Select screen index zero based to match config array. (#286)

BBC-archive · Aug 1, 2019 · 546676e · 546676e
1 parent 4e4daaa
commit 546676e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 | Version | Description |
 |---------|-------------|
+| 2.0.4 | |
+| | Button accessibility hot fix. (CGPROD-1577) |
 | 2.0.3 | |
 | | Select screen index zero based to match config array. |
 | | Remove achievement audio. |

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "genie",
-    "version": "2.0.1",
+    "version": "2.0.4",
     "description": "Genie - A Modular Game Engine",
     "license": "Apache-2.0",
     "private": true,

diff --git a/src/core/accessibility/element-manipulator.js b/src/core/accessibility/element-manipulator.js
@@ -47,7 +47,7 @@ const callOnNextTick = fn => setTimeout(fn, 0);
 const resetElementToDefault = (el, self) => {
     el.removeEventListener("blur", self);
     callOnNextTick(() => {
-        el.parentElement.removeChild(el);
+        el.parentElement && el.parentElement.removeChild(el);
         showElement(el);
         unsetElementAsHiddenAndDisabled(el);
     });

diff --git a/test/core/accessibility/element-manipulator.test.js b/test/core/accessibility/element-manipulator.test.js
@@ -100,6 +100,15 @@ describe("element manipulator", () => {
             expect(setTimeout).toHaveBeenCalledTimes(1);
             expect(element.parentElement.removeChild).toHaveBeenCalledWith(element);
         });
+
+        test("does not error if parentElement is null (caused by race condition)", () => {
+            jest.useFakeTimers();
+            delete element.parentElement;
+            resetElement();
+            jest.runAllTimers();
+
+            expect(setTimeout).toHaveBeenCalledTimes(1);
+        });
     });
 
     describe("showElement Method", () => {