@react-navigation/native 7.1.1 → 7.1.3

package/lib/commonjs/useLinkBuilder.js

@@ -15,6 +15,8 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
  * @returns `buildHref` to build an `href` for screen and `buildAction` to build an action from an `href`.
  */
 function useLinkBuilder() {
+  const navigation = React.useContext(_core.NavigationHelpersContext);
+  const route = React.useContext(_core.NavigationRouteContext);
   const {
     options
   } = React.useContext(_LinkingContext.LinkingContext);
@@ -23,27 +25,52 @@ function useLinkBuilder() {
   const getStateFromPathHelper = options?.getStateFromPath ?? _core.getStateFromPath;
   const getActionFromStateHelper = options?.getActionFromState ?? _core.getActionFromState;
   const buildHref = React.useCallback((name, params) => {
-    const addStateToInnermostRoute = state => {
+    if (options?.enabled === false) {
+      return undefined;
+    }
+
+    // Check that we're inside:
+    // - navigator's context
+    // - route context of the navigator (could be a screen, tab, etc.)
+    // - route matches the state for path (from the screen's context)
+    // This ensures that we're inside a screen
+    const isScreen = navigation && route?.key && focusedRouteState ? route.key === (0, _core.findFocusedRoute)(focusedRouteState)?.key && navigation.getState().routes.some(r => r.key === route.key) : false;
+    const stateForRoute = {
+      routes: [{
+        name,
+        params
+      }]
+    };
+    const constructState = state => {
       if (state) {
         const route = state.routes[0];
+
+        // If we're inside a screen and at the innermost route
+        // We need to replace the state with the provided one
+        // This assumes that we're navigating to a sibling route
+        if (isScreen && !route.state) {
+          return stateForRoute;
+        }
+
+        // Otherwise, dive into the nested state of the route
         return {
           routes: [{
             ...route,
-            state: addStateToInnermostRoute(route.state)
+            state: constructState(route.state)
           }]
         };
       }
-      return {
-        routes: [{
-          name,
-          params
-        }]
-      };
+
+      // Once there is no more nested state, we're at the innermost route
+      // We can add a state based on provided parameters
+      // This assumes that we're navigating to a child of this route
+      // In this case, the helper is used in a navigator for its routes
+      return stateForRoute;
     };
-    const state = addStateToInnermostRoute(focusedRouteState);
+    const state = constructState(focusedRouteState);
     const path = getPathFromStateHelper(state, options?.config);
     return path;
-  }, [options?.config, getPathFromStateHelper, focusedRouteState]);
+  }, [options?.enabled, options?.config, route?.key, navigation, focusedRouteState, getPathFromStateHelper]);
   const buildAction = React.useCallback(href => {
     if (!href.startsWith('/')) {
       throw new Error(`The href must start with '/' (${href}).`);

package/lib/commonjs/useLinkBuilder.js.map

@@ -1 +1 @@
-{"version":3,"names":["_core","require","React","_interopRequireWildcard","_LinkingContext","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","useLinkBuilder","options","useContext","LinkingContext","focusedRouteState","useStateForPath","getPathFromStateHelper","getPathFromState","getStateFromPathHelper","getStateFromPath","getActionFromStateHelper","getActionFromState","buildHref","useCallback","name","params","addStateToInnermostRoute","state","route","routes","path","config","buildAction","href","startsWith","Error","action","CommonActions","reset"],"sourceRoot":"../../src","sources":["useLinkBuilder.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_core","require","React","_interopRequireWildcard","_LinkingContext","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","useLinkBuilder","navigation","useContext","NavigationHelpersContext","route","NavigationRouteContext","options","LinkingContext","focusedRouteState","useStateForPath","getPathFromStateHelper","getPathFromState","getStateFromPathHelper","getStateFromPath","getActionFromStateHelper","getActionFromState","buildHref","useCallback","name","params","enabled","undefined","isScreen","key","findFocusedRoute","getState","routes","some","stateForRoute","constructState","state","path","config","buildAction","href","startsWith","Error","action","CommonActions","reset"],"sourceRoot":"../../src","sources":["useLinkBuilder.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/useRoutePath.js

@@ -24,9 +24,12 @@ function useRoutePath() {
   }
   const getPathFromStateHelper = options?.getPathFromState ?? _core.getPathFromState;
   const path = React.useMemo(() => {
+    if (options?.enabled === false) {
+      return undefined;
+    }
     const path = getPathFromStateHelper(state, options?.config);
     return path;
-  }, [state, options?.config, getPathFromStateHelper]);
+  }, [options?.enabled, options?.config, state, getPathFromStateHelper]);
   return path;
 }
 //# sourceMappingURL=useRoutePath.js.map

package/lib/commonjs/useRoutePath.js.map

@@ -1 +1 @@
-{"version":3,"names":["_core","require","React","_interopRequireWildcard","_LinkingContext","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","useRoutePath","options","useContext","LinkingContext","state","useStateForPath","undefined","Error","getPathFromStateHelper","getPathFromState","path","useMemo","config"],"sourceRoot":"../../src","sources":["useRoutePath.tsx"],"mappings":";;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,KAAA,GAAAC,uBAAA,CAAAF,OAAA;AAEA,IAAAG,eAAA,GAAAH,OAAA;AAAkD,SAAAI,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAH,wBAAAG,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,OAAAC,cAAA,CAAAC,IAAA,CAAAhB,CAAA,EAAAc,CAAA,SAAAG,CAAA,GAAAP,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAG,CAAA,KAAAA,CAAA,CAAAV,GAAA,IAAAU,CAAA,CAAAC,GAAA,IAAAP,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAG,CAAA,IAAAT,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAe,GAAA,CAAAlB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAElD;AACA;AACA;AACA;AACA;AACO,SAASW,YAAYA,CAAA,EAAG;EAC7B,MAAM;IAAEC;EAAQ,CAAC,GAAGxB,KAAK,CAACyB,UAAU,CAACC,8BAAc,CAAC;EACpD,MAAMC,KAAK,GAAG,IAAAC,qBAAe,EAAC,CAAC;EAE/B,IAAID,KAAK,KAAKE,SAAS,EAAE;IACvB,MAAM,IAAIC,KAAK,CACb,+FACF,CAAC;EACH;EAEA,MAAMC,sBAAsB,GAAGP,OAAO,EAAEQ,gBAAgB,IAAIA,sBAAgB;EAE5E,MAAMC,IAAI,GAAGjC,KAAK,CAACkC,OAAO,CAAC,MAAM;IAC/B,MAAMD,IAAI,GAAGF,sBAAsB,CAACJ,KAAK,EAAEH,OAAO,EAAEW,MAAM,CAAC;IAE3D,OAAOF,IAAI;EACb,CAAC,EAAE,CAACN,KAAK,EAAEH,OAAO,EAAEW,MAAM,EAAEJ,sBAAsB,CAAC,CAAC;EAEpD,OAAOE,IAAI;AACb","ignoreList":[]}
+{"version":3,"names":["_core","require","React","_interopRequireWildcard","_LinkingContext","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","useRoutePath","options","useContext","LinkingContext","state","useStateForPath","undefined","Error","getPathFromStateHelper","getPathFromState","path","useMemo","enabled","config"],"sourceRoot":"../../src","sources":["useRoutePath.tsx"],"mappings":";;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,KAAA,GAAAC,uBAAA,CAAAF,OAAA;AAEA,IAAAG,eAAA,GAAAH,OAAA;AAAkD,SAAAI,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAH,wBAAAG,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,OAAAC,cAAA,CAAAC,IAAA,CAAAhB,CAAA,EAAAc,CAAA,SAAAG,CAAA,GAAAP,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAG,CAAA,KAAAA,CAAA,CAAAV,GAAA,IAAAU,CAAA,CAAAC,GAAA,IAAAP,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAG,CAAA,IAAAT,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAe,GAAA,CAAAlB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAElD;AACA;AACA;AACA;AACA;AACO,SAASW,YAAYA,CAAA,EAAG;EAC7B,MAAM;IAAEC;EAAQ,CAAC,GAAGxB,KAAK,CAACyB,UAAU,CAACC,8BAAc,CAAC;EACpD,MAAMC,KAAK,GAAG,IAAAC,qBAAe,EAAC,CAAC;EAE/B,IAAID,KAAK,KAAKE,SAAS,EAAE;IACvB,MAAM,IAAIC,KAAK,CACb,+FACF,CAAC;EACH;EAEA,MAAMC,sBAAsB,GAAGP,OAAO,EAAEQ,gBAAgB,IAAIA,sBAAgB;EAE5E,MAAMC,IAAI,GAAGjC,KAAK,CAACkC,OAAO,CAAC,MAAM;IAC/B,IAAIV,OAAO,EAAEW,OAAO,KAAK,KAAK,EAAE;MAC9B,OAAON,SAAS;IAClB;IAEA,MAAMI,IAAI,GAAGF,sBAAsB,CAACJ,KAAK,EAAEH,OAAO,EAAEY,MAAM,CAAC;IAE3D,OAAOH,IAAI;EACb,CAAC,EAAE,CAACT,OAAO,EAAEW,OAAO,EAAEX,OAAO,EAAEY,MAAM,EAAET,KAAK,EAAEI,sBAAsB,CAAC,CAAC;EAEtE,OAAOE,IAAI;AACb","ignoreList":[]}

package/lib/module/useLinkBuilder.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { CommonActions, getActionFromState, getPathFromState, getStateFromPath, useStateForPath } from '@react-navigation/core';
+import { CommonActions, findFocusedRoute, getActionFromState, getPathFromState, getStateFromPath, NavigationHelpersContext, NavigationRouteContext, useStateForPath } from '@react-navigation/core';
 import * as React from 'react';
 import { LinkingContext } from "./LinkingContext.js";
 /**
@@ -9,6 +9,8 @@ import { LinkingContext } from "./LinkingContext.js";
  * @returns `buildHref` to build an `href` for screen and `buildAction` to build an action from an `href`.
  */
 export function useLinkBuilder() {
+  const navigation = React.useContext(NavigationHelpersContext);
+  const route = React.useContext(NavigationRouteContext);
   const {
     options
   } = React.useContext(LinkingContext);
@@ -17,27 +19,52 @@ export function useLinkBuilder() {
   const getStateFromPathHelper = options?.getStateFromPath ?? getStateFromPath;
   const getActionFromStateHelper = options?.getActionFromState ?? getActionFromState;
   const buildHref = React.useCallback((name, params) => {
-    const addStateToInnermostRoute = state => {
+    if (options?.enabled === false) {
+      return undefined;
+    }
+
+    // Check that we're inside:
+    // - navigator's context
+    // - route context of the navigator (could be a screen, tab, etc.)
+    // - route matches the state for path (from the screen's context)
+    // This ensures that we're inside a screen
+    const isScreen = navigation && route?.key && focusedRouteState ? route.key === findFocusedRoute(focusedRouteState)?.key && navigation.getState().routes.some(r => r.key === route.key) : false;
+    const stateForRoute = {
+      routes: [{
+        name,
+        params
+      }]
+    };
+    const constructState = state => {
       if (state) {
         const route = state.routes[0];
+
+        // If we're inside a screen and at the innermost route
+        // We need to replace the state with the provided one
+        // This assumes that we're navigating to a sibling route
+        if (isScreen && !route.state) {
+          return stateForRoute;
+        }
+
+        // Otherwise, dive into the nested state of the route
         return {
           routes: [{
             ...route,
-            state: addStateToInnermostRoute(route.state)
+            state: constructState(route.state)
           }]
         };
       }
-      return {
-        routes: [{
-          name,
-          params
-        }]
-      };
+
+      // Once there is no more nested state, we're at the innermost route
+      // We can add a state based on provided parameters
+      // This assumes that we're navigating to a child of this route
+      // In this case, the helper is used in a navigator for its routes
+      return stateForRoute;
     };
-    const state = addStateToInnermostRoute(focusedRouteState);
+    const state = constructState(focusedRouteState);
     const path = getPathFromStateHelper(state, options?.config);
     return path;
-  }, [options?.config, getPathFromStateHelper, focusedRouteState]);
+  }, [options?.enabled, options?.config, route?.key, navigation, focusedRouteState, getPathFromStateHelper]);
   const buildAction = React.useCallback(href => {
     if (!href.startsWith('/')) {
       throw new Error(`The href must start with '/' (${href}).`);

package/lib/module/useLinkBuilder.js.map

@@ -1 +1 @@
-{"version":3,"names":["CommonActions","getActionFromState","getPathFromState","getStateFromPath","useStateForPath","React","LinkingContext","useLinkBuilder","options","useContext","focusedRouteState","getPathFromStateHelper","getStateFromPathHelper","getActionFromStateHelper","buildHref","useCallback","name","params","addStateToInnermostRoute","state","route","routes","path","config","buildAction","href","startsWith","Error","action","reset"],"sourceRoot":"../../src","sources":["useLinkBuilder.tsx"],"mappings":";;AAAA,SACEA,aAAa,EACbC,kBAAkB,EAClBC,gBAAgB,EAChBC,gBAAgB,EAChBC,eAAe,QACV,wBAAwB;AAC/B,OAAO,KAAKC,KAAK,MAAM,OAAO;AAE9B,SAASC,cAAc,QAAQ,qBAAkB;AAMjD;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,cAAcA,CAAA,EAAG;EAC/B,MAAM;IAAEC;EAAQ,CAAC,GAAGH,KAAK,CAACI,UAAU,CAACH,cAAc,CAAC;EAEpD,MAAMI,iBAAiB,GAAGN,eAAe,CAAC,CAAC;EAE3C,MAAMO,sBAAsB,GAAGH,OAAO,EAAEN,gBAAgB,IAAIA,gBAAgB;EAC5E,MAAMU,sBAAsB,GAAGJ,OAAO,EAAEL,gBAAgB,IAAIA,gBAAgB;EAC5E,MAAMU,wBAAwB,GAC5BL,OAAO,EAAEP,kBAAkB,IAAIA,kBAAkB;EAEnD,MAAMa,SAAS,GAAGT,KAAK,CAACU,WAAW,CACjC,CAACC,IAAY,EAAEC,MAAe,KAAK;IACjC,MAAMC,wBAAwB,GAC5BC,KAA+B,IACd;MACjB,IAAIA,KAAK,EAAE;QACT,MAAMC,KAAK,GAAGD,KAAK,CAACE,MAAM,CAAC,CAAC,CAAC;QAE7B,OAAO;UACLA,MAAM,EAAE,CACN;YACE,GAAGD,KAAK;YACRD,KAAK,EAAED,wBAAwB,CAACE,KAAK,CAACD,KAAK;UAC7C,CAAC;QAEL,CAAC;MACH;MAEA,OAAO;QACLE,MAAM,EAAE,CAAC;UAAEL,IAAI;UAAEC;QAAO,CAAC;MAC3B,CAAC;IACH,CAAC;IAED,MAAME,KAAK,GAAGD,wBAAwB,CAACR,iBAAiB,CAAC;IACzD,MAAMY,IAAI,GAAGX,sBAAsB,CAACQ,KAAK,EAAEX,OAAO,EAAEe,MAAM,CAAC;IAE3D,OAAOD,IAAI;EACb,CAAC,EACD,CAACd,OAAO,EAAEe,MAAM,EAAEZ,sBAAsB,EAAED,iBAAiB,CAC7D,CAAC;EAED,MAAMc,WAAW,GAAGnB,KAAK,CAACU,WAAW,CAClCU,IAAY,IAAK;IAChB,IAAI,CAACA,IAAI,CAACC,UAAU,CAAC,GAAG,CAAC,EAAE;MACzB,MAAM,IAAIC,KAAK,CAAC,iCAAiCF,IAAI,IAAI,CAAC;IAC5D;IAEA,MAAMN,KAAK,GAAGP,sBAAsB,CAACa,IAAI,EAAEjB,OAAO,EAAEe,MAAM,CAAC;IAE3D,IAAIJ,KAAK,EAAE;MACT,MAAMS,MAAM,GAAGf,wBAAwB,CAACM,KAAK,EAAEX,OAAO,EAAEe,MAAM,CAAC;MAE/D,OAAOK,MAAM,IAAI5B,aAAa,CAAC6B,KAAK,CAACV,KAAK,CAAC;IAC7C,CAAC,MAAM;MACL,MAAM,IAAIQ,KAAK,CAAC,iDAAiD,CAAC;IACpE;EACF,CAAC,EACD,CAACnB,OAAO,EAAEe,MAAM,EAAEX,sBAAsB,EAAEC,wBAAwB,CACpE,CAAC;EAED,OAAO;IACLC,SAAS;IACTU;EACF,CAAC;AACH","ignoreList":[]}
+{"version":3,"names":["CommonActions","findFocusedRoute","getActionFromState","getPathFromState","getStateFromPath","NavigationHelpersContext","NavigationRouteContext","useStateForPath","React","LinkingContext","useLinkBuilder","navigation","useContext","route","options","focusedRouteState","getPathFromStateHelper","getStateFromPathHelper","getActionFromStateHelper","buildHref","useCallback","name","params","enabled","undefined","isScreen","key","getState","routes","some","r","stateForRoute","constructState","state","path","config","buildAction","href","startsWith","Error","action","reset"],"sourceRoot":"../../src","sources":["useLinkBuilder.tsx"],"mappings":";;AAAA,SACEA,aAAa,EACbC,gBAAgB,EAChBC,kBAAkB,EAClBC,gBAAgB,EAChBC,gBAAgB,EAChBC,wBAAwB,EACxBC,sBAAsB,EACtBC,eAAe,QACV,wBAAwB;AAC/B,OAAO,KAAKC,KAAK,MAAM,OAAO;AAE9B,SAASC,cAAc,QAAQ,qBAAkB;AAMjD;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,cAAcA,CAAA,EAAG;EAC/B,MAAMC,UAAU,GAAGH,KAAK,CAACI,UAAU,CAACP,wBAAwB,CAAC;EAC7D,MAAMQ,KAAK,GAAGL,KAAK,CAACI,UAAU,CAACN,sBAAsB,CAAC;EAEtD,MAAM;IAAEQ;EAAQ,CAAC,GAAGN,KAAK,CAACI,UAAU,CAACH,cAAc,CAAC;EAEpD,MAAMM,iBAAiB,GAAGR,eAAe,CAAC,CAAC;EAE3C,MAAMS,sBAAsB,GAAGF,OAAO,EAAEX,gBAAgB,IAAIA,gBAAgB;EAC5E,MAAMc,sBAAsB,GAAGH,OAAO,EAAEV,gBAAgB,IAAIA,gBAAgB;EAC5E,MAAMc,wBAAwB,GAC5BJ,OAAO,EAAEZ,kBAAkB,IAAIA,kBAAkB;EAEnD,MAAMiB,SAAS,GAAGX,KAAK,CAACY,WAAW,CACjC,CAACC,IAAY,EAAEC,MAAe,KAAK;IACjC,IAAIR,OAAO,EAAES,OAAO,KAAK,KAAK,EAAE;MAC9B,OAAOC,SAAS;IAClB;;IAEA;IACA;IACA;IACA;IACA;IACA,MAAMC,QAAQ,GACZd,UAAU,IAAIE,KAAK,EAAEa,GAAG,IAAIX,iBAAiB,GACzCF,KAAK,CAACa,GAAG,KAAKzB,gBAAgB,CAACc,iBAAiB,CAAC,EAAEW,GAAG,IACtDf,UAAU,CAACgB,QAAQ,CAAC,CAAC,CAACC,MAAM,CAACC,IAAI,CAAEC,CAAC,IAAKA,CAAC,CAACJ,GAAG,KAAKb,KAAK,CAACa,GAAG,CAAC,GAC7D,KAAK;IAEX,MAAMK,aAA2B,GAAG;MAClCH,MAAM,EAAE,CAAC;QAAEP,IAAI;QAAEC;MAAO,CAAC;IAC3B,CAAC;IAED,MAAMU,cAAc,GAClBC,KAA+B,IACd;MACjB,IAAIA,KAAK,EAAE;QACT,MAAMpB,KAAK,GAAGoB,KAAK,CAACL,MAAM,CAAC,CAAC,CAAC;;QAE7B;QACA;QACA;QACA,IAAIH,QAAQ,IAAI,CAACZ,KAAK,CAACoB,KAAK,EAAE;UAC5B,OAAOF,aAAa;QACtB;;QAEA;QACA,OAAO;UACLH,MAAM,EAAE,CACN;YACE,GAAGf,KAAK;YACRoB,KAAK,EAAED,cAAc,CAACnB,KAAK,CAACoB,KAAK;UACnC,CAAC;QAEL,CAAC;MACH;;MAEA;MACA;MACA;MACA;MACA,OAAOF,aAAa;IACtB,CAAC;IAED,MAAME,KAAK,GAAGD,cAAc,CAACjB,iBAAiB,CAAC;IAC/C,MAAMmB,IAAI,GAAGlB,sBAAsB,CAACiB,KAAK,EAAEnB,OAAO,EAAEqB,MAAM,CAAC;IAE3D,OAAOD,IAAI;EACb,CAAC,EACD,CACEpB,OAAO,EAAES,OAAO,EAChBT,OAAO,EAAEqB,MAAM,EACftB,KAAK,EAAEa,GAAG,EACVf,UAAU,EACVI,iBAAiB,EACjBC,sBAAsB,CAE1B,CAAC;EAED,MAAMoB,WAAW,GAAG5B,KAAK,CAACY,WAAW,CAClCiB,IAAY,IAAK;IAChB,IAAI,CAACA,IAAI,CAACC,UAAU,CAAC,GAAG,CAAC,EAAE;MACzB,MAAM,IAAIC,KAAK,CAAC,iCAAiCF,IAAI,IAAI,CAAC;IAC5D;IAEA,MAAMJ,KAAK,GAAGhB,sBAAsB,CAACoB,IAAI,EAAEvB,OAAO,EAAEqB,MAAM,CAAC;IAE3D,IAAIF,KAAK,EAAE;MACT,MAAMO,MAAM,GAAGtB,wBAAwB,CAACe,KAAK,EAAEnB,OAAO,EAAEqB,MAAM,CAAC;MAE/D,OAAOK,MAAM,IAAIxC,aAAa,CAACyC,KAAK,CAACR,KAAK,CAAC;IAC7C,CAAC,MAAM;MACL,MAAM,IAAIM,KAAK,CAAC,iDAAiD,CAAC;IACpE;EACF,CAAC,EACD,CAACzB,OAAO,EAAEqB,MAAM,EAAElB,sBAAsB,EAAEC,wBAAwB,CACpE,CAAC;EAED,OAAO;IACLC,SAAS;IACTiB;EACF,CAAC;AACH","ignoreList":[]}

package/lib/module/useRoutePath.js

@@ -19,9 +19,12 @@ export function useRoutePath() {
   }
   const getPathFromStateHelper = options?.getPathFromState ?? getPathFromState;
   const path = React.useMemo(() => {
+    if (options?.enabled === false) {
+      return undefined;
+    }
     const path = getPathFromStateHelper(state, options?.config);
     return path;
-  }, [state, options?.config, getPathFromStateHelper]);
+  }, [options?.enabled, options?.config, state, getPathFromStateHelper]);
   return path;
 }
 //# sourceMappingURL=useRoutePath.js.map

package/lib/module/useRoutePath.js.map

@@ -1 +1 @@
-{"version":3,"names":["getPathFromState","useStateForPath","React","LinkingContext","useRoutePath","options","useContext","state","undefined","Error","getPathFromStateHelper","path","useMemo","config"],"sourceRoot":"../../src","sources":["useRoutePath.tsx"],"mappings":";;AAAA,SAASA,gBAAgB,EAAEC,eAAe,QAAQ,wBAAwB;AAC1E,OAAO,KAAKC,KAAK,MAAM,OAAO;AAE9B,SAASC,cAAc,QAAQ,qBAAkB;;AAEjD;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,YAAYA,CAAA,EAAG;EAC7B,MAAM;IAAEC;EAAQ,CAAC,GAAGH,KAAK,CAACI,UAAU,CAACH,cAAc,CAAC;EACpD,MAAMI,KAAK,GAAGN,eAAe,CAAC,CAAC;EAE/B,IAAIM,KAAK,KAAKC,SAAS,EAAE;IACvB,MAAM,IAAIC,KAAK,CACb,+FACF,CAAC;EACH;EAEA,MAAMC,sBAAsB,GAAGL,OAAO,EAAEL,gBAAgB,IAAIA,gBAAgB;EAE5E,MAAMW,IAAI,GAAGT,KAAK,CAACU,OAAO,CAAC,MAAM;IAC/B,MAAMD,IAAI,GAAGD,sBAAsB,CAACH,KAAK,EAAEF,OAAO,EAAEQ,MAAM,CAAC;IAE3D,OAAOF,IAAI;EACb,CAAC,EAAE,CAACJ,KAAK,EAAEF,OAAO,EAAEQ,MAAM,EAAEH,sBAAsB,CAAC,CAAC;EAEpD,OAAOC,IAAI;AACb","ignoreList":[]}
+{"version":3,"names":["getPathFromState","useStateForPath","React","LinkingContext","useRoutePath","options","useContext","state","undefined","Error","getPathFromStateHelper","path","useMemo","enabled","config"],"sourceRoot":"../../src","sources":["useRoutePath.tsx"],"mappings":";;AAAA,SAASA,gBAAgB,EAAEC,eAAe,QAAQ,wBAAwB;AAC1E,OAAO,KAAKC,KAAK,MAAM,OAAO;AAE9B,SAASC,cAAc,QAAQ,qBAAkB;;AAEjD;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,YAAYA,CAAA,EAAG;EAC7B,MAAM;IAAEC;EAAQ,CAAC,GAAGH,KAAK,CAACI,UAAU,CAACH,cAAc,CAAC;EACpD,MAAMI,KAAK,GAAGN,eAAe,CAAC,CAAC;EAE/B,IAAIM,KAAK,KAAKC,SAAS,EAAE;IACvB,MAAM,IAAIC,KAAK,CACb,+FACF,CAAC;EACH;EAEA,MAAMC,sBAAsB,GAAGL,OAAO,EAAEL,gBAAgB,IAAIA,gBAAgB;EAE5E,MAAMW,IAAI,GAAGT,KAAK,CAACU,OAAO,CAAC,MAAM;IAC/B,IAAIP,OAAO,EAAEQ,OAAO,KAAK,KAAK,EAAE;MAC9B,OAAOL,SAAS;IAClB;IAEA,MAAMG,IAAI,GAAGD,sBAAsB,CAACH,KAAK,EAAEF,OAAO,EAAES,MAAM,CAAC;IAE3D,OAAOH,IAAI;EACb,CAAC,EAAE,CAACN,OAAO,EAAEQ,OAAO,EAAER,OAAO,EAAES,MAAM,EAAEP,KAAK,EAAEG,sBAAsB,CAAC,CAAC;EAEtE,OAAOC,IAAI;AACb","ignoreList":[]}

package/lib/typescript/commonjs/src/useLinkBuilder.d.ts

@@ -5,7 +5,7 @@ import { CommonActions } from '@react-navigation/core';
  * @returns `buildHref` to build an `href` for screen and `buildAction` to build an action from an `href`.
  */
 export declare function useLinkBuilder(): {
-    buildHref: (name: string, params?: object) => string;
+    buildHref: (name: string, params?: object) => string | undefined;
     buildAction: (href: string) => {
         type: "NAVIGATE";
         payload: {

package/lib/typescript/commonjs/src/useLinkBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useLinkBuilder.d.ts","sourceRoot":"","sources":["../../../../src/useLinkBuilder.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAKd,MAAM,wBAAwB,CAAC;AAShC;;;;GAIG;AACH,wBAAgB,cAAc;sBAWnB,MAAM,WAAW,MAAM;wBA+BvB,MAAM;;;;;;;;;;;;;;;;EAsBhB"}
+{"version":3,"file":"useLinkBuilder.d.ts","sourceRoot":"","sources":["../../../../src/useLinkBuilder.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAQd,MAAM,wBAAwB,CAAC;AAShC;;;;GAIG;AACH,wBAAgB,cAAc;sBAcnB,MAAM,WAAW,MAAM;wBAmEvB,MAAM;;;;;;;;;;;;;;;;EAsBhB"}

package/lib/typescript/commonjs/src/useRoutePath.d.ts

@@ -3,5 +3,5 @@
  *
  * @returns Path for the current route.
  */
-export declare function useRoutePath(): string;
+export declare function useRoutePath(): string | undefined;
 //# sourceMappingURL=useRoutePath.d.ts.map

package/lib/typescript/commonjs/src/useRoutePath.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useRoutePath.d.ts","sourceRoot":"","sources":["../../../../src/useRoutePath.tsx"],"names":[],"mappings":"AAKA;;;;GAIG;AACH,wBAAgB,YAAY,WAmB3B"}
+{"version":3,"file":"useRoutePath.d.ts","sourceRoot":"","sources":["../../../../src/useRoutePath.tsx"],"names":[],"mappings":"AAKA;;;;GAIG;AACH,wBAAgB,YAAY,uBAuB3B"}

package/lib/typescript/module/src/useLinkBuilder.d.ts

@@ -5,7 +5,7 @@ import { CommonActions } from '@react-navigation/core';
  * @returns `buildHref` to build an `href` for screen and `buildAction` to build an action from an `href`.
  */
 export declare function useLinkBuilder(): {
-    buildHref: (name: string, params?: object) => string;
+    buildHref: (name: string, params?: object) => string | undefined;
     buildAction: (href: string) => {
         type: "NAVIGATE";
         payload: {

package/lib/typescript/module/src/useLinkBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useLinkBuilder.d.ts","sourceRoot":"","sources":["../../../../src/useLinkBuilder.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAKd,MAAM,wBAAwB,CAAC;AAShC;;;;GAIG;AACH,wBAAgB,cAAc;sBAWnB,MAAM,WAAW,MAAM;wBA+BvB,MAAM;;;;;;;;;;;;;;;;EAsBhB"}
+{"version":3,"file":"useLinkBuilder.d.ts","sourceRoot":"","sources":["../../../../src/useLinkBuilder.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAQd,MAAM,wBAAwB,CAAC;AAShC;;;;GAIG;AACH,wBAAgB,cAAc;sBAcnB,MAAM,WAAW,MAAM;wBAmEvB,MAAM;;;;;;;;;;;;;;;;EAsBhB"}

package/lib/typescript/module/src/useRoutePath.d.ts

@@ -3,5 +3,5 @@
  *
  * @returns Path for the current route.
  */
-export declare function useRoutePath(): string;
+export declare function useRoutePath(): string | undefined;
 //# sourceMappingURL=useRoutePath.d.ts.map

package/lib/typescript/module/src/useRoutePath.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useRoutePath.d.ts","sourceRoot":"","sources":["../../../../src/useRoutePath.tsx"],"names":[],"mappings":"AAKA;;;;GAIG;AACH,wBAAgB,YAAY,WAmB3B"}
+{"version":3,"file":"useRoutePath.d.ts","sourceRoot":"","sources":["../../../../src/useRoutePath.tsx"],"names":[],"mappings":"AAKA;;;;GAIG;AACH,wBAAgB,YAAY,uBAuB3B"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@react-navigation/native",
   "description": "React Native integration for React Navigation",
-  "version": "7.1.1",
+  "version": "7.1.3",
   "keywords": [
     "react-native",
     "react-navigation",
@@ -48,7 +48,7 @@
     "clean": "del lib"
   },
   "dependencies": {
-    "@react-navigation/core": "^7.8.0",
+    "@react-navigation/core": "^7.8.2",
     "escape-string-regexp": "^4.0.0",
     "fast-deep-equal": "^3.1.3",
     "nanoid": "3.3.8",
@@ -63,7 +63,7 @@
     "react": "18.3.1",
     "react-dom": "18.3.1",
     "react-native": "0.76.2",
-    "react-native-builder-bob": "^0.39.0",
+    "react-native-builder-bob": "^0.39.1",
     "typescript": "^5.5.2"
   },
   "peerDependencies": {
@@ -95,5 +95,5 @@
       ]
     ]
   },
-  "gitHead": "01f42770305a70c6ff43d6baa75136d47d988fdc"
+  "gitHead": "1ee608f918e50195907c6bd74c193be7d0a2a8c8"
 }

package/src/useLinkBuilder.tsx

@@ -1,8 +1,11 @@
 import {
   CommonActions,
+  findFocusedRoute,
   getActionFromState,
   getPathFromState,
   getStateFromPath,
+  NavigationHelpersContext,
+  NavigationRouteContext,
   useStateForPath,
 } from '@react-navigation/core';
 import * as React from 'react';
@@ -19,6 +22,9 @@ type MinimalState = {
  * @returns `buildHref` to build an `href` for screen and `buildAction` to build an action from an `href`.
  */
 export function useLinkBuilder() {
+  const navigation = React.useContext(NavigationHelpersContext);
+  const route = React.useContext(NavigationRouteContext);
+
   const { options } = React.useContext(LinkingContext);
 
   const focusedRouteState = useStateForPath();
@@ -30,33 +36,69 @@ export function useLinkBuilder() {
 
   const buildHref = React.useCallback(
     (name: string, params?: object) => {
-      const addStateToInnermostRoute = (
+      if (options?.enabled === false) {
+        return undefined;
+      }
+
+      // Check that we're inside:
+      // - navigator's context
+      // - route context of the navigator (could be a screen, tab, etc.)
+      // - route matches the state for path (from the screen's context)
+      // This ensures that we're inside a screen
+      const isScreen =
+        navigation && route?.key && focusedRouteState
+          ? route.key === findFocusedRoute(focusedRouteState)?.key &&
+            navigation.getState().routes.some((r) => r.key === route.key)
+          : false;
+
+      const stateForRoute: MinimalState = {
+        routes: [{ name, params }],
+      };
+
+      const constructState = (
         state: MinimalState | undefined
       ): MinimalState => {
         if (state) {
           const route = state.routes[0];
 
+          // If we're inside a screen and at the innermost route
+          // We need to replace the state with the provided one
+          // This assumes that we're navigating to a sibling route
+          if (isScreen && !route.state) {
+            return stateForRoute;
+          }
+
+          // Otherwise, dive into the nested state of the route
           return {
             routes: [
               {
                 ...route,
-                state: addStateToInnermostRoute(route.state),
+                state: constructState(route.state),
               },
             ],
           };
         }
 
-        return {
-          routes: [{ name, params }],
-        };
+        // Once there is no more nested state, we're at the innermost route
+        // We can add a state based on provided parameters
+        // This assumes that we're navigating to a child of this route
+        // In this case, the helper is used in a navigator for its routes
+        return stateForRoute;
       };
 
-      const state = addStateToInnermostRoute(focusedRouteState);
+      const state = constructState(focusedRouteState);
       const path = getPathFromStateHelper(state, options?.config);
 
       return path;
     },
-    [options?.config, getPathFromStateHelper, focusedRouteState]
+    [
+      options?.enabled,
+      options?.config,
+      route?.key,
+      navigation,
+      focusedRouteState,
+      getPathFromStateHelper,
+    ]
   );
 
   const buildAction = React.useCallback(

package/src/useRoutePath.tsx

@@ -21,10 +21,14 @@ export function useRoutePath() {
   const getPathFromStateHelper = options?.getPathFromState ?? getPathFromState;
 
   const path = React.useMemo(() => {
+    if (options?.enabled === false) {
+      return undefined;
+    }
+
     const path = getPathFromStateHelper(state, options?.config);
 
     return path;
-  }, [state, options?.config, getPathFromStateHelper]);
+  }, [options?.enabled, options?.config, state, getPathFromStateHelper]);
 
   return path;
 }