refactor: rename navigationStrategy to nextFocusResolver

Made-with: Cursor

Author: xavi160

packages/core/src/SpatialNavigation.ts

@@ -37,7 +37,7 @@ export type NodeType = NodeTypeOverrides extends { node: infer N }
 
 export type Direction = 'up' | 'down' | 'left' | 'right';
 
-export type NavigationStrategy = (
+export type NextFocusResolver = (
   direction: Direction,
   focusKey: string,
   siblings: FocusableComponent[]
@@ -118,7 +118,7 @@ export interface FocusableComponent {
   focusBoundaryDirections?: Direction[];
   autoRestoreFocus: boolean;
   forceFocus: boolean;
-  navigationStrategy?: NavigationStrategy;
+  nextFocusResolver?: NextFocusResolver;
   lastFocusedChildKey?: string;
   layout?: FocusableComponentLayout;
   layoutUpdatedAt?: number;
@@ -136,7 +136,7 @@ interface FocusableComponentUpdatePayload {
   onArrowRelease: (direction: string) => void;
   onFocus: (layout: FocusableComponentLayout, details: FocusDetails) => void;
   onBlur: (layout: FocusableComponentLayout, details: FocusDetails) => void;
-  navigationStrategy?: NavigationStrategy;
+  nextFocusResolver?: NextFocusResolver;
 }
 
 interface FocusableComponentRemovePayload {
@@ -1129,16 +1129,16 @@ export class SpatialNavigationService {
 
       let nextComponent: FocusableComponent | null = null;
 
-      const { navigationStrategy } =
+      const { nextFocusResolver } =
         this.focusableComponents[parentFocusKey] ?? {};
 
-      if (navigationStrategy) {
+      if (nextFocusResolver) {
         const siblings = filter(
           this.focusableComponents,
           (component) =>
             component.parentFocusKey === parentFocusKey && component.focusable
         );
-        nextComponent = navigationStrategy(
+        nextComponent = nextFocusResolver(
           direction as Direction,
           focusKey,
           siblings
@@ -1147,7 +1147,7 @@ export class SpatialNavigationService {
         if (this.debug) {
           this.log(
             'smartNavigate',
-            'navigation overrided by navigationStrategy',
+            'navigation overrided by nextFocusResolver',
             nextComponent
           );
         }
@@ -1425,7 +1425,7 @@ export class SpatialNavigationService {
     focusable,
     isFocusBoundary,
     focusBoundaryDirections,
-    navigationStrategy
+    nextFocusResolver
   }: FocusableComponent) {
     this.focusableComponents[focusKey] = {
       focusKey,
@@ -1439,7 +1439,7 @@ export class SpatialNavigationService {
       onBlur,
       onUpdateFocus,
       onUpdateHasFocusedChild,
-      navigationStrategy,
+      nextFocusResolver,
       saveLastFocusedChild,
       trackChildren,
       preferredChildFocusKey,
@@ -1807,7 +1807,7 @@ export class SpatialNavigationService {
       onArrowPress,
       onFocus,
       onBlur,
-      navigationStrategy
+      nextFocusResolver
     }: FocusableComponentUpdatePayload
   ) {
     const component = this.focusableComponents[focusKey];
@@ -1822,7 +1822,7 @@ export class SpatialNavigationService {
       component.onArrowPress = onArrowPress;
       component.onFocus = onFocus;
       component.onBlur = onBlur;
-      component.navigationStrategy = navigationStrategy;
+      component.nextFocusResolver = nextFocusResolver;
       // Reset layout updated at to force a layout update
       component.layoutUpdatedAt = 0;
 

packages/react/src/useFocusable.ts

@@ -13,7 +13,7 @@ import {
   FocusDetails,
   KeyPressDetails,
   Direction,
-  NavigationStrategy
+  NextFocusResolver
 } from '@noriginmedia/norigin-spatial-navigation-core';
 import { useFocusContext } from './useFocusContext';
 
@@ -57,7 +57,7 @@ export interface UseFocusableConfig<P = object> {
   focusBoundaryDirections?: Direction[];
   focusKey?: string;
   preferredChildFocusKey?: string;
-  navigationStrategy?: NavigationStrategy;
+  nextFocusResolver?: NextFocusResolver;
   onEnterPress?: EnterPressHandler<P>;
   onEnterRelease?: EnterReleaseHandler<P>;
   onArrowPress?: ArrowPressHandler<P>;
@@ -85,7 +85,7 @@ const useFocusableHook = <P, E = any>({
   focusBoundaryDirections,
   focusKey: propFocusKey,
   preferredChildFocusKey,
-  navigationStrategy,
+  nextFocusResolver,
   onEnterPress = noop,
   onEnterRelease = noop,
   onArrowPress = () => true,
@@ -162,7 +162,7 @@ const useFocusableHook = <P, E = any>({
       node,
       parentFocusKey,
       preferredChildFocusKey,
-      navigationStrategy,
+      nextFocusResolver,
       onEnterPress: onEnterPressHandler,
       onEnterRelease: onEnterReleaseHandler,
       onArrowPress: onArrowPressHandler,
@@ -197,7 +197,7 @@ const useFocusableHook = <P, E = any>({
       focusable,
       isFocusBoundary,
       focusBoundaryDirections,
-      navigationStrategy,
+      nextFocusResolver,
       onEnterPress: onEnterPressHandler,
       onEnterRelease: onEnterReleaseHandler,
       onArrowPress: onArrowPressHandler,
@@ -211,7 +211,7 @@ const useFocusableHook = <P, E = any>({
     focusable,
     isFocusBoundary,
     focusBoundaryDirections,
-    navigationStrategy,
+    nextFocusResolver,
     onEnterPressHandler,
     onEnterReleaseHandler,
     onArrowPressHandler,