@react-navigation/routers 8.0.0-alpha.20 → 8.0.0-alpha.21

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.
Files changed (5) hide show
  1. package/lib/module/SwitchRouter.js +2 -2
  2. package/lib/module/SwitchRouter.js.map +1 -1
  3. package/lib/typescript/src/SwitchRouter.d.ts.map +1 -1
  4. package/package.json +2 -2
  5. package/src/SwitchRouter.tsx +12 -6
package/lib/module/SwitchRouter.js CHANGED
@@ -282,7 +282,7 @@ export function SwitchRouter({
282
282
  path,
283
283
  params
284
284
  } : route;
285
- const routes = state.routes.map((item, routeIndex) => routeIndex === index ? nextRoute : item);
285
+ const routes = nextRoute === route ? state.routes : state.routes.map((item, routeIndex) => routeIndex === index ? nextRoute : item);
286
286
  const updatedState = {
287
287
  ...state,
288
288
  routes,
@@ -412,7 +412,7 @@ export function SwitchRouter({
412
412
  return {
413
413
  ...state,
414
414
  preloadedRouteKeys: state.preloadedRouteKeys.filter(key => key !== route.key).concat(newRoute.key),
415
- routes: state.routes.map((route, index) => index === routeIndex ? newRoute : route),
415
+ routes: newRoute === route ? state.routes : state.routes.map((route, index) => index === routeIndex ? newRoute : route),
416
416
  history
417
417
  };
418
418
  }
package/lib/module/SwitchRouter.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["nanoid","BaseRouter","createParamsFromAction","TYPE_ROUTE","getRouteHistory","routes","index","backBehavior","initialRouteName","route","Error","history","type","key","params","undefined","initialRouteIndex","i","unshift","findIndex","name","changeIndex","state","currentRoute","filter","it","lastHistoryRouteItemIndex","findLastIndex","item","lastHistoryRouteItem","previousRoute","find","slice","concat","SwitchRouter","router","getInitialState","routeNames","routeParamList","includes","indexOf","map","stale","preloadedRouteKeys","getRehydratedState","r","Math","min","max","length","routeKeys","push","stateData","getStateForRouteNamesChange","routeKeyChanges","Set","has","previousRouteItem","findLast","getStateForRouteFocus","getStateForAction","action","routeGetIdList","payload","source","sourceIndex","sourceHistoryIndex","getId","currentId","nextId","merge","path","nextRoute","routeIndex","updatedState","focusedRoute","lastHistoryItem","last","pop","previousHistoryItem","previousKey","newRoute","record"],"sourceRoot":"../../src","sources":["SwitchRouter.tsx"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["nanoid","BaseRouter","createParamsFromAction","TYPE_ROUTE","getRouteHistory","routes","index","backBehavior","initialRouteName","route","Error","history","type","key","params","undefined","initialRouteIndex","i","unshift","findIndex","name","changeIndex","state","currentRoute","filter","it","lastHistoryRouteItemIndex","findLastIndex","item","lastHistoryRouteItem","previousRoute","find","slice","concat","SwitchRouter","router","getInitialState","routeNames","routeParamList","includes","indexOf","map","stale","preloadedRouteKeys","getRehydratedState","r","Math","min","max","length","routeKeys","push","stateData","getStateForRouteNamesChange","routeKeyChanges","Set","has","previousRouteItem","findLast","getStateForRouteFocus","getStateForAction","action","routeGetIdList","payload","source","sourceIndex","sourceHistoryIndex","getId","currentId","nextId","merge","path","nextRoute","routeIndex","updatedState","focusedRoute","lastHistoryItem","last","pop","previousHistoryItem","previousKey","newRoute","record"],"sourceRoot":"../../src","sources":["SwitchRouter.tsx"],"mappings":"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","ignoreList":[]}
package/lib/typescript/src/SwitchRouter.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"SwitchRouter.d.ts","sourceRoot":"","sources":["../../../src/SwitchRouter.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,sBAAsB,EACtB,oBAAoB,EACpB,eAAe,EACf,YAAY,EAEZ,mBAAmB,EACpB,MAAM,YAAS,CAAC;AAEjB,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,SAAS,CAAC;IAChB,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAC;IACvD,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,oBAAoB,GAAG;IACvD;;;;;;;;OAQG;IACH,YAAY,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;CACzC,CAAC;AAEF,KAAK,YAAY,GACb,YAAY,GACZ,cAAc,GACd,OAAO,GACP,SAAS,GACT,aAAa,GACb,MAAM,CAAC;AAEX,KAAK,YAAY,GAAG;IAClB,IAAI,EAAE,OAAO,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B,CAAC;AAEF,KAAK,aAAa,GAAG;IACnB,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,MAAM,GAAG,QAAQ,CAAC;CAC3B,CAAC;AAEF,KAAK,iBAAiB,CAAC,OAAO,IAAI,IAAI,CAAC,eAAe,EAAE,SAAS,GAAG,MAAM,CAAC,GAAG;IAC5E,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,kBAAkB,EAAE,MAAM,EAAE,CAAC;CAC9B,CAAC;AAEF,KAAK,oBAAoB,GAAG;IAC1B,GAAG,EAAE,iBAAiB,CAAC,YAAY,CAAC,GAAG;QAAE,IAAI,EAAE,KAAK,CAAA;KAAE,CAAC;IACvD,MAAM,EAAE,iBAAiB,CAAC,YAAY,GAAG,aAAa,CAAC,GAAG;QACxD,IAAI,EAAE,QAAQ,CAAC;QACf,OAAO,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;KAClC,CAAC;CACH,CAAC;AAEF,KAAK,gBAAgB,GAAG,KAAK,GAAG,QAAQ,CAAC;AA4KzC,wBAAgB,YAAY,CAAC,IAAI,SAAS,gBAAgB,EAAE,EAC1D,gBAAgB,EAChB,YAA2B,GAC5B,EAAE,mBAAmB;qDASf,mBAAmB,GAAG,iBAAiB,CAAC,YAAY,CAAC;8BAwB/C,YAAY,4BAAO,kCACM,mBAAmB,GAClD,iBAAiB,CAAC,YAAY,CAAC;qHA8D7B,mBAAmB,GAAG;QAAE,eAAe,EAAE,MAAM,EAAE,CAAA;KAAE;kEAwDf,MAAM;iEAerC,gBAAgB,GAAG,sBAAsB,sCACb,mBAAmB,GACtD,6BAAQ,YAAY,4BAAO,GAAG,IAAI;;;;;kBA1Y5B,CAAC;gBACD,CAAC;iBAGJ,CAAC;eAA8B,CAAC;;;;;EAyrBzC"}
1
+ {"version":3,"file":"SwitchRouter.d.ts","sourceRoot":"","sources":["../../../src/SwitchRouter.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,sBAAsB,EACtB,oBAAoB,EACpB,eAAe,EACf,YAAY,EAEZ,mBAAmB,EACpB,MAAM,YAAS,CAAC;AAEjB,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,SAAS,CAAC;IAChB,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAC;IACvD,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,oBAAoB,GAAG;IACvD;;;;;;;;OAQG;IACH,YAAY,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;CACzC,CAAC;AAEF,KAAK,YAAY,GACb,YAAY,GACZ,cAAc,GACd,OAAO,GACP,SAAS,GACT,aAAa,GACb,MAAM,CAAC;AAEX,KAAK,YAAY,GAAG;IAClB,IAAI,EAAE,OAAO,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B,CAAC;AAEF,KAAK,aAAa,GAAG;IACnB,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,MAAM,GAAG,QAAQ,CAAC;CAC3B,CAAC;AAEF,KAAK,iBAAiB,CAAC,OAAO,IAAI,IAAI,CAAC,eAAe,EAAE,SAAS,GAAG,MAAM,CAAC,GAAG;IAC5E,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,kBAAkB,EAAE,MAAM,EAAE,CAAC;CAC9B,CAAC;AAEF,KAAK,oBAAoB,GAAG;IAC1B,GAAG,EAAE,iBAAiB,CAAC,YAAY,CAAC,GAAG;QAAE,IAAI,EAAE,KAAK,CAAA;KAAE,CAAC;IACvD,MAAM,EAAE,iBAAiB,CAAC,YAAY,GAAG,aAAa,CAAC,GAAG;QACxD,IAAI,EAAE,QAAQ,CAAC;QACf,OAAO,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;KAClC,CAAC;CACH,CAAC;AAEF,KAAK,gBAAgB,GAAG,KAAK,GAAG,QAAQ,CAAC;AA4KzC,wBAAgB,YAAY,CAAC,IAAI,SAAS,gBAAgB,EAAE,EAC1D,gBAAgB,EAChB,YAA2B,GAC5B,EAAE,mBAAmB;qDASf,mBAAmB,GAAG,iBAAiB,CAAC,YAAY,CAAC;8BAwB/C,YAAY,4BAAO,kCACM,mBAAmB,GAClD,iBAAiB,CAAC,YAAY,CAAC;qHA8D7B,mBAAmB,GAAG;QAAE,eAAe,EAAE,MAAM,EAAE,CAAA;KAAE;kEAwDf,MAAM;iEAerC,gBAAgB,GAAG,sBAAsB,sCACb,mBAAmB,GACtD,6BAAQ,YAAY,4BAAO,GAAG,IAAI;;;;;kBA1Y5B,CAAC;gBACD,CAAC;iBAGJ,CAAC;eAA8B,CAAC;;;;;EA+rBzC"}
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": "8.0.0-alpha.20",
4
+ "version": "8.0.0-alpha.21",
5
5
  "keywords": [
6
6
  "react",
7
7
  "react-native",
@@ -67,5 +67,5 @@
67
67
  ]
68
68
  ]
69
69
  },
70
- "gitHead": "201473e290e52fc2847cd61025cf068f7ec1a54d"
70
+ "gitHead": "7db23d23b7808c2cc6e8fae82982f0b60d5a0003"
71
71
  }
package/src/SwitchRouter.tsx CHANGED
@@ -501,9 +501,12 @@ export function SwitchRouter<Type extends SwitchRouterType>({
501
501
  ? { ...route, path, params }
502
502
  : route;
503
503
 
504
- const routes = state.routes.map((item, routeIndex) =>
505
- routeIndex === index ? nextRoute : item
506
- );
504
+ const routes =
505
+ nextRoute === route
506
+ ? state.routes
507
+ : state.routes.map((item, routeIndex) =>
508
+ routeIndex === index ? nextRoute : item
509
+ );
507
510
 
508
511
  const updatedState: State = {
509
512
  ...state,
@@ -701,9 +704,12 @@ export function SwitchRouter<Type extends SwitchRouterType>({
701
704
  preloadedRouteKeys: state.preloadedRouteKeys
702
705
  .filter((key) => key !== route.key)
703
706
  .concat(newRoute.key),
704
- routes: state.routes.map((route, index) =>
705
- index === routeIndex ? newRoute : route
706
- ),
707
+ routes:
708
+ newRoute === route
709
+ ? state.routes
710
+ : state.routes.map((route, index) =>
711
+ index === routeIndex ? newRoute : route
712
+ ),
707
713
  history,
708
714
  };
709
715
  }