Merge pull request #123 from NoriginMedia/api-cleanup

Remove startDrawLayouts and onKeyEvent from public API
NoriginMedia · Mar 19, 2024 · 3306b4c · 3306b4c
2 parents 60e2de1 + 7ad6d44
commit 3306b4c
Showing 1 changed file with 24 additions and 38 deletions.
diff --git a/src/SpatialNavigation.ts b/src/SpatialNavigation.ts
@@ -565,7 +565,6 @@ class SpatialNavigationService {
     this.keyUpEventListener = null;
     this.keyMap = DEFAULT_KEY_MAP;
 
-    this.onKeyEvent = this.onKeyEvent.bind(this);
     this.pause = this.pause.bind(this);
     this.resume = this.resume.bind(this);
     this.setFocus = this.setFocus.bind(this);
@@ -618,7 +617,21 @@ class SpatialNavigationService {
         this.bindEventHandlers();
         if (visualDebug) {
           this.visualDebugger = new VisualDebugger(this.writingDirection);
-          this.startDrawLayouts();
+          const draw = () => {
+            requestAnimationFrame(() => {
+              this.visualDebugger.clearLayouts();
+              forOwn(this.focusableComponents, (component, focusKey) => {
+                this.visualDebugger.drawLayout(
+                  component.layout,
+                  focusKey,
+                  component.parentFocusKey
+                );
+              });
+              draw();
+            });
+          };
+
+          draw();
         }
       }
     }
@@ -639,24 +652,6 @@ class SpatialNavigationService {
     }
   }
 
-  startDrawLayouts() {
-    const draw = () => {
-      requestAnimationFrame(() => {
-        this.visualDebugger.clearLayouts();
-        forOwn(this.focusableComponents, (component, focusKey) => {
-          this.visualDebugger.drawLayout(
-            component.layout,
-            focusKey,
-            component.parentFocusKey
-          );
-        });
-        draw();
-      });
-    };
-
-    draw();
-  }
-
   destroy() {
     if (this.enabled) {
       this.enabled = false;
@@ -722,14 +717,18 @@ class SpatialNavigationService {
         const preventDefaultNavigation =
           this.onArrowPress(eventType, keysDetails) === false;
 
+        if (this.visualDebugger) {
+          this.visualDebugger.clear();
+        }
+
         if (preventDefaultNavigation) {
           this.log('keyDownEventListener', 'default navigation prevented');
-
-          if (this.visualDebugger) {
-            this.visualDebugger.clear();
-          }
         } else {
-          this.onKeyEvent(event);
+          const direction = findKey(this.getKeyMap(), (codeList) =>
+            codeList.includes(keyCode)
+          );
+
+          this.smartNavigate(direction, null, { event });
         }
       };
 
@@ -877,19 +876,6 @@ class SpatialNavigationService {
     }
   }
 
-  onKeyEvent(event: KeyboardEvent) {
-    if (this.visualDebugger) {
-      this.visualDebugger.clear();
-    }
-
-    const keyCode = SpatialNavigationService.getKeyCode(event);
-    const direction = findKey(this.getKeyMap(), (codeList) =>
-      codeList.includes(keyCode)
-    );
-
-    this.smartNavigate(direction, null, { event });
-  }
-
   /**
    * This function navigates between siblings OR goes up by the Tree
    * Based on the Direction