@react-navigation/native 8.0.0-alpha.20 → 8.0.0-alpha.22

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.
@@ -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 === 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: pathWithHash,
97
+ path: pathWithoutHash,
93
98
  state,
94
99
  id
95
100
  }];
96
101
  index = 0;
97
102
  } else {
98
- if (items[index].path === 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","path","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":[]}
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":";;AACA,SAASA,MAAM,QAAQ,mBAAmB;AAW1C,MAAMC,kBAAkB,GAAIC,IAAY,IAAKA,IAAI,CAACC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AAE/D,OAAO,SAASC,mBAAmBA,CAAA,EAAG;EACpC,IAAIC,KAAK,GAAG,CAAC;EACb,IAAIC,KAAsB,GAAG,EAAE;;EAE/B;EACA;EACA,MAAMC,OAAgE,GAAG,EAAE;EAE3E,MAAMC,SAAS,GAAGA,CAAA,KAAM;IACtB;IACA;IACA;IACAD,OAAO,CAACE,OAAO,CAAEC,EAAE,IAAK;MACtB,MAAMC,EAAE,GAAGD,EAAE,CAACC,EAAE;MAChBD,EAAE,CAACC,EAAE,GAAG,MAAMA,EAAE,CAAC,IAAI,CAAC;IACxB,CAAC,CAAC;EACJ,CAAC;EAED,MAAMC,OAAO,GAAG;IACd,IAAIP,KAAKA,CAAA,EAAW;MAClB;MACA;MACA,MAAMQ,EAAE,GAAGC,MAAM,CAACF,OAAO,CAACG,KAAK,EAAEF,EAAE;MAEnC,IAAIA,EAAE,EAAE;QACN,MAAMR,KAAK,GAAGC,KAAK,CAACU,SAAS,CAAEC,IAAI,IAAKA,IAAI,CAACJ,EAAE,KAAKA,EAAE,CAAC;QAEvD,OAAOR,KAAK,GAAG,CAAC,CAAC,GAAGA,KAAK,GAAG,CAAC;MAC/B;MAEA,OAAO,CAAC;IACV,CAAC;IAEDa,GAAGA,CAACb,KAAa,EAAE;MACjB,OAAOC,KAAK,CAACD,KAAK,CAAC;IACrB,CAAC;IAEDc,SAASA,CAAC;MAAEjB;IAAuB,CAAC,EAAE;MACpC,MAAMkB,eAAe,GAAGnB,kBAAkB,CAACC,IAAI,CAAC;;MAEhD;MACA,KAAK,IAAImB,CAAC,GAAGhB,KAAK,GAAG,CAAC,EAAEgB,CAAC,IAAI,CAAC,EAAEA,CAAC,EAAE,EAAE;QACnC,MAAMJ,IAAI,GAAGX,KAAK,CAACe,CAAC,CAAC;QAErB,IAAIJ,IAAI,CAACf,IAAI,KAAKkB,eAAe,EAAE;UACjC,OAAOC,CAAC;QACV;MACF;MAEA,OAAO,CAAC,CAAC;IACX,CAAC;IAEDC,IAAIA,CAAC;MAAEpB,IAAI;MAAEa;IAAgD,CAAC,EAAE;MAC9DP,SAAS,CAAC,CAAC;MAEX,MAAMK,EAAE,GAAGb,MAAM,CAAC,CAAC;MACnB,MAAMoB,eAAe,GAAGnB,kBAAkB,CAACC,IAAI,CAAC;;MAEhD;MACA;MACAI,KAAK,GAAGA,KAAK,CAACiB,KAAK,CAAC,CAAC,EAAElB,KAAK,GAAG,CAAC,CAAC;MAEjCC,KAAK,CAACgB,IAAI,CAAC;QAAEpB,IAAI,EAAEkB,eAAe;QAAEL,KAAK;QAAEF;MAAG,CAAC,CAAC;MAChDR,KAAK,GAAGC,KAAK,CAACkB,MAAM,GAAG,CAAC;;MAExB;MACA;MACA;MACA;MACAV,MAAM,CAACF,OAAO,CAACa,SAAS,CAAC;QAAEZ;MAAG,CAAC,EAAE,EAAE,EAAEX,IAAI,CAAC;IAC5C,CAAC;IAEDwB,OAAOA,CAAC;MAAExB,IAAI;MAAEa;IAAgD,CAAC,EAAE;MACjEP,SAAS,CAAC,CAAC;MAEX,MAAMK,EAAE,GAAGC,MAAM,CAACF,OAAO,CAACG,KAAK,EAAEF,EAAE,IAAIb,MAAM,CAAC,CAAC;MAC/C,MAAMoB,eAAe,GAAGnB,kBAAkB,CAACC,IAAI,CAAC;;MAEhD;MACA;MACA,IAAIyB,YAAY,GAAGzB,IAAI;MACvB,MAAM0B,IAAI,GAAGD,YAAY,CAACE,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,GAAGC,QAAQ,CAACF,IAAI;MAE5D,IAAI,CAACtB,KAAK,CAACkB,MAAM,IAAIlB,KAAK,CAACU,SAAS,CAAEC,IAAI,IAAKA,IAAI,CAACJ,EAAE,KAAKA,EAAE,CAAC,GAAG,CAAC,EAAE;QAClE;QACA;QACA;QACA;QACA;QACA;;QAEAc,YAAY,GAAGA,YAAY,GAAGC,IAAI;QAClCtB,KAAK,GAAG,CAAC;UAAEJ,IAAI,EAAEkB,eAAe;UAAEL,KAAK;UAAEF;QAAG,CAAC,CAAC;QAC9CR,KAAK,GAAG,CAAC;MACX,CAAC,MAAM;QACL,IAAIC,KAAK,CAACD,KAAK,CAAC,CAACH,IAAI,KAAKkB,eAAe,EAAE;UACzCO,YAAY,GAAGA,YAAY,GAAGC,IAAI;QACpC;QACAtB,KAAK,CAACD,KAAK,CAAC,GAAG;UAAEH,IAAI,EAAEkB,eAAe;UAAEL,KAAK;UAAEF;QAAG,CAAC;MACrD;MAEAC,MAAM,CAACF,OAAO,CAACmB,YAAY,CAAC;QAAElB;MAAG,CAAC,EAAE,EAAE,EAAEc,YAAY,CAAC;IACvD,CAAC;IAED;IACA;IACA;IACA;IACA;IACAK,EAAEA,CAACC,CAAS,EAAE;MACZzB,SAAS,CAAC,CAAC;;MAEX;MACA;MACA,MAAM0B,SAAS,GAAG7B,KAAK,GAAG4B,CAAC;MAC3B,MAAME,aAAa,GAAG7B,KAAK,CAACkB,MAAM,GAAG,CAAC;MACtC,IAAIS,CAAC,GAAG,CAAC,IAAI,CAAC3B,KAAK,CAAC4B,SAAS,CAAC,EAAE;QAC9B;QACAD,CAAC,GAAG,CAAC5B,KAAK;QACVA,KAAK,GAAG,CAAC;MACX,CAAC,MAAM,IAAI4B,CAAC,GAAG,CAAC,IAAIC,SAAS,GAAGC,aAAa,EAAE;QAC7C;QACAF,CAAC,GAAGE,aAAa,GAAG9B,KAAK;QACzBA,KAAK,GAAG8B,aAAa;MACvB,CAAC,MAAM;QACL9B,KAAK,GAAG6B,SAAS;MACnB;MAEA,IAAID,CAAC,KAAK,CAAC,EAAE;QACX;MACF;;MAEA;MACA;MACA;MACA;MACA;MACA,OAAO,IAAIG,OAAO,CAAO,CAACC,OAAO,EAAEC,MAAM,KAAK;QAC5C,MAAMC,IAAI,GAAIC,WAAqB,IAAK;UACtCC,YAAY,CAACC,KAAK,CAAC;UAEnB,IAAIF,WAAW,EAAE;YACfF,MAAM,CAAC,IAAIK,KAAK,CAAC,wCAAwC,CAAC,CAAC;YAC3D;UACF;;UAEA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA,MAAM;YAAEC;UAAM,CAAC,GAAG9B,MAAM,CAAC+B,QAAQ;UAEjC/B,MAAM,CAAC+B,QAAQ,CAACD,KAAK,GAAG,EAAE;UAC1B9B,MAAM,CAAC+B,QAAQ,CAACD,KAAK,GAAGA,KAAK;UAE7BP,OAAO,CAAC,CAAC;QACX,CAAC;QAED9B,OAAO,CAACe,IAAI,CAAC;UAAEwB,GAAG,EAAEP,IAAI;UAAE5B,EAAE,EAAE4B;QAAK,CAAC,CAAC;;QAErC;QACA;QACA;QACA;QACA;QACA,MAAMG,KAAK,GAAGK,UAAU,CAAC,MAAM;UAC7B,MAAMC,UAAU,GAAGzC,OAAO,CAACS,SAAS,CAAEN,EAAE,IAAKA,EAAE,CAACoC,GAAG,KAAKP,IAAI,CAAC;UAE7D,IAAIS,UAAU,GAAG,CAAC,CAAC,EAAE;YACnBzC,OAAO,CAACyC,UAAU,CAAC,CAACrC,EAAE,CAAC,CAAC;YACxBJ,OAAO,CAAC0C,MAAM,CAACD,UAAU,EAAE,CAAC,CAAC;UAC/B;UAEA3C,KAAK,GAAG,IAAI,CAACA,KAAK;QACpB,CAAC,EAAE,GAAG,CAAC;QAEP,MAAM6C,UAAU,GAAGA,CAAA,KAAM;UACvB;UACA;UACA7C,KAAK,GAAG,IAAI,CAACA,KAAK;UAElB,MAAM8C,IAAI,GAAG5C,OAAO,CAAC6C,GAAG,CAAC,CAAC;UAE1BtC,MAAM,CAACuC,mBAAmB,CAAC,UAAU,EAAEH,UAAU,CAAC;UAClDC,IAAI,EAAExC,EAAE,CAAC,CAAC;QACZ,CAAC;QAEDG,MAAM,CAACwC,gBAAgB,CAAC,UAAU,EAAEJ,UAAU,CAAC;QAC/CpC,MAAM,CAACF,OAAO,CAACoB,EAAE,CAACC,CAAC,CAAC;MACtB,CAAC,CAAC;IACJ,CAAC;IAED;IACA;IACA;IACAsB,MAAMA,CAACC,QAAoB,EAAE;MAC3B,MAAMN,UAAU,GAAGA,CAAA,KAAM;QACvB;QACA;QACA7C,KAAK,GAAG,IAAI,CAACA,KAAK;QAElB,IAAIE,OAAO,CAACiB,MAAM,EAAE;UAClB;UACA;QACF;QAEAgC,QAAQ,CAAC,CAAC;MACZ,CAAC;MAED1C,MAAM,CAACwC,gBAAgB,CAAC,UAAU,EAAEJ,UAAU,CAAC;MAE/C,OAAO,MAAMpC,MAAM,CAACuC,mBAAmB,CAAC,UAAU,EAAEH,UAAU,CAAC;IACjE;EACF,CAAC;EAED,OAAOtC,OAAO;AAChB","ignoreList":[]}
@@ -11,7 +11,7 @@ export function extractPathFromURL(prefixes, url) {
11
11
  const host = prefix.replace(new RegExp(`^${escapeStringRegexp(protocol)}`), '').replace(/\/+/g, '/') // Replace multiple slash (//) with single ones
12
12
  .replace(/^\//, ''); // Remove extra leading slash
13
13
 
14
- prefixRegex = new RegExp(`^${escapeStringRegexp(protocol)}(/)*${host.split('.').map(it => it === '*' ? '[^/]+' : escapeStringRegexp(it)).join('\\.')}`);
14
+ prefixRegex = new RegExp(`^${escapeStringRegexp(protocol)}(/)*${host.split('.').map(it => it === '*' ? '[^/?#]+' : escapeStringRegexp(it)).join('\\.')}${host === '' || host.endsWith('/') ? '' : '(?=$|[/?#])'}`);
15
15
  }
16
16
  const [originAndPath, ...searchParams] = url.split('?');
17
17
  if (prefixRegex.test(originAndPath)) {
@@ -1 +1 @@
1
- {"version":3,"names":["escapeStringRegexp","extractPathFromURL","prefixes","url","prefix","prefixRegex","protocol","match","host","replace","RegExp","split","map","it","join","originAndPath","searchParams","test","result","concat","length","startsWith","undefined"],"sourceRoot":"../../src","sources":["extractPathFromURL.tsx"],"mappings":";;AAAA,OAAOA,kBAAkB,MAAM,sBAAsB;AAIrD,OAAO,SAASC,kBAAkBA,CAACC,QAAyB,EAAEC,GAAW,EAAE;EACzE,KAAK,MAAMC,MAAM,IAAIF,QAAQ,EAAE;IAC7B,IAAIG,WAAW;IAEf,IAAID,MAAM,KAAK,GAAG,EAAE;MAClBC,WAAW,GAAG,yCAAyC;IACzD,CAAC,MAAM;MACL,MAAMC,QAAQ,GAAGF,MAAM,CAACG,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE;MACnD,MAAMC,IAAI,GAAGJ,MAAM,CAChBK,OAAO,CAAC,IAAIC,MAAM,CAAC,IAAIV,kBAAkB,CAACM,QAAQ,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAC3DG,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;MAAA,CACrBA,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC;;MAEvBJ,WAAW,GAAG,IAAIK,MAAM,CACtB,IAAIV,kBAAkB,CAACM,QAAQ,CAAC,OAAOE,IAAI,CACxCG,KAAK,CAAC,GAAG,CAAC,CACVC,GAAG,CAAEC,EAAE,IAAMA,EAAE,KAAK,GAAG,GAAG,OAAO,GAAGb,kBAAkB,CAACa,EAAE,CAAE,CAAC,CAC5DC,IAAI,CAAC,KAAK,CAAC,EAChB,CAAC;IACH;IAEA,MAAM,CAACC,aAAa,EAAE,GAAGC,YAAY,CAAC,GAAGb,GAAG,CAACQ,KAAK,CAAC,GAAG,CAAC;IAEvD,IAAIN,WAAW,CAACY,IAAI,CAACF,aAAa,CAAC,EAAE;MACnC,MAAMG,MAAM,GAAGH,aAAa,CACzBN,OAAO,CAACJ,WAAW,EAAE,EAAE,CAAC,CACxBI,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CACpBU,MAAM,CAACH,YAAY,CAACI,MAAM,GAAG,IAAIJ,YAAY,CAACF,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC;MAElE,OAAOI,MAAM,CAACG,UAAU,CAAC,GAAG,CAAC,GAAGH,MAAM,GAAG,IAAIA,MAAM,EAAE;IACvD;EACF;EAEA,OAAOI,SAAS;AAClB","ignoreList":[]}
1
+ {"version":3,"names":["escapeStringRegexp","extractPathFromURL","prefixes","url","prefix","prefixRegex","protocol","match","host","replace","RegExp","split","map","it","join","endsWith","originAndPath","searchParams","test","result","concat","length","startsWith","undefined"],"sourceRoot":"../../src","sources":["extractPathFromURL.tsx"],"mappings":";;AAAA,OAAOA,kBAAkB,MAAM,sBAAsB;AAIrD,OAAO,SAASC,kBAAkBA,CAACC,QAAyB,EAAEC,GAAW,EAAE;EACzE,KAAK,MAAMC,MAAM,IAAIF,QAAQ,EAAE;IAC7B,IAAIG,WAAW;IAEf,IAAID,MAAM,KAAK,GAAG,EAAE;MAClBC,WAAW,GAAG,yCAAyC;IACzD,CAAC,MAAM;MACL,MAAMC,QAAQ,GAAGF,MAAM,CAACG,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE;MACnD,MAAMC,IAAI,GAAGJ,MAAM,CAChBK,OAAO,CAAC,IAAIC,MAAM,CAAC,IAAIV,kBAAkB,CAACM,QAAQ,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAC3DG,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;MAAA,CACrBA,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC;;MAEvBJ,WAAW,GAAG,IAAIK,MAAM,CACtB,IAAIV,kBAAkB,CAACM,QAAQ,CAAC,OAAOE,IAAI,CACxCG,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,GACZN,IAAI,KAAK,EAAE,IAAIA,IAAI,CAACO,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,aAAa,EAE1D,CAAC;IACH;IAEA,MAAM,CAACC,aAAa,EAAE,GAAGC,YAAY,CAAC,GAAGd,GAAG,CAACQ,KAAK,CAAC,GAAG,CAAC;IAEvD,IAAIN,WAAW,CAACa,IAAI,CAACF,aAAa,CAAC,EAAE;MACnC,MAAMG,MAAM,GAAGH,aAAa,CACzBP,OAAO,CAACJ,WAAW,EAAE,EAAE,CAAC,CACxBI,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CACpBW,MAAM,CAACH,YAAY,CAACI,MAAM,GAAG,IAAIJ,YAAY,CAACH,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC;MAElE,OAAOK,MAAM,CAACG,UAAU,CAAC,GAAG,CAAC,GAAGH,MAAM,GAAG,IAAIA,MAAM,EAAE;IACvD;EACF;EAEA,OAAOI,SAAS;AAClB","ignoreList":[]}
@@ -137,7 +137,12 @@ export function useLinking(ref, {
137
137
  const location = server?.location ?? (typeof window !== 'undefined' ? window.location : undefined);
138
138
  const path = location ? location.pathname + location.search : undefined;
139
139
  if (path) {
140
- value = getStateFromPathRef.current(path, configRef.current);
140
+ try {
141
+ value = getStateFromPathRef.current(path, configRef.current);
142
+ } catch (e) {
143
+ console.error(e);
144
+ value = undefined;
145
+ }
141
146
  }
142
147
  }
143
148
  const thenable = {
@@ -184,7 +189,13 @@ export function useLinking(ref, {
184
189
  }
185
190
  return;
186
191
  }
187
- const state = getStateFromPathRef.current(path, configRef.current);
192
+ let state;
193
+ try {
194
+ state = getStateFromPathRef.current(path, configRef.current);
195
+ } catch (e) {
196
+ console.error(e);
197
+ state = undefined;
198
+ }
188
199
 
189
200
  // We should only dispatch an action when going forward
190
201
  // Otherwise the action will likely add items to history, which would mess things up
@@ -226,7 +237,13 @@ export function useLinking(ref, {
226
237
  // If the `route` object contains a `path`, use that path as long as `route.name` and `params` still match
227
238
  // This makes sure that we preserve the original URL for wildcard routes
228
239
  if (route?.path) {
229
- const stateForPath = getStateFromPathRef.current(route.path, configRef.current);
240
+ let stateForPath;
241
+ try {
242
+ stateForPath = getStateFromPathRef.current(route.path, configRef.current);
243
+ } catch (e) {
244
+ console.error(e);
245
+ stateForPath = undefined;
246
+ }
230
247
  if (stateForPath) {
231
248
  const focusedRoute = findFocusedRoute(stateForPath);
232
249
  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","getTotalHistoryLength","baseHistoryLength","history","length","routeHistoryLength","reduce","acc","r","findMatchingState","a","b","undefined","key","aHistoryLength","bHistoryLength","aRoute","bRoute","aChildState","bChildState","isPoppingLastEntry","current","record","currentRoute","recordRoute","currentRouteHistory","recordRouteHistory","currentRoutes","recordRoutes","every","route","i","series","cb","queue","Promise","resolve","callback","then","linkingHandlers","Set","useLinking","ref","enabled","config","independent","useEffect","process","env","NODE_ENV","size","console","error","join","trim","handler","Symbol","add","delete","useState","enabledRef","useRef","configRef","getStateFromPathRef","getPathFromStateRef","getActionFromStateRef","validateRoutesNotExistInRootState","useCallback","navigation","rootState","getRootState","some","routeNames","includes","name","server","use","getInitialState","value","location","window","path","pathname","search","thenable","onfulfilled","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","push","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","getTotalHistoryLength","baseHistoryLength","history","length","routeHistoryLength","reduce","acc","r","findMatchingState","a","b","undefined","key","aHistoryLength","bHistoryLength","aRoute","bRoute","aChildState","bChildState","isPoppingLastEntry","current","record","currentRoute","recordRoute","currentRouteHistory","recordRouteHistory","currentRoutes","recordRoutes","every","route","i","series","cb","queue","Promise","resolve","callback","then","linkingHandlers","Set","useLinking","ref","enabled","config","independent","useEffect","process","env","NODE_ENV","size","console","error","join","trim","handler","Symbol","add","delete","useState","enabledRef","useRef","configRef","getStateFromPathRef","getPathFromStateRef","getActionFromStateRef","validateRoutesNotExistInRootState","useCallback","navigation","rootState","getRootState","some","routeNames","includes","name","server","use","getInitialState","value","location","window","path","pathname","search","e","thenable","onfulfilled","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","push","nextIndex","backIndex","currentIndex","go","addListener"],"sourceRoot":"../../src","sources":["useLinking.tsx"],"mappings":"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","ignoreList":[]}
@@ -86,6 +86,7 @@ export function useLinking(ref, {
86
86
  getStateFromPath: getStateFromPathRef.current
87
87
  });
88
88
  } catch (e) {
89
+ console.error(e);
89
90
  return undefined;
90
91
  }
91
92
  }, []);
@@ -1 +1 @@
1
- {"version":3,"names":["getActionFromState","getActionFromStateDefault","getStateFromPath","getStateFromPathDefault","useNavigationIndependentTree","React","Linking","Platform","getStateFromHref","linkingHandlers","Set","useLinking","ref","enabled","prefixes","filter","config","getInitialURL","Promise","race","resolve","setTimeout","subscribe","listener","callback","url","subscription","addEventListener","remove","independent","useEffect","process","env","NODE_ENV","undefined","handler","Symbol","add","timer","size","has","console","error","OS","join","trim","clearTimeout","delete","enabledRef","useRef","prefixesRef","filterRef","configRef","getInitialURLRef","getStateFromPathRef","getActionFromStateRef","current","getStateFromURL","useCallback","e","getInitialState","state","then","thenable","onfulfilled","navigation","REACT_NAVIGATION_DEVTOOLS","get","listeners","forEach","type","action","dispatch","warn","message","resetRoot"],"sourceRoot":"../../src","sources":["useLinking.native.tsx"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["getActionFromState","getActionFromStateDefault","getStateFromPath","getStateFromPathDefault","useNavigationIndependentTree","React","Linking","Platform","getStateFromHref","linkingHandlers","Set","useLinking","ref","enabled","prefixes","filter","config","getInitialURL","Promise","race","resolve","setTimeout","subscribe","listener","callback","url","subscription","addEventListener","remove","independent","useEffect","process","env","NODE_ENV","undefined","handler","Symbol","add","timer","size","has","console","error","OS","join","trim","clearTimeout","delete","enabledRef","useRef","prefixesRef","filterRef","configRef","getInitialURLRef","getStateFromPathRef","getActionFromStateRef","current","getStateFromURL","useCallback","e","getInitialState","state","then","thenable","onfulfilled","navigation","REACT_NAVIGATION_DEVTOOLS","get","listeners","forEach","type","action","dispatch","warn","message","resetRoot"],"sourceRoot":"../../src","sources":["useLinking.native.tsx"],"mappings":";;AAAA,SACEA,kBAAkB,IAAIC,yBAAyB,EAC/CC,gBAAgB,IAAIC,uBAAuB,EAG3CC,4BAA4B,QACvB,wBAAwB;AAC/B,OAAO,KAAKC,KAAK,MAAM,OAAO;AAC9B,SAASC,OAAO,EAAEC,QAAQ,QAAQ,cAAc;AAEhD,SAASC,gBAAgB,QAAQ,uBAAoB;AAMrD,MAAMC,eAAe,GAAG,IAAIC,GAAG,CAAS,CAAC;AAEzC,OAAO,SAASC,UAAUA,CACxBC,GAA8D,EAC9D;EACEC,OAAO,GAAG,IAAI;EACdC,QAAQ,GAAG,CAAC,GAAG,CAAC;EAChBC,MAAM;EACNC,MAAM;EACNC,aAAa,GAAGA,CAAA,KACdC,OAAO,CAACC,IAAI,CAAC,CACXb,OAAO,CAACW,aAAa,CAAC,CAAC,EACvB,IAAIC,OAAO,CAAaE,OAAO,IAAK;IAClC;IACA;IACAC,UAAU,CAACD,OAAO,EAAE,GAAG,CAAC;EAC1B,CAAC,CAAC,CACH,CAAC;EACJE,SAAS,GAAIC,QAAQ,IAAK;IACxB,MAAMC,QAAQ,GAAGA,CAAC;MAAEC;IAAqB,CAAC,KAAKF,QAAQ,CAACE,GAAG,CAAC;IAE5D,MAAMC,YAAY,GAAGpB,OAAO,CAACqB,gBAAgB,CAAC,KAAK,EAAEH,QAAQ,CAAC;IAE9D,OAAO,MAAM;MACXE,YAAY,CAACE,MAAM,CAAC,CAAC;IACvB,CAAC;EACH,CAAC;EACD1B,gBAAgB,GAAGC,uBAAuB;EAC1CH,kBAAkB,GAAGC;AACQ,CAAC,EAChC;EACA,MAAM4B,WAAW,GAAGzB,4BAA4B,CAAC,CAAC;EAElDC,KAAK,CAACyB,SAAS,CAAC,MAAM;IACpB,IAAIC,OAAO,CAACC,GAAG,CAACC,QAAQ,KAAK,YAAY,EAAE;MACzC,OAAOC,SAAS;IAClB;IAEA,IAAIL,WAAW,EAAE;MACf,OAAOK,SAAS;IAClB;IAEA,MAAMC,OAAO,GAAGC,MAAM,CAAC,CAAC;IAExB,IAAIvB,OAAO,KAAK,KAAK,EAAE;MACrBJ,eAAe,CAAC4B,GAAG,CAACF,OAAO,CAAC;IAC9B;;IAEA;IACA;IACA;IACA;IACA,MAAMG,KAAK,GAAGjB,UAAU,CAAC,MAAM;MAC7B,IACER,OAAO,KAAK,KAAK,IACjBJ,eAAe,CAAC8B,IAAI,IACpB,EAAE9B,eAAe,CAAC8B,IAAI,KAAK,CAAC,IAAI9B,eAAe,CAAC+B,GAAG,CAACL,OAAO,CAAC,CAAC,EAC7D;QACAM,OAAO,CAACC,KAAK,CACX,CACE,6KAA6K,EAC7K,uFAAuF,EACvF,4DAA4D,EAC5DnC,QAAQ,CAACoC,EAAE,KAAK,SAAS,GACrB,sJAAsJ,GACtJ,EAAE,CACP,CACEC,IAAI,CAAC,IAAI,CAAC,CACVC,IAAI,CAAC,CACV,CAAC;MACH;IACF,CAAC,EAAE,IAAI,CAAC;IAER,OAAO,MAAM;MACXC,YAAY,CAACR,KAAK,CAAC;MACnB7B,eAAe,CAACsC,MAAM,CAACZ,OAAO,CAAC;IACjC,CAAC;EACH,CAAC,EAAE,CAACtB,OAAO,EAAEgB,WAAW,CAAC,CAAC;;EAE1B;EACA;EACA;EACA,MAAMmB,UAAU,GAAG3C,KAAK,CAAC4C,MAAM,CAACpC,OAAO,CAAC;EACxC,MAAMqC,WAAW,GAAG7C,KAAK,CAAC4C,MAAM,CAACnC,QAAQ,CAAC;EAC1C,MAAMqC,SAAS,GAAG9C,KAAK,CAAC4C,MAAM,CAAClC,MAAM,CAAC;EACtC,MAAMqC,SAAS,GAAG/C,KAAK,CAAC4C,MAAM,CAACjC,MAAM,CAAC;EACtC,MAAMqC,gBAAgB,GAAGhD,KAAK,CAAC4C,MAAM,CAAChC,aAAa,CAAC;EACpD,MAAMqC,mBAAmB,GAAGjD,KAAK,CAAC4C,MAAM,CAAC/C,gBAAgB,CAAC;EAC1D,MAAMqD,qBAAqB,GAAGlD,KAAK,CAAC4C,MAAM,CAACjD,kBAAkB,CAAC;EAE9DK,KAAK,CAACyB,SAAS,CAAC,MAAM;IACpBkB,UAAU,CAACQ,OAAO,GAAG3C,OAAO;IAC5BqC,WAAW,CAACM,OAAO,GAAG1C,QAAQ;IAC9BqC,SAAS,CAACK,OAAO,GAAGzC,MAAM;IAC1BqC,SAAS,CAACI,OAAO,GAAGxC,MAAM;IAC1BqC,gBAAgB,CAACG,OAAO,GAAGvC,aAAa;IACxCqC,mBAAmB,CAACE,OAAO,GAAGtD,gBAAgB;IAC9CqD,qBAAqB,CAACC,OAAO,GAAGxD,kBAAkB;EACpD,CAAC,CAAC;EAEF,MAAMyD,eAAe,GAAGpD,KAAK,CAACqD,WAAW,CACtCjC,GAA8B,IAAK;IAClC,IAAI,CAACA,GAAG,EAAE;MACR,OAAOS,SAAS;IAClB;IAEA,IAAI;MACF,OAAO1B,gBAAgB,CAACiB,GAAG,EAAE;QAC3BX,QAAQ,EAAEoC,WAAW,CAACM,OAAO;QAC7BzC,MAAM,EAAEoC,SAAS,CAACK,OAAO;QACzBxC,MAAM,EAAEoC,SAAS,CAACI,OAAO;QACzBtD,gBAAgB,EAAEoD,mBAAmB,CAACE;MACxC,CAAC,CAAC;IACJ,CAAC,CAAC,OAAOG,CAAC,EAAE;MACVlB,OAAO,CAACC,KAAK,CAACiB,CAAC,CAAC;MAEhB,OAAOzB,SAAS;IAClB;EACF,CAAC,EACD,EACF,CAAC;EAED,MAAM0B,eAAe,GAAGvD,KAAK,CAACqD,WAAW,CAAC,MAAM;IAC9C,IAAIG,KAA8B;IAElC,IAAIb,UAAU,CAACQ,OAAO,EAAE;MACtB,MAAM/B,GAAG,GAAG4B,gBAAgB,CAACG,OAAO,CAAC,CAAC;MAEtC,IAAI/B,GAAG,IAAI,IAAI,EAAE;QACf,IAAI,OAAOA,GAAG,KAAK,QAAQ,EAAE;UAC3B,OAAOA,GAAG,CAACqC,IAAI,CAAErC,GAAG,IAAK;YACvB,MAAMoC,KAAK,GAAGJ,eAAe,CAAChC,GAAG,CAAC;YAElC,OAAOoC,KAAK;UACd,CAAC,CAAC;QACJ;MACF;MAEAA,KAAK,GAAGJ,eAAe,CAAChC,GAAG,CAAC;IAC9B;IAEA,MAAMsC,QAA2C,GAAG;MAClDD,IAAIA,CAACE,WAAsD,EAAE;QAC3D,OAAO9C,OAAO,CAACE,OAAO,CAAC4C,WAAW,GAAGA,WAAW,CAACH,KAAK,CAAC,GAAGA,KAAK,CAAC;MAClE;IACF,CAAC;IAED,OAAOE,QAAQ;EACjB,CAAC,EAAE,CAACN,eAAe,CAAC,CAAC;EAErBpD,KAAK,CAACyB,SAAS,CAAC,MAAM;IACpB,MAAMP,QAAQ,GAAIE,GAAW,IAAK;MAChC,IAAI,CAACZ,OAAO,EAAE;QACZ;MACF;MAEA,MAAMoD,UAAU,GAAGrD,GAAG,CAAC4C,OAAO;MAC9B,MAAMK,KAAK,GAAGI,UAAU,GAAGR,eAAe,CAAChC,GAAG,CAAC,GAAGS,SAAS;MAE3D,IAAI+B,UAAU,EAAE;QACdC,yBAAyB,CAACC,GAAG,CAACF,UAAU,CAAC,EAAEG,SAAS,CAACC,OAAO,CACzD9C,QAAQ,IAAK;UACZA,QAAQ,CAAC;YACP+C,IAAI,EAAE,MAAM;YACZ7C,GAAG;YACHoC;UACF,CAAC,CAAC;QACJ,CACF,CAAC;MACH;MAEA,IAAII,UAAU,IAAIJ,KAAK,EAAE;QACvB,MAAMU,MAAM,GAAGhB,qBAAqB,CAACC,OAAO,CAACK,KAAK,EAAET,SAAS,CAACI,OAAO,CAAC;QAEtE,IAAIe,MAAM,KAAKrC,SAAS,EAAE;UACxB,IAAI;YACF+B,UAAU,CAACO,QAAQ,CAACD,MAAM,CAAC;UAC7B,CAAC,CAAC,OAAOZ,CAAC,EAAE;YACV;YACA;YACAlB,OAAO,CAACgC,IAAI,CACV,qDAAqDhD,GAAG,MACtD,OAAOkC,CAAC,KAAK,QAAQ,IAAIA,CAAC,IAAI,IAAI,IAAI,SAAS,IAAIA,CAAC,GAChDA,CAAC,CAACe,OAAO,GACTf,CAAC,EAET,CAAC;UACH;QACF,CAAC,MAAM;UACLM,UAAU,CAACU,SAAS,CAACd,KAAK,CAAC;QAC7B;MACF;IACF,CAAC;IAED,OAAOvC,SAAS,CAACC,QAAQ,CAAC;EAC5B,CAAC,EAAE,CAACV,OAAO,EAAE4C,eAAe,EAAE3C,QAAQ,EAAEF,GAAG,EAAEU,SAAS,CAAC,CAAC;EAExD,OAAO;IACLsC;EACF,CAAC;AACH","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;AAEF,wBAAgB,mBAAmB;oBAmBlB,MAAM;eAcR,MAAM;wBAIG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;0BAad;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,eAAe,CAAA;KAAE;6BAmBrC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,eAAe,CAAA;KAAE;UAoC3D,MAAM;qBA0FK,MAAM,IAAI;EAqB9B"}
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,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAE7C,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,aAAa,EAAE,EAAE,GAAG,EAAE,MAAM,sBAkCxE"}
1
+ {"version":3,"file":"extractPathFromURL.d.ts","sourceRoot":"","sources":["../../../src/extractPathFromURL.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAE7C,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,aAAa,EAAE,EAAE,GAAG,EAAE,MAAM,sBAoCxE"}
@@ -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;AAC9C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAkG9C;;GAEG;AACH,eAAO,MAAM,MAAM,GAAI,IAAI,MAAM,OAAO,CAAC,IAAI,CAAC,eAO7C,CAAC;AAIF,wBAAgB,UAAU,CAAC,SAAS,SAAS,aAAa,EACxD,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,sBAAsB,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,EAC9D,EACE,OAAc,EACd,MAAM,EACN,gBAA0C,EAC1C,gBAA0C,EAC1C,kBAA8C,GAC/C,EAAE,cAAc,CAAC,SAAS,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAsW7B"}
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;AAC9C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAkG9C;;GAEG;AACH,eAAO,MAAM,MAAM,GAAI,IAAI,MAAM,OAAO,CAAC,IAAI,CAAC,eAO7C,CAAC;AAIF,wBAAgB,UAAU,CAAC,SAAS,SAAS,aAAa,EACxD,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,sBAAsB,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,EAC9D,EACE,OAAc,EACd,MAAM,EACN,gBAA0C,EAC1C,gBAA0C,EAC1C,kBAA8C,GAC/C,EAAE,cAAc,CAAC,SAAS,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4X7B"}
@@ -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;AAC9C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAM9C,wBAAgB,UAAU,CAAC,SAAS,SAAS,aAAa,EACxD,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,sBAAsB,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,EAC9D,EACE,OAAc,EACd,QAAgB,EAChB,MAAM,EACN,MAAM,EACN,aAQI,EACJ,SAQC,EACD,gBAA0C,EAC1C,kBAA8C,GAC/C,EAAE,cAAc,CAAC,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAyKjC"}
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;AAC9C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAM9C,wBAAgB,UAAU,CAAC,SAAS,SAAS,aAAa,EACxD,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,sBAAsB,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,EAC9D,EACE,OAAc,EACd,QAAgB,EAChB,MAAM,EACN,MAAM,EACN,aAQI,EACJ,SAQC,EACD,gBAA0C,EAC1C,kBAA8C,GAC/C,EAAE,cAAc,CAAC,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2KjC"}
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": "8.0.0-alpha.20",
4
+ "version": "8.0.0-alpha.22",
5
5
  "keywords": [
6
6
  "react-native",
7
7
  "react-navigation",
@@ -57,7 +57,7 @@
57
57
  "clean": "del lib"
58
58
  },
59
59
  "dependencies": {
60
- "@react-navigation/core": "^8.0.0-alpha.12",
60
+ "@react-navigation/core": "^8.0.0-alpha.14",
61
61
  "escape-string-regexp": "^5.0.0",
62
62
  "fast-deep-equal": "^3.1.3",
63
63
  "nanoid": "^5.1.7",
@@ -120,5 +120,5 @@
120
120
  }
121
121
  }
122
122
  },
123
- "gitHead": "d465f4e6b2996e5ed4648b23487e2027e83b263d"
123
+ "gitHead": "1483f82dfc630d749082390717526776608c43ea"
124
124
  }
@@ -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 === 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: pathWithHash, state, id }];
107
+ items = [{ path: pathWithoutHash, state, id }];
102
108
  index = 0;
103
109
  } else {
104
- if (items[index].path === 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);
@@ -18,8 +18,10 @@ export function extractPathFromURL(prefixes: LinkingPrefix[], url: string) {
18
18
  prefixRegex = new RegExp(
19
19
  `^${escapeStringRegexp(protocol)}(/)*${host
20
20
  .split('.')
21
- .map((it) => (it === '*' ? '[^/]+' : escapeStringRegexp(it)))
22
- .join('\\.')}`
21
+ .map((it) => (it === '*' ? '[^/?#]+' : escapeStringRegexp(it)))
22
+ .join('\\.')}${
23
+ host === '' || host.endsWith('/') ? '' : '(?=$|[/?#])'
24
+ }`
23
25
  );
24
26
  }
25
27
 
@@ -128,6 +128,8 @@ export function useLinking<ParamList extends ParamListBase>(
128
128
  getStateFromPath: getStateFromPathRef.current,
129
129
  });
130
130
  } catch (e) {
131
+ console.error(e);
132
+
131
133
  return undefined;
132
134
  }
133
135
  },
@@ -213,7 +213,13 @@ export function useLinking<ParamList extends ParamListBase>(
213
213
  const path = location ? location.pathname + location.search : undefined;
214
214
 
215
215
  if (path) {
216
- value = getStateFromPathRef.current(path, configRef.current);
216
+ try {
217
+ value = getStateFromPathRef.current(path, configRef.current);
218
+ } catch (e) {
219
+ console.error(e);
220
+
221
+ value = undefined;
222
+ }
217
223
  }
218
224
  }
219
225
 
@@ -281,7 +287,15 @@ export function useLinking<ParamList extends ParamListBase>(
281
287
  return;
282
288
  }
283
289
 
284
- const state = getStateFromPathRef.current(path, configRef.current);
290
+ let state: ResultState | undefined;
291
+
292
+ try {
293
+ state = getStateFromPathRef.current(path, configRef.current);
294
+ } catch (e) {
295
+ console.error(e);
296
+
297
+ state = undefined;
298
+ }
285
299
 
286
300
  // We should only dispatch an action when going forward
287
301
  // Otherwise the action will likely add items to history, which would mess things up
@@ -339,10 +353,18 @@ export function useLinking<ParamList extends ParamListBase>(
339
353
  // If the `route` object contains a `path`, use that path as long as `route.name` and `params` still match
340
354
  // This makes sure that we preserve the original URL for wildcard routes
341
355
  if (route?.path) {
342
- const stateForPath = getStateFromPathRef.current(
343
- route.path,
344
- configRef.current
345
- );
356
+ let stateForPath: ResultState | undefined;
357
+
358
+ try {
359
+ stateForPath = getStateFromPathRef.current(
360
+ route.path,
361
+ configRef.current
362
+ );
363
+ } catch (e) {
364
+ console.error(e);
365
+
366
+ stateForPath = undefined;
367
+ }
346
368
 
347
369
  if (stateForPath) {
348
370
  const focusedRoute = findFocusedRoute(stateForPath);