@react-navigation/core 8.0.0-alpha.3 → 8.0.0-alpha.31

package/lib/module/useIsFocused.js

@@ -1,23 +1,18 @@
 "use strict";
 
 import * as React from 'react';
-import { useNavigation } from "./useNavigation.js";
+export const FocusedRouteKeyContext = /*#__PURE__*/React.createContext(undefined);
+export const IsFocusedContext = /*#__PURE__*/React.createContext(undefined);
 
 /**
  * Hook to get the current focus state of the screen. Returns a `true` if screen is focused, otherwise `false`.
  * This can be used if a component needs to render something based on the focus state.
  */
 export function useIsFocused() {
-  const navigation = useNavigation();
-  const subscribe = React.useCallback(callback => {
-    const unsubscribeFocus = navigation.addListener('focus', callback);
-    const unsubscribeBlur = navigation.addListener('blur', callback);
-    return () => {
-      unsubscribeFocus();
-      unsubscribeBlur();
-    };
-  }, [navigation]);
-  const value = React.useSyncExternalStore(subscribe, navigation.isFocused, navigation.isFocused);
-  return value;
+  const isFocused = React.use(IsFocusedContext);
+  if (isFocused === undefined) {
+    throw new Error("Couldn't determine focus state. Is your component inside a screen in a navigator?");
+  }
+  return isFocused;
 }
 //# sourceMappingURL=useIsFocused.js.map

package/lib/module/useIsFocused.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useNavigation","useIsFocused","navigation","subscribe","useCallback","callback","unsubscribeFocus","addListener","unsubscribeBlur","value","useSyncExternalStore","isFocused"],"sourceRoot":"../../src","sources":["useIsFocused.tsx"],"mappings":";;AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAE9B,SAASC,aAAa,QAAQ,oBAAiB;;AAE/C;AACA;AACA;AACA;AACA,OAAO,SAASC,YAAYA,CAAA,EAAY;EACtC,MAAMC,UAAU,GAAGF,aAAa,CAAC,CAAC;EAElC,MAAMG,SAAS,GAAGJ,KAAK,CAACK,WAAW,CAChCC,QAAoB,IAAK;IACxB,MAAMC,gBAAgB,GAAGJ,UAAU,CAACK,WAAW,CAAC,OAAO,EAAEF,QAAQ,CAAC;IAClE,MAAMG,eAAe,GAAGN,UAAU,CAACK,WAAW,CAAC,MAAM,EAAEF,QAAQ,CAAC;IAEhE,OAAO,MAAM;MACXC,gBAAgB,CAAC,CAAC;MAClBE,eAAe,CAAC,CAAC;IACnB,CAAC;EACH,CAAC,EACD,CAACN,UAAU,CACb,CAAC;EAED,MAAMO,KAAK,GAAGV,KAAK,CAACW,oBAAoB,CACtCP,SAAS,EACTD,UAAU,CAACS,SAAS,EACpBT,UAAU,CAACS,SACb,CAAC;EAED,OAAOF,KAAK;AACd","ignoreList":[]}
+{"version":3,"names":["React","FocusedRouteKeyContext","createContext","undefined","IsFocusedContext","useIsFocused","isFocused","use","Error"],"sourceRoot":"../../src","sources":["useIsFocused.tsx"],"mappings":";;AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAE9B,OAAO,MAAMC,sBAAsB,gBAAGD,KAAK,CAACE,aAAa,CACvDC,SACF,CAAC;AAED,OAAO,MAAMC,gBAAgB,gBAAGJ,KAAK,CAACE,aAAa,CACjDC,SACF,CAAC;;AAED;AACA;AACA;AACA;AACA,OAAO,SAASE,YAAYA,CAAA,EAAY;EACtC,MAAMC,SAAS,GAAGN,KAAK,CAACO,GAAG,CAACH,gBAAgB,CAAC;EAE7C,IAAIE,SAAS,KAAKH,SAAS,EAAE;IAC3B,MAAM,IAAIK,KAAK,CACb,mFACF,CAAC;EACH;EAEA,OAAOF,SAAS;AAClB","ignoreList":[]}

package/lib/module/useKeyedChildListeners.js

@@ -15,8 +15,10 @@ export function useKeyedChildListeners() {
     // @ts-expect-error: according to ref stated above you can use `key` to index type
     keyedListeners[type][key] = listener;
     return () => {
-      // @ts-expect-error: according to ref stated above you can use `key` to index type
-      keyedListeners[type][key] = undefined;
+      if (keyedListeners[type][key] === listener) {
+        // @ts-expect-error: according to ref stated above you can use `key` to index type
+        keyedListeners[type][key] = undefined;
+      }
     };
   }, [keyedListeners]);
   return {

package/lib/module/useKeyedChildListeners.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useKeyedChildListeners","current","keyedListeners","useRef","Object","assign","create","getState","beforeRemove","addKeyedListener","useCallback","type","key","listener","undefined"],"sourceRoot":"../../src","sources":["useKeyedChildListeners.tsx"],"mappings":";;AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAI9B;AACA;AACA;AACA,OAAO,SAASC,sBAAsBA,CAAA,EAAG;EACvC,MAAM;IAAEC,OAAO,EAAEC;EAAe,CAAC,GAAGH,KAAK,CAACI,MAAM,CAM9CC,MAAM,CAACC,MAAM,CAACD,MAAM,CAACE,MAAM,CAAC,IAAI,CAAC,EAAE;IACjCC,QAAQ,EAAE,CAAC,CAAC;IACZC,YAAY,EAAE,CAAC;EACjB,CAAC,CACH,CAAC;EAED,MAAMC,gBAAgB,GAAGV,KAAK,CAACW,WAAW,CACxC,CACEC,IAAO,EACPC,GAAW,EACXC,QAA6B,KAC1B;IACH;IACAX,cAAc,CAACS,IAAI,CAAC,CAACC,GAAG,CAAC,GAAGC,QAAQ;IAEpC,OAAO,MAAM;MACX;MACAX,cAAc,CAACS,IAAI,CAAC,CAACC,GAAG,CAAC,GAAGE,SAAS;IACvC,CAAC;EACH,CAAC,EACD,CAACZ,cAAc,CACjB,CAAC;EAED,OAAO;IACLA,cAAc;IACdO;EACF,CAAC;AACH","ignoreList":[]}
+{"version":3,"names":["React","useKeyedChildListeners","current","keyedListeners","useRef","Object","assign","create","getState","beforeRemove","addKeyedListener","useCallback","type","key","listener","undefined"],"sourceRoot":"../../src","sources":["useKeyedChildListeners.tsx"],"mappings":";;AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAI9B;AACA;AACA;AACA,OAAO,SAASC,sBAAsBA,CAAA,EAAG;EACvC,MAAM;IAAEC,OAAO,EAAEC;EAAe,CAAC,GAAGH,KAAK,CAACI,MAAM,CAM9CC,MAAM,CAACC,MAAM,CAACD,MAAM,CAACE,MAAM,CAAC,IAAI,CAAC,EAAE;IACjCC,QAAQ,EAAE,CAAC,CAAC;IACZC,YAAY,EAAE,CAAC;EACjB,CAAC,CACH,CAAC;EAED,MAAMC,gBAAgB,GAAGV,KAAK,CAACW,WAAW,CACxC,CACEC,IAAO,EACPC,GAAW,EACXC,QAA6B,KAC1B;IACH;IACAX,cAAc,CAACS,IAAI,CAAC,CAACC,GAAG,CAAC,GAAGC,QAAQ;IAEpC,OAAO,MAAM;MACX,IAAIX,cAAc,CAACS,IAAI,CAAC,CAACC,GAAG,CAAC,KAAKC,QAAQ,EAAE;QAC1C;QACAX,cAAc,CAACS,IAAI,CAAC,CAACC,GAAG,CAAC,GAAGE,SAAS;MACvC;IACF,CAAC;EACH,CAAC,EACD,CAACZ,cAAc,CACjB,CAAC;EAED,OAAO;IACLA,cAAc;IACdO;EACF,CAAC;AACH","ignoreList":[]}

package/lib/module/useLazyValue.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useLazyValue","create","lazyRef","useRef","undefined","current"],"sourceRoot":"../../src","sources":["useLazyValue.tsx"],"mappings":";;AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAE9B,OAAO,SAASC,YAAYA,CAAIC,MAAe,EAAE;EAC/C,MAAMC,OAAO,GAAGH,KAAK,CAACI,MAAM,CAAIC,SAAS,CAAC;EAE1C,IAAIF,OAAO,CAACG,OAAO,KAAKD,SAAS,EAAE;IACjCF,OAAO,CAACG,OAAO,GAAGJ,MAAM,CAAC,CAAC;EAC5B;EAEA,OAAOC,OAAO,CAACG,OAAO;AACxB","ignoreList":[]}
+{"version":3,"names":["React","useLazyValue","create","lazyRef","useRef","undefined","current"],"sourceRoot":"../../src","sources":["useLazyValue.tsx"],"mappings":";;AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAE9B,OAAO,SAASC,YAAYA,CAAIC,MAAe,EAAK;EAClD,MAAMC,OAAO,GAAGH,KAAK,CAACI,MAAM,CAAIC,SAAS,CAAC;EAE1C,IAAIF,OAAO,CAACG,OAAO,KAAKD,SAAS,EAAE;IACjCF,OAAO,CAACG,OAAO,GAAGJ,MAAM,CAAC,CAAC;EAC5B;EAEA,OAAOC,OAAO,CAACG,OAAO;AACxB","ignoreList":[]}

package/lib/module/useNavigation.js

@@ -2,7 +2,7 @@
 
 import * as React from 'react';
 import { NavigationContainerRefContext } from "./NavigationContainerRefContext.js";
-import { NavigationContext, NavigationRouteNameContext } from "./NavigationProvider.js";
+import { NavigationContext } from "./NavigationProvider.js";
 
 /**
  * Hook to access the navigation prop of the parent screen anywhere.
@@ -22,20 +22,7 @@ export function useNavigation(name) {
     }
     return navigation ?? root;
   }
-  const routeName = React.use(NavigationRouteNameContext);
-
-  // Generally, this condition isn't needed as `getParent(name)` works for current screen
-  // However, it'll throw if the hook is used in a preloaded screen
-  if (routeName === name) {
-    if (navigation === undefined) {
-      throw new Error(`Couldn't find a navigation object for '${name}'. This is not expected.`);
-    }
-    return navigation;
-  }
-
-  // We get parent first so that `getParent(name)` is not called in preloaded screens
-  // It's ok since `getParent` also works for current screen, so parent is not skipped
-  const parent = navigation?.getParent()?.getParent(name);
+  const parent = navigation?.getParent(name);
   if (parent === undefined) {
     throw new Error(`Couldn't find a navigation object for '${name}' in current or any parent screens. Is your component inside the correct screen?`);
   }

package/lib/module/useNavigation.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","NavigationContainerRefContext","NavigationContext","NavigationRouteNameContext","useNavigation","name","root","use","navigation","undefined","Error","routeName","parent","getParent"],"sourceRoot":"../../src","sources":["useNavigation.tsx"],"mappings":";;AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAE9B,SAASC,6BAA6B,QAAQ,oCAAiC;AAC/E,SACEC,iBAAiB,EACjBC,0BAA0B,QACrB,yBAAsB;;AAS7B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAUA,OAAO,SAASC,aAAaA,CAACC,IAAa,EAAW;EACpD,MAAMC,IAAI,GAAGN,KAAK,CAACO,GAAG,CAACN,6BAA6B,CAAC;EACrD,MAAMO,UAAU,GAAGR,KAAK,CAACO,GAAG,CAACL,iBAAiB,CAAC;EAE/C,IAAIG,IAAI,KAAKI,SAAS,EAAE;IACtB,IAAID,UAAU,KAAKC,SAAS,IAAIH,IAAI,KAAKG,SAAS,EAAE;MAClD,MAAM,IAAIC,KAAK,CACb,kFACF,CAAC;IACH;IAEA,OAAOF,UAAU,IAAIF,IAAI;EAC3B;EAEA,MAAMK,SAAS,GAAGX,KAAK,CAACO,GAAG,CAACJ,0BAA0B,CAAC;;EAEvD;EACA;EACA,IAAIQ,SAAS,KAAKN,IAAI,EAAE;IACtB,IAAIG,UAAU,KAAKC,SAAS,EAAE;MAC5B,MAAM,IAAIC,KAAK,CACb,0CAA0CL,IAAI,0BAChD,CAAC;IACH;IAEA,OAAOG,UAAU;EACnB;;EAEA;EACA;EACA,MAAMI,MAAM,GAAGJ,UAAU,EAAEK,SAAS,CAAC,CAAC,EAAEA,SAAS,CAACR,IAAI,CAAC;EAEvD,IAAIO,MAAM,KAAKH,SAAS,EAAE;IACxB,MAAM,IAAIC,KAAK,CACb,0CAA0CL,IAAI,kFAChD,CAAC;EACH;EAEA,OAAOO,MAAM;AACf","ignoreList":[]}
+{"version":3,"names":["React","NavigationContainerRefContext","NavigationContext","useNavigation","name","root","use","navigation","undefined","Error","parent","getParent"],"sourceRoot":"../../src","sources":["useNavigation.tsx"],"mappings":";;AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAE9B,SAASC,6BAA6B,QAAQ,oCAAiC;AAC/E,SAASC,iBAAiB,QAAQ,yBAAsB;;AAWxD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAUA,OAAO,SAASC,aAAaA,CAACC,IAAa,EAAW;EACpD,MAAMC,IAAI,GAAGL,KAAK,CAACM,GAAG,CAACL,6BAA6B,CAAC;EACrD,MAAMM,UAAU,GAAGP,KAAK,CAACM,GAAG,CAACJ,iBAAiB,CAAC;EAE/C,IAAIE,IAAI,KAAKI,SAAS,EAAE;IACtB,IAAID,UAAU,KAAKC,SAAS,IAAIH,IAAI,KAAKG,SAAS,EAAE;MAClD,MAAM,IAAIC,KAAK,CACb,kFACF,CAAC;IACH;IAEA,OAAOF,UAAU,IAAIF,IAAI;EAC3B;EAEA,MAAMK,MAAM,GAAGH,UAAU,EAAEI,SAAS,CAACP,IAAI,CAAC;EAE1C,IAAIM,MAAM,KAAKF,SAAS,EAAE;IACxB,MAAM,IAAIC,KAAK,CACb,0CAA0CL,IAAI,kFAChD,CAAC;EACH;EAEA,OAAOM,MAAM;AACf","ignoreList":[]}