fix(FocusManager): add patching of itemPosX and itemPosY to Items

rdkcentral · Mar 18, 2024 · e00b890 · e00b890
1 parent 7ac02e8
commit e00b890
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/packages/@lightningjs/ui-components/src/components/FocusManager/FocusManager.js b/packages/@lightningjs/ui-components/src/components/FocusManager/FocusManager.js
@@ -54,6 +54,20 @@ export default class FocusManager extends Base {
     this._checkSkipFocus();
   }
 
+  _update() {
+    super._update();
+    this._updateItemPos();
+  }
+
+  // I think this is necessary, because there is nothing other than _restItems patching in itemPosX and itemPosY,
+  // whereas the previous setters were setting the x and y values for Items. -David
+  _updateItemPos() {
+    this.Items.patch({
+      x: this.itemPosX,
+      y: this.itemPosY
+    });
+  }
+
   get Items() {
     if (!this.tag('Items')) {
       this.patch({ Items: {} });

diff --git a/packages/@lightningjs/ui-components/src/components/FocusManager/FocusManager.test.js b/packages/@lightningjs/ui-components/src/components/FocusManager/FocusManager.test.js
@@ -197,6 +197,7 @@ describe('FocusManager', () => {
     const pos = 100;
     focusManager.itemPosX = pos;
     focusManager.itemPosY = pos;
+    testRenderer.forceAllUpdates();
     expect(focusManager.Items.x).toBe(pos);
     expect(focusManager.Items.y).toBe(pos);