one 1.16.2 → 1.16.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/fork/useLinking.cjs +10 -1
- package/dist/cjs/views/Navigator.cjs +34 -18
- package/dist/cjs/views/Navigator.native.js +49 -38
- package/dist/cjs/views/Navigator.native.js.map +1 -1
- package/dist/esm/fork/useLinking.mjs +10 -1
- package/dist/esm/fork/useLinking.mjs.map +1 -1
- package/dist/esm/views/Navigator.mjs +34 -18
- package/dist/esm/views/Navigator.mjs.map +1 -1
- package/dist/esm/views/Navigator.native.js +49 -38
- package/dist/esm/views/Navigator.native.js.map +1 -1
- package/package.json +9 -9
- package/src/fork/useLinking.ts +21 -6
- package/src/views/Navigator.tsx +93 -48
- package/types/fork/useLinking.d.ts.map +1 -1
- package/types/views/Navigator.d.ts.map +1 -1
|
@@ -72,6 +72,15 @@ const getPartialState = state => {
|
|
|
72
72
|
}))
|
|
73
73
|
};
|
|
74
74
|
};
|
|
75
|
+
function getFocusedRouteDepth(state) {
|
|
76
|
+
const length = state.history ? state.history.length : state.routes.length;
|
|
77
|
+
const focusedRoute = state.routes[state.index];
|
|
78
|
+
const child = focusedRoute?.state;
|
|
79
|
+
if (child) {
|
|
80
|
+
return length + getFocusedRouteDepth(child);
|
|
81
|
+
}
|
|
82
|
+
return length;
|
|
83
|
+
}
|
|
75
84
|
const findMatchingState = (a, b) => {
|
|
76
85
|
if (a === void 0 || b === void 0 || a.key !== b.key) {
|
|
77
86
|
return [void 0, void 0];
|
|
@@ -411,7 +420,7 @@ function useLinking(ref, {
|
|
|
411
420
|
// We should only handle push/pop if path changed from what was in last `popstate`
|
|
412
421
|
// Otherwise it's likely a change triggered by `popstate`
|
|
413
422
|
path !== pendingPath) {
|
|
414
|
-
const historyDelta = (focusedState
|
|
423
|
+
const historyDelta = getFocusedRouteDepth(focusedState) - getFocusedRouteDepth(previousFocusedState);
|
|
415
424
|
if (historyDelta > 0) {
|
|
416
425
|
history.push({
|
|
417
426
|
path,
|
|
@@ -49,12 +49,13 @@ __export(Navigator_exports, {
|
|
|
49
49
|
});
|
|
50
50
|
module.exports = __toCommonJS(Navigator_exports);
|
|
51
51
|
var import_native = require("@react-navigation/native");
|
|
52
|
+
var import_core = require("@react-navigation/core");
|
|
52
53
|
var React = __toESM(require("react"), 1);
|
|
53
54
|
var import_react_native_safe_area_context = require("react-native-safe-area-context");
|
|
54
55
|
var import_withLayoutContext = require("../layouts/withLayoutContext.cjs");
|
|
55
56
|
var import_notFoundState = require("../notFoundState.cjs");
|
|
56
57
|
var import_Route = require("../router/Route.cjs");
|
|
57
|
-
var
|
|
58
|
+
var import_linkingConfig = require("../router/linkingConfig.cjs");
|
|
58
59
|
var import_router = require("../router/router.cjs");
|
|
59
60
|
var import_router2 = require("../router/router.cjs");
|
|
60
61
|
var import_useScreens = require("../router/useScreens.cjs");
|
|
@@ -62,6 +63,27 @@ var import_Screen = require("./Screen.cjs");
|
|
|
62
63
|
var import_interceptRoutes = require("../router/interceptRoutes.cjs");
|
|
63
64
|
var import_jsx_runtime = require("react/jsx-runtime");
|
|
64
65
|
const SLOT_STATIC_KEY = "one-slot-static-key";
|
|
66
|
+
function resolveInitialRouteFromLinking(contextKey, browserPath) {
|
|
67
|
+
const linking = (0, import_linkingConfig.getLinking)();
|
|
68
|
+
if (!linking?.getStateFromPath) return void 0;
|
|
69
|
+
let current = linking.getStateFromPath(browserPath, linking.config);
|
|
70
|
+
const segments = contextKey.split("/").filter(Boolean);
|
|
71
|
+
let i = 0;
|
|
72
|
+
while (i < segments.length) {
|
|
73
|
+
if (!current?.routes?.length) return void 0;
|
|
74
|
+
const idx2 = current.index ?? current.routes.length - 1;
|
|
75
|
+
const focused = current.routes[idx2];
|
|
76
|
+
if (!focused?.name || !focused.state) return void 0;
|
|
77
|
+
const nameSegments = focused.name.split("/").filter(Boolean);
|
|
78
|
+
const expected = segments.slice(i, i + nameSegments.length).join("/");
|
|
79
|
+
if (focused.name !== expected) return void 0;
|
|
80
|
+
current = focused.state;
|
|
81
|
+
i += nameSegments.length;
|
|
82
|
+
}
|
|
83
|
+
if (!current?.routes?.length) return void 0;
|
|
84
|
+
const idx = current.index ?? current.routes.length - 1;
|
|
85
|
+
return current.routes[idx]?.name;
|
|
86
|
+
}
|
|
65
87
|
const globalSlotState = /* @__PURE__ */new Map();
|
|
66
88
|
const slotStateListeners = /* @__PURE__ */new Set();
|
|
67
89
|
function getSlotState(slotName) {
|
|
@@ -140,27 +162,21 @@ function QualifiedNavigator({
|
|
|
140
162
|
contextKey,
|
|
141
163
|
router = import_native.StackRouter
|
|
142
164
|
}) {
|
|
165
|
+
const parentRoute = React.useContext(import_core.NavigationRouteContext);
|
|
166
|
+
const screenFromParent = parentRoute && typeof parentRoute.params === "object" && parentRoute.params !== null && typeof parentRoute.params.screen === "string" ? parentRoute.params.screen : void 0;
|
|
143
167
|
const resolvedInitialRouteName = React.useMemo(() => {
|
|
144
168
|
if (initialRouteName) return initialRouteName;
|
|
169
|
+
if (screenFromParent) {
|
|
170
|
+
const hasScreen2 = screens.some(s => s?.props?.name === screenFromParent);
|
|
171
|
+
if (hasScreen2) return screenFromParent;
|
|
172
|
+
}
|
|
145
173
|
const browserPath = import_router.initialPathname ?? (typeof window !== "undefined" ? window.location.pathname : void 0);
|
|
146
174
|
if (!browserPath) return void 0;
|
|
147
|
-
const
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
const fullPattern = layoutUrlPrefix ? `${layoutUrlPrefix}/${name}` : name;
|
|
153
|
-
const match = (0, import_matchers.matchRoutePattern)(fullPattern, browserPath);
|
|
154
|
-
if (!match) continue;
|
|
155
|
-
if (!best || match.specificity > best.specificity) {
|
|
156
|
-
best = {
|
|
157
|
-
name,
|
|
158
|
-
specificity: match.specificity
|
|
159
|
-
};
|
|
160
|
-
}
|
|
161
|
-
}
|
|
162
|
-
return best?.name;
|
|
163
|
-
}, [initialRouteName, screens, contextKey]);
|
|
175
|
+
const resolved = resolveInitialRouteFromLinking(contextKey, browserPath);
|
|
176
|
+
if (!resolved) return void 0;
|
|
177
|
+
const hasScreen = screens.some(s => s?.props?.name === resolved);
|
|
178
|
+
return hasScreen ? resolved : void 0;
|
|
179
|
+
}, [initialRouteName, screens, contextKey, screenFromParent]);
|
|
164
180
|
const {
|
|
165
181
|
state,
|
|
166
182
|
navigation,
|
|
@@ -52,18 +52,49 @@ __export(Navigator_exports, {
|
|
|
52
52
|
module.exports = __toCommonJS(Navigator_exports);
|
|
53
53
|
var import_jsx_runtime = require("react/jsx-runtime");
|
|
54
54
|
var import_native = require("@react-navigation/native");
|
|
55
|
+
var import_core = require("@react-navigation/core");
|
|
55
56
|
var React = __toESM(require("react"), 1);
|
|
56
57
|
var import_react_native_safe_area_context = require("react-native-safe-area-context");
|
|
57
58
|
var import_withLayoutContext = require("../layouts/withLayoutContext.native.js");
|
|
58
59
|
var import_notFoundState = require("../notFoundState.native.js");
|
|
59
60
|
var import_Route = require("../router/Route.native.js");
|
|
60
|
-
var
|
|
61
|
+
var import_linkingConfig = require("../router/linkingConfig.native.js");
|
|
61
62
|
var import_router = require("../router/router.native.js");
|
|
62
63
|
var import_router2 = require("../router/router.native.js");
|
|
63
64
|
var import_useScreens = require("../router/useScreens.native.js");
|
|
64
65
|
var import_Screen = require("./Screen.native.js");
|
|
65
66
|
var import_interceptRoutes = require("../router/interceptRoutes.native.js");
|
|
67
|
+
function _type_of(obj) {
|
|
68
|
+
"@swc/helpers - typeof";
|
|
69
|
+
|
|
70
|
+
return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
|
|
71
|
+
}
|
|
66
72
|
var SLOT_STATIC_KEY = "one-slot-static-key";
|
|
73
|
+
function resolveInitialRouteFromLinking(contextKey, browserPath) {
|
|
74
|
+
var _current_index;
|
|
75
|
+
var _current_routes, _current_routes_idx;
|
|
76
|
+
var linking = (0, import_linkingConfig.getLinking)();
|
|
77
|
+
if (!(linking === null || linking === void 0 ? void 0 : linking.getStateFromPath)) return void 0;
|
|
78
|
+
var current = linking.getStateFromPath(browserPath, linking.config);
|
|
79
|
+
var segments = contextKey.split("/").filter(Boolean);
|
|
80
|
+
var i = 0;
|
|
81
|
+
while (i < segments.length) {
|
|
82
|
+
var _current_index1;
|
|
83
|
+
var _current_routes1;
|
|
84
|
+
if (!(current === null || current === void 0 ? void 0 : (_current_routes1 = current.routes) === null || _current_routes1 === void 0 ? void 0 : _current_routes1.length)) return void 0;
|
|
85
|
+
var idx = (_current_index1 = current.index) !== null && _current_index1 !== void 0 ? _current_index1 : current.routes.length - 1;
|
|
86
|
+
var focused = current.routes[idx];
|
|
87
|
+
if (!(focused === null || focused === void 0 ? void 0 : focused.name) || !focused.state) return void 0;
|
|
88
|
+
var nameSegments = focused.name.split("/").filter(Boolean);
|
|
89
|
+
var expected = segments.slice(i, i + nameSegments.length).join("/");
|
|
90
|
+
if (focused.name !== expected) return void 0;
|
|
91
|
+
current = focused.state;
|
|
92
|
+
i += nameSegments.length;
|
|
93
|
+
}
|
|
94
|
+
if (!(current === null || current === void 0 ? void 0 : (_current_routes = current.routes) === null || _current_routes === void 0 ? void 0 : _current_routes.length)) return void 0;
|
|
95
|
+
var idx1 = (_current_index = current.index) !== null && _current_index !== void 0 ? _current_index : current.routes.length - 1;
|
|
96
|
+
return (_current_routes_idx = current.routes[idx1]) === null || _current_routes_idx === void 0 ? void 0 : _current_routes_idx.name;
|
|
97
|
+
}
|
|
67
98
|
var globalSlotState = /* @__PURE__ */new Map();
|
|
68
99
|
var slotStateListeners = /* @__PURE__ */new Set();
|
|
69
100
|
function getSlotState(slotName) {
|
|
@@ -150,47 +181,27 @@ function QualifiedNavigator(param) {
|
|
|
150
181
|
contextKey,
|
|
151
182
|
router = import_native.StackRouter
|
|
152
183
|
} = param;
|
|
184
|
+
var parentRoute = React.useContext(import_core.NavigationRouteContext);
|
|
185
|
+
var screenFromParent = parentRoute && _type_of(parentRoute.params) === "object" && parentRoute.params !== null && typeof parentRoute.params.screen === "string" ? parentRoute.params.screen : void 0;
|
|
153
186
|
var resolvedInitialRouteName = React.useMemo(function () {
|
|
154
187
|
if (initialRouteName) return initialRouteName;
|
|
188
|
+
if (screenFromParent) {
|
|
189
|
+
var hasScreen = screens.some(function (s) {
|
|
190
|
+
var _s_props;
|
|
191
|
+
return (s === null || s === void 0 ? void 0 : (_s_props = s.props) === null || _s_props === void 0 ? void 0 : _s_props.name) === screenFromParent;
|
|
192
|
+
});
|
|
193
|
+
if (hasScreen) return screenFromParent;
|
|
194
|
+
}
|
|
155
195
|
var browserPath = import_router.initialPathname !== null && import_router.initialPathname !== void 0 ? import_router.initialPathname : typeof window !== "undefined" ? window.location.pathname : void 0;
|
|
156
196
|
if (!browserPath) return void 0;
|
|
157
|
-
var
|
|
158
|
-
|
|
159
|
-
var
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
var _screen_props;
|
|
166
|
-
var name = screen === null || screen === void 0 ? void 0 : (_screen_props = screen.props) === null || _screen_props === void 0 ? void 0 : _screen_props.name;
|
|
167
|
-
if (!name) continue;
|
|
168
|
-
var fullPattern = layoutUrlPrefix ? `${layoutUrlPrefix}/${name}` : name;
|
|
169
|
-
var match = (0, import_matchers.matchRoutePattern)(fullPattern, browserPath);
|
|
170
|
-
if (!match) continue;
|
|
171
|
-
if (!best || match.specificity > best.specificity) {
|
|
172
|
-
best = {
|
|
173
|
-
name,
|
|
174
|
-
specificity: match.specificity
|
|
175
|
-
};
|
|
176
|
-
}
|
|
177
|
-
}
|
|
178
|
-
} catch (err) {
|
|
179
|
-
_didIteratorError = true;
|
|
180
|
-
_iteratorError = err;
|
|
181
|
-
} finally {
|
|
182
|
-
try {
|
|
183
|
-
if (!_iteratorNormalCompletion && _iterator.return != null) {
|
|
184
|
-
_iterator.return();
|
|
185
|
-
}
|
|
186
|
-
} finally {
|
|
187
|
-
if (_didIteratorError) {
|
|
188
|
-
throw _iteratorError;
|
|
189
|
-
}
|
|
190
|
-
}
|
|
191
|
-
}
|
|
192
|
-
return best === null || best === void 0 ? void 0 : best.name;
|
|
193
|
-
}, [initialRouteName, screens, contextKey]);
|
|
197
|
+
var resolved = resolveInitialRouteFromLinking(contextKey, browserPath);
|
|
198
|
+
if (!resolved) return void 0;
|
|
199
|
+
var hasScreen1 = screens.some(function (s) {
|
|
200
|
+
var _s_props;
|
|
201
|
+
return (s === null || s === void 0 ? void 0 : (_s_props = s.props) === null || _s_props === void 0 ? void 0 : _s_props.name) === resolved;
|
|
202
|
+
});
|
|
203
|
+
return hasScreen1 ? resolved : void 0;
|
|
204
|
+
}, [initialRouteName, screens, contextKey, screenFromParent]);
|
|
194
205
|
var {
|
|
195
206
|
state,
|
|
196
207
|
navigation,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","Navigator_exports","__export","DefaultNavigator","NamedSlot","Navigator","NavigatorContext","QualifiedSlot","Slot","clearAllSlotStates","getScopedSlotKey","getSlotState","setSlotState","useNamedSlot","useNavigatorContext","useSlot","module","exports","import_jsx_runtime","require","import_native","React","__toESM","import_react_native_safe_area_context","import_withLayoutContext","import_notFoundState","import_Route","import_matchers","import_router","import_router2","import_useScreens","import_Screen","import_interceptRoutes","SLOT_STATIC_KEY","globalSlotState","Map","slotStateListeners","Set","slotName","get","state","delete","set","forEach","listener","clear","registerClearSlotStates","registerSetSlotState","useSlotStateSubscription","forceUpdate","useReducer","x","useEffect","add","createContext","process","env","NODE_ENV","displayName","param","initialRouteName","screenOptions","children","router","contextKey","useContextKey","screens","otherSlot","protectedScreens","useFilterScreenChildren","isCustomNavigator","registerProtectedRoutes","unregisterProtectedRoutes","sorted","useSortedScreens","length","console","warn","jsx","QualifiedNavigator","StackRouter","resolvedInitialRouteName","useMemo","browserPath","initialPathname","window","location","pathname","layoutUrlPrefix","stripGroupSegmentsFromPath","replace","best","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","screen","_screen_props","name","props","fullPattern","match","matchRoutePattern","specificity","err","return","navigation","descriptors","NavigationContent","useNavigationBuilder","id","descriptorsRef","useRef","current","Provider","context","useContext","Error","_ref","_descriptorsRef_current_current_key","notFoundState","useNotFoundState","notFoundRouteNode","findRouteNodeByPath","notFoundPath","routeNode","findNearestNotFoundRoute","originalPath","NotFoundComponent","getQualifiedRouteComponent","route","params","routes","index","renderedElement","key","render","cloneElement","memo","Slot2","SafeAreaView","style","flex"],"sources":["../../../src/views/Navigator.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","Navigator_exports","__export","DefaultNavigator","NamedSlot","Navigator","NavigatorContext","QualifiedSlot","Slot","clearAllSlotStates","getScopedSlotKey","getSlotState","setSlotState","useNamedSlot","useNavigatorContext","useSlot","module","exports","import_jsx_runtime","require","import_native","import_core","React","__toESM","import_react_native_safe_area_context","import_withLayoutContext","import_notFoundState","import_Route","import_linkingConfig","import_router","import_router2","import_useScreens","import_Screen","import_interceptRoutes","_type_of","obj","Symbol","constructor","SLOT_STATIC_KEY","resolveInitialRouteFromLinking","contextKey","browserPath","_current_index","_current_routes","_current_routes_idx","linking","getLinking","getStateFromPath","current","config","segments","split","filter","Boolean","i","length","_current_index1","_current_routes1","routes","idx","index","focused","name","state","nameSegments","expected","slice","join","idx1","globalSlotState","Map","slotStateListeners","Set","slotName","get","delete","set","forEach","listener","clear","registerClearSlotStates","registerSetSlotState","useSlotStateSubscription","forceUpdate","useReducer","x","useEffect","add","createContext","process","env","NODE_ENV","displayName","param","initialRouteName","screenOptions","children","router","useContextKey","screens","otherSlot","protectedScreens","useFilterScreenChildren","isCustomNavigator","registerProtectedRoutes","unregisterProtectedRoutes","sorted","useSortedScreens","console","warn","jsx","QualifiedNavigator","StackRouter","parentRoute","useContext","NavigationRouteContext","screenFromParent","params","screen","resolvedInitialRouteName","useMemo","hasScreen","some","s","_s_props","props","initialPathname","window","location","pathname","resolved","hasScreen1","navigation","descriptors","NavigationContent","useNavigationBuilder","id","descriptorsRef","useRef","Provider","context","Error","_ref","_descriptorsRef_current_current_key","notFoundState","useNotFoundState","notFoundRouteNode","findRouteNodeByPath","notFoundPath","routeNode","findNearestNotFoundRoute","originalPath","NotFoundComponent","getQualifiedRouteComponent","route","renderedElement","key","render","cloneElement","memo","Slot2","SafeAreaView","style","flex","Screen","layoutContextKey"],"sources":["../../../src/views/Navigator.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -33,6 +33,15 @@ const getPartialState = state => {
|
|
|
33
33
|
}))
|
|
34
34
|
};
|
|
35
35
|
};
|
|
36
|
+
function getFocusedRouteDepth(state) {
|
|
37
|
+
const length = state.history ? state.history.length : state.routes.length;
|
|
38
|
+
const focusedRoute = state.routes[state.index];
|
|
39
|
+
const child = focusedRoute?.state;
|
|
40
|
+
if (child) {
|
|
41
|
+
return length + getFocusedRouteDepth(child);
|
|
42
|
+
}
|
|
43
|
+
return length;
|
|
44
|
+
}
|
|
36
45
|
const findMatchingState = (a, b) => {
|
|
37
46
|
if (a === void 0 || b === void 0 || a.key !== b.key) {
|
|
38
47
|
return [void 0, void 0];
|
|
@@ -372,7 +381,7 @@ function useLinking(ref, {
|
|
|
372
381
|
// We should only handle push/pop if path changed from what was in last `popstate`
|
|
373
382
|
// Otherwise it's likely a change triggered by `popstate`
|
|
374
383
|
path !== pendingPath) {
|
|
375
|
-
const historyDelta = (focusedState
|
|
384
|
+
const historyDelta = getFocusedRouteDepth(focusedState) - getFocusedRouteDepth(previousFocusedState);
|
|
376
385
|
if (historyDelta > 0) {
|
|
377
386
|
history.push({
|
|
378
387
|
path,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["findFocusedRoute","getActionFromState","getActionFromStateDefault","getPathFromState","getPathFromStateDefault","useNavigationIndependentTree","getStateFromPath","getStateFromPathDefault","isEqual","React","stripGroupSegmentsFromPath","setNavigationType","isReturningFromIntercept","setReturningFromIntercept","restoreInterceptFromHistory","rootState","routerRootState","ServerLocationContext","clearAllSlotStates","createMemoryHistory","appendBaseUrl","getPartialState","state","key","routeNames","stale","routes","partial","map","routeKey","childState","route","findMatchingState","a","b","aHistoryLength","history","length","bHistoryLength","aRoute","index","bRoute","aChildState","bChildState","series","cb","queue","Promise","resolve","callback","then","linkingHandlers","useLinking","ref","enabled","config","onUnhandledLinking","window","getInitialState2","useCallback","fn","catch","getInitialState","independent","useEffect","process","env","NODE_ENV","console","error","join","trim","handler","Symbol","push","indexOf","splice","useState","enabledRef","useRef","configRef","getStateFromPathRef","getPathFromStateRef","getActionFromStateRef","restoringFromTempLocationRef","initialHistorySetupDoneRef","maskedDisplayPathRef","current","validateRoutesNotExistInRootState","navigation","getRootState","some","r","includes","name","location","useContext","server","value","location2","path","pathname","search","hash","historyState","__tempLocation","__tempKey","ONE_DEBUG_ROUTER","info","thenable","onfulfilled","previousIndexRef","previousStateRef","pendingPopStatePathRef","listen","previousIndex","record","get","pathMatches","displayPath","resetRoot","action","dispatch","e","warn","message","getPathForRoute","JSON","stringify","stateForPath","focusedRoute","params","refState","isRestoringFromMask","replace","actualPath","onStateChange","previousState","pendingPath","test","currentSearch","maskOptions","linkOptions","mask","maskHref","href","maskedInfo","unmaskOnReload","previousFocusedState","focusedState","historyDelta","nextIndex","backIndex","currentIndex","go","addListener"],"sources":["../../../src/fork/useLinking.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["findFocusedRoute","getActionFromState","getActionFromStateDefault","getPathFromState","getPathFromStateDefault","useNavigationIndependentTree","getStateFromPath","getStateFromPathDefault","isEqual","React","stripGroupSegmentsFromPath","setNavigationType","isReturningFromIntercept","setReturningFromIntercept","restoreInterceptFromHistory","rootState","routerRootState","ServerLocationContext","clearAllSlotStates","createMemoryHistory","appendBaseUrl","getPartialState","state","key","routeNames","stale","routes","partial","map","routeKey","childState","route","getFocusedRouteDepth","length","history","focusedRoute","index","child","findMatchingState","a","b","aHistoryLength","bHistoryLength","aRoute","bRoute","aChildState","bChildState","series","cb","queue","Promise","resolve","callback","then","linkingHandlers","useLinking","ref","enabled","config","onUnhandledLinking","window","getInitialState2","useCallback","fn","catch","getInitialState","independent","useEffect","process","env","NODE_ENV","console","error","join","trim","handler","Symbol","push","indexOf","splice","useState","enabledRef","useRef","configRef","getStateFromPathRef","getPathFromStateRef","getActionFromStateRef","restoringFromTempLocationRef","initialHistorySetupDoneRef","maskedDisplayPathRef","current","validateRoutesNotExistInRootState","navigation","getRootState","some","r","includes","name","location","useContext","server","value","location2","path","pathname","search","hash","historyState","__tempLocation","__tempKey","ONE_DEBUG_ROUTER","info","thenable","onfulfilled","previousIndexRef","previousStateRef","pendingPopStatePathRef","listen","previousIndex","record","get","pathMatches","displayPath","resetRoot","action","dispatch","e","warn","message","getPathForRoute","JSON","stringify","stateForPath","params","refState","isRestoringFromMask","replace","actualPath","onStateChange","previousState","pendingPath","test","currentSearch","maskOptions","linkOptions","mask","maskHref","href","maskedInfo","unmaskOnReload","previousFocusedState","focusedState","historyDelta","nextIndex","backIndex","currentIndex","go","addListener"],"sources":["../../../src/fork/useLinking.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { StackRouter, useNavigationBuilder } from "@react-navigation/native";
|
|
2
|
+
import { NavigationRouteContext } from "@react-navigation/core";
|
|
2
3
|
import * as React from "react";
|
|
3
4
|
import { SafeAreaView } from "react-native-safe-area-context";
|
|
4
5
|
import { useFilterScreenChildren } from "../layouts/withLayoutContext.mjs";
|
|
5
6
|
import { findNearestNotFoundRoute, findRouteNodeByPath, useNotFoundState } from "../notFoundState.mjs";
|
|
6
7
|
import { useContextKey } from "../router/Route.mjs";
|
|
7
|
-
import {
|
|
8
|
+
import { getLinking } from "../router/linkingConfig.mjs";
|
|
8
9
|
import { routeNode as globalRouteNode, initialPathname } from "../router/router.mjs";
|
|
9
10
|
import { registerProtectedRoutes, unregisterProtectedRoutes } from "../router/router.mjs";
|
|
10
11
|
import { useSortedScreens, getQualifiedRouteComponent } from "../router/useScreens.mjs";
|
|
@@ -12,6 +13,27 @@ import { Screen } from "./Screen.mjs";
|
|
|
12
13
|
import { registerClearSlotStates, registerSetSlotState } from "../router/interceptRoutes.mjs";
|
|
13
14
|
import { Fragment, jsx } from "react/jsx-runtime";
|
|
14
15
|
const SLOT_STATIC_KEY = "one-slot-static-key";
|
|
16
|
+
function resolveInitialRouteFromLinking(contextKey, browserPath) {
|
|
17
|
+
const linking = getLinking();
|
|
18
|
+
if (!linking?.getStateFromPath) return void 0;
|
|
19
|
+
let current = linking.getStateFromPath(browserPath, linking.config);
|
|
20
|
+
const segments = contextKey.split("/").filter(Boolean);
|
|
21
|
+
let i = 0;
|
|
22
|
+
while (i < segments.length) {
|
|
23
|
+
if (!current?.routes?.length) return void 0;
|
|
24
|
+
const idx2 = current.index ?? current.routes.length - 1;
|
|
25
|
+
const focused = current.routes[idx2];
|
|
26
|
+
if (!focused?.name || !focused.state) return void 0;
|
|
27
|
+
const nameSegments = focused.name.split("/").filter(Boolean);
|
|
28
|
+
const expected = segments.slice(i, i + nameSegments.length).join("/");
|
|
29
|
+
if (focused.name !== expected) return void 0;
|
|
30
|
+
current = focused.state;
|
|
31
|
+
i += nameSegments.length;
|
|
32
|
+
}
|
|
33
|
+
if (!current?.routes?.length) return void 0;
|
|
34
|
+
const idx = current.index ?? current.routes.length - 1;
|
|
35
|
+
return current.routes[idx]?.name;
|
|
36
|
+
}
|
|
15
37
|
const globalSlotState = /* @__PURE__ */new Map();
|
|
16
38
|
const slotStateListeners = /* @__PURE__ */new Set();
|
|
17
39
|
function getSlotState(slotName) {
|
|
@@ -90,27 +112,21 @@ function QualifiedNavigator({
|
|
|
90
112
|
contextKey,
|
|
91
113
|
router = StackRouter
|
|
92
114
|
}) {
|
|
115
|
+
const parentRoute = React.useContext(NavigationRouteContext);
|
|
116
|
+
const screenFromParent = parentRoute && typeof parentRoute.params === "object" && parentRoute.params !== null && typeof parentRoute.params.screen === "string" ? parentRoute.params.screen : void 0;
|
|
93
117
|
const resolvedInitialRouteName = React.useMemo(() => {
|
|
94
118
|
if (initialRouteName) return initialRouteName;
|
|
119
|
+
if (screenFromParent) {
|
|
120
|
+
const hasScreen2 = screens.some(s => s?.props?.name === screenFromParent);
|
|
121
|
+
if (hasScreen2) return screenFromParent;
|
|
122
|
+
}
|
|
95
123
|
const browserPath = initialPathname ?? (typeof window !== "undefined" ? window.location.pathname : void 0);
|
|
96
124
|
if (!browserPath) return void 0;
|
|
97
|
-
const
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
const fullPattern = layoutUrlPrefix ? `${layoutUrlPrefix}/${name}` : name;
|
|
103
|
-
const match = matchRoutePattern(fullPattern, browserPath);
|
|
104
|
-
if (!match) continue;
|
|
105
|
-
if (!best || match.specificity > best.specificity) {
|
|
106
|
-
best = {
|
|
107
|
-
name,
|
|
108
|
-
specificity: match.specificity
|
|
109
|
-
};
|
|
110
|
-
}
|
|
111
|
-
}
|
|
112
|
-
return best?.name;
|
|
113
|
-
}, [initialRouteName, screens, contextKey]);
|
|
125
|
+
const resolved = resolveInitialRouteFromLinking(contextKey, browserPath);
|
|
126
|
+
if (!resolved) return void 0;
|
|
127
|
+
const hasScreen = screens.some(s => s?.props?.name === resolved);
|
|
128
|
+
return hasScreen ? resolved : void 0;
|
|
129
|
+
}, [initialRouteName, screens, contextKey, screenFromParent]);
|
|
114
130
|
const {
|
|
115
131
|
state,
|
|
116
132
|
navigation,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["StackRouter","useNavigationBuilder","React","SafeAreaView","useFilterScreenChildren","findNearestNotFoundRoute","findRouteNodeByPath","useNotFoundState","useContextKey","
|
|
1
|
+
{"version":3,"names":["StackRouter","useNavigationBuilder","NavigationRouteContext","React","SafeAreaView","useFilterScreenChildren","findNearestNotFoundRoute","findRouteNodeByPath","useNotFoundState","useContextKey","getLinking","routeNode","globalRouteNode","initialPathname","registerProtectedRoutes","unregisterProtectedRoutes","useSortedScreens","getQualifiedRouteComponent","Screen","registerClearSlotStates","registerSetSlotState","Fragment","jsx","SLOT_STATIC_KEY","resolveInitialRouteFromLinking","contextKey","browserPath","linking","getStateFromPath","current","config","segments","split","filter","Boolean","i","length","routes","idx2","index","focused","name","state","nameSegments","expected","slice","join","idx","globalSlotState","Map","slotStateListeners","Set","getSlotState","slotName","get","setSlotState","delete","set","forEach","listener","clearAllSlotStates","clear","useSlotStateSubscription","forceUpdate","useReducer","x","useEffect","add","NavigatorContext","createContext","process","env","NODE_ENV","displayName","Navigator","initialRouteName","screenOptions","children","router","screens","otherSlot","protectedScreens","isCustomNavigator","sorted","console","warn","QualifiedNavigator","parentRoute","useContext","screenFromParent","params","screen","resolvedInitialRouteName","useMemo","hasScreen2","some","s","props","window","location","pathname","resolved","hasScreen","navigation","descriptors","NavigationContent","id","descriptorsRef","useRef","value","Provider","useNavigatorContext","context","Error","useSlot","notFoundState","notFoundRouteNode","notFoundPath","originalPath","NotFoundComponent","route","renderedElement","key","render","cloneElement","Slot","memo","Slot2","QualifiedSlot","DefaultNavigator","style","flex","getScopedSlotKey","layoutContextKey","useNamedSlot","scopedKey","slotState","activeRouteKey","isIntercepted","activeRouteNode","Component","NamedSlot","slotContent"],"sources":["../../../src/views/Navigator.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -1,17 +1,48 @@
|
|
|
1
1
|
import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
|
|
2
2
|
import { StackRouter, useNavigationBuilder } from "@react-navigation/native";
|
|
3
|
+
import { NavigationRouteContext } from "@react-navigation/core";
|
|
3
4
|
import * as React from "react";
|
|
4
5
|
import { SafeAreaView } from "react-native-safe-area-context";
|
|
5
6
|
import { useFilterScreenChildren } from "../layouts/withLayoutContext.native.js";
|
|
6
7
|
import { findNearestNotFoundRoute, findRouteNodeByPath, useNotFoundState } from "../notFoundState.native.js";
|
|
7
8
|
import { useContextKey } from "../router/Route.native.js";
|
|
8
|
-
import {
|
|
9
|
+
import { getLinking } from "../router/linkingConfig.native.js";
|
|
9
10
|
import { routeNode as globalRouteNode, initialPathname } from "../router/router.native.js";
|
|
10
11
|
import { registerProtectedRoutes, unregisterProtectedRoutes } from "../router/router.native.js";
|
|
11
12
|
import { useSortedScreens, getQualifiedRouteComponent } from "../router/useScreens.native.js";
|
|
12
13
|
import { Screen } from "./Screen.native.js";
|
|
13
14
|
import { registerClearSlotStates, registerSetSlotState } from "../router/interceptRoutes.native.js";
|
|
15
|
+
function _type_of(obj) {
|
|
16
|
+
"@swc/helpers - typeof";
|
|
17
|
+
|
|
18
|
+
return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
|
|
19
|
+
}
|
|
14
20
|
var SLOT_STATIC_KEY = "one-slot-static-key";
|
|
21
|
+
function resolveInitialRouteFromLinking(contextKey, browserPath) {
|
|
22
|
+
var _current_index;
|
|
23
|
+
var _current_routes, _current_routes_idx;
|
|
24
|
+
var linking = getLinking();
|
|
25
|
+
if (!(linking === null || linking === void 0 ? void 0 : linking.getStateFromPath)) return void 0;
|
|
26
|
+
var current = linking.getStateFromPath(browserPath, linking.config);
|
|
27
|
+
var segments = contextKey.split("/").filter(Boolean);
|
|
28
|
+
var i = 0;
|
|
29
|
+
while (i < segments.length) {
|
|
30
|
+
var _current_index1;
|
|
31
|
+
var _current_routes1;
|
|
32
|
+
if (!(current === null || current === void 0 ? void 0 : (_current_routes1 = current.routes) === null || _current_routes1 === void 0 ? void 0 : _current_routes1.length)) return void 0;
|
|
33
|
+
var idx = (_current_index1 = current.index) !== null && _current_index1 !== void 0 ? _current_index1 : current.routes.length - 1;
|
|
34
|
+
var focused = current.routes[idx];
|
|
35
|
+
if (!(focused === null || focused === void 0 ? void 0 : focused.name) || !focused.state) return void 0;
|
|
36
|
+
var nameSegments = focused.name.split("/").filter(Boolean);
|
|
37
|
+
var expected = segments.slice(i, i + nameSegments.length).join("/");
|
|
38
|
+
if (focused.name !== expected) return void 0;
|
|
39
|
+
current = focused.state;
|
|
40
|
+
i += nameSegments.length;
|
|
41
|
+
}
|
|
42
|
+
if (!(current === null || current === void 0 ? void 0 : (_current_routes = current.routes) === null || _current_routes === void 0 ? void 0 : _current_routes.length)) return void 0;
|
|
43
|
+
var idx1 = (_current_index = current.index) !== null && _current_index !== void 0 ? _current_index : current.routes.length - 1;
|
|
44
|
+
return (_current_routes_idx = current.routes[idx1]) === null || _current_routes_idx === void 0 ? void 0 : _current_routes_idx.name;
|
|
45
|
+
}
|
|
15
46
|
var globalSlotState = /* @__PURE__ */new Map();
|
|
16
47
|
var slotStateListeners = /* @__PURE__ */new Set();
|
|
17
48
|
function getSlotState(slotName) {
|
|
@@ -98,47 +129,27 @@ function QualifiedNavigator(param) {
|
|
|
98
129
|
contextKey,
|
|
99
130
|
router = StackRouter
|
|
100
131
|
} = param;
|
|
132
|
+
var parentRoute = React.useContext(NavigationRouteContext);
|
|
133
|
+
var screenFromParent = parentRoute && _type_of(parentRoute.params) === "object" && parentRoute.params !== null && typeof parentRoute.params.screen === "string" ? parentRoute.params.screen : void 0;
|
|
101
134
|
var resolvedInitialRouteName = React.useMemo(function () {
|
|
102
135
|
if (initialRouteName) return initialRouteName;
|
|
136
|
+
if (screenFromParent) {
|
|
137
|
+
var hasScreen = screens.some(function (s) {
|
|
138
|
+
var _s_props;
|
|
139
|
+
return (s === null || s === void 0 ? void 0 : (_s_props = s.props) === null || _s_props === void 0 ? void 0 : _s_props.name) === screenFromParent;
|
|
140
|
+
});
|
|
141
|
+
if (hasScreen) return screenFromParent;
|
|
142
|
+
}
|
|
103
143
|
var browserPath = initialPathname !== null && initialPathname !== void 0 ? initialPathname : typeof window !== "undefined" ? window.location.pathname : void 0;
|
|
104
144
|
if (!browserPath) return void 0;
|
|
105
|
-
var
|
|
106
|
-
|
|
107
|
-
var
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
var _screen_props;
|
|
114
|
-
var name = screen === null || screen === void 0 ? void 0 : (_screen_props = screen.props) === null || _screen_props === void 0 ? void 0 : _screen_props.name;
|
|
115
|
-
if (!name) continue;
|
|
116
|
-
var fullPattern = layoutUrlPrefix ? `${layoutUrlPrefix}/${name}` : name;
|
|
117
|
-
var match = matchRoutePattern(fullPattern, browserPath);
|
|
118
|
-
if (!match) continue;
|
|
119
|
-
if (!best || match.specificity > best.specificity) {
|
|
120
|
-
best = {
|
|
121
|
-
name,
|
|
122
|
-
specificity: match.specificity
|
|
123
|
-
};
|
|
124
|
-
}
|
|
125
|
-
}
|
|
126
|
-
} catch (err) {
|
|
127
|
-
_didIteratorError = true;
|
|
128
|
-
_iteratorError = err;
|
|
129
|
-
} finally {
|
|
130
|
-
try {
|
|
131
|
-
if (!_iteratorNormalCompletion && _iterator.return != null) {
|
|
132
|
-
_iterator.return();
|
|
133
|
-
}
|
|
134
|
-
} finally {
|
|
135
|
-
if (_didIteratorError) {
|
|
136
|
-
throw _iteratorError;
|
|
137
|
-
}
|
|
138
|
-
}
|
|
139
|
-
}
|
|
140
|
-
return best === null || best === void 0 ? void 0 : best.name;
|
|
141
|
-
}, [initialRouteName, screens, contextKey]);
|
|
145
|
+
var resolved = resolveInitialRouteFromLinking(contextKey, browserPath);
|
|
146
|
+
if (!resolved) return void 0;
|
|
147
|
+
var hasScreen1 = screens.some(function (s) {
|
|
148
|
+
var _s_props;
|
|
149
|
+
return (s === null || s === void 0 ? void 0 : (_s_props = s.props) === null || _s_props === void 0 ? void 0 : _s_props.name) === resolved;
|
|
150
|
+
});
|
|
151
|
+
return hasScreen1 ? resolved : void 0;
|
|
152
|
+
}, [initialRouteName, screens, contextKey, screenFromParent]);
|
|
142
153
|
var {
|
|
143
154
|
state,
|
|
144
155
|
navigation,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["jsx","_jsx","Fragment","_Fragment","StackRouter","useNavigationBuilder","React","SafeAreaView","useFilterScreenChildren","findNearestNotFoundRoute","findRouteNodeByPath","useNotFoundState","useContextKey","
|
|
1
|
+
{"version":3,"names":["jsx","_jsx","Fragment","_Fragment","StackRouter","useNavigationBuilder","NavigationRouteContext","React","SafeAreaView","useFilterScreenChildren","findNearestNotFoundRoute","findRouteNodeByPath","useNotFoundState","useContextKey","getLinking","routeNode","globalRouteNode","initialPathname","registerProtectedRoutes","unregisterProtectedRoutes","useSortedScreens","getQualifiedRouteComponent","Screen","registerClearSlotStates","registerSetSlotState","_type_of","obj","Symbol","constructor","SLOT_STATIC_KEY","resolveInitialRouteFromLinking","contextKey","browserPath","_current_index","_current_routes","_current_routes_idx","linking","getStateFromPath","current","config","segments","split","filter","Boolean","i","length","_current_index1","_current_routes1","routes","idx","index","focused","name","state","nameSegments","expected","slice","join","idx1","globalSlotState","Map","slotStateListeners","Set","getSlotState","slotName","get","setSlotState","delete","set","forEach","listener","clearAllSlotStates","clear","useSlotStateSubscription","forceUpdate","useReducer","x","useEffect","add","NavigatorContext","createContext","process","env","NODE_ENV","displayName","Navigator","param","initialRouteName","screenOptions","children","router","screens","otherSlot","protectedScreens","isCustomNavigator","sorted","console","warn","QualifiedNavigator","parentRoute","useContext","screenFromParent","params","screen","resolvedInitialRouteName","useMemo","hasScreen","some","s","_s_props","props","window","location","pathname","resolved","hasScreen1","navigation","descriptors","NavigationContent","id","descriptorsRef","useRef","value","Provider","useNavigatorContext","context","Error","useSlot","_ref","_descriptorsRef_current_current_key","notFoundState","notFoundRouteNode","notFoundPath","originalPath","NotFoundComponent","route","renderedElement","key","render","cloneElement","Slot","memo","Slot2","QualifiedSlot","DefaultNavigator","style","flex","getScopedSlotKey","layoutContextKey","useNamedSlot","scopedKey","slotState","activeRouteKey","isIntercepted"],"sources":["../../../src/views/Navigator.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "one",
|
|
3
|
-
"version": "1.16.
|
|
3
|
+
"version": "1.16.4",
|
|
4
4
|
"license": "BSD-3-Clause",
|
|
5
5
|
"sideEffects": [
|
|
6
6
|
"setup.mjs",
|
|
@@ -170,17 +170,17 @@
|
|
|
170
170
|
"@cloudflare/vite-plugin": "^1.33.1",
|
|
171
171
|
"@swc/core": "^1.14.0",
|
|
172
172
|
"@ungap/structured-clone": "^1.2.0",
|
|
173
|
-
"@vxrn/color-scheme": "1.16.
|
|
174
|
-
"@vxrn/compiler": "1.16.
|
|
175
|
-
"@vxrn/resolve": "1.16.
|
|
176
|
-
"@vxrn/tslib-lite": "1.16.
|
|
177
|
-
"@vxrn/use-isomorphic-layout-effect": "1.16.
|
|
178
|
-
"@vxrn/vite-plugin-metro": "1.16.
|
|
173
|
+
"@vxrn/color-scheme": "1.16.4",
|
|
174
|
+
"@vxrn/compiler": "1.16.4",
|
|
175
|
+
"@vxrn/resolve": "1.16.4",
|
|
176
|
+
"@vxrn/tslib-lite": "1.16.4",
|
|
177
|
+
"@vxrn/use-isomorphic-layout-effect": "1.16.4",
|
|
178
|
+
"@vxrn/vite-plugin-metro": "1.16.4",
|
|
179
179
|
"babel-dead-code-elimination": "1.0.10",
|
|
180
180
|
"babel-plugin-module-resolver": "^5.0.2",
|
|
181
181
|
"citty": "^0.1.6",
|
|
182
182
|
"core-js": "^3.38.1",
|
|
183
|
-
"create-vxrn": "1.16.
|
|
183
|
+
"create-vxrn": "1.16.4",
|
|
184
184
|
"escape-string-regexp": "^5.0.0",
|
|
185
185
|
"expo-linking": "~55.0.7",
|
|
186
186
|
"expo-modules-core": "~55.0.16",
|
|
@@ -200,7 +200,7 @@
|
|
|
200
200
|
"tsconfig-paths": "^4",
|
|
201
201
|
"use-latest-callback": "^0.2.3",
|
|
202
202
|
"vite": "^8.0.0",
|
|
203
|
-
"vxrn": "1.16.
|
|
203
|
+
"vxrn": "1.16.4",
|
|
204
204
|
"ws": "^8.18.0",
|
|
205
205
|
"xxhashjs": "^0.2.2"
|
|
206
206
|
},
|
package/src/fork/useLinking.ts
CHANGED
|
@@ -58,6 +58,20 @@ const getPartialState = (state: any): any => {
|
|
|
58
58
|
}
|
|
59
59
|
}
|
|
60
60
|
|
|
61
|
+
// @modified - sum of routes/history length across the focused route chain.
|
|
62
|
+
// findMatchingState may return at a level where both states have the same
|
|
63
|
+
// routes.length but the focused route's nested navigator gained or lost
|
|
64
|
+
// entries. that nested change is what determines push vs replace.
|
|
65
|
+
function getFocusedRouteDepth(state: NavigationState): number {
|
|
66
|
+
const length = state.history ? state.history.length : state.routes.length
|
|
67
|
+
const focusedRoute = state.routes[state.index]
|
|
68
|
+
const child = focusedRoute?.state as NavigationState | undefined
|
|
69
|
+
if (child) {
|
|
70
|
+
return length + getFocusedRouteDepth(child)
|
|
71
|
+
}
|
|
72
|
+
return length
|
|
73
|
+
}
|
|
74
|
+
|
|
61
75
|
/**
|
|
62
76
|
* Find the matching navigation state that changed between 2 navigation states
|
|
63
77
|
* e.g.: a -> b -> c -> d and a -> b -> c -> e -> f, if history in b changed, b is the matching state
|
|
@@ -653,13 +667,14 @@ export function useLinking(
|
|
|
653
667
|
// Otherwise it's likely a change triggered by `popstate`
|
|
654
668
|
path !== pendingPath
|
|
655
669
|
) {
|
|
670
|
+
// @modified - use recursive depth across nested navigator states.
|
|
671
|
+
// when navigation pushes a route whose nested navigator gains a focused
|
|
672
|
+
// child (e.g. / → /docs/sootsim), comparing only the matching state's
|
|
673
|
+
// top-level routes.length misses the nested push and yields delta=0,
|
|
674
|
+
// which would replace history instead of push.
|
|
656
675
|
const historyDelta =
|
|
657
|
-
(focusedState
|
|
658
|
-
|
|
659
|
-
: focusedState.routes.length) -
|
|
660
|
-
(previousFocusedState.history
|
|
661
|
-
? previousFocusedState.history.length
|
|
662
|
-
: previousFocusedState.routes.length)
|
|
676
|
+
getFocusedRouteDepth(focusedState as NavigationState) -
|
|
677
|
+
getFocusedRouteDepth(previousFocusedState as NavigationState)
|
|
663
678
|
|
|
664
679
|
if (historyDelta > 0) {
|
|
665
680
|
// If history length is increased, we should pushState
|
package/src/views/Navigator.tsx
CHANGED
|
@@ -4,6 +4,7 @@ import {
|
|
|
4
4
|
StackRouter,
|
|
5
5
|
useNavigationBuilder,
|
|
6
6
|
} from '@react-navigation/native'
|
|
7
|
+
import { NavigationRouteContext } from '@react-navigation/core'
|
|
7
8
|
import * as React from 'react'
|
|
8
9
|
import { SafeAreaView } from 'react-native-safe-area-context'
|
|
9
10
|
import { useFilterScreenChildren } from '../layouts/withLayoutContext'
|
|
@@ -13,7 +14,7 @@ import {
|
|
|
13
14
|
useNotFoundState,
|
|
14
15
|
} from '../notFoundState'
|
|
15
16
|
import { useContextKey } from '../router/Route'
|
|
16
|
-
import {
|
|
17
|
+
import { getLinking } from '../router/linkingConfig'
|
|
17
18
|
import { routeNode as globalRouteNode, initialPathname } from '../router/router'
|
|
18
19
|
import { registerProtectedRoutes, unregisterProtectedRoutes } from '../router/router'
|
|
19
20
|
import { useSortedScreens, getQualifiedRouteComponent } from '../router/useScreens'
|
|
@@ -24,6 +25,46 @@ import { Screen } from './Screen'
|
|
|
24
25
|
// at a time anyway, we can safely reuse the same component instance.
|
|
25
26
|
const SLOT_STATIC_KEY = 'one-slot-static-key'
|
|
26
27
|
|
|
28
|
+
// resolve a navigator's initialRouteName by asking the linking config —
|
|
29
|
+
// the same getStateFromPath NavigationContainer uses for initialState —
|
|
30
|
+
// and walking the resulting nested state down to this navigator's depth.
|
|
31
|
+
//
|
|
32
|
+
// the contextKey of a layout (e.g. `/(public)/(auth-flow)`) lines up
|
|
33
|
+
// segment-for-segment with the route names react-navigation uses in its
|
|
34
|
+
// state tree, so this is a lookup at the right depth, not a re-derivation.
|
|
35
|
+
//
|
|
36
|
+
// hoisting wrinkle: when a directory has no `_layout.tsx`, its children
|
|
37
|
+
// are flattened into the nearest parent navigator with a multi-segment
|
|
38
|
+
// route name like `dashboard/[appId]/index`. the walker accepts these by
|
|
39
|
+
// consuming as many contextKey segments as the route's name spans.
|
|
40
|
+
function resolveInitialRouteFromLinking(
|
|
41
|
+
contextKey: string,
|
|
42
|
+
browserPath: string
|
|
43
|
+
): string | undefined {
|
|
44
|
+
const linking = getLinking()
|
|
45
|
+
if (!linking?.getStateFromPath) return undefined
|
|
46
|
+
|
|
47
|
+
let current = linking.getStateFromPath(browserPath, linking.config)
|
|
48
|
+
const segments = contextKey.split('/').filter(Boolean)
|
|
49
|
+
|
|
50
|
+
let i = 0
|
|
51
|
+
while (i < segments.length) {
|
|
52
|
+
if (!current?.routes?.length) return undefined
|
|
53
|
+
const idx = current.index ?? current.routes.length - 1
|
|
54
|
+
const focused = current.routes[idx]
|
|
55
|
+
if (!focused?.name || !focused.state) return undefined
|
|
56
|
+
const nameSegments = focused.name.split('/').filter(Boolean)
|
|
57
|
+
const expected = segments.slice(i, i + nameSegments.length).join('/')
|
|
58
|
+
if (focused.name !== expected) return undefined
|
|
59
|
+
current = focused.state
|
|
60
|
+
i += nameSegments.length
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
if (!current?.routes?.length) return undefined
|
|
64
|
+
const idx = current.index ?? current.routes.length - 1
|
|
65
|
+
return current.routes[idx]?.name
|
|
66
|
+
}
|
|
67
|
+
|
|
27
68
|
type NavigatorTypes = ReturnType<typeof useNavigationBuilder>
|
|
28
69
|
|
|
29
70
|
// Import RouteNode type for slot state
|
|
@@ -174,63 +215,67 @@ function QualifiedNavigator({
|
|
|
174
215
|
}: NavigatorProps & { contextKey: string; screens: React.ReactNode[] }) {
|
|
175
216
|
// LATE MOUNT FIX: when a parent layout conditionally renders (auth gate,
|
|
176
217
|
// suspense resolve, provider init, etc.), this navigator may mount after
|
|
177
|
-
// initialState was consumed. compute the correct
|
|
178
|
-
// original URL so the navigator starts on the
|
|
179
|
-
// defaulting to the first child. uses
|
|
180
|
-
// instead of window.location.pathname
|
|
181
|
-
// can push a wrong URL during the delay.
|
|
218
|
+
// initialState was consumed by NavigationContainer. compute the correct
|
|
219
|
+
// initialRouteName from the original URL so the navigator starts on the
|
|
220
|
+
// right route instead of defaulting to the first child. uses
|
|
221
|
+
// initialPathname (captured at setup) instead of window.location.pathname
|
|
222
|
+
// because React Navigation's linking can push a wrong URL during the delay.
|
|
182
223
|
//
|
|
183
|
-
//
|
|
184
|
-
//
|
|
185
|
-
//
|
|
186
|
-
//
|
|
187
|
-
//
|
|
188
|
-
//
|
|
189
|
-
// don't
|
|
190
|
-
//
|
|
191
|
-
//
|
|
192
|
-
// commit ea96e360
|
|
224
|
+
// resolution uses the linking config's getStateFromPath — the same
|
|
225
|
+
// function NavigationContainer uses to build the initial state — and
|
|
226
|
+
// walks the resulting nested state down to this navigator's depth. that
|
|
227
|
+
// covers both:
|
|
228
|
+
// - sibling route groups, e.g. `(public)` vs `(authed)` at the root
|
|
229
|
+
// (pattern matching alone ties at specificity 0 because group
|
|
230
|
+
// segments don't appear in URLs)
|
|
231
|
+
// - hoisted deep dynamic routes, e.g. `project/[projectId]/index` as
|
|
232
|
+
// a flat sibling under (app) when there's no intermediate _layout
|
|
233
|
+
// (seen in soot, commit ea96e360 — picking the first sibling mounts
|
|
234
|
+
// `index` while the browser URL is still /project/foo)
|
|
235
|
+
// when this navigator is mounting because the user navigated to a path that
|
|
236
|
+
// targets a screen inside it (e.g. clicking /docs/sootsim while the docs
|
|
237
|
+
// navigator hasn't been mounted yet), getNavigateAction encodes the deep
|
|
238
|
+
// target as the parent route's `params.screen` chain. read that directly
|
|
239
|
+
// here so we don't have to re-derive it from a URL — useful in prod where
|
|
240
|
+
// React Navigation's params consumption can race the late mount and leave
|
|
241
|
+
// the navigator on the first alphabetical screen (e.g. `index`) instead of
|
|
242
|
+
// the actual target.
|
|
243
|
+
const parentRoute = React.useContext(NavigationRouteContext)
|
|
244
|
+
const screenFromParent =
|
|
245
|
+
parentRoute &&
|
|
246
|
+
typeof parentRoute.params === 'object' &&
|
|
247
|
+
parentRoute.params !== null &&
|
|
248
|
+
typeof (parentRoute.params as any).screen === 'string'
|
|
249
|
+
? (parentRoute.params as any).screen
|
|
250
|
+
: undefined
|
|
251
|
+
|
|
193
252
|
const resolvedInitialRouteName = React.useMemo(() => {
|
|
194
253
|
if (initialRouteName) return initialRouteName
|
|
195
254
|
|
|
255
|
+
if (screenFromParent) {
|
|
256
|
+
const hasScreen = screens.some(
|
|
257
|
+
(s) => (s as any)?.props?.name === screenFromParent
|
|
258
|
+
)
|
|
259
|
+
if (hasScreen) return screenFromParent
|
|
260
|
+
}
|
|
261
|
+
|
|
196
262
|
const browserPath =
|
|
197
263
|
initialPathname ??
|
|
198
264
|
(typeof window !== 'undefined' ? window.location.pathname : undefined)
|
|
199
265
|
if (!browserPath) return undefined
|
|
200
266
|
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
// when the layout path contains dynamic segments like
|
|
204
|
-
// /project/[projectId] — a literal startsWith won't match `/project/foo`),
|
|
205
|
-
// prepend the layout prefix to each screen name and match the full
|
|
206
|
-
// pattern against browserPath. matchRoutePattern handles dynamic segments
|
|
207
|
-
// segment-by-segment, so both the prefix and the screen-relative suffix
|
|
208
|
-
// resolve correctly.
|
|
209
|
-
//
|
|
210
|
-
// contextKey is the layout's path including group segments, e.g.
|
|
211
|
-
// `/(app)/project/[projectId]` or `/hooks/cases/route-group-pathname/(tabs)`.
|
|
212
|
-
// stripping groups gives the URL-relevant prefix the screens live under.
|
|
213
|
-
const layoutUrlPrefix = stripGroupSegmentsFromPath(contextKey).replace(/\/+$/, '')
|
|
214
|
-
|
|
215
|
-
// score each screen by how specifically its full pattern matches the
|
|
216
|
-
// URL. screen names may contain dynamic segments `[param]`/`[...param]`.
|
|
217
|
-
// matchRoutePattern does a prefix match so layout screens (like
|
|
218
|
-
// `project`) can match deeper URLs; the specificity score then tiebreaks
|
|
219
|
-
// to pick the best leaf.
|
|
220
|
-
let best: { name: string; specificity: number } | undefined
|
|
221
|
-
for (const screen of screens) {
|
|
222
|
-
const name = (screen as any)?.props?.name
|
|
223
|
-
if (!name) continue
|
|
224
|
-
const fullPattern = layoutUrlPrefix ? `${layoutUrlPrefix}/${name}` : name
|
|
225
|
-
const match = matchRoutePattern(fullPattern, browserPath)
|
|
226
|
-
if (!match) continue
|
|
227
|
-
if (!best || match.specificity > best.specificity) {
|
|
228
|
-
best = { name, specificity: match.specificity }
|
|
229
|
-
}
|
|
230
|
-
}
|
|
267
|
+
const resolved = resolveInitialRouteFromLinking(contextKey, browserPath)
|
|
268
|
+
if (!resolved) return undefined
|
|
231
269
|
|
|
232
|
-
return
|
|
233
|
-
|
|
270
|
+
// only return a name that is actually one of this navigator's screens.
|
|
271
|
+
// if the linking state's depth doesn't line up with screens here (e.g.
|
|
272
|
+
// a custom navigator that filters screens), fall back to letting react
|
|
273
|
+
// navigation pick its default.
|
|
274
|
+
const hasScreen = screens.some(
|
|
275
|
+
(s) => (s as any)?.props?.name === resolved
|
|
276
|
+
)
|
|
277
|
+
return hasScreen ? resolved : undefined
|
|
278
|
+
}, [initialRouteName, screens, contextKey, screenFromParent])
|
|
234
279
|
|
|
235
280
|
const { state, navigation, descriptors, NavigationContent } = useNavigationBuilder(
|
|
236
281
|
router,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useLinking.d.ts","sourceRoot":"","sources":["../../src/fork/useLinking.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAML,KAAK,sBAAsB,EAE3B,KAAK,aAAa,EAEnB,MAAM,wBAAwB,CAAA;AAE/B,OAAO,EAAE,gBAAgB,IAAI,uBAAuB,EAAE,MAAM,oBAAoB,CAAA;AAEhF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAE9D,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAgB9B,KAAK,WAAW,GAAG,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"useLinking.d.ts","sourceRoot":"","sources":["../../src/fork/useLinking.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAML,KAAK,sBAAsB,EAE3B,KAAK,aAAa,EAEnB,MAAM,wBAAwB,CAAA;AAE/B,OAAO,EAAE,gBAAgB,IAAI,uBAAuB,EAAE,MAAM,oBAAoB,CAAA;AAEhF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAE9D,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAgB9B,KAAK,WAAW,GAAG,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAAA;AA0E7D;;GAEG;AACH,eAAO,MAAM,MAAM,GAAI,IAAI,MAAM,OAAO,CAAC,IAAI,CAAC,eAO7C,CAAA;AAID,KAAK,OAAO,GAAG,cAAc,CAAC,aAAa,CAAC,CAAA;AAE5C,wBAAgB,UAAU,CACxB,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,sBAAsB,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,EAClE,EACE,OAAc,EACd,MAAM,EACN,gBAA0C,EAC1C,gBAA0C,EAC1C,kBAA8C,GAC/C,EAAE,OAAO,EACV,kBAAkB,EAAE,CAAC,mBAAmB,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI;2BAe5D,WAAW,CAAC,WAAW,GAAG,SAAS,CAAC;EAgkB9C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Navigator.d.ts","sourceRoot":"","sources":["../../src/views/Navigator.tsx"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,aAAa,EAElB,oBAAoB,EACrB,MAAM,0BAA0B,CAAA;
|
|
1
|
+
{"version":3,"file":"Navigator.d.ts","sourceRoot":"","sources":["../../src/views/Navigator.tsx"],"names":[],"mappings":"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"}
|