@react-navigation/stack 8.0.0-alpha.11 → 8.0.0-alpha.12
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/views/Stack/Card.js +25 -20
- package/lib/module/views/Stack/Card.js.map +1 -1
- package/lib/module/views/Stack/StackView.js +5 -0
- package/lib/module/views/Stack/StackView.js.map +1 -1
- package/lib/typescript/src/views/Stack/Card.d.ts.map +1 -1
- package/lib/typescript/src/views/Stack/StackView.d.ts.map +1 -1
- package/package.json +3 -3
- package/src/views/Stack/Card.tsx +29 -20
- package/src/views/Stack/StackView.tsx +10 -0
|
@@ -72,11 +72,11 @@ function Card({
|
|
|
72
72
|
containerStyle: customContainerStyle,
|
|
73
73
|
contentStyle
|
|
74
74
|
}) {
|
|
75
|
-
const [, forceUpdate] = React.useReducer(x => x + 1, 0);
|
|
76
75
|
const didInitiallyAnimate = React.useRef(false);
|
|
77
76
|
const lastToValueRef = React.useRef(undefined);
|
|
78
77
|
const animationHandleRef = React.useRef(undefined);
|
|
79
78
|
const pendingGestureCallbackRef = React.useRef(undefined);
|
|
79
|
+
const pendingOnCloseCallbackRef = React.useRef(undefined);
|
|
80
80
|
const [isClosing] = React.useState(() => new Animated.Value(FALSE));
|
|
81
81
|
const [inverted] = React.useState(() => new Animated.Value(getInvertedMultiplier(gestureDirection, direction === 'rtl')));
|
|
82
82
|
const [layoutAnim] = React.useState(() => ({
|
|
@@ -114,10 +114,8 @@ function Card({
|
|
|
114
114
|
onOpen();
|
|
115
115
|
}
|
|
116
116
|
animationHandleRef.current = requestAnimationFrame(() => {
|
|
117
|
-
if
|
|
118
|
-
|
|
119
|
-
forceUpdate();
|
|
120
|
-
}
|
|
117
|
+
// Make sure to re-open screen if it wasn't removed
|
|
118
|
+
maybeAnimate();
|
|
121
119
|
});
|
|
122
120
|
};
|
|
123
121
|
if (animated) {
|
|
@@ -144,6 +142,8 @@ function Card({
|
|
|
144
142
|
}) => {
|
|
145
143
|
switch (nativeEvent.state) {
|
|
146
144
|
case GestureState.ACTIVE:
|
|
145
|
+
clearTimeout(pendingGestureCallbackRef.current);
|
|
146
|
+
clearTimeout(pendingOnCloseCallbackRef.current);
|
|
147
147
|
isSwiping.setValue(TRUE);
|
|
148
148
|
onGestureBegin?.();
|
|
149
149
|
break;
|
|
@@ -185,10 +185,13 @@ function Card({
|
|
|
185
185
|
pendingGestureCallbackRef.current = setTimeout(() => {
|
|
186
186
|
onClose();
|
|
187
187
|
|
|
188
|
-
//
|
|
189
|
-
//
|
|
190
|
-
|
|
191
|
-
|
|
188
|
+
// Check if the screen is still closing with a delay
|
|
189
|
+
// So state update from onClose has a chance to go through
|
|
190
|
+
// If route wasn't removed after onClose, re-open it
|
|
191
|
+
pendingOnCloseCallbackRef.current = setTimeout(() => {
|
|
192
|
+
maybeAnimate();
|
|
193
|
+
}, 32);
|
|
194
|
+
}, 16);
|
|
192
195
|
}
|
|
193
196
|
onGestureEnd?.();
|
|
194
197
|
break;
|
|
@@ -207,24 +210,20 @@ function Card({
|
|
|
207
210
|
cancelAnimationFrame(animationHandleRef.current);
|
|
208
211
|
}
|
|
209
212
|
clearTimeout(pendingGestureCallbackRef.current);
|
|
213
|
+
clearTimeout(pendingOnCloseCallbackRef.current);
|
|
210
214
|
};
|
|
211
|
-
|
|
212
|
-
// We only want to clean up the animation on unmount
|
|
213
215
|
}, []);
|
|
214
|
-
const timeoutRef = React.useRef(
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
}
|
|
216
|
+
const timeoutRef = React.useRef(undefined);
|
|
217
|
+
const maybeAnimate = useLatestCallback(() => {
|
|
218
|
+
clearTimeout(pendingGestureCallbackRef.current);
|
|
219
|
+
clearTimeout(pendingOnCloseCallbackRef.current);
|
|
219
220
|
if (!didInitiallyAnimate.current) {
|
|
220
221
|
// Animate the card in on initial mount
|
|
221
222
|
// Wrap in setTimeout to ensure animation starts after
|
|
222
223
|
// rending of the screen is done. This is especially important
|
|
223
224
|
// in the new architecture
|
|
224
225
|
// cf., https://github.com/react-navigation/react-navigation/issues/12401
|
|
225
|
-
|
|
226
|
-
clearTimeout(timeoutRef.current);
|
|
227
|
-
}
|
|
226
|
+
clearTimeout(timeoutRef.current);
|
|
228
227
|
timeoutRef.current = setTimeout(() => {
|
|
229
228
|
didInitiallyAnimate.current = true;
|
|
230
229
|
animate({
|
|
@@ -259,6 +258,12 @@ function Card({
|
|
|
259
258
|
});
|
|
260
259
|
}
|
|
261
260
|
}
|
|
261
|
+
});
|
|
262
|
+
React.useEffect(() => {
|
|
263
|
+
if (preloaded) {
|
|
264
|
+
return;
|
|
265
|
+
}
|
|
266
|
+
maybeAnimate();
|
|
262
267
|
previousPropsRef.current = {
|
|
263
268
|
opening,
|
|
264
269
|
closing,
|
|
@@ -267,7 +272,7 @@ function Card({
|
|
|
267
272
|
direction,
|
|
268
273
|
preloaded
|
|
269
274
|
};
|
|
270
|
-
}, [animate, closing, direction, gesture, gestureDirection, layout, opening, preloaded]);
|
|
275
|
+
}, [animate, closing, direction, gesture, gestureDirection, layout, opening, preloaded, maybeAnimate]);
|
|
271
276
|
const interpolationProps = React.useMemo(() => ({
|
|
272
277
|
index: interpolationIndex,
|
|
273
278
|
current: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["Color","React","Animated","Platform","StyleSheet","View","useLatestCallback","CardAnimationContext","gestureActivationCriteria","getDistanceForDirection","getInvertedMultiplier","getShadowStyle","GestureState","PanGestureHandler","CardContent","jsx","_jsx","jsxs","_jsxs","GESTURE_VELOCITY_IMPACT","TRUE","FALSE","useNativeDriver","OS","hasOpacityStyle","style","flattenedStyle","flatten","opacity","getAnimateToValue","closing","isClosing","layout","currentLayout","gestureDirection","currentGestureDirection","direction","currentDirection","preloaded","isPreloaded","defaultOverlay","styles","overlay","Card","shadowEnabled","gestureEnabled","gestureVelocityImpact","animated","interpolationIndex","opening","next","current","gesture","insets","pageOverflowEnabled","onOpen","onClose","onTransition","onGestureBegin","onGestureCanceled","onGestureEnd","children","overlayEnabled","gestureResponseDistance","transitionSpec","styleInterpolator","containerStyle","customContainerStyle","contentStyle","forceUpdate","useReducer","x","didInitiallyAnimate","useRef","lastToValueRef","undefined","animationHandleRef","pendingGestureCallbackRef","useState","Value","inverted","layoutAnim","width","height","isSwiping","animate","isClosingParam","velocity","toValue","setValue","spec","close","open","animation","spring","timing","clearTimeout","cancelAnimationFrame","onFinish","requestAnimationFrame","config","isInteraction","start","finished","onGestureStateChange","nativeEvent","state","ACTIVE","CANCELLED","FAILED","velocityY","velocityX","END","distance","translation","translationY","translationX","shouldClose","setTimeout","useLayoutEffect","previousPropsRef","useEffect","timeoutRef","previousOpening","previousToValue","interpolationProps","useMemo","index","progress","swiping","layouts","screen","top","right","bottom","left","cardStyle","overlayStyle","shadowStyle","onGestureEvent","event","backgroundColor","isTransparent","alpha","Provider","value","collapsable","absoluteFill","pointerEvents","container","enabled","onHandlerStateChange","needsOffscreenAlphaCompositing","shadow","shadowHorizontal","shadowStart","shadowEnd","shadowVertical","shadowTop","shadowBottom","create","flex","position","offset","radius","end"],"sourceRoot":"../../../../src","sources":["views/Stack/Card.tsx"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["Color","React","Animated","Platform","StyleSheet","View","useLatestCallback","CardAnimationContext","gestureActivationCriteria","getDistanceForDirection","getInvertedMultiplier","getShadowStyle","GestureState","PanGestureHandler","CardContent","jsx","_jsx","jsxs","_jsxs","GESTURE_VELOCITY_IMPACT","TRUE","FALSE","useNativeDriver","OS","hasOpacityStyle","style","flattenedStyle","flatten","opacity","getAnimateToValue","closing","isClosing","layout","currentLayout","gestureDirection","currentGestureDirection","direction","currentDirection","preloaded","isPreloaded","defaultOverlay","styles","overlay","Card","shadowEnabled","gestureEnabled","gestureVelocityImpact","animated","interpolationIndex","opening","next","current","gesture","insets","pageOverflowEnabled","onOpen","onClose","onTransition","onGestureBegin","onGestureCanceled","onGestureEnd","children","overlayEnabled","gestureResponseDistance","transitionSpec","styleInterpolator","containerStyle","customContainerStyle","contentStyle","didInitiallyAnimate","useRef","lastToValueRef","undefined","animationHandleRef","pendingGestureCallbackRef","pendingOnCloseCallbackRef","useState","Value","inverted","layoutAnim","width","height","isSwiping","animate","isClosingParam","velocity","toValue","setValue","spec","close","open","animation","spring","timing","clearTimeout","cancelAnimationFrame","onFinish","requestAnimationFrame","maybeAnimate","config","isInteraction","start","finished","onGestureStateChange","nativeEvent","state","ACTIVE","CANCELLED","FAILED","velocityY","velocityX","END","distance","translation","translationY","translationX","shouldClose","setTimeout","useLayoutEffect","previousPropsRef","useEffect","timeoutRef","previousOpening","previousToValue","interpolationProps","useMemo","index","progress","swiping","layouts","screen","top","right","bottom","left","cardStyle","overlayStyle","shadowStyle","onGestureEvent","event","backgroundColor","isTransparent","alpha","Provider","value","collapsable","absoluteFill","pointerEvents","container","enabled","onHandlerStateChange","needsOffscreenAlphaCompositing","shadow","shadowHorizontal","shadowStart","shadowEnd","shadowVertical","shadowTop","shadowBottom","create","flex","position","offset","radius","end"],"sourceRoot":"../../../../src","sources":["views/Stack/Card.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -86,6 +86,11 @@ export class StackView extends React.Component {
|
|
|
86
86
|
closingRouteKeys,
|
|
87
87
|
replacingRouteKeys
|
|
88
88
|
} = state;
|
|
89
|
+
|
|
90
|
+
// If a route that was closing or being replaced is now back in the routes,
|
|
91
|
+
// it was added back before the animation finished, so stop tracking it
|
|
92
|
+
closingRouteKeys = closingRouteKeys.filter(key => !routes.some(r => r.key === key));
|
|
93
|
+
replacingRouteKeys = replacingRouteKeys.filter(key => !routes.some(r => r.key === key));
|
|
89
94
|
const previousFocusedRoute = previousRoutes[previousRoutes.length - 1];
|
|
90
95
|
const nextFocusedRoute = routes[routes.length - 1];
|
|
91
96
|
const isAnimationEnabled = key => {
|
|
@@ -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","map","r","key","previousRoutes","closingRoutes","filter","closingRouteKeys","includes","some","pr","replacingRoutes","replacingRouteKeys","slice","splice","push","descriptors","previousDescriptors","reduce","acc","route","openingRouteKeys","previousFocusedRoute","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","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":";;AAAA,SAASA,kBAAkB,QAAQ,4BAA4B;AAC/D,SAASC,sBAAsB,QAAQ,qCAAqC;AAC5E,SACEC,aAAa,EAIbC,YAAY,QAEP,0BAA0B;AACjC,OAAO,KAAKC,KAAK,MAAM,OAAO;AAC9B,SAASC,UAAU,EAAEC,IAAI,QAAQ,cAAc;AAC/C,SAASC,qBAAqB,QAAQ,gCAAgC;AAOtE,SAASC,wBAAwB,QAAQ,yCAAsC;AAC/E,SAASC,sBAAsB,QAAQ,mBAAmB;AAC1D,SACEC,eAAe,QAEV,8BAA2B;AAClC,SAASC,SAAS,EAAEC,mBAAmB,QAAQ,gBAAa;AAAC,SAAAC,GAAA,IAAAC,IAAA;AA2B7D,MAAMC,qBAAqB,GAAGN,sBAAsB,IAAIH,IAAI;;AAE5D;AACA;AACA;AACA;AACA,MAAMU,YAAY,GAAGA,CAACC,CAAQ,EAAEC,CAAQ,KACtCD,CAAC,CAACE,MAAM,KAAKD,CAAC,CAACC,MAAM,IAAIF,CAAC,CAACG,KAAK,CAAC,CAACC,EAAE,EAAEC,KAAK,KAAKC,MAAM,CAACC,EAAE,CAACH,EAAE,EAAEH,CAAC,CAACI,KAAK,CAAC,CAAC,CAAC;AAE1E,OAAO,MAAMG,SAAS,SAASrB,KAAK,CAACsB,SAAS,CAAe;EAC3D,OAAOC,wBAAwBA,CAC7BC,KAAsB,EACtBC,KAAsB,EACtB;IACA,MAAMC,SAAS,GAAG,CAAC,GAAGF,KAAK,CAACC,KAAK,CAACE,MAAM,EAAE,GAAGH,KAAK,CAACC,KAAK,CAACG,eAAe,CAAC;;IAEzE;IACA,IACEhB,YAAY,CACVc,SAAS,CAACG,GAAG,CAAEC,CAAC,IAAKA,CAAC,CAACC,GAAG,CAAC,EAC3BN,KAAK,CAACO,cAAc,CAACH,GAAG,CAAEC,CAAC,IAAKA,CAAC,CAACC,GAAG,CACvC,CAAC,IACDN,KAAK,CAACE,MAAM,CAACZ,MAAM,EACnB;MACA;MACA;MACA;MACA;;MAEA,MAAMkB,aAAa,GAAGR,KAAK,CAACE,MAAM,CAACO,MAAM,CACtCJ,CAAC,IACAL,KAAK,CAACU,gBAAgB,CAACC,QAAQ,CAACN,CAAC,CAACC,GAAG,CAAC,IACtC,CAACP,KAAK,CAACC,KAAK,CAACE,MAAM,CAACU,IAAI,CAAEC,EAAE,IAAKA,EAAE,CAACP,GAAG,KAAKD,CAAC,CAACC,GAAG,CACrD,CAAC;MAED,MAAMQ,eAAe,GAAGd,KAAK,CAACE,MAAM,CAACO,MAAM,CACxCJ,CAAC,IACAL,KAAK,CAACe,kBAAkB,CAACJ,QAAQ,CAACN,CAAC,CAACC,GAAG,CAAC,IACxC,CAACP,KAAK,CAACC,KAAK,CAACE,MAAM,CAACU,IAAI,CAAEC,EAAE,IAAKA,EAAE,CAACP,GAAG,KAAKD,CAAC,CAACC,GAAG,CACrD,CAAC;MAED,IAAIJ,MAAuB,GAAGH,KAAK,CAACC,KAAK,CAACE,MAAM,CAACc,KAAK,CAAC,CAAC;;MAExD;MACA,IAAIF,eAAe,CAACxB,MAAM,EAAE;QAC1BY,MAAM,CAACe,MAAM,CAACf,MAAM,CAACZ,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,GAAGwB,eAAe,CAAC;MACzD;;MAEA;MACA,IAAIN,aAAa,CAAClB,MAAM,EAAE;QACxBY,MAAM,CAACgB,IAAI,CAAC,GAAGV,aAAa,CAAC;MAC/B;MAEA,IAAID,cAAc,GAAGP,KAAK,CAACO,cAAc;MACzC,IAAIY,WAAW,GAAGpB,KAAK,CAACoB,WAAW;MACnC,IAAIC,mBAAmB,GAAGpB,KAAK,CAACoB,mBAAmB;MAEnD,IAAIrB,KAAK,CAACoB,WAAW,KAAKnB,KAAK,CAACoB,mBAAmB,EAAE;QACnDD,WAAW,GAAGjB,MAAM,CAACmB,MAAM,CAAqB,CAACC,GAAG,EAAEC,KAAK,KAAK;UAC9DD,GAAG,CAACC,KAAK,CAACjB,GAAG,CAAC,GACZP,KAAK,CAACoB,WAAW,CAACI,KAAK,CAACjB,GAAG,CAAC,IAAIN,KAAK,CAACmB,WAAW,CAACI,KAAK,CAACjB,GAAG,CAAC;UAE9D,OAAOgB,GAAG;QACZ,CAAC,EAAE,CAAC,CAAC,CAAC;QAENF,mBAAmB,GAAGrB,KAAK,CAACoB,WAAW;MACzC;MAEA,IAAI,CAAChC,YAAY,CAACc,SAAS,EAAED,KAAK,CAACO,cAAc,CAAC,EAAE;QAClD;QACA,MAAMH,GAAG,GAAGH,SAAS,CAACoB,MAAM,CAC1B,CAACC,GAAG,EAAEC,KAAK,KAAK;UACdD,GAAG,CAACC,KAAK,CAACjB,GAAG,CAAC,GAAGiB,KAAK;UACtB,OAAOD,GAAG;QACZ,CAAC,EACD,CAAC,CACH,CAAC;QAEDpB,MAAM,GAAGA,MAAM,CAACE,GAAG,CAAEmB,KAAK,IAAKnB,GAAG,CAACmB,KAAK,CAACjB,GAAG,CAAC,IAAIiB,KAAK,CAAC;QACvDhB,cAAc,GAAGN,SAAS;MAC5B;MAEA,OAAO;QACLC,MAAM;QACNK,cAAc;QACdY,WAAW;QACXC;MACF,CAAC;IACH;;IAEA;IACA;;IAEA,IAAIlB,MAAM,GACRH,KAAK,CAACC,KAAK,CAACP,KAAK,GAAGM,KAAK,CAACC,KAAK,CAACE,MAAM,CAACZ,MAAM,GAAG,CAAC;IAC7C;IACA;IACAS,KAAK,CAACC,KAAK,CAACE,MAAM,CAACc,KAAK,CAAC,CAAC,EAAEjB,KAAK,CAACC,KAAK,CAACP,KAAK,GAAG,CAAC,CAAC,GAClDM,KAAK,CAACC,KAAK,CAACE,MAAM;;IAExB;IACA,MAAM;MAAEK;IAAe,CAAC,GAAGP,KAAK;IAEhC,IAAI;MAAEwB,gBAAgB;MAAEd,gBAAgB;MAAEK;IAAmB,CAAC,GAAGf,KAAK;IAEtE,MAAMyB,oBAAoB,GAAGlB,cAAc,CAACA,cAAc,CAACjB,MAAM,GAAG,CAAC,CAExD;IACb,MAAMoC,gBAAgB,GAAGxB,MAAM,CAACA,MAAM,CAACZ,MAAM,GAAG,CAAC,CAAC;IAElD,MAAMqC,kBAAkB,GAAIrB,GAAW,IAAK;MAC1C,MAAMsB,UAAU,GAAG7B,KAAK,CAACoB,WAAW,CAACb,GAAG,CAAC,IAAIN,KAAK,CAACmB,WAAW,CAACb,GAAG,CAAC;MAEnE,OAAOvB,mBAAmB,CAAC6C,UAAU,EAAEC,OAAO,CAACC,SAAS,CAAC;IAC3D,CAAC;IAED,MAAMC,0BAA0B,GAAIzB,GAAW,IAAK;MAClD,MAAMsB,UAAU,GAAG7B,KAAK,CAACoB,WAAW,CAACb,GAAG,CAAC,IAAIN,KAAK,CAACmB,WAAW,CAACb,GAAG,CAAC;MAEnE,OAAOsB,UAAU,CAACC,OAAO,CAACG,uBAAuB,IAAI,MAAM;IAC7D,CAAC;IAED,IACEP,oBAAoB,IACpBA,oBAAoB,CAACnB,GAAG,KAAKoB,gBAAgB,CAACpB,GAAG,EACjD;MACA;MACA;;MAEA,IACEC,cAAc,CAACK,IAAI,CAAEP,CAAC,IAAKA,CAAC,CAACC,GAAG,KAAKoB,gBAAgB,CAACpB,GAAG,CAAC,IAC1D,CAACJ,MAAM,CAACU,IAAI,CAAEP,CAAC,IAAKA,CAAC,CAACC,GAAG,KAAKmB,oBAAoB,CAACnB,GAAG,CAAC,EACvD;QACA;QACA;;QAEA,IACEqB,kBAAkB,CAACF,oBAAoB,CAACnB,GAAG,CAAC,IAC5C,CAACI,gBAAgB,CAACC,QAAQ,CAACc,oBAAoB,CAACnB,GAAG,CAAC,EACpD;UACAI,gBAAgB,GAAG,CAAC,GAAGA,gBAAgB,EAAEe,oBAAoB,CAACnB,GAAG,CAAC;;UAElE;UACA;UACAkB,gBAAgB,GAAGA,gBAAgB,CAACf,MAAM,CACvCH,GAAG,IAAKA,GAAG,KAAKmB,oBAAoB,CAACnB,GACxC,CAAC;UACDS,kBAAkB,GAAGA,kBAAkB,CAACN,MAAM,CAC3CH,GAAG,IAAKA,GAAG,KAAKmB,oBAAoB,CAACnB,GACxC,CAAC;;UAED;UACAJ,MAAM,GAAG,CAAC,GAAGA,MAAM,EAAEuB,oBAAoB,CAAC;QAC5C;MACF,CAAC,MAAM;QACL;QACA;QACA;;QAEA,IACEE,kBAAkB,CAACD,gBAAgB,CAACpB,GAAG,CAAC,IACxC,CAACkB,gBAAgB,CAACb,QAAQ,CAACe,gBAAgB,CAACpB,GAAG,CAAC,EAChD;UACA;UACA;UACAkB,gBAAgB,GAAG,CAAC,GAAGA,gBAAgB,EAAEE,gBAAgB,CAACpB,GAAG,CAAC;UAE9DI,gBAAgB,GAAGA,gBAAgB,CAACD,MAAM,CACvCH,GAAG,IAAKA,GAAG,KAAKoB,gBAAgB,CAACpB,GACpC,CAAC;UACDS,kBAAkB,GAAGA,kBAAkB,CAACN,MAAM,CAC3CH,GAAG,IAAKA,GAAG,KAAKoB,gBAAgB,CAACpB,GACpC,CAAC;UAED,IAAI,CAACJ,MAAM,CAACU,IAAI,CAAEP,CAAC,IAAKA,CAAC,CAACC,GAAG,KAAKmB,oBAAoB,CAACnB,GAAG,CAAC,EAAE;YAC3D;;YAEAkB,gBAAgB,GAAGA,gBAAgB,CAACf,MAAM,CACvCH,GAAG,IAAKA,GAAG,KAAKmB,oBAAoB,CAACnB,GACxC,CAAC;YAED,IAAIyB,0BAA0B,CAACL,gBAAgB,CAACpB,GAAG,CAAC,KAAK,KAAK,EAAE;cAC9DI,gBAAgB,GAAG,CACjB,GAAGA,gBAAgB,EACnBe,oBAAoB,CAACnB,GAAG,CACzB;;cAED;cACA;cACA;cACAkB,gBAAgB,GAAGA,gBAAgB,CAACf,MAAM,CACvCH,GAAG,IAAKA,GAAG,KAAKoB,gBAAgB,CAACpB,GACpC,CAAC;;cAED;cACAJ,MAAM,GAAG,CAAC,GAAGA,MAAM,EAAEuB,oBAAoB,CAAC;YAC5C,CAAC,MAAM;cACLV,kBAAkB,GAAG,CACnB,GAAGA,kBAAkB,EACrBU,oBAAoB,CAACnB,GAAG,CACzB;cAEDI,gBAAgB,GAAGA,gBAAgB,CAACD,MAAM,CACvCH,GAAG,IAAKA,GAAG,KAAKmB,oBAAoB,CAACnB,GACxC,CAAC;;cAED;cACA;cACA;cACAJ,MAAM,GAAGA,MAAM,CAACc,KAAK,CAAC,CAAC;cACvBd,MAAM,CAACe,MAAM,CAACf,MAAM,CAACZ,MAAM,GAAG,CAAC,EAAE,CAAC,EAAEmC,oBAAoB,CAAC;;cAEzD;cACA,MAAMQ,uBAAuB,GAAGjC,KAAK,CAACE,MAAM,CAACO,MAAM,CAChDJ,CAAC,IACAU,kBAAkB,CAACJ,QAAQ,CAACN,CAAC,CAACC,GAAG,CAAC,IAClC,CAACJ,MAAM,CAACU,IAAI,CAAEsB,QAAQ,IAAKA,QAAQ,CAAC5B,GAAG,KAAKD,CAAC,CAACC,GAAG,CACrD,CAAC;cAED,IAAI2B,uBAAuB,CAAC3C,MAAM,EAAE;gBAClC;gBACAY,MAAM,CAACe,MAAM,CAACf,MAAM,CAACZ,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,GAAG2C,uBAAuB,CAAC;cACjE;YACF;UACF;QACF;MACF;IACF,CAAC,MAAM,IAAIlB,kBAAkB,CAACzB,MAAM,IAAIoB,gBAAgB,CAACpB,MAAM,EAAE;MAC/D;MACAY,MAAM,GAAGA,MAAM,CAACc,KAAK,CAAC,CAAC;MACvBd,MAAM,CAACe,MAAM,CACXf,MAAM,CAACZ,MAAM,GAAG,CAAC,EACjB,CAAC,EACD,GAAGU,KAAK,CAACE,MAAM,CAACO,MAAM,CAAC,CAAC;QAAEH;MAAI,CAAC,KAC7BqB,kBAAkB,CAACrB,GAAG,CAAC,GACnBS,kBAAkB,CAACJ,QAAQ,CAACL,GAAG,CAAC,IAAII,gBAAgB,CAACC,QAAQ,CAACL,GAAG,CAAC,GAClE,KACN,CACF,CAAC;IACH;IAEA,IAAI,CAACJ,MAAM,CAACZ,MAAM,EAAE;MAClB,MAAM,IAAI6C,KAAK,CACb,oEACF,CAAC;IACH;IAEA,MAAMhB,WAAW,GAAGlB,SAAS,CAACoB,MAAM,CAAqB,CAACC,GAAG,EAAEC,KAAK,KAAK;MACvED,GAAG,CAACC,KAAK,CAACjB,GAAG,CAAC,GACZP,KAAK,CAACoB,WAAW,CAACI,KAAK,CAACjB,GAAG,CAAC,IAAIN,KAAK,CAACmB,WAAW,CAACI,KAAK,CAACjB,GAAG,CAAC;MAE9D,OAAOgB,GAAG;IACZ,CAAC,EAAE,CAAC,CAAC,CAAC;IAEN,OAAO;MACLpB,MAAM;MACNK,cAAc,EAAE,CAAC,GAAGR,KAAK,CAACC,KAAK,CAACE,MAAM,EAAE,GAAGH,KAAK,CAACC,KAAK,CAACG,eAAe,CAAC;MACvEiB,mBAAmB,EAAErB,KAAK,CAACoB,WAAW;MACtCK,gBAAgB;MAChBd,gBAAgB;MAChBK,kBAAkB;MAClBI;IACF,CAAC;EACH;EAEAnB,KAAK,GAAU;IACbE,MAAM,EAAE,EAAE;IACVK,cAAc,EAAE,EAAE;IAClBa,mBAAmB,EAAE,CAAC,CAAC;IACvBI,gBAAgB,EAAE,EAAE;IACpBd,gBAAgB,EAAE,EAAE;IACpBK,kBAAkB,EAAE,EAAE;IACtBI,WAAW,EAAE,CAAC;EAChB,CAAC;EAEOiB,gBAAgB,GAAGA,CAAC;IAAEb;EAAgC,CAAC,KAAK;IAClE,MAAM;MAAEb,gBAAgB;MAAEK;IAAmB,CAAC,GAAG,IAAI,CAACf,KAAK;IAC3D,MAAME,MAAM,GAAG,IAAI,CAACF,KAAK,CAACE,MAAM,CAACO,MAAM,CACpCJ,CAAC,IACAA,CAAC,CAACC,GAAG,KAAKiB,KAAK,CAACjB,GAAG,IAClB,CAACI,gBAAgB,CAACC,QAAQ,CAACN,CAAC,CAACC,GAAG,CAAC,IAChC,CAACS,kBAAkB,CAACJ,QAAQ,CAACN,CAAC,CAACC,GAAG,CACxC,CAAC;IAED,MAAMb,KAAK,GAAGS,MAAM,CAACmC,SAAS,CAAEhC,CAAC,IAAKA,CAAC,CAACC,GAAG,KAAKiB,KAAK,CAACjB,GAAG,CAAC;IAE1D,OAAOJ,MAAM,CAACT,KAAK,GAAG,CAAC,CAAC;EAC1B,CAAC;EAEO6C,YAAY,GAAIvC,KAA2B,IAAK;IACtD,oBAAOd,IAAA,CAACJ,eAAe;MAAA,GAAKkB;IAAK,CAAG,CAAC;EACvC,CAAC;EAEOwC,eAAe,GAAGA,CAAC;IAAEhB;EAAgC,CAAC,KAAK;IACjE,MAAM;MAAEvB,KAAK;MAAEwC;IAAW,CAAC,GAAG,IAAI,CAACzC,KAAK;IACxC,MAAM;MAAEW,gBAAgB;MAAEK;IAAmB,CAAC,GAAG,IAAI,CAACf,KAAK;IAE3D,IACEU,gBAAgB,CAACE,IAAI,CAAEN,GAAG,IAAKA,GAAG,KAAKiB,KAAK,CAACjB,GAAG,CAAC,IACjDS,kBAAkB,CAACxB,KAAK,CAAEe,GAAG,IAAKA,GAAG,KAAKiB,KAAK,CAACjB,GAAG,CAAC,IACpDN,KAAK,CAACyC,UAAU,CAAC9B,QAAQ,CAACY,KAAK,CAACmB,IAAI,CAAC,IACrC,CAAC1C,KAAK,CAACE,MAAM,CAACU,IAAI,CAAEP,CAAC,IAAKA,CAAC,CAACC,GAAG,KAAKiB,KAAK,CAACjB,GAAG,CAAC,EAC9C;MACA;MACA;MACAkC,UAAU,CAACG,QAAQ,CAAE3C,KAAK,IAAK;QAC7B,MAAME,MAAM,GAAG,CACb,GAAGF,KAAK,CAACE,MAAM,CAACO,MAAM,CAAEJ,CAAC,IAAKA,CAAC,CAACC,GAAG,KAAKiB,KAAK,CAACjB,GAAG,CAAC,EAClDiB,KAAK,CACN;QAED,OAAOlD,aAAa,CAACuE,KAAK,CAAC;UACzB,GAAG5C,KAAK;UACRE,MAAM;UACNT,KAAK,EAAES,MAAM,CAACZ,MAAM,GAAG;QACzB,CAAC,CAAC;MACJ,CAAC,CAAC;IACJ,CAAC,MAAM;MACL,IAAI,CAACuD,QAAQ,CAAE7C,KAAK,IAAK;QACvB,MAAM8C,UAAU,GAAG9C,KAAK,CAACE,MAAM,CAACmC,SAAS,CAAEhC,CAAC,IAAKA,CAAC,CAACC,GAAG,KAAKiB,KAAK,CAACjB,GAAG,CAAC;;QAErE;QACA;QACA,MAAMyC,uBAAuB,GAAG,IAAIC,GAAG,CACrChD,KAAK,CAACE,MAAM,CACTc,KAAK,CAAC,CAAC,EAAE8B,UAAU,CAAC,CACpBrC,MAAM,CAAEJ,CAAC,IAAKL,KAAK,CAACe,kBAAkB,CAACJ,QAAQ,CAACN,CAAC,CAACC,GAAG,CAAC,CAAC,CACvDF,GAAG,CAAEC,CAAC,IAAKA,CAAC,CAACC,GAAG,CACrB,CAAC;QAED,MAAM2C,SAAS,GAAGjD,KAAK,CAACE,MAAM,CAACO,MAAM,CAClCJ,CAAC,IAAK,CAAC0C,uBAAuB,CAACG,GAAG,CAAC7C,CAAC,CAACC,GAAG,CAC3C,CAAC;QAED,OAAO;UACLJ,MAAM,EAAE+C,SAAS;UACjBzB,gBAAgB,EAAExB,KAAK,CAACwB,gBAAgB,CAACf,MAAM,CAC5CH,GAAG,IAAKA,GAAG,KAAKiB,KAAK,CAACjB,GACzB,CAAC;UACDI,gBAAgB,EAAEV,KAAK,CAACU,gBAAgB,CAACD,MAAM,CAC5CH,GAAG,IAAKA,GAAG,KAAKiB,KAAK,CAACjB,GACzB,CAAC;UACDS,kBAAkB,EAAEf,KAAK,CAACe,kBAAkB,CAACN,MAAM,CAChDH,GAAG,IAAK,CAACyC,uBAAuB,CAACG,GAAG,CAAC5C,GAAG,CAC3C;QACF,CAAC;MACH,CAAC,CAAC;IACJ;EACF,CAAC;EAEO6C,gBAAgB,GAAGA,CAAC;IAAE5B;EAAgC,CAAC,KAAK;IAClE,MAAM;MAAEvB,KAAK;MAAEwC;IAAW,CAAC,GAAG,IAAI,CAACzC,KAAK;IAExC,IAAIC,KAAK,CAACE,MAAM,CAACU,IAAI,CAAEP,CAAC,IAAKA,CAAC,CAACC,GAAG,KAAKiB,KAAK,CAACjB,GAAG,CAAC,EAAE;MACjD;MACA;MACA;MACAkC,UAAU,CAACG,QAAQ,CAAC;QAClB,GAAGrE,YAAY,CAAC8E,GAAG,CAAC,CAAC;QACrBC,MAAM,EAAE9B,KAAK,CAACjB,GAAG;QACjBgD,MAAM,EAAEtD,KAAK,CAACM;MAChB,CAAC,CAAC;IACJ,CAAC,MAAM;MACL;MACA,IAAI,CAACuC,QAAQ,CAAE7C,KAAK,KAAM;QACxBE,MAAM,EAAEF,KAAK,CAACE,MAAM,CAACO,MAAM,CAAEJ,CAAC,IAAKA,CAAC,CAACC,GAAG,KAAKiB,KAAK,CAACjB,GAAG,CAAC;QACvDkB,gBAAgB,EAAExB,KAAK,CAACwB,gBAAgB,CAACf,MAAM,CAC5CH,GAAG,IAAKA,GAAG,KAAKiB,KAAK,CAACjB,GACzB,CAAC;QACDI,gBAAgB,EAAEV,KAAK,CAACU,gBAAgB,CAACD,MAAM,CAC5CH,GAAG,IAAKA,GAAG,KAAKiB,KAAK,CAACjB,GACzB;MACF,CAAC,CAAC,CAAC;IACL;EACF,CAAC;EAEOiD,qBAAqB,GAAGA,CAC9B;IAAEhC;EAAgC,CAAC,EACnCiC,OAAgB,KAEhB,IAAI,CAACzD,KAAK,CAACyC,UAAU,CAACiB,IAAI,CAAC;IACzBC,IAAI,EAAE,iBAAiB;IACvBC,IAAI,EAAE;MAAEH;IAAQ,CAAC;IACjBF,MAAM,EAAE/B,KAAK,CAACjB;EAChB,CAAC,CAAC;EAEIsD,mBAAmB,GAAGA,CAC5B;IAAErC;EAAgC,CAAC,EACnCiC,OAAgB,KAEhB,IAAI,CAACzD,KAAK,CAACyC,UAAU,CAACiB,IAAI,CAAC;IACzBC,IAAI,EAAE,eAAe;IACrBC,IAAI,EAAE;MAAEH;IAAQ,CAAC;IACjBF,MAAM,EAAE/B,KAAK,CAACjB;EAChB,CAAC,CAAC;EAEIuD,kBAAkB,GAAGA,CAAC;IAAEtC;EAAgC,CAAC,KAAK;IACpE,IAAI,CAACxB,KAAK,CAACyC,UAAU,CAACiB,IAAI,CAAC;MACzBC,IAAI,EAAE,cAAc;MACpBJ,MAAM,EAAE/B,KAAK,CAACjB;IAChB,CAAC,CAAC;EACJ,CAAC;EAEOwD,gBAAgB,GAAGA,CAAC;IAAEvC;EAAgC,CAAC,KAAK;IAClE,IAAI,CAACxB,KAAK,CAACyC,UAAU,CAACiB,IAAI,CAAC;MACzBC,IAAI,EAAE,YAAY;MAClBJ,MAAM,EAAE/B,KAAK,CAACjB;IAChB,CAAC,CAAC;EACJ,CAAC;EAEOyD,mBAAmB,GAAGA,CAAC;IAAExC;EAAgC,CAAC,KAAK;IACrE,IAAI,CAACxB,KAAK,CAACyC,UAAU,CAACiB,IAAI,CAAC;MACzBC,IAAI,EAAE,eAAe;MACrBJ,MAAM,EAAE/B,KAAK,CAACjB;IAChB,CAAC,CAAC;EACJ,CAAC;EAED0D,MAAMA,CAAA,EAAG;IACP,MAAM;MACJhE,KAAK;MACL;MACAmB,WAAW,EAAE8C,CAAC;MACd,GAAGC;IACL,CAAC,GAAG,IAAI,CAACnE,KAAK;IAEd,MAAM;MAAEG,MAAM;MAAEiB,WAAW;MAAEK,gBAAgB;MAAEd;IAAiB,CAAC,GAC/D,IAAI,CAACV,KAAK;IAEZ,oBACEf,IAAA,CAACC,qBAAqB;MAACiF,KAAK,EAAEC,MAAM,CAACC,SAAU;MAAAC,QAAA,eAC7CrF,IAAA,CAACb,sBAAsB;QAAAkG,QAAA,eACrBrF,IAAA,CAACP,qBAAqB,CAAC6F,QAAQ;UAAAD,QAAA,EAC3BE,MAAM,iBACNvF,IAAA,CAACN,wBAAwB,CAAC4F,QAAQ;YAAAD,QAAA,EAC9BG,aAAa,iBACbxF,IAAA,CAACd,kBAAkB,CAACoG,QAAQ;cAAAD,QAAA,EACxBI,mBAAmB,iBACnBzF,IAAA,CAACH,SAAS;gBACR0F,MAAM,EAAEA,MAAQ;gBAChBE,mBAAmB,EAAEA,mBAAoB;gBACzCD,aAAa,EAAEA,aAAc;gBAC7BrC,gBAAgB,EAAE,IAAI,CAACA,gBAAiB;gBACxClC,MAAM,EAAEA,MAAO;gBACfsB,gBAAgB,EAAEA,gBAAiB;gBACnCd,gBAAgB,EAAEA,gBAAiB;gBACnCiE,WAAW,EAAE,IAAI,CAACpC,eAAgB;gBAClCqC,YAAY,EAAE,IAAI,CAACzB,gBAAiB;gBACpC0B,iBAAiB,EAAE,IAAI,CAACtB,qBAAsB;gBAC9CuB,eAAe,EAAE,IAAI,CAAClB,mBAAoB;gBAC1CtB,YAAY,EAAE,IAAI,CAACA,YAAa;gBAChCtC,KAAK,EAAEA,KAAM;gBACbmB,WAAW,EAAEA,WAAY;gBACzB4D,cAAc,EAAE,IAAI,CAAClB,kBAAmB;gBACxCmB,YAAY,EAAE,IAAI,CAAClB,gBAAiB;gBACpCmB,eAAe,EAAE,IAAI,CAAClB,mBAAoB;gBAAA,GACtCG;cAAI,CACT;YACF,CAC0B;UAC9B,CACgC;QACpC,CAC6B;MAAC,CACX;IAAC,CACJ,CAAC;EAE5B;AACF;AAEA,MAAME,MAAM,GAAG5F,UAAU,CAAC0G,MAAM,CAAC;EAC/Bb,SAAS,EAAE;IACTc,IAAI,EAAE;EACR;AACF,CAAC,CAAC","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","map","r","key","previousRoutes","closingRoutes","filter","closingRouteKeys","includes","some","pr","replacingRoutes","replacingRouteKeys","slice","splice","push","descriptors","previousDescriptors","reduce","acc","route","openingRouteKeys","previousFocusedRoute","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","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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Card.d.ts","sourceRoot":"","sources":["../../../../../src/views/Stack/Card.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EACL,QAAQ,EAER,KAAK,SAAS,EAGd,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAGjE,OAAO,KAAK,EACV,gBAAgB,EAChB,MAAM,EACN,0BAA0B,EAC1B,cAAc,EACf,MAAM,aAAa,CAAC;AAarB,KAAK,KAAK,GAAG;IACX,QAAQ,EAAE,OAAO,CAAC;IAClB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,QAAQ,CAAC,qBAAqB,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;IACzD,OAAO,EAAE,QAAQ,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;IAChD,OAAO,EAAE,QAAQ,CAAC,KAAK,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,UAAU,CAAC;IACnB,SAAS,EAAE,eAAe,CAAC;IAC3B,mBAAmB,EAAE,OAAO,CAAC;IAC7B,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,YAAY,EAAE,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,OAAO,CAAA;KAAE,KAAK,IAAI,CAAC;IACtE,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,iBAAiB,EAAE,MAAM,IAAI,CAAC;IAC9B,YAAY,EAAE,MAAM,IAAI,CAAC;IACzB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,OAAO,EACH,CAAC,CAAC,KAAK,EAAE;QACP,KAAK,EAAE,QAAQ,CAAC,iBAAiB,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC;KACzD,KAAK,KAAK,CAAC,SAAS,CAAC,GACtB,SAAS,CAAC;IACd,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,EAAE,OAAO,GAAG,SAAS,CAAC;IACnC,cAAc,EAAE,OAAO,CAAC;IACxB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,qBAAqB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1C,cAAc,EAAE;QACd,IAAI,EAAE,cAAc,CAAC;QACrB,KAAK,EAAE,cAAc,CAAC;KACvB,CAAC;IACF,SAAS,EAAE,OAAO,CAAC;IACnB,iBAAiB,EAAE,0BAA0B,CAAC;IAC9C,cAAc,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IACtC,YAAY,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;CACrC,CAAC;AAmDF,iBAAS,IAAI,CAAC,EACZ,aAAqB,EACrB,cAAqB,EACrB,qBAA+C,EAC/C,OAAwB,EACxB,QAAQ,EACR,kBAAkB,EAClB,OAAO,EACP,OAAO,EACP,IAAI,EACJ,OAAO,EACP,OAAO,EACP,MAAM,EACN,MAAM,EACN,SAAS,EACT,mBAAmB,EACnB,gBAAgB,EAChB,MAAM,EACN,OAAO,EACP,YAAY,EACZ,cAAc,EACd,iBAAiB,EACjB,YAAY,EACZ,QAAQ,EACR,cAAc,EACd,uBAAuB,EACvB,cAAc,EACd,SAAS,EACT,iBAAiB,EACjB,cAAc,EAAE,oBAAoB,EACpC,YAAY,GACb,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"Card.d.ts","sourceRoot":"","sources":["../../../../../src/views/Stack/Card.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EACL,QAAQ,EAER,KAAK,SAAS,EAGd,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAGjE,OAAO,KAAK,EACV,gBAAgB,EAChB,MAAM,EACN,0BAA0B,EAC1B,cAAc,EACf,MAAM,aAAa,CAAC;AAarB,KAAK,KAAK,GAAG;IACX,QAAQ,EAAE,OAAO,CAAC;IAClB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,QAAQ,CAAC,qBAAqB,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;IACzD,OAAO,EAAE,QAAQ,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;IAChD,OAAO,EAAE,QAAQ,CAAC,KAAK,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,UAAU,CAAC;IACnB,SAAS,EAAE,eAAe,CAAC;IAC3B,mBAAmB,EAAE,OAAO,CAAC;IAC7B,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,YAAY,EAAE,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,OAAO,CAAA;KAAE,KAAK,IAAI,CAAC;IACtE,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,iBAAiB,EAAE,MAAM,IAAI,CAAC;IAC9B,YAAY,EAAE,MAAM,IAAI,CAAC;IACzB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,OAAO,EACH,CAAC,CAAC,KAAK,EAAE;QACP,KAAK,EAAE,QAAQ,CAAC,iBAAiB,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC;KACzD,KAAK,KAAK,CAAC,SAAS,CAAC,GACtB,SAAS,CAAC;IACd,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,EAAE,OAAO,GAAG,SAAS,CAAC;IACnC,cAAc,EAAE,OAAO,CAAC;IACxB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,qBAAqB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1C,cAAc,EAAE;QACd,IAAI,EAAE,cAAc,CAAC;QACrB,KAAK,EAAE,cAAc,CAAC;KACvB,CAAC;IACF,SAAS,EAAE,OAAO,CAAC;IACnB,iBAAiB,EAAE,0BAA0B,CAAC;IAC9C,cAAc,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IACtC,YAAY,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;CACrC,CAAC;AAmDF,iBAAS,IAAI,CAAC,EACZ,aAAqB,EACrB,cAAqB,EACrB,qBAA+C,EAC/C,OAAwB,EACxB,QAAQ,EACR,kBAAkB,EAClB,OAAO,EACP,OAAO,EACP,IAAI,EACJ,OAAO,EACP,OAAO,EACP,MAAM,EACN,MAAM,EACN,SAAS,EACT,mBAAmB,EACnB,gBAAgB,EAChB,MAAM,EACN,OAAO,EACP,YAAY,EACZ,cAAc,EACd,iBAAiB,EACjB,YAAY,EACZ,QAAQ,EACR,cAAc,EACd,uBAAuB,EACvB,cAAc,EACd,SAAS,EACT,iBAAiB,EACjB,cAAc,EAAE,oBAAoB,EACpC,YAAY,GACb,EAAE,KAAK,2CAqaP;AAED,OAAO,EAAE,IAAI,EAAE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StackView.d.ts","sourceRoot":"","sources":["../../../../../src/views/Stack/StackView.tsx"],"names":[],"mappings":"AAEA,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,aAAa,EAClB,KAAK,KAAK,EAEV,KAAK,oBAAoB,EAC1B,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,KAAK,EACV,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;CACjC,CAAC;AAEF,KAAK,KAAK,GAAG;IAEX,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;IAExB,cAAc,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;IAEhC,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"StackView.d.ts","sourceRoot":"","sources":["../../../../../src/views/Stack/StackView.tsx"],"names":[],"mappings":"AAEA,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,aAAa,EAClB,KAAK,KAAK,EAEV,KAAK,oBAAoB,EAC1B,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,KAAK,EACV,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;CACjC,CAAC;AAEF,KAAK,KAAK,GAAG;IAEX,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;IAExB,cAAc,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;IAEhC,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAuQxB,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;CAkDP"}
|
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": "8.0.0-alpha.
|
|
4
|
+
"version": "8.0.0-alpha.12",
|
|
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": "^3.0.0-alpha.
|
|
48
|
+
"@react-navigation/elements": "^3.0.0-alpha.12",
|
|
49
49
|
"color": "^4.2.3",
|
|
50
50
|
"use-latest-callback": "^0.3.2"
|
|
51
51
|
},
|
|
@@ -91,5 +91,5 @@
|
|
|
91
91
|
]
|
|
92
92
|
]
|
|
93
93
|
},
|
|
94
|
-
"gitHead": "
|
|
94
|
+
"gitHead": "5d08a615905bbdaf8feba748bd83828d3eea5fdf"
|
|
95
95
|
}
|
package/src/views/Stack/Card.tsx
CHANGED
|
@@ -151,14 +151,14 @@ function Card({
|
|
|
151
151
|
containerStyle: customContainerStyle,
|
|
152
152
|
contentStyle,
|
|
153
153
|
}: Props) {
|
|
154
|
-
const [, forceUpdate] = React.useReducer((x) => x + 1, 0);
|
|
155
|
-
|
|
156
154
|
const didInitiallyAnimate = React.useRef(false);
|
|
157
155
|
const lastToValueRef = React.useRef<number | undefined>(undefined);
|
|
158
156
|
|
|
159
157
|
const animationHandleRef = React.useRef<number | undefined>(undefined);
|
|
160
158
|
const pendingGestureCallbackRef =
|
|
161
159
|
React.useRef<ReturnType<typeof setTimeout>>(undefined);
|
|
160
|
+
const pendingOnCloseCallbackRef =
|
|
161
|
+
React.useRef<ReturnType<typeof setTimeout>>(undefined);
|
|
162
162
|
|
|
163
163
|
const [isClosing] = React.useState(() => new Animated.Value(FALSE));
|
|
164
164
|
|
|
@@ -218,10 +218,8 @@ function Card({
|
|
|
218
218
|
}
|
|
219
219
|
|
|
220
220
|
animationHandleRef.current = requestAnimationFrame(() => {
|
|
221
|
-
if
|
|
222
|
-
|
|
223
|
-
forceUpdate();
|
|
224
|
-
}
|
|
221
|
+
// Make sure to re-open screen if it wasn't removed
|
|
222
|
+
maybeAnimate();
|
|
225
223
|
});
|
|
226
224
|
};
|
|
227
225
|
|
|
@@ -249,6 +247,8 @@ function Card({
|
|
|
249
247
|
({ nativeEvent }: PanGestureHandlerGestureEvent) => {
|
|
250
248
|
switch (nativeEvent.state) {
|
|
251
249
|
case GestureState.ACTIVE:
|
|
250
|
+
clearTimeout(pendingGestureCallbackRef.current);
|
|
251
|
+
clearTimeout(pendingOnCloseCallbackRef.current);
|
|
252
252
|
isSwiping.setValue(TRUE);
|
|
253
253
|
onGestureBegin?.();
|
|
254
254
|
break;
|
|
@@ -305,10 +305,13 @@ function Card({
|
|
|
305
305
|
pendingGestureCallbackRef.current = setTimeout(() => {
|
|
306
306
|
onClose();
|
|
307
307
|
|
|
308
|
-
//
|
|
309
|
-
//
|
|
310
|
-
|
|
311
|
-
|
|
308
|
+
// Check if the screen is still closing with a delay
|
|
309
|
+
// So state update from onClose has a chance to go through
|
|
310
|
+
// If route wasn't removed after onClose, re-open it
|
|
311
|
+
pendingOnCloseCallbackRef.current = setTimeout(() => {
|
|
312
|
+
maybeAnimate();
|
|
313
|
+
}, 32);
|
|
314
|
+
}, 16);
|
|
312
315
|
}
|
|
313
316
|
|
|
314
317
|
onGestureEnd?.();
|
|
@@ -350,17 +353,15 @@ function Card({
|
|
|
350
353
|
}
|
|
351
354
|
|
|
352
355
|
clearTimeout(pendingGestureCallbackRef.current);
|
|
356
|
+
clearTimeout(pendingOnCloseCallbackRef.current);
|
|
353
357
|
};
|
|
354
|
-
|
|
355
|
-
// We only want to clean up the animation on unmount
|
|
356
358
|
}, []);
|
|
357
359
|
|
|
358
|
-
const timeoutRef = React.useRef<ReturnType<typeof setTimeout
|
|
360
|
+
const timeoutRef = React.useRef<ReturnType<typeof setTimeout>>(undefined);
|
|
359
361
|
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
}
|
|
362
|
+
const maybeAnimate = useLatestCallback(() => {
|
|
363
|
+
clearTimeout(pendingGestureCallbackRef.current);
|
|
364
|
+
clearTimeout(pendingOnCloseCallbackRef.current);
|
|
364
365
|
|
|
365
366
|
if (!didInitiallyAnimate.current) {
|
|
366
367
|
// Animate the card in on initial mount
|
|
@@ -368,9 +369,8 @@ function Card({
|
|
|
368
369
|
// rending of the screen is done. This is especially important
|
|
369
370
|
// in the new architecture
|
|
370
371
|
// cf., https://github.com/react-navigation/react-navigation/issues/12401
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
}
|
|
372
|
+
clearTimeout(timeoutRef.current);
|
|
373
|
+
|
|
374
374
|
timeoutRef.current = setTimeout(() => {
|
|
375
375
|
didInitiallyAnimate.current = true;
|
|
376
376
|
animate({ closing });
|
|
@@ -410,6 +410,14 @@ function Card({
|
|
|
410
410
|
animate({ closing });
|
|
411
411
|
}
|
|
412
412
|
}
|
|
413
|
+
});
|
|
414
|
+
|
|
415
|
+
React.useEffect(() => {
|
|
416
|
+
if (preloaded) {
|
|
417
|
+
return;
|
|
418
|
+
}
|
|
419
|
+
|
|
420
|
+
maybeAnimate();
|
|
413
421
|
|
|
414
422
|
previousPropsRef.current = {
|
|
415
423
|
opening,
|
|
@@ -428,6 +436,7 @@ function Card({
|
|
|
428
436
|
layout,
|
|
429
437
|
opening,
|
|
430
438
|
preloaded,
|
|
439
|
+
maybeAnimate,
|
|
431
440
|
]);
|
|
432
441
|
|
|
433
442
|
const interpolationProps = React.useMemo(
|
|
@@ -155,6 +155,16 @@ export class StackView extends React.Component<Props, State> {
|
|
|
155
155
|
|
|
156
156
|
let { openingRouteKeys, closingRouteKeys, replacingRouteKeys } = state;
|
|
157
157
|
|
|
158
|
+
// If a route that was closing or being replaced is now back in the routes,
|
|
159
|
+
// it was added back before the animation finished, so stop tracking it
|
|
160
|
+
closingRouteKeys = closingRouteKeys.filter(
|
|
161
|
+
(key) => !routes.some((r) => r.key === key)
|
|
162
|
+
);
|
|
163
|
+
|
|
164
|
+
replacingRouteKeys = replacingRouteKeys.filter(
|
|
165
|
+
(key) => !routes.some((r) => r.key === key)
|
|
166
|
+
);
|
|
167
|
+
|
|
158
168
|
const previousFocusedRoute = previousRoutes[previousRoutes.length - 1] as
|
|
159
169
|
| Route<string>
|
|
160
170
|
| undefined;
|