react-native-screen-transitions 3.3.0-rc.3 → 3.4.0-alpha.0

package/lib/module/shared/constants.js

@@ -6,11 +6,15 @@ import { Platform } from "react-native";
  */
 export const MASK_STYLE_ID = "_ROOT_MASKED";
 export const CONTAINER_STYLE_ID = "_ROOT_CONTAINER";
+export const NAVIGATION_MASK_HOST_FLAG_STYLE_ID = "_NAVIGATION_MASK_HOST";
+export const NAVIGATION_MASK_STYLE_ID = "_NAVIGATION_ROOT_MASK";
+export const NAVIGATION_CONTAINER_STYLE_ID = "_NAVIGATION_ROOT_CONTAINER";
 
 /**
  * Styles
  */
 export const NO_STYLES = Object.freeze({});
+export const NO_PROPS = Object.freeze({});
 
 /**
  * Default gesture values
@@ -18,11 +22,16 @@ export const NO_STYLES = Object.freeze({});
 const DEFAULT_GESTURE_VALUES = {
   x: 0,
   y: 0,
+  normX: 0,
+  normY: 0,
+  dismissing: 0,
+  dragging: 0,
+  direction: null,
+  // Deprecated aliases
   normalizedX: 0,
   normalizedY: 0,
   isDismissing: 0,
-  isDragging: 0,
-  direction: null
+  isDragging: 0
 };
 
 /**
@@ -32,6 +41,7 @@ export const createScreenTransitionState = (route, meta) => ({
   progress: 0,
   closing: 0,
   animating: 0,
+  settled: 1,
   entering: 1,
   gesture: {
     ...DEFAULT_GESTURE_VALUES
@@ -47,6 +57,7 @@ export const DEFAULT_SCREEN_TRANSITION_STATE = Object.freeze({
   progress: 0,
   closing: 0,
   animating: 0,
+  settled: 1,
   entering: 1,
   gesture: DEFAULT_GESTURE_VALUES,
   route: {}
@@ -79,14 +90,13 @@ export const FULLSCREEN_DIMENSIONS = dimensions => {
     height: dimensions.height
   };
 };
-
-/**
- * Default gesture config
- */
-export const GESTURE_VELOCITY_IMPACT = 0.3;
-export const SNAP_VELOCITY_IMPACT = 0.1;
+export const DEFAULT_GESTURE_VELOCITY_IMPACT = 0.3;
+export const DEFAULT_GESTURE_SNAP_VELOCITY_IMPACT = 0.1;
+export const DEFAULT_GESTURE_RELEASE_VELOCITY_MAX = 3.2;
+export const DEFAULT_GESTURE_RELEASE_VELOCITY_SCALE = 1;
 export const DEFAULT_GESTURE_DIRECTION = "horizontal";
 export const DEFAULT_GESTURE_DRIVES_PROGRESS = true;
+export const DEFAULT_GESTURE_SNAP_LOCKED = false;
 export const DEFAULT_GESTURE_ACTIVATION_AREA = "screen";
 export const IS_WEB = Platform.OS === "web";
 export const TRUE = 1;

package/lib/module/shared/constants.js.map

@@ -1 +1 @@
-{"version":3,"names":["Platform","MASK_STYLE_ID","CONTAINER_STYLE_ID","NO_STYLES","Object","freeze","DEFAULT_GESTURE_VALUES","x","y","normalizedX","normalizedY","isDismissing","isDragging","direction","createScreenTransitionState","route","meta","progress","closing","animating","entering","gesture","DEFAULT_SCREEN_TRANSITION_STATE","EMPTY_BOUND_HELPER_RESULT","EMPTY_BOUND_HELPER_RESULT_RAW","scaleX","scaleY","scale","translateX","translateY","width","height","ENTER_RANGE","EXIT_RANGE","FULLSCREEN_DIMENSIONS","dimensions","pageX","pageY","GESTURE_VELOCITY_IMPACT","SNAP_VELOCITY_IMPACT","DEFAULT_GESTURE_DIRECTION","DEFAULT_GESTURE_DRIVES_PROGRESS","DEFAULT_GESTURE_ACTIVATION_AREA","IS_WEB","OS","TRUE","FALSE","EPSILON","ANIMATION_SNAP_THRESHOLD"],"sourceRoot":"../../../src","sources":["shared/constants.ts"],"mappings":";;AACA,SAASA,QAAQ,QAAQ,cAAc;AAOvC;AACA;AACA;AACA,OAAO,MAAMC,aAAa,GAAG,cAAc;AAC3C,OAAO,MAAMC,kBAAkB,GAAG,iBAAiB;;AAEnD;AACA;AACA;AACA,OAAO,MAAMC,SAAS,GAAGC,MAAM,CAACC,MAAM,CAAC,CAAC,CAAC,CAAC;;AAE1C;AACA;AACA;AACA,MAAMC,sBAAsB,GAAG;EAC9BC,CAAC,EAAE,CAAC;EACJC,CAAC,EAAE,CAAC;EACJC,WAAW,EAAE,CAAC;EACdC,WAAW,EAAE,CAAC;EACdC,YAAY,EAAE,CAAC;EACfC,UAAU,EAAE,CAAC;EACbC,SAAS,EAAE;AACZ,CAAU;;AAEV;AACA;AACA;AACA,OAAO,MAAMC,2BAA2B,GAAGA,CAC1CC,KAAqB,EACrBC,IAA8B,MACF;EAC5BC,QAAQ,EAAE,CAAC;EACXC,OAAO,EAAE,CAAC;EACVC,SAAS,EAAE,CAAC;EACZC,QAAQ,EAAE,CAAC;EACXC,OAAO,EAAE;IAAE,GAAGf;EAAuB,CAAC;EACtCS,KAAK;EACLC;AACD,CAAC,CAAC;;AAEF;AACA;AACA;AACA,OAAO,MAAMM,+BAAsD,GAClElB,MAAM,CAACC,MAAM,CAAC;EACbY,QAAQ,EAAE,CAAC;EACXC,OAAO,EAAE,CAAC;EACVC,SAAS,EAAE,CAAC;EACZC,QAAQ,EAAE,CAAC;EACXC,OAAO,EAAEf,sBAAsB;EAC/BS,KAAK,EAAE,CAAC;AACT,CAAC,CAAC;;AAEH;AACA;AACA;AACA,OAAO,MAAMQ,yBAAyB,GAAGnB,MAAM,CAACC,MAAM,CAAC,CAAC,CAAC,CAAC;AAC1D,OAAO,MAAMmB,6BAA6B,GAAGpB,MAAM,CAACC,MAAM,CAAC;EAC1DoB,MAAM,EAAE,CAAC;EACTC,MAAM,EAAE,CAAC;EACTC,KAAK,EAAE,CAAC;EACRC,UAAU,EAAE,CAAC;EACbC,UAAU,EAAE,CAAC;EACbC,KAAK,EAAE,CAAC;EACRC,MAAM,EAAE;AACT,CAAC,CAAC;AACF,OAAO,MAAMC,WAAW,GAAG,CAAC,CAAC,EAAE,CAAC,CAAU;AAC1C,OAAO,MAAMC,UAAU,GAAG,CAAC,CAAC,EAAE,CAAC,CAAU;AAEzC,OAAO,MAAMC,qBAAqB,GACjCC,UAAkB,IACM;EACxB,SAAS;;EACT,OAAO;IACN5B,CAAC,EAAE,CAAC;IACJC,CAAC,EAAE,CAAC;IACJ4B,KAAK,EAAE,CAAC;IACRC,KAAK,EAAE,CAAC;IACRP,KAAK,EAAEK,UAAU,CAACL,KAAK;IACvBC,MAAM,EAAEI,UAAU,CAACJ;EACpB,CAAC;AACF,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAMO,uBAAuB,GAAG,GAAG;AAC1C,OAAO,MAAMC,oBAAoB,GAAG,GAAG;AACvC,OAAO,MAAMC,yBAAyB,GAAG,YAAY;AACrD,OAAO,MAAMC,+BAA+B,GAAG,IAAI;AACnD,OAAO,MAAMC,+BAA+C,GAAG,QAAQ;AAEvE,OAAO,MAAMC,MAAM,GAAG3C,QAAQ,CAAC4C,EAAE,KAAK,KAAK;AAE3C,OAAO,MAAMC,IAAI,GAAG,CAAC;AACrB,OAAO,MAAMC,KAAK,GAAG,CAAC;;AAEtB;AACA;AACA;AACA,OAAO,MAAMC,OAAO,GAAG,IAAI;;AAE3B;AACA;AACA;AACA;AACA,OAAO,MAAMC,wBAAwB,GAAG,IAAI","ignoreList":[]}
+{"version":3,"names":["Platform","MASK_STYLE_ID","CONTAINER_STYLE_ID","NAVIGATION_MASK_HOST_FLAG_STYLE_ID","NAVIGATION_MASK_STYLE_ID","NAVIGATION_CONTAINER_STYLE_ID","NO_STYLES","Object","freeze","NO_PROPS","DEFAULT_GESTURE_VALUES","x","y","normX","normY","dismissing","dragging","direction","normalizedX","normalizedY","isDismissing","isDragging","createScreenTransitionState","route","meta","progress","closing","animating","settled","entering","gesture","DEFAULT_SCREEN_TRANSITION_STATE","EMPTY_BOUND_HELPER_RESULT","EMPTY_BOUND_HELPER_RESULT_RAW","scaleX","scaleY","scale","translateX","translateY","width","height","ENTER_RANGE","EXIT_RANGE","FULLSCREEN_DIMENSIONS","dimensions","pageX","pageY","DEFAULT_GESTURE_VELOCITY_IMPACT","DEFAULT_GESTURE_SNAP_VELOCITY_IMPACT","DEFAULT_GESTURE_RELEASE_VELOCITY_MAX","DEFAULT_GESTURE_RELEASE_VELOCITY_SCALE","DEFAULT_GESTURE_DIRECTION","DEFAULT_GESTURE_DRIVES_PROGRESS","DEFAULT_GESTURE_SNAP_LOCKED","DEFAULT_GESTURE_ACTIVATION_AREA","IS_WEB","OS","TRUE","FALSE","EPSILON","ANIMATION_SNAP_THRESHOLD"],"sourceRoot":"../../../src","sources":["shared/constants.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/hooks/animation/use-associated-style.js

@@ -1,63 +1,254 @@
 "use strict";
 
-import { useAnimatedStyle, useDerivedValue, useSharedValue } from "react-native-reanimated";
-import { NO_STYLES } from "../../constants";
+import { useAnimatedProps, useAnimatedStyle, useSharedValue } from "react-native-reanimated";
+import { EPSILON, NO_PROPS, NO_STYLES } from "../../constants";
+import { useDescriptorDerivations } from "../../providers/screen/descriptors";
 import { useScreenStyles } from "../../providers/screen/styles.provider";
+import { AnimationStore } from "../../stores/animation.store";
+import { BoundStore } from "../../stores/bounds";
+const TRANSIENT_EMPTY_GRACE_FRAMES = 2;
+const TRANSITION_PROGRESS_COMPLETE = 1 - EPSILON;
+const IDENTITY_TRANSFORM = [{
+  translateX: 0
+}, {
+  translateY: 0
+}, {
+  scaleX: 1
+}, {
+  scaleY: 1
+}];
+const ALWAYS_RESET_STYLE_VALUES = {
+  zIndex: 0,
+  elevation: 0
+};
+const hasAnyKeys = record => {
+  "worklet";
+
+  for (const _key in record) {
+    return true;
+  }
+  return false;
+};
+const collectKeyMeta = record => {
+  "worklet";
+
+  const keys = {};
+  let hasAny = false;
+  for (const key in record) {
+    keys[key] = true;
+    hasAny = true;
+  }
+  return {
+    keys,
+    hasAny
+  };
+};
+const getGroupTagParts = tag => {
+  "worklet";
+
+  const separatorIndex = tag.indexOf(":");
+  if (separatorIndex <= 0 || separatorIndex >= tag.length - 1) {
+    return null;
+  }
+  return {
+    group: tag.slice(0, separatorIndex),
+    memberId: tag.slice(separatorIndex + 1)
+  };
+};
+const allowPreviousTransitionEvidence = tag => {
+  "worklet";
+
+  const groupTagParts = getGroupTagParts(tag);
+  if (!groupTagParts) {
+    return true;
+  }
+
+  // For grouped boundaries, only the active member can inherit
+  // transition evidence from the previous screen.
+  const activeGroupMemberId = BoundStore.getGroupActiveId(groupTagParts.group);
+  return activeGroupMemberId !== null && activeGroupMemberId === groupTagParts.memberId;
+};
+const buildUnsetPatch = ({
+  previousKeys,
+  currentKeys,
+  shouldDeferUnset,
+  resetTransformOnUnset
+}) => {
+  "worklet";
+
+  const unsetPatch = {};
+  for (const key in previousKeys) {
+    if (currentKeys[key]) continue;
+    const shouldAlwaysUnset = key in ALWAYS_RESET_STYLE_VALUES;
+    if (shouldDeferUnset && !shouldAlwaysUnset) continue;
+    if (key === "transform" && resetTransformOnUnset) {
+      unsetPatch.transform = IDENTITY_TRANSFORM;
+    } else if (key in ALWAYS_RESET_STYLE_VALUES) {
+      unsetPatch[key] = ALWAYS_RESET_STYLE_VALUES[key];
+    } else {
+      unsetPatch[key] = undefined;
+    }
+  }
+  return unsetPatch;
+};
+
 /**
- * This hook is used to get the associated styles for a given styleId / boundTag.
+ * Resolves the animated style associated with an `id` (styleId/bound tag), while
+ * guarding against one-frame glitches during shared-boundary transitions.
+ *
+ * Why this exists:
+ * - During push/pop, links and style maps can be briefly out of sync.
+ * - Without guards, boundaries can flash raw layout for one frame.
+ * - Cleanup must be deterministic so stale transform keys do not linger.
+ *
+ * Visual model (worklet state machine):
+ *
+ *   expected transition + no resolved style yet -> waiting-first-style
+ *   expected transition + transient empty style map -> hold-last-style
+ *   otherwise -> live
+ *
+ * - `waiting-first-style`: return `opacity: 0` until first resolved style arrives.
+ * - `hold-last-style`: reuse last resolved style through short empty-map gaps.
+ * - `live`: apply current resolved style directly.
+ *
+ * For grouped tags (`group:id`), previous-screen transition evidence is only
+ * considered for the group's active member to avoid hiding non-active siblings.
+ *
+ * Set `waitForFirstResolvedStyle` to `false` for generic shared-bound-tag usage
+ * where the transition can be driven by other style ids.
  */
 export const useAssociatedStyles = ({
-  id
+  id,
+  resetTransformOnUnset = false,
+  waitForFirstResolvedStyle = true
 } = {}) => {
   const {
     stylesMap,
     ancestorStylesMaps
   } = useScreenStyles();
-  const showAfterFirstFrame = useSharedValue(false);
-  useDerivedValue(() => {
+  const {
+    previousScreenKey,
+    currentScreenKey,
+    hasConfiguredInterpolator
+  } = useDescriptorDerivations();
+  const isAnimating = AnimationStore.getRouteAnimation(currentScreenKey, "animating");
+  const progress = AnimationStore.getRouteAnimation(currentScreenKey, "progress");
+  const isClosing = AnimationStore.getRouteAnimation(currentScreenKey, "closing");
+  const previousAppliedKeys = useSharedValue({});
+  const emptyGraceFrameCount = useSharedValue(0);
+  const lastResolvedBase = useSharedValue(null);
+  const associatedStyles = useAnimatedStyle(() => {
     "worklet";
 
     if (!id) {
-      showAfterFirstFrame.value = true;
-      return;
+      return NO_STYLES;
     }
-    if (!showAfterFirstFrame.value) {
-      requestAnimationFrame(() => {
-        showAfterFirstFrame.value = true;
-      });
+
+    // Check local slot first, then fall back to parent
+    const ownSlot = stylesMap.value[id];
+    const ancestorSlot = ancestorStylesMaps.find(ancestorMap => ancestorMap.value[id])?.value[id];
+    const slot = ownSlot || ancestorSlot;
+    const base = slot?.style || NO_STYLES;
+    const {
+      keys: currentKeys,
+      hasAny: hasCurrentKeys
+    } = collectKeyMeta(base);
+    const hasPreviousKeys = hasAnyKeys(previousAppliedKeys.value);
+    const isTransitioning = isAnimating.get() !== 0 || isClosing.get() !== 0;
+    const isTransitionProgressInFlight = progress.get() < TRANSITION_PROGRESS_COMPLETE;
+    const isTransitionInFlight = isTransitioning || isTransitionProgressInFlight;
+    const canUsePreviousTransitionEvidence = resetTransformOnUnset && allowPreviousTransitionEvidence(id);
+    const hasActiveLink = resetTransformOnUnset && canUsePreviousTransitionEvidence && (BoundStore.hasPendingLink(id) || BoundStore.hasSourceLink(id, currentScreenKey) || BoundStore.hasDestinationLink(id, currentScreenKey));
+    const hasPreviousTransitionEvidence = canUsePreviousTransitionEvidence && !!previousScreenKey && (!!BoundStore.getSnapshot(id, previousScreenKey) || BoundStore.hasBoundaryPresence(id, previousScreenKey));
+
+    // Split intent:
+    // - incoming: strict signal for first-style hiding
+    // - in-flight: broad signal to keep existing styles from resetting
+    const shouldExpectIncomingStyle = resetTransformOnUnset && (hasActiveLink && canUsePreviousTransitionEvidence || hasPreviousTransitionEvidence);
+    const shouldProtectInFlightStyles = resetTransformOnUnset && (hasActiveLink || hasPreviousTransitionEvidence);
+    if (hasCurrentKeys) {
+      lastResolvedBase.value = base;
     }
-  });
-  const associatedStyles = useAnimatedStyle(() => {
-    "worklet";
+    const hasPersistedResolvedStyle = !!lastResolvedBase.value;
+    const hasResolvedStyle = hasCurrentKeys || hasPersistedResolvedStyle;
+    const isTransientEmptyGap = hasConfiguredInterpolator && shouldProtectInFlightStyles && !isTransitioning && !hasCurrentKeys && (hasPreviousKeys || hasPersistedResolvedStyle);
 
-    if (!id) {
-      return NO_STYLES;
+    // Keep styles stable for a couple of frames to absorb
+    // transient empty-map gaps on slower devices.
+    if (isTransientEmptyGap) {
+      emptyGraceFrameCount.value = emptyGraceFrameCount.value + 1;
+    } else {
+      emptyGraceFrameCount.value = 0;
     }
+    const isWithinGapGrace = isTransientEmptyGap && emptyGraceFrameCount.value <= TRANSIENT_EMPTY_GRACE_FRAMES;
+    const shouldDeferUnset = resetTransformOnUnset && shouldProtectInFlightStyles && (isTransitioning || isWithinGapGrace);
 
-    // Check local styles first, then fall back to parent
-    const ownStyle = stylesMap.value[id];
-    const ancestorStyle = ancestorStylesMaps.find(ancestorMap => ancestorMap.value[id])?.value[id];
-    const base = ownStyle || ancestorStyle || NO_STYLES;
-    let opacity = 1;
-    if ("opacity" in base) {
-      opacity = base.opacity;
+    /**
+     * Associated-style state machine:
+     * - waiting-first-style: transition is expected but no style has resolved yet.
+     * - hold-last-style: transient empty frame; reuse last resolved style.
+     * - live: apply current resolved style normally.
+     */
+    let mode = "live";
+    if (waitForFirstResolvedStyle && resetTransformOnUnset && hasConfiguredInterpolator && shouldExpectIncomingStyle && isTransitionInFlight && !hasResolvedStyle) {
+      mode = "waiting-first-style";
+    } else if (shouldDeferUnset && !hasCurrentKeys && hasPersistedResolvedStyle) {
+      mode = "hold-last-style";
     }
-    if (!showAfterFirstFrame.value) {
+    const resolvedBase = mode === "hold-last-style" ? lastResolvedBase.value : base;
+    const unsetPatch = buildUnsetPatch({
+      previousKeys: previousAppliedKeys.value,
+      currentKeys,
+      shouldDeferUnset,
+      resetTransformOnUnset
+    });
+    if (shouldDeferUnset) {
+      previousAppliedKeys.value = {
+        ...previousAppliedKeys.value,
+        ...currentKeys
+      };
+    } else {
+      previousAppliedKeys.value = currentKeys;
+
+      // Drop cached style when fully idle so future transitions
+      // start from a clean state.
+      if (!hasCurrentKeys && !shouldProtectInFlightStyles && !isTransitioning) {
+        lastResolvedBase.value = null;
+      }
+    }
+    if (mode === "waiting-first-style") {
       return {
-        ...base,
+        ...unsetPatch,
         opacity: 0
       };
     }
-    if ("opacity" in base) {
-      return base;
+    const mergedBase = {
+      ...unsetPatch,
+      ...resolvedBase
+    };
+    let opacity = 1;
+    if ("opacity" in mergedBase) {
+      opacity = mergedBase.opacity;
+    }
+    if ("opacity" in mergedBase) {
+      return mergedBase;
     }
     return {
-      ...base,
+      ...mergedBase,
       opacity
     };
   });
+  const associatedProps = useAnimatedProps(() => {
+    "worklet";
+
+    if (!id) return NO_PROPS;
+    const ownSlot = stylesMap.value[id];
+    const ancestorSlot = ancestorStylesMaps.find(ancestorMap => ancestorMap.value[id])?.value[id];
+    return (ownSlot || ancestorSlot)?.props ?? NO_PROPS;
+  });
   return {
-    associatedStyles
+    associatedStyles,
+    associatedProps
   };
 };
 //# sourceMappingURL=use-associated-style.js.map

package/lib/module/shared/hooks/animation/use-associated-style.js.map

@@ -1 +1 @@
-{"version":3,"names":["useAnimatedStyle","useDerivedValue","useSharedValue","NO_STYLES","useScreenStyles","useAssociatedStyles","id","stylesMap","ancestorStylesMaps","showAfterFirstFrame","value","requestAnimationFrame","associatedStyles","ownStyle","ancestorStyle","find","ancestorMap","base","opacity"],"sourceRoot":"../../../../../src","sources":["shared/hooks/animation/use-associated-style.tsx"],"mappings":";;AAAA,SAECA,gBAAgB,EAChBC,eAAe,EACfC,cAAc,QACR,yBAAyB;AAChC,SAASC,SAAS,QAAQ,iBAAiB;AAC3C,SAASC,eAAe,QAAQ,wCAAwC;AAOxE;AACA;AACA;AACA,OAAO,MAAMC,mBAAmB,GAAGA,CAAC;EAAEC;AAAU,CAAC,GAAG,CAAC,CAAC,KAAK;EAC1D,MAAM;IAAEC,SAAS;IAAEC;EAAmB,CAAC,GAAGJ,eAAe,CAAC,CAAC;EAC3D,MAAMK,mBAAmB,GAAGP,cAAc,CAAC,KAAK,CAAC;EAEjDD,eAAe,CAAC,MAAM;IACrB,SAAS;;IAET,IAAI,CAACK,EAAE,EAAE;MACRG,mBAAmB,CAACC,KAAK,GAAG,IAAI;MAChC;IACD;IAEA,IAAI,CAACD,mBAAmB,CAACC,KAAK,EAAE;MAC/BC,qBAAqB,CAAC,MAAM;QAC3BF,mBAAmB,CAACC,KAAK,GAAG,IAAI;MACjC,CAAC,CAAC;IACH;EACD,CAAC,CAAC;EAEF,MAAME,gBAAgB,GAAGZ,gBAAgB,CAAC,MAAM;IAC/C,SAAS;;IAET,IAAI,CAACM,EAAE,EAAE;MACR,OAAOH,SAAS;IACjB;;IAEA;IACA,MAAMU,QAAQ,GAAGN,SAAS,CAACG,KAAK,CAACJ,EAAE,CAAC;IAEpC,MAAMQ,aAAa,GAAGN,kBAAkB,CAACO,IAAI,CAC3CC,WAAW,IAAKA,WAAW,CAACN,KAAK,CAACJ,EAAE,CACtC,CAAC,EAAEI,KAAK,CAACJ,EAAE,CAAC;IAEZ,MAAMW,IAAI,GAAGJ,QAAQ,IAAIC,aAAa,IAAIX,SAAS;IAEnD,IAAIe,OAAO,GAAG,CAAC;IAEf,IAAI,SAAS,IAAID,IAAI,EAAE;MACtBC,OAAO,GAAGD,IAAI,CAACC,OAAiB;IACjC;IAEA,IAAI,CAACT,mBAAmB,CAACC,KAAK,EAAE;MAC/B,OAAO;QAAE,GAAGO,IAAI;QAAEC,OAAO,EAAE;MAAE,CAAC;IAC/B;IAEA,IAAI,SAAS,IAAID,IAAI,EAAE;MACtB,OAAOA,IAAI;IACZ;IAEA,OAAO;MAAE,GAAGA,IAAI;MAAEC;IAAQ,CAAC;EAC5B,CAAC,CAAC;EAEF,OAAO;IAAEN;EAAiB,CAAC;AAC5B,CAAC","ignoreList":[]}
+{"version":3,"names":["useAnimatedProps","useAnimatedStyle","useSharedValue","EPSILON","NO_PROPS","NO_STYLES","useDescriptorDerivations","useScreenStyles","AnimationStore","BoundStore","TRANSIENT_EMPTY_GRACE_FRAMES","TRANSITION_PROGRESS_COMPLETE","IDENTITY_TRANSFORM","translateX","translateY","scaleX","scaleY","ALWAYS_RESET_STYLE_VALUES","zIndex","elevation","hasAnyKeys","record","_key","collectKeyMeta","keys","hasAny","key","getGroupTagParts","tag","separatorIndex","indexOf","length","group","slice","memberId","allowPreviousTransitionEvidence","groupTagParts","activeGroupMemberId","getGroupActiveId","buildUnsetPatch","previousKeys","currentKeys","shouldDeferUnset","resetTransformOnUnset","unsetPatch","shouldAlwaysUnset","transform","undefined","useAssociatedStyles","id","waitForFirstResolvedStyle","stylesMap","ancestorStylesMaps","previousScreenKey","currentScreenKey","hasConfiguredInterpolator","isAnimating","getRouteAnimation","progress","isClosing","previousAppliedKeys","emptyGraceFrameCount","lastResolvedBase","associatedStyles","ownSlot","value","ancestorSlot","find","ancestorMap","slot","base","style","hasCurrentKeys","hasPreviousKeys","isTransitioning","get","isTransitionProgressInFlight","isTransitionInFlight","canUsePreviousTransitionEvidence","hasActiveLink","hasPendingLink","hasSourceLink","hasDestinationLink","hasPreviousTransitionEvidence","getSnapshot","hasBoundaryPresence","shouldExpectIncomingStyle","shouldProtectInFlightStyles","hasPersistedResolvedStyle","hasResolvedStyle","isTransientEmptyGap","isWithinGapGrace","mode","resolvedBase","opacity","mergedBase","associatedProps","props"],"sourceRoot":"../../../../../src","sources":["shared/hooks/animation/use-associated-style.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/hooks/gestures/use-screen-gesture.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { useGestureContext } from "../../providers/gestures.provider";
+import { useGestureContext } from "../../providers/gestures";
 
 /**
  * Returns a ref to the screen's navigation pan gesture.

package/lib/module/shared/hooks/gestures/use-screen-gesture.js.map

@@ -1 +1 @@
-{"version":3,"names":["useGestureContext","useScreenGesture","ctx","panGestureRef"],"sourceRoot":"../../../../../src","sources":["shared/hooks/gestures/use-screen-gesture.ts"],"mappings":";;AAAA,SAASA,iBAAiB,QAAQ,mCAAmC;;AAErE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,gBAAgB,GAAGA,CAAA,KAAM;EACrC,MAAMC,GAAG,GAAGF,iBAAiB,CAAC,CAAC;EAC/B,OAAOE,GAAG,EAAEC,aAAa,IAAI,IAAI;AAClC,CAAC","ignoreList":[]}
+{"version":3,"names":["useGestureContext","useScreenGesture","ctx","panGestureRef"],"sourceRoot":"../../../../../src","sources":["shared/hooks/gestures/use-screen-gesture.ts"],"mappings":";;AAAA,SAASA,iBAAiB,QAAQ,0BAA0B;;AAE5D;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,gBAAgB,GAAGA,CAAA,KAAM;EACrC,MAAMC,GAAG,GAAGF,iBAAiB,CAAC,CAAC;EAC/B,OAAOE,GAAG,EAAEC,aAAa,IAAI,IAAI;AAClC,CAAC","ignoreList":[]}

package/lib/module/shared/hooks/gestures/use-scroll-registry.js

@@ -17,7 +17,7 @@
 import { useMemo } from "react";
 import { Gesture } from "react-native-gesture-handler";
 import { useAnimatedScrollHandler } from "react-native-reanimated";
-import { useGestureContext } from "../../providers/gestures.provider";
+import { useGestureContext } from "../../providers/gestures";
 import useStableCallback from "../use-stable-callback";
 
 /** Walks up context tree to find the screen that owns a specific direction. */
@@ -79,24 +79,24 @@ export const useScrollRegistry = props => {
       "worklet";
 
       for (const scrollConfig of scrollConfigs) {
-        if (scrollConfig.value) {
-          scrollConfig.value = {
-            ...scrollConfig.value,
-            isTouched: true
-          };
-        }
+        scrollConfig.modify(v => {
+          "worklet";
+
+          if (v) v.isTouched = true;
+          return v;
+        });
       }
     };
     const clearIsTouched = () => {
       "worklet";
 
       for (const scrollConfig of scrollConfigs) {
-        if (scrollConfig.value) {
-          scrollConfig.value = {
-            ...scrollConfig.value,
-            isTouched: false
-          };
-        }
+        scrollConfig.modify(v => {
+          "worklet";
+
+          if (v) v.isTouched = false;
+          return v;
+        });
       }
     };
 

package/lib/module/shared/hooks/gestures/use-scroll-registry.js.map

@@ -1 +1 @@
-{"version":3,"names":["useMemo","Gesture","useAnimatedScrollHandler","useGestureContext","useStableCallback","findGestureOwnerForDirection","context","direction","current","startIsolated","isIsolated","undefined","claimedDirections","ancestorContext","findGestureOwnersForAxis","axis","directions","owners","dir","owner","includes","push","useScrollRegistry","props","scrollDirection","scrollConfigs","map","o","scrollConfig","filter","c","panGestures","panGesture","g","nativeGesture","length","setIsTouched","value","isTouched","clearIsTouched","gesture","Native","onTouchesDown","onTouchesUp","onTouchesCancelled","requireExternalGestureToFail","scrollHandler","onScroll","event","update","v","x","contentOffset","y","contentHeight","contentWidth","layoutHeight","layoutWidth","modify","onContentSizeChange","width","height","onLayout","nativeEvent","layout"],"sourceRoot":"../../../../../src","sources":["shared/hooks/gestures/use-scroll-registry.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useMemo","Gesture","useAnimatedScrollHandler","useGestureContext","useStableCallback","findGestureOwnerForDirection","context","direction","current","startIsolated","isIsolated","undefined","claimedDirections","ancestorContext","findGestureOwnersForAxis","axis","directions","owners","dir","owner","includes","push","useScrollRegistry","props","scrollDirection","scrollConfigs","map","o","scrollConfig","filter","c","panGestures","panGesture","g","nativeGesture","length","setIsTouched","modify","v","isTouched","clearIsTouched","gesture","Native","onTouchesDown","onTouchesUp","onTouchesCancelled","requireExternalGestureToFail","scrollHandler","onScroll","event","update","x","contentOffset","y","contentHeight","contentWidth","layoutHeight","layoutWidth","onContentSizeChange","width","height","onLayout","nativeEvent","layout"],"sourceRoot":"../../../../../src","sources":["shared/hooks/gestures/use-scroll-registry.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/hooks/navigation/use-closing-route-keys.js.map

@@ -1 +1 @@
-{"version":3,"names":["useMemo","useRef","useSharedValue","useStableCallback","useClosingRouteKeys","keysRef","Set","shared","add","key","keys","current","has","modify","prev","includes","push","remove","delete","index","indexOf","splice","clear","length","ref"],"sourceRoot":"../../../../../src","sources":["shared/hooks/navigation/use-closing-route-keys.tsx"],"mappings":";;AAAA,SAASA,OAAO,EAAEC,MAAM,QAAQ,OAAO;AACvC,SAASC,cAAc,QAAQ,yBAAyB;AACxD,OAAOC,iBAAiB,MAAM,wBAAwB;AAEtD,OAAO,MAAMC,mBAAmB,GAAGA,CAAA,KAAM;EACxC,MAAMC,OAAO,GAAGJ,MAAM,CAAc,IAAIK,GAAG,CAAC,CAAC,CAAC;EAC9C,MAAMC,MAAM,GAAGL,cAAc,CAAW,EAAE,CAAC;EAE3C,MAAMM,GAAG,GAAGL,iBAAiB,CAAEM,GAAW,IAAK;IAC9C,MAAMC,IAAI,GAAGL,OAAO,CAACM,OAAO;IAC5B,IAAID,IAAI,CAACE,GAAG,CAACH,GAAG,CAAC,EAAE;MAClB;IACD;IAEAC,IAAI,CAACF,GAAG,CAACC,GAAG,CAAC;IACbF,MAAM,CAACM,MAAM,CAAEC,IAAI,IAAK;MACvB,SAAS;;MACT,IAAI,CAACA,IAAI,CAACC,QAAQ,CAACN,GAAG,CAAC,EAAE;QACxBK,IAAI,CAACE,IAAI,CAACP,GAAG,CAAC;MACf;MACA,OAAOK,IAAI;IACZ,CAAC,CAAC;EACH,CAAC,CAAC;EAEF,MAAMG,MAAM,GAAGd,iBAAiB,CAAEM,GAAW,IAAK;IACjD,MAAMC,IAAI,GAAGL,OAAO,CAACM,OAAO;IAC5BD,IAAI,CAACQ,MAAM,CAACT,GAAG,CAAC;IAEhBF,MAAM,CAACM,MAAM,CAAEC,IAAI,IAAK;MACvB,SAAS;;MACT,MAAMK,KAAK,GAAGL,IAAI,CAACM,OAAO,CAACX,GAAG,CAAC;MAC/B,IAAIU,KAAK,KAAK,CAAC,CAAC,EAAE;QACjBL,IAAI,CAACO,MAAM,CAACF,KAAK,EAAE,CAAC,CAAC;MACtB;MACA,OAAOL,IAAI;IACZ,CAAC,CAAC;EACH,CAAC,CAAC;EAEF,MAAMQ,KAAK,GAAGnB,iBAAiB,CAAC,MAAM;IACrC,MAAMO,IAAI,GAAGL,OAAO,CAACM,OAAO;IAE5BD,IAAI,CAACY,KAAK,CAAC,CAAC;IACZf,MAAM,CAACM,MAAM,CAAEC,IAAI,IAAK;MACvB,SAAS;;MACTA,IAAI,CAACS,MAAM,GAAG,CAAC;MACf,OAAOT,IAAI;IACZ,CAAC,CAAC;EACH,CAAC,CAAC;EAEF,OAAOd,OAAO,CACb,OAAO;IACNwB,GAAG,EAAEnB,OAAO;IACZE,MAAM;IACNC,GAAG;IACHS,MAAM;IACNK;EACD,CAAC,CAAC,EACF,CAACf,MAAM,EAAEC,GAAG,EAAES,MAAM,EAAEK,KAAK,CAC5B,CAAC;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["useMemo","useRef","useSharedValue","useStableCallback","useClosingRouteKeys","keysRef","Set","shared","add","key","keys","current","has","modify","prev","includes","push","remove","delete","index","indexOf","splice","clear","length","ref"],"sourceRoot":"../../../../../src","sources":["shared/hooks/navigation/use-closing-route-keys.ts"],"mappings":";;AAAA,SAASA,OAAO,EAAEC,MAAM,QAAQ,OAAO;AACvC,SAASC,cAAc,QAAQ,yBAAyB;AACxD,OAAOC,iBAAiB,MAAM,wBAAwB;AAEtD,OAAO,MAAMC,mBAAmB,GAAGA,CAAA,KAAM;EACxC,MAAMC,OAAO,GAAGJ,MAAM,CAAc,IAAIK,GAAG,CAAC,CAAC,CAAC;EAC9C,MAAMC,MAAM,GAAGL,cAAc,CAAW,EAAE,CAAC;EAE3C,MAAMM,GAAG,GAAGL,iBAAiB,CAAEM,GAAW,IAAK;IAC9C,MAAMC,IAAI,GAAGL,OAAO,CAACM,OAAO;IAC5B,IAAID,IAAI,CAACE,GAAG,CAACH,GAAG,CAAC,EAAE;MAClB;IACD;IAEAC,IAAI,CAACF,GAAG,CAACC,GAAG,CAAC;IACbF,MAAM,CAACM,MAAM,CAAEC,IAAI,IAAK;MACvB,SAAS;;MACT,IAAI,CAACA,IAAI,CAACC,QAAQ,CAACN,GAAG,CAAC,EAAE;QACxBK,IAAI,CAACE,IAAI,CAACP,GAAG,CAAC;MACf;MACA,OAAOK,IAAI;IACZ,CAAC,CAAC;EACH,CAAC,CAAC;EAEF,MAAMG,MAAM,GAAGd,iBAAiB,CAAEM,GAAW,IAAK;IACjD,MAAMC,IAAI,GAAGL,OAAO,CAACM,OAAO;IAC5BD,IAAI,CAACQ,MAAM,CAACT,GAAG,CAAC;IAEhBF,MAAM,CAACM,MAAM,CAAEC,IAAI,IAAK;MACvB,SAAS;;MACT,MAAMK,KAAK,GAAGL,IAAI,CAACM,OAAO,CAACX,GAAG,CAAC;MAC/B,IAAIU,KAAK,KAAK,CAAC,CAAC,EAAE;QACjBL,IAAI,CAACO,MAAM,CAACF,KAAK,EAAE,CAAC,CAAC;MACtB;MACA,OAAOL,IAAI;IACZ,CAAC,CAAC;EACH,CAAC,CAAC;EAEF,MAAMQ,KAAK,GAAGnB,iBAAiB,CAAC,MAAM;IACrC,MAAMO,IAAI,GAAGL,OAAO,CAACM,OAAO;IAE5BD,IAAI,CAACY,KAAK,CAAC,CAAC;IACZf,MAAM,CAACM,MAAM,CAAEC,IAAI,IAAK;MACvB,SAAS;;MACTA,IAAI,CAACS,MAAM,GAAG,CAAC;MACf,OAAOT,IAAI;IACZ,CAAC,CAAC;EACH,CAAC,CAAC;EAEF,OAAOd,OAAO,CACb,OAAO;IACNwB,GAAG,EAAEnB,OAAO;IACZE,MAAM;IACNC,GAAG;IACHS,MAAM;IACNK;EACD,CAAC,CAAC,EACF,CAACf,MAAM,EAAEC,GAAG,EAAES,MAAM,EAAEK,KAAK,CAC5B,CAAC;AACF,CAAC","ignoreList":[]}

package/lib/module/shared/hooks/navigation/use-navigation-helpers.js

@@ -0,0 +1,26 @@
+"use strict";
+
+import { StackActions } from "@react-navigation/native";
+import { useCallback } from "react";
+import { useDescriptors } from "../../providers/screen/descriptors";
+export function useNavigationHelpers() {
+  const {
+    current
+  } = useDescriptors();
+  const dismissScreen = useCallback(() => {
+    const state = current.navigation.getState();
+    const routeIndex = state.routes.findIndex(route => route.key === current.route.key);
+    const routeStillPresent = routeIndex !== -1;
+    if (!routeStillPresent || routeIndex === 0) return false;
+    current.navigation.dispatch({
+      ...StackActions.pop(),
+      source: current.route.key,
+      target: state.key
+    });
+    return true;
+  }, [current]);
+  return {
+    dismissScreen
+  };
+}
+//# sourceMappingURL=use-navigation-helpers.js.map

package/lib/module/shared/hooks/navigation/use-navigation-helpers.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["StackActions","useCallback","useDescriptors","useNavigationHelpers","current","dismissScreen","state","navigation","getState","routeIndex","routes","findIndex","route","key","routeStillPresent","dispatch","pop","source","target"],"sourceRoot":"../../../../../src","sources":["shared/hooks/navigation/use-navigation-helpers.ts"],"mappings":";;AAAA,SAASA,YAAY,QAAQ,0BAA0B;AACvD,SAASC,WAAW,QAAQ,OAAO;AACnC,SAASC,cAAc,QAAQ,oCAAoC;AAEnE,OAAO,SAASC,oBAAoBA,CAAA,EAAG;EACtC,MAAM;IAAEC;EAAQ,CAAC,GAAGF,cAAc,CAAC,CAAC;EAEpC,MAAMG,aAAa,GAAGJ,WAAW,CAAC,MAAe;IAChD,MAAMK,KAAK,GAAGF,OAAO,CAACG,UAAU,CAACC,QAAQ,CAAC,CAAC;IAC3C,MAAMC,UAAU,GAAGH,KAAK,CAACI,MAAM,CAACC,SAAS,CACvCC,KAAK,IAAKA,KAAK,CAACC,GAAG,KAAKT,OAAO,CAACQ,KAAK,CAACC,GACxC,CAAC;IACD,MAAMC,iBAAiB,GAAGL,UAAU,KAAK,CAAC,CAAC;IAC3C,IAAI,CAACK,iBAAiB,IAAIL,UAAU,KAAK,CAAC,EAAE,OAAO,KAAK;IAExDL,OAAO,CAACG,UAAU,CAACQ,QAAQ,CAAC;MAC3B,GAAGf,YAAY,CAACgB,GAAG,CAAC,CAAC;MACrBC,MAAM,EAAEb,OAAO,CAACQ,KAAK,CAACC,GAAG;MACzBK,MAAM,EAAEZ,KAAK,CAACO;IACf,CAAC,CAAC;IACF,OAAO,IAAI;EACZ,CAAC,EAAE,CAACT,OAAO,CAAC,CAAC;EAEb,OAAO;IAAEC;EAAc,CAAC;AACzB","ignoreList":[]}

package/lib/module/shared/hooks/navigation/use-optimistic-focused-index.js

@@ -0,0 +1,17 @@
+"use strict";
+
+import { useDerivedValue } from "react-native-reanimated";
+import { useSharedValueState } from "../reanimated/use-shared-value-state";
+
+/**
+ * Returns a JS-focused index derived from optimisticFocusedIndex and clamped to route count.
+ * Keeps callers aligned on focus behavior during transitions with closing screens.
+ */
+export function useOptimisticFocusedIndex(optimisticFocusedIndex, routeCount) {
+  return useSharedValueState(useDerivedValue(() => {
+    const globalIndex = optimisticFocusedIndex.get();
+    if (routeCount <= 0) return 0;
+    return Math.max(0, Math.min(globalIndex, routeCount - 1));
+  }));
+}
+//# sourceMappingURL=use-optimistic-focused-index.js.map

package/lib/module/shared/hooks/navigation/use-optimistic-focused-index.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["useDerivedValue","useSharedValueState","useOptimisticFocusedIndex","optimisticFocusedIndex","routeCount","globalIndex","get","Math","max","min"],"sourceRoot":"../../../../../src","sources":["shared/hooks/navigation/use-optimistic-focused-index.ts"],"mappings":";;AAAA,SAA4BA,eAAe,QAAQ,yBAAyB;AAC5E,SAASC,mBAAmB,QAAQ,sCAAsC;;AAE1E;AACA;AACA;AACA;AACA,OAAO,SAASC,yBAAyBA,CACxCC,sBAA4C,EAC5CC,UAAkB,EACT;EACT,OAAOH,mBAAmB,CACzBD,eAAe,CAAC,MAAM;IACrB,MAAMK,WAAW,GAAGF,sBAAsB,CAACG,GAAG,CAAC,CAAC;IAChD,IAAIF,UAAU,IAAI,CAAC,EAAE,OAAO,CAAC;IAC7B,OAAOG,IAAI,CAACC,GAAG,CAAC,CAAC,EAAED,IAAI,CAACE,GAAG,CAACJ,WAAW,EAAED,UAAU,GAAG,CAAC,CAAC,CAAC;EAC1D,CAAC,CACF,CAAC;AACF","ignoreList":[]}

package/lib/module/shared/hooks/navigation/use-previous.js.map

@@ -1 +1 @@
-{"version":3,"names":["useEffect","useRef","usePrevious","value","ref","current"],"sourceRoot":"../../../../../src","sources":["shared/hooks/navigation/use-previous.tsx"],"mappings":";;AAAA,SAASA,SAAS,EAAEC,MAAM,QAAQ,OAAO;AAEzC,OAAO,MAAMC,WAAW,GAAQC,KAAQ,IAAe;EACtD,MAAMC,GAAG,GAAGH,MAAM,CAAI,IAAI,CAAC;EAE3BD,SAAS,CAAC,MAAM;IACfI,GAAG,CAACC,OAAO,GAAGF,KAAK;EACpB,CAAC,CAAC;EAEF,OAAOC,GAAG,CAACC,OAAO;AACnB,CAAC","ignoreList":[]}
+{"version":3,"names":["useEffect","useRef","usePrevious","value","ref","current"],"sourceRoot":"../../../../../src","sources":["shared/hooks/navigation/use-previous.ts"],"mappings":";;AAAA,SAASA,SAAS,EAAEC,MAAM,QAAQ,OAAO;AAEzC,OAAO,MAAMC,WAAW,GAAOC,KAAQ,IAAe;EACrD,MAAMC,GAAG,GAAGH,MAAM,CAAI,IAAI,CAAC;EAE3BD,SAAS,CAAC,MAAM;IACfI,GAAG,CAACC,OAAO,GAAGF,KAAK;EACpB,CAAC,CAAC;EAEF,OAAOC,GAAG,CAACC,OAAO;AACnB,CAAC","ignoreList":[]}

package/lib/module/shared/hooks/navigation/use-screen-state.js

@@ -1,10 +1,9 @@
 "use strict";
 
 import { useCallback, useMemo } from "react";
-import { useDerivedValue } from "react-native-reanimated";
 import { snapDescriptorToIndex } from "../../animation/snap-to";
-import { useKeys } from "../../providers/screen/keys.provider";
-import { useSharedValueState } from "../reanimated/use-shared-value-state";
+import { useDescriptors } from "../../providers/screen/descriptors";
+import { useOptimisticFocusedIndex } from "./use-optimistic-focused-index";
 import { useStack } from "./use-stack";
 /**
  * Hook to access screen state information.
@@ -20,12 +19,9 @@ export function useScreenState() {
   } = useStack();
   const {
     current
-  } = useKeys();
+  } = useDescriptors();
   const index = useMemo(() => routeKeys.indexOf(current.route.key), [routeKeys, current.route.key]);
-  const focusedIndex = useSharedValueState(useDerivedValue(() => {
-    const globalIndex = optimisticFocusedIndex.get();
-    return Math.max(0, Math.min(globalIndex, routeKeys.length - 1));
-  }));
+  const focusedIndex = useOptimisticFocusedIndex(optimisticFocusedIndex, routeKeys.length);
   const focusedScene = useMemo(() => {
     return scenes[focusedIndex] ?? scenes[scenes.length - 1];
   }, [scenes, focusedIndex]);

package/lib/module/shared/hooks/navigation/use-screen-state.js.map

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useMemo","useDerivedValue","snapDescriptorToIndex","useKeys","useSharedValueState","useStack","useScreenState","routes","scenes","routeKeys","optimisticFocusedIndex","current","index","indexOf","route","key","focusedIndex","globalIndex","get","Math","max","min","length","focusedScene","snapTo","targetIndex","descriptor","options","focusedRoute","meta","navigation"],"sourceRoot":"../../../../../src","sources":["shared/hooks/navigation/use-screen-state.tsx"],"mappings":";;AACA,SAASA,WAAW,EAAEC,OAAO,QAAQ,OAAO;AAC5C,SAASC,eAAe,QAAQ,yBAAyB;AACzD,SAASC,qBAAqB,QAAQ,yBAAyB;AAC/D,SAECC,OAAO,QACD,sCAAsC;AAG7C,SAASC,mBAAmB,QAAQ,sCAAsC;AAC1E,SAAiCC,QAAQ,QAAQ,aAAa;AAgD9D;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,cAAcA,CAAA,EAEA;EAC7B,MAAM;IAAEC,MAAM;IAAEC,MAAM;IAAEC,SAAS;IAAEC;EAAuB,CAAC,GAC1DL,QAAQ,CAAoB,CAAC;EAC9B,MAAM;IAAEM;EAAQ,CAAC,GAAGR,OAAO,CAAiB,CAAC;EAE7C,MAAMS,KAAK,GAAGZ,OAAO,CACpB,MAAMS,SAAS,CAACI,OAAO,CAACF,OAAO,CAACG,KAAK,CAACC,GAAG,CAAC,EAC1C,CAACN,SAAS,EAAEE,OAAO,CAACG,KAAK,CAACC,GAAG,CAC9B,CAAC;EAED,MAAMC,YAAY,GAAGZ,mBAAmB,CACvCH,eAAe,CAAC,MAAM;IACrB,MAAMgB,WAAW,GAAGP,sBAAsB,CAACQ,GAAG,CAAC,CAAC;IAChD,OAAOC,IAAI,CAACC,GAAG,CAAC,CAAC,EAAED,IAAI,CAACE,GAAG,CAACJ,WAAW,EAAER,SAAS,CAACa,MAAM,GAAG,CAAC,CAAC,CAAC;EAChE,CAAC,CACF,CAAC;EAED,MAAMC,YAAY,GAAGvB,OAAO,CAAC,MAAM;IAClC,OAAOQ,MAAM,CAACQ,YAAY,CAAC,IAAIR,MAAM,CAACA,MAAM,CAACc,MAAM,GAAG,CAAC,CAAC;EACzD,CAAC,EAAE,CAACd,MAAM,EAAEQ,YAAY,CAAC,CAAC;EAE1B,MAAMQ,MAAM,GAAGzB,WAAW,CACxB0B,WAAmB,IAAK;IACxB,MAAMC,UAAU,GAAGH,YAAY,EAAEG,UAAU;IAC3C,IAAI,CAACA,UAAU,EAAE;IACjBxB,qBAAqB,CAACwB,UAAU,EAAED,WAAW,CAAC;EAC/C,CAAC,EACD,CAACF,YAAY,CACd,CAAC;EAED,OAAOvB,OAAO,CACb,OAAO;IACNY,KAAK;IACLe,OAAO,EAAEJ,YAAY,EAAEG,UAAU,EAAEC,OAAO,IAAI,CAAC,CAAC;IAChDpB,MAAM;IACNqB,YAAY,EAAEL,YAAY,EAAET,KAAK,IAAIH,OAAO,CAACG,KAAK;IAClDE,YAAY;IACZa,IAAI,EAAEN,YAAY,EAAEG,UAAU,EAAEC,OAAO,EAAEE,IAAI;IAC7CC,UAAU,EAAEnB,OAAO,CAACmB,UAAyB;IAC7CN;EACD,CAAC,CAAC,EACF,CACCZ,KAAK,EACLW,YAAY,EACZhB,MAAM,EACNS,YAAY,EACZL,OAAO,CAACmB,UAAU,EAClBnB,OAAO,CAACG,KAAK,EACbU,MAAM,CAER,CAAC;AACF","ignoreList":[]}
+{"version":3,"names":["useCallback","useMemo","snapDescriptorToIndex","useDescriptors","useOptimisticFocusedIndex","useStack","useScreenState","routes","scenes","routeKeys","optimisticFocusedIndex","current","index","indexOf","route","key","focusedIndex","length","focusedScene","snapTo","targetIndex","descriptor","options","focusedRoute","meta","navigation"],"sourceRoot":"../../../../../src","sources":["shared/hooks/navigation/use-screen-state.ts"],"mappings":";;AACA,SAASA,WAAW,EAAEC,OAAO,QAAQ,OAAO;AAC5C,SAASC,qBAAqB,QAAQ,yBAAyB;AAC/D,SAECC,cAAc,QACR,oCAAoC;AAG3C,SAASC,yBAAyB,QAAQ,gCAAgC;AAC1E,SAAiCC,QAAQ,QAAQ,aAAa;AAgD9D;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,cAAcA,CAAA,EAEA;EAC7B,MAAM;IAAEC,MAAM;IAAEC,MAAM;IAAEC,SAAS;IAAEC;EAAuB,CAAC,GAC1DL,QAAQ,CAAoB,CAAC;EAC9B,MAAM;IAAEM;EAAQ,CAAC,GAAGR,cAAc,CAAiB,CAAC;EAEpD,MAAMS,KAAK,GAAGX,OAAO,CACpB,MAAMQ,SAAS,CAACI,OAAO,CAACF,OAAO,CAACG,KAAK,CAACC,GAAG,CAAC,EAC1C,CAACN,SAAS,EAAEE,OAAO,CAACG,KAAK,CAACC,GAAG,CAC9B,CAAC;EAED,MAAMC,YAAY,GAAGZ,yBAAyB,CAC7CM,sBAAsB,EACtBD,SAAS,CAACQ,MACX,CAAC;EAED,MAAMC,YAAY,GAAGjB,OAAO,CAAC,MAAM;IAClC,OAAOO,MAAM,CAACQ,YAAY,CAAC,IAAIR,MAAM,CAACA,MAAM,CAACS,MAAM,GAAG,CAAC,CAAC;EACzD,CAAC,EAAE,CAACT,MAAM,EAAEQ,YAAY,CAAC,CAAC;EAE1B,MAAMG,MAAM,GAAGnB,WAAW,CACxBoB,WAAmB,IAAK;IACxB,MAAMC,UAAU,GAAGH,YAAY,EAAEG,UAAU;IAC3C,IAAI,CAACA,UAAU,EAAE;IACjBnB,qBAAqB,CAACmB,UAAU,EAAED,WAAW,CAAC;EAC/C,CAAC,EACD,CAACF,YAAY,CACd,CAAC;EAED,OAAOjB,OAAO,CACb,OAAO;IACNW,KAAK;IACLU,OAAO,EAAEJ,YAAY,EAAEG,UAAU,EAAEC,OAAO,IAAI,CAAC,CAAC;IAChDf,MAAM;IACNgB,YAAY,EAAEL,YAAY,EAAEJ,KAAK,IAAIH,OAAO,CAACG,KAAK;IAClDE,YAAY;IACZQ,IAAI,EAAEN,YAAY,EAAEG,UAAU,EAAEC,OAAO,EAAEE,IAAI;IAC7CC,UAAU,EAAEd,OAAO,CAACc,UAAyB;IAC7CN;EACD,CAAC,CAAC,EACF,CACCP,KAAK,EACLM,YAAY,EACZX,MAAM,EACNS,YAAY,EACZL,OAAO,CAACc,UAAU,EAClBd,OAAO,CAACG,KAAK,EACbK,MAAM,CAER,CAAC;AACF","ignoreList":[]}