@react-navigation/stack 7.8.9 → 7.8.11

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 (10) hide show
  1. package/lib/module/views/Stack/CardContainer.js +5 -1
  2. package/lib/module/views/Stack/CardContainer.js.map +1 -1
  3. package/lib/module/views/Stack/StackView.js +6 -14
  4. package/lib/module/views/Stack/StackView.js.map +1 -1
  5. package/lib/typescript/src/views/Stack/CardContainer.d.ts.map +1 -1
  6. package/lib/typescript/src/views/Stack/StackView.d.ts +0 -3
  7. package/lib/typescript/src/views/Stack/StackView.d.ts.map +1 -1
  8. package/package.json +3 -3
  9. package/src/views/Stack/CardContainer.tsx +10 -1
  10. package/src/views/Stack/StackView.tsx +14 -20
package/lib/module/views/Stack/CardContainer.js CHANGED
@@ -160,6 +160,7 @@ function CardContainerInner({
160
160
  gestureVelocityImpact,
161
161
  headerMode,
162
162
  headerShown,
163
+ headerTransparent,
163
164
  transitionSpec
164
165
  } = scene.descriptor.options;
165
166
  const {
@@ -241,7 +242,10 @@ function CardContainerInner({
241
242
  getPreviousScene,
242
243
  getFocusedRoute,
243
244
  onContentHeightChange: onHeaderHeightChange,
244
- style: styles.header
245
+ style: [styles.header, headerTransparent ? {
246
+ // Specify an explicit min height for Android screen readers
247
+ minHeight: headerHeight
248
+ } : null]
245
249
  }) : null, /*#__PURE__*/_jsx(View, {
246
250
  style: styles.scene,
247
251
  children: /*#__PURE__*/_jsx(HeaderBackContext.Provider, {
package/lib/module/views/Stack/CardContainer.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["getHeaderTitle","HeaderBackContext","HeaderHeightContext","HeaderShownContext","useLinkBuilder","useLocale","useTheme","React","StyleSheet","View","ModalPresentationContext","useKeyboardManager","Card","CardA11yWrapper","jsx","_jsx","jsxs","_jsxs","EPSILON","CardContainerInner","interpolationIndex","index","active","opening","closing","gesture","focused","modal","getPreviousScene","getFocusedRoute","hasAbsoluteFloatHeader","headerHeight","onHeaderHeightChange","isParentHeaderShown","isNextScreenTransparent","detachCurrentScreen","layout","onCloseRoute","onOpenRoute","onGestureCancel","onGestureEnd","onGestureStart","onTransitionEnd","onTransitionStart","preloaded","renderHeader","safeAreaInsetBottom","safeAreaInsetLeft","safeAreaInsetRight","safeAreaInsetTop","scene","wrapperRef","useRef","direction","parentHeaderHeight","useContext","options","descriptor","enabled","keyboardHandlingEnabled","onPageChangeStart","onPageChangeCancel","onPageChangeConfirm","handleOpen","route","handleClose","handleGestureBegin","handleGestureCanceled","handleGestureEnd","handleTransition","current","setInert","insets","top","right","bottom","left","colors","useEffect","listener","progress","next","addListener","value","removeListener","presentation","animation","cardOverlay","cardOverlayEnabled","cardShadowEnabled","cardStyle","cardStyleInterpolator","gestureDirection","gestureEnabled","gestureResponseDistance","gestureVelocityImpact","headerMode","headerShown","transitionSpec","buildHref","previousScene","backTitle","href","name","params","canGoBack","headerBack","useMemo","title","undefined","animated","ref","children","onOpen","onClose","overlay","overlayEnabled","shadowEnabled","onTransition","onGestureBegin","onGestureCanceled","styleInterpolator","pageOverflowEnabled","containerStyle","marginTop","contentStyle","backgroundColor","background","style","styles","container","Provider","mode","scenes","onContentHeightChange","header","render","CardContainer","memo","create","flex","zIndex"],"sourceRoot":"../../../../src","sources":["views/Stack/CardContainer.tsx"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["getHeaderTitle","HeaderBackContext","HeaderHeightContext","HeaderShownContext","useLinkBuilder","useLocale","useTheme","React","StyleSheet","View","ModalPresentationContext","useKeyboardManager","Card","CardA11yWrapper","jsx","_jsx","jsxs","_jsxs","EPSILON","CardContainerInner","interpolationIndex","index","active","opening","closing","gesture","focused","modal","getPreviousScene","getFocusedRoute","hasAbsoluteFloatHeader","headerHeight","onHeaderHeightChange","isParentHeaderShown","isNextScreenTransparent","detachCurrentScreen","layout","onCloseRoute","onOpenRoute","onGestureCancel","onGestureEnd","onGestureStart","onTransitionEnd","onTransitionStart","preloaded","renderHeader","safeAreaInsetBottom","safeAreaInsetLeft","safeAreaInsetRight","safeAreaInsetTop","scene","wrapperRef","useRef","direction","parentHeaderHeight","useContext","options","descriptor","enabled","keyboardHandlingEnabled","onPageChangeStart","onPageChangeCancel","onPageChangeConfirm","handleOpen","route","handleClose","handleGestureBegin","handleGestureCanceled","handleGestureEnd","handleTransition","current","setInert","insets","top","right","bottom","left","colors","useEffect","listener","progress","next","addListener","value","removeListener","presentation","animation","cardOverlay","cardOverlayEnabled","cardShadowEnabled","cardStyle","cardStyleInterpolator","gestureDirection","gestureEnabled","gestureResponseDistance","gestureVelocityImpact","headerMode","headerShown","headerTransparent","transitionSpec","buildHref","previousScene","backTitle","href","name","params","canGoBack","headerBack","useMemo","title","undefined","animated","ref","children","onOpen","onClose","overlay","overlayEnabled","shadowEnabled","onTransition","onGestureBegin","onGestureCanceled","styleInterpolator","pageOverflowEnabled","containerStyle","marginTop","contentStyle","backgroundColor","background","style","styles","container","Provider","mode","scenes","onContentHeightChange","header","minHeight","render","CardContainer","memo","create","flex","zIndex"],"sourceRoot":"../../../../src","sources":["views/Stack/CardContainer.tsx"],"mappings":"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","ignoreList":[]}
package/lib/module/views/Stack/StackView.js CHANGED
@@ -42,15 +42,6 @@ export class StackView extends React.Component {
42
42
  if (closingRoutes.length) {
43
43
  routes.push(...closingRoutes);
44
44
  }
45
- let descriptors = props.descriptors;
46
- let previousDescriptors = state.previousDescriptors;
47
- if (props.descriptors !== state.previousDescriptors) {
48
- descriptors = routes.reduce((acc, route) => {
49
- acc[route.key] = props.descriptors[route.key] || state.descriptors[route.key];
50
- return acc;
51
- }, {});
52
- previousDescriptors = props.descriptors;
53
- }
54
45
  if (!isArrayEqual(allRoutes, previousRoutes)) {
55
46
  // if any route objects have changed, we should update them
56
47
  const map = allRoutes.reduce((acc, route) => {
@@ -59,11 +50,14 @@ export class StackView extends React.Component {
59
50
  }, {});
60
51
  routes = routes.map(route => map[route.key] || route);
61
52
  }
53
+ const descriptors = [...routes, ...props.state.preloadedRoutes].reduce((acc, route) => {
54
+ acc[route.key] = props.descriptors[route.key] || state.descriptors[route.key];
55
+ return acc;
56
+ }, {});
62
57
  return {
63
58
  routes,
64
59
  previousState: props.state,
65
- descriptors,
66
- previousDescriptors
60
+ descriptors
67
61
  };
68
62
  }
69
63
 
@@ -171,14 +165,13 @@ export class StackView extends React.Component {
171
165
  if (!routes.length) {
172
166
  throw new Error('There should always be at least one route in the navigation state.');
173
167
  }
174
- const descriptors = allRoutes.reduce((acc, route) => {
168
+ const descriptors = [...routes, ...props.state.preloadedRoutes].reduce((acc, route) => {
175
169
  acc[route.key] = props.descriptors[route.key] || state.descriptors[route.key];
176
170
  return acc;
177
171
  }, {});
178
172
  return {
179
173
  routes,
180
174
  previousState: props.state,
181
- previousDescriptors: props.descriptors,
182
175
  openingRouteKeys,
183
176
  closingRouteKeys,
184
177
  replacingRouteKeys,
@@ -188,7 +181,6 @@ export class StackView extends React.Component {
188
181
  state = {
189
182
  routes: [],
190
183
  previousState: undefined,
191
- previousDescriptors: {},
192
184
  openingRouteKeys: [],
193
185
  closingRouteKeys: [],
194
186
  replacingRouteKeys: [],
package/lib/module/views/Stack/StackView.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["HeaderShownContext","SafeAreaProviderCompat","CommonActions","StackActions","React","StyleSheet","View","SafeAreaInsetsContext","ModalPresentationContext","GestureHandlerRootView","HeaderContainer","CardStack","getAnimationEnabled","jsx","_jsx","GestureHandlerWrapper","isArrayEqual","a","b","length","every","it","index","Object","is","StackView","Component","getDerivedStateFromProps","props","state","allRoutes","routes","preloadedRoutes","previousRoutes","previousState","map","r","key","closingRoutes","filter","closingRouteKeys","includes","some","pr","replacingRoutes","replacingRouteKeys","slice","splice","push","descriptors","previousDescriptors","reduce","acc","route","openingRouteKeys","previousFocusedRoute","undefined","nextFocusedRoute","isAnimationEnabled","descriptor","options","animation","getAnimationTypeForReplace","animationTypeForReplace","previousReplacingRoutes","existing","Error","getPreviousRoute","findIndex","renderHeader","handleOpenRoute","navigation","routeNames","name","dispatch","reset","setState","routeIndex","replacingRoutesToRemove","Set","newRoutes","has","handleCloseRoute","pop","source","target","handleTransitionStart","closing","emit","type","data","handleTransitionEnd","handleGestureStart","handleGestureEnd","handleGestureCancel","render","_","rest","preloadedDescriptors","describe","style","styles","container","children","Consumer","insets","isParentModal","isParentHeaderShown","onOpenRoute","onCloseRoute","onTransitionStart","onTransitionEnd","onGestureStart","onGestureEnd","onGestureCancel","create","flex"],"sourceRoot":"../../../../src","sources":["views/Stack/StackView.tsx"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["HeaderShownContext","SafeAreaProviderCompat","CommonActions","StackActions","React","StyleSheet","View","SafeAreaInsetsContext","ModalPresentationContext","GestureHandlerRootView","HeaderContainer","CardStack","getAnimationEnabled","jsx","_jsx","GestureHandlerWrapper","isArrayEqual","a","b","length","every","it","index","Object","is","StackView","Component","getDerivedStateFromProps","props","state","allRoutes","routes","preloadedRoutes","previousRoutes","previousState","map","r","key","closingRoutes","filter","closingRouteKeys","includes","some","pr","replacingRoutes","replacingRouteKeys","slice","splice","push","reduce","acc","route","descriptors","openingRouteKeys","previousFocusedRoute","undefined","nextFocusedRoute","isAnimationEnabled","descriptor","options","animation","getAnimationTypeForReplace","animationTypeForReplace","previousReplacingRoutes","existing","Error","getPreviousRoute","findIndex","renderHeader","handleOpenRoute","navigation","routeNames","name","dispatch","reset","setState","routeIndex","replacingRoutesToRemove","Set","newRoutes","has","handleCloseRoute","pop","source","target","handleTransitionStart","closing","emit","type","data","handleTransitionEnd","handleGestureStart","handleGestureEnd","handleGestureCancel","render","_","rest","preloadedDescriptors","describe","style","styles","container","children","Consumer","insets","isParentModal","isParentHeaderShown","onOpenRoute","onCloseRoute","onTransitionStart","onTransitionEnd","onGestureStart","onGestureEnd","onGestureCancel","create","flex"],"sourceRoot":"../../../../src","sources":["views/Stack/StackView.tsx"],"mappings":"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","ignoreList":[]}
package/lib/typescript/src/views/Stack/CardContainer.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"CardContainer.d.ts","sourceRoot":"","sources":["../../../../../src/views/Stack/CardContainer.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"CardContainer.d.ts","sourceRoot":"","sources":["../../../../../src/views/Stack/CardContainer.tsx"],"names":[],"mappings":"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"}
package/lib/typescript/src/views/Stack/StackView.d.ts CHANGED
@@ -11,7 +11,6 @@ type Props = StackNavigationConfig & {
11
11
  type State = {
12
12
  routes: Route<string>[];
13
13
  previousState: StackNavigationState<ParamListBase> | undefined;
14
- previousDescriptors: StackDescriptorMap;
15
14
  openingRouteKeys: string[];
16
15
  closingRouteKeys: string[];
17
16
  replacingRouteKeys: string[];
@@ -22,14 +21,12 @@ export declare class StackView extends React.Component<Props, State> {
22
21
  routes: Route<string>[];
23
22
  previousState: StackNavigationState<ParamListBase>;
24
23
  descriptors: StackDescriptorMap;
25
- previousDescriptors: StackDescriptorMap;
26
24
  openingRouteKeys?: undefined;
27
25
  closingRouteKeys?: undefined;
28
26
  replacingRouteKeys?: undefined;
29
27
  } | {
30
28
  routes: import("@react-navigation/routers").NavigationRoute<ParamListBase, string>[];
31
29
  previousState: StackNavigationState<ParamListBase>;
32
- previousDescriptors: StackDescriptorMap;
33
30
  openingRouteKeys: string[];
34
31
  closingRouteKeys: string[];
35
32
  replacingRouteKeys: string[];
package/lib/typescript/src/views/Stack/StackView.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"StackView.d.ts","sourceRoot":"","sources":["../../../../../src/views/Stack/StackView.tsx"],"names":[],"mappings":"AAIA,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,aAAa,EAClB,KAAK,KAAK,EACV,KAAK,SAAS,EAEd,KAAK,oBAAoB,EAC1B,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,KAAK,EACV,eAAe,EACf,kBAAkB,EAClB,qBAAqB,EACrB,sBAAsB,EACvB,MAAM,aAAa,CAAC;AASrB,KAAK,KAAK,GAAG,qBAAqB,GAAG;IACnC,SAAS,EAAE,eAAe,CAAC;IAC3B,KAAK,EAAE,oBAAoB,CAAC,aAAa,CAAC,CAAC;IAC3C,UAAU,EAAE,sBAAsB,CAAC;IACnC,WAAW,EAAE,kBAAkB,CAAC;IAChC,QAAQ,EAAE,CACR,KAAK,EAAE,SAAS,CAAC,aAAa,CAAC,EAC/B,WAAW,EAAE,OAAO,KACjB,eAAe,CAAC;CACtB,CAAC;AAEF,KAAK,KAAK,GAAG;IAEX,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;IAExB,aAAa,EAAE,oBAAoB,CAAC,aAAa,CAAC,GAAG,SAAS,CAAC;IAE/D,mBAAmB,EAAE,kBAAkB,CAAC;IAExC,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAE3B,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAE3B,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAG7B,WAAW,EAAE,kBAAkB,CAAC;CACjC,CAAC;AAWF,qBAAa,SAAU,SAAQ,KAAK,CAAC,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC;IAC1D,MAAM,CAAC,wBAAwB,CAC7B,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,EACtB,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC;;;;;;;;;;;;;;;;;IAwQxB,KAAK,EAAE,KAAK,CAQV;IAEF,OAAO,CAAC,gBAAgB,CAYtB;IAEF,OAAO,CAAC,YAAY,CAElB;IAEF,OAAO,CAAC,eAAe,CAuDrB;IAEF,OAAO,CAAC,gBAAgB,CAwBtB;IAEF,OAAO,CAAC,qBAAqB,CAQxB;IAEL,OAAO,CAAC,mBAAmB,CAQtB;IAEL,OAAO,CAAC,kBAAkB,CAKxB;IAEF,OAAO,CAAC,gBAAgB,CAKtB;IAEF,OAAO,CAAC,mBAAmB,CAKzB;IAEF,MAAM;CAyDP"}
1
+ {"version":3,"file":"StackView.d.ts","sourceRoot":"","sources":["../../../../../src/views/Stack/StackView.tsx"],"names":[],"mappings":"AAIA,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,aAAa,EAClB,KAAK,KAAK,EACV,KAAK,SAAS,EAEd,KAAK,oBAAoB,EAC1B,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,KAAK,EACV,eAAe,EACf,kBAAkB,EAClB,qBAAqB,EACrB,sBAAsB,EACvB,MAAM,aAAa,CAAC;AASrB,KAAK,KAAK,GAAG,qBAAqB,GAAG;IACnC,SAAS,EAAE,eAAe,CAAC;IAC3B,KAAK,EAAE,oBAAoB,CAAC,aAAa,CAAC,CAAC;IAC3C,UAAU,EAAE,sBAAsB,CAAC;IACnC,WAAW,EAAE,kBAAkB,CAAC;IAChC,QAAQ,EAAE,CACR,KAAK,EAAE,SAAS,CAAC,aAAa,CAAC,EAC/B,WAAW,EAAE,OAAO,KACjB,eAAe,CAAC;CACtB,CAAC;AAEF,KAAK,KAAK,GAAG;IAEX,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;IAExB,aAAa,EAAE,oBAAoB,CAAC,aAAa,CAAC,GAAG,SAAS,CAAC;IAE/D,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAE3B,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAE3B,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAG7B,WAAW,EAAE,kBAAkB,CAAC;CACjC,CAAC;AAWF,qBAAa,SAAU,SAAQ,KAAK,CAAC,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC;IAC1D,MAAM,CAAC,wBAAwB,CAC7B,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,EACtB,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC;;;;;;;;;;;;;;;IAqQxB,KAAK,EAAE,KAAK,CAOV;IAEF,OAAO,CAAC,gBAAgB,CAYtB;IAEF,OAAO,CAAC,YAAY,CAElB;IAEF,OAAO,CAAC,eAAe,CAuDrB;IAEF,OAAO,CAAC,gBAAgB,CAwBtB;IAEF,OAAO,CAAC,qBAAqB,CAQxB;IAEL,OAAO,CAAC,mBAAmB,CAQtB;IAEL,OAAO,CAAC,kBAAkB,CAKxB;IAEF,OAAO,CAAC,gBAAgB,CAKtB;IAEF,OAAO,CAAC,mBAAmB,CAKzB;IAEF,MAAM;CAyDP"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@react-navigation/stack",
3
3
  "description": "Stack navigator component for iOS and Android with animated transitions and gestures",
4
- "version": "7.8.9",
4
+ "version": "7.8.11",
5
5
  "keywords": [
6
6
  "react-native-component",
7
7
  "react-component",
@@ -45,7 +45,7 @@
45
45
  "clean": "del lib"
46
46
  },
47
47
  "dependencies": {
48
- "@react-navigation/elements": "^2.9.14",
48
+ "@react-navigation/elements": "^2.9.15",
49
49
  "color": "^4.2.3",
50
50
  "use-latest-callback": "^0.2.4"
51
51
  },
@@ -91,5 +91,5 @@
91
91
  ]
92
92
  ]
93
93
  },
94
- "gitHead": "f25ef01d8dcd691ea445eb1359eb37fd21113b26"
94
+ "gitHead": "c0040abbdd748521c5619048a05b81639c670fd1"
95
95
  }
package/src/views/Stack/CardContainer.tsx CHANGED
@@ -194,6 +194,7 @@ function CardContainerInner({
194
194
  gestureVelocityImpact,
195
195
  headerMode,
196
196
  headerShown,
197
+ headerTransparent,
197
198
  transitionSpec,
198
199
  } = scene.descriptor.options;
199
200
 
@@ -286,7 +287,15 @@ function CardContainerInner({
286
287
  getPreviousScene,
287
288
  getFocusedRoute,
288
289
  onContentHeightChange: onHeaderHeightChange,
289
- style: styles.header,
290
+ style: [
291
+ styles.header,
292
+ headerTransparent
293
+ ? {
294
+ // Specify an explicit min height for Android screen readers
295
+ minHeight: headerHeight,
296
+ }
297
+ : null,
298
+ ],
290
299
  })
291
300
  : null}
292
301
  <View style={styles.scene}>
package/src/views/Stack/StackView.tsx CHANGED
@@ -45,8 +45,6 @@ type State = {
45
45
  routes: Route<string>[];
46
46
  // Previous navigation state for comparison
47
47
  previousState: StackNavigationState<ParamListBase> | undefined;
48
- // Previous descriptors, to compare whether descriptors have changed or not
49
- previousDescriptors: StackDescriptorMap;
50
48
  // List of routes being opened, we need to animate pushing of these new routes
51
49
  openingRouteKeys: string[];
52
50
  // List of routes being closed, we need to animate popping of these routes
@@ -114,20 +112,6 @@ export class StackView extends React.Component<Props, State> {
114
112
  routes.push(...closingRoutes);
115
113
  }
116
114
 
117
- let descriptors = props.descriptors;
118
- let previousDescriptors = state.previousDescriptors;
119
-
120
- if (props.descriptors !== state.previousDescriptors) {
121
- descriptors = routes.reduce<StackDescriptorMap>((acc, route) => {
122
- acc[route.key] =
123
- props.descriptors[route.key] || state.descriptors[route.key];
124
-
125
- return acc;
126
- }, {});
127
-
128
- previousDescriptors = props.descriptors;
129
- }
130
-
131
115
  if (!isArrayEqual(allRoutes, previousRoutes)) {
132
116
  // if any route objects have changed, we should update them
133
117
  const map = allRoutes.reduce<Record<string, Route<string>>>(
@@ -141,11 +125,20 @@ export class StackView extends React.Component<Props, State> {
141
125
  routes = routes.map((route) => map[route.key] || route);
142
126
  }
143
127
 
128
+ const descriptors = [
129
+ ...routes,
130
+ ...props.state.preloadedRoutes,
131
+ ].reduce<StackDescriptorMap>((acc, route) => {
132
+ acc[route.key] =
133
+ props.descriptors[route.key] || state.descriptors[route.key];
134
+
135
+ return acc;
136
+ }, {});
137
+
144
138
  return {
145
139
  routes,
146
140
  previousState: props.state,
147
141
  descriptors,
148
- previousDescriptors,
149
142
  };
150
143
  }
151
144
 
@@ -316,7 +309,10 @@ export class StackView extends React.Component<Props, State> {
316
309
  );
317
310
  }
318
311
 
319
- const descriptors = allRoutes.reduce<StackDescriptorMap>((acc, route) => {
312
+ const descriptors = [
313
+ ...routes,
314
+ ...props.state.preloadedRoutes,
315
+ ].reduce<StackDescriptorMap>((acc, route) => {
320
316
  acc[route.key] =
321
317
  props.descriptors[route.key] || state.descriptors[route.key];
322
318
 
@@ -326,7 +322,6 @@ export class StackView extends React.Component<Props, State> {
326
322
  return {
327
323
  routes,
328
324
  previousState: props.state,
329
- previousDescriptors: props.descriptors,
330
325
  openingRouteKeys,
331
326
  closingRouteKeys,
332
327
  replacingRouteKeys,
@@ -337,7 +332,6 @@ export class StackView extends React.Component<Props, State> {
337
332
  state: State = {
338
333
  routes: [],
339
334
  previousState: undefined,
340
- previousDescriptors: {},
341
335
  openingRouteKeys: [],
342
336
  closingRouteKeys: [],
343
337
  replacingRouteKeys: [],