@react-navigation/stack 8.0.0-alpha.2 → 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 (57) hide show
  1. package/lib/module/utils/useCardAnimation.js +1 -1
  2. package/lib/module/utils/useCardAnimation.js.map +1 -1
  3. package/lib/module/utils/useGestureHandlerRef.js +1 -1
  4. package/lib/module/utils/useGestureHandlerRef.js.map +1 -1
  5. package/lib/module/utils/useKeyboardManager.js +50 -26
  6. package/lib/module/utils/useKeyboardManager.js.map +1 -1
  7. package/lib/module/views/Header/Header.js +2 -2
  8. package/lib/module/views/Header/Header.js.map +1 -1
  9. package/lib/module/views/Header/HeaderContainer.js +8 -4
  10. package/lib/module/views/Header/HeaderContainer.js.map +1 -1
  11. package/lib/module/views/Header/HeaderSegment.js +2 -2
  12. package/lib/module/views/Header/HeaderSegment.js.map +1 -1
  13. package/lib/module/views/Stack/Card.js +25 -20
  14. package/lib/module/views/Stack/Card.js.map +1 -1
  15. package/lib/module/views/Stack/CardA11yWrapper.js +1 -2
  16. package/lib/module/views/Stack/CardA11yWrapper.js.map +1 -1
  17. package/lib/module/views/Stack/CardContainer.js +17 -19
  18. package/lib/module/views/Stack/CardContainer.js.map +1 -1
  19. package/lib/module/views/Stack/CardStack.js +72 -117
  20. package/lib/module/views/Stack/CardStack.js.map +1 -1
  21. package/lib/module/views/Stack/StackView.js +59 -23
  22. package/lib/module/views/Stack/StackView.js.map +1 -1
  23. package/lib/typescript/src/types.d.ts +46 -47
  24. package/lib/typescript/src/types.d.ts.map +1 -1
  25. package/lib/typescript/src/utils/gestureActivationCriteria.d.ts +1 -1
  26. package/lib/typescript/src/utils/gestureActivationCriteria.d.ts.map +1 -1
  27. package/lib/typescript/src/utils/useKeyboardManager.d.ts +9 -2
  28. package/lib/typescript/src/utils/useKeyboardManager.d.ts.map +1 -1
  29. package/lib/typescript/src/views/Header/Header.d.ts +1 -1
  30. package/lib/typescript/src/views/Header/Header.d.ts.map +1 -1
  31. package/lib/typescript/src/views/Header/HeaderContainer.d.ts.map +1 -1
  32. package/lib/typescript/src/views/Header/HeaderSegment.d.ts +2 -2
  33. package/lib/typescript/src/views/Header/HeaderSegment.d.ts.map +1 -1
  34. package/lib/typescript/src/views/Stack/Card.d.ts +3 -3
  35. package/lib/typescript/src/views/Stack/Card.d.ts.map +1 -1
  36. package/lib/typescript/src/views/Stack/CardA11yWrapper.d.ts +0 -1
  37. package/lib/typescript/src/views/Stack/CardA11yWrapper.d.ts.map +1 -1
  38. package/lib/typescript/src/views/Stack/CardContainer.d.ts +2 -2
  39. package/lib/typescript/src/views/Stack/CardContainer.d.ts.map +1 -1
  40. package/lib/typescript/src/views/Stack/CardStack.d.ts +1 -1
  41. package/lib/typescript/src/views/Stack/CardStack.d.ts.map +1 -1
  42. package/lib/typescript/src/views/Stack/StackView.d.ts +6 -6
  43. package/lib/typescript/src/views/Stack/StackView.d.ts.map +1 -1
  44. package/package.json +16 -16
  45. package/src/types.tsx +73 -67
  46. package/src/utils/gestureActivationCriteria.tsx +1 -1
  47. package/src/utils/useCardAnimation.tsx +1 -1
  48. package/src/utils/useGestureHandlerRef.tsx +1 -1
  49. package/src/utils/useKeyboardManager.tsx +67 -33
  50. package/src/views/Header/Header.tsx +2 -2
  51. package/src/views/Header/HeaderContainer.tsx +8 -3
  52. package/src/views/Header/HeaderSegment.tsx +4 -4
  53. package/src/views/Stack/Card.tsx +32 -23
  54. package/src/views/Stack/CardA11yWrapper.tsx +2 -14
  55. package/src/views/Stack/CardContainer.tsx +9 -21
  56. package/src/views/Stack/CardStack.tsx +102 -155
  57. package/src/views/Stack/StackView.tsx +106 -34
@@ -3,7 +3,7 @@
3
3
  import * as React from 'react';
4
4
  import { CardAnimationContext } from "./CardAnimationContext.js";
5
5
  export function useCardAnimation() {
6
- const animation = React.useContext(CardAnimationContext);
6
+ const animation = React.use(CardAnimationContext);
7
7
  if (animation === undefined) {
8
8
  throw new Error("Couldn't find values for card animation. Are you inside a screen in Stack?");
9
9
  }
@@ -1 +1 @@
1
- {"version":3,"names":["React","CardAnimationContext","useCardAnimation","animation","useContext","undefined","Error"],"sourceRoot":"../../../src","sources":["utils/useCardAnimation.tsx"],"mappings":";;AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAE9B,SAASC,oBAAoB,QAAQ,2BAAwB;AAE7D,OAAO,SAASC,gBAAgBA,CAAA,EAAG;EACjC,MAAMC,SAAS,GAAGH,KAAK,CAACI,UAAU,CAACH,oBAAoB,CAAC;EAExD,IAAIE,SAAS,KAAKE,SAAS,EAAE;IAC3B,MAAM,IAAIC,KAAK,CACb,4EACF,CAAC;EACH;EAEA,OAAOH,SAAS;AAClB","ignoreList":[]}
1
+ {"version":3,"names":["React","CardAnimationContext","useCardAnimation","animation","use","undefined","Error"],"sourceRoot":"../../../src","sources":["utils/useCardAnimation.tsx"],"mappings":";;AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAE9B,SAASC,oBAAoB,QAAQ,2BAAwB;AAE7D,OAAO,SAASC,gBAAgBA,CAAA,EAAG;EACjC,MAAMC,SAAS,GAAGH,KAAK,CAACI,GAAG,CAACH,oBAAoB,CAAC;EAEjD,IAAIE,SAAS,KAAKE,SAAS,EAAE;IAC3B,MAAM,IAAIC,KAAK,CACb,4EACF,CAAC;EACH;EAEA,OAAOH,SAAS;AAClB","ignoreList":[]}
@@ -3,7 +3,7 @@
3
3
  import * as React from 'react';
4
4
  import { GestureHandlerRefContext } from "./GestureHandlerRefContext.js";
5
5
  export function useGestureHandlerRef() {
6
- const ref = React.useContext(GestureHandlerRefContext);
6
+ const ref = React.use(GestureHandlerRefContext);
7
7
  if (ref === undefined) {
8
8
  throw new Error("Couldn't find a ref for gesture handler. Are you inside a screen in Stack?");
9
9
  }
@@ -1 +1 @@
1
- {"version":3,"names":["React","GestureHandlerRefContext","useGestureHandlerRef","ref","useContext","undefined","Error"],"sourceRoot":"../../../src","sources":["utils/useGestureHandlerRef.tsx"],"mappings":";;AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAE9B,SAASC,wBAAwB,QAAQ,+BAA4B;AAErE,OAAO,SAASC,oBAAoBA,CAAA,EAAG;EACrC,MAAMC,GAAG,GAAGH,KAAK,CAACI,UAAU,CAACH,wBAAwB,CAAC;EAEtD,IAAIE,GAAG,KAAKE,SAAS,EAAE;IACrB,MAAM,IAAIC,KAAK,CACb,4EACF,CAAC;EACH;EAEA,OAAOH,GAAG;AACZ","ignoreList":[]}
1
+ {"version":3,"names":["React","GestureHandlerRefContext","useGestureHandlerRef","ref","use","undefined","Error"],"sourceRoot":"../../../src","sources":["utils/useGestureHandlerRef.tsx"],"mappings":";;AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAE9B,SAASC,wBAAwB,QAAQ,+BAA4B;AAErE,OAAO,SAASC,oBAAoBA,CAAA,EAAG;EACrC,MAAMC,GAAG,GAAGH,KAAK,CAACI,GAAG,CAACH,wBAAwB,CAAC;EAE/C,IAAIE,GAAG,KAAKE,SAAS,EAAE;IACrB,MAAM,IAAIC,KAAK,CACb,4EACF,CAAC;EACH;EAEA,OAAOH,GAAG;AACZ","ignoreList":[]}
@@ -2,12 +2,16 @@
2
2
 
3
3
  import * as React from 'react';
4
4
  import { Keyboard, TextInput } from 'react-native';
5
- export function useKeyboardManager(isEnabled) {
5
+ export function useKeyboardManager({
6
+ enabled,
7
+ focused
8
+ }) {
6
9
  // Numeric id of the previously focused text input
7
10
  // When a gesture didn't change the tab, we can restore the focused input with this
8
11
  const previouslyFocusedTextInputRef = React.useRef(undefined);
9
12
  const startTimestampRef = React.useRef(0);
10
13
  const keyboardTimeoutRef = React.useRef(undefined);
14
+ const enabledRef = React.useRef(enabled);
11
15
  const clearKeyboardTimeout = React.useCallback(() => {
12
16
  if (keyboardTimeoutRef.current !== undefined) {
13
17
  clearTimeout(keyboardTimeoutRef.current);
@@ -15,7 +19,7 @@ export function useKeyboardManager(isEnabled) {
15
19
  }
16
20
  }, []);
17
21
  const onPageChangeStart = React.useCallback(() => {
18
- if (!isEnabled()) {
22
+ if (!enabledRef.current) {
19
23
  return;
20
24
  }
21
25
  clearKeyboardTimeout();
@@ -29,30 +33,9 @@ export function useKeyboardManager(isEnabled) {
29
33
 
30
34
  // Store timestamp for touch start
31
35
  startTimestampRef.current = Date.now();
32
- }, [clearKeyboardTimeout, isEnabled]);
33
- const onPageChangeConfirm = React.useCallback(force => {
34
- if (!isEnabled()) {
35
- return;
36
- }
37
- clearKeyboardTimeout();
38
- if (force) {
39
- // Always dismiss input, even if we don't have a ref to it
40
- // We might not have the ref if onPageChangeStart was never called
41
- // This can happen if page change was not from a gesture
42
- Keyboard.dismiss();
43
- } else {
44
- const input = previouslyFocusedTextInputRef.current;
45
-
46
- // Dismiss the keyboard only if an input was a focused before
47
- // This makes sure we don't dismiss input on going back and focusing an input
48
- input?.blur();
49
- }
50
-
51
- // Cleanup the ID on successful page change
52
- previouslyFocusedTextInputRef.current = undefined;
53
- }, [clearKeyboardTimeout, isEnabled]);
36
+ }, [clearKeyboardTimeout]);
54
37
  const onPageChangeCancel = React.useCallback(() => {
55
- if (!isEnabled()) {
38
+ if (!enabledRef.current) {
56
39
  return;
57
40
  }
58
41
  clearKeyboardTimeout();
@@ -77,7 +60,48 @@ export function useKeyboardManager(isEnabled) {
77
60
  previouslyFocusedTextInputRef.current = undefined;
78
61
  }
79
62
  }
80
- }, [clearKeyboardTimeout, isEnabled]);
63
+ }, [clearKeyboardTimeout]);
64
+ const onPageChangeConfirm = React.useCallback(({
65
+ gesture,
66
+ active,
67
+ closing
68
+ }) => {
69
+ if (!enabledRef.current) {
70
+ return;
71
+ }
72
+ if (!closing) {
73
+ onPageChangeCancel();
74
+ return;
75
+ }
76
+ clearKeyboardTimeout();
77
+ if (!gesture) {
78
+ // Always dismiss input, even if we don't have a ref to it
79
+ // We might not have the ref if onPageChangeStart was never called
80
+ // This can happen if page change was not from a gesture
81
+ Keyboard.dismiss();
82
+ } else if (active) {
83
+ const input = previouslyFocusedTextInputRef.current;
84
+
85
+ // Dismiss the keyboard only if an input was a focused before
86
+ // This makes sure we don't dismiss input on going back and focusing an input
87
+ input?.blur();
88
+ }
89
+
90
+ // Cleanup the ID on successful page change
91
+ previouslyFocusedTextInputRef.current = undefined;
92
+ }, [clearKeyboardTimeout, onPageChangeCancel]);
93
+
94
+ // Dismiss keyboard when screen loses focus (e.g. when pushing a new screen).
95
+ // This handles the "navigate forward" case so we don't dismiss the new screen's
96
+ // auto-focused input from handleTransition.
97
+ React.useLayoutEffect(() => {
98
+ if (enabledRef.current && !focused) {
99
+ Keyboard.dismiss();
100
+ }
101
+ }, [focused]);
102
+ React.useLayoutEffect(() => {
103
+ enabledRef.current = enabled;
104
+ });
81
105
  React.useEffect(() => {
82
106
  return () => clearKeyboardTimeout();
83
107
  }, [clearKeyboardTimeout]);
@@ -1 +1 @@
1
- {"version":3,"names":["React","Keyboard","TextInput","useKeyboardManager","isEnabled","previouslyFocusedTextInputRef","useRef","undefined","startTimestampRef","keyboardTimeoutRef","clearKeyboardTimeout","useCallback","current","clearTimeout","onPageChangeStart","input","State","currentlyFocusedInput","blur","Date","now","onPageChangeConfirm","force","dismiss","onPageChangeCancel","setTimeout","focus","useEffect"],"sourceRoot":"../../../src","sources":["utils/useKeyboardManager.tsx"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["React","Keyboard","TextInput","useKeyboardManager","enabled","focused","previouslyFocusedTextInputRef","useRef","undefined","startTimestampRef","keyboardTimeoutRef","enabledRef","clearKeyboardTimeout","useCallback","current","clearTimeout","onPageChangeStart","input","State","currentlyFocusedInput","blur","Date","now","onPageChangeCancel","setTimeout","focus","onPageChangeConfirm","gesture","active","closing","dismiss","useLayoutEffect","useEffect"],"sourceRoot":"../../../src","sources":["utils/useKeyboardManager.tsx"],"mappings":"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","ignoreList":[]}
@@ -36,8 +36,8 @@ export const Header = /*#__PURE__*/React.memo(function Header({
36
36
  });
37
37
  }
38
38
  }, 50), [navigation, route.key]);
39
- const isModal = React.useContext(ModalPresentationContext);
40
- const isParentHeaderShown = React.useContext(HeaderShownContext);
39
+ const isModal = React.use(ModalPresentationContext);
40
+ const isParentHeaderShown = React.use(HeaderShownContext);
41
41
  const statusBarHeight = options.headerStatusBarHeight !== undefined ? options.headerStatusBarHeight : isModal || isParentHeaderShown ? 0 : insets.top;
42
42
  return /*#__PURE__*/_jsx(HeaderSegment, {
43
43
  ...options,
@@ -1 +1 @@
1
- {"version":3,"names":["getHeaderTitle","HeaderShownContext","StackActions","React","useSafeAreaInsets","ModalPresentationContext","throttle","HeaderSegment","jsx","_jsx","Header","memo","back","progress","options","route","navigation","styleInterpolator","insets","previousTitle","headerBackTitle","undefined","title","goBack","useCallback","isFocused","canGoBack","dispatch","pop","source","key","isModal","useContext","isParentHeaderShown","statusBarHeight","headerStatusBarHeight","top","name","modal","onGoBack","backHref","href"],"sourceRoot":"../../../../src","sources":["views/Header/Header.tsx"],"mappings":";;AAAA,SAASA,cAAc,EAAEC,kBAAkB,QAAQ,4BAA4B;AAC/E,SAASC,YAAY,QAAQ,0BAA0B;AACvD,OAAO,KAAKC,KAAK,MAAM,OAAO;AAC9B,SAASC,iBAAiB,QAAQ,gCAAgC;AAGlE,SAASC,wBAAwB,QAAQ,yCAAsC;AAC/E,SAASC,QAAQ,QAAQ,yBAAsB;AAC/C,SAASC,aAAa,QAAQ,oBAAiB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAEhD,OAAO,MAAMC,MAAM,gBAAGP,KAAK,CAACQ,IAAI,CAAC,SAASD,MAAMA,CAAC;EAC/CE,IAAI;EACJC,QAAQ;EACRC,OAAO;EACPC,KAAK;EACLC,UAAU;EACVC;AACgB,CAAC,EAAE;EACnB,MAAMC,MAAM,GAAGd,iBAAiB,CAAC,CAAC;EAElC,IAAIe,aAAa;;EAEjB;EACA;EACA,IAAIL,OAAO,CAACM,eAAe,KAAKC,SAAS,EAAE;IACzCF,aAAa,GAAGL,OAAO,CAACM,eAAe;EACzC,CAAC,MAAM,IAAIR,IAAI,EAAE;IACfO,aAAa,GAAGP,IAAI,CAACU,KAAK;EAC5B;;EAEA;EACA,MAAMC,MAAM,GAAGpB,KAAK,CAACqB,WAAW,CAC9BlB,QAAQ,CAAC,MAAM;IACb,IAAIU,UAAU,CAACS,SAAS,CAAC,CAAC,IAAIT,UAAU,CAACU,SAAS,CAAC,CAAC,EAAE;MACpDV,UAAU,CAACW,QAAQ,CAAC;QAClB,GAAGzB,YAAY,CAAC0B,GAAG,CAAC,CAAC;QACrBC,MAAM,EAAEd,KAAK,CAACe;MAChB,CAAC,CAAC;IACJ;EACF,CAAC,EAAE,EAAE,CAAC,EACN,CAACd,UAAU,EAAED,KAAK,CAACe,GAAG,CACxB,CAAC;EAED,MAAMC,OAAO,GAAG5B,KAAK,CAAC6B,UAAU,CAAC3B,wBAAwB,CAAC;EAC1D,MAAM4B,mBAAmB,GAAG9B,KAAK,CAAC6B,UAAU,CAAC/B,kBAAkB,CAAC;EAEhE,MAAMiC,eAAe,GACnBpB,OAAO,CAACqB,qBAAqB,KAAKd,SAAS,GACvCP,OAAO,CAACqB,qBAAqB,GAC7BJ,OAAO,IAAIE,mBAAmB,GAC5B,CAAC,GACDf,MAAM,CAACkB,GAAG;EAElB,oBACE3B,IAAA,CAACF,aAAa;IAAA,GACRO,OAAO;IACXQ,KAAK,EAAEtB,cAAc,CAACc,OAAO,EAAEC,KAAK,CAACsB,IAAI,CAAE;IAC3CxB,QAAQ,EAAEA,QAAS;IACnByB,KAAK,EAAEP,OAAQ;IACfX,eAAe,EACbN,OAAO,CAACM,eAAe,KAAKC,SAAS,GACjCP,OAAO,CAACM,eAAe,GACvBD,aACL;IACDgB,qBAAqB,EAAED,eAAgB;IACvCK,QAAQ,EAAE3B,IAAI,GAAGW,MAAM,GAAGF,SAAU;IACpCmB,QAAQ,EAAE5B,IAAI,GAAGA,IAAI,CAAC6B,IAAI,GAAGpB,SAAU;IACvCJ,iBAAiB,EAAEA;EAAkB,CACtC,CAAC;AAEN,CAAC,CAAC","ignoreList":[]}
1
+ {"version":3,"names":["getHeaderTitle","HeaderShownContext","StackActions","React","useSafeAreaInsets","ModalPresentationContext","throttle","HeaderSegment","jsx","_jsx","Header","memo","back","progress","options","route","navigation","styleInterpolator","insets","previousTitle","headerBackTitle","undefined","title","goBack","useCallback","isFocused","canGoBack","dispatch","pop","source","key","isModal","use","isParentHeaderShown","statusBarHeight","headerStatusBarHeight","top","name","modal","onGoBack","backHref","href"],"sourceRoot":"../../../../src","sources":["views/Header/Header.tsx"],"mappings":";;AAAA,SAASA,cAAc,EAAEC,kBAAkB,QAAQ,4BAA4B;AAC/E,SAASC,YAAY,QAAQ,0BAA0B;AACvD,OAAO,KAAKC,KAAK,MAAM,OAAO;AAC9B,SAASC,iBAAiB,QAAQ,gCAAgC;AAGlE,SAASC,wBAAwB,QAAQ,yCAAsC;AAC/E,SAASC,QAAQ,QAAQ,yBAAsB;AAC/C,SAASC,aAAa,QAAQ,oBAAiB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAEhD,OAAO,MAAMC,MAAM,gBAAGP,KAAK,CAACQ,IAAI,CAAC,SAASD,MAAMA,CAAC;EAC/CE,IAAI;EACJC,QAAQ;EACRC,OAAO;EACPC,KAAK;EACLC,UAAU;EACVC;AACgB,CAAC,EAAE;EACnB,MAAMC,MAAM,GAAGd,iBAAiB,CAAC,CAAC;EAElC,IAAIe,aAAa;;EAEjB;EACA;EACA,IAAIL,OAAO,CAACM,eAAe,KAAKC,SAAS,EAAE;IACzCF,aAAa,GAAGL,OAAO,CAACM,eAAe;EACzC,CAAC,MAAM,IAAIR,IAAI,EAAE;IACfO,aAAa,GAAGP,IAAI,CAACU,KAAK;EAC5B;;EAEA;EACA,MAAMC,MAAM,GAAGpB,KAAK,CAACqB,WAAW,CAC9BlB,QAAQ,CAAC,MAAM;IACb,IAAIU,UAAU,CAACS,SAAS,CAAC,CAAC,IAAIT,UAAU,CAACU,SAAS,CAAC,CAAC,EAAE;MACpDV,UAAU,CAACW,QAAQ,CAAC;QAClB,GAAGzB,YAAY,CAAC0B,GAAG,CAAC,CAAC;QACrBC,MAAM,EAAEd,KAAK,CAACe;MAChB,CAAC,CAAC;IACJ;EACF,CAAC,EAAE,EAAE,CAAC,EACN,CAACd,UAAU,EAAED,KAAK,CAACe,GAAG,CACxB,CAAC;EAED,MAAMC,OAAO,GAAG5B,KAAK,CAAC6B,GAAG,CAAC3B,wBAAwB,CAAC;EACnD,MAAM4B,mBAAmB,GAAG9B,KAAK,CAAC6B,GAAG,CAAC/B,kBAAkB,CAAC;EAEzD,MAAMiC,eAAe,GACnBpB,OAAO,CAACqB,qBAAqB,KAAKd,SAAS,GACvCP,OAAO,CAACqB,qBAAqB,GAC7BJ,OAAO,IAAIE,mBAAmB,GAC5B,CAAC,GACDf,MAAM,CAACkB,GAAG;EAElB,oBACE3B,IAAA,CAACF,aAAa;IAAA,GACRO,OAAO;IACXQ,KAAK,EAAEtB,cAAc,CAACc,OAAO,EAAEC,KAAK,CAACsB,IAAI,CAAE;IAC3CxB,QAAQ,EAAEA,QAAS;IACnByB,KAAK,EAAEP,OAAQ;IACfX,eAAe,EACbN,OAAO,CAACM,eAAe,KAAKC,SAAS,GACjCP,OAAO,CAACM,eAAe,GACvBD,aACL;IACDgB,qBAAqB,EAAED,eAAgB;IACvCK,QAAQ,EAAE3B,IAAI,GAAGW,MAAM,GAAGF,SAAU;IACpCmB,QAAQ,EAAE5B,IAAI,GAAGA,IAAI,CAAC6B,IAAI,GAAGpB,SAAU;IACvCJ,iBAAiB,EAAEA;EAAkB,CACtC,CAAC;AAEN,CAAC,CAAC","ignoreList":[]}
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
 
3
3
  import { getHeaderTitle, HeaderBackContext } from '@react-navigation/elements';
4
+ import { ActivityView } from '@react-navigation/elements/internal';
4
5
  import { NavigationProvider, useLinkBuilder } from '@react-navigation/native';
5
6
  import * as React from 'react';
6
7
  import { StyleSheet, View } from 'react-native';
@@ -16,7 +17,7 @@ export function HeaderContainer({
16
17
  style
17
18
  }) {
18
19
  const focusedRoute = getFocusedRoute();
19
- const parentHeaderBack = React.useContext(HeaderBackContext);
20
+ const parentHeaderBack = React.use(HeaderBackContext);
20
21
  const {
21
22
  buildHref
22
23
  } = useLinkBuilder();
@@ -98,15 +99,18 @@ export function HeaderContainer({
98
99
  height
99
100
  });
100
101
  } : undefined,
101
- "aria-hidden": !isFocused,
102
102
  style: [
103
103
  // Avoid positioning the focused header absolutely
104
104
  // Otherwise accessibility tools don't seem to be able to find it
105
105
  mode === 'float' && !isFocused || headerTransparent ? styles.header : null, {
106
106
  pointerEvents: isFocused ? 'box-none' : 'none'
107
107
  }],
108
- children: header !== undefined ? header(props) : /*#__PURE__*/_jsx(Header, {
109
- ...props
108
+ children: /*#__PURE__*/_jsx(ActivityView, {
109
+ mode: isFocused ? 'normal' : 'inert',
110
+ visible: true,
111
+ children: header !== undefined ? header(props) : /*#__PURE__*/_jsx(Header, {
112
+ ...props
113
+ })
110
114
  })
111
115
  })
112
116
  }, scene.descriptor.route.key);
@@ -1 +1 @@
1
- {"version":3,"names":["getHeaderTitle","HeaderBackContext","NavigationProvider","useLinkBuilder","React","StyleSheet","View","forNoAnimation","forSlideLeft","forSlideRight","forSlideUp","Header","jsx","_jsx","HeaderContainer","mode","scenes","getPreviousScene","getFocusedRoute","onContentHeightChange","style","focusedRoute","parentHeaderBack","useContext","buildHref","styles","container","children","slice","map","scene","i","self","length","header","headerMode","headerShown","headerTransparent","headerStyleInterpolator","descriptor","options","isFocused","key","route","previousScene","headerBack","title","name","href","params","previousDescriptor","nextDescriptor","previousHeaderShown","previousHeaderMode","nextHeaderlessScene","find","currentHeaderShown","currentHeaderMode","gestureDirection","nextHeaderlessGestureDirection","isHeaderStatic","props","back","progress","navigation","styleInterpolator","onLayout","e","height","nativeEvent","layout","undefined","pointerEvents","create","position","top","start","end"],"sourceRoot":"../../../../src","sources":["views/Header/HeaderContainer.tsx"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["getHeaderTitle","HeaderBackContext","ActivityView","NavigationProvider","useLinkBuilder","React","StyleSheet","View","forNoAnimation","forSlideLeft","forSlideRight","forSlideUp","Header","jsx","_jsx","HeaderContainer","mode","scenes","getPreviousScene","getFocusedRoute","onContentHeightChange","style","focusedRoute","parentHeaderBack","use","buildHref","styles","container","children","slice","map","scene","i","self","length","header","headerMode","headerShown","headerTransparent","headerStyleInterpolator","descriptor","options","isFocused","key","route","previousScene","headerBack","title","name","href","params","previousDescriptor","nextDescriptor","previousHeaderShown","previousHeaderMode","nextHeaderlessScene","find","currentHeaderShown","currentHeaderMode","gestureDirection","nextHeaderlessGestureDirection","isHeaderStatic","props","back","progress","navigation","styleInterpolator","onLayout","e","height","nativeEvent","layout","undefined","pointerEvents","visible","create","position","top","start","end"],"sourceRoot":"../../../../src","sources":["views/Header/HeaderContainer.tsx"],"mappings":"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","ignoreList":[]}
@@ -20,7 +20,7 @@ export function HeaderSegment(props) {
20
20
  ...props
21
21
  }) : undefined,
22
22
  headerRight: right,
23
- headerBackImage,
23
+ headerBackIcon,
24
24
  headerBackTitle,
25
25
  headerBackButtonDisplayMode,
26
26
  headerBackTruncatedTitle,
@@ -70,7 +70,7 @@ export function HeaderSegment(props) {
70
70
  const headerLeft = left ? props => left({
71
71
  ...props,
72
72
  href: backHref,
73
- backImage: headerBackImage,
73
+ icon: headerBackIcon,
74
74
  accessibilityLabel: headerBackAccessibilityLabel,
75
75
  testID: headerBackTestID,
76
76
  allowFontScaling: headerBackAllowFontScaling,
@@ -1 +1 @@
1
- {"version":3,"names":["getDefaultHeaderHeight","Header","HeaderBackButton","HeaderTitle","useFrameSize","useLocale","React","StyleSheet","jsx","_jsx","HeaderSegment","props","direction","layout","frame","progress","modal","onGoBack","backHref","headerTitle","title","headerLeft","left","undefined","headerRight","right","headerBackImage","headerBackTitle","headerBackButtonDisplayMode","headerBackTruncatedTitle","headerBackAccessibilityLabel","headerBackTestID","headerBackAllowFontScaling","headerBackTitleStyle","headerTitleContainerStyle","headerLeftContainerStyle","headerRightContainerStyle","headerBackgroundContainerStyle","headerStyle","customHeaderStyle","headerStatusBarHeight","styleInterpolator","rest","defaultHeight","landscape","width","height","modalPresentation","topInset","flatten","headerHeight","titleStyle","leftButtonStyle","rightButtonStyle","backgroundStyle","useMemo","current","next","layouts","header","screen","href","backImage","accessibilityLabel","testID","allowFontScaling","onPress","label","truncatedLabel","labelStyle","canGoBack","Boolean"],"sourceRoot":"../../../../src","sources":["views/Header/HeaderSegment.tsx"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["getDefaultHeaderHeight","Header","HeaderBackButton","HeaderTitle","useFrameSize","useLocale","React","StyleSheet","jsx","_jsx","HeaderSegment","props","direction","layout","frame","progress","modal","onGoBack","backHref","headerTitle","title","headerLeft","left","undefined","headerRight","right","headerBackIcon","headerBackTitle","headerBackButtonDisplayMode","headerBackTruncatedTitle","headerBackAccessibilityLabel","headerBackTestID","headerBackAllowFontScaling","headerBackTitleStyle","headerTitleContainerStyle","headerLeftContainerStyle","headerRightContainerStyle","headerBackgroundContainerStyle","headerStyle","customHeaderStyle","headerStatusBarHeight","styleInterpolator","rest","defaultHeight","landscape","width","height","modalPresentation","topInset","flatten","headerHeight","titleStyle","leftButtonStyle","rightButtonStyle","backgroundStyle","useMemo","current","next","layouts","header","screen","href","icon","accessibilityLabel","testID","allowFontScaling","onPress","label","truncatedLabel","labelStyle","canGoBack","Boolean"],"sourceRoot":"../../../../src","sources":["views/Header/HeaderSegment.tsx"],"mappings":";;AAAA,SACEA,sBAAsB,EACtBC,MAAM,EACNC,gBAAgB,EAEhBC,WAAW,EACXC,YAAY,QACP,4BAA4B;AACnC,SAASC,SAAS,QAAQ,0BAA0B;AACpD,OAAO,KAAKC,KAAK,MAAM,OAAO;AAC9B,SAASC,UAAU,QAAwB,cAAc;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAkB1D,OAAO,SAASC,aAAaA,CAACC,KAAY,EAAE;EAC1C,MAAM;IAAEC;EAAU,CAAC,GAAGP,SAAS,CAAC,CAAC;EACjC,MAAMQ,MAAM,GAAGT,YAAY,CAAEU,KAAK,IAAKA,KAAK,EAAE,IAAI,CAAC;EAEnD,MAAM;IACJC,QAAQ;IACRC,KAAK;IACLC,QAAQ;IACRC,QAAQ;IACRC,WAAW,EAAEC,KAAK;IAClBC,UAAU,EAAEC,IAAI,GAAGL,QAAQ,GACtBN,KAA4B,iBAAKF,IAAA,CAACP,gBAAgB;MAAA,GAAKS;IAAK,CAAG,CAAC,GACjEY,SAAS;IACbC,WAAW,EAAEC,KAAK;IAClBC,cAAc;IACdC,eAAe;IACfC,2BAA2B;IAC3BC,wBAAwB;IACxBC,4BAA4B;IAC5BC,gBAAgB;IAChBC,0BAA0B;IAC1BC,oBAAoB;IACpBC,yBAAyB;IACzBC,wBAAwB;IACxBC,yBAAyB;IACzBC,8BAA8B;IAC9BC,WAAW,EAAEC,iBAAiB;IAC9BC,qBAAqB;IACrBC,iBAAiB;IACjB,GAAGC;EACL,CAAC,GAAG/B,KAAK;EAET,MAAMgC,aAAa,GAAG3C,sBAAsB,CAAC;IAC3C4C,SAAS,EAAE/B,MAAM,CAACgC,KAAK,GAAGhC,MAAM,CAACiC,MAAM;IACvCC,iBAAiB,EAAE/B,KAAK;IACxBgC,QAAQ,EAAER;EACZ,CAAC,CAAC;EAEF,MAAM;IAAEM,MAAM,GAAGH;EAAc,CAAC,GAAGpC,UAAU,CAAC0C,OAAO,CACnDV,iBAAiB,IAAI,CAAC,CACxB,CAAc;EAEd,MAAMW,YAAY,GAAG,OAAOJ,MAAM,KAAK,QAAQ,GAAGA,MAAM,GAAGH,aAAa;EAExE,MAAM;IAAEQ,UAAU;IAAEC,eAAe;IAAEC,gBAAgB;IAAEC;EAAgB,CAAC,GACtEhD,KAAK,CAACiD,OAAO,CACX,MACEd,iBAAiB,CAAC;IAChBe,OAAO,EAAE;MAAEzC,QAAQ,EAAEA,QAAQ,CAACyC;IAAQ,CAAC;IACvCC,IAAI,EAAE1C,QAAQ,CAAC0C,IAAI,IAAI;MAAE1C,QAAQ,EAAEA,QAAQ,CAAC0C;IAAK,CAAC;IAClD7C,SAAS;IACT8C,OAAO,EAAE;MACPC,MAAM,EAAE;QACNb,MAAM,EAAEI,YAAY;QACpBL,KAAK,EAAEhC,MAAM,CAACgC;MAChB,CAAC;MACDe,MAAM,EAAE/C;IACV;EACF,CAAC,CAAC,EACJ,CAAC4B,iBAAiB,EAAE1B,QAAQ,EAAEH,SAAS,EAAEsC,YAAY,EAAErC,MAAM,CAC/D,CAAC;EAEH,MAAMQ,UAA4C,GAAGC,IAAI,GACpDX,KAAK,IACJW,IAAI,CAAC;IACH,GAAGX,KAAK;IACRkD,IAAI,EAAE3C,QAAQ;IACd4C,IAAI,EAAEpC,cAAc;IACpBqC,kBAAkB,EAAEjC,4BAA4B;IAChDkC,MAAM,EAAEjC,gBAAgB;IACxBkC,gBAAgB,EAAEjC,0BAA0B;IAC5CkC,OAAO,EAAEjD,QAAQ;IACjBkD,KAAK,EAAExC,eAAe;IACtByC,cAAc,EAAEvC,wBAAwB;IACxCwC,UAAU,EAAEpC,oBAAoB;IAChCqC,SAAS,EAAEC,OAAO,CAACtD,QAAQ;EAC7B,CAAC,CAAC,GACJM,SAAS;EAEb,MAAMC,WAA8C,GAAGC,KAAK,GACvDd,KAAK,IACJc,KAAK,CAAC;IACJ,GAAGd,KAAK;IACR2D,SAAS,EAAEC,OAAO,CAACtD,QAAQ;EAC7B,CAAC,CAAC,GACJM,SAAS;EAEb,MAAMJ,WAA8C,GAClD,OAAOC,KAAK,KAAK,UAAU,GAAIT,KAAK,iBAAKF,IAAA,CAACN,WAAW;IAAA,GAAKQ;EAAK,CAAG,CAAC,GAAGS,KAAK;EAE7E,oBACEX,IAAA,CAACR,MAAM;IACLe,KAAK,EAAEA,KAAM;IACbG,WAAW,EAAEA,WAAY;IACzBE,UAAU,EAAEA,UAAW;IACvBG,WAAW,EAAEA,WAAY;IACzBU,yBAAyB,EAAE,CAACiB,UAAU,EAAEjB,yBAAyB,CAAE;IACnEC,wBAAwB,EAAE,CAACiB,eAAe,EAAEjB,wBAAwB,CAAE;IACtEC,yBAAyB,EAAE,CAACiB,gBAAgB,EAAEjB,yBAAyB,CAAE;IACzER,2BAA2B,EAAEA,2BAA4B;IACzDS,8BAA8B,EAAE,CAC9BiB,eAAe,EACfjB,8BAA8B,CAC9B;IACFC,WAAW,EAAEC,iBAAkB;IAC/BC,qBAAqB,EAAEA,qBAAsB;IAAA,GACzCE;EAAI,CACT,CAAC;AAEN","ignoreList":[]}
@@ -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 (didInitiallyAnimate.current) {
118
- // Make sure to re-open screen if it wasn't removed
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
- // Trigger an update after we dispatch the action to remove the screen
189
- // This will make sure that we check if the screen didn't get removed so we can cancel the animation
190
- forceUpdate();
191
- }, 32);
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(null);
215
- React.useEffect(() => {
216
- if (preloaded) {
217
- return;
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
- if (timeoutRef.current) {
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":";;AAAA,SAASA,KAAK,QAAQ,qCAAqC;AAE3D,OAAO,KAAKC,KAAK,MAAM,OAAO;AAC9B,SACEC,QAAQ,EACRC,QAAQ,EAERC,UAAU,EACVC,IAAI,QAEC,cAAc;AAErB,OAAOC,iBAAiB,MAAM,qBAAqB;AAQnD,SAASC,oBAAoB,QAAQ,qCAAkC;AACvE,SAASC,yBAAyB,QAAQ,0CAAuC;AACjF,SAASC,uBAAuB,QAAQ,wCAAqC;AAC7E,SAASC,qBAAqB,QAAQ,sCAAmC;AACzE,SAASC,cAAc,QAAQ,+BAA4B;AAC3D,SACEC,YAAY,EACZC,iBAAiB,QAEZ,mBAAmB;AAC1B,SAASC,WAAW,QAAQ,kBAAe;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AA0C5C,MAAMC,uBAAuB,GAAG,GAAG;AAEnC,MAAMC,IAAI,GAAG,CAAC;AACd,MAAMC,KAAK,GAAG,CAAC;AAEf,MAAMC,eAAe,GAAGnB,QAAQ,CAACoB,EAAE,KAAK,KAAK;AAE7C,MAAMC,eAAe,GACnBC,KAAuD,IACpD;EACH,IAAIA,KAAK,EAAE;IACT,MAAMC,cAAc,GAAGtB,UAAU,CAACuB,OAAO,CAACF,KAAK,CAAC;IAEhD,OAAO,SAAS,IAAIC,cAAc,IAAIA,cAAc,CAACE,OAAO,IAAI,IAAI;EACtE;EAEA,OAAO,KAAK;AACd,CAAC;AAED,MAAMC,iBAAiB,GAAGA,CAAC;EACzBC,OAAO,EAAEC,SAAS;EAClBC,MAAM,EAAEC,aAAa;EACrBC,gBAAgB,EAAEC,uBAAuB;EACzCC,SAAS,EAAEC,gBAAgB;EAC3BC,SAAS,EAAEC;AAOb,CAAC,KAAK;EACJ,IAAI,CAACR,SAAS,IAAI,CAACQ,WAAW,EAAE;IAC9B,OAAO,CAAC;EACV;EAEA,OAAO9B,uBAAuB,CAC5BwB,aAAa,EACbE,uBAAuB,EACvBE,gBAAgB,KAAK,KACvB,CAAC;AACH,CAAC;AAED,MAAMG,cAAc,GAAGA,CAAC;EACtBf;AAGF,CAAC,KAAMA,KAAK,gBAAGT,IAAA,CAACd,QAAQ,CAACG,IAAI;EAACoB,KAAK,EAAE,CAACgB,MAAM,CAACC,OAAO,EAAEjB,KAAK;AAAE,CAAE,CAAC,GAAG,IAAK;AAExE,SAASkB,IAAIA,CAAC;EACZC,aAAa,GAAG,KAAK;EACrBC,cAAc,GAAG,IAAI;EACrBC,qBAAqB,GAAG3B,uBAAuB;EAC/CuB,OAAO,GAAGF,cAAc;EACxBO,QAAQ;EACRC,kBAAkB;EAClBC,OAAO;EACPnB,OAAO;EACPoB,IAAI;EACJC,OAAO;EACPC,OAAO;EACPpB,MAAM;EACNqB,MAAM;EACNjB,SAAS;EACTkB,mBAAmB;EACnBpB,gBAAgB;EAChBqB,MAAM;EACNC,OAAO;EACPC,YAAY;EACZC,cAAc;EACdC,iBAAiB;EACjBC,YAAY;EACZC,QAAQ;EACRC,cAAc;EACdC,uBAAuB;EACvBC,cAAc;EACd1B,SAAS;EACT2B,iBAAiB;EACjBC,cAAc,EAAEC,oBAAoB;EACpCC;AACK,CAAC,EAAE;EACR,MAAM,GAAGC,WAAW,CAAC,GAAGpE,KAAK,CAACqE,UAAU,CAAEC,CAAC,IAAKA,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;EAEzD,MAAMC,mBAAmB,GAAGvE,KAAK,CAACwE,MAAM,CAAC,KAAK,CAAC;EAC/C,MAAMC,cAAc,GAAGzE,KAAK,CAACwE,MAAM,CAAqBE,SAAS,CAAC;EAElE,MAAMC,kBAAkB,GAAG3E,KAAK,CAACwE,MAAM,CAAqBE,SAAS,CAAC;EACtE,MAAME,yBAAyB,GAC7B5E,KAAK,CAACwE,MAAM,CAAgCE,SAAS,CAAC;EAExD,MAAM,CAAC5C,SAAS,CAAC,GAAG9B,KAAK,CAAC6E,QAAQ,CAAC,MAAM,IAAI5E,QAAQ,CAAC6E,KAAK,CAAC1D,KAAK,CAAC,CAAC;EAEnE,MAAM,CAAC2D,QAAQ,CAAC,GAAG/E,KAAK,CAAC6E,QAAQ,CAC/B,MACE,IAAI5E,QAAQ,CAAC6E,KAAK,CAChBrE,qBAAqB,CAACwB,gBAAgB,EAAEE,SAAS,KAAK,KAAK,CAC7D,CACJ,CAAC;EAED,MAAM,CAAC6C,UAAU,CAAC,GAAGhF,KAAK,CAAC6E,QAAQ,CAAC,OAAO;IACzCI,KAAK,EAAE,IAAIhF,QAAQ,CAAC6E,KAAK,CAAC/C,MAAM,CAACkD,KAAK,CAAC;IACvCC,MAAM,EAAE,IAAIjF,QAAQ,CAAC6E,KAAK,CAAC/C,MAAM,CAACmD,MAAM;EAC1C,CAAC,CAAC,CAAC;EAEH,MAAM,CAACC,SAAS,CAAC,GAAGnF,KAAK,CAAC6E,QAAQ,CAAC,MAAM,IAAI5E,QAAQ,CAAC6E,KAAK,CAAC1D,KAAK,CAAC,CAAC;EAEnE,MAAMgE,OAAO,GAAG/E,iBAAiB,CAC/B,CAAC;IACCwB,OAAO,EAAEwD,cAAc;IACvBC;EAIF,CAAC,KAAK;IACJ,MAAMC,OAAO,GAAG3D,iBAAiB,CAAC;MAChCC,OAAO,EAAEwD,cAAc;MACvBtD,MAAM;MACNE,gBAAgB;MAChBE,SAAS;MACTE;IACF,CAAC,CAAC;IAEFoC,cAAc,CAACvB,OAAO,GAAGqC,OAAO;IAChCzD,SAAS,CAAC0D,QAAQ,CAACH,cAAc,GAAGlE,IAAI,GAAGC,KAAK,CAAC;IAEjD,MAAMqE,IAAI,GAAGJ,cAAc,GAAGtB,cAAc,CAAC2B,KAAK,GAAG3B,cAAc,CAAC4B,IAAI;IACxE,MAAMC,SAAS,GACbH,IAAI,CAACG,SAAS,KAAK,QAAQ,GAAG3F,QAAQ,CAAC4F,MAAM,GAAG5F,QAAQ,CAAC6F,MAAM;IAEjEC,YAAY,CAACnB,yBAAyB,CAAC1B,OAAO,CAAC;IAE/C,IAAIyB,kBAAkB,CAACzB,OAAO,KAAKwB,SAAS,EAAE;MAC5CsB,oBAAoB,CAACrB,kBAAkB,CAACzB,OAAO,CAAC;IAClD;IAEAM,YAAY,GAAG;MACb3B,OAAO,EAAEwD,cAAc;MACvBlC,OAAO,EAAEmC,QAAQ,KAAKZ;IACxB,CAAC,CAAC;IAEF,MAAMuB,QAAQ,GAAGA,CAAA,KAAM;MACrB,IAAIZ,cAAc,EAAE;QAClB9B,OAAO,CAAC,CAAC;MACX,CAAC,MAAM;QACLD,MAAM,CAAC,CAAC;MACV;MAEAqB,kBAAkB,CAACzB,OAAO,GAAGgD,qBAAqB,CAAC,MAAM;QACvD,IAAI3B,mBAAmB,CAACrB,OAAO,EAAE;UAC/B;UACAkB,WAAW,CAAC,CAAC;QACf;MACF,CAAC,CAAC;IACJ,CAAC;IAED,IAAItB,QAAQ,EAAE;MACZ8C,SAAS,CAACzC,OAAO,EAAE;QACjB,GAAGsC,IAAI,CAACU,MAAM;QACdb,QAAQ;QACRC,OAAO;QACPlE,eAAe;QACf+E,aAAa,EAAE;MACjB,CAAC,CAAC,CAACC,KAAK,CAAC,CAAC;QAAEC;MAAS,CAAC,KAAK;QACzBP,YAAY,CAACnB,yBAAyB,CAAC1B,OAAO,CAAC;QAE/C,IAAIoD,QAAQ,EAAE;UACZL,QAAQ,CAAC,CAAC;QACZ;MACF,CAAC,CAAC;IACJ,CAAC,MAAM;MACLA,QAAQ,CAAC,CAAC;IACZ;EACF,CACF,CAAC;EAED,MAAMM,oBAAoB,GAAGlG,iBAAiB,CAC5C,CAAC;IAAEmG;EAA2C,CAAC,KAAK;IAClD,QAAQA,WAAW,CAACC,KAAK;MACvB,KAAK9F,YAAY,CAAC+F,MAAM;QACtBvB,SAAS,CAACK,QAAQ,CAACrE,IAAI,CAAC;QACxBsC,cAAc,GAAG,CAAC;QAClB;MACF,KAAK9C,YAAY,CAACgG,SAAS;MAC3B,KAAKhG,YAAY,CAACiG,MAAM;QAAE;UACxBzB,SAAS,CAACK,QAAQ,CAACpE,KAAK,CAAC;UAEzB,MAAMkE,QAAQ,GACZrD,gBAAgB,KAAK,UAAU,IAC/BA,gBAAgB,KAAK,mBAAmB,GACpCuE,WAAW,CAACK,SAAS,GACrBL,WAAW,CAACM,SAAS;UAE3B1B,OAAO,CAAC;YACNvD,OAAO;YACPyD;UACF,CAAC,CAAC;UAEF5B,iBAAiB,GAAG,CAAC;UACrB;QACF;MACA,KAAK/C,YAAY,CAACoG,GAAG;QAAE;UACrB5B,SAAS,CAACK,QAAQ,CAACpE,KAAK,CAAC;UAEzB,IAAI4F,QAAQ;UACZ,IAAIC,WAAW;UACf,IAAI3B,QAAQ;UAEZ,IACErD,gBAAgB,KAAK,UAAU,IAC/BA,gBAAgB,KAAK,mBAAmB,EACxC;YACA+E,QAAQ,GAAGjF,MAAM,CAACmD,MAAM;YACxB+B,WAAW,GAAGT,WAAW,CAACU,YAAY;YACtC5B,QAAQ,GAAGkB,WAAW,CAACK,SAAS;UAClC,CAAC,MAAM;YACLG,QAAQ,GAAGjF,MAAM,CAACkD,KAAK;YACvBgC,WAAW,GAAGT,WAAW,CAACW,YAAY;YACtC7B,QAAQ,GAAGkB,WAAW,CAACM,SAAS;UAClC;UAEA,MAAMM,WAAW,GACf,CAACH,WAAW,GAAG3B,QAAQ,GAAGzC,qBAAqB,IAC7CpC,qBAAqB,CAACwB,gBAAgB,EAAEE,SAAS,KAAK,KAAK,CAAC,GAC9D6E,QAAQ,GAAG,CAAC,GACR1B,QAAQ,KAAK,CAAC,IAAI2B,WAAW,KAAK,CAAC,GACnCpF,OAAO;UAEbuD,OAAO,CAAC;YAAEvD,OAAO,EAAEuF,WAAW;YAAE9B;UAAS,CAAC,CAAC;UAE3C,IAAI8B,WAAW,EAAE;YACf;YACA;YACAxC,yBAAyB,CAAC1B,OAAO,GAAGmE,UAAU,CAAC,MAAM;cACnD9D,OAAO,CAAC,CAAC;;cAET;cACA;cACAa,WAAW,CAAC,CAAC;YACf,CAAC,EAAE,EAAE,CAAC;UACR;UAEAT,YAAY,GAAG,CAAC;UAChB;QACF;IACF;EACF,CACF,CAAC;EAED3D,KAAK,CAACsH,eAAe,CAAC,MAAM;IAC1BtC,UAAU,CAACC,KAAK,CAACO,QAAQ,CAACzD,MAAM,CAACkD,KAAK,CAAC;IACvCD,UAAU,CAACE,MAAM,CAACM,QAAQ,CAACzD,MAAM,CAACmD,MAAM,CAAC;IACzCH,QAAQ,CAACS,QAAQ,CACf/E,qBAAqB,CAACwB,gBAAgB,EAAEE,SAAS,KAAK,KAAK,CAC7D,CAAC;EACH,CAAC,EAAE,CACDF,gBAAgB,EAChBE,SAAS,EACT4C,QAAQ,EACRC,UAAU,CAACC,KAAK,EAChBD,UAAU,CAACE,MAAM,EACjBnD,MAAM,CAACkD,KAAK,EACZlD,MAAM,CAACmD,MAAM,CACd,CAAC;EAEF,MAAMqC,gBAAgB,GAAGvH,KAAK,CAACwE,MAAM,CAO3B,IAAI,CAAC;EAEfxE,KAAK,CAACwH,SAAS,CAAC,MAAM;IACpB,OAAO,MAAM;MACX,IAAI7C,kBAAkB,CAACzB,OAAO,EAAE;QAC9B8C,oBAAoB,CAACrB,kBAAkB,CAACzB,OAAO,CAAC;MAClD;MAEA6C,YAAY,CAACnB,yBAAyB,CAAC1B,OAAO,CAAC;IACjD,CAAC;;IAED;EACF,CAAC,EAAE,EAAE,CAAC;EAEN,MAAMuE,UAAU,GAAGzH,KAAK,CAACwE,MAAM,CAAuC,IAAI,CAAC;EAE3ExE,KAAK,CAACwH,SAAS,CAAC,MAAM;IACpB,IAAInF,SAAS,EAAE;MACb;IACF;IAEA,IAAI,CAACkC,mBAAmB,CAACrB,OAAO,EAAE;MAChC;MACA;MACA;MACA;MACA;MACA,IAAIuE,UAAU,CAACvE,OAAO,EAAE;QACtB6C,YAAY,CAAC0B,UAAU,CAACvE,OAAO,CAAC;MAClC;MACAuE,UAAU,CAACvE,OAAO,GAAGmE,UAAU,CAAC,MAAM;QACpC9C,mBAAmB,CAACrB,OAAO,GAAG,IAAI;QAClCkC,OAAO,CAAC;UAAEvD;QAAQ,CAAC,CAAC;MACtB,CAAC,EAAE,CAAC,CAAC;IACP,CAAC,MAAM;MACL,MAAM6F,eAAe,GAAGH,gBAAgB,CAACrE,OAAO,EAAEF,OAAO;MACzD,MAAM2E,eAAe,GAAGJ,gBAAgB,CAACrE,OAAO,GAC5CtB,iBAAiB,CAAC2F,gBAAgB,CAACrE,OAAO,CAAC,GAC3C,IAAI;MAER,MAAMqC,OAAO,GAAG3D,iBAAiB,CAAC;QAChCC,OAAO;QACPE,MAAM;QACNE,gBAAgB;QAChBE,SAAS;QACTE;MACF,CAAC,CAAC;MAEF,IAAIsF,eAAe,KAAKpC,OAAO,IAAId,cAAc,CAACvB,OAAO,KAAKqC,OAAO,EAAE;QACrE;QACA;QACA;QACA;QACA;QACAH,OAAO,CAAC;UAAEvD;QAAQ,CAAC,CAAC;MACtB,CAAC,MAAM,IACL,OAAO6F,eAAe,KAAK,SAAS,IACpC1E,OAAO,IACP,CAAC0E,eAAe,EAChB;QACA;QACA;QACAvE,OAAO,CAACqC,QAAQ,CACdhF,uBAAuB,CAACuB,MAAM,EAAEE,gBAAgB,EAAEE,SAAS,KAAK,KAAK,CACvE,CAAC;QAEDiD,OAAO,CAAC;UAAEvD;QAAQ,CAAC,CAAC;MACtB;IACF;IAEA0F,gBAAgB,CAACrE,OAAO,GAAG;MACzBF,OAAO;MACPnB,OAAO;MACPE,MAAM;MACNE,gBAAgB;MAChBE,SAAS;MACTE;IACF,CAAC;EACH,CAAC,EAAE,CACD+C,OAAO,EACPvD,OAAO,EACPM,SAAS,EACTgB,OAAO,EACPlB,gBAAgB,EAChBF,MAAM,EACNiB,OAAO,EACPX,SAAS,CACV,CAAC;EAEF,MAAMuF,kBAAkB,GAAG5H,KAAK,CAAC6H,OAAO,CACtC,OAAO;IACLC,KAAK,EAAE/E,kBAAkB;IACzBG,OAAO,EAAE;MAAE6E,QAAQ,EAAE7E;IAAQ,CAAC;IAC9BD,IAAI,EAAEA,IAAI,IAAI;MAAE8E,QAAQ,EAAE9E;IAAK,CAAC;IAChCpB,OAAO,EAAEC,SAAS;IAClBkG,OAAO,EAAE7C,SAAS;IAClBJ,QAAQ;IACRkD,OAAO,EAAE;MACPC,MAAM,EAAEnG;IACV,CAAC;IACDqB,MAAM,EAAE;MACN+E,GAAG,EAAE/E,MAAM,CAAC+E,GAAG;MACfC,KAAK,EAAEhF,MAAM,CAACgF,KAAK;MACnBC,MAAM,EAAEjF,MAAM,CAACiF,MAAM;MACrBC,IAAI,EAAElF,MAAM,CAACkF;IACf;EACF,CAAC,CAAC,EACF,CACEvF,kBAAkB,EAClBG,OAAO,EACPD,IAAI,EACJnB,SAAS,EACTqD,SAAS,EACTJ,QAAQ,EACRhD,MAAM,EACNqB,MAAM,CAAC+E,GAAG,EACV/E,MAAM,CAACgF,KAAK,EACZhF,MAAM,CAACiF,MAAM,EACbjF,MAAM,CAACkF,IAAI,CAEf,CAAC;EAED,MAAM;IAAErE,cAAc;IAAEsE,SAAS;IAAEC,YAAY;IAAEC;EAAY,CAAC,GAC5DzI,KAAK,CAAC6H,OAAO,CACX,MAAM7D,iBAAiB,CAAC4D,kBAAkB,CAAC,EAC3C,CAAC5D,iBAAiB,EAAE4D,kBAAkB,CACxC,CAAC;EAEH,MAAMc,cAAc,GAAG1I,KAAK,CAAC6H,OAAO,CAClC,MACEjF,cAAc,GACV3C,QAAQ,CAAC0I,KAAK,CACZ,CACE;IACEnC,WAAW,EACTvE,gBAAgB,KAAK,UAAU,IAC/BA,gBAAgB,KAAK,mBAAmB,GACpC;MAAEiF,YAAY,EAAE/D;IAAQ,CAAC,GACzB;MAAEgE,YAAY,EAAEhE;IAAQ;EAChC,CAAC,CACF,EACD;IAAE9B;EAAgB,CACpB,CAAC,GACDqD,SAAS,EACf,CAACvB,OAAO,EAAElB,gBAAgB,EAAEW,cAAc,CAC5C,CAAC;EAED,MAAM;IAAEgG;EAAgB,CAAC,GAAGzI,UAAU,CAACuB,OAAO,CAACyC,YAAY,IAAI,CAAC,CAAC,CAAC;EAElE,MAAM0E,aAAa,GACjB,OAAOD,eAAe,KAAK,QAAQ,GAC/BA,eAAe,KAAK,aAAa,IACjC7I,KAAK,CAAC6I,eAAe,CAAC,EAAEE,KAAK,CAAC,CAAC,KAAK,CAAC,GACrC,KAAK;EAEX,oBACE7H,KAAA,CAACX,oBAAoB,CAACyI,QAAQ;IAACC,KAAK,EAAEpB,kBAAmB;IAAAhE,QAAA,GACtD1D,QAAQ,CAACoB,EAAE,KAAK,KAAK,gBACpBP,IAAA,CAACd,QAAQ,CAACG,IAAI;MACZoB,KAAK,EAAE;QACL;QACA;QACA;QACA;QACAG,OAAO,EAAEuB;MACX;MACA;MAAA;MACA+F,WAAW,EAAE;IAAM,CACpB,CAAC,GACA,IAAI,EACPpF,cAAc,gBACb9C,IAAA,CAACX,IAAI;MAACoB,KAAK,EAAE,CAACrB,UAAU,CAAC+I,YAAY,EAAE;QAAEC,aAAa,EAAE;MAAW,CAAC,CAAE;MAAAvF,QAAA,EACnEnB,OAAO,CAAC;QAAEjB,KAAK,EAAEgH;MAAa,CAAC;IAAC,CAC7B,CAAC,GACL,IAAI,eACRzH,IAAA,CAACd,QAAQ,CAACG,IAAI;MACZoB,KAAK,EAAE,CAACgB,MAAM,CAAC4G,SAAS,EAAEnF,cAAc,EAAEC,oBAAoB,CAAE;MAAAN,QAAA,eAEhE7C,IAAA,CAACH,iBAAiB;QAChByI,OAAO,EAAEtH,MAAM,CAACkD,KAAK,KAAK,CAAC,IAAIrC,cAAe;QAC9C8F,cAAc,EAAEA,cAAe;QAC/BY,oBAAoB,EAAE/C,oBAAqB;QAAA,GACvChG,yBAAyB,CAAC;UAC5BwB,MAAM;UACNI,SAAS;UACTF,gBAAgB;UAChB6B;QACF,CAAC,CAAC;QAAAF,QAAA,eAEF3C,KAAA,CAAChB,QAAQ,CAACG,IAAI;UACZmJ,8BAA8B,EAAEhI,eAAe,CAACgH,SAAS,CAAE;UAC3D/G,KAAK,EAAE,CAACgB,MAAM,CAAC4G,SAAS,EAAEb,SAAS,CAAE;UAAA3E,QAAA,GAEpCjB,aAAa,IAAI8F,WAAW,IAAI,CAACI,aAAa,gBAC7C9H,IAAA,CAACd,QAAQ,CAACG,IAAI;YACZoB,KAAK,EAAE,CACLgB,MAAM,CAACgH,MAAM,EACbvH,gBAAgB,KAAK,YAAY,GAC7B,CAACO,MAAM,CAACiH,gBAAgB,EAAEjH,MAAM,CAACkH,WAAW,CAAC,GAC7CzH,gBAAgB,KAAK,qBAAqB,GACxC,CAACO,MAAM,CAACiH,gBAAgB,EAAEjH,MAAM,CAACmH,SAAS,CAAC,GAC3C1H,gBAAgB,KAAK,UAAU,GAC7B,CAACO,MAAM,CAACoH,cAAc,EAAEpH,MAAM,CAACqH,SAAS,CAAC,GACzC,CAACrH,MAAM,CAACoH,cAAc,EAAEpH,MAAM,CAACsH,YAAY,CAAC,EACpD;cAAElB;YAAgB,CAAC,EACnBH,WAAW;UACX,CACH,CAAC,GACA,IAAI,eACR1H,IAAA,CAACF,WAAW;YACVwI,OAAO,EAAEhG,mBAAoB;YAC7BtB,MAAM,EAAEA,MAAO;YACfP,KAAK,EAAE2C,YAAa;YAAAP,QAAA,EAEnBA;UAAQ,CACE,CAAC;QAAA,CACD;MAAC,CACC;IAAC,CACP,CAAC;EAAA,CACa,CAAC;AAEpC;AAEA,SAASlB,IAAI;AAEb,MAAMF,MAAM,GAAGrC,UAAU,CAAC4J,MAAM,CAAC;EAC/BX,SAAS,EAAE;IACTY,IAAI,EAAE,CAAC;IACPb,aAAa,EAAE;EACjB,CAAC;EACD1G,OAAO,EAAE;IACPuH,IAAI,EAAE,CAAC;IACPpB,eAAe,EAAE,MAAM;IACvBO,aAAa,EAAE;EACjB,CAAC;EACDK,MAAM,EAAE;IACNS,QAAQ,EAAE,UAAU;IACpBd,aAAa,EAAE;EACjB,CAAC;EACDM,gBAAgB,EAAE;IAChBtB,GAAG,EAAE,CAAC;IACNE,MAAM,EAAE,CAAC;IACTpD,KAAK,EAAE,CAAC;IACR,GAAGvE,cAAc,CAAC;MAChBwJ,MAAM,EAAE;QACNjF,KAAK,EAAE,CAAC,CAAC;QACTC,MAAM,EAAE;MACV,CAAC;MACDiF,MAAM,EAAE,CAAC;MACTxI,OAAO,EAAE;IACX,CAAC;EACH,CAAC;EACD+H,WAAW,EAAE;IACXrD,KAAK,EAAE;EACT,CAAC;EACDsD,SAAS,EAAE;IACTS,GAAG,EAAE;EACP,CAAC;EACDR,cAAc,EAAE;IACdvD,KAAK,EAAE,CAAC;IACR+D,GAAG,EAAE,CAAC;IACNlF,MAAM,EAAE,CAAC;IACT,GAAGxE,cAAc,CAAC;MAChBwJ,MAAM,EAAE;QACNjF,KAAK,EAAE,CAAC;QACRC,MAAM,EAAE,CAAC;MACX,CAAC;MACDiF,MAAM,EAAE,CAAC;MACTxI,OAAO,EAAE;IACX,CAAC;EACH,CAAC;EACDkI,SAAS,EAAE;IACT1B,GAAG,EAAE;EACP,CAAC;EACD2B,YAAY,EAAE;IACZzB,MAAM,EAAE;EACV;AACF,CAAC,CAAC","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":[]}
@@ -8,7 +8,6 @@ export const CardA11yWrapper = /*#__PURE__*/React.forwardRef(({
8
8
  active,
9
9
  animated,
10
10
  isNextScreenTransparent,
11
- detachCurrentScreen,
12
11
  children
13
12
  }, ref) => {
14
13
  // Manage this in separate component to avoid re-rendering card during gestures
@@ -17,7 +16,7 @@ export const CardA11yWrapper = /*#__PURE__*/React.forwardRef(({
17
16
  React.useImperativeHandle(ref, () => ({
18
17
  setInert
19
18
  }), []);
20
- const isHidden = !animated && isNextScreenTransparent === false && detachCurrentScreen !== false && !focused;
19
+ const isHidden = !animated && isNextScreenTransparent === false && !focused;
21
20
  return /*#__PURE__*/_jsx(View, {
22
21
  "aria-hidden": !focused,
23
22
  style: [StyleSheet.absoluteFill, {
@@ -1 +1 @@
1
- {"version":3,"names":["React","Platform","StyleSheet","View","jsx","_jsx","CardA11yWrapper","forwardRef","focused","active","animated","isNextScreenTransparent","detachCurrentScreen","children","ref","inert","setInert","useState","useImperativeHandle","isHidden","style","absoluteFill","pointerEvents","overflow","undefined","display","OS","visibility","collapsable","displayName"],"sourceRoot":"../../../../src","sources":["views/Stack/CardA11yWrapper.tsx"],"mappings":";;AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAC9B,SAASC,QAAQ,EAAEC,UAAU,EAAEC,IAAI,QAAQ,cAAc;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAa1D,OAAO,MAAMC,eAAe,gBAAGN,KAAK,CAACO,UAAU,CAC7C,CACE;EACEC,OAAO;EACPC,MAAM;EACNC,QAAQ;EACRC,uBAAuB;EACvBC,mBAAmB;EACnBC;AACK,CAAC,EACRC,GAAkC,KAC/B;EACH;EACA;EACA,MAAM,CAACC,KAAK,EAAEC,QAAQ,CAAC,GAAGhB,KAAK,CAACiB,QAAQ,CAAC,KAAK,CAAC;EAE/CjB,KAAK,CAACkB,mBAAmB,CAACJ,GAAG,EAAE,OAAO;IAAEE;EAAS,CAAC,CAAC,EAAE,EAAE,CAAC;EAExD,MAAMG,QAAQ,GACZ,CAACT,QAAQ,IACTC,uBAAuB,KAAK,KAAK,IACjCC,mBAAmB,KAAK,KAAK,IAC7B,CAACJ,OAAO;EAEV,oBACEH,IAAA,CAACF,IAAI;IACH,eAAa,CAACK,OAAQ;IACtBY,KAAK,EAAE,CACLlB,UAAU,CAACmB,YAAY,EACvB;MACEC,aAAa,EAAE,CAACZ,QAAQ,GAAGK,KAAK,GAAG,CAACP,OAAO,IAAI,MAAM,GAAG,UAAU;MAClE;MACA;MACAe,QAAQ,EAAEd,MAAM,GAAGe,SAAS,GAAG,QAAQ;MACvC;MACAC,OAAO,EAAExB,QAAQ,CAACyB,EAAE,KAAK,KAAK,IAAIP,QAAQ,GAAG,MAAM,GAAG,MAAM;MAC5D;MACA;MACA;MACAQ,UAAU,EAAER,QAAQ,GAAG,QAAQ,GAAG;IACpC,CAAC;IAEH;IACA;IAAA;IACAS,WAAW,EAAE,KAAM;IAAAf,QAAA,EAElBA;EAAQ,CACL,CAAC;AAEX,CACF,CAAC;AAEDP,eAAe,CAACuB,WAAW,GAAG,iBAAiB","ignoreList":[]}
1
+ {"version":3,"names":["React","Platform","StyleSheet","View","jsx","_jsx","CardA11yWrapper","forwardRef","focused","active","animated","isNextScreenTransparent","children","ref","inert","setInert","useState","useImperativeHandle","isHidden","style","absoluteFill","pointerEvents","overflow","undefined","display","OS","visibility","collapsable","displayName"],"sourceRoot":"../../../../src","sources":["views/Stack/CardA11yWrapper.tsx"],"mappings":";;AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAC9B,SAASC,QAAQ,EAAEC,UAAU,EAAEC,IAAI,QAAQ,cAAc;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAY1D,OAAO,MAAMC,eAAe,gBAAGN,KAAK,CAACO,UAAU,CAC7C,CACE;EAAEC,OAAO;EAAEC,MAAM;EAAEC,QAAQ;EAAEC,uBAAuB;EAAEC;AAAgB,CAAC,EACvEC,GAAkC,KAC/B;EACH;EACA;EACA,MAAM,CAACC,KAAK,EAAEC,QAAQ,CAAC,GAAGf,KAAK,CAACgB,QAAQ,CAAC,KAAK,CAAC;EAE/ChB,KAAK,CAACiB,mBAAmB,CAACJ,GAAG,EAAE,OAAO;IAAEE;EAAS,CAAC,CAAC,EAAE,EAAE,CAAC;EAExD,MAAMG,QAAQ,GAAG,CAACR,QAAQ,IAAIC,uBAAuB,KAAK,KAAK,IAAI,CAACH,OAAO;EAE3E,oBACEH,IAAA,CAACF,IAAI;IACH,eAAa,CAACK,OAAQ;IACtBW,KAAK,EAAE,CACLjB,UAAU,CAACkB,YAAY,EACvB;MACEC,aAAa,EAAE,CAACX,QAAQ,GAAGI,KAAK,GAAG,CAACN,OAAO,IAAI,MAAM,GAAG,UAAU;MAClE;MACA;MACAc,QAAQ,EAAEb,MAAM,GAAGc,SAAS,GAAG,QAAQ;MACvC;MACAC,OAAO,EAAEvB,QAAQ,CAACwB,EAAE,KAAK,KAAK,IAAIP,QAAQ,GAAG,MAAM,GAAG,MAAM;MAC5D;MACA;MACA;MACAQ,UAAU,EAAER,QAAQ,GAAG,QAAQ,GAAG;IACpC,CAAC;IAEH;IACA;IAAA;IACAS,WAAW,EAAE,KAAM;IAAAf,QAAA,EAElBA;EAAQ,CACL,CAAC;AAEX,CACF,CAAC;AAEDN,eAAe,CAACsB,WAAW,GAAG,iBAAiB","ignoreList":[]}
@@ -26,7 +26,6 @@ function CardContainerInner({
26
26
  onHeaderHeightChange,
27
27
  isParentHeaderShown,
28
28
  isNextScreenTransparent,
29
- detachCurrentScreen,
30
29
  layout,
31
30
  onCloseRoute,
32
31
  onOpenRoute,
@@ -41,24 +40,26 @@ function CardContainerInner({
41
40
  safeAreaInsetLeft,
42
41
  safeAreaInsetRight,
43
42
  safeAreaInsetTop,
44
- scene
43
+ scene,
44
+ children
45
45
  }) {
46
46
  const wrapperRef = React.useRef(null);
47
47
  const {
48
48
  direction
49
49
  } = useLocale();
50
- const parentHeaderHeight = React.useContext(HeaderHeightContext);
50
+ const parentHeaderHeight = React.use(HeaderHeightContext);
51
+ const {
52
+ options
53
+ } = scene.descriptor;
54
+ const enabled = focused && options.keyboardHandlingEnabled !== false;
51
55
  const {
52
56
  onPageChangeStart,
53
57
  onPageChangeCancel,
54
58
  onPageChangeConfirm
55
- } = useKeyboardManager(React.useCallback(() => {
56
- const {
57
- options,
58
- navigation
59
- } = scene.descriptor;
60
- return navigation.isFocused() && options.keyboardHandlingEnabled !== false;
61
- }, [scene.descriptor]));
59
+ } = useKeyboardManager({
60
+ enabled,
61
+ focused
62
+ });
62
63
  const handleOpen = () => {
63
64
  const {
64
65
  route
@@ -115,13 +116,11 @@ function CardContainerInner({
115
116
  const {
116
117
  route
117
118
  } = scene.descriptor;
118
- if (!gesture) {
119
- onPageChangeConfirm?.(true);
120
- } else if (active && closing) {
121
- onPageChangeConfirm?.(false);
122
- } else {
123
- onPageChangeCancel?.();
124
- }
119
+ onPageChangeConfirm?.({
120
+ gesture,
121
+ active,
122
+ closing
123
+ });
125
124
  onTransitionStart?.({
126
125
  route
127
126
  }, closing);
@@ -196,7 +195,6 @@ function CardContainerInner({
196
195
  active: active,
197
196
  animated: animated,
198
197
  isNextScreenTransparent: isNextScreenTransparent,
199
- detachCurrentScreen: detachCurrentScreen,
200
198
  children: /*#__PURE__*/_jsx(Card, {
201
199
  animated: animated,
202
200
  interpolationIndex: interpolationIndex,
@@ -250,7 +248,7 @@ function CardContainerInner({
250
248
  value: isParentHeaderShown || headerShown !== false,
251
249
  children: /*#__PURE__*/_jsx(HeaderHeightContext.Provider, {
252
250
  value: headerShown !== false ? headerHeight : parentHeaderHeight ?? 0,
253
- children: scene.descriptor.render()
251
+ children: children
254
252
  })
255
253
  })
256
254
  })