@react-navigation/native 7.0.0-alpha.11 → 7.0.0-alpha.12
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/lib/commonjs/createMemoryHistory.js +4 -2
- package/lib/commonjs/createMemoryHistory.js.map +1 -1
- package/lib/commonjs/useLinking.js +13 -2
- package/lib/commonjs/useLinking.js.map +1 -1
- package/lib/module/createMemoryHistory.js +4 -2
- package/lib/module/createMemoryHistory.js.map +1 -1
- package/lib/module/useLinking.js +13 -2
- package/lib/module/useLinking.js.map +1 -1
- package/lib/typescript/src/createMemoryHistory.d.ts.map +1 -1
- package/lib/typescript/src/useLinking.d.ts.map +1 -1
- package/package.json +3 -3
- package/src/createMemoryHistory.tsx +4 -2
- package/src/useLinking.tsx +23 -2
|
@@ -85,6 +85,7 @@ function createMemoryHistory() {
|
|
|
85
85
|
// Need to keep the hash part of the path if there was no previous history entry
|
|
86
86
|
// or the previous history entry had the same path
|
|
87
87
|
let pathWithHash = path;
|
|
88
|
+
const hash = pathWithHash.includes('#') ? '' : location.hash;
|
|
88
89
|
if (!items.length || items.findIndex(item => item.id === id) < 0) {
|
|
89
90
|
// There are two scenarios for creating an array with only one history record:
|
|
90
91
|
// - When loaded id not found in the items array, this function by default will replace
|
|
@@ -92,7 +93,8 @@ function createMemoryHistory() {
|
|
|
92
93
|
// the page when navigating forward in history.
|
|
93
94
|
// - This is the first time any state modifications are done
|
|
94
95
|
// So we need to push the entry as there's nothing to replace
|
|
95
|
-
|
|
96
|
+
|
|
97
|
+
pathWithHash = pathWithHash + hash;
|
|
96
98
|
items = [{
|
|
97
99
|
path: pathWithHash,
|
|
98
100
|
state,
|
|
@@ -101,7 +103,7 @@ function createMemoryHistory() {
|
|
|
101
103
|
index = 0;
|
|
102
104
|
} else {
|
|
103
105
|
if (items[index].path === path) {
|
|
104
|
-
pathWithHash = pathWithHash +
|
|
106
|
+
pathWithHash = pathWithHash + hash;
|
|
105
107
|
}
|
|
106
108
|
items[index] = {
|
|
107
109
|
path,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_nonSecure","require","createMemoryHistory","index","items","pending","interrupt","forEach","it","cb","history","id","window","state","findIndex","item","get","backIndex","_ref","path","i","push","_ref2","nanoid","slice","length","pushState","replace","_ref3","pathWithHash","
|
|
1
|
+
{"version":3,"names":["_nonSecure","require","createMemoryHistory","index","items","pending","interrupt","forEach","it","cb","history","id","window","state","findIndex","item","get","backIndex","_ref","path","i","push","_ref2","nanoid","slice","length","pushState","replace","_ref3","pathWithHash","hash","includes","location","replaceState","go","n","nextIndex","lastItemIndex","Promise","resolve","reject","done","interrupted","clearTimeout","timer","Error","title","document","ref","setTimeout","splice","onPopState","currentIndex","Math","max","last","pop","removeEventListener","addEventListener","listen","listener"],"sourceRoot":"../../src","sources":["createMemoryHistory.tsx"],"mappings":"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"}
|
|
@@ -198,6 +198,8 @@ function useLinking(ref, _ref, onUnhandledLinking) {
|
|
|
198
198
|
return;
|
|
199
199
|
}
|
|
200
200
|
const getPathForRoute = (route, state) => {
|
|
201
|
+
let path;
|
|
202
|
+
|
|
201
203
|
// If the `route` object contains a `path`, use that path as long as `route.name` and `params` still match
|
|
202
204
|
// This makes sure that we preserve the original URL for wildcard routes
|
|
203
205
|
if (route?.path) {
|
|
@@ -205,11 +207,20 @@ function useLinking(ref, _ref, onUnhandledLinking) {
|
|
|
205
207
|
if (stateForPath) {
|
|
206
208
|
const focusedRoute = (0, _core.findFocusedRoute)(stateForPath);
|
|
207
209
|
if (focusedRoute && focusedRoute.name === route.name && (0, _fastDeepEqual.default)(focusedRoute.params, route.params)) {
|
|
208
|
-
|
|
210
|
+
path = route.path;
|
|
209
211
|
}
|
|
210
212
|
}
|
|
211
213
|
}
|
|
212
|
-
|
|
214
|
+
if (path == null) {
|
|
215
|
+
path = getPathFromStateRef.current(state, configRef.current);
|
|
216
|
+
}
|
|
217
|
+
const previousRoute = previousStateRef.current ? (0, _core.findFocusedRoute)(previousStateRef.current) : undefined;
|
|
218
|
+
|
|
219
|
+
// Preserve the hash if the route didn't change
|
|
220
|
+
if (previousRoute && route && 'key' in previousRoute && 'key' in route && previousRoute.key === route.key) {
|
|
221
|
+
path = path + location.hash;
|
|
222
|
+
}
|
|
223
|
+
return path;
|
|
213
224
|
};
|
|
214
225
|
if (ref.current) {
|
|
215
226
|
// We need to record the current metadata on the first render if they aren't set
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_core","require","_fastDeepEqual","_interopRequireDefault","React","_interopRequireWildcard","_createMemoryHistory","_ServerContext","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","obj","findMatchingState","b","undefined","key","aHistoryLength","history","length","routes","bHistoryLength","aRoute","index","bRoute","aChildState","state","bChildState","series","cb","queue","Promise","resolve","callback","then","exports","linkingHandlers","useLinking","ref","_ref","onUnhandledLinking","enabled","config","getStateFromPath","getStateFromPathDefault","getPathFromState","getPathFromStateDefault","getActionFromState","getActionFromStateDefault","independent","useNavigationIndependentTree","useEffect","process","env","NODE_ENV","console","error","join","trim","handler","Symbol","push","indexOf","splice","useState","createMemoryHistory","enabledRef","useRef","configRef","getStateFromPathRef","getPathFromStateRef","getActionFromStateRef","current","validateRoutesNotExistInRootState","useCallback","navigation","rootState","getRootState","some","routeNames","includes","name","server","useContext","ServerContext","getInitialState","value","location","window","path","pathname","search","thenable","onfulfilled","catch","previousIndexRef","previousStateRef","pendingPopStatePathRef","listen","previousIndex","record","resetRoot","action","dispatch","warn","message","getPathForRoute","route","stateForPath","focusedRoute","findFocusedRoute","isEqual","params","replace","onStateChange","previousState","pendingPath","previousFocusedState","focusedState","historyDelta","nextIndex","backIndex","currentIndex","go","addListener"],"sourceRoot":"../../src","sources":["useLinking.tsx"],"mappings":"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"}
|
|
1
|
+
{"version":3,"names":["_core","require","_fastDeepEqual","_interopRequireDefault","React","_interopRequireWildcard","_createMemoryHistory","_ServerContext","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","obj","findMatchingState","b","undefined","key","aHistoryLength","history","length","routes","bHistoryLength","aRoute","index","bRoute","aChildState","state","bChildState","series","cb","queue","Promise","resolve","callback","then","exports","linkingHandlers","useLinking","ref","_ref","onUnhandledLinking","enabled","config","getStateFromPath","getStateFromPathDefault","getPathFromState","getPathFromStateDefault","getActionFromState","getActionFromStateDefault","independent","useNavigationIndependentTree","useEffect","process","env","NODE_ENV","console","error","join","trim","handler","Symbol","push","indexOf","splice","useState","createMemoryHistory","enabledRef","useRef","configRef","getStateFromPathRef","getPathFromStateRef","getActionFromStateRef","current","validateRoutesNotExistInRootState","useCallback","navigation","rootState","getRootState","some","routeNames","includes","name","server","useContext","ServerContext","getInitialState","value","location","window","path","pathname","search","thenable","onfulfilled","catch","previousIndexRef","previousStateRef","pendingPopStatePathRef","listen","previousIndex","record","resetRoot","action","dispatch","warn","message","getPathForRoute","route","stateForPath","focusedRoute","findFocusedRoute","isEqual","params","previousRoute","hash","replace","onStateChange","previousState","pendingPath","previousFocusedState","focusedState","historyDelta","nextIndex","backIndex","currentIndex","go","addListener"],"sourceRoot":"../../src","sources":["useLinking.tsx"],"mappings":"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"}
|
|
@@ -79,6 +79,7 @@ export function createMemoryHistory() {
|
|
|
79
79
|
// Need to keep the hash part of the path if there was no previous history entry
|
|
80
80
|
// or the previous history entry had the same path
|
|
81
81
|
let pathWithHash = path;
|
|
82
|
+
const hash = pathWithHash.includes('#') ? '' : location.hash;
|
|
82
83
|
if (!items.length || items.findIndex(item => item.id === id) < 0) {
|
|
83
84
|
// There are two scenarios for creating an array with only one history record:
|
|
84
85
|
// - When loaded id not found in the items array, this function by default will replace
|
|
@@ -86,7 +87,8 @@ export function createMemoryHistory() {
|
|
|
86
87
|
// the page when navigating forward in history.
|
|
87
88
|
// - This is the first time any state modifications are done
|
|
88
89
|
// So we need to push the entry as there's nothing to replace
|
|
89
|
-
|
|
90
|
+
|
|
91
|
+
pathWithHash = pathWithHash + hash;
|
|
90
92
|
items = [{
|
|
91
93
|
path: pathWithHash,
|
|
92
94
|
state,
|
|
@@ -95,7 +97,7 @@ export function createMemoryHistory() {
|
|
|
95
97
|
index = 0;
|
|
96
98
|
} else {
|
|
97
99
|
if (items[index].path === path) {
|
|
98
|
-
pathWithHash = pathWithHash +
|
|
100
|
+
pathWithHash = pathWithHash + hash;
|
|
99
101
|
}
|
|
100
102
|
items[index] = {
|
|
101
103
|
path,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["nanoid","createMemoryHistory","index","items","pending","interrupt","forEach","it","cb","history","id","window","state","findIndex","item","get","backIndex","_ref","path","i","push","_ref2","slice","length","pushState","replace","_ref3","pathWithHash","
|
|
1
|
+
{"version":3,"names":["nanoid","createMemoryHistory","index","items","pending","interrupt","forEach","it","cb","history","id","window","state","findIndex","item","get","backIndex","_ref","path","i","push","_ref2","slice","length","pushState","replace","_ref3","pathWithHash","hash","includes","location","replaceState","go","n","nextIndex","lastItemIndex","Promise","resolve","reject","done","interrupted","clearTimeout","timer","Error","title","document","ref","setTimeout","splice","onPopState","currentIndex","Math","max","last","pop","removeEventListener","addEventListener","listen","listener"],"sourceRoot":"../../src","sources":["createMemoryHistory.tsx"],"mappings":"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"}
|
package/lib/module/useLinking.js
CHANGED
|
@@ -187,6 +187,8 @@ export function useLinking(ref, _ref, onUnhandledLinking) {
|
|
|
187
187
|
return;
|
|
188
188
|
}
|
|
189
189
|
const getPathForRoute = (route, state) => {
|
|
190
|
+
let path;
|
|
191
|
+
|
|
190
192
|
// If the `route` object contains a `path`, use that path as long as `route.name` and `params` still match
|
|
191
193
|
// This makes sure that we preserve the original URL for wildcard routes
|
|
192
194
|
if (route?.path) {
|
|
@@ -194,11 +196,20 @@ export function useLinking(ref, _ref, onUnhandledLinking) {
|
|
|
194
196
|
if (stateForPath) {
|
|
195
197
|
const focusedRoute = findFocusedRoute(stateForPath);
|
|
196
198
|
if (focusedRoute && focusedRoute.name === route.name && isEqual(focusedRoute.params, route.params)) {
|
|
197
|
-
|
|
199
|
+
path = route.path;
|
|
198
200
|
}
|
|
199
201
|
}
|
|
200
202
|
}
|
|
201
|
-
|
|
203
|
+
if (path == null) {
|
|
204
|
+
path = getPathFromStateRef.current(state, configRef.current);
|
|
205
|
+
}
|
|
206
|
+
const previousRoute = previousStateRef.current ? findFocusedRoute(previousStateRef.current) : undefined;
|
|
207
|
+
|
|
208
|
+
// Preserve the hash if the route didn't change
|
|
209
|
+
if (previousRoute && route && 'key' in previousRoute && 'key' in route && previousRoute.key === route.key) {
|
|
210
|
+
path = path + location.hash;
|
|
211
|
+
}
|
|
212
|
+
return path;
|
|
202
213
|
};
|
|
203
214
|
if (ref.current) {
|
|
204
215
|
// We need to record the current metadata on the first render if they aren't set
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["findFocusedRoute","getActionFromState","getActionFromStateDefault","getPathFromState","getPathFromStateDefault","getStateFromPath","getStateFromPathDefault","useNavigationIndependentTree","isEqual","React","createMemoryHistory","ServerContext","findMatchingState","a","b","undefined","key","aHistoryLength","history","length","routes","bHistoryLength","aRoute","index","bRoute","aChildState","state","bChildState","series","cb","queue","Promise","resolve","callback","then","linkingHandlers","useLinking","ref","_ref","onUnhandledLinking","enabled","config","independent","useEffect","process","env","NODE_ENV","console","error","join","trim","handler","Symbol","push","indexOf","splice","useState","enabledRef","useRef","configRef","getStateFromPathRef","getPathFromStateRef","getActionFromStateRef","current","validateRoutesNotExistInRootState","useCallback","navigation","rootState","getRootState","some","r","routeNames","includes","name","server","useContext","getInitialState","value","location","window","path","pathname","search","thenable","onfulfilled","catch","previousIndexRef","previousStateRef","pendingPopStatePathRef","listen","previousIndex","record","get","resetRoot","action","dispatch","e","warn","message","getPathForRoute","route","stateForPath","focusedRoute","params","replace","onStateChange","previousState","pendingPath","previousFocusedState","focusedState","historyDelta","nextIndex","backIndex","currentIndex","go","addListener"],"sourceRoot":"../../src","sources":["useLinking.tsx"],"mappings":"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"}
|
|
1
|
+
{"version":3,"names":["findFocusedRoute","getActionFromState","getActionFromStateDefault","getPathFromState","getPathFromStateDefault","getStateFromPath","getStateFromPathDefault","useNavigationIndependentTree","isEqual","React","createMemoryHistory","ServerContext","findMatchingState","a","b","undefined","key","aHistoryLength","history","length","routes","bHistoryLength","aRoute","index","bRoute","aChildState","state","bChildState","series","cb","queue","Promise","resolve","callback","then","linkingHandlers","useLinking","ref","_ref","onUnhandledLinking","enabled","config","independent","useEffect","process","env","NODE_ENV","console","error","join","trim","handler","Symbol","push","indexOf","splice","useState","enabledRef","useRef","configRef","getStateFromPathRef","getPathFromStateRef","getActionFromStateRef","current","validateRoutesNotExistInRootState","useCallback","navigation","rootState","getRootState","some","r","routeNames","includes","name","server","useContext","getInitialState","value","location","window","path","pathname","search","thenable","onfulfilled","catch","previousIndexRef","previousStateRef","pendingPopStatePathRef","listen","previousIndex","record","get","resetRoot","action","dispatch","e","warn","message","getPathForRoute","route","stateForPath","focusedRoute","params","previousRoute","hash","replace","onStateChange","previousState","pendingPath","previousFocusedState","focusedState","historyDelta","nextIndex","backIndex","currentIndex","go","addListener"],"sourceRoot":"../../src","sources":["useLinking.tsx"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createMemoryHistory.d.ts","sourceRoot":"","sources":["../../../src/createMemoryHistory.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAG9D,KAAK,aAAa,GAAG;IAEnB,EAAE,EAAE,MAAM,CAAC;IAEX,KAAK,EAAE,eAAe,CAAC;IAEvB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,wBAAgB,mBAAmB;;eAiCpB,MAAM;;cAIW,MAAM;;;cAaJ,MAAM;eAAS,eAAe;;;cAmB3B,MAAM;eAAS,eAAe;;
|
|
1
|
+
{"version":3,"file":"createMemoryHistory.d.ts","sourceRoot":"","sources":["../../../src/createMemoryHistory.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAG9D,KAAK,aAAa,GAAG;IAEnB,EAAE,EAAE,MAAM,CAAC;IAEX,KAAK,EAAE,eAAe,CAAC;IAEvB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,wBAAgB,mBAAmB;;eAiCpB,MAAM;;cAIW,MAAM;;;cAaJ,MAAM;eAAS,eAAe;;;cAmB3B,MAAM;eAAS,eAAe;;UAoCzD,MAAM;qBA2FK,MAAM,IAAI;EAiB9B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useLinking.d.ts","sourceRoot":"","sources":["../../../src/useLinking.tsx"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,sBAAsB,EAE3B,KAAK,aAAa,EAEnB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AA4C9C;;GAEG;AACH,eAAO,MAAM,MAAM,OAAQ,MAAM,QAAQ,IAAI,CAAC,eAO7C,CAAC;AAIF,KAAK,OAAO,GAAG,cAAc,CAAC,aAAa,CAAC,CAAC;AAE7C,wBAAgB,UAAU,CACxB,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC,EAC3D,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;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"useLinking.d.ts","sourceRoot":"","sources":["../../../src/useLinking.tsx"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,sBAAsB,EAE3B,KAAK,aAAa,EAEnB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AA4C9C;;GAEG;AACH,eAAO,MAAM,MAAM,OAAQ,MAAM,QAAQ,IAAI,CAAC,eAO7C,CAAC;AAIF,KAAK,OAAO,GAAG,cAAc,CAAC,aAAa,CAAC,CAAC;AAE7C,wBAAgB,UAAU,CACxB,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC,EAC3D,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;;;;;;;;;;;;;;;;;;;;;;;;;;EAqWtE"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@react-navigation/native",
|
|
3
3
|
"description": "React Native integration for React Navigation",
|
|
4
|
-
"version": "7.0.0-alpha.
|
|
4
|
+
"version": "7.0.0-alpha.12",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"react-native",
|
|
7
7
|
"react-navigation",
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
"clean": "del lib"
|
|
38
38
|
},
|
|
39
39
|
"dependencies": {
|
|
40
|
-
"@react-navigation/core": "^7.0.0-alpha.
|
|
40
|
+
"@react-navigation/core": "^7.0.0-alpha.11",
|
|
41
41
|
"escape-string-regexp": "^4.0.0",
|
|
42
42
|
"fast-deep-equal": "^3.1.3",
|
|
43
43
|
"nanoid": "3.3.7",
|
|
@@ -72,5 +72,5 @@
|
|
|
72
72
|
]
|
|
73
73
|
]
|
|
74
74
|
},
|
|
75
|
-
"gitHead": "
|
|
75
|
+
"gitHead": "4278a3d0a5deca93206771a1fa746aa03b86900e"
|
|
76
76
|
}
|
|
@@ -87,6 +87,7 @@ export function createMemoryHistory() {
|
|
|
87
87
|
// Need to keep the hash part of the path if there was no previous history entry
|
|
88
88
|
// or the previous history entry had the same path
|
|
89
89
|
let pathWithHash = path;
|
|
90
|
+
const hash = pathWithHash.includes('#') ? '' : location.hash;
|
|
90
91
|
|
|
91
92
|
if (!items.length || items.findIndex((item) => item.id === id) < 0) {
|
|
92
93
|
// There are two scenarios for creating an array with only one history record:
|
|
@@ -95,12 +96,13 @@ export function createMemoryHistory() {
|
|
|
95
96
|
// the page when navigating forward in history.
|
|
96
97
|
// - This is the first time any state modifications are done
|
|
97
98
|
// So we need to push the entry as there's nothing to replace
|
|
98
|
-
|
|
99
|
+
|
|
100
|
+
pathWithHash = pathWithHash + hash;
|
|
99
101
|
items = [{ path: pathWithHash, state, id }];
|
|
100
102
|
index = 0;
|
|
101
103
|
} else {
|
|
102
104
|
if (items[index].path === path) {
|
|
103
|
-
pathWithHash = pathWithHash +
|
|
105
|
+
pathWithHash = pathWithHash + hash;
|
|
104
106
|
}
|
|
105
107
|
items[index] = { path, state, id };
|
|
106
108
|
}
|
package/src/useLinking.tsx
CHANGED
|
@@ -280,6 +280,8 @@ export function useLinking(
|
|
|
280
280
|
route: ReturnType<typeof findFocusedRoute>,
|
|
281
281
|
state: NavigationState
|
|
282
282
|
): string => {
|
|
283
|
+
let path;
|
|
284
|
+
|
|
283
285
|
// If the `route` object contains a `path`, use that path as long as `route.name` and `params` still match
|
|
284
286
|
// This makes sure that we preserve the original URL for wildcard routes
|
|
285
287
|
if (route?.path) {
|
|
@@ -296,12 +298,31 @@ export function useLinking(
|
|
|
296
298
|
focusedRoute.name === route.name &&
|
|
297
299
|
isEqual(focusedRoute.params, route.params)
|
|
298
300
|
) {
|
|
299
|
-
|
|
301
|
+
path = route.path;
|
|
300
302
|
}
|
|
301
303
|
}
|
|
302
304
|
}
|
|
303
305
|
|
|
304
|
-
|
|
306
|
+
if (path == null) {
|
|
307
|
+
path = getPathFromStateRef.current(state, configRef.current);
|
|
308
|
+
}
|
|
309
|
+
|
|
310
|
+
const previousRoute = previousStateRef.current
|
|
311
|
+
? findFocusedRoute(previousStateRef.current)
|
|
312
|
+
: undefined;
|
|
313
|
+
|
|
314
|
+
// Preserve the hash if the route didn't change
|
|
315
|
+
if (
|
|
316
|
+
previousRoute &&
|
|
317
|
+
route &&
|
|
318
|
+
'key' in previousRoute &&
|
|
319
|
+
'key' in route &&
|
|
320
|
+
previousRoute.key === route.key
|
|
321
|
+
) {
|
|
322
|
+
path = path + location.hash;
|
|
323
|
+
}
|
|
324
|
+
|
|
325
|
+
return path;
|
|
305
326
|
};
|
|
306
327
|
|
|
307
328
|
if (ref.current) {
|