@react-navigation/native 7.2.3 → 7.2.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/lib/module/createMemoryHistory.js +10 -5
- package/lib/module/createMemoryHistory.js.map +1 -1
- package/lib/module/extractPathFromURL.js +3 -2
- package/lib/module/extractPathFromURL.js.map +1 -1
- package/lib/module/useLinking.js +20 -3
- package/lib/module/useLinking.js.map +1 -1
- package/lib/module/useLinking.native.js +8 -1
- package/lib/module/useLinking.native.js.map +1 -1
- package/lib/typescript/src/createMemoryHistory.d.ts.map +1 -1
- package/lib/typescript/src/extractPathFromURL.d.ts.map +1 -1
- package/lib/typescript/src/useLinking.d.ts.map +1 -1
- package/lib/typescript/src/useLinking.native.d.ts.map +1 -1
- package/package.json +3 -3
- package/src/createMemoryHistory.tsx +11 -5
- package/src/extractPathFromURL.tsx +7 -3
- package/src/useLinking.native.tsx +9 -3
- package/src/useLinking.tsx +28 -6
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
import { nanoid } from 'nanoid/non-secure';
|
|
4
|
+
const getPathWithoutHash = path => path.split('#')[0];
|
|
4
5
|
export function createMemoryHistory() {
|
|
5
6
|
let index = 0;
|
|
6
7
|
let items = [];
|
|
@@ -34,10 +35,12 @@ export function createMemoryHistory() {
|
|
|
34
35
|
backIndex({
|
|
35
36
|
path
|
|
36
37
|
}) {
|
|
38
|
+
const pathWithoutHash = getPathWithoutHash(path);
|
|
39
|
+
|
|
37
40
|
// We need to find the index from the element before current to get closest path to go back to
|
|
38
41
|
for (let i = index - 1; i >= 0; i--) {
|
|
39
42
|
const item = items[i];
|
|
40
|
-
if (item.path ===
|
|
43
|
+
if (item.path === pathWithoutHash) {
|
|
41
44
|
return i;
|
|
42
45
|
}
|
|
43
46
|
}
|
|
@@ -49,12 +52,13 @@ export function createMemoryHistory() {
|
|
|
49
52
|
}) {
|
|
50
53
|
interrupt();
|
|
51
54
|
const id = nanoid();
|
|
55
|
+
const pathWithoutHash = getPathWithoutHash(path);
|
|
52
56
|
|
|
53
57
|
// When a new entry is pushed, all the existing entries after index will be inaccessible
|
|
54
58
|
// So we remove any existing entries after the current index to clean them up
|
|
55
59
|
items = items.slice(0, index + 1);
|
|
56
60
|
items.push({
|
|
57
|
-
path,
|
|
61
|
+
path: pathWithoutHash,
|
|
58
62
|
state,
|
|
59
63
|
id
|
|
60
64
|
});
|
|
@@ -74,6 +78,7 @@ export function createMemoryHistory() {
|
|
|
74
78
|
}) {
|
|
75
79
|
interrupt();
|
|
76
80
|
const id = window.history.state?.id ?? nanoid();
|
|
81
|
+
const pathWithoutHash = getPathWithoutHash(path);
|
|
77
82
|
|
|
78
83
|
// Need to keep the hash part of the path if there was no previous history entry
|
|
79
84
|
// or the previous history entry had the same path
|
|
@@ -89,17 +94,17 @@ export function createMemoryHistory() {
|
|
|
89
94
|
|
|
90
95
|
pathWithHash = pathWithHash + hash;
|
|
91
96
|
items = [{
|
|
92
|
-
path:
|
|
97
|
+
path: pathWithoutHash,
|
|
93
98
|
state,
|
|
94
99
|
id
|
|
95
100
|
}];
|
|
96
101
|
index = 0;
|
|
97
102
|
} else {
|
|
98
|
-
if (items[index].path ===
|
|
103
|
+
if (items[index].path === pathWithoutHash) {
|
|
99
104
|
pathWithHash = pathWithHash + hash;
|
|
100
105
|
}
|
|
101
106
|
items[index] = {
|
|
102
|
-
path,
|
|
107
|
+
path: pathWithoutHash,
|
|
103
108
|
state,
|
|
104
109
|
id
|
|
105
110
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["nanoid","createMemoryHistory","index","items","pending","interrupt","forEach","it","cb","history","id","window","state","findIndex","item","get","backIndex","
|
|
1
|
+
{"version":3,"names":["nanoid","getPathWithoutHash","path","split","createMemoryHistory","index","items","pending","interrupt","forEach","it","cb","history","id","window","state","findIndex","item","get","backIndex","pathWithoutHash","i","push","slice","length","pushState","replace","pathWithHash","hash","includes","location","replaceState","go","n","nextIndex","lastItemIndex","Promise","resolve","reject","done","interrupted","clearTimeout","timer","Error","title","document","ref","setTimeout","foundIndex","splice","onPopState","last","pop","removeEventListener","addEventListener","listen","listener"],"sourceRoot":"../../src","sources":["createMemoryHistory.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -7,11 +7,12 @@ export function extractPathFromURL(prefixes, url) {
|
|
|
7
7
|
const host = prefix.replace(new RegExp(`^${escapeStringRegexp(protocol)}`), '').replace(/\/+/g, '/') // Replace multiple slash (//) with single ones
|
|
8
8
|
.replace(/^\//, ''); // Remove extra leading slash
|
|
9
9
|
|
|
10
|
-
const prefixRegex = new RegExp(`^${escapeStringRegexp(protocol)}(/)*${host.split('.').map(it => it === '*' ? '[
|
|
10
|
+
const prefixRegex = new RegExp(`^${escapeStringRegexp(protocol)}(/)*${host.split('.').map(it => it === '*' ? '[^/?#]+' : escapeStringRegexp(it)).join('\\.')}${host === '' || host.endsWith('/') ? '' : '(?=$|[/?#])'}`);
|
|
11
11
|
const [originAndPath, ...searchParams] = url.split('?');
|
|
12
12
|
const normalizedURL = originAndPath.replace(/\/+/g, '/').concat(searchParams.length ? `?${searchParams.join('?')}` : '');
|
|
13
13
|
if (prefixRegex.test(normalizedURL)) {
|
|
14
|
-
|
|
14
|
+
const result = normalizedURL.replace(prefixRegex, '');
|
|
15
|
+
return result.startsWith('?') || result.startsWith('#') ? `/${result}` : result;
|
|
15
16
|
}
|
|
16
17
|
}
|
|
17
18
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["escapeStringRegexp","extractPathFromURL","prefixes","url","prefix","protocol","match","host","replace","RegExp","prefixRegex","split","map","it","join","originAndPath","searchParams","normalizedURL","concat","length","test","undefined"],"sourceRoot":"../../src","sources":["extractPathFromURL.tsx"],"mappings":";;AAAA,OAAOA,kBAAkB,MAAM,sBAAsB;AAErD,OAAO,SAASC,kBAAkBA,CAACC,QAAkB,EAAEC,GAAW,EAAE;EAClE,KAAK,MAAMC,MAAM,IAAIF,QAAQ,EAAE;IAC7B,MAAMG,QAAQ,GAAGD,MAAM,CAACE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE;IACnD,MAAMC,IAAI,GAAGH,MAAM,CAChBI,OAAO,CAAC,IAAIC,MAAM,CAAC,IAAIT,kBAAkB,CAACK,QAAQ,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAC3DG,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAAA,CACrBA,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC;;IAEvB,MAAME,WAAW,GAAG,IAAID,MAAM,CAC5B,IAAIT,kBAAkB,CAACK,QAAQ,CAAC,OAAOE,IAAI,CACxCI,KAAK,CAAC,GAAG,CAAC,CACVC,GAAG,CAAEC,EAAE,IAAMA,EAAE,KAAK,GAAG,GAAG,
|
|
1
|
+
{"version":3,"names":["escapeStringRegexp","extractPathFromURL","prefixes","url","prefix","protocol","match","host","replace","RegExp","prefixRegex","split","map","it","join","endsWith","originAndPath","searchParams","normalizedURL","concat","length","test","result","startsWith","undefined"],"sourceRoot":"../../src","sources":["extractPathFromURL.tsx"],"mappings":";;AAAA,OAAOA,kBAAkB,MAAM,sBAAsB;AAErD,OAAO,SAASC,kBAAkBA,CAACC,QAAkB,EAAEC,GAAW,EAAE;EAClE,KAAK,MAAMC,MAAM,IAAIF,QAAQ,EAAE;IAC7B,MAAMG,QAAQ,GAAGD,MAAM,CAACE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE;IACnD,MAAMC,IAAI,GAAGH,MAAM,CAChBI,OAAO,CAAC,IAAIC,MAAM,CAAC,IAAIT,kBAAkB,CAACK,QAAQ,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAC3DG,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAAA,CACrBA,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC;;IAEvB,MAAME,WAAW,GAAG,IAAID,MAAM,CAC5B,IAAIT,kBAAkB,CAACK,QAAQ,CAAC,OAAOE,IAAI,CACxCI,KAAK,CAAC,GAAG,CAAC,CACVC,GAAG,CAAEC,EAAE,IAAMA,EAAE,KAAK,GAAG,GAAG,SAAS,GAAGb,kBAAkB,CAACa,EAAE,CAAE,CAAC,CAC9DC,IAAI,CAAC,KAAK,CAAC,GAAGP,IAAI,KAAK,EAAE,IAAIA,IAAI,CAACQ,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,aAAa,EACzE,CAAC;IAED,MAAM,CAACC,aAAa,EAAE,GAAGC,YAAY,CAAC,GAAGd,GAAG,CAACQ,KAAK,CAAC,GAAG,CAAC;IACvD,MAAMO,aAAa,GAAGF,aAAa,CAChCR,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CACpBW,MAAM,CAACF,YAAY,CAACG,MAAM,GAAG,IAAIH,YAAY,CAACH,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC;IAElE,IAAIJ,WAAW,CAACW,IAAI,CAACH,aAAa,CAAC,EAAE;MACnC,MAAMI,MAAM,GAAGJ,aAAa,CAACV,OAAO,CAACE,WAAW,EAAE,EAAE,CAAC;MAErD,OAAOY,MAAM,CAACC,UAAU,CAAC,GAAG,CAAC,IAAID,MAAM,CAACC,UAAU,CAAC,GAAG,CAAC,GACnD,IAAID,MAAM,EAAE,GACZA,MAAM;IACZ;EACF;EAEA,OAAOE,SAAS;AAClB","ignoreList":[]}
|
package/lib/module/useLinking.js
CHANGED
|
@@ -125,7 +125,12 @@ export function useLinking(ref, {
|
|
|
125
125
|
const location = server?.location ?? (typeof window !== 'undefined' ? window.location : undefined);
|
|
126
126
|
const path = location ? location.pathname + location.search : undefined;
|
|
127
127
|
if (path) {
|
|
128
|
-
|
|
128
|
+
try {
|
|
129
|
+
value = getStateFromPathRef.current(path, configRef.current);
|
|
130
|
+
} catch (e) {
|
|
131
|
+
console.error(e);
|
|
132
|
+
value = undefined;
|
|
133
|
+
}
|
|
129
134
|
}
|
|
130
135
|
|
|
131
136
|
// If the link were handled, it gets cleared in NavigationContainer
|
|
@@ -178,7 +183,13 @@ export function useLinking(ref, {
|
|
|
178
183
|
}
|
|
179
184
|
return;
|
|
180
185
|
}
|
|
181
|
-
|
|
186
|
+
let state;
|
|
187
|
+
try {
|
|
188
|
+
state = getStateFromPathRef.current(path, configRef.current);
|
|
189
|
+
} catch (e) {
|
|
190
|
+
console.error(e);
|
|
191
|
+
state = undefined;
|
|
192
|
+
}
|
|
182
193
|
|
|
183
194
|
// We should only dispatch an action when going forward
|
|
184
195
|
// Otherwise the action will likely add items to history, which would mess things up
|
|
@@ -222,7 +233,13 @@ export function useLinking(ref, {
|
|
|
222
233
|
// If the `route` object contains a `path`, use that path as long as `route.name` and `params` still match
|
|
223
234
|
// This makes sure that we preserve the original URL for wildcard routes
|
|
224
235
|
if (route?.path) {
|
|
225
|
-
|
|
236
|
+
let stateForPath;
|
|
237
|
+
try {
|
|
238
|
+
stateForPath = getStateFromPathRef.current(route.path, configRef.current);
|
|
239
|
+
} catch (e) {
|
|
240
|
+
console.error(e);
|
|
241
|
+
stateForPath = undefined;
|
|
242
|
+
}
|
|
226
243
|
if (stateForPath) {
|
|
227
244
|
const focusedRoute = findFocusedRoute(stateForPath);
|
|
228
245
|
if (focusedRoute && focusedRoute.name === route.name && isEqual(focusedRoute.params, route.params)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["findFocusedRoute","getActionFromState","getActionFromStateDefault","getPathFromState","getPathFromStateDefault","getStateFromPath","getStateFromPathDefault","useNavigationIndependentTree","isEqual","React","createMemoryHistory","ServerContext","getRoutesUntilIndex","state","routes","slice","index","getHistoryLength","history","length","findMatchingState","a","b","undefined","key","aHistoryLength","bHistoryLength","aRoute","bRoute","aChildState","bChildState","isPoppingLastEntry","current","record","currentRoutes","recordRoutes","every","route","i","series","cb","queue","Promise","resolve","callback","then","linkingHandlers","useLinking","ref","enabled","config","onUnhandledLinking","independent","useEffect","process","env","NODE_ENV","console","error","join","trim","handler","Symbol","push","indexOf","splice","useState","enabledRef","useRef","configRef","getStateFromPathRef","getPathFromStateRef","getActionFromStateRef","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","get","currentState","currentFocused","recordFocused","goBack","resetRoot","action","dispatch","e","warn","message","getPathForRoute","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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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["findFocusedRoute","getActionFromState","getActionFromStateDefault","getPathFromState","getPathFromStateDefault","getStateFromPath","getStateFromPathDefault","useNavigationIndependentTree","isEqual","React","createMemoryHistory","ServerContext","getRoutesUntilIndex","state","routes","slice","index","getHistoryLength","history","length","findMatchingState","a","b","undefined","key","aHistoryLength","bHistoryLength","aRoute","bRoute","aChildState","bChildState","isPoppingLastEntry","current","record","currentRoutes","recordRoutes","every","route","i","series","cb","queue","Promise","resolve","callback","then","linkingHandlers","useLinking","ref","enabled","config","onUnhandledLinking","independent","useEffect","process","env","NODE_ENV","console","error","join","trim","handler","Symbol","push","indexOf","splice","useState","enabledRef","useRef","configRef","getStateFromPathRef","getPathFromStateRef","getActionFromStateRef","validateRoutesNotExistInRootState","useCallback","navigation","rootState","getRootState","some","r","routeNames","includes","name","server","useContext","getInitialState","value","location","window","path","pathname","search","e","thenable","onfulfilled","catch","previousIndexRef","previousStateRef","pendingPopStatePathRef","listen","previousIndex","get","currentState","currentFocused","recordFocused","goBack","resetRoot","action","dispatch","warn","message","getPathForRoute","stateForPath","focusedRoute","params","previousRoute","hash","replace","onStateChange","previousState","pendingPath","previousFocusedState","focusedState","historyDelta","nextIndex","backIndex","currentIndex","go","addListener"],"sourceRoot":"../../src","sources":["useLinking.tsx"],"mappings":";;AAAA,SACEA,gBAAgB,EAChBC,kBAAkB,IAAIC,yBAAyB,EAC/CC,gBAAgB,IAAIC,uBAAuB,EAC3CC,gBAAgB,IAAIC,uBAAuB,EAI3CC,4BAA4B,QACvB,wBAAwB;AAC/B,OAAOC,OAAO,MAAM,iBAAiB;AACrC,OAAO,KAAKC,KAAK,MAAM,OAAO;AAE9B,SAASC,mBAAmB,QAAQ,0BAAuB;AAC3D,SAASC,aAAa,QAAQ,oBAAiB;AAK/C,MAAMC,mBAAmB,GAAIC,KAAsB,IACjDA,KAAK,CAACC,MAAM,CAACC,KAAK,CAAC,CAAC,EAAEF,KAAK,CAACG,KAAK,GAAG,CAAC,CAAC;;AAExC;AACA;AACA;AACA,MAAMC,gBAAgB,GAAIJ,KAAsB,IAC9CA,KAAK,CAACK,OAAO,GAAGL,KAAK,CAACK,OAAO,CAACC,MAAM,GAAGP,mBAAmB,CAACC,KAAK,CAAC,CAACM,MAAM;;AAE1E;AACA;AACA;AACA;AACA,MAAMC,iBAAiB,GAAGA,CACxBC,CAAgB,EAChBC,CAAgB,KACmB;EACnC,IAAID,CAAC,KAAKE,SAAS,IAAID,CAAC,KAAKC,SAAS,IAAIF,CAAC,CAACG,GAAG,KAAKF,CAAC,CAACE,GAAG,EAAE;IACzD,OAAO,CAACD,SAAS,EAAEA,SAAS,CAAC;EAC/B;EAEA,MAAME,cAAc,GAAGR,gBAAgB,CAACI,CAAC,CAAC;EAC1C,MAAMK,cAAc,GAAGT,gBAAgB,CAACK,CAAC,CAAC;EAE1C,MAAMK,MAAM,GAAGN,CAAC,CAACP,MAAM,CAACO,CAAC,CAACL,KAAK,CAAC;EAChC,MAAMY,MAAM,GAAGN,CAAC,CAACR,MAAM,CAACQ,CAAC,CAACN,KAAK,CAAC;EAEhC,MAAMa,WAAW,GAAGF,MAAM,CAACd,KAAsB;EACjD,MAAMiB,WAAW,GAAGF,MAAM,CAACf,KAAsB;;EAEjD;EACA;EACA;EACA;EACA;EACA,IACEY,cAAc,KAAKC,cAAc,IACjCC,MAAM,CAACH,GAAG,KAAKI,MAAM,CAACJ,GAAG,IACzBK,WAAW,KAAKN,SAAS,IACzBO,WAAW,KAAKP,SAAS,IACzBM,WAAW,CAACL,GAAG,KAAKM,WAAW,CAACN,GAAG,EACnC;IACA,OAAO,CAACH,CAAC,EAAEC,CAAC,CAAC;EACf;EAEA,OAAOF,iBAAiB,CAACS,WAAW,EAAEC,WAAW,CAAC;AACpD,CAAC;;AAED;AACA;AACA;AACA,MAAMC,kBAAkB,GAAGA,CACzBC,OAAwB,EACxBC,MAAuB,KACX;EACZ,IAAID,OAAO,CAACd,OAAO,IAAIe,MAAM,CAACf,OAAO,EAAE;IACrC,OAAOc,OAAO,CAACd,OAAO,CAACC,MAAM,KAAKc,MAAM,CAACf,OAAO,CAACC,MAAM,GAAG,CAAC;EAC7D;EAEA,MAAMe,aAAa,GAAGtB,mBAAmB,CAACoB,OAAO,CAAC;EAClD,MAAMG,YAAY,GAAGvB,mBAAmB,CAACqB,MAAM,CAAC;EAEhD,IAAIC,aAAa,CAACf,MAAM,KAAKgB,YAAY,CAAChB,MAAM,GAAG,CAAC,EAAE;IACpD,OAAOgB,YAAY,CAACC,KAAK,CAAC,CAACC,KAAK,EAAEC,CAAC,KAAKD,KAAK,CAACb,GAAG,KAAKU,aAAa,CAACI,CAAC,CAAC,CAACd,GAAG,CAAC;EAC7E;EAEA,OAAO,KAAK;AACd,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAMe,MAAM,GAAIC,EAAuB,IAAK;EACjD,IAAIC,KAAK,GAAGC,OAAO,CAACC,OAAO,CAAC,CAAC;EAC7B,MAAMC,QAAQ,GAAGA,CAAA,KAAM;IACrB;IACAH,KAAK,GAAGA,KAAK,CAACI,IAAI,CAACL,EAAE,CAAC;EACxB,CAAC;EACD,OAAOI,QAAQ;AACjB,CAAC;AAED,MAAME,eAAyB,GAAG,EAAE;AAIpC,OAAO,SAASC,UAAUA,CACxBC,GAAkE,EAClE;EACEC,OAAO,GAAG,IAAI;EACdC,MAAM;EACN7C,gBAAgB,GAAGC,uBAAuB;EAC1CH,gBAAgB,GAAGC,uBAAuB;EAC1CH,kBAAkB,GAAGC;AACd,CAAC,EACViD,kBAAqE,EACrE;EACA,MAAMC,WAAW,GAAG7C,4BAA4B,CAAC,CAAC;EAElDE,KAAK,CAAC4C,SAAS,CAAC,MAAM;IACpB,IAAIC,OAAO,CAACC,GAAG,CAACC,QAAQ,KAAK,YAAY,EAAE;MACzC,OAAOjC,SAAS;IAClB;IAEA,IAAI6B,WAAW,EAAE;MACf,OAAO7B,SAAS;IAClB;IAEA,IAAI0B,OAAO,KAAK,KAAK,IAAIH,eAAe,CAAC3B,MAAM,EAAE;MAC/CsC,OAAO,CAACC,KAAK,CACX,CACE,6KAA6K,EAC7K,uFAAuF,EACvF,4DAA4D,CAC7D,CACEC,IAAI,CAAC,IAAI,CAAC,CACVC,IAAI,CAAC,CACV,CAAC;IACH;IAEA,MAAMC,OAAO,GAAGC,MAAM,CAAC,CAAC;IAExB,IAAIb,OAAO,KAAK,KAAK,EAAE;MACrBH,eAAe,CAACiB,IAAI,CAACF,OAAO,CAAC;IAC/B;IAEA,OAAO,MAAM;MACX,MAAM7C,KAAK,GAAG8B,eAAe,CAACkB,OAAO,CAACH,OAAO,CAAC;MAE9C,IAAI7C,KAAK,GAAG,CAAC,CAAC,EAAE;QACd8B,eAAe,CAACmB,MAAM,CAACjD,KAAK,EAAE,CAAC,CAAC;MAClC;IACF,CAAC;EACH,CAAC,EAAE,CAACiC,OAAO,EAAEG,WAAW,CAAC,CAAC;EAE1B,MAAM,CAAClC,OAAO,CAAC,GAAGT,KAAK,CAACyD,QAAQ,CAACxD,mBAAmB,CAAC;;EAErD;EACA;EACA;EACA,MAAMyD,UAAU,GAAG1D,KAAK,CAAC2D,MAAM,CAACnB,OAAO,CAAC;EACxC,MAAMoB,SAAS,GAAG5D,KAAK,CAAC2D,MAAM,CAAClB,MAAM,CAAC;EACtC,MAAMoB,mBAAmB,GAAG7D,KAAK,CAAC2D,MAAM,CAAC/D,gBAAgB,CAAC;EAC1D,MAAMkE,mBAAmB,GAAG9D,KAAK,CAAC2D,MAAM,CAACjE,gBAAgB,CAAC;EAC1D,MAAMqE,qBAAqB,GAAG/D,KAAK,CAAC2D,MAAM,CAACnE,kBAAkB,CAAC;EAE9DQ,KAAK,CAAC4C,SAAS,CAAC,MAAM;IACpBc,UAAU,CAACnC,OAAO,GAAGiB,OAAO;IAC5BoB,SAAS,CAACrC,OAAO,GAAGkB,MAAM;IAC1BoB,mBAAmB,CAACtC,OAAO,GAAG3B,gBAAgB;IAC9CkE,mBAAmB,CAACvC,OAAO,GAAG7B,gBAAgB;IAC9CqE,qBAAqB,CAACxC,OAAO,GAAG/B,kBAAkB;EACpD,CAAC,CAAC;EAEF,MAAMwE,iCAAiC,GAAGhE,KAAK,CAACiE,WAAW,CACxD7D,KAAkB,IAAK;IACtB,MAAM8D,UAAU,GAAG3B,GAAG,CAAChB,OAAO;IAC9B,MAAM4C,SAAS,GAAGD,UAAU,EAAEE,YAAY,CAAC,CAAC;IAC5C;IACA;IACA,OAAOhE,KAAK,EAAEC,MAAM,CAACgE,IAAI,CAAEC,CAAC,IAAK,CAACH,SAAS,EAAEI,UAAU,CAACC,QAAQ,CAACF,CAAC,CAACG,IAAI,CAAC,CAAC;EAC3E,CAAC,EACD,CAAClC,GAAG,CACN,CAAC;EAED,MAAMmC,MAAM,GAAG1E,KAAK,CAAC2E,UAAU,CAACzE,aAAa,CAAC;EAE9C,MAAM0E,eAAe,GAAG5E,KAAK,CAACiE,WAAW,CAAC,MAAM;IAC9C,IAAIY,KAA8B;IAElC,IAAInB,UAAU,CAACnC,OAAO,EAAE;MACtB,MAAMuD,QAAQ,GACZJ,MAAM,EAAEI,QAAQ,KACf,OAAOC,MAAM,KAAK,WAAW,GAAGA,MAAM,CAACD,QAAQ,GAAGhE,SAAS,CAAC;MAE/D,MAAMkE,IAAI,GAAGF,QAAQ,GAAGA,QAAQ,CAACG,QAAQ,GAAGH,QAAQ,CAACI,MAAM,GAAGpE,SAAS;MAEvE,IAAIkE,IAAI,EAAE;QACR,IAAI;UACFH,KAAK,GAAGhB,mBAAmB,CAACtC,OAAO,CAACyD,IAAI,EAAEpB,SAAS,CAACrC,OAAO,CAAC;QAC9D,CAAC,CAAC,OAAO4D,CAAC,EAAE;UACVnC,OAAO,CAACC,KAAK,CAACkC,CAAC,CAAC;UAEhBN,KAAK,GAAG/D,SAAS;QACnB;MACF;;MAEA;MACA4B,kBAAkB,CAACsC,IAAI,CAAC;IAC1B;IAEA,MAAMI,QAAQ,GAAG;MACfhD,IAAIA,CAACiD,WAAsD,EAAE;QAC3D,OAAOpD,OAAO,CAACC,OAAO,CAACmD,WAAW,GAAGA,WAAW,CAACR,KAAK,CAAC,GAAGA,KAAK,CAAC;MAClE,CAAC;MACDS,KAAKA,CAAA,EAAG;QACN,OAAOF,QAAQ;MACjB;IACF,CAAC;IAED,OAAOA,QAAQ;IACf;EACF,CAAC,EAAE,EAAE,CAAC;EAEN,MAAMG,gBAAgB,GAAGvF,KAAK,CAAC2D,MAAM,CAAqB7C,SAAS,CAAC;EACpE,MAAM0E,gBAAgB,GAAGxF,KAAK,CAAC2D,MAAM,CAA8B7C,SAAS,CAAC;EAC7E,MAAM2E,sBAAsB,GAAGzF,KAAK,CAAC2D,MAAM,CAAqB7C,SAAS,CAAC;EAE1Ed,KAAK,CAAC4C,SAAS,CAAC,MAAM;IACpB2C,gBAAgB,CAAChE,OAAO,GAAGd,OAAO,CAACF,KAAK;IAExC,OAAOE,OAAO,CAACiF,MAAM,CAAC,MAAM;MAC1B,MAAMxB,UAAU,GAAG3B,GAAG,CAAChB,OAAO;MAE9B,IAAI,CAAC2C,UAAU,IAAI,CAAC1B,OAAO,EAAE;QAC3B;MACF;MAEA,MAAM;QAAEsC;MAAS,CAAC,GAAGC,MAAM;MAE3B,MAAMC,IAAI,GAAGF,QAAQ,CAACG,QAAQ,GAAGH,QAAQ,CAACI,MAAM;MAChD,MAAM3E,KAAK,GAAGE,OAAO,CAACF,KAAK;MAE3B,MAAMoF,aAAa,GAAGJ,gBAAgB,CAAChE,OAAO,IAAI,CAAC;MAEnDgE,gBAAgB,CAAChE,OAAO,GAAGhB,KAAK;MAChCkF,sBAAsB,CAAClE,OAAO,GAAGyD,IAAI;;MAErC;MACA;MACA;MACA,MAAMxD,MAAM,GAAGf,OAAO,CAACmF,GAAG,CAACrF,KAAK,CAAC;MAEjC,IAAIiB,MAAM,EAAEwD,IAAI,KAAKA,IAAI,IAAIxD,MAAM,EAAEpB,KAAK,EAAE;QAC1C,MAAMyF,YAAY,GAAG3B,UAAU,CAACE,YAAY,CAAC,CAAC;QAE9C,MAAM,CAAC0B,cAAc,EAAEC,aAAa,CAAC,GAAGpF,iBAAiB,CACvDkF,YAAY,EACZrE,MAAM,CAACpB,KACT,CAAC;QAED,IACEuF,aAAa,GAAGpF,KAAK,KAAK,CAAC,IAC3BuF,cAAc,IACdC,aAAa,IACbzE,kBAAkB,CAACwE,cAAc,EAAEC,aAAa,CAAC,EACjD;UACA;UACA;UACA;UACA7B,UAAU,CAAC8B,MAAM,CAAC,CAAC;QACrB,CAAC,MAAM;UACL9B,UAAU,CAAC+B,SAAS,CAACzE,MAAM,CAACpB,KAAK,CAAC;QACpC;QAEA;MACF;MAEA,IAAIA,KAA8B;MAElC,IAAI;QACFA,KAAK,GAAGyD,mBAAmB,CAACtC,OAAO,CAACyD,IAAI,EAAEpB,SAAS,CAACrC,OAAO,CAAC;MAC9D,CAAC,CAAC,OAAO4D,CAAC,EAAE;QACVnC,OAAO,CAACC,KAAK,CAACkC,CAAC,CAAC;QAEhB/E,KAAK,GAAGU,SAAS;MACnB;;MAEA;MACA;MACA,IAAIV,KAAK,EAAE;QACT;QACAsC,kBAAkB,CAACsC,IAAI,CAAC;QACxB;QACA;QACA,IAAIhB,iCAAiC,CAAC5D,KAAK,CAAC,EAAE;UAC5C;QACF;QAEA,IAAIG,KAAK,GAAGoF,aAAa,EAAE;UACzB,MAAMO,MAAM,GAAGnC,qBAAqB,CAACxC,OAAO,CAC1CnB,KAAK,EACLwD,SAAS,CAACrC,OACZ,CAAC;UAED,IAAI2E,MAAM,KAAKpF,SAAS,EAAE;YACxB,IAAI;cACFoD,UAAU,CAACiC,QAAQ,CAACD,MAAM,CAAC;YAC7B,CAAC,CAAC,OAAOf,CAAC,EAAE;cACV;cACA;cACAnC,OAAO,CAACoD,IAAI,CACV,qDAAqDpB,IAAI,MACvD,OAAOG,CAAC,KAAK,QAAQ,IAAIA,CAAC,IAAI,IAAI,IAAI,SAAS,IAAIA,CAAC,GAChDA,CAAC,CAACkB,OAAO,GACTlB,CAAC,EAET,CAAC;YACH;UACF,CAAC,MAAM;YACLjB,UAAU,CAAC+B,SAAS,CAAC7F,KAAK,CAAC;UAC7B;QACF,CAAC,MAAM;UACL8D,UAAU,CAAC+B,SAAS,CAAC7F,KAAK,CAAC;QAC7B;MACF,CAAC,MAAM;QACL;QACA8D,UAAU,CAAC+B,SAAS,CAAC7F,KAAK,CAAC;MAC7B;IACF,CAAC,CAAC;EACJ,CAAC,EAAE,CACDoC,OAAO,EACP/B,OAAO,EACPiC,kBAAkB,EAClBH,GAAG,EACHyB,iCAAiC,CAClC,CAAC;EAEFhE,KAAK,CAAC4C,SAAS,CAAC,MAAM;IACpB,IAAI,CAACJ,OAAO,EAAE;MACZ;IACF;IAEA,MAAM8D,eAAe,GAAGA,CACtB1E,KAA0C,EAC1CxB,KAAsB,KACX;MACX,IAAI4E,IAAI;;MAER;MACA;MACA,IAAIpD,KAAK,EAAEoD,IAAI,EAAE;QACf,IAAIuB,YAAqC;QAEzC,IAAI;UACFA,YAAY,GAAG1C,mBAAmB,CAACtC,OAAO,CACxCK,KAAK,CAACoD,IAAI,EACVpB,SAAS,CAACrC,OACZ,CAAC;QACH,CAAC,CAAC,OAAO4D,CAAC,EAAE;UACVnC,OAAO,CAACC,KAAK,CAACkC,CAAC,CAAC;UAEhBoB,YAAY,GAAGzF,SAAS;QAC1B;QAEA,IAAIyF,YAAY,EAAE;UAChB,MAAMC,YAAY,GAAGjH,gBAAgB,CAACgH,YAAY,CAAC;UAEnD,IACEC,YAAY,IACZA,YAAY,CAAC/B,IAAI,KAAK7C,KAAK,CAAC6C,IAAI,IAChC1E,OAAO,CAACyG,YAAY,CAACC,MAAM,EAAE7E,KAAK,CAAC6E,MAAM,CAAC,EAC1C;YACAzB,IAAI,GAAGpD,KAAK,CAACoD,IAAI;UACnB;QACF;MACF;MAEA,IAAIA,IAAI,IAAI,IAAI,EAAE;QAChBA,IAAI,GAAGlB,mBAAmB,CAACvC,OAAO,CAACnB,KAAK,EAAEwD,SAAS,CAACrC,OAAO,CAAC;MAC9D;MAEA,MAAMmF,aAAa,GAAGlB,gBAAgB,CAACjE,OAAO,GAC1ChC,gBAAgB,CAACiG,gBAAgB,CAACjE,OAAO,CAAC,GAC1CT,SAAS;;MAEb;MACA,IACE4F,aAAa,IACb9E,KAAK,IACL,KAAK,IAAI8E,aAAa,IACtB,KAAK,IAAI9E,KAAK,IACd8E,aAAa,CAAC3F,GAAG,KAAKa,KAAK,CAACb,GAAG,EAC/B;QACAiE,IAAI,GAAGA,IAAI,GAAGF,QAAQ,CAAC6B,IAAI;MAC7B;MAEA,OAAO3B,IAAI;IACb,CAAC;IAED,IAAIzC,GAAG,CAAChB,OAAO,EAAE;MACf;MACA;MACA,MAAMnB,KAAK,GAAGmC,GAAG,CAAChB,OAAO,CAAC6C,YAAY,CAAC,CAAC;MAExC,IAAIhE,KAAK,EAAE;QACT,MAAMwB,KAAK,GAAGrC,gBAAgB,CAACa,KAAK,CAAC;QACrC,MAAM4E,IAAI,GAAGsB,eAAe,CAAC1E,KAAK,EAAExB,KAAK,CAAC;QAE1C,IAAIoF,gBAAgB,CAACjE,OAAO,KAAKT,SAAS,EAAE;UAC1C0E,gBAAgB,CAACjE,OAAO,GAAGnB,KAAK;QAClC;QAEAK,OAAO,CAACmG,OAAO,CAAC;UAAE5B,IAAI;UAAE5E;QAAM,CAAC,CAAC;QAChCmF,gBAAgB,CAAChE,OAAO,GAAGd,OAAO,CAACF,KAAK;MAC1C;IACF;IAEA,MAAMsG,aAAa,GAAG,MAAAA,CAAA,KAAY;MAChC,MAAM3C,UAAU,GAAG3B,GAAG,CAAChB,OAAO;MAE9B,IAAI,CAAC2C,UAAU,IAAI,CAAC1B,OAAO,EAAE;QAC3B;MACF;MAEA,MAAMsE,aAAa,GAAGtB,gBAAgB,CAACjE,OAAO;MAC9C,MAAMnB,KAAK,GAAG8D,UAAU,CAACE,YAAY,CAAC,CAAC;;MAEvC;MACA,IAAI,CAAChE,KAAK,EAAE;QACV;MACF;MAEA,MAAM2G,WAAW,GAAGtB,sBAAsB,CAAClE,OAAO;MAClD,MAAMK,KAAK,GAAGrC,gBAAgB,CAACa,KAAK,CAAC;MACrC,MAAM4E,IAAI,GAAGsB,eAAe,CAAC1E,KAAK,EAAExB,KAAK,CAAC;MAE1CoF,gBAAgB,CAACjE,OAAO,GAAGnB,KAAK;MAChCqF,sBAAsB,CAAClE,OAAO,GAAGT,SAAS;;MAE1C;MACA;MACA;MACA;MACA,MAAM,CAACkG,oBAAoB,EAAEC,YAAY,CAAC,GAAGtG,iBAAiB,CAC5DmG,aAAa,EACb1G,KACF,CAAC;MAED,IACE4G,oBAAoB,IACpBC,YAAY;MACZ;MACA;MACAjC,IAAI,KAAK+B,WAAW,EACpB;QACA,MAAMG,YAAY,GAChB1G,gBAAgB,CAACyG,YAAY,CAAC,GAC9BzG,gBAAgB,CAACwG,oBAAoB,CAAC;QAExC,IAAIE,YAAY,GAAG,CAAC,EAAE;UACpB;UACA;UACAzG,OAAO,CAAC6C,IAAI,CAAC;YAAE0B,IAAI;YAAE5E;UAAM,CAAC,CAAC;QAC/B,CAAC,MAAM,IAAI8G,YAAY,GAAG,CAAC,EAAE;UAC3B;;UAEA,MAAMC,SAAS,GAAG1G,OAAO,CAAC2G,SAAS,CAAC;YAAEpC;UAAK,CAAC,CAAC;UAC7C,MAAMqC,YAAY,GAAG5G,OAAO,CAACF,KAAK;UAElC,IAAI;YACF,IACE4G,SAAS,KAAK,CAAC,CAAC,IAChBA,SAAS,GAAGE,YAAY;YACxB;YACA5G,OAAO,CAACmF,GAAG,CAACuB,SAAS,CAAC,EACtB;cACA;cACA,MAAM1G,OAAO,CAAC6G,EAAE,CAACH,SAAS,GAAGE,YAAY,CAAC;YAC5C,CAAC,MAAM;cACL;cACA;cACA;cACA,MAAM5G,OAAO,CAAC6G,EAAE,CAACJ,YAAY,CAAC;YAChC;;YAEA;YACAzG,OAAO,CAACmG,OAAO,CAAC;cAAE5B,IAAI;cAAE5E;YAAM,CAAC,CAAC;UAClC,CAAC,CAAC,OAAO+E,CAAC,EAAE;YACV;UAAA;QAEJ,CAAC,MAAM;UACL;UACA1E,OAAO,CAACmG,OAAO,CAAC;YAAE5B,IAAI;YAAE5E;UAAM,CAAC,CAAC;QAClC;MACF,CAAC,MAAM;QACL;QACA;QACAK,OAAO,CAACmG,OAAO,CAAC;UAAE5B,IAAI;UAAE5E;QAAM,CAAC,CAAC;MAClC;MAEAmF,gBAAgB,CAAChE,OAAO,GAAGd,OAAO,CAACF,KAAK;IAC1C,CAAC;;IAED;IACA;IACA;IACA,OAAOgC,GAAG,CAAChB,OAAO,EAAEgG,WAAW,CAAC,OAAO,EAAEzF,MAAM,CAAC+E,aAAa,CAAC,CAAC;EACjE,CAAC,EAAE,CAACrE,OAAO,EAAE/B,OAAO,EAAE8B,GAAG,CAAC,CAAC;EAE3B,OAAO;IACLqC;EACF,CAAC;AACH","ignoreList":[]}
|
|
@@ -83,7 +83,14 @@ export function useLinking(ref, {
|
|
|
83
83
|
return undefined;
|
|
84
84
|
}
|
|
85
85
|
const path = extractPathFromURL(prefixesRef.current, url);
|
|
86
|
-
|
|
86
|
+
if (path !== undefined) {
|
|
87
|
+
try {
|
|
88
|
+
return getStateFromPathRef.current(path, configRef.current);
|
|
89
|
+
} catch (e) {
|
|
90
|
+
console.error(e);
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
return undefined;
|
|
87
94
|
}, []);
|
|
88
95
|
const getInitialState = React.useCallback(() => {
|
|
89
96
|
let state;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["getActionFromState","getActionFromStateDefault","getStateFromPath","getStateFromPathDefault","useNavigationIndependentTree","React","Linking","Platform","extractPathFromURL","linkingHandlers","useLinking","ref","enabled","prefixes","filter","config","getInitialURL","Promise","race","resolve","setTimeout","subscribe","listener","callback","url","subscription","addEventListener","removeEventListener","bind","remove","onUnhandledLinking","independent","useEffect","process","env","NODE_ENV","undefined","length","console","error","OS","join","trim","handler","Symbol","push","index","indexOf","splice","enabledRef","useRef","prefixesRef","filterRef","configRef","getInitialURLRef","getStateFromPathRef","getActionFromStateRef","current","getStateFromURL","useCallback","path","getInitialState","state","then","thenable","onfulfilled","catch","navigation","action","dispatch","
|
|
1
|
+
{"version":3,"names":["getActionFromState","getActionFromStateDefault","getStateFromPath","getStateFromPathDefault","useNavigationIndependentTree","React","Linking","Platform","extractPathFromURL","linkingHandlers","useLinking","ref","enabled","prefixes","filter","config","getInitialURL","Promise","race","resolve","setTimeout","subscribe","listener","callback","url","subscription","addEventListener","removeEventListener","bind","remove","onUnhandledLinking","independent","useEffect","process","env","NODE_ENV","undefined","length","console","error","OS","join","trim","handler","Symbol","push","index","indexOf","splice","enabledRef","useRef","prefixesRef","filterRef","configRef","getInitialURLRef","getStateFromPathRef","getActionFromStateRef","current","getStateFromURL","useCallback","path","e","getInitialState","state","then","thenable","onfulfilled","catch","navigation","action","dispatch","warn","message","resetRoot"],"sourceRoot":"../../src","sources":["useLinking.native.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -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;
|
|
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;AAIF,wBAAgB,mBAAmB;oBAmBlB,MAAM;eAcR,MAAM;wBAIG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;0BAed;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,eAAe,CAAA;KAAE;6BAoBrC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,eAAe,CAAA;KAAE;UAqC3D,MAAM;qBA0FK,MAAM,IAAI;EAqB9B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extractPathFromURL.d.ts","sourceRoot":"","sources":["../../../src/extractPathFromURL.tsx"],"names":[],"mappings":"AAEA,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"extractPathFromURL.d.ts","sourceRoot":"","sources":["../../../src/extractPathFromURL.tsx"],"names":[],"mappings":"AAEA,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,sBA8BjE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useLinking.d.ts","sourceRoot":"","sources":["../../../src/useLinking.tsx"],"names":[],"mappings":"AAAA,OAAO,EAIL,gBAAgB,IAAI,uBAAuB,EAC3C,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;AAE9C,KAAK,WAAW,GAAG,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAuE9D;;GAEG;AACH,eAAO,MAAM,MAAM,GAAI,IAAI,MAAM,OAAO,CAAC,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,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;
|
|
1
|
+
{"version":3,"file":"useLinking.d.ts","sourceRoot":"","sources":["../../../src/useLinking.tsx"],"names":[],"mappings":"AAAA,OAAO,EAIL,gBAAgB,IAAI,uBAAuB,EAC3C,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;AAE9C,KAAK,WAAW,GAAG,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAuE9D;;GAEG;AACH,eAAO,MAAM,MAAM,GAAI,IAAI,MAAM,OAAO,CAAC,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,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;2BAyGhD,WAAW,CAAC,WAAW,GAAG,SAAS,CAAC;EAqS1D"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useLinking.native.d.ts","sourceRoot":"","sources":["../../../src/useLinking.native.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,sBAAsB,EAC3B,KAAK,aAAa,EAEnB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAI9C,KAAK,OAAO,GAAG,cAAc,CAAC,aAAa,CAAC,CAAC;AAI7C,wBAAgB,UAAU,CACxB,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,sBAAsB,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,EAClE,EACE,OAAc,EACd,QAAQ,EACR,MAAM,EACN,MAAM,EACN,aAQI,EACJ,SAmBC,EACD,gBAA0C,EAC1C,kBAA8C,GAC/C,EAAE,OAAO,EACV,kBAAkB,EAAE,CAAC,mBAAmB,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"useLinking.native.d.ts","sourceRoot":"","sources":["../../../src/useLinking.native.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,sBAAsB,EAC3B,KAAK,aAAa,EAEnB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAI9C,KAAK,OAAO,GAAG,cAAc,CAAC,aAAa,CAAC,CAAC;AAI7C,wBAAgB,UAAU,CACxB,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,sBAAsB,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,EAClE,EACE,OAAc,EACd,QAAQ,EACR,MAAM,EACN,MAAM,EACN,aAQI,EACJ,SAmBC,EACD,gBAA0C,EAC1C,kBAA8C,GAC/C,EAAE,OAAO,EACV,kBAAkB,EAAE,CAAC,mBAAmB,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;EAoKtE"}
|
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.2.
|
|
4
|
+
"version": "7.2.4",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"react-native",
|
|
7
7
|
"react-navigation",
|
|
@@ -42,7 +42,7 @@
|
|
|
42
42
|
"clean": "del lib"
|
|
43
43
|
},
|
|
44
44
|
"dependencies": {
|
|
45
|
-
"@react-navigation/core": "^7.17.
|
|
45
|
+
"@react-navigation/core": "^7.17.4",
|
|
46
46
|
"escape-string-regexp": "^4.0.0",
|
|
47
47
|
"fast-deep-equal": "^3.1.3",
|
|
48
48
|
"nanoid": "^3.3.11",
|
|
@@ -83,5 +83,5 @@
|
|
|
83
83
|
]
|
|
84
84
|
]
|
|
85
85
|
},
|
|
86
|
-
"gitHead": "
|
|
86
|
+
"gitHead": "01ae31e084223989654cbaafeffc88b4448b5d4f"
|
|
87
87
|
}
|
|
@@ -10,6 +10,8 @@ type HistoryRecord = {
|
|
|
10
10
|
path: string;
|
|
11
11
|
};
|
|
12
12
|
|
|
13
|
+
const getPathWithoutHash = (path: string) => path.split('#')[0];
|
|
14
|
+
|
|
13
15
|
export function createMemoryHistory() {
|
|
14
16
|
let index = 0;
|
|
15
17
|
let items: HistoryRecord[] = [];
|
|
@@ -48,11 +50,13 @@ export function createMemoryHistory() {
|
|
|
48
50
|
},
|
|
49
51
|
|
|
50
52
|
backIndex({ path }: { path: string }) {
|
|
53
|
+
const pathWithoutHash = getPathWithoutHash(path);
|
|
54
|
+
|
|
51
55
|
// We need to find the index from the element before current to get closest path to go back to
|
|
52
56
|
for (let i = index - 1; i >= 0; i--) {
|
|
53
57
|
const item = items[i];
|
|
54
58
|
|
|
55
|
-
if (item.path ===
|
|
59
|
+
if (item.path === pathWithoutHash) {
|
|
56
60
|
return i;
|
|
57
61
|
}
|
|
58
62
|
}
|
|
@@ -64,12 +68,13 @@ export function createMemoryHistory() {
|
|
|
64
68
|
interrupt();
|
|
65
69
|
|
|
66
70
|
const id = nanoid();
|
|
71
|
+
const pathWithoutHash = getPathWithoutHash(path);
|
|
67
72
|
|
|
68
73
|
// When a new entry is pushed, all the existing entries after index will be inaccessible
|
|
69
74
|
// So we remove any existing entries after the current index to clean them up
|
|
70
75
|
items = items.slice(0, index + 1);
|
|
71
76
|
|
|
72
|
-
items.push({ path, state, id });
|
|
77
|
+
items.push({ path: pathWithoutHash, state, id });
|
|
73
78
|
index = items.length - 1;
|
|
74
79
|
|
|
75
80
|
// We pass empty string for title because it's ignored in all browsers except safari
|
|
@@ -83,6 +88,7 @@ export function createMemoryHistory() {
|
|
|
83
88
|
interrupt();
|
|
84
89
|
|
|
85
90
|
const id = window.history.state?.id ?? nanoid();
|
|
91
|
+
const pathWithoutHash = getPathWithoutHash(path);
|
|
86
92
|
|
|
87
93
|
// Need to keep the hash part of the path if there was no previous history entry
|
|
88
94
|
// or the previous history entry had the same path
|
|
@@ -98,13 +104,13 @@ export function createMemoryHistory() {
|
|
|
98
104
|
// So we need to push the entry as there's nothing to replace
|
|
99
105
|
|
|
100
106
|
pathWithHash = pathWithHash + hash;
|
|
101
|
-
items = [{ path:
|
|
107
|
+
items = [{ path: pathWithoutHash, state, id }];
|
|
102
108
|
index = 0;
|
|
103
109
|
} else {
|
|
104
|
-
if (items[index].path ===
|
|
110
|
+
if (items[index].path === pathWithoutHash) {
|
|
105
111
|
pathWithHash = pathWithHash + hash;
|
|
106
112
|
}
|
|
107
|
-
items[index] = { path, state, id };
|
|
113
|
+
items[index] = { path: pathWithoutHash, state, id };
|
|
108
114
|
}
|
|
109
115
|
|
|
110
116
|
window.history.replaceState({ id }, '', pathWithHash);
|
|
@@ -11,8 +11,8 @@ export function extractPathFromURL(prefixes: string[], url: string) {
|
|
|
11
11
|
const prefixRegex = new RegExp(
|
|
12
12
|
`^${escapeStringRegexp(protocol)}(/)*${host
|
|
13
13
|
.split('.')
|
|
14
|
-
.map((it) => (it === '*' ? '[
|
|
15
|
-
.join('\\.')}`
|
|
14
|
+
.map((it) => (it === '*' ? '[^/?#]+' : escapeStringRegexp(it)))
|
|
15
|
+
.join('\\.')}${host === '' || host.endsWith('/') ? '' : '(?=$|[/?#])'}`
|
|
16
16
|
);
|
|
17
17
|
|
|
18
18
|
const [originAndPath, ...searchParams] = url.split('?');
|
|
@@ -21,7 +21,11 @@ export function extractPathFromURL(prefixes: string[], url: string) {
|
|
|
21
21
|
.concat(searchParams.length ? `?${searchParams.join('?')}` : '');
|
|
22
22
|
|
|
23
23
|
if (prefixRegex.test(normalizedURL)) {
|
|
24
|
-
|
|
24
|
+
const result = normalizedURL.replace(prefixRegex, '');
|
|
25
|
+
|
|
26
|
+
return result.startsWith('?') || result.startsWith('#')
|
|
27
|
+
? `/${result}`
|
|
28
|
+
: result;
|
|
25
29
|
}
|
|
26
30
|
}
|
|
27
31
|
|
|
@@ -128,9 +128,15 @@ export function useLinking(
|
|
|
128
128
|
|
|
129
129
|
const path = extractPathFromURL(prefixesRef.current, url);
|
|
130
130
|
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
131
|
+
if (path !== undefined) {
|
|
132
|
+
try {
|
|
133
|
+
return getStateFromPathRef.current(path, configRef.current);
|
|
134
|
+
} catch (e) {
|
|
135
|
+
console.error(e);
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
|
|
139
|
+
return undefined;
|
|
134
140
|
},
|
|
135
141
|
[]
|
|
136
142
|
);
|
package/src/useLinking.tsx
CHANGED
|
@@ -194,7 +194,13 @@ export function useLinking(
|
|
|
194
194
|
const path = location ? location.pathname + location.search : undefined;
|
|
195
195
|
|
|
196
196
|
if (path) {
|
|
197
|
-
|
|
197
|
+
try {
|
|
198
|
+
value = getStateFromPathRef.current(path, configRef.current);
|
|
199
|
+
} catch (e) {
|
|
200
|
+
console.error(e);
|
|
201
|
+
|
|
202
|
+
value = undefined;
|
|
203
|
+
}
|
|
198
204
|
}
|
|
199
205
|
|
|
200
206
|
// If the link were handled, it gets cleared in NavigationContainer
|
|
@@ -268,7 +274,15 @@ export function useLinking(
|
|
|
268
274
|
return;
|
|
269
275
|
}
|
|
270
276
|
|
|
271
|
-
|
|
277
|
+
let state: ResultState | undefined;
|
|
278
|
+
|
|
279
|
+
try {
|
|
280
|
+
state = getStateFromPathRef.current(path, configRef.current);
|
|
281
|
+
} catch (e) {
|
|
282
|
+
console.error(e);
|
|
283
|
+
|
|
284
|
+
state = undefined;
|
|
285
|
+
}
|
|
272
286
|
|
|
273
287
|
// We should only dispatch an action when going forward
|
|
274
288
|
// Otherwise the action will likely add items to history, which would mess things up
|
|
@@ -334,10 +348,18 @@ export function useLinking(
|
|
|
334
348
|
// If the `route` object contains a `path`, use that path as long as `route.name` and `params` still match
|
|
335
349
|
// This makes sure that we preserve the original URL for wildcard routes
|
|
336
350
|
if (route?.path) {
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
351
|
+
let stateForPath: ResultState | undefined;
|
|
352
|
+
|
|
353
|
+
try {
|
|
354
|
+
stateForPath = getStateFromPathRef.current(
|
|
355
|
+
route.path,
|
|
356
|
+
configRef.current
|
|
357
|
+
);
|
|
358
|
+
} catch (e) {
|
|
359
|
+
console.error(e);
|
|
360
|
+
|
|
361
|
+
stateForPath = undefined;
|
|
362
|
+
}
|
|
341
363
|
|
|
342
364
|
if (stateForPath) {
|
|
343
365
|
const focusedRoute = findFocusedRoute(stateForPath);
|