@react-navigation/routers 7.5.3 → 7.5.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/BaseRouter.js
CHANGED
|
@@ -29,11 +29,12 @@ export const BaseRouter = {
|
|
|
29
29
|
case 'RESET':
|
|
30
30
|
{
|
|
31
31
|
const nextState = action.payload;
|
|
32
|
-
|
|
32
|
+
const routeNamesSet = new Set(state.routeNames);
|
|
33
|
+
if (nextState.routes.length === 0 || nextState.routes.some(route => !routeNamesSet.has(route.name))) {
|
|
33
34
|
return null;
|
|
34
35
|
}
|
|
35
36
|
if (nextState.stale === false) {
|
|
36
|
-
if (state.routeNames.length !== nextState.routeNames.length || nextState.routeNames.some(name => !
|
|
37
|
+
if (state.routeNames.length !== nextState.routeNames.length || nextState.routeNames.some(name => !routeNamesSet.has(name))) {
|
|
37
38
|
return null;
|
|
38
39
|
}
|
|
39
40
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["nanoid","BaseRouter","getStateForAction","state","action","type","index","source","routes","findIndex","r","key","map","i","params","payload","nextState","length","some","route","
|
|
1
|
+
{"version":3,"names":["nanoid","BaseRouter","getStateForAction","state","action","type","index","source","routes","findIndex","r","key","map","i","params","payload","nextState","routeNamesSet","Set","routeNames","length","some","route","has","name","stale","shouldActionChangeFocus"],"sourceRoot":"../../src","sources":["BaseRouter.tsx"],"mappings":";;AAAA,SAASA,MAAM,QAAQ,mBAAmB;AAQ1C;AACA;AACA;AACA;AACA,OAAO,MAAMC,UAAU,GAAG;EACxBC,iBAAiBA,CACfC,KAAY,EACZC,MAA8B,EACM;IACpC,QAAQA,MAAM,CAACC,IAAI;MACjB,KAAK,YAAY;MACjB,KAAK,gBAAgB;QAAE;UACrB,MAAMC,KAAK,GAAGF,MAAM,CAACG,MAAM,GACvBJ,KAAK,CAACK,MAAM,CAACC,SAAS,CAAEC,CAAC,IAAKA,CAAC,CAACC,GAAG,KAAKP,MAAM,CAACG,MAAM,CAAC,GACtDJ,KAAK,CAACG,KAAK;UAEf,IAAIA,KAAK,KAAK,CAAC,CAAC,EAAE;YAChB,OAAO,IAAI;UACb;UAEA,OAAO;YACL,GAAGH,KAAK;YACRK,MAAM,EAAEL,KAAK,CAACK,MAAM,CAACI,GAAG,CAAC,CAACF,CAAC,EAAEG,CAAC,KAC5BA,CAAC,KAAKP,KAAK,GACP;cACE,GAAGI,CAAC;cACJI,MAAM,EACJV,MAAM,CAACC,IAAI,KAAK,gBAAgB,GAC5BD,MAAM,CAACW,OAAO,CAACD,MAAM,GACrB;gBAAE,GAAGJ,CAAC,CAACI,MAAM;gBAAE,GAAGV,MAAM,CAACW,OAAO,CAACD;cAAO;YAChD,CAAC,GACDJ,CACN;UACF,CAAC;QACH;MAEA,KAAK,OAAO;QAAE;UACZ,MAAMM,SAAS,GAAGZ,MAAM,CAACW,OAAsC;UAE/D,MAAME,aAAa,GAAG,IAAIC,GAAG,CAACf,KAAK,CAACgB,UAAU,CAAC;UAE/C,IACEH,SAAS,CAACR,MAAM,CAACY,MAAM,KAAK,CAAC,IAC7BJ,SAAS,CAACR,MAAM,CAACa,IAAI,CAClBC,KAAuB,IAAK,CAACL,aAAa,CAACM,GAAG,CAACD,KAAK,CAACE,IAAI,CAC5D,CAAC,EACD;YACA,OAAO,IAAI;UACb;UAEA,IAAIR,SAAS,CAACS,KAAK,KAAK,KAAK,EAAE;YAC7B,IACEtB,KAAK,CAACgB,UAAU,CAACC,MAAM,KAAKJ,SAAS,CAACG,UAAU,CAACC,MAAM,IACvDJ,SAAS,CAACG,UAAU,CAACE,IAAI,CAAEG,IAAI,IAAK,CAACP,aAAa,CAACM,GAAG,CAACC,IAAI,CAAC,CAAC,EAC7D;cACA,OAAO,IAAI;YACb;YAEA,OAAO;cACL,GAAGR,SAAS;cACZR,MAAM,EAAEQ,SAAS,CAACR,MAAM,CAACI,GAAG,CAAEU,KAAK,IACjCA,KAAK,CAACX,GAAG,GAAGW,KAAK,GAAG;gBAAE,GAAGA,KAAK;gBAAEX,GAAG,EAAE,GAAGW,KAAK,CAACE,IAAI,IAAIxB,MAAM,CAAC,CAAC;cAAG,CACnE;YACF,CAAC;UACH;UAEA,OAAOgB,SAAS;QAClB;MAEA;QACE,OAAO,IAAI;IACf;EACF,CAAC;EAEDU,uBAAuBA,CAACtB,MAA8B,EAAE;IACtD,OAAOA,MAAM,CAACC,IAAI,KAAK,UAAU,IAAID,MAAM,CAACC,IAAI,KAAK,qBAAqB;EAC5E;AACF,CAAC","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@react-navigation/routers",
|
|
3
3
|
"description": "Routers to help build custom navigators",
|
|
4
|
-
"version": "7.5.
|
|
4
|
+
"version": "7.5.4",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"react",
|
|
7
7
|
"react-native",
|
|
@@ -67,5 +67,5 @@
|
|
|
67
67
|
]
|
|
68
68
|
]
|
|
69
69
|
},
|
|
70
|
-
"gitHead": "
|
|
70
|
+
"gitHead": "e8a05bbfaf33a2fd0c6b67e9a186b823d697d323"
|
|
71
71
|
}
|
package/src/BaseRouter.tsx
CHANGED
|
@@ -45,10 +45,12 @@ export const BaseRouter = {
|
|
|
45
45
|
case 'RESET': {
|
|
46
46
|
const nextState = action.payload as State | PartialState<State>;
|
|
47
47
|
|
|
48
|
+
const routeNamesSet = new Set(state.routeNames);
|
|
49
|
+
|
|
48
50
|
if (
|
|
49
51
|
nextState.routes.length === 0 ||
|
|
50
52
|
nextState.routes.some(
|
|
51
|
-
(route: { name: string }) => !
|
|
53
|
+
(route: { name: string }) => !routeNamesSet.has(route.name)
|
|
52
54
|
)
|
|
53
55
|
) {
|
|
54
56
|
return null;
|
|
@@ -57,9 +59,7 @@ export const BaseRouter = {
|
|
|
57
59
|
if (nextState.stale === false) {
|
|
58
60
|
if (
|
|
59
61
|
state.routeNames.length !== nextState.routeNames.length ||
|
|
60
|
-
nextState.routeNames.some(
|
|
61
|
-
(name) => !state.routeNames.includes(name)
|
|
62
|
-
)
|
|
62
|
+
nextState.routeNames.some((name) => !routeNamesSet.has(name))
|
|
63
63
|
) {
|
|
64
64
|
return null;
|
|
65
65
|
}
|