one 2.9.1 → 2.9.2
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/router/router.cjs +2 -1
- package/dist/cjs/router/router.native.cjs +5 -2
- package/dist/cjs/router/router.native.js +5 -2
- package/dist/cjs/router/router.native.js.map +1 -1
- package/dist/cjs/router/utils/getNativeStackReplaceAction.cjs +54 -0
- package/dist/cjs/router/utils/getNativeStackReplaceAction.native.cjs +58 -0
- package/dist/cjs/router/utils/getNativeStackReplaceAction.native.js +60 -0
- package/dist/cjs/router/utils/getNativeStackReplaceAction.native.js.map +1 -0
- package/dist/esm/router/router.mjs +1 -1
- package/dist/esm/router/router.mjs.map +1 -1
- package/dist/esm/router/router.native.js +5 -2
- package/dist/esm/router/router.native.js.map +1 -1
- package/dist/esm/router/utils/getNativeStackReplaceAction.mjs +35 -0
- package/dist/esm/router/utils/getNativeStackReplaceAction.mjs.map +1 -0
- package/dist/esm/router/utils/getNativeStackReplaceAction.native.js +37 -0
- package/dist/esm/router/utils/getNativeStackReplaceAction.native.js.map +1 -0
- package/package.json +17 -17
- package/src/router/router.ts +9 -2
- package/src/router/utils/getNativeStackReplaceAction.ts +55 -0
- package/types/router/router.d.ts.map +1 -1
- package/types/router/utils/getNativeStackReplaceAction.d.ts +12 -0
- package/types/router/utils/getNativeStackReplaceAction.d.ts.map +1 -0
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getNativeStackReplaceAction.js","names":[],"sources":["esm/router/utils/getNativeStackReplaceAction.js"],"sourcesContent":["import { StackActions } from \"@react-navigation/native\";\nimport { matchDynamicName, matchGroupName } from \"../matchers\";\nimport { getNavigateAction } from \"./getNavigateAction\";\nfunction getNativeStackReplaceAction(actionState, navigationState) {\n while (actionState && navigationState) {\n const currentRoute = navigationState.routes[navigationState.index];\n const targetRoute = actionState.routes[actionState.index ?? actionState.routes.length - 1];\n if (currentRoute.name !== targetRoute.name && (matchGroupName(currentRoute.name) || matchGroupName(targetRoute.name))) {\n return null;\n }\n const dynamicMatch = matchDynamicName(targetRoute.name);\n const changesDynamicScreen = currentRoute.name === targetRoute.name && dynamicMatch && currentRoute.params?.[dynamicMatch.name] !== targetRoute.params?.[dynamicMatch.name];\n if (!currentRoute.state || !targetRoute.state || changesDynamicScreen) {\n if ((currentRoute.name !== targetRoute.name || changesDynamicScreen) && navigationState.type === \"stack\" && navigationState.routeNames.includes(targetRoute.name)) {\n const { payload } = getNavigateAction(actionState, navigationState, \"REPLACE\");\n return {\n ...StackActions.replace(payload.name, payload.params),\n target: navigationState.key,\n source: currentRoute.key\n };\n }\n return null;\n }\n if (currentRoute.name !== targetRoute.name) {\n return null;\n }\n actionState = targetRoute.state;\n navigationState = currentRoute.state;\n }\n return null;\n}\nexport {\n getNativeStackReplaceAction\n};\n//# sourceMappingURL=getNativeStackReplaceAction.js.map\n"],"mappings":";;;;;AAGA,SAAS,4BAA4B,aAAa,iBAAiB;CACjE,OAAO,eAAe,iBAAiB;EACrC,MAAM,eAAe,gBAAgB,OAAO,gBAAgB;EAC5D,MAAM,cAAc,YAAY,OAAO,YAAY,SAAS,YAAY,OAAO,SAAS;EACxF,IAAI,aAAa,SAAS,YAAY,SAAS,eAAe,aAAa,IAAI,KAAK,eAAe,YAAY,IAAI,IAAI;GACrH,OAAO;EACT;EACA,MAAM,eAAe,iBAAiB,YAAY,IAAI;EACtD,MAAM,uBAAuB,aAAa,SAAS,YAAY,QAAQ,gBAAgB,aAAa,SAAS,aAAa,UAAU,YAAY,SAAS,aAAa;EACtK,IAAI,CAAC,aAAa,SAAS,CAAC,YAAY,SAAS,sBAAsB;GACrE,KAAK,aAAa,SAAS,YAAY,QAAQ,yBAAyB,gBAAgB,SAAS,WAAW,gBAAgB,WAAW,SAAS,YAAY,IAAI,GAAG;IACjK,MAAM,EAAE,YAAY,kBAAkB,aAAa,iBAAiB,SAAS;IAC7E,OAAO;KACL,GAAG,aAAa,QAAQ,QAAQ,MAAM,QAAQ,MAAM;KACpD,QAAQ,gBAAgB;KACxB,QAAQ,aAAa;IACvB;GACF;GACA,OAAO;EACT;EACA,IAAI,aAAa,SAAS,YAAY,MAAM;GAC1C,OAAO;EACT;EACA,cAAc,YAAY;EAC1B,kBAAkB,aAAa;CACjC;CACA,OAAO;AACT"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import { StackActions } from "@react-navigation/native";
|
|
2
|
+
import { matchDynamicName, matchGroupName } from "../matchers.native.js";
|
|
3
|
+
import { getNavigateAction } from "./getNavigateAction.native.js";
|
|
4
|
+
|
|
5
|
+
function getNativeStackReplaceAction(actionState, navigationState) {
|
|
6
|
+
while (actionState && navigationState) {
|
|
7
|
+
var _actionState_index;
|
|
8
|
+
var _currentRoute_params, _targetRoute_params;
|
|
9
|
+
var currentRoute = navigationState.routes[navigationState.index];
|
|
10
|
+
var targetRoute = actionState.routes[(_actionState_index = actionState.index) !== null && _actionState_index !== void 0 ? _actionState_index : actionState.routes.length - 1];
|
|
11
|
+
if (currentRoute.name !== targetRoute.name && (matchGroupName(currentRoute.name) || matchGroupName(targetRoute.name))) {
|
|
12
|
+
return null;
|
|
13
|
+
}
|
|
14
|
+
var dynamicMatch = matchDynamicName(targetRoute.name);
|
|
15
|
+
var changesDynamicScreen = currentRoute.name === targetRoute.name && dynamicMatch && ((_currentRoute_params = currentRoute.params) === null || _currentRoute_params === void 0 ? void 0 : _currentRoute_params[dynamicMatch.name]) !== ((_targetRoute_params = targetRoute.params) === null || _targetRoute_params === void 0 ? void 0 : _targetRoute_params[dynamicMatch.name]);
|
|
16
|
+
if (!currentRoute.state || !targetRoute.state || changesDynamicScreen) {
|
|
17
|
+
if ((currentRoute.name !== targetRoute.name || changesDynamicScreen) && navigationState.type === "stack" && navigationState.routeNames.includes(targetRoute.name)) {
|
|
18
|
+
var { payload } = getNavigateAction(actionState, navigationState, "REPLACE");
|
|
19
|
+
return {
|
|
20
|
+
...StackActions.replace(payload.name, payload.params),
|
|
21
|
+
target: navigationState.key,
|
|
22
|
+
source: currentRoute.key
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
return null;
|
|
26
|
+
}
|
|
27
|
+
if (currentRoute.name !== targetRoute.name) {
|
|
28
|
+
return null;
|
|
29
|
+
}
|
|
30
|
+
actionState = targetRoute.state;
|
|
31
|
+
navigationState = currentRoute.state;
|
|
32
|
+
}
|
|
33
|
+
return null;
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
export { getNativeStackReplaceAction };
|
|
37
|
+
//# sourceMappingURL=getNativeStackReplaceAction.native.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getNativeStackReplaceAction.native.js","names":[],"sources":["esm/router/utils/getNativeStackReplaceAction.native.js"],"sourcesContent":["import { StackActions } from \"@react-navigation/native\";\nimport { matchDynamicName, matchGroupName } from \"../matchers\";\nimport { getNavigateAction } from \"./getNavigateAction\";\nfunction getNativeStackReplaceAction(actionState, navigationState) {\n while (actionState && navigationState) {\n var _actionState_index;\n var _currentRoute_params, _targetRoute_params;\n var currentRoute = navigationState.routes[navigationState.index];\n var targetRoute = actionState.routes[(_actionState_index = actionState.index) !== null && _actionState_index !== void 0 ? _actionState_index : actionState.routes.length - 1];\n if (currentRoute.name !== targetRoute.name && (matchGroupName(currentRoute.name) || matchGroupName(targetRoute.name))) {\n return null;\n }\n var dynamicMatch = matchDynamicName(targetRoute.name);\n var changesDynamicScreen = currentRoute.name === targetRoute.name && dynamicMatch && ((_currentRoute_params = currentRoute.params) === null || _currentRoute_params === void 0 ? void 0 : _currentRoute_params[dynamicMatch.name]) !== ((_targetRoute_params = targetRoute.params) === null || _targetRoute_params === void 0 ? void 0 : _targetRoute_params[dynamicMatch.name]);\n if (!currentRoute.state || !targetRoute.state || changesDynamicScreen) {\n if ((currentRoute.name !== targetRoute.name || changesDynamicScreen) && navigationState.type === \"stack\" && navigationState.routeNames.includes(targetRoute.name)) {\n var { payload } = getNavigateAction(actionState, navigationState, \"REPLACE\");\n return {\n ...StackActions.replace(payload.name, payload.params),\n target: navigationState.key,\n source: currentRoute.key\n };\n }\n return null;\n }\n if (currentRoute.name !== targetRoute.name) {\n return null;\n }\n actionState = targetRoute.state;\n navigationState = currentRoute.state;\n }\n return null;\n}\nexport {\n getNativeStackReplaceAction\n};\n//# sourceMappingURL=getNativeStackReplaceAction.js.map\n"],"mappings":";;;;;AAGA,SAAS,4BAA4B,aAAa,iBAAiB;CACjE,OAAO,eAAe,iBAAiB;EACrC,IAAI;EACJ,IAAI,sBAAsB;EAC1B,IAAI,eAAe,gBAAgB,OAAO,gBAAgB;EAC1D,IAAI,cAAc,YAAY,QAAQ,qBAAqB,YAAY,WAAW,QAAQ,uBAAuB,KAAK,IAAI,qBAAqB,YAAY,OAAO,SAAS;EAC3K,IAAI,aAAa,SAAS,YAAY,SAAS,eAAe,aAAa,IAAI,KAAK,eAAe,YAAY,IAAI,IAAI;GACrH,OAAO;EACT;EACA,IAAI,eAAe,iBAAiB,YAAY,IAAI;EACpD,IAAI,uBAAuB,aAAa,SAAS,YAAY,QAAQ,kBAAkB,uBAAuB,aAAa,YAAY,QAAQ,yBAAyB,KAAK,IAAI,KAAK,IAAI,qBAAqB,aAAa,aAAa,sBAAsB,YAAY,YAAY,QAAQ,wBAAwB,KAAK,IAAI,KAAK,IAAI,oBAAoB,aAAa;EAC1W,IAAI,CAAC,aAAa,SAAS,CAAC,YAAY,SAAS,sBAAsB;GACrE,KAAK,aAAa,SAAS,YAAY,QAAQ,yBAAyB,gBAAgB,SAAS,WAAW,gBAAgB,WAAW,SAAS,YAAY,IAAI,GAAG;IACjK,IAAI,EAAE,YAAY,kBAAkB,aAAa,iBAAiB,SAAS;IAC3E,OAAO;KACL,GAAG,aAAa,QAAQ,QAAQ,MAAM,QAAQ,MAAM;KACpD,QAAQ,gBAAgB;KACxB,QAAQ,aAAa;IACvB;GACF;GACA,OAAO;EACT;EACA,IAAI,aAAa,SAAS,YAAY,MAAM;GAC1C,OAAO;EACT;EACA,cAAc,YAAY;EAC1B,kBAAkB,aAAa;CACjC;CACA,OAAO;AACT"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "one",
|
|
3
|
-
"version": "2.9.
|
|
3
|
+
"version": "2.9.2",
|
|
4
4
|
"description": "One is a React framework for web, iOS, and Android apps.",
|
|
5
5
|
"license": "BSD-3-Clause",
|
|
6
6
|
"sideEffects": [
|
|
@@ -253,20 +253,20 @@
|
|
|
253
253
|
"@react-navigation/routers": "8.0.0-alpha.21",
|
|
254
254
|
"@rozenite/middleware": "^2.5.0",
|
|
255
255
|
"@ungap/structured-clone": "^1.2.0",
|
|
256
|
-
"@vxrn/color-scheme": "2.9.
|
|
257
|
-
"@vxrn/compiler": "2.9.
|
|
258
|
-
"@vxrn/resolve": "2.9.
|
|
259
|
-
"@vxrn/tslib-lite": "2.9.
|
|
260
|
-
"@vxrn/use-isomorphic-layout-effect": "2.9.
|
|
261
|
-
"@vxrn/utils": "2.9.
|
|
256
|
+
"@vxrn/color-scheme": "2.9.2",
|
|
257
|
+
"@vxrn/compiler": "2.9.2",
|
|
258
|
+
"@vxrn/resolve": "2.9.2",
|
|
259
|
+
"@vxrn/tslib-lite": "2.9.2",
|
|
260
|
+
"@vxrn/use-isomorphic-layout-effect": "2.9.2",
|
|
261
|
+
"@vxrn/utils": "2.9.2",
|
|
262
262
|
"citty": "^0.1.6",
|
|
263
263
|
"core-js": "^3.38.1",
|
|
264
|
-
"create-vxrn": "2.9.
|
|
264
|
+
"create-vxrn": "2.9.2",
|
|
265
265
|
"escape-string-regexp": "^5.0.0",
|
|
266
266
|
"fast-deep-equal": "^3.1.3",
|
|
267
267
|
"fast-glob": "^3.3.3",
|
|
268
268
|
"fs-extra": "^11.2.0",
|
|
269
|
-
"hono": "^4.
|
|
269
|
+
"hono": "^4.13.11",
|
|
270
270
|
"lightningcss": "^1.30.1",
|
|
271
271
|
"magic-string": "^0.30.21",
|
|
272
272
|
"micromatch": "^4.0.8",
|
|
@@ -283,7 +283,7 @@
|
|
|
283
283
|
"tsconfig-paths": "^4",
|
|
284
284
|
"use-latest-callback": "^0.3.5",
|
|
285
285
|
"vite": "^8.2.2",
|
|
286
|
-
"vxrn": "2.9.
|
|
286
|
+
"vxrn": "2.9.2",
|
|
287
287
|
"web-streams-polyfill": "^4.3.0",
|
|
288
288
|
"ws": "^8.21.0",
|
|
289
289
|
"xxhashjs": "^0.2.2"
|
|
@@ -313,7 +313,7 @@
|
|
|
313
313
|
"@babel/types": "^7.28.5",
|
|
314
314
|
"babel-dead-code-elimination": "1.0.10",
|
|
315
315
|
"babel-plugin-module-resolver": "^5.0.2",
|
|
316
|
-
"@vxrn/vite-plugin-metro": "2.9.
|
|
316
|
+
"@vxrn/vite-plugin-metro": "2.9.2"
|
|
317
317
|
},
|
|
318
318
|
"peerDependenciesMeta": {
|
|
319
319
|
"@react-native/babel-preset": {
|
|
@@ -375,19 +375,19 @@
|
|
|
375
375
|
}
|
|
376
376
|
},
|
|
377
377
|
"devDependencies": {
|
|
378
|
-
"@tamagui/sheet": "3.1.
|
|
378
|
+
"@tamagui/sheet": "3.1.2",
|
|
379
379
|
"@callstack/liquid-glass": "^0.8.1",
|
|
380
380
|
"@react-native/babel-plugin-codegen": "0.88.0",
|
|
381
381
|
"@react-native/codegen": "^0.88.0",
|
|
382
382
|
"@react-navigation/core": "8.0.0-alpha.41",
|
|
383
383
|
"@react-navigation/drawer": "8.0.0-alpha.58",
|
|
384
384
|
"@react-navigation/native": "8.0.0-alpha.51",
|
|
385
|
-
"@tamagui/build": "3.1.
|
|
385
|
+
"@tamagui/build": "3.1.2",
|
|
386
386
|
"@types/node": "^24.10.0",
|
|
387
387
|
"@types/react-dom": "^19.3.0",
|
|
388
388
|
"@types/react-test-renderer": "^19.1.0",
|
|
389
389
|
"@types/xxhashjs": "^0.2.4",
|
|
390
|
-
"@vxrn/emitter": "2.9.
|
|
390
|
+
"@vxrn/emitter": "2.9.2",
|
|
391
391
|
"depcheck": "^1.4.7",
|
|
392
392
|
"esbuild": "^0.25.12",
|
|
393
393
|
"immer": "^10.1.1",
|
|
@@ -406,7 +406,7 @@
|
|
|
406
406
|
"typescript": "7.0.2",
|
|
407
407
|
"vitest": "^4.1.0",
|
|
408
408
|
"yoga-layout": "^3.2.1",
|
|
409
|
-
"@tamagui/web": "3.1.
|
|
409
|
+
"@tamagui/web": "3.1.2",
|
|
410
410
|
"@babel/core": "^7.28.5",
|
|
411
411
|
"@babel/generator": "7.29.7",
|
|
412
412
|
"@babel/parser": "^7.28.5",
|
|
@@ -415,7 +415,7 @@
|
|
|
415
415
|
"@babel/types": "^7.28.5",
|
|
416
416
|
"babel-dead-code-elimination": "1.0.10",
|
|
417
417
|
"babel-plugin-module-resolver": "^5.0.2",
|
|
418
|
-
"@vxrn/vite-plugin-metro": "2.9.
|
|
418
|
+
"@vxrn/vite-plugin-metro": "2.9.2"
|
|
419
419
|
},
|
|
420
420
|
"publishConfig": {
|
|
421
421
|
"access": "public"
|
|
@@ -581,7 +581,7 @@
|
|
|
581
581
|
}
|
|
582
582
|
}
|
|
583
583
|
},
|
|
584
|
-
"releaseSourceCommit": "
|
|
584
|
+
"releaseSourceCommit": "ce34ec2d7ee2bcbc559d7c3f110f5324dea3bff6",
|
|
585
585
|
"repository": {
|
|
586
586
|
"type": "git",
|
|
587
587
|
"url": "git+https://github.com/onejs/one.git",
|
package/src/router/router.ts
CHANGED
|
@@ -63,6 +63,7 @@ import { sortRoutes } from './sortRoutes'
|
|
|
63
63
|
import { getQualifiedRouteComponent } from './useScreens'
|
|
64
64
|
import { preloadRouteModules } from './useViteRoutes'
|
|
65
65
|
import { getNavigateAction } from './utils/getNavigateAction'
|
|
66
|
+
import { getNativeStackReplaceAction } from './utils/getNativeStackReplaceAction'
|
|
66
67
|
import { setClientMatches } from '../useMatches'
|
|
67
68
|
import type { RouteMatch } from '../useMatches'
|
|
68
69
|
import {
|
|
@@ -1317,6 +1318,7 @@ export async function linkTo(
|
|
|
1317
1318
|
|
|
1318
1319
|
// Run async route validation before navigation
|
|
1319
1320
|
const matchingRouteNode = findRouteNodeFromState(state, routeNode)
|
|
1321
|
+
let isColdRoute = false
|
|
1320
1322
|
if (matchingRouteNode?.loadRoute) {
|
|
1321
1323
|
setValidationState({ status: 'validating', lastValidatedHref: href })
|
|
1322
1324
|
|
|
@@ -1355,6 +1357,7 @@ export async function linkTo(
|
|
|
1355
1357
|
} catch (error) {
|
|
1356
1358
|
// Handle Suspense promises thrown by loadRoute in dev mode
|
|
1357
1359
|
if (error && typeof (error as any).then === 'function') {
|
|
1360
|
+
isColdRoute = true
|
|
1358
1361
|
// native dev screens own module suspension. dispatch now so a cold
|
|
1359
1362
|
// route does not hold navigation on the redirect screen while it loads.
|
|
1360
1363
|
const routeLoading = (error as Promise<any>).catch(() => {})
|
|
@@ -1435,7 +1438,11 @@ export async function linkTo(
|
|
|
1435
1438
|
// navigation. the action is built first, so a target it cannot reach
|
|
1436
1439
|
// publishes nothing.
|
|
1437
1440
|
const action =
|
|
1438
|
-
event === 'REPLACE'
|
|
1441
|
+
event === 'REPLACE'
|
|
1442
|
+
? process.env.TAMAGUI_TARGET === 'native' && !isColdRoute
|
|
1443
|
+
? getNativeStackReplaceAction(state, freshRootState)
|
|
1444
|
+
: null
|
|
1445
|
+
: getNavigateAction(state, freshRootState, event)
|
|
1439
1446
|
startTransition(() => {
|
|
1440
1447
|
updateState(optimisticState)
|
|
1441
1448
|
pendingNavigationPathname = targetPathname
|
|
@@ -1457,7 +1464,7 @@ export async function linkTo(
|
|
|
1457
1464
|
const currentFocusedRoute = freshRootState.routes[freshRootState.index]
|
|
1458
1465
|
const currentFocusedName = currentFocusedRoute?.name
|
|
1459
1466
|
|
|
1460
|
-
if (isRootTarget && isGroupTarget && hasFreshRootState) {
|
|
1467
|
+
if (event !== 'REPLACE' && isRootTarget && isGroupTarget && hasFreshRootState) {
|
|
1461
1468
|
const targetRoute = state.routes[state.index ?? state.routes.length - 1]
|
|
1462
1469
|
const targetRootName = targetRoute.name
|
|
1463
1470
|
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
import type { NavigationState } from '@react-navigation/core'
|
|
2
|
+
import { StackActions } from '@react-navigation/native'
|
|
3
|
+
import type { OneRouter } from '../../interfaces/router'
|
|
4
|
+
import { matchDynamicName, matchGroupName } from '../matchers'
|
|
5
|
+
import { getNavigateAction } from './getNavigateAction'
|
|
6
|
+
|
|
7
|
+
export function getNativeStackReplaceAction(
|
|
8
|
+
actionState: OneRouter.ResultState,
|
|
9
|
+
navigationState: NavigationState
|
|
10
|
+
) {
|
|
11
|
+
while (actionState && navigationState) {
|
|
12
|
+
const currentRoute = navigationState.routes[navigationState.index]
|
|
13
|
+
const targetRoute =
|
|
14
|
+
actionState.routes[actionState.index ?? actionState.routes.length - 1]
|
|
15
|
+
|
|
16
|
+
if (
|
|
17
|
+
currentRoute.name !== targetRoute.name &&
|
|
18
|
+
(matchGroupName(currentRoute.name) || matchGroupName(targetRoute.name))
|
|
19
|
+
) {
|
|
20
|
+
return null
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
const dynamicMatch = matchDynamicName(targetRoute.name)
|
|
24
|
+
const changesDynamicScreen =
|
|
25
|
+
currentRoute.name === targetRoute.name &&
|
|
26
|
+
dynamicMatch &&
|
|
27
|
+
currentRoute.params?.[dynamicMatch.name] !== targetRoute.params?.[dynamicMatch.name]
|
|
28
|
+
|
|
29
|
+
// a new dynamic screen instance can own a nested navigator of its own.
|
|
30
|
+
if (!currentRoute.state || !targetRoute.state || changesDynamicScreen) {
|
|
31
|
+
if (
|
|
32
|
+
(currentRoute.name !== targetRoute.name || changesDynamicScreen) &&
|
|
33
|
+
navigationState.type === 'stack' &&
|
|
34
|
+
navigationState.routeNames.includes(targetRoute.name)
|
|
35
|
+
) {
|
|
36
|
+
const { payload } = getNavigateAction(actionState, navigationState, 'REPLACE')
|
|
37
|
+
return {
|
|
38
|
+
...StackActions.replace(payload.name, payload.params),
|
|
39
|
+
target: navigationState.key,
|
|
40
|
+
source: currentRoute.key,
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
return null
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
if (currentRoute.name !== targetRoute.name) {
|
|
47
|
+
return null
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
actionState = targetRoute.state as OneRouter.ResultState
|
|
51
|
+
navigationState = currentRoute.state as NavigationState
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
return null
|
|
55
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/router/router.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EACV,iCAAiC,EACjC,eAAe,EACf,aAAa,EACd,MAAM,wBAAwB,CAAA;AAE/B,OAAO,EACL,KAAK,aAAa,EAOnB,MAAM,OAAO,CAAA;AAEd,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAErD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAe1D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AAQxC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AAazD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/router/router.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import type { NavigationState } from '@react-navigation/core';
|
|
2
|
+
import type { OneRouter } from '../../interfaces/router';
|
|
3
|
+
export declare function getNativeStackReplaceAction(actionState: OneRouter.ResultState, navigationState: NavigationState): {
|
|
4
|
+
type: "REPLACE";
|
|
5
|
+
payload: {
|
|
6
|
+
readonly name: string;
|
|
7
|
+
readonly params: object | undefined;
|
|
8
|
+
};
|
|
9
|
+
target: string;
|
|
10
|
+
source: string;
|
|
11
|
+
} | null;
|
|
12
|
+
//# sourceMappingURL=getNativeStackReplaceAction.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getNativeStackReplaceAction.d.ts","sourceRoot":"","sources":["../../../src/router/utils/getNativeStackReplaceAction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAE7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAIxD,wBAAgB,2BAA2B,CACzC,WAAW,EAAE,SAAS,CAAC,WAAW,EAClC,eAAe,EAAE,eAAe;;;;;;;;SA8CjC"}
|