@react-navigation/stack 7.0.0-alpha.2 → 7.0.0-alpha.20
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/commonjs/TransitionConfigs/CardStyleInterpolators.js +29 -14
- package/lib/commonjs/TransitionConfigs/CardStyleInterpolators.js.map +1 -1
- package/lib/commonjs/TransitionConfigs/HeaderStyleInterpolators.js +19 -12
- package/lib/commonjs/TransitionConfigs/HeaderStyleInterpolators.js.map +1 -1
- package/lib/commonjs/TransitionConfigs/TransitionPresets.js +20 -22
- package/lib/commonjs/TransitionConfigs/TransitionPresets.js.map +1 -1
- package/lib/commonjs/TransitionConfigs/TransitionSpecs.js +7 -14
- package/lib/commonjs/TransitionConfigs/TransitionSpecs.js.map +1 -1
- package/lib/commonjs/index.js +2 -2
- package/lib/commonjs/index.js.map +1 -1
- package/lib/commonjs/navigators/createStackNavigator.js +35 -25
- package/lib/commonjs/navigators/createStackNavigator.js.map +1 -1
- package/lib/commonjs/types.js.map +1 -1
- package/lib/commonjs/utils/CardAnimationContext.js +3 -4
- package/lib/commonjs/utils/CardAnimationContext.js.map +1 -1
- package/lib/commonjs/utils/GestureHandlerRefContext.js +3 -4
- package/lib/commonjs/utils/GestureHandlerRefContext.js.map +1 -1
- package/lib/commonjs/utils/ModalPresentationContext.js +3 -4
- package/lib/commonjs/utils/ModalPresentationContext.js.map +1 -1
- package/lib/commonjs/utils/conditional.js.map +1 -1
- package/lib/commonjs/utils/debounce.js.map +1 -1
- package/lib/commonjs/utils/findLastIndex.js +1 -1
- package/lib/commonjs/utils/findLastIndex.js.map +1 -1
- package/lib/commonjs/utils/getDistanceForDirection.js +2 -2
- package/lib/commonjs/utils/getDistanceForDirection.js.map +1 -1
- package/lib/commonjs/utils/getInvertedMultiplier.js +3 -4
- package/lib/commonjs/utils/getInvertedMultiplier.js.map +1 -1
- package/lib/commonjs/utils/getModalRoutesKeys.js +17 -0
- package/lib/commonjs/utils/getModalRoutesKeys.js.map +1 -0
- package/lib/commonjs/utils/memoize.js.map +1 -1
- package/lib/commonjs/utils/useCardAnimation.js +2 -2
- package/lib/commonjs/utils/useCardAnimation.js.map +1 -1
- package/lib/commonjs/utils/useGestureHandlerRef.js +2 -2
- package/lib/commonjs/utils/useGestureHandlerRef.js.map +1 -1
- package/lib/commonjs/utils/useKeyboardManager.js +6 -6
- package/lib/commonjs/utils/useKeyboardManager.js.map +1 -1
- package/lib/commonjs/views/GestureHandler.android.js.map +1 -1
- package/lib/commonjs/views/GestureHandler.ios.js.map +1 -1
- package/lib/commonjs/views/GestureHandler.js +5 -8
- package/lib/commonjs/views/GestureHandler.js.map +1 -1
- package/lib/commonjs/views/GestureHandlerNative.js +2 -2
- package/lib/commonjs/views/GestureHandlerNative.js.map +1 -1
- package/lib/commonjs/views/Header/Header.js +4 -4
- package/lib/commonjs/views/Header/Header.js.map +1 -1
- package/lib/commonjs/views/Header/HeaderContainer.js +14 -11
- package/lib/commonjs/views/Header/HeaderContainer.js.map +1 -1
- package/lib/commonjs/views/Header/HeaderSegment.js +9 -2
- package/lib/commonjs/views/Header/HeaderSegment.js.map +1 -1
- package/lib/commonjs/views/Screens.js +2 -2
- package/lib/commonjs/views/Screens.js.map +1 -1
- package/lib/commonjs/views/Stack/Card.js +55 -48
- package/lib/commonjs/views/Stack/Card.js.map +1 -1
- package/lib/commonjs/views/Stack/CardContainer.js +27 -23
- package/lib/commonjs/views/Stack/CardContainer.js.map +1 -1
- package/lib/commonjs/views/Stack/CardSheet.js +24 -4
- package/lib/commonjs/views/Stack/CardSheet.js.map +1 -1
- package/lib/commonjs/views/Stack/CardStack.js +99 -73
- package/lib/commonjs/views/Stack/CardStack.js.map +1 -1
- package/lib/commonjs/views/Stack/StackView.js +27 -31
- package/lib/commonjs/views/Stack/StackView.js.map +1 -1
- package/lib/module/TransitionConfigs/CardStyleInterpolators.js +28 -14
- package/lib/module/TransitionConfigs/CardStyleInterpolators.js.map +1 -1
- package/lib/module/TransitionConfigs/HeaderStyleInterpolators.js +20 -13
- package/lib/module/TransitionConfigs/HeaderStyleInterpolators.js.map +1 -1
- package/lib/module/TransitionConfigs/TransitionPresets.js +10 -2
- package/lib/module/TransitionConfigs/TransitionPresets.js.map +1 -1
- package/lib/module/TransitionConfigs/TransitionSpecs.js.map +1 -1
- package/lib/module/index.js.map +1 -1
- package/lib/module/navigators/createStackNavigator.js +33 -22
- package/lib/module/navigators/createStackNavigator.js.map +1 -1
- package/lib/module/types.js.map +1 -1
- package/lib/module/utils/CardAnimationContext.js.map +1 -1
- package/lib/module/utils/GestureHandlerRefContext.js.map +1 -1
- package/lib/module/utils/ModalPresentationContext.js.map +1 -1
- package/lib/module/utils/conditional.js.map +1 -1
- package/lib/module/utils/debounce.js.map +1 -1
- package/lib/module/utils/findLastIndex.js +1 -1
- package/lib/module/utils/findLastIndex.js.map +1 -1
- package/lib/module/utils/getDistanceForDirection.js +2 -2
- package/lib/module/utils/getDistanceForDirection.js.map +1 -1
- package/lib/module/utils/getInvertedMultiplier.js +3 -4
- package/lib/module/utils/getInvertedMultiplier.js.map +1 -1
- package/lib/module/utils/getModalRoutesKeys.js +10 -0
- package/lib/module/utils/getModalRoutesKeys.js.map +1 -0
- package/lib/module/utils/memoize.js.map +1 -1
- package/lib/module/utils/useCardAnimation.js.map +1 -1
- package/lib/module/utils/useGestureHandlerRef.js.map +1 -1
- package/lib/module/utils/useKeyboardManager.js +4 -4
- package/lib/module/utils/useKeyboardManager.js.map +1 -1
- package/lib/module/views/GestureHandler.android.js.map +1 -1
- package/lib/module/views/GestureHandler.ios.js.map +1 -1
- package/lib/module/views/GestureHandler.js.map +1 -1
- package/lib/module/views/GestureHandlerNative.js.map +1 -1
- package/lib/module/views/Header/Header.js +1 -0
- package/lib/module/views/Header/Header.js.map +1 -1
- package/lib/module/views/Header/HeaderContainer.js +13 -10
- package/lib/module/views/Header/HeaderContainer.js.map +1 -1
- package/lib/module/views/Header/HeaderSegment.js +7 -0
- package/lib/module/views/Header/HeaderSegment.js.map +1 -1
- package/lib/module/views/Screens.js.map +1 -1
- package/lib/module/views/Stack/Card.js +52 -44
- package/lib/module/views/Stack/Card.js.map +1 -1
- package/lib/module/views/Stack/CardContainer.js +25 -20
- package/lib/module/views/Stack/CardContainer.js.map +1 -1
- package/lib/module/views/Stack/CardSheet.js +21 -0
- package/lib/module/views/Stack/CardSheet.js.map +1 -1
- package/lib/module/views/Stack/CardStack.js +95 -68
- package/lib/module/views/Stack/CardStack.js.map +1 -1
- package/lib/module/views/Stack/StackView.js +25 -29
- package/lib/module/views/Stack/StackView.js.map +1 -1
- package/lib/typescript/src/TransitionConfigs/CardStyleInterpolators.d.ts +4 -0
- package/lib/typescript/src/TransitionConfigs/CardStyleInterpolators.d.ts.map +1 -1
- package/lib/typescript/src/TransitionConfigs/HeaderStyleInterpolators.d.ts +3 -3
- package/lib/typescript/src/TransitionConfigs/HeaderStyleInterpolators.d.ts.map +1 -1
- package/lib/typescript/src/TransitionConfigs/TransitionPresets.d.ts +4 -0
- package/lib/typescript/src/TransitionConfigs/TransitionPresets.d.ts.map +1 -1
- package/lib/typescript/src/index.d.ts +1 -1
- package/lib/typescript/src/index.d.ts.map +1 -1
- package/lib/typescript/src/navigators/createStackNavigator.d.ts +15 -9
- package/lib/typescript/src/navigators/createStackNavigator.d.ts.map +1 -1
- package/lib/typescript/src/types.d.ts +70 -15
- package/lib/typescript/src/types.d.ts.map +1 -1
- package/lib/typescript/src/utils/getDistanceForDirection.d.ts +1 -1
- package/lib/typescript/src/utils/getDistanceForDirection.d.ts.map +1 -1
- package/lib/typescript/src/utils/getInvertedMultiplier.d.ts +1 -1
- package/lib/typescript/src/utils/getInvertedMultiplier.d.ts.map +1 -1
- package/lib/typescript/src/utils/getModalRoutesKeys.d.ts +4 -0
- package/lib/typescript/src/utils/getModalRoutesKeys.d.ts.map +1 -0
- package/lib/typescript/src/views/GestureHandlerNative.d.ts +3 -2
- package/lib/typescript/src/views/GestureHandlerNative.d.ts.map +1 -1
- package/lib/typescript/src/views/Header/Header.d.ts.map +1 -1
- package/lib/typescript/src/views/Header/HeaderContainer.d.ts +4 -3
- package/lib/typescript/src/views/Header/HeaderContainer.d.ts.map +1 -1
- package/lib/typescript/src/views/Header/HeaderSegment.d.ts +3 -1
- package/lib/typescript/src/views/Header/HeaderSegment.d.ts.map +1 -1
- package/lib/typescript/src/views/Screens.d.ts +4 -3
- package/lib/typescript/src/views/Screens.d.ts.map +1 -1
- package/lib/typescript/src/views/Stack/Card.d.ts +6 -5
- package/lib/typescript/src/views/Stack/Card.d.ts.map +1 -1
- package/lib/typescript/src/views/Stack/CardContainer.d.ts +3 -6
- package/lib/typescript/src/views/Stack/CardContainer.d.ts.map +1 -1
- package/lib/typescript/src/views/Stack/CardSheet.d.ts +1 -1
- package/lib/typescript/src/views/Stack/CardSheet.d.ts.map +1 -1
- package/lib/typescript/src/views/Stack/CardStack.d.ts +4 -5
- package/lib/typescript/src/views/Stack/CardStack.d.ts.map +1 -1
- package/lib/typescript/src/views/Stack/StackView.d.ts +9 -80
- package/lib/typescript/src/views/Stack/StackView.d.ts.map +1 -1
- package/package.json +19 -20
- package/src/TransitionConfigs/CardStyleInterpolators.tsx +18 -5
- package/src/TransitionConfigs/HeaderStyleInterpolators.tsx +32 -22
- package/src/TransitionConfigs/TransitionPresets.tsx +13 -4
- package/src/index.tsx +2 -0
- package/src/navigators/createStackNavigator.tsx +49 -14
- package/src/types.tsx +88 -15
- package/src/utils/findLastIndex.tsx +1 -1
- package/src/utils/getDistanceForDirection.tsx +3 -2
- package/src/utils/getInvertedMultiplier.tsx +4 -5
- package/src/utils/getModalRoutesKeys.ts +21 -0
- package/src/utils/useKeyboardManager.tsx +1 -1
- package/src/views/GestureHandlerNative.tsx +1 -1
- package/src/views/Header/Header.tsx +3 -2
- package/src/views/Header/HeaderContainer.tsx +19 -8
- package/src/views/Header/HeaderSegment.tsx +10 -3
- package/src/views/Screens.tsx +2 -1
- package/src/views/Stack/Card.tsx +82 -63
- package/src/views/Stack/CardContainer.tsx +20 -11
- package/src/views/Stack/CardSheet.tsx +25 -1
- package/src/views/Stack/CardStack.tsx +278 -193
- package/src/views/Stack/StackView.tsx +25 -28
- package/lib/commonjs/views/ModalStatusBarManager.js +0 -44
- package/lib/commonjs/views/ModalStatusBarManager.js.map +0 -1
- package/lib/module/views/ModalStatusBarManager.js +0 -36
- package/lib/module/views/ModalStatusBarManager.js.map +0 -1
- package/lib/typescript/src/views/ModalStatusBarManager.d.ts +0 -11
- package/lib/typescript/src/views/ModalStatusBarManager.d.ts.map +0 -1
- package/src/views/ModalStatusBarManager.tsx +0 -45
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["
|
|
1
|
+
{"version":3,"names":["_elements","require","_native","React","_interopRequireWildcard","_reactNativeSafeAreaContext","_debounce","_ModalPresentationContext","_HeaderSegment","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","_extends","assign","bind","target","arguments","length","source","key","apply","Header","exports","memo","_ref","back","layout","progress","options","route","navigation","styleInterpolator","insets","useSafeAreaInsets","previousTitle","headerBackTitle","undefined","title","goBack","useCallback","debounce","isFocused","canGoBack","dispatch","StackActions","pop","isModal","useContext","ModalPresentationContext","isParentHeaderShown","HeaderShownContext","statusBarHeight","headerStatusBarHeight","top","createElement","HeaderSegment","getHeaderTitle","name","modal","onGoBack","backHref","href"],"sourceRoot":"../../../../src","sources":["views/Header/Header.tsx"],"mappings":";;;;;;AAAA,IAAAA,SAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AACA,IAAAE,KAAA,GAAAC,uBAAA,CAAAH,OAAA;AACA,IAAAI,2BAAA,GAAAJ,OAAA;AAGA,IAAAK,SAAA,GAAAL,OAAA;AACA,IAAAM,yBAAA,GAAAN,OAAA;AACA,IAAAO,cAAA,GAAAP,OAAA;AAAgD,SAAAQ,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAN,wBAAAM,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAjB,CAAA,EAAAc,CAAA,SAAAI,CAAA,GAAAR,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAI,CAAA,KAAAA,CAAA,CAAAX,GAAA,IAAAW,CAAA,CAAAC,GAAA,IAAAR,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAI,CAAA,IAAAV,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAgB,GAAA,CAAAnB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAAA,SAAAY,SAAA,IAAAA,QAAA,GAAAT,MAAA,CAAAU,MAAA,GAAAV,MAAA,CAAAU,MAAA,CAAAC,IAAA,eAAAC,MAAA,aAAAL,CAAA,MAAAA,CAAA,GAAAM,SAAA,CAAAC,MAAA,EAAAP,CAAA,UAAAQ,MAAA,GAAAF,SAAA,CAAAN,CAAA,YAAAS,GAAA,IAAAD,MAAA,QAAAf,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAS,MAAA,EAAAC,GAAA,KAAAJ,MAAA,CAAAI,GAAA,IAAAD,MAAA,CAAAC,GAAA,gBAAAJ,MAAA,YAAAH,QAAA,CAAAQ,KAAA,OAAAJ,SAAA;AAEzC,MAAMK,MAAM,GAAAC,OAAA,CAAAD,MAAA,gBAAGpC,KAAK,CAACsC,IAAI,CAAC,SAASF,MAAMA,CAAAG,IAAA,EAQ3B;EAAA,IAR4B;IAC/CC,IAAI;IACJC,MAAM;IACNC,QAAQ;IACRC,OAAO;IACPC,KAAK;IACLC,UAAU;IACVC;EACgB,CAAC,GAAAP,IAAA;EACjB,MAAMQ,MAAM,GAAG,IAAAC,6CAAiB,EAAC,CAAC;EAElC,IAAIC,aAAa;;EAEjB;EACA;EACA,IAAIN,OAAO,CAACO,eAAe,KAAKC,SAAS,EAAE;IACzCF,aAAa,GAAGN,OAAO,CAACO,eAAe;EACzC,CAAC,MAAM,IAAIV,IAAI,EAAE;IACfS,aAAa,GAAGT,IAAI,CAACY,KAAK;EAC5B;;EAEA;EACA,MAAMC,MAAM,GAAGrD,KAAK,CAACsD,WAAW,CAC9B,IAAAC,kBAAQ,EAAC,MAAM;IACb,IAAIV,UAAU,CAACW,SAAS,CAAC,CAAC,IAAIX,UAAU,CAACY,SAAS,CAAC,CAAC,EAAE;MACpDZ,UAAU,CAACa,QAAQ,CAAC;QAClB,GAAGC,oBAAY,CAACC,GAAG,CAAC,CAAC;QACrB3B,MAAM,EAAEW,KAAK,CAACV;MAChB,CAAC,CAAC;IACJ;EACF,CAAC,EAAE,EAAE,CAAC,EACN,CAACW,UAAU,EAAED,KAAK,CAACV,GAAG,CACxB,CAAC;EAED,MAAM2B,OAAO,GAAG7D,KAAK,CAAC8D,UAAU,CAACC,kDAAwB,CAAC;EAC1D,MAAMC,mBAAmB,GAAGhE,KAAK,CAAC8D,UAAU,CAACG,4BAAkB,CAAC;EAEhE,MAAMC,eAAe,GACnBvB,OAAO,CAACwB,qBAAqB,KAAKhB,SAAS,GACvCR,OAAO,CAACwB,qBAAqB,GAC7BN,OAAO,IAAIG,mBAAmB,GAC5B,CAAC,GACDjB,MAAM,CAACqB,GAAG;EAElB,oBACEpE,KAAA,CAAAqE,aAAA,CAAChE,cAAA,CAAAiE,aAAa,EAAA3C,QAAA,KACRgB,OAAO;IACXS,KAAK,EAAE,IAAAmB,wBAAc,EAAC5B,OAAO,EAAEC,KAAK,CAAC4B,IAAI,CAAE;IAC3C9B,QAAQ,EAAEA,QAAS;IACnBD,MAAM,EAAEA,MAAO;IACfgC,KAAK,EAAEZ,OAAQ;IACfX,eAAe,EACbP,OAAO,CAACO,eAAe,KAAKC,SAAS,GACjCR,OAAO,CAACO,eAAe,GACvBD,aACL;IACDkB,qBAAqB,EAAED,eAAgB;IACvCQ,QAAQ,EAAElC,IAAI,GAAGa,MAAM,GAAGF,SAAU;IACpCwB,QAAQ,EAAEnC,IAAI,GAAGA,IAAI,CAACoC,IAAI,GAAGzB,SAAU;IACvCL,iBAAiB,EAAEA;EAAkB,EACtC,CAAC;AAEN,CAAC,CAAC"}
|
|
@@ -10,8 +10,8 @@ var React = _interopRequireWildcard(require("react"));
|
|
|
10
10
|
var _reactNative = require("react-native");
|
|
11
11
|
var _HeaderStyleInterpolators = require("../../TransitionConfigs/HeaderStyleInterpolators");
|
|
12
12
|
var _Header = require("./Header");
|
|
13
|
-
function _getRequireWildcardCache(
|
|
14
|
-
function _interopRequireWildcard(
|
|
13
|
+
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
14
|
+
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
15
15
|
function HeaderContainer(_ref) {
|
|
16
16
|
let {
|
|
17
17
|
mode,
|
|
@@ -24,11 +24,13 @@ function HeaderContainer(_ref) {
|
|
|
24
24
|
} = _ref;
|
|
25
25
|
const focusedRoute = getFocusedRoute();
|
|
26
26
|
const parentHeaderBack = React.useContext(_elements.HeaderBackContext);
|
|
27
|
+
const {
|
|
28
|
+
buildHref
|
|
29
|
+
} = (0, _native.useLinkBuilder)();
|
|
27
30
|
return /*#__PURE__*/React.createElement(_reactNative.Animated.View, {
|
|
28
31
|
pointerEvents: "box-none",
|
|
29
32
|
style: style
|
|
30
33
|
}, scenes.slice(-3).map((scene, i, self) => {
|
|
31
|
-
var _self, _self2;
|
|
32
34
|
if (mode === 'screen' && i !== self.length - 1 || !scene) {
|
|
33
35
|
return null;
|
|
34
36
|
}
|
|
@@ -53,18 +55,19 @@ function HeaderContainer(_ref) {
|
|
|
53
55
|
route
|
|
54
56
|
} = previousScene.descriptor;
|
|
55
57
|
headerBack = previousScene ? {
|
|
56
|
-
title: (0, _elements.getHeaderTitle)(options, route.name)
|
|
58
|
+
title: (0, _elements.getHeaderTitle)(options, route.name),
|
|
59
|
+
href: buildHref(route.name, route.params)
|
|
57
60
|
} : parentHeaderBack;
|
|
58
61
|
}
|
|
59
62
|
|
|
60
63
|
// If the screen is next to a headerless screen, we need to make the header appear static
|
|
61
64
|
// This makes the header look like it's moving with the screen
|
|
62
|
-
const previousDescriptor =
|
|
63
|
-
const nextDescriptor =
|
|
65
|
+
const previousDescriptor = self[i - 1]?.descriptor;
|
|
66
|
+
const nextDescriptor = self[i + 1]?.descriptor;
|
|
64
67
|
const {
|
|
65
68
|
headerShown: previousHeaderShown = true,
|
|
66
69
|
headerMode: previousHeaderMode
|
|
67
|
-
} =
|
|
70
|
+
} = previousDescriptor?.options || {};
|
|
68
71
|
|
|
69
72
|
// If any of the next screens don't have a header or header is part of the screen
|
|
70
73
|
// Then we need to move this header offscreen so that it doesn't cover it
|
|
@@ -72,12 +75,12 @@ function HeaderContainer(_ref) {
|
|
|
72
75
|
const {
|
|
73
76
|
headerShown: currentHeaderShown = true,
|
|
74
77
|
headerMode: currentHeaderMode
|
|
75
|
-
} =
|
|
78
|
+
} = scene?.descriptor.options || {};
|
|
76
79
|
return currentHeaderShown === false || currentHeaderMode === 'screen';
|
|
77
80
|
});
|
|
78
81
|
const {
|
|
79
82
|
gestureDirection: nextHeaderlessGestureDirection
|
|
80
|
-
} =
|
|
83
|
+
} = nextHeaderlessScene?.descriptor.options || {};
|
|
81
84
|
const isHeaderStatic = (previousHeaderShown === false || previousHeaderMode === 'screen') &&
|
|
82
85
|
// We still need to animate when coming back from next scene
|
|
83
86
|
// A hacky way to check this is if the next scene exists
|
|
@@ -120,8 +123,8 @@ const styles = _reactNative.StyleSheet.create({
|
|
|
120
123
|
header: {
|
|
121
124
|
position: 'absolute',
|
|
122
125
|
top: 0,
|
|
123
|
-
|
|
124
|
-
|
|
126
|
+
start: 0,
|
|
127
|
+
end: 0
|
|
125
128
|
}
|
|
126
129
|
});
|
|
127
130
|
//# sourceMappingURL=HeaderContainer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["HeaderContainer","mode","scenes","layout","getPreviousScene","getFocusedRoute","onContentHeightChange","style","focusedRoute","parentHeaderBack","
|
|
1
|
+
{"version":3,"names":["_elements","require","_native","React","_interopRequireWildcard","_reactNative","_HeaderStyleInterpolators","_Header","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","HeaderContainer","_ref","mode","scenes","layout","getPreviousScene","getFocusedRoute","onContentHeightChange","style","focusedRoute","parentHeaderBack","useContext","HeaderBackContext","buildHref","useLinkBuilder","createElement","Animated","View","pointerEvents","slice","map","scene","self","length","header","headerMode","headerShown","headerTransparent","headerStyleInterpolator","descriptor","options","isFocused","key","route","previousScene","headerBack","title","getHeaderTitle","name","href","params","previousDescriptor","nextDescriptor","previousHeaderShown","previousHeaderMode","nextHeaderlessScene","find","currentHeaderShown","currentHeaderMode","gestureDirection","nextHeaderlessGestureDirection","isHeaderStatic","props","back","progress","navigation","styleInterpolator","forSlideUp","forSlideRight","forSlideLeft","forNoAnimation","NavigationContext","Provider","value","NavigationRouteContext","onLayout","height","nativeEvent","undefined","accessibilityElementsHidden","importantForAccessibility","styles","Header","StyleSheet","create","position","top","start","end"],"sourceRoot":"../../../../src","sources":["views/Header/HeaderContainer.tsx"],"mappings":"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"}
|
|
@@ -5,13 +5,17 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.HeaderSegment = HeaderSegment;
|
|
7
7
|
var _elements = require("@react-navigation/elements");
|
|
8
|
+
var _native = require("@react-navigation/native");
|
|
8
9
|
var React = _interopRequireWildcard(require("react"));
|
|
9
10
|
var _reactNative = require("react-native");
|
|
10
11
|
var _memoize = require("../../utils/memoize");
|
|
11
|
-
function _getRequireWildcardCache(
|
|
12
|
-
function _interopRequireWildcard(
|
|
12
|
+
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
13
|
+
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
13
14
|
function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
|
|
14
15
|
function HeaderSegment(props) {
|
|
16
|
+
const {
|
|
17
|
+
direction
|
|
18
|
+
} = (0, _native.useLocale)();
|
|
15
19
|
const [leftLabelLayout, setLeftLabelLayout] = React.useState(undefined);
|
|
16
20
|
const [titleLayout, setTitleLayout] = React.useState(undefined);
|
|
17
21
|
const handleTitleLayout = e => {
|
|
@@ -49,6 +53,7 @@ function HeaderSegment(props) {
|
|
|
49
53
|
next: next && {
|
|
50
54
|
progress: next
|
|
51
55
|
},
|
|
56
|
+
direction,
|
|
52
57
|
layouts: {
|
|
53
58
|
header: {
|
|
54
59
|
height: headerHeight,
|
|
@@ -64,6 +69,7 @@ function HeaderSegment(props) {
|
|
|
64
69
|
layout,
|
|
65
70
|
modal,
|
|
66
71
|
onGoBack,
|
|
72
|
+
backHref,
|
|
67
73
|
headerTitle: title,
|
|
68
74
|
headerLeft: left = onGoBack ? props => /*#__PURE__*/React.createElement(_elements.HeaderBackButton, props) : undefined,
|
|
69
75
|
headerRight: right,
|
|
@@ -97,6 +103,7 @@ function HeaderSegment(props) {
|
|
|
97
103
|
} = getInterpolatedStyle(styleInterpolator, layout, progress.current, progress.next, titleLayout, headerBackTitle ? leftLabelLayout : undefined, typeof height === 'number' ? height : defaultHeight);
|
|
98
104
|
const headerLeft = left ? props => left({
|
|
99
105
|
...props,
|
|
106
|
+
href: backHref,
|
|
100
107
|
backImage: headerBackImage,
|
|
101
108
|
accessibilityLabel: headerBackAccessibilityLabel,
|
|
102
109
|
testID: headerBackTestID,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["HeaderSegment","props","
|
|
1
|
+
{"version":3,"names":["_elements","require","_native","React","_interopRequireWildcard","_reactNative","_memoize","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","_extends","assign","bind","target","arguments","length","source","key","apply","HeaderSegment","props","direction","useLocale","leftLabelLayout","setLeftLabelLayout","useState","undefined","titleLayout","setTitleLayout","handleTitleLayout","height","width","nativeEvent","layout","handleLeftLabelLayout","getInterpolatedStyle","memoize","styleInterpolator","current","next","headerHeight","progress","layouts","header","screen","title","leftLabel","modal","onGoBack","backHref","headerTitle","headerLeft","left","createElement","HeaderBackButton","headerRight","right","headerBackImage","headerBackTitle","headerBackTitleVisible","Platform","OS","headerTruncatedBackTitle","headerBackAccessibilityLabel","headerBackTestID","headerBackAllowFontScaling","headerBackTitleStyle","headerTitleContainerStyle","headerLeftContainerStyle","headerRightContainerStyle","headerBackgroundContainerStyle","headerStyle","customHeaderStyle","headerStatusBarHeight","rest","defaultHeight","getDefaultHeaderHeight","StyleSheet","flatten","titleStyle","leftButtonStyle","leftLabelStyle","rightButtonStyle","backgroundStyle","href","backImage","accessibilityLabel","testID","allowFontScaling","onPress","label","truncatedLabel","labelStyle","onLabelLayout","screenLayout","canGoBack","Boolean","HeaderTitle","onLayout","Header","headerLeftLabelVisible"],"sourceRoot":"../../../../src","sources":["views/Header/HeaderSegment.tsx"],"mappings":"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"}
|
|
@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.MaybeScreenContainer = exports.MaybeScreen = void 0;
|
|
7
7
|
var React = _interopRequireWildcard(require("react"));
|
|
8
8
|
var _reactNative = require("react-native");
|
|
9
|
-
function _getRequireWildcardCache(
|
|
10
|
-
function _interopRequireWildcard(
|
|
9
|
+
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
10
|
+
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
11
11
|
function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
|
|
12
12
|
let Screens;
|
|
13
13
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["
|
|
1
|
+
{"version":3,"names":["React","_interopRequireWildcard","require","_reactNative","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","_extends","assign","bind","target","arguments","length","source","key","apply","Screens","MaybeScreenContainer","_ref","enabled","rest","createElement","ScreenContainer","View","exports","MaybeScreen","_ref2","active","Screen","activityState"],"sourceRoot":"../../../src","sources":["views/Screens.tsx"],"mappings":"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"}
|
|
@@ -3,20 +3,18 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.
|
|
6
|
+
exports.Card = void 0;
|
|
7
7
|
var _color = _interopRequireDefault(require("color"));
|
|
8
8
|
var React = _interopRequireWildcard(require("react"));
|
|
9
9
|
var _reactNative = require("react-native");
|
|
10
|
-
var _CardStyleInterpolators = require("../../TransitionConfigs/CardStyleInterpolators");
|
|
11
10
|
var _CardAnimationContext = require("../../utils/CardAnimationContext");
|
|
12
11
|
var _getDistanceForDirection = require("../../utils/getDistanceForDirection");
|
|
13
12
|
var _getInvertedMultiplier = require("../../utils/getInvertedMultiplier");
|
|
14
13
|
var _memoize = require("../../utils/memoize");
|
|
15
14
|
var _GestureHandler = require("../GestureHandler");
|
|
16
|
-
var _ModalStatusBarManager = require("../ModalStatusBarManager");
|
|
17
15
|
var _CardSheet = require("./CardSheet");
|
|
18
|
-
function _getRequireWildcardCache(
|
|
19
|
-
function _interopRequireWildcard(
|
|
16
|
+
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
17
|
+
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
20
18
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
21
19
|
function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
|
|
22
20
|
const GESTURE_VELOCITY_IMPACT = 0.3;
|
|
@@ -52,13 +50,16 @@ class Card extends React.Component {
|
|
|
52
50
|
}
|
|
53
51
|
};
|
|
54
52
|
componentDidMount() {
|
|
55
|
-
this.
|
|
56
|
-
|
|
57
|
-
|
|
53
|
+
if (!this.props.preloaded) {
|
|
54
|
+
this.animate({
|
|
55
|
+
closing: this.props.closing
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
58
|
this.isCurrentlyMounted = true;
|
|
59
59
|
}
|
|
60
60
|
componentDidUpdate(prevProps) {
|
|
61
61
|
const {
|
|
62
|
+
direction,
|
|
62
63
|
layout,
|
|
63
64
|
gestureDirection,
|
|
64
65
|
closing
|
|
@@ -74,12 +75,12 @@ class Card extends React.Component {
|
|
|
74
75
|
this.layout.height.setValue(height);
|
|
75
76
|
}
|
|
76
77
|
if (gestureDirection !== prevProps.gestureDirection) {
|
|
77
|
-
this.inverted.setValue((0, _getInvertedMultiplier.getInvertedMultiplier)(gestureDirection));
|
|
78
|
+
this.inverted.setValue((0, _getInvertedMultiplier.getInvertedMultiplier)(gestureDirection, direction === 'rtl'));
|
|
78
79
|
}
|
|
79
80
|
const toValue = this.getAnimateToValue(this.props);
|
|
80
81
|
if (this.getAnimateToValue(prevProps) !== toValue || this.lastToValue !== toValue) {
|
|
81
82
|
// We need to trigger the animation when route was closed
|
|
82
|
-
//
|
|
83
|
+
// The route might have been closed by a `POP` action or by a gesture
|
|
83
84
|
// When route was closed due to a gesture, the animation would've happened already
|
|
84
85
|
// It's still important to trigger the animation so that `onClose` is called
|
|
85
86
|
// If `onClose` is not called, cleanup step won't be performed for gestures
|
|
@@ -89,13 +90,13 @@ class Card extends React.Component {
|
|
|
89
90
|
}
|
|
90
91
|
}
|
|
91
92
|
componentWillUnmount() {
|
|
92
|
-
this.props.gesture
|
|
93
|
+
this.props.gesture?.stopAnimation();
|
|
93
94
|
this.isCurrentlyMounted = false;
|
|
94
95
|
this.handleEndInteraction();
|
|
95
96
|
}
|
|
96
97
|
isCurrentlyMounted = false;
|
|
97
98
|
isClosing = new _reactNative.Animated.Value(FALSE);
|
|
98
|
-
inverted = new _reactNative.Animated.Value((0, _getInvertedMultiplier.getInvertedMultiplier)(this.props.gestureDirection));
|
|
99
|
+
inverted = new _reactNative.Animated.Value((0, _getInvertedMultiplier.getInvertedMultiplier)(this.props.gestureDirection, this.props.direction === 'rtl'));
|
|
99
100
|
layout = {
|
|
100
101
|
width: new _reactNative.Animated.Value(this.props.layout.width),
|
|
101
102
|
height: new _reactNative.Animated.Value(this.props.layout.height)
|
|
@@ -107,11 +108,11 @@ class Card extends React.Component {
|
|
|
107
108
|
velocity
|
|
108
109
|
} = _ref2;
|
|
109
110
|
const {
|
|
110
|
-
gesture,
|
|
111
111
|
transitionSpec,
|
|
112
112
|
onOpen,
|
|
113
113
|
onClose,
|
|
114
|
-
onTransition
|
|
114
|
+
onTransition,
|
|
115
|
+
gesture
|
|
115
116
|
} = this.props;
|
|
116
117
|
const toValue = this.getAnimateToValue({
|
|
117
118
|
...this.props,
|
|
@@ -124,7 +125,7 @@ class Card extends React.Component {
|
|
|
124
125
|
this.setPointerEventsEnabled(!closing);
|
|
125
126
|
this.handleStartInteraction();
|
|
126
127
|
clearTimeout(this.pendingGestureCallback);
|
|
127
|
-
onTransition
|
|
128
|
+
onTransition?.({
|
|
128
129
|
closing,
|
|
129
130
|
gesture: velocity !== undefined
|
|
130
131
|
});
|
|
@@ -157,17 +158,18 @@ class Card extends React.Component {
|
|
|
157
158
|
let {
|
|
158
159
|
closing,
|
|
159
160
|
layout,
|
|
160
|
-
gestureDirection
|
|
161
|
+
gestureDirection,
|
|
162
|
+
direction,
|
|
163
|
+
preloaded
|
|
161
164
|
} = _ref4;
|
|
162
|
-
if (!closing) {
|
|
165
|
+
if (!closing && !preloaded) {
|
|
163
166
|
return 0;
|
|
164
167
|
}
|
|
165
|
-
return (0, _getDistanceForDirection.getDistanceForDirection)(layout, gestureDirection);
|
|
168
|
+
return (0, _getDistanceForDirection.getDistanceForDirection)(layout, gestureDirection, direction === 'rtl');
|
|
166
169
|
};
|
|
167
170
|
setPointerEventsEnabled = enabled => {
|
|
168
|
-
var _this$ref$current;
|
|
169
171
|
const pointerEvents = enabled ? 'box-none' : 'none';
|
|
170
|
-
|
|
172
|
+
this.ref.current?.setPointerEvents(pointerEvents);
|
|
171
173
|
};
|
|
172
174
|
handleStartInteraction = () => {
|
|
173
175
|
if (this.interactionHandle === undefined) {
|
|
@@ -185,6 +187,7 @@ class Card extends React.Component {
|
|
|
185
187
|
nativeEvent
|
|
186
188
|
} = _ref5;
|
|
187
189
|
const {
|
|
190
|
+
direction,
|
|
188
191
|
layout,
|
|
189
192
|
onClose,
|
|
190
193
|
onGestureBegin,
|
|
@@ -197,9 +200,10 @@ class Card extends React.Component {
|
|
|
197
200
|
case _GestureHandler.GestureState.ACTIVE:
|
|
198
201
|
this.isSwiping.setValue(TRUE);
|
|
199
202
|
this.handleStartInteraction();
|
|
200
|
-
onGestureBegin
|
|
203
|
+
onGestureBegin?.();
|
|
201
204
|
break;
|
|
202
205
|
case _GestureHandler.GestureState.CANCELLED:
|
|
206
|
+
case _GestureHandler.GestureState.FAILED:
|
|
203
207
|
{
|
|
204
208
|
this.isSwiping.setValue(FALSE);
|
|
205
209
|
this.handleEndInteraction();
|
|
@@ -208,7 +212,7 @@ class Card extends React.Component {
|
|
|
208
212
|
closing: this.props.closing,
|
|
209
213
|
velocity
|
|
210
214
|
});
|
|
211
|
-
onGestureCanceled
|
|
215
|
+
onGestureCanceled?.();
|
|
212
216
|
break;
|
|
213
217
|
}
|
|
214
218
|
case _GestureHandler.GestureState.END:
|
|
@@ -226,7 +230,7 @@ class Card extends React.Component {
|
|
|
226
230
|
translation = nativeEvent.translationX;
|
|
227
231
|
velocity = nativeEvent.velocityX;
|
|
228
232
|
}
|
|
229
|
-
const closing = (translation + velocity * gestureVelocityImpact) * (0, _getInvertedMultiplier.getInvertedMultiplier)(gestureDirection) > distance / 2 ? velocity !== 0 || translation !== 0 : this.props.closing;
|
|
233
|
+
const closing = (translation + velocity * gestureVelocityImpact) * (0, _getInvertedMultiplier.getInvertedMultiplier)(gestureDirection, direction === 'rtl') > distance / 2 ? velocity !== 0 || translation !== 0 : this.props.closing;
|
|
230
234
|
this.animate({
|
|
231
235
|
closing,
|
|
232
236
|
velocity
|
|
@@ -242,7 +246,7 @@ class Card extends React.Component {
|
|
|
242
246
|
this.forceUpdate();
|
|
243
247
|
}, 32);
|
|
244
248
|
}
|
|
245
|
-
onGestureEnd
|
|
249
|
+
onGestureEnd?.();
|
|
246
250
|
break;
|
|
247
251
|
}
|
|
248
252
|
}
|
|
@@ -275,6 +279,7 @@ class Card extends React.Component {
|
|
|
275
279
|
}));
|
|
276
280
|
gestureActivationCriteria() {
|
|
277
281
|
const {
|
|
282
|
+
direction,
|
|
278
283
|
layout,
|
|
279
284
|
gestureDirection,
|
|
280
285
|
gestureResponseDistance
|
|
@@ -301,7 +306,7 @@ class Card extends React.Component {
|
|
|
301
306
|
};
|
|
302
307
|
} else {
|
|
303
308
|
const hitSlop = -layout.width + distance;
|
|
304
|
-
const invertedMultiplier = (0, _getInvertedMultiplier.getInvertedMultiplier)(gestureDirection);
|
|
309
|
+
const invertedMultiplier = (0, _getInvertedMultiplier.getInvertedMultiplier)(gestureDirection, direction === 'rtl');
|
|
305
310
|
if (invertedMultiplier === 1) {
|
|
306
311
|
return {
|
|
307
312
|
minOffsetX: 5,
|
|
@@ -339,10 +344,22 @@ class Card extends React.Component {
|
|
|
339
344
|
gestureEnabled,
|
|
340
345
|
gestureDirection,
|
|
341
346
|
pageOverflowEnabled,
|
|
342
|
-
headerDarkContent,
|
|
343
347
|
children,
|
|
344
348
|
containerStyle: customContainerStyle,
|
|
345
349
|
contentStyle,
|
|
350
|
+
/* eslint-disable @typescript-eslint/no-unused-vars */
|
|
351
|
+
closing,
|
|
352
|
+
direction,
|
|
353
|
+
gestureResponseDistance,
|
|
354
|
+
gestureVelocityImpact,
|
|
355
|
+
onClose,
|
|
356
|
+
onGestureBegin,
|
|
357
|
+
onGestureCanceled,
|
|
358
|
+
onGestureEnd,
|
|
359
|
+
onOpen,
|
|
360
|
+
onTransition,
|
|
361
|
+
transitionSpec,
|
|
362
|
+
/* eslint-enable @typescript-eslint/no-unused-vars */
|
|
346
363
|
...rest
|
|
347
364
|
} = this.props;
|
|
348
365
|
const interpolationProps = this.getCardAnimation(interpolationIndex, current, next, layout, insets.top, insets.right, insets.bottom, insets.left);
|
|
@@ -368,15 +385,7 @@ class Card extends React.Component {
|
|
|
368
385
|
const isTransparent = typeof backgroundColor === 'string' ? (0, _color.default)(backgroundColor).alpha() === 0 : false;
|
|
369
386
|
return /*#__PURE__*/React.createElement(_CardAnimationContext.CardAnimationContext.Provider, {
|
|
370
387
|
value: interpolationProps
|
|
371
|
-
},
|
|
372
|
-
// StatusBar messes with translucent status bar on Android
|
|
373
|
-
// So we should only enable it on iOS
|
|
374
|
-
_reactNative.Platform.OS === 'ios' && overlayEnabled && next && getIsModalPresentation(styleInterpolator) ? /*#__PURE__*/React.createElement(_ModalStatusBarManager.ModalStatusBarManager, {
|
|
375
|
-
dark: headerDarkContent,
|
|
376
|
-
layout: layout,
|
|
377
|
-
insets: insets,
|
|
378
|
-
style: cardStyle
|
|
379
|
-
}) : null, /*#__PURE__*/React.createElement(_reactNative.Animated.View, {
|
|
388
|
+
}, /*#__PURE__*/React.createElement(_reactNative.Animated.View, {
|
|
380
389
|
style: {
|
|
381
390
|
// This is a dummy style that doesn't actually change anything visually.
|
|
382
391
|
// Animated needs the animated value to be used somewhere, otherwise things don't update properly.
|
|
@@ -389,6 +398,10 @@ class Card extends React.Component {
|
|
|
389
398
|
collapsable: false
|
|
390
399
|
}), /*#__PURE__*/React.createElement(_reactNative.View, _extends({
|
|
391
400
|
pointerEvents: "box-none"
|
|
401
|
+
// Make sure this view is not removed on the new architecture, as it causes focus loss during navigation on Android.
|
|
402
|
+
// This can happen when the view flattening results in different trees - due to `overflow` style changing in a parent.
|
|
403
|
+
,
|
|
404
|
+
collapsable: false
|
|
392
405
|
}, rest), overlayEnabled ? /*#__PURE__*/React.createElement(_reactNative.View, {
|
|
393
406
|
pointerEvents: "box-none",
|
|
394
407
|
style: _reactNative.StyleSheet.absoluteFill
|
|
@@ -405,7 +418,7 @@ class Card extends React.Component {
|
|
|
405
418
|
needsOffscreenAlphaCompositing: hasOpacityStyle(cardStyle),
|
|
406
419
|
style: [styles.container, cardStyle]
|
|
407
420
|
}, shadowEnabled && shadowStyle && !isTransparent ? /*#__PURE__*/React.createElement(_reactNative.Animated.View, {
|
|
408
|
-
style: [styles.shadow, gestureDirection === 'horizontal' ? [styles.shadowHorizontal, styles.
|
|
421
|
+
style: [styles.shadow, gestureDirection === 'horizontal' ? [styles.shadowHorizontal, styles.shadowStart] : gestureDirection === 'horizontal-inverted' ? [styles.shadowHorizontal, styles.shadowEnd] : gestureDirection === 'vertical' ? [styles.shadowVertical, styles.shadowTop] : [styles.shadowVertical, styles.shadowBottom], {
|
|
409
422
|
backgroundColor
|
|
410
423
|
}, shadowStyle],
|
|
411
424
|
pointerEvents: "none"
|
|
@@ -418,12 +431,6 @@ class Card extends React.Component {
|
|
|
418
431
|
}
|
|
419
432
|
}
|
|
420
433
|
exports.Card = Card;
|
|
421
|
-
const getIsModalPresentation = cardStyleInterpolator => {
|
|
422
|
-
return cardStyleInterpolator === _CardStyleInterpolators.forModalPresentationIOS ||
|
|
423
|
-
// Handle custom modal presentation interpolators as well
|
|
424
|
-
cardStyleInterpolator.name === 'forModalPresentationIOS';
|
|
425
|
-
};
|
|
426
|
-
exports.getIsModalPresentation = getIsModalPresentation;
|
|
427
434
|
const styles = _reactNative.StyleSheet.create({
|
|
428
435
|
container: {
|
|
429
436
|
flex: 1
|
|
@@ -447,15 +454,15 @@ const styles = _reactNative.StyleSheet.create({
|
|
|
447
454
|
height: 1
|
|
448
455
|
}
|
|
449
456
|
},
|
|
450
|
-
|
|
451
|
-
|
|
457
|
+
shadowStart: {
|
|
458
|
+
start: 0
|
|
452
459
|
},
|
|
453
|
-
|
|
454
|
-
|
|
460
|
+
shadowEnd: {
|
|
461
|
+
end: 0
|
|
455
462
|
},
|
|
456
463
|
shadowVertical: {
|
|
457
|
-
|
|
458
|
-
|
|
464
|
+
start: 0,
|
|
465
|
+
end: 0,
|
|
459
466
|
height: 3,
|
|
460
467
|
shadowOffset: {
|
|
461
468
|
width: 1,
|