@react-navigation/core 8.0.0-alpha.4 → 8.0.0-alpha.40

package/lib/module/useEventEmitter.js

@@ -4,10 +4,12 @@ import * as React from 'react';
 /**
  * Hook to manage the event system used by the navigator to notify screens of various events.
  */
-export function useEventEmitter(listen) {
+export function useEventEmitter(listen, onPostEmit) {
   const listenRef = React.useRef(listen);
-  React.useEffect(() => {
+  const onPostEmitRef = React.useRef(onPostEmit);
+  React.useInsertionEffect(() => {
     listenRef.current = listen;
+    onPostEmitRef.current = onPostEmit;
   });
   const listeners = React.useRef(Object.create(null));
   const create = React.useCallback(target => {
@@ -32,52 +34,65 @@ export function useEventEmitter(listen) {
     target,
     canPreventDefault
   }) => {
-    const items = listeners.current[type] || {};
+    const items = listeners.current[type];
 
     // Copy the current list of callbacks in case they are mutated during execution
-    const callbacks = new Set(Object.values(target ? {
-      [target]: items[target]
-    } : items).flatMap(t => t ? Array.from(t) : []));
-    const event = {
-      get type() {
-        return type;
+    let callbacks;
+    if (items) {
+      if (target !== undefined) {
+        const targetSet = items[target];
+        if (targetSet && targetSet.size) {
+          callbacks = new Set(targetSet);
+        }
+      } else {
+        for (const key in items) {
+          const set = items[key];
+          if (set && set.size) {
+            callbacks ??= new Set();
+            for (const cb of set) {
+              callbacks.add(cb);
+            }
+          }
+        }
+      }
+    }
+    const descriptors = {
+      type: {
+        enumerable: true,
+        value: type
       }
     };
     if (target !== undefined) {
-      Object.defineProperty(event, 'target', {
+      descriptors.target = {
         enumerable: true,
-        get() {
-          return target;
-        }
-      });
+        value: target
+      };
     }
     if (data !== undefined) {
-      Object.defineProperty(event, 'data', {
+      descriptors.data = {
         enumerable: true,
-        get() {
-          return data;
-        }
-      });
+        value: data
+      };
     }
+    let defaultPrevented = false;
     if (canPreventDefault) {
-      let defaultPrevented = false;
-      Object.defineProperties(event, {
-        defaultPrevented: {
-          enumerable: true,
-          get() {
-            return defaultPrevented;
-          }
-        },
-        preventDefault: {
-          enumerable: true,
-          value() {
-            defaultPrevented = true;
-          }
+      descriptors.defaultPrevented = {
+        enumerable: true,
+        get() {
+          return defaultPrevented;
+        }
+      };
+      descriptors.preventDefault = {
+        enumerable: true,
+        value() {
+          defaultPrevented = true;
         }
-      });
+      };
     }
+    const event = Object.defineProperties({}, descriptors);
     listenRef.current?.(event);
     callbacks?.forEach(cb => cb(event));
+    onPostEmitRef.current?.(event);
     return event;
   }, []);
   return React.useMemo(() => ({

package/lib/module/useEventEmitter.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useEventEmitter","listen","listenRef","useRef","useEffect","current","listeners","Object","create","useCallback","target","removeListener","type","callback","callbacks","delete","addListener","Set","add","emit","data","canPreventDefault","items","values","flatMap","t","Array","from","event","undefined","defineProperty","enumerable","get","defaultPrevented","defineProperties","preventDefault","value","forEach","cb","useMemo"],"sourceRoot":"../../src","sources":["useEventEmitter.tsx"],"mappings":";;AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAW9B;AACA;AACA;AACA,OAAO,SAASC,eAAeA,CAC7BC,MAAyB,EACE;EAC3B,MAAMC,SAAS,GAAGH,KAAK,CAACI,MAAM,CAACF,MAAM,CAAC;EAEtCF,KAAK,CAACK,SAAS,CAAC,MAAM;IACpBF,SAAS,CAACG,OAAO,GAAGJ,MAAM;EAC5B,CAAC,CAAC;EAEF,MAAMK,SAAS,GAAGP,KAAK,CAACI,MAAM,CAC5BI,MAAM,CAACC,MAAM,CAAC,IAAI,CACpB,CAAC;EAED,MAAMA,MAAM,GAAGT,KAAK,CAACU,WAAW,CAAEC,MAAc,IAAK;IACnD,MAAMC,cAAc,GAAGA,CAACC,IAAY,EAAEC,QAA6B,KAAK;MACtE,MAAMC,SAAS,GAAGR,SAAS,CAACD,OAAO,CAACO,IAAI,CAAC,GAAGF,MAAM,CAAC;MAEnDI,SAAS,EAAEC,MAAM,CAACF,QAAQ,CAAC;IAC7B,CAAC;IAED,MAAMG,WAAW,GAAGA,CAACJ,IAAY,EAAEC,QAA6B,KAAK;MACnEP,SAAS,CAACD,OAAO,CAACO,IAAI,CAAC,KAAK,CAAC,CAAC;MAC9BN,SAAS,CAACD,OAAO,CAACO,IAAI,CAAC,CAACF,MAAM,CAAC,KAAK,IAAIO,GAAG,CAAC,CAAC;MAE7CX,SAAS,CAACD,OAAO,CAACO,IAAI,CAAC,CAACF,MAAM,CAAC,CAACQ,GAAG,CAACL,QAAQ,CAAC;MAE7C,OAAO,MAAMF,cAAc,CAACC,IAAI,EAAEC,QAAQ,CAAC;IAC7C,CAAC;IAED,OAAO;MACLG,WAAW;MACXL;IACF,CAAC;EACH,CAAC,EAAE,EAAE,CAAC;EAEN,MAAMQ,IAAI,GAAGpB,KAAK,CAACU,WAAW,CAC5B,CAAC;IACCG,IAAI;IACJQ,IAAI;IACJV,MAAM;IACNW;EAMF,CAAC,KAAK;IACJ,MAAMC,KAAK,GAAGhB,SAAS,CAACD,OAAO,CAACO,IAAI,CAAC,IAAI,CAAC,CAAC;;IAE3C;IACA,MAAME,SAAS,GAAG,IAAIG,GAAG,CACvBV,MAAM,CAACgB,MAAM,CAACb,MAAM,GAAG;MAAE,CAACA,MAAM,GAAGY,KAAK,CAACZ,MAAM;IAAE,CAAC,GAAGY,KAAK,CAAC,CAACE,OAAO,CAChEC,CAAC,IAAMA,CAAC,GAAGC,KAAK,CAACC,IAAI,CAACF,CAAC,CAAC,GAAG,EAC9B,CACF,CAAC;IAED,MAAMG,KAA8B,GAAG;MACrC,IAAIhB,IAAIA,CAAA,EAAG;QACT,OAAOA,IAAI;MACb;IACF,CAAC;IAED,IAAIF,MAAM,KAAKmB,SAAS,EAAE;MACxBtB,MAAM,CAACuB,cAAc,CAACF,KAAK,EAAE,QAAQ,EAAE;QACrCG,UAAU,EAAE,IAAI;QAChBC,GAAGA,CAAA,EAAG;UACJ,OAAOtB,MAAM;QACf;MACF,CAAC,CAAC;IACJ;IAEA,IAAIU,IAAI,KAAKS,SAAS,EAAE;MACtBtB,MAAM,CAACuB,cAAc,CAACF,KAAK,EAAE,MAAM,EAAE;QACnCG,UAAU,EAAE,IAAI;QAChBC,GAAGA,CAAA,EAAG;UACJ,OAAOZ,IAAI;QACb;MACF,CAAC,CAAC;IACJ;IAEA,IAAIC,iBAAiB,EAAE;MACrB,IAAIY,gBAAgB,GAAG,KAAK;MAE5B1B,MAAM,CAAC2B,gBAAgB,CAACN,KAAK,EAAE;QAC7BK,gBAAgB,EAAE;UAChBF,UAAU,EAAE,IAAI;UAChBC,GAAGA,CAAA,EAAG;YACJ,OAAOC,gBAAgB;UACzB;QACF,CAAC;QACDE,cAAc,EAAE;UACdJ,UAAU,EAAE,IAAI;UAChBK,KAAKA,CAAA,EAAG;YACNH,gBAAgB,GAAG,IAAI;UACzB;QACF;MACF,CAAC,CAAC;IACJ;IAEA/B,SAAS,CAACG,OAAO,GAAGuB,KAAK,CAAC;IAE1Bd,SAAS,EAAEuB,OAAO,CAAEC,EAAE,IAAKA,EAAE,CAACV,KAAK,CAAC,CAAC;IAErC,OAAOA,KAAK;EACd,CAAC,EACD,EACF,CAAC;EAED,OAAO7B,KAAK,CAACwC,OAAO,CAAC,OAAO;IAAE/B,MAAM;IAAEW;EAAK,CAAC,CAAC,EAAE,CAACX,MAAM,EAAEW,IAAI,CAAC,CAAC;AAChE","ignoreList":[]}
+{"version":3,"names":["React","useEventEmitter","listen","onPostEmit","listenRef","useRef","onPostEmitRef","useInsertionEffect","current","listeners","Object","create","useCallback","target","removeListener","type","callback","callbacks","delete","addListener","Set","add","emit","data","canPreventDefault","items","undefined","targetSet","size","key","set","cb","descriptors","enumerable","value","defaultPrevented","get","preventDefault","event","defineProperties","forEach","useMemo"],"sourceRoot":"../../src","sources":["useEventEmitter.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/useFocusEffect.js

@@ -1,6 +1,7 @@
 "use strict";
 
 import * as React from 'react';
+import { IsFocusedGetterContext } from "./useIsFocused.js";
 import { useNavigation } from "./useNavigation.js";
 /**
  * Hook to run an effect in a focused screen, similar to `React.useEffect`.
@@ -11,6 +12,7 @@ import { useNavigation } from "./useNavigation.js";
  */
 export function useFocusEffect(effect) {
   const navigation = useNavigation();
+  const getIsFocused = React.use(IsFocusedGetterContext);
 
   // eslint-disable-next-line prefer-rest-params
   if (arguments[1] !== undefined) {
@@ -39,7 +41,7 @@ export function useFocusEffect(effect) {
     };
 
     // We need to run the effect on initial render/dep changes if the screen is focused
-    if (navigation.isFocused()) {
+    if (getIsFocused?.() ?? true) {
       cleanup = callback();
       isFocused = true;
     }
@@ -69,6 +71,6 @@ export function useFocusEffect(effect) {
       unsubscribeFocus();
       unsubscribeBlur();
     };
-  }, [effect, navigation]);
+  }, [effect, navigation, getIsFocused]);
 }
 //# sourceMappingURL=useFocusEffect.js.map

package/lib/module/useFocusEffect.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useNavigation","useFocusEffect","effect","navigation","arguments","undefined","message","console","error","useEffect","isFocused","cleanup","callback","destroy","process","env","NODE_ENV","then","JSON","stringify","unsubscribeFocus","addListener","unsubscribeBlur"],"sourceRoot":"../../src","sources":["useFocusEffect.tsx"],"mappings":";;AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAE9B,SAASC,aAAa,QAAQ,oBAAiB;AAI/C;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,cAAcA,CAACC,MAAsB,EAAE;EACrD,MAAMC,UAAU,GAAGH,aAAa,CAAC,CAAC;;EAElC;EACA,IAAII,SAAS,CAAC,CAAC,CAAC,KAAKC,SAAS,EAAE;IAC9B,MAAMC,OAAO,GACX,sFAAsF,GACtF,8EAA8E,GAC9E,mBAAmB,GACnB,+BAA+B,GAC/B,yBAAyB,GACzB,sBAAsB,GACtB,QAAQ,GACR,oEAAoE;IAEtEC,OAAO,CAACC,KAAK,CAACF,OAAO,CAAC;EACxB;EAEAP,KAAK,CAACU,SAAS,CAAC,MAAM;IACpB,IAAIC,SAAS,GAAG,KAAK;IACrB,IAAIC,OAAwC;IAE5C,MAAMC,QAAQ,GAAGA,CAAA,KAAM;MACrB,MAAMC,OAAO,GAAGX,MAAM,CAAC,CAAC;MAExB,IAAIW,OAAO,KAAKR,SAAS,IAAI,OAAOQ,OAAO,KAAK,UAAU,EAAE;QAC1D,OAAOA,OAAO;MAChB;MAEA,IAAIC,OAAO,CAACC,GAAG,CAACC,QAAQ,KAAK,YAAY,EAAE;QACzC,IAAIV,OAAO,GACT,6FAA6F;QAE/F,IAAIO,OAAO,KAAK,IAAI,EAAE;UACpBP,OAAO,IACL,kGAAkG;QACtG,CAAC,MAAM,IAAI,OAAQO,OAAO,CAASI,IAAI,KAAK,UAAU,EAAE;UACtDX,OAAO,IACL,uFAAuF,GACvF,uDAAuD,GACvD,8BAA8B,GAC9B,mBAAmB,GACnB,+BAA+B,GAC/B,oCAAoC,GACpC,+BAA+B,GAC/B,uDAAuD,GACvD,gBAAgB,GAChB,WAAW,GACX,oBAAoB,GACpB,kBAAkB,GAClB,QAAQ,GACR,oEAAoE;QACxE,CAAC,MAAM;UACLA,OAAO,IAAI,kBAAkBY,IAAI,CAACC,SAAS,CAACN,OAAO,CAAC,IAAI;QAC1D;QAEAN,OAAO,CAACC,KAAK,CAACF,OAAO,CAAC;MACxB;IACF,CAAC;;IAED;IACA,IAAIH,UAAU,CAACO,SAAS,CAAC,CAAC,EAAE;MAC1BC,OAAO,GAAGC,QAAQ,CAAC,CAAC;MACpBF,SAAS,GAAG,IAAI;IAClB;IAEA,MAAMU,gBAAgB,GAAGjB,UAAU,CAACkB,WAAW,CAAC,OAAO,EAAE,MAAM;MAC7D;MACA;MACA,IAAIX,SAAS,EAAE;QACb;MACF;MAEA,IAAIC,OAAO,KAAKN,SAAS,EAAE;QACzBM,OAAO,CAAC,CAAC;MACX;MAEAA,OAAO,GAAGC,QAAQ,CAAC,CAAC;MACpBF,SAAS,GAAG,IAAI;IAClB,CAAC,CAAC;IAEF,MAAMY,eAAe,GAAGnB,UAAU,CAACkB,WAAW,CAAC,MAAM,EAAE,MAAM;MAC3D,IAAIV,OAAO,KAAKN,SAAS,EAAE;QACzBM,OAAO,CAAC,CAAC;MACX;MAEAA,OAAO,GAAGN,SAAS;MACnBK,SAAS,GAAG,KAAK;IACnB,CAAC,CAAC;IAEF,OAAO,MAAM;MACX,IAAIC,OAAO,KAAKN,SAAS,EAAE;QACzBM,OAAO,CAAC,CAAC;MACX;MAEAS,gBAAgB,CAAC,CAAC;MAClBE,eAAe,CAAC,CAAC;IACnB,CAAC;EACH,CAAC,EAAE,CAACpB,MAAM,EAAEC,UAAU,CAAC,CAAC;AAC1B","ignoreList":[]}
+{"version":3,"names":["React","IsFocusedGetterContext","useNavigation","useFocusEffect","effect","navigation","getIsFocused","use","arguments","undefined","message","console","error","useEffect","isFocused","cleanup","callback","destroy","process","env","NODE_ENV","then","JSON","stringify","unsubscribeFocus","addListener","unsubscribeBlur"],"sourceRoot":"../../src","sources":["useFocusEffect.tsx"],"mappings":";;AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAE9B,SAASC,sBAAsB,QAAQ,mBAAgB;AACvD,SAASC,aAAa,QAAQ,oBAAiB;AAI/C;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,cAAcA,CAACC,MAAsB,EAAE;EACrD,MAAMC,UAAU,GAAGH,aAAa,CAAC,CAAC;EAElC,MAAMI,YAAY,GAAGN,KAAK,CAACO,GAAG,CAACN,sBAAsB,CAAC;;EAEtD;EACA,IAAIO,SAAS,CAAC,CAAC,CAAC,KAAKC,SAAS,EAAE;IAC9B,MAAMC,OAAO,GACX,sFAAsF,GACtF,8EAA8E,GAC9E,mBAAmB,GACnB,+BAA+B,GAC/B,yBAAyB,GACzB,sBAAsB,GACtB,QAAQ,GACR,oEAAoE;IAEtEC,OAAO,CAACC,KAAK,CAACF,OAAO,CAAC;EACxB;EAEAV,KAAK,CAACa,SAAS,CAAC,MAAM;IACpB,IAAIC,SAAS,GAAG,KAAK;IACrB,IAAIC,OAAwC;IAE5C,MAAMC,QAAQ,GAAGA,CAAA,KAAM;MACrB,MAAMC,OAAO,GAAGb,MAAM,CAAC,CAAC;MAExB,IAAIa,OAAO,KAAKR,SAAS,IAAI,OAAOQ,OAAO,KAAK,UAAU,EAAE;QAC1D,OAAOA,OAAO;MAChB;MAEA,IAAIC,OAAO,CAACC,GAAG,CAACC,QAAQ,KAAK,YAAY,EAAE;QACzC,IAAIV,OAAO,GACT,6FAA6F;QAE/F,IAAIO,OAAO,KAAK,IAAI,EAAE;UACpBP,OAAO,IACL,kGAAkG;QACtG,CAAC,MAAM,IAAI,OAAQO,OAAO,CAASI,IAAI,KAAK,UAAU,EAAE;UACtDX,OAAO,IACL,uFAAuF,GACvF,uDAAuD,GACvD,8BAA8B,GAC9B,mBAAmB,GACnB,+BAA+B,GAC/B,oCAAoC,GACpC,+BAA+B,GAC/B,uDAAuD,GACvD,gBAAgB,GAChB,WAAW,GACX,oBAAoB,GACpB,kBAAkB,GAClB,QAAQ,GACR,oEAAoE;QACxE,CAAC,MAAM;UACLA,OAAO,IAAI,kBAAkBY,IAAI,CAACC,SAAS,CAACN,OAAO,CAAC,IAAI;QAC1D;QAEAN,OAAO,CAACC,KAAK,CAACF,OAAO,CAAC;MACxB;IACF,CAAC;;IAED;IACA,IAAIJ,YAAY,GAAG,CAAC,IAAI,IAAI,EAAE;MAC5BS,OAAO,GAAGC,QAAQ,CAAC,CAAC;MACpBF,SAAS,GAAG,IAAI;IAClB;IAEA,MAAMU,gBAAgB,GAAGnB,UAAU,CAACoB,WAAW,CAAC,OAAO,EAAE,MAAM;MAC7D;MACA;MACA,IAAIX,SAAS,EAAE;QACb;MACF;MAEA,IAAIC,OAAO,KAAKN,SAAS,EAAE;QACzBM,OAAO,CAAC,CAAC;MACX;MAEAA,OAAO,GAAGC,QAAQ,CAAC,CAAC;MACpBF,SAAS,GAAG,IAAI;IAClB,CAAC,CAAC;IAEF,MAAMY,eAAe,GAAGrB,UAAU,CAACoB,WAAW,CAAC,MAAM,EAAE,MAAM;MAC3D,IAAIV,OAAO,KAAKN,SAAS,EAAE;QACzBM,OAAO,CAAC,CAAC;MACX;MAEAA,OAAO,GAAGN,SAAS;MACnBK,SAAS,GAAG,KAAK;IACnB,CAAC,CAAC;IAEF,OAAO,MAAM;MACX,IAAIC,OAAO,KAAKN,SAAS,EAAE;QACzBM,OAAO,CAAC,CAAC;MACX;MAEAS,gBAAgB,CAAC,CAAC;MAClBE,eAAe,CAAC,CAAC;IACnB,CAAC;EACH,CAAC,EAAE,CAACtB,MAAM,EAAEC,UAAU,EAAEC,YAAY,CAAC,CAAC;AACxC","ignoreList":[]}

package/lib/module/useFocusEvents.js

@@ -2,6 +2,7 @@
 
 import * as React from 'react';
 import { NavigationContext } from "./NavigationProvider.js";
+import { IsFocusedGetterContext } from "./useIsFocused.js";
 /**
  * Hook to take care of emitting `focus` and `blur` events.
  */
@@ -9,9 +10,14 @@ export function useFocusEvents({
   state,
   emitter
 }) {
-  const navigation = React.useContext(NavigationContext);
+  const navigation = React.use(NavigationContext);
+  const getIsFocused = React.use(IsFocusedGetterContext);
   const lastFocusedKeyRef = React.useRef(undefined);
-  const currentFocusedKey = state.routes[state.index].key;
+  const currentFocusedRoute = state.routes[state.index];
+  if (currentFocusedRoute == null) {
+    throw new Error(`Couldn't find a route at index ${state.index}.`);
+  }
+  const currentFocusedKey = currentFocusedRoute.key;
 
   // When the parent screen changes its focus state, we also need to change child's focus
   // Coz the child screen can't be focused if the parent screen is out of focus
@@ -31,7 +37,11 @@ export function useFocusEvents({
   }), [currentFocusedKey, emitter, navigation]);
   React.useEffect(() => {
     const lastFocusedKey = lastFocusedKeyRef.current;
-    lastFocusedKeyRef.current = currentFocusedKey;
+    const isFocused = getIsFocused?.() ?? true;
+    if (isFocused) {
+      // Remember the current route as focused if the navigator is focused
+      lastFocusedKeyRef.current = currentFocusedKey;
+    }
 
     // We wouldn't have `lastFocusedKey` on initial mount
     // Fire focus event for the current route on mount if there's no parent navigator
@@ -44,7 +54,7 @@ export function useFocusEvents({
 
     // We should only emit events when the focused key changed and navigator is focused
     // When navigator is not focused, screens inside shouldn't receive focused status either
-    if (lastFocusedKey === currentFocusedKey || !(navigation ? navigation.isFocused() : true)) {
+    if (lastFocusedKey === currentFocusedKey || !isFocused) {
       return;
     }
     if (lastFocusedKey === undefined) {
@@ -59,6 +69,6 @@ export function useFocusEvents({
       type: 'focus',
       target: currentFocusedKey
     });
-  }, [currentFocusedKey, emitter, navigation]);
+  }, [currentFocusedKey, emitter, navigation, getIsFocused]);
 }
 //# sourceMappingURL=useFocusEvents.js.map

package/lib/module/useFocusEvents.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","NavigationContext","useFocusEvents","state","emitter","navigation","useContext","lastFocusedKeyRef","useRef","undefined","currentFocusedKey","routes","index","key","useEffect","addListener","current","emit","type","target","lastFocusedKey","isFocused"],"sourceRoot":"../../src","sources":["useFocusEvents.tsx"],"mappings":";;AACA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAE9B,SAASC,iBAAiB,QAAQ,yBAAsB;AASxD;AACA;AACA;AACA,OAAO,SAASC,cAAcA,CAAgC;EAC5DC,KAAK;EACLC;AACc,CAAC,EAAE;EACjB,MAAMC,UAAU,GAAGL,KAAK,CAACM,UAAU,CAACL,iBAAiB,CAAC;EACtD,MAAMM,iBAAiB,GAAGP,KAAK,CAACQ,MAAM,CAAqBC,SAAS,CAAC;EAErE,MAAMC,iBAAiB,GAAGP,KAAK,CAACQ,MAAM,CAACR,KAAK,CAACS,KAAK,CAAC,CAACC,GAAG;;EAEvD;EACA;EACAb,KAAK,CAACc,SAAS,CACb,MACET,UAAU,EAAEU,WAAW,CAAC,OAAO,EAAE,MAAM;IACrCR,iBAAiB,CAACS,OAAO,GAAGN,iBAAiB;IAC7CN,OAAO,CAACa,IAAI,CAAC;MAAEC,IAAI,EAAE,OAAO;MAAEC,MAAM,EAAET;IAAkB,CAAC,CAAC;EAC5D,CAAC,CAAC,EACJ,CAACA,iBAAiB,EAAEN,OAAO,EAAEC,UAAU,CACzC,CAAC;EAEDL,KAAK,CAACc,SAAS,CACb,MACET,UAAU,EAAEU,WAAW,CAAC,MAAM,EAAE,MAAM;IACpCR,iBAAiB,CAACS,OAAO,GAAGP,SAAS;IACrCL,OAAO,CAACa,IAAI,CAAC;MAAEC,IAAI,EAAE,MAAM;MAAEC,MAAM,EAAET;IAAkB,CAAC,CAAC;EAC3D,CAAC,CAAC,EACJ,CAACA,iBAAiB,EAAEN,OAAO,EAAEC,UAAU,CACzC,CAAC;EAEDL,KAAK,CAACc,SAAS,CAAC,MAAM;IACpB,MAAMM,cAAc,GAAGb,iBAAiB,CAACS,OAAO;IAEhDT,iBAAiB,CAACS,OAAO,GAAGN,iBAAiB;;IAE7C;IACA;IACA,IAAIU,cAAc,KAAKX,SAAS,IAAI,CAACJ,UAAU,EAAE;MAC/CD,OAAO,CAACa,IAAI,CAAC;QAAEC,IAAI,EAAE,OAAO;QAAEC,MAAM,EAAET;MAAkB,CAAC,CAAC;IAC5D;;IAEA;IACA;IACA,IACEU,cAAc,KAAKV,iBAAiB,IACpC,EAAEL,UAAU,GAAGA,UAAU,CAACgB,SAAS,CAAC,CAAC,GAAG,IAAI,CAAC,EAC7C;MACA;IACF;IAEA,IAAID,cAAc,KAAKX,SAAS,EAAE;MAChC;MACA;IACF;IAEAL,OAAO,CAACa,IAAI,CAAC;MAAEC,IAAI,EAAE,MAAM;MAAEC,MAAM,EAAEC;IAAe,CAAC,CAAC;IACtDhB,OAAO,CAACa,IAAI,CAAC;MAAEC,IAAI,EAAE,OAAO;MAAEC,MAAM,EAAET;IAAkB,CAAC,CAAC;EAC5D,CAAC,EAAE,CAACA,iBAAiB,EAAEN,OAAO,EAAEC,UAAU,CAAC,CAAC;AAC9C","ignoreList":[]}
+{"version":3,"names":["React","NavigationContext","IsFocusedGetterContext","useFocusEvents","state","emitter","navigation","use","getIsFocused","lastFocusedKeyRef","useRef","undefined","currentFocusedRoute","routes","index","Error","currentFocusedKey","key","useEffect","addListener","current","emit","type","target","lastFocusedKey","isFocused"],"sourceRoot":"../../src","sources":["useFocusEvents.tsx"],"mappings":";;AACA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAE9B,SAASC,iBAAiB,QAAQ,yBAAsB;AAGxD,SAASC,sBAAsB,QAAQ,mBAAgB;AAOvD;AACA;AACA;AACA,OAAO,SAASC,cAAcA,CAAgC;EAC5DC,KAAK;EACLC;AACc,CAAC,EAAE;EACjB,MAAMC,UAAU,GAAGN,KAAK,CAACO,GAAG,CAACN,iBAAiB,CAAC;EAC/C,MAAMO,YAAY,GAAGR,KAAK,CAACO,GAAG,CAACL,sBAAsB,CAAC;EAEtD,MAAMO,iBAAiB,GAAGT,KAAK,CAACU,MAAM,CAAqBC,SAAS,CAAC;EAErE,MAAMC,mBAAmB,GAAGR,KAAK,CAACS,MAAM,CAACT,KAAK,CAACU,KAAK,CAAC;EAErD,IAAIF,mBAAmB,IAAI,IAAI,EAAE;IAC/B,MAAM,IAAIG,KAAK,CAAC,kCAAkCX,KAAK,CAACU,KAAK,GAAG,CAAC;EACnE;EAEA,MAAME,iBAAiB,GAAGJ,mBAAmB,CAACK,GAAG;;EAEjD;EACA;EACAjB,KAAK,CAACkB,SAAS,CACb,MACEZ,UAAU,EAAEa,WAAW,CAAC,OAAO,EAAE,MAAM;IACrCV,iBAAiB,CAACW,OAAO,GAAGJ,iBAAiB;IAC7CX,OAAO,CAACgB,IAAI,CAAC;MAAEC,IAAI,EAAE,OAAO;MAAEC,MAAM,EAAEP;IAAkB,CAAC,CAAC;EAC5D,CAAC,CAAC,EACJ,CAACA,iBAAiB,EAAEX,OAAO,EAAEC,UAAU,CACzC,CAAC;EAEDN,KAAK,CAACkB,SAAS,CACb,MACEZ,UAAU,EAAEa,WAAW,CAAC,MAAM,EAAE,MAAM;IACpCV,iBAAiB,CAACW,OAAO,GAAGT,SAAS;IACrCN,OAAO,CAACgB,IAAI,CAAC;MAAEC,IAAI,EAAE,MAAM;MAAEC,MAAM,EAAEP;IAAkB,CAAC,CAAC;EAC3D,CAAC,CAAC,EACJ,CAACA,iBAAiB,EAAEX,OAAO,EAAEC,UAAU,CACzC,CAAC;EAEDN,KAAK,CAACkB,SAAS,CAAC,MAAM;IACpB,MAAMM,cAAc,GAAGf,iBAAiB,CAACW,OAAO;IAEhD,MAAMK,SAAS,GAAGjB,YAAY,GAAG,CAAC,IAAI,IAAI;IAE1C,IAAIiB,SAAS,EAAE;MACb;MACAhB,iBAAiB,CAACW,OAAO,GAAGJ,iBAAiB;IAC/C;;IAEA;IACA;IACA,IAAIQ,cAAc,KAAKb,SAAS,IAAI,CAACL,UAAU,EAAE;MAC/CD,OAAO,CAACgB,IAAI,CAAC;QAAEC,IAAI,EAAE,OAAO;QAAEC,MAAM,EAAEP;MAAkB,CAAC,CAAC;IAC5D;;IAEA;IACA;IACA,IAAIQ,cAAc,KAAKR,iBAAiB,IAAI,CAACS,SAAS,EAAE;MACtD;IACF;IAEA,IAAID,cAAc,KAAKb,SAAS,EAAE;MAChC;MACA;IACF;IAEAN,OAAO,CAACgB,IAAI,CAAC;MAAEC,IAAI,EAAE,MAAM;MAAEC,MAAM,EAAEC;IAAe,CAAC,CAAC;IACtDnB,OAAO,CAACgB,IAAI,CAAC;MAAEC,IAAI,EAAE,OAAO;MAAEC,MAAM,EAAEP;IAAkB,CAAC,CAAC;EAC5D,CAAC,EAAE,CAACA,iBAAiB,EAAEX,OAAO,EAAEC,UAAU,EAAEE,YAAY,CAAC,CAAC;AAC5D","ignoreList":[]}

package/lib/module/useFocusedListenersChildrenAdapter.js

@@ -1,7 +1,7 @@
 "use strict";
 
 import * as React from 'react';
-import { NavigationBuilderContext } from "./NavigationBuilderContext.js";
+import { useNavigationBuilderContext } from "./NavigationBuilderContext.js";
 /**
  * Hook for passing focus callback to children
  */
@@ -11,7 +11,7 @@ export function useFocusedListenersChildrenAdapter({
 }) {
   const {
     addListener
-  } = React.useContext(NavigationBuilderContext);
+  } = useNavigationBuilderContext();
   const listener = React.useCallback(callback => {
     if (navigation.isFocused()) {
       for (const listener of focusedListeners) {
@@ -37,6 +37,6 @@ export function useFocusedListenersChildrenAdapter({
       };
     }
   }, [focusedListeners, navigation]);
-  React.useEffect(() => addListener?.('focus', listener), [addListener, listener]);
+  React.useInsertionEffect(() => addListener?.('focus', listener), [addListener, listener]);
 }
 //# sourceMappingURL=useFocusedListenersChildrenAdapter.js.map

package/lib/module/useFocusedListenersChildrenAdapter.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","NavigationBuilderContext","useFocusedListenersChildrenAdapter","navigation","focusedListeners","addListener","useContext","listener","useCallback","callback","isFocused","handled","result","useEffect"],"sourceRoot":"../../src","sources":["useFocusedListenersChildrenAdapter.tsx"],"mappings":";;AACA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAE9B,SAGEC,wBAAwB,QACnB,+BAA4B;AAQnC;AACA;AACA;AACA,OAAO,SAASC,kCAAkCA,CAAC;EACjDC,UAAU;EACVC;AACO,CAAC,EAAE;EACV,MAAM;IAAEC;EAAY,CAAC,GAAGL,KAAK,CAACM,UAAU,CAACL,wBAAwB,CAAC;EAElE,MAAMM,QAAQ,GAAGP,KAAK,CAACQ,WAAW,CAC/BC,QAAwC,IAAK;IAC5C,IAAIN,UAAU,CAACO,SAAS,CAAC,CAAC,EAAE;MAC1B,KAAK,MAAMH,QAAQ,IAAIH,gBAAgB,EAAE;QACvC,MAAM;UAAEO,OAAO;UAAEC;QAAO,CAAC,GAAGL,QAAQ,CAACE,QAAQ,CAAC;QAE9C,IAAIE,OAAO,EAAE;UACX,OAAO;YAAEA,OAAO;YAAEC;UAAO,CAAC;QAC5B;MACF;MAEA,OAAO;QAAED,OAAO,EAAE,IAAI;QAAEC,MAAM,EAAEH,QAAQ,CAACN,UAAU;MAAE,CAAC;IACxD,CAAC,MAAM;MACL,OAAO;QAAEQ,OAAO,EAAE,KAAK;QAAEC,MAAM,EAAE;MAAK,CAAC;IACzC;EACF,CAAC,EACD,CAACR,gBAAgB,EAAED,UAAU,CAC/B,CAAC;EAEDH,KAAK,CAACa,SAAS,CACb,MAAMR,WAAW,GAAG,OAAO,EAAEE,QAAQ,CAAC,EACtC,CAACF,WAAW,EAAEE,QAAQ,CACxB,CAAC;AACH","ignoreList":[]}
+{"version":3,"names":["React","useNavigationBuilderContext","useFocusedListenersChildrenAdapter","navigation","focusedListeners","addListener","listener","useCallback","callback","isFocused","handled","result","useInsertionEffect"],"sourceRoot":"../../src","sources":["useFocusedListenersChildrenAdapter.tsx"],"mappings":";;AACA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAE9B,SAGEC,2BAA2B,QACtB,+BAA4B;AAQnC;AACA;AACA;AACA,OAAO,SAASC,kCAAkCA,CAAC;EACjDC,UAAU;EACVC;AACO,CAAC,EAAE;EACV,MAAM;IAAEC;EAAY,CAAC,GAAGJ,2BAA2B,CAAC,CAAC;EAErD,MAAMK,QAAQ,GAAGN,KAAK,CAACO,WAAW,CAC/BC,QAAwC,IAAK;IAC5C,IAAIL,UAAU,CAACM,SAAS,CAAC,CAAC,EAAE;MAC1B,KAAK,MAAMH,QAAQ,IAAIF,gBAAgB,EAAE;QACvC,MAAM;UAAEM,OAAO;UAAEC;QAAO,CAAC,GAAGL,QAAQ,CAACE,QAAQ,CAAC;QAE9C,IAAIE,OAAO,EAAE;UACX,OAAO;YAAEA,OAAO;YAAEC;UAAO,CAAC;QAC5B;MACF;MAEA,OAAO;QAAED,OAAO,EAAE,IAAI;QAAEC,MAAM,EAAEH,QAAQ,CAACL,UAAU;MAAE,CAAC;IACxD,CAAC,MAAM;MACL,OAAO;QAAEO,OAAO,EAAE,KAAK;QAAEC,MAAM,EAAE;MAAK,CAAC;IACzC;EACF,CAAC,EACD,CAACP,gBAAgB,EAAED,UAAU,CAC/B,CAAC;EAEDH,KAAK,CAACY,kBAAkB,CACtB,MAAMP,WAAW,GAAG,OAAO,EAAEC,QAAQ,CAAC,EACtC,CAACD,WAAW,EAAEC,QAAQ,CACxB,CAAC;AACH","ignoreList":[]}

package/lib/module/useIsFocused.js

@@ -1,23 +1,19 @@
 "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);
+export const IsFocusedGetterContext = /*#__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","IsFocusedGetterContext","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,OAAO,MAAME,sBAAsB,gBAAGL,KAAK,CAACE,aAAa,CAEvDC,SAAS,CAAC;;AAEZ;AACA;AACA;AACA;AACA,OAAO,SAASG,YAAYA,CAAA,EAAY;EACtC,MAAMC,SAAS,GAAGP,KAAK,CAACQ,GAAG,CAACJ,gBAAgB,CAAC;EAE7C,IAAIG,SAAS,KAAKJ,SAAS,EAAE;IAC3B,MAAM,IAAIM,KAAK,CACb,mFACF,CAAC;EACH;EAEA,OAAOF,SAAS;AAClB","ignoreList":[]}

package/lib/module/useKeyedChildListeners.js

@@ -9,14 +9,17 @@ export function useKeyedChildListeners() {
     current: keyedListeners
   } = React.useRef(Object.assign(Object.create(null), {
     getState: {},
+    getNavigation: {},
     beforeRemove: {}
   }));
   const addKeyedListener = React.useCallback((type, key, listener) => {
     // @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","getNavigation","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,aAAa,EAAE,CAAC,CAAC;IACjBC,YAAY,EAAE,CAAC;EACjB,CAAC,CACH,CAAC;EAED,MAAMC,gBAAgB,GAAGX,KAAK,CAACY,WAAW,CACxC,CACEC,IAAO,EACPC,GAAW,EACXC,QAA6B,KAC1B;IACH;IACAZ,cAAc,CAACU,IAAI,CAAC,CAACC,GAAG,CAAC,GAAGC,QAAQ;IAEpC,OAAO,MAAM;MACX,IAAIZ,cAAc,CAACU,IAAI,CAAC,CAACC,GAAG,CAAC,KAAKC,QAAQ,EAAE;QAC1C;QACAZ,cAAc,CAACU,IAAI,CAAC,CAACC,GAAG,CAAC,GAAGE,SAAS;MACvC;IACF,CAAC;EACH,CAAC,EACD,CAACb,cAAc,CACjB,CAAC;EAED,OAAO;IACLA,cAAc;IACdQ;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

@@ -1,8 +1,8 @@
 "use strict";
 
 import * as React from 'react';
-import { NavigationContainerRefContext } from "./NavigationContainerRefContext.js";
-import { NavigationContext, NavigationRouteNameContext } from "./NavigationProvider.js";
+import { NavigationContext } from "./NavigationProvider.js";
+import { NavigationRootContext } from "./NavigationRootContext.js";
 
 /**
  * Hook to access the navigation prop of the parent screen anywhere.
@@ -14,7 +14,7 @@ import { NavigationContext, NavigationRouteNameContext } from "./NavigationProvi
  */
 
 export function useNavigation(name) {
-  const root = React.use(NavigationContainerRefContext);
+  const root = React.use(NavigationRootContext);
   const navigation = React.use(NavigationContext);
   if (name === undefined) {
     if (navigation === undefined && root === undefined) {
@@ -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","NavigationContext","NavigationRootContext","useNavigation","name","root","use","navigation","undefined","Error","parent","getParent"],"sourceRoot":"../../src","sources":["useNavigation.tsx"],"mappings":";;AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAE9B,SAASC,iBAAiB,QAAQ,yBAAsB;AACxD,SAASC,qBAAqB,QAAQ,4BAAyB;;AAW/D;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAUA,OAAO,SAASC,aAAaA,CAACC,IAAa,EAAW;EACpD,MAAMC,IAAI,GAAGL,KAAK,CAACM,GAAG,CAACJ,qBAAqB,CAAC;EAC7C,MAAMK,UAAU,GAAGP,KAAK,CAACM,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,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":[]}