@react-navigation/stack 8.0.0-alpha.6 → 8.0.0-alpha.60

package/lib/module/utils/gestureActivationCriteria.js

@@ -15,10 +15,12 @@ export const gestureActivationCriteria = ({
 }) => {
   const enableTrackpadTwoFingerGesture = true;
   const distance = gestureResponseDistance !== undefined ? gestureResponseDistance : gestureDirection === 'vertical' || gestureDirection === 'vertical-inverted' ? GESTURE_RESPONSE_DISTANCE_VERTICAL : GESTURE_RESPONSE_DISTANCE_HORIZONTAL;
+  const failOffsetX = [-15, 15];
+  const failOffsetY = [-20, 20];
   if (gestureDirection === 'vertical') {
     return {
-      maxDeltaX: 15,
-      minOffsetY: 5,
+      failOffsetX,
+      activeOffsetY: 5,
       hitSlop: {
         bottom: -layout.height + distance
       },
@@ -26,8 +28,8 @@ export const gestureActivationCriteria = ({
     };
   } else if (gestureDirection === 'vertical-inverted') {
     return {
-      maxDeltaX: 15,
-      minOffsetY: -5,
+      failOffsetX,
+      activeOffsetY: -5,
       hitSlop: {
         top: -layout.height + distance
       },
@@ -38,8 +40,8 @@ export const gestureActivationCriteria = ({
     const invertedMultiplier = getInvertedMultiplier(gestureDirection, direction === 'rtl');
     if (invertedMultiplier === 1) {
       return {
-        minOffsetX: 5,
-        maxDeltaY: 20,
+        activeOffsetX: 5,
+        failOffsetY,
         hitSlop: {
           right: hitSlop
         },
@@ -47,8 +49,8 @@ export const gestureActivationCriteria = ({
       };
     } else {
       return {
-        minOffsetX: -5,
-        maxDeltaY: 20,
+        activeOffsetX: -5,
+        failOffsetY,
         hitSlop: {
           left: hitSlop
         },

package/lib/module/utils/gestureActivationCriteria.js.map

@@ -1 +1 @@
-{"version":3,"names":["getInvertedMultiplier","GESTURE_RESPONSE_DISTANCE_HORIZONTAL","GESTURE_RESPONSE_DISTANCE_VERTICAL","gestureActivationCriteria","direction","gestureDirection","gestureResponseDistance","layout","enableTrackpadTwoFingerGesture","distance","undefined","maxDeltaX","minOffsetY","hitSlop","bottom","height","top","width","invertedMultiplier","minOffsetX","maxDeltaY","right","left"],"sourceRoot":"../../../src","sources":["utils/gestureActivationCriteria.tsx"],"mappings":";;AAGA,SAASA,qBAAqB,QAAQ,4BAAyB;;AAE/D;AACA;AACA;AACA,MAAMC,oCAAoC,GAAG,EAAE;AAC/C,MAAMC,kCAAkC,GAAG,GAAG;AAE9C,OAAO,MAAMC,yBAAyB,GAAGA,CAAC;EACxCC,SAAS;EACTC,gBAAgB;EAChBC,uBAAuB;EACvBC;AAMF,CAAC,KAAK;EACJ,MAAMC,8BAA8B,GAAG,IAAI;EAE3C,MAAMC,QAAQ,GACZH,uBAAuB,KAAKI,SAAS,GACjCJ,uBAAuB,GACvBD,gBAAgB,KAAK,UAAU,IAC7BA,gBAAgB,KAAK,mBAAmB,GACxCH,kCAAkC,GAClCD,oCAAoC;EAE5C,IAAII,gBAAgB,KAAK,UAAU,EAAE;IACnC,OAAO;MACLM,SAAS,EAAE,EAAE;MACbC,UAAU,EAAE,CAAC;MACbC,OAAO,EAAE;QAAEC,MAAM,EAAE,CAACP,MAAM,CAACQ,MAAM,GAAGN;MAAS,CAAC;MAC9CD;IACF,CAAC;EACH,CAAC,MAAM,IAAIH,gBAAgB,KAAK,mBAAmB,EAAE;IACnD,OAAO;MACLM,SAAS,EAAE,EAAE;MACbC,UAAU,EAAE,CAAC,CAAC;MACdC,OAAO,EAAE;QAAEG,GAAG,EAAE,CAACT,MAAM,CAACQ,MAAM,GAAGN;MAAS,CAAC;MAC3CD;IACF,CAAC;EACH,CAAC,MAAM;IACL,MAAMK,OAAO,GAAG,CAACN,MAAM,CAACU,KAAK,GAAGR,QAAQ;IACxC,MAAMS,kBAAkB,GAAGlB,qBAAqB,CAC9CK,gBAAgB,EAChBD,SAAS,KAAK,KAChB,CAAC;IAED,IAAIc,kBAAkB,KAAK,CAAC,EAAE;MAC5B,OAAO;QACLC,UAAU,EAAE,CAAC;QACbC,SAAS,EAAE,EAAE;QACbP,OAAO,EAAE;UAAEQ,KAAK,EAAER;QAAQ,CAAC;QAC3BL;MACF,CAAC;IACH,CAAC,MAAM;MACL,OAAO;QACLW,UAAU,EAAE,CAAC,CAAC;QACdC,SAAS,EAAE,EAAE;QACbP,OAAO,EAAE;UAAES,IAAI,EAAET;QAAQ,CAAC;QAC1BL;MACF,CAAC;IACH;EACF;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["getInvertedMultiplier","GESTURE_RESPONSE_DISTANCE_HORIZONTAL","GESTURE_RESPONSE_DISTANCE_VERTICAL","gestureActivationCriteria","direction","gestureDirection","gestureResponseDistance","layout","enableTrackpadTwoFingerGesture","distance","undefined","failOffsetX","failOffsetY","activeOffsetY","hitSlop","bottom","height","top","width","invertedMultiplier","activeOffsetX","right","left"],"sourceRoot":"../../../src","sources":["utils/gestureActivationCriteria.tsx"],"mappings":";;AAIA,SAASA,qBAAqB,QAAQ,4BAAyB;;AAE/D;AACA;AACA;AACA,MAAMC,oCAAoC,GAAG,EAAE;AAC/C,MAAMC,kCAAkC,GAAG,GAAG;AAE9C,OAAO,MAAMC,yBAAyB,GAAGA,CAAC;EACxCC,SAAS;EACTC,gBAAgB;EAChBC,uBAAuB;EACvBC;AAMF,CAAC,KAAuB;EACtB,MAAMC,8BAA8B,GAAG,IAAI;EAE3C,MAAMC,QAAQ,GACZH,uBAAuB,KAAKI,SAAS,GACjCJ,uBAAuB,GACvBD,gBAAgB,KAAK,UAAU,IAC7BA,gBAAgB,KAAK,mBAAmB,GACxCH,kCAAkC,GAClCD,oCAAoC;EAE5C,MAAMU,WAA6B,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC;EAC/C,MAAMC,WAA6B,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC;EAE/C,IAAIP,gBAAgB,KAAK,UAAU,EAAE;IACnC,OAAO;MACLM,WAAW;MACXE,aAAa,EAAE,CAAC;MAChBC,OAAO,EAAE;QAAEC,MAAM,EAAE,CAACR,MAAM,CAACS,MAAM,GAAGP;MAAS,CAAC;MAC9CD;IACF,CAAC;EACH,CAAC,MAAM,IAAIH,gBAAgB,KAAK,mBAAmB,EAAE;IACnD,OAAO;MACLM,WAAW;MACXE,aAAa,EAAE,CAAC,CAAC;MACjBC,OAAO,EAAE;QAAEG,GAAG,EAAE,CAACV,MAAM,CAACS,MAAM,GAAGP;MAAS,CAAC;MAC3CD;IACF,CAAC;EACH,CAAC,MAAM;IACL,MAAMM,OAAO,GAAG,CAACP,MAAM,CAACW,KAAK,GAAGT,QAAQ;IACxC,MAAMU,kBAAkB,GAAGnB,qBAAqB,CAC9CK,gBAAgB,EAChBD,SAAS,KAAK,KAChB,CAAC;IAED,IAAIe,kBAAkB,KAAK,CAAC,EAAE;MAC5B,OAAO;QACLC,aAAa,EAAE,CAAC;QAChBR,WAAW;QACXE,OAAO,EAAE;UAAEO,KAAK,EAAEP;QAAQ,CAAC;QAC3BN;MACF,CAAC;IACH,CAAC,MAAM;MACL,OAAO;QACLY,aAAa,EAAE,CAAC,CAAC;QACjBR,WAAW;QACXE,OAAO,EAAE;UAAEQ,IAAI,EAAER;QAAQ,CAAC;QAC1BN;MACF,CAAC;IACH;EACF;AACF,CAAC","ignoreList":[]}

package/lib/module/utils/useCardAnimation.js

@@ -3,7 +3,7 @@
 import * as React from 'react';
 import { CardAnimationContext } from "./CardAnimationContext.js";
 export function useCardAnimation() {
-  const animation = React.useContext(CardAnimationContext);
+  const animation = React.use(CardAnimationContext);
   if (animation === undefined) {
     throw new Error("Couldn't find values for card animation. Are you inside a screen in Stack?");
   }

package/lib/module/utils/useCardAnimation.js.map

@@ -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":[]}
+{"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":[]}

package/lib/module/utils/useGestureHandler.js

@@ -0,0 +1,9 @@
+"use strict";
+
+import * as React from 'react';
+import { GestureHandlerContext } from "./GestureHandlerContext.js";
+export function useGestureHandler() {
+  const gesture = React.useContext(GestureHandlerContext);
+  return gesture;
+}
+//# sourceMappingURL=useGestureHandler.js.map

package/lib/module/utils/useGestureHandler.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["React","GestureHandlerContext","useGestureHandler","gesture","useContext"],"sourceRoot":"../../../src","sources":["utils/useGestureHandler.tsx"],"mappings":";;AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAE9B,SAASC,qBAAqB,QAAQ,4BAAyB;AAE/D,OAAO,SAASC,iBAAiBA,CAAA,EAAG;EAClC,MAAMC,OAAO,GAAGH,KAAK,CAACI,UAAU,CAACH,qBAAqB,CAAC;EAEvD,OAAOE,OAAO;AAChB","ignoreList":[]}

package/lib/module/utils/useKeyboardManager.js

@@ -2,12 +2,18 @@
 
 import * as React from 'react';
 import { Keyboard, TextInput } from 'react-native';
-export function useKeyboardManager(isEnabled) {
+export function useKeyboardManager({
+  enabled,
+  focused,
+  contentRef
+}) {
   // Numeric id of the previously focused text input
   // When a gesture didn't change the tab, we can restore the focused input with this
   const previouslyFocusedTextInputRef = React.useRef(undefined);
   const startTimestampRef = React.useRef(0);
   const keyboardTimeoutRef = React.useRef(undefined);
+  const enabledRef = React.useRef(enabled);
+  const focusedRef = React.useRef(focused);
   const clearKeyboardTimeout = React.useCallback(() => {
     if (keyboardTimeoutRef.current !== undefined) {
       clearTimeout(keyboardTimeoutRef.current);
@@ -15,7 +21,7 @@ export function useKeyboardManager(isEnabled) {
     }
   }, []);
   const onPageChangeStart = React.useCallback(() => {
-    if (!isEnabled()) {
+    if (!enabledRef.current || !focusedRef.current) {
       return;
     }
     clearKeyboardTimeout();
@@ -29,30 +35,9 @@ export function useKeyboardManager(isEnabled) {
 
     // Store timestamp for touch start
     startTimestampRef.current = Date.now();
-  }, [clearKeyboardTimeout, isEnabled]);
-  const onPageChangeConfirm = React.useCallback(force => {
-    if (!isEnabled()) {
-      return;
-    }
-    clearKeyboardTimeout();
-    if (force) {
-      // Always dismiss input, even if we don't have a ref to it
-      // We might not have the ref if onPageChangeStart was never called
-      // This can happen if page change was not from a gesture
-      Keyboard.dismiss();
-    } else {
-      const input = previouslyFocusedTextInputRef.current;
-
-      // Dismiss the keyboard only if an input was a focused before
-      // This makes sure we don't dismiss input on going back and focusing an input
-      input?.blur();
-    }
-
-    // Cleanup the ID on successful page change
-    previouslyFocusedTextInputRef.current = undefined;
-  }, [clearKeyboardTimeout, isEnabled]);
+  }, [clearKeyboardTimeout]);
   const onPageChangeCancel = React.useCallback(() => {
-    if (!isEnabled()) {
+    if (!enabledRef.current || !focusedRef.current) {
       return;
     }
     clearKeyboardTimeout();
@@ -77,7 +62,67 @@ export function useKeyboardManager(isEnabled) {
         previouslyFocusedTextInputRef.current = undefined;
       }
     }
-  }, [clearKeyboardTimeout, isEnabled]);
+  }, [clearKeyboardTimeout]);
+  const onPageChangeConfirm = React.useCallback(({
+    gesture,
+    active,
+    closing
+  }) => {
+    if (!enabledRef.current || !focusedRef.current) {
+      return;
+    }
+    if (!closing) {
+      onPageChangeCancel();
+      return;
+    }
+    clearKeyboardTimeout();
+    if (!gesture) {
+      // Always dismiss input, even if we don't have a ref to it
+      // We might not have the ref if onPageChangeStart was never called
+      // This can happen if page change was not from a gesture
+      Keyboard.dismiss();
+    } else if (active) {
+      const input = previouslyFocusedTextInputRef.current;
+
+      // Dismiss the keyboard only if an input was a focused before
+      // This makes sure we don't dismiss input on going back and focusing an input
+      input?.blur();
+    }
+
+    // Cleanup the ID on successful page change
+    previouslyFocusedTextInputRef.current = undefined;
+  }, [clearKeyboardTimeout, onPageChangeCancel]);
+
+  // Dismiss keyboard when screen loses focus (e.g. when pushing a new screen).
+  // This handles the "navigate forward" case so we don't dismiss the new screen's
+  // auto-focused input from handleTransition.
+  React.useLayoutEffect(() => {
+    if (enabledRef.current && !focused) {
+      Keyboard.dismiss();
+    }
+  }, [focused]);
+
+  // Dismiss keyboard if native focus is restored to an input in an unfocused screen.
+  // This can happen after dismissing a native alert when `autoFocus` is used on iOS.
+  React.useEffect(() => {
+    const blurInputInScreen = () => {
+      if (focusedRef.current || !enabledRef.current) {
+        return;
+      }
+      const input = TextInput.State.currentlyFocusedInput();
+      if (input && contentRef.current?.contains(input)) {
+        input.blur();
+      }
+    };
+    const subscriptions = [Keyboard.addListener('keyboardWillShow', blurInputInScreen), Keyboard.addListener('keyboardDidShow', blurInputInScreen)];
+    return () => {
+      subscriptions.forEach(subscription => subscription.remove());
+    };
+  }, [contentRef]);
+  React.useLayoutEffect(() => {
+    enabledRef.current = enabled;
+    focusedRef.current = focused;
+  });
   React.useEffect(() => {
     return () => clearKeyboardTimeout();
   }, [clearKeyboardTimeout]);

package/lib/module/utils/useKeyboardManager.js.map

@@ -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":[]}
+{"version":3,"names":["React","Keyboard","TextInput","useKeyboardManager","enabled","focused","contentRef","previouslyFocusedTextInputRef","useRef","undefined","startTimestampRef","keyboardTimeoutRef","enabledRef","focusedRef","clearKeyboardTimeout","useCallback","current","clearTimeout","onPageChangeStart","input","State","currentlyFocusedInput","blur","Date","now","onPageChangeCancel","setTimeout","focus","onPageChangeConfirm","gesture","active","closing","dismiss","useLayoutEffect","useEffect","blurInputInScreen","contains","subscriptions","addListener","forEach","subscription","remove"],"sourceRoot":"../../../src","sources":["utils/useKeyboardManager.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/views/GestureHandler.js

@@ -2,20 +2,21 @@
 
 import * as React from 'react';
 import { View } from 'react-native';
-import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
-const Dummy = ({
+import { GestureHandlerContext } from "../utils/GestureHandlerContext.js";
+import { jsx as _jsx } from "react/jsx-runtime";
+export function GestureDetector({
+  gesture,
   children
-}) => /*#__PURE__*/_jsx(_Fragment, {
-  children: children
-});
-export const PanGestureHandler = Dummy;
+}) {
+  return /*#__PURE__*/_jsx(GestureHandlerContext.Provider, {
+    value: gesture ?? null,
+    children: children
+  });
+}
+
+// eslint-disable-next-line @eslint-react/hooks-extra/no-unnecessary-use-prefix, @eslint-react/hooks-extra/ensure-custom-hooks-using-other-hooks
+export function usePanGesture(_config) {
+  return undefined;
+}
 export const GestureHandlerRootView = View;
-export const GestureState = {
-  UNDETERMINED: 0,
-  FAILED: 1,
-  BEGAN: 2,
-  CANCELLED: 3,
-  ACTIVE: 4,
-  END: 5
-};
 //# sourceMappingURL=GestureHandler.js.map

package/lib/module/views/GestureHandler.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","View","Fragment","_Fragment","jsx","_jsx","Dummy","children","PanGestureHandler","GestureHandlerRootView","GestureState","UNDETERMINED","FAILED","BEGAN","CANCELLED","ACTIVE","END"],"sourceRoot":"../../../src","sources":["views/GestureHandler.tsx"],"mappings":";;AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAC9B,SAASC,IAAI,QAAQ,cAAc;AAAC,SAAAC,QAAA,IAAAC,SAAA,EAAAC,GAAA,IAAAC,IAAA;AAGpC,MAAMC,KAAU,GAAGA,CAAC;EAAEC;AAAwC,CAAC,kBAC7DF,IAAA,CAAAF,SAAA;EAAAI,QAAA,EAAGA;AAAQ,CAAG,CACf;AAED,OAAO,MAAMC,iBAAiB,GAC5BF,KAAyD;AAE3D,OAAO,MAAMG,sBAAsB,GAAGR,IAAI;AAE1C,OAAO,MAAMS,YAAY,GAAG;EAC1BC,YAAY,EAAE,CAAC;EACfC,MAAM,EAAE,CAAC;EACTC,KAAK,EAAE,CAAC;EACRC,SAAS,EAAE,CAAC;EACZC,MAAM,EAAE,CAAC;EACTC,GAAG,EAAE;AACP,CAAC","ignoreList":[]}
+{"version":3,"names":["React","View","GestureHandlerContext","jsx","_jsx","GestureDetector","gesture","children","Provider","value","usePanGesture","_config","undefined","GestureHandlerRootView"],"sourceRoot":"../../../src","sources":["views/GestureHandler.tsx"],"mappings":";;AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAC9B,SAASC,IAAI,QAAQ,cAAc;AAMnC,SAASC,qBAAqB,QAAQ,mCAAgC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAEvE,OAAO,SAASC,eAAeA,CAAC;EAC9BC,OAAO;EACPC;AAIF,CAAC,EAAE;EACD,oBACEH,IAAA,CAACF,qBAAqB,CAACM,QAAQ;IAACC,KAAK,EAAEH,OAAO,IAAI,IAAK;IAAAC,QAAA,EACpDA;EAAQ,CACqB,CAAC;AAErC;;AAEA;AACA,OAAO,SAASG,aAAaA,CAACC,OAAyB,EAAE;EACvD,OAAOC,SAAS;AAClB;AAEA,OAAO,MAAMC,sBAAsB,GAAGZ,IAAI","ignoreList":[]}

package/lib/module/views/GestureHandlerNative.js

@@ -1,18 +1,24 @@
 "use strict";
 
 import * as React from 'react';
-import { PanGestureHandler as PanGestureHandlerNative } from 'react-native-gesture-handler';
-import { GestureHandlerRefContext } from "../utils/GestureHandlerRefContext.js";
+import { GestureDetector as GestureDetectorNative, usePanGesture } from 'react-native-gesture-handler';
+import { GestureHandlerContext } from "../utils/GestureHandlerContext.js";
 import { jsx as _jsx } from "react/jsx-runtime";
-export function PanGestureHandler(props) {
-  const gestureRef = React.useRef(null);
-  return /*#__PURE__*/_jsx(GestureHandlerRefContext.Provider, {
-    value: gestureRef,
-    children: /*#__PURE__*/_jsx(PanGestureHandlerNative, {
-      ...props,
-      ref: gestureRef
+export function GestureDetector({
+  gesture,
+  children
+}) {
+  if (gesture == null) {
+    throw new Error('The provided gesture is undefined. A valid gesture must be passed to the GestureDetector on native platforms.');
+  }
+  return /*#__PURE__*/_jsx(GestureHandlerContext.Provider, {
+    value: gesture,
+    children: /*#__PURE__*/_jsx(GestureDetectorNative, {
+      gesture: gesture,
+      children: children
     })
   });
 }
-export { GestureHandlerRootView, State as GestureState } from 'react-native-gesture-handler';
+export { usePanGesture };
+export { GestureHandlerRootView } from 'react-native-gesture-handler';
 //# sourceMappingURL=GestureHandlerNative.js.map

package/lib/module/views/GestureHandlerNative.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","PanGestureHandler","PanGestureHandlerNative","GestureHandlerRefContext","jsx","_jsx","props","gestureRef","useRef","Provider","value","children","ref","GestureHandlerRootView","State","GestureState"],"sourceRoot":"../../../src","sources":["views/GestureHandlerNative.tsx"],"mappings":";;AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAC9B,SACEC,iBAAiB,IAAIC,uBAAuB,QAEvC,8BAA8B;AAErC,SAASC,wBAAwB,QAAQ,sCAAmC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAE7E,OAAO,SAASJ,iBAAiBA,CAACK,KAAkC,EAAE;EACpE,MAAMC,UAAU,GAAGP,KAAK,CAACQ,MAAM,CAA0B,IAAI,CAAC;EAE9D,oBACEH,IAAA,CAACF,wBAAwB,CAACM,QAAQ;IAACC,KAAK,EAAEH,UAAW;IAAAI,QAAA,eACnDN,IAAA,CAACH,uBAAuB;MAAA,GAAKI,KAAK;MAAEM,GAAG,EAAEL;IAAW,CAAE;EAAC,CACtB,CAAC;AAExC;AAGA,SACEM,sBAAsB,EACtBC,KAAK,IAAIC,YAAY,QAChB,8BAA8B","ignoreList":[]}
+{"version":3,"names":["React","GestureDetector","GestureDetectorNative","usePanGesture","GestureHandlerContext","jsx","_jsx","gesture","children","Error","Provider","value","GestureHandlerRootView"],"sourceRoot":"../../../src","sources":["views/GestureHandlerNative.tsx"],"mappings":";;AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAC9B,SACEC,eAAe,IAAIC,qBAAqB,EAExCC,aAAa,QACR,8BAA8B;AAErC,SAASC,qBAAqB,QAAQ,mCAAgC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAEvE,OAAO,SAASL,eAAeA,CAAC;EAC9BM,OAAO;EACPC;AAIF,CAAC,EAAE;EACD,IAAID,OAAO,IAAI,IAAI,EAAE;IACnB,MAAM,IAAIE,KAAK,CACb,+GACF,CAAC;EACH;EAEA,oBACEH,IAAA,CAACF,qBAAqB,CAACM,QAAQ;IAACC,KAAK,EAAEJ,OAAQ;IAAAC,QAAA,eAC7CF,IAAA,CAACJ,qBAAqB;MAACK,OAAO,EAAEA,OAAQ;MAAAC,QAAA,EACrCA;IAAQ,CACY;EAAC,CACM,CAAC;AAErC;AAEA,SAASL,aAAa;AAEtB,SAASS,sBAAsB,QAAQ,8BAA8B","ignoreList":[]}

package/lib/module/views/Header/Header.js

@@ -11,6 +11,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 export const Header = /*#__PURE__*/React.memo(function Header({
   back,
   progress,
+  inverted,
   options,
   route,
   navigation,
@@ -36,11 +37,12 @@ export const Header = /*#__PURE__*/React.memo(function Header({
       });
     }
   }, 50), [navigation, route.key]);
-  const isModal = React.useContext(ModalPresentationContext);
-  const isParentHeaderShown = React.useContext(HeaderShownContext);
+  const isModal = React.use(ModalPresentationContext);
+  const isParentHeaderShown = React.use(HeaderShownContext);
   const statusBarHeight = options.headerStatusBarHeight !== undefined ? options.headerStatusBarHeight : isModal || isParentHeaderShown ? 0 : insets.top;
   return /*#__PURE__*/_jsx(HeaderSegment, {
     ...options,
+    inverted: inverted,
     title: getHeaderTitle(options, route.name),
     progress: progress,
     modal: isModal,

package/lib/module/views/Header/Header.js.map

@@ -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":[]}
+{"version":3,"names":["getHeaderTitle","HeaderShownContext","StackActions","React","useSafeAreaInsets","ModalPresentationContext","throttle","HeaderSegment","jsx","_jsx","Header","memo","back","progress","inverted","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,QAAQ;EACRC,OAAO;EACPC,KAAK;EACLC,UAAU;EACVC;AACgB,CAAC,EAAE;EACnB,MAAMC,MAAM,GAAGf,iBAAiB,CAAC,CAAC;EAElC,IAAIgB,aAAa;;EAEjB;EACA;EACA,IAAIL,OAAO,CAACM,eAAe,KAAKC,SAAS,EAAE;IACzCF,aAAa,GAAGL,OAAO,CAACM,eAAe;EACzC,CAAC,MAAM,IAAIT,IAAI,EAAE;IACfQ,aAAa,GAAGR,IAAI,CAACW,KAAK;EAC5B;;EAEA;EACA,MAAMC,MAAM,GAAGrB,KAAK,CAACsB,WAAW,CAC9BnB,QAAQ,CAAC,MAAM;IACb,IAAIW,UAAU,CAACS,SAAS,CAAC,CAAC,IAAIT,UAAU,CAACU,SAAS,CAAC,CAAC,EAAE;MACpDV,UAAU,CAACW,QAAQ,CAAC;QAClB,GAAG1B,YAAY,CAAC2B,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,GAAG7B,KAAK,CAAC8B,GAAG,CAAC5B,wBAAwB,CAAC;EACnD,MAAM6B,mBAAmB,GAAG/B,KAAK,CAAC8B,GAAG,CAAChC,kBAAkB,CAAC;EAEzD,MAAMkC,eAAe,GACnBpB,OAAO,CAACqB,qBAAqB,KAAKd,SAAS,GACvCP,OAAO,CAACqB,qBAAqB,GAC7BJ,OAAO,IAAIE,mBAAmB,GAC5B,CAAC,GACDf,MAAM,CAACkB,GAAG;EAElB,oBACE5B,IAAA,CAACF,aAAa;IAAA,GACRQ,OAAO;IACXD,QAAQ,EAAEA,QAAS;IACnBS,KAAK,EAAEvB,cAAc,CAACe,OAAO,EAAEC,KAAK,CAACsB,IAAI,CAAE;IAC3CzB,QAAQ,EAAEA,QAAS;IACnB0B,KAAK,EAAEP,OAAQ;IACfX,eAAe,EACbN,OAAO,CAACM,eAAe,KAAKC,SAAS,GACjCP,OAAO,CAACM,eAAe,GACvBD,aACL;IACDgB,qBAAqB,EAAED,eAAgB;IACvCK,QAAQ,EAAE5B,IAAI,GAAGY,MAAM,GAAGF,SAAU;IACpCmB,QAAQ,EAAE7B,IAAI,GAAGA,IAAI,CAAC8B,IAAI,GAAGpB,SAAU;IACvCJ,iBAAiB,EAAEA;EAAkB,CACtC,CAAC;AAEN,CAAC,CAAC","ignoreList":[]}

package/lib/module/views/Header/HeaderContainer.js

@@ -1,10 +1,12 @@
 "use strict";
 
 import { getHeaderTitle, HeaderBackContext } from '@react-navigation/elements';
-import { NavigationProvider, useLinkBuilder } from '@react-navigation/native';
+import { ActivityView } from '@react-navigation/elements/internal';
+import { NavigationProvider, useLinkBuilder, useLocale } from '@react-navigation/native';
 import * as React from 'react';
 import { StyleSheet, View } from 'react-native';
-import { forNoAnimation, forSlideLeft, forSlideRight, forSlideUp } from "../../TransitionConfigs/HeaderStyleInterpolators.js";
+import { forNoAnimation, forSlideLeft, forSlideUp } from "../../TransitionConfigs/HeaderStyleInterpolators.js";
+import { getInvertedMultiplier } from "../../utils/getInvertedMultiplier.js";
 import { Header } from "./Header.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 export function HeaderContainer({
@@ -12,17 +14,21 @@ export function HeaderContainer({
   scenes,
   getPreviousScene,
   getFocusedRoute,
+  contentHeight,
   onContentHeightChange,
   style
 }) {
   const focusedRoute = getFocusedRoute();
-  const parentHeaderBack = React.useContext(HeaderBackContext);
+  const parentHeaderBack = React.use(HeaderBackContext);
   const {
     buildHref
   } = useLinkBuilder();
+  const {
+    direction
+  } = useLocale();
   return /*#__PURE__*/_jsx(View, {
     style: [styles.container, style],
-    children: scenes.slice(-2).map((scene, i, self) => {
+    children: scenes.map((scene, i, self) => {
       if (mode === 'screen' && i !== self.length - 1 || !scene) {
         return null;
       }
@@ -60,6 +66,9 @@ export function HeaderContainer({
         headerShown: previousHeaderShown = true,
         headerMode: previousHeaderMode
       } = previousDescriptor?.options || {};
+      const {
+        headerTransparent: nextHeaderTransparent
+      } = nextDescriptor?.options || {};
 
       // If any of the next screens don't have a header or header is part of the screen
       // Then we need to move this header offscreen so that it doesn't cover it
@@ -76,37 +85,67 @@ export function HeaderContainer({
       const isHeaderStatic = (previousHeaderShown === false || previousHeaderMode === 'screen') &&
       // We still need to animate when coming back from next scene
       // A hacky way to check this is if the next scene exists
-      !nextDescriptor || nextHeaderlessScene;
+      !nextDescriptor ||
+      // If next header is transparent, we want to treat this header as static
+      // Otherwise it may show through the next header
+      nextHeaderTransparent || nextHeaderlessScene;
       const props = {
         back: headerBack,
         progress: scene.progress,
+        inverted: getInvertedMultiplier(isHeaderStatic && nextHeaderlessGestureDirection ? nextHeaderlessGestureDirection : scene.descriptor.options.gestureDirection, direction === 'rtl'),
         options: scene.descriptor.options,
         route: scene.descriptor.route,
         navigation: scene.descriptor.navigation,
-        styleInterpolator: mode === 'float' ? isHeaderStatic ? nextHeaderlessGestureDirection === 'vertical' || nextHeaderlessGestureDirection === 'vertical-inverted' ? forSlideUp : nextHeaderlessGestureDirection === 'horizontal-inverted' ? forSlideRight : forSlideLeft : headerStyleInterpolator : forNoAnimation
+        styleInterpolator: mode === 'float' ? isHeaderStatic ? nextHeaderlessGestureDirection === 'vertical' || nextHeaderlessGestureDirection === 'vertical-inverted' ? forSlideUp : forSlideLeft : headerStyleInterpolator : forNoAnimation
       };
-      return /*#__PURE__*/_jsx(NavigationProvider, {
-        navigation: scene.descriptor.navigation,
-        route: scene.descriptor.route,
-        children: /*#__PURE__*/_jsx(View, {
-          onLayout: onContentHeightChange ? e => {
-            const {
-              height
-            } = e.nativeEvent.layout;
+      const onRef = node => {
+        node?.measure((_x, _y, _width, height) => {
+          if (height && !contentHeight?.measured) {
             onContentHeightChange({
               route: scene.descriptor.route,
               height
             });
-          } : undefined,
-          "aria-hidden": !isFocused,
+          }
+        });
+      };
+      const onLayout = e => {
+        const {
+          height
+        } = e.nativeEvent.layout;
+        onContentHeightChange({
+          route: scene.descriptor.route,
+          height
+        });
+      };
+      return /*#__PURE__*/_jsx(NavigationProvider, {
+        navigation: scene.descriptor.navigation,
+        route: scene.descriptor.route,
+        children: /*#__PURE__*/_jsx(View, {
           style: [
-          // Avoid positioning the focused header absolutely
+          // Avoid absolutely positioning the focused header unnecessarily
           // Otherwise accessibility tools don't seem to be able to find it
-          mode === 'float' && !isFocused || headerTransparent ? styles.header : null, {
+          mode === 'float' && !isFocused || headerTransparent ? [styles.absolute, mode === 'screen' ?
+          // For transparent headers, specify a min height
+          // This is needed for screen readers, and testing tools on Android
+          // For float header, it's handled in CardStack
+          {
+            minHeight: contentHeight?.value
+          } : null] : null, {
             pointerEvents: isFocused ? 'box-none' : 'none'
           }],
-          children: header !== undefined ? header(props) : /*#__PURE__*/_jsx(Header, {
-            ...props
+          children: /*#__PURE__*/_jsx(View, {
+            ref: onRef,
+            onLayout: onLayout,
+            style: {
+              pointerEvents: 'box-none'
+            },
+            children: /*#__PURE__*/_jsx(ActivityView, {
+              mode: isFocused ? 'normal' : 'inert',
+              visible: true,
+              children: header !== undefined ? header(props) : /*#__PURE__*/_jsx(Header, {
+                ...props
+              })
+            })
           })
         })
       }, scene.descriptor.route.key);
@@ -117,7 +156,7 @@ const styles = StyleSheet.create({
   container: {
     pointerEvents: 'box-none'
   },
-  header: {
+  absolute: {
     position: 'absolute',
     top: 0,
     start: 0,

package/lib/module/views/Header/HeaderContainer.js.map

@@ -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":[]}
+{"version":3,"names":["getHeaderTitle","HeaderBackContext","ActivityView","NavigationProvider","useLinkBuilder","useLocale","React","StyleSheet","View","forNoAnimation","forSlideLeft","forSlideUp","getInvertedMultiplier","Header","jsx","_jsx","HeaderContainer","mode","scenes","getPreviousScene","getFocusedRoute","contentHeight","onContentHeightChange","style","focusedRoute","parentHeaderBack","use","buildHref","direction","styles","container","children","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","nextHeaderTransparent","nextHeaderlessScene","slice","find","currentHeaderShown","currentHeaderMode","gestureDirection","nextHeaderlessGestureDirection","isHeaderStatic","props","back","progress","inverted","navigation","styleInterpolator","onRef","node","measure","_x","_y","_width","height","measured","onLayout","e","nativeEvent","layout","absolute","minHeight","value","pointerEvents","ref","visible","undefined","create","position","top","start","end"],"sourceRoot":"../../../../src","sources":["views/Header/HeaderContainer.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/views/Header/HeaderSegment.js

@@ -1,17 +1,14 @@
 "use strict";
 
 import { getDefaultHeaderHeight, Header, HeaderBackButton, HeaderTitle, useFrameSize } from '@react-navigation/elements';
-import { useLocale } from '@react-navigation/native';
 import * as React from 'react';
 import { StyleSheet } from 'react-native';
 import { jsx as _jsx } from "react/jsx-runtime";
 export function HeaderSegment(props) {
-  const {
-    direction
-  } = useLocale();
   const layout = useFrameSize(frame => frame, true);
   const {
     progress,
+    inverted,
     modal,
     onGoBack,
     backHref,
@@ -20,7 +17,7 @@ export function HeaderSegment(props) {
       ...props
     }) : undefined,
     headerRight: right,
-    headerBackImage,
+    headerBackIcon,
     headerBackTitle,
     headerBackButtonDisplayMode,
     headerBackTruncatedTitle,
@@ -44,7 +41,7 @@ export function HeaderSegment(props) {
   });
   const {
     height = defaultHeight
-  } = StyleSheet.flatten(customHeaderStyle || {});
+  } = StyleSheet.flatten(customHeaderStyle) ?? {};
   const headerHeight = typeof height === 'number' ? height : defaultHeight;
   const {
     titleStyle,
@@ -58,7 +55,7 @@ export function HeaderSegment(props) {
     next: progress.next && {
       progress: progress.next
     },
-    direction,
+    inverted,
     layouts: {
       header: {
         height: headerHeight,
@@ -66,11 +63,11 @@ export function HeaderSegment(props) {
       },
       screen: layout
     }
-  }), [styleInterpolator, progress, direction, headerHeight, layout]);
+  }), [styleInterpolator, progress, inverted, headerHeight, layout]);
   const headerLeft = left ? props => left({
     ...props,
     href: backHref,
-    backImage: headerBackImage,
+    icon: headerBackIcon,
     accessibilityLabel: headerBackAccessibilityLabel,
     testID: headerBackTestID,
     allowFontScaling: headerBackAllowFontScaling,