react-native-screen-transitions 3.5.2 → 3.6.0-alpha.1

package/lib/module/shared/providers/screen/styles/helpers/resolve-slot-styles/slot-state.js

@@ -0,0 +1,119 @@
+"use strict";
+
+import { getPropResetValue, getStyleResetValue } from "./reset-values";
+const hasTrackedKey = (keys, key) => {
+  "worklet";
+
+  return keys !== undefined && keys[key] === true;
+};
+const isDefinedStyleValue = value => {
+  "worklet";
+
+  return value !== undefined && value !== null;
+};
+
+// fallow-ignore-next-line complexity
+const collectDefinedKeys = ({
+  source,
+  getResetValue
+}) => {
+  "worklet";
+
+  const sourceValues = source ?? {};
+  const keys = {};
+  const resetValues = {};
+  let hasKeys = false;
+  let hasResetValues = false;
+  for (const key in sourceValues) {
+    const value = sourceValues[key];
+    if (!isDefinedStyleValue(value)) {
+      continue;
+    }
+    keys[key] = true;
+    hasKeys = true;
+    const resetValue = getResetValue(key, value);
+    if (resetValue !== undefined) {
+      resetValues[key] = resetValue;
+      hasResetValues = true;
+    }
+  }
+  return {
+    keys: hasKeys ? keys : undefined,
+    resetValues: hasResetValues ? resetValues : undefined,
+    hasKeys
+  };
+};
+export const hasDisappearedKeys = (previousKeys, currentKeys) => {
+  "worklet";
+
+  if (!previousKeys) {
+    return false;
+  }
+  for (const key in previousKeys) {
+    if (!hasTrackedKey(currentKeys, key)) {
+      return true;
+    }
+  }
+  return false;
+};
+const hasEitherKeySet = (styleKeys, propKeys) => {
+  "worklet";
+
+  return styleKeys !== undefined || propKeys !== undefined;
+};
+const getNextStyleState = ({
+  styleKeys,
+  styleResetValues,
+  propKeys,
+  propResetValues
+}) => {
+  "worklet";
+
+  if (!hasEitherKeySet(styleKeys, propKeys)) {
+    return undefined;
+  }
+  return {
+    styleKeys,
+    styleResetValues,
+    propKeys,
+    propResetValues
+  };
+};
+export const getResolvedSlotState = slot => {
+  "worklet";
+
+  const baseStyle = slot?.style;
+  const baseProps = slot?.props;
+  const {
+    keys: styleKeys,
+    resetValues: styleResetValues,
+    hasKeys: hasAnyStyleKeys
+  } = collectDefinedKeys({
+    source: baseStyle,
+    getResetValue: getStyleResetValue
+  });
+  const {
+    keys: propKeys,
+    resetValues: propResetValues,
+    hasKeys: hasAnyPropKeys
+  } = collectDefinedKeys({
+    source: baseProps,
+    getResetValue: getPropResetValue
+  });
+  return {
+    baseStyle,
+    baseProps,
+    styleKeys,
+    propKeys,
+    hasAnyStyleKeys,
+    hasAnyPropKeys,
+    hasAnyKeys: hasAnyStyleKeys || hasAnyPropKeys,
+    nextState: getNextStyleState({
+      styleKeys,
+      styleResetValues,
+      propKeys,
+      propResetValues
+    })
+  };
+};
+//# sourceMappingURL=slot-state.js.map

package/lib/module/shared/providers/screen/styles/helpers/resolve-slot-styles/slot-state.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["getPropResetValue","getStyleResetValue","hasTrackedKey","keys","key","undefined","isDefinedStyleValue","value","collectDefinedKeys","source","getResetValue","sourceValues","resetValues","hasKeys","hasResetValues","resetValue","hasDisappearedKeys","previousKeys","currentKeys","hasEitherKeySet","styleKeys","propKeys","getNextStyleState","styleResetValues","propResetValues","getResolvedSlotState","slot","baseStyle","style","baseProps","props","hasAnyStyleKeys","hasAnyPropKeys","hasAnyKeys","nextState"],"sourceRoot":"../../../../../../../../src","sources":["shared/providers/screen/styles/helpers/resolve-slot-styles/slot-state.ts"],"mappings":";;AACA,SAASA,iBAAiB,EAAEC,kBAAkB,QAAQ,gBAAgB;AAGtE,MAAMC,aAAa,GAAGA,CAACC,IAAsC,EAAEC,GAAW,KAAK;EAC9E,SAAS;;EACT,OAAOD,IAAI,KAAKE,SAAS,IAAIF,IAAI,CAACC,GAAG,CAAC,KAAK,IAAI;AAChD,CAAC;AAED,MAAME,mBAAmB,GAAIC,KAAc,IAAK;EAC/C,SAAS;;EACT,OAAOA,KAAK,KAAKF,SAAS,IAAIE,KAAK,KAAK,IAAI;AAC7C,CAAC;;AAED;AACA,MAAMC,kBAAkB,GAAGA,CAAC;EAC3BC,MAAM;EACNC;AAID,CAAC,KAAK;EACL,SAAS;;EACT,MAAMC,YAAY,GAAGF,MAAM,IAAI,CAAC,CAAC;EACjC,MAAMN,IAA0B,GAAG,CAAC,CAAC;EACrC,MAAMS,WAAoC,GAAG,CAAC,CAAC;EAC/C,IAAIC,OAAO,GAAG,KAAK;EACnB,IAAIC,cAAc,GAAG,KAAK;EAE1B,KAAK,MAAMV,GAAG,IAAIO,YAAY,EAAE;IAC/B,MAAMJ,KAAK,GAAGI,YAAY,CAACP,GAAG,CAAC;IAE/B,IAAI,CAACE,mBAAmB,CAACC,KAAK,CAAC,EAAE;MAChC;IACD;IAEAJ,IAAI,CAACC,GAAG,CAAC,GAAG,IAAI;IAChBS,OAAO,GAAG,IAAI;IAEd,MAAME,UAAU,GAAGL,aAAa,CAACN,GAAG,EAAEG,KAAK,CAAC;IAE5C,IAAIQ,UAAU,KAAKV,SAAS,EAAE;MAC7BO,WAAW,CAACR,GAAG,CAAC,GAAGW,UAAU;MAC7BD,cAAc,GAAG,IAAI;IACtB;EACD;EAEA,OAAO;IACNX,IAAI,EAAEU,OAAO,GAAGV,IAAI,GAAGE,SAAS;IAChCO,WAAW,EAAEE,cAAc,GAAGF,WAAW,GAAGP,SAAS;IACrDQ;EACD,CAAC;AACF,CAAC;AAED,OAAO,MAAMG,kBAAkB,GAAGA,CACjCC,YAA8C,EAC9CC,WAA6C,KACzC;EACJ,SAAS;;EAET,IAAI,CAACD,YAAY,EAAE;IAClB,OAAO,KAAK;EACb;EAEA,KAAK,MAAMb,GAAG,IAAIa,YAAY,EAAE;IAC/B,IAAI,CAACf,aAAa,CAACgB,WAAW,EAAEd,GAAG,CAAC,EAAE;MACrC,OAAO,IAAI;IACZ;EACD;EAEA,OAAO,KAAK;AACb,CAAC;AAED,MAAMe,eAAe,GAAGA,CACvBC,SAA2C,EAC3CC,QAA0C,KACtC;EACJ,SAAS;;EACT,OAAOD,SAAS,KAAKf,SAAS,IAAIgB,QAAQ,KAAKhB,SAAS;AACzD,CAAC;AAED,MAAMiB,iBAAiB,GAAGA,CAAC;EAC1BF,SAAS;EACTG,gBAAgB;EAChBF,QAAQ;EACRG;AAMD,CAAC,KAAuC;EACvC,SAAS;;EAET,IAAI,CAACL,eAAe,CAACC,SAAS,EAAEC,QAAQ,CAAC,EAAE;IAC1C,OAAOhB,SAAS;EACjB;EAEA,OAAO;IACNe,SAAS;IACTG,gBAAgB;IAChBF,QAAQ;IACRG;EACD,CAAC;AACF,CAAC;AAED,OAAO,MAAMC,oBAAoB,GAChCC,IAA+C,IAC3C;EACJ,SAAS;;EACT,MAAMC,SAAS,GAAGD,IAAI,EAAEE,KAA4C;EACpE,MAAMC,SAAS,GAAGH,IAAI,EAAEI,KAA4C;EAEpE,MAAM;IACL3B,IAAI,EAAEiB,SAAS;IACfR,WAAW,EAAEW,gBAAgB;IAC7BV,OAAO,EAAEkB;EACV,CAAC,GAAGvB,kBAAkB,CAAC;IACtBC,MAAM,EAAEkB,SAAS;IACjBjB,aAAa,EAAET;EAChB,CAAC,CAAC;EACF,MAAM;IACLE,IAAI,EAAEkB,QAAQ;IACdT,WAAW,EAAEY,eAAe;IAC5BX,OAAO,EAAEmB;EACV,CAAC,GAAGxB,kBAAkB,CAAC;IACtBC,MAAM,EAAEoB,SAAS;IACjBnB,aAAa,EAAEV;EAChB,CAAC,CAAC;EAEF,OAAO;IACN2B,SAAS;IACTE,SAAS;IACTT,SAAS;IACTC,QAAQ;IACRU,eAAe;IACfC,cAAc;IACdC,UAAU,EAAEF,eAAe,IAAIC,cAAc;IAC7CE,SAAS,EAAEZ,iBAAiB,CAAC;MAC5BF,SAAS;MACTG,gBAAgB;MAChBF,QAAQ;MACRG;IACD,CAAC;EACF,CAAC;AACF,CAAC","ignoreList":[]}

package/lib/module/shared/providers/screen/styles/helpers/resolve-slot-styles/types.js.map

@@ -0,0 +1 @@
+{"version":3,"names":[],"sourceRoot":"../../../../../../../../src","sources":["shared/providers/screen/styles/helpers/resolve-slot-styles/types.ts"],"mappings":"","ignoreList":[]}

package/lib/module/shared/providers/screen/styles/helpers/strip-interpolator-options.js

@@ -0,0 +1,17 @@
+"use strict";
+
+export const stripInterpolatorOptions = raw => {
+  "worklet";
+
+  if (!("options" in raw)) {
+    return raw;
+  }
+  const slots = {};
+  for (const key in raw) {
+    if (key !== "options") {
+      slots[key] = raw[key];
+    }
+  }
+  return slots;
+};
+//# sourceMappingURL=strip-interpolator-options.js.map

package/lib/module/shared/providers/screen/styles/helpers/strip-interpolator-options.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["stripInterpolatorOptions","raw","slots","key"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/styles/helpers/strip-interpolator-options.ts"],"mappings":";;AAAA,OAAO,MAAMA,wBAAwB,GAAIC,GAAwB,IAAK;EACrE,SAAS;;EAET,IAAI,EAAE,SAAS,IAAIA,GAAG,CAAC,EAAE;IACxB,OAAOA,GAAG;EACX;EAEA,MAAMC,KAA0B,GAAG,CAAC,CAAC;EAErC,KAAK,MAAMC,GAAG,IAAIF,GAAG,EAAE;IACtB,IAAIE,GAAG,KAAK,SAAS,EAAE;MACtBD,KAAK,CAACC,GAAG,CAAC,GAAGF,GAAG,CAACE,GAAG,CAAC;IACtB;EACD;EAEA,OAAOD,KAAK;AACb,CAAC","ignoreList":[]}

package/lib/module/shared/providers/screen/styles/helpers/visibility-gate.js

@@ -0,0 +1,39 @@
+"use strict";
+
+import { LifecycleTransitionRequestKind } from "../../../../stores/system.store";
+export const resolveScreenVisibilityGate = ({
+  isFloatingOverlay,
+  hasVisibilityGateOpened,
+  pendingLifecycleStartBlockCount,
+  pendingLifecycleRequestKind,
+  progress,
+  entering
+}) => {
+  "worklet";
+
+  if (isFloatingOverlay || hasVisibilityGateOpened) {
+    return {
+      shouldBlock: false,
+      shouldOpenGate: false
+    };
+  }
+  const hasPendingLifecycleBlock = pendingLifecycleStartBlockCount > 0;
+  const isPendingOpen = pendingLifecycleRequestKind === LifecycleTransitionRequestKind.Open;
+  const isOpening = isPendingOpen || !!entering;
+
+  // Keep the screen hidden until the first transformed opening frame exists.
+  // The lifecycle request is cleared before the RAF-scheduled progress
+  // animation starts, so `entering` carries the gate through that one-frame gap.
+  const isWaitingForOpenToStart = progress <= 0;
+  const shouldBlock = (hasPendingLifecycleBlock || isWaitingForOpenToStart) && isOpening;
+  return {
+    shouldBlock,
+    shouldOpenGate: !shouldBlock && progress > 0
+  };
+};
+export const shouldBlockScreenVisibility = state => {
+  "worklet";
+
+  return resolveScreenVisibilityGate(state).shouldBlock;
+};
+//# sourceMappingURL=visibility-gate.js.map

package/lib/module/shared/providers/screen/styles/helpers/visibility-gate.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["LifecycleTransitionRequestKind","resolveScreenVisibilityGate","isFloatingOverlay","hasVisibilityGateOpened","pendingLifecycleStartBlockCount","pendingLifecycleRequestKind","progress","entering","shouldBlock","shouldOpenGate","hasPendingLifecycleBlock","isPendingOpen","Open","isOpening","isWaitingForOpenToStart","shouldBlockScreenVisibility","state"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/styles/helpers/visibility-gate.ts"],"mappings":";;AAAA,SAASA,8BAA8B,QAAQ,iCAAiC;AAgBhF,OAAO,MAAMC,2BAA2B,GAAGA,CAAC;EAC3CC,iBAAiB;EACjBC,uBAAuB;EACvBC,+BAA+B;EAC/BC,2BAA2B;EAC3BC,QAAQ;EACRC;AAC0B,CAAC,KAAmC;EAC9D,SAAS;;EACT,IAAIL,iBAAiB,IAAIC,uBAAuB,EAAE;IACjD,OAAO;MACNK,WAAW,EAAE,KAAK;MAClBC,cAAc,EAAE;IACjB,CAAC;EACF;EAEA,MAAMC,wBAAwB,GAAGN,+BAA+B,GAAG,CAAC;EACpE,MAAMO,aAAa,GAClBN,2BAA2B,KAAKL,8BAA8B,CAACY,IAAI;EACpE,MAAMC,SAAS,GAAGF,aAAa,IAAI,CAAC,CAACJ,QAAQ;;EAE7C;EACA;EACA;EACA,MAAMO,uBAAuB,GAAGR,QAAQ,IAAI,CAAC;EAE7C,MAAME,WAAW,GAChB,CAACE,wBAAwB,IAAII,uBAAuB,KAAKD,SAAS;EAEnE,OAAO;IACNL,WAAW;IACXC,cAAc,EAAE,CAACD,WAAW,IAAIF,QAAQ,GAAG;EAC5C,CAAC;AACF,CAAC;AAED,OAAO,MAAMS,2BAA2B,GACvCC,KAAgC,IAC5B;EACJ,SAAS;;EACT,OAAOf,2BAA2B,CAACe,KAAK,CAAC,CAACR,WAAW;AACtD,CAAC","ignoreList":[]}

package/lib/module/shared/providers/screen/styles/hooks/use-interpolated-style-maps.js

@@ -5,27 +5,74 @@ import { NO_STYLES } from "../../../../constants";
 import { SystemStore } from "../../../../stores/system.store";
 import { logger } from "../../../../utils/logger";
 import { useScreenAnimationContext } from "../../animation";
+import { useBuildBoundsAccessor } from "../../animation/helpers/accessors/use-build-bounds-accessor";
+import { useBuildTransitionAccessor } from "../../animation/helpers/accessors/use-build-transition-accessor";
+import { syncSelectedInterpolatorOptions } from "../../animation/helpers/selected-interpolator-options";
 import { useDescriptorDerivations } from "../../descriptors";
+import { syncScreenOptionsOverrides, useScreenOptionsContext } from "../../options";
 import { normalizeSlots } from "../helpers/normalize-slots";
+import { preserveAnimatedPropsOnly } from "../helpers/preserve-animated-props-only";
+import { stripInterpolatorOptions } from "../helpers/strip-interpolator-options";
+
+/**
+ * Builds the raw interpolated styles map for the current screen pass.
+ *
+ * This hook exists to stabilize style ownership during rapid navigation,
+ * especially when an interactive close gesture overlaps with a new navigation
+ * event. In flows like `A -> B`, begin closing `B`, then quickly open `C`,
+ * the active route state can change before the gesture-driven close has
+ * visually finished.
+ *
+ * If we immediately switch to the next interpolator in that window, styles can
+ * be computed against the wrong route pair and leave layer or element slots
+ * stranded in an intermediate state. We therefore latch onto the current
+ * gesture interpolator for the lifetime of that close interaction, then resume
+ * normal interpolator selection once the gesture-driven close is no longer in
+ * play.
+ *
+ * Visibility gating happens downstream while lifecycle start is blocked for
+ * pending destination measurement. We still run the interpolator during that
+ * hidden window so animated props and runtime options stay warm, but defer style
+ * buckets so measurement sees the final untransformed layout.
+ *
+ * The result stays as a single slot map. Resolution happens downstream, where
+ * slot ids determine whether a slot may inherit from ancestors or must remain
+ * local to the owning screen container.
+ */
 export const useInterpolatedStylesMap = () => {
   const {
     currentScreenKey
   } = useDescriptorDerivations();
+  const screenOptions = useScreenOptionsContext();
   const {
     screenInterpolatorProps,
+    screenInterpolatorPropsRevision,
+    selectedInterpolatorOptions,
     nextInterpolator,
-    currentInterpolator,
-    boundsAccessor
+    currentInterpolator
   } = useScreenAnimationContext();
+  const boundsAccessor = useBuildBoundsAccessor();
+  const transition = useBuildTransitionAccessor();
   const pendingLifecycleStartBlockCount = SystemStore.getValue(currentScreenKey, "pendingLifecycleStartBlockCount");
   const isGesturingDuringCloseAnimation = useSharedValue(false);
   return useDerivedValue(() => {
     "worklet";
 
-    if (pendingLifecycleStartBlockCount.get() > 0) {
-      return NO_STYLES;
-    }
+    screenInterpolatorPropsRevision.get();
     const props = screenInterpolatorProps.get();
+
+    /**
+     * There is a niche case where bounds can be attached to a view that's styles are out of viewport.
+     * Due to our blocking mechanism and ensuring accurate measurement, this boundary measurement
+     * will be blocked and the screen will never be visible. To mitigate this, we:
+     *
+     * - Defer the style buckets (props are fine), to ensure we get the correct position of the boundary
+     *
+     * Again this is very niche, and since we're not marketing ourselves as a proper shared element transition
+     * package, we won't spend time finding a better solution for this.
+     *
+     */
+    const shouldDeferStyleBuckets = pendingLifecycleStartBlockCount.get() > 0;
     const {
       current,
       next,
@@ -33,15 +80,22 @@ export const useInterpolatedStylesMap = () => {
     } = props;
     const isDragging = current.gesture.dragging;
     const isNextClosing = !!next?.closing;
+
+    // Keep using the gesture-driven interpolator until the closing gesture has
+    // fully released. This avoids switching style ownership mid-flight when a
+    // new navigation event lands before the close interaction visually settles.
     if (isDragging && isNextClosing) {
       isGesturingDuringCloseAnimation.set(true);
     }
     if (!isDragging && !isNextClosing) {
       isGesturingDuringCloseAnimation.set(false);
     }
-    const isInGestureMode = isDragging || isGesturingDuringCloseAnimation.get();
-    const interpolator = isInGestureMode ? currentInterpolator : nextInterpolator ?? currentInterpolator;
+    const isInGestureMode = !!isDragging || isGesturingDuringCloseAnimation.get();
+    const interpolatorOptionsOwner = isInGestureMode || !nextInterpolator ? "current" : "next";
+    const interpolator = interpolatorOptionsOwner === "current" ? currentInterpolator : nextInterpolator;
     if (!interpolator) {
+      syncSelectedInterpolatorOptions(selectedInterpolatorOptions, "current");
+      syncScreenOptionsOverrides(undefined, screenOptions);
       return NO_STYLES;
     }
     let effectiveProgress = progress;
@@ -55,14 +109,20 @@ export const useInterpolatedStylesMap = () => {
         ...props,
         progress: effectiveProgress,
         next: effectiveNext,
-        bounds: boundsAccessor
+        bounds: boundsAccessor,
+        transition
       });
-      const stylesMap = typeof raw !== "object" || raw == null ? NO_STYLES : normalizeSlots(raw);
-      return stylesMap;
+      const rawStyleMap = typeof raw === "object" && raw != null ? raw : undefined;
+      syncSelectedInterpolatorOptions(selectedInterpolatorOptions, interpolatorOptionsOwner, rawStyleMap?.options);
+      syncScreenOptionsOverrides(interpolatorOptionsOwner === "current" ? rawStyleMap : undefined, screenOptions);
+      const stylesMap = !rawStyleMap ? NO_STYLES : normalizeSlots(stripInterpolatorOptions(rawStyleMap));
+      return shouldDeferStyleBuckets ? preserveAnimatedPropsOnly(stylesMap) : stylesMap;
     } catch (_) {
       if (__DEV__) {
         logger.warn("screenStyleInterpolator must be a worklet");
       }
+      syncSelectedInterpolatorOptions(selectedInterpolatorOptions, "current");
+      syncScreenOptionsOverrides(undefined, screenOptions);
       return NO_STYLES;
     }
   });

package/lib/module/shared/providers/screen/styles/hooks/use-interpolated-style-maps.js.map

@@ -1 +1 @@
-{"version":3,"names":["useDerivedValue","useSharedValue","NO_STYLES","SystemStore","logger","useScreenAnimationContext","useDescriptorDerivations","normalizeSlots","useInterpolatedStylesMap","currentScreenKey","screenInterpolatorProps","nextInterpolator","currentInterpolator","boundsAccessor","pendingLifecycleStartBlockCount","getValue","isGesturingDuringCloseAnimation","get","props","current","next","progress","isDragging","gesture","dragging","isNextClosing","closing","set","isInGestureMode","interpolator","effectiveProgress","effectiveNext","undefined","raw","bounds","stylesMap","_","__DEV__","warn"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/styles/hooks/use-interpolated-style-maps.tsx"],"mappings":";;AAAA,SAASA,eAAe,EAAEC,cAAc,QAAQ,yBAAyB;AACzE,SAASC,SAAS,QAAQ,uBAAuB;AACjD,SAASC,WAAW,QAAQ,iCAAiC;AAE7D,SAASC,MAAM,QAAQ,0BAA0B;AACjD,SAASC,yBAAyB,QAAQ,iBAAiB;AAC3D,SAASC,wBAAwB,QAAQ,mBAAmB;AAC5D,SAASC,cAAc,QAAQ,4BAA4B;AAE3D,OAAO,MAAMC,wBAAwB,GAAGA,CAAA,KAAM;EAC7C,MAAM;IAAEC;EAAiB,CAAC,GAAGH,wBAAwB,CAAC,CAAC;EACvD,MAAM;IACLI,uBAAuB;IACvBC,gBAAgB;IAChBC,mBAAmB;IACnBC;EACD,CAAC,GAAGR,yBAAyB,CAAC,CAAC;EAE/B,MAAMS,+BAA+B,GAAGX,WAAW,CAACY,QAAQ,CAC3DN,gBAAgB,EAChB,iCACD,CAAC;EAED,MAAMO,+BAA+B,GAAGf,cAAc,CAAC,KAAK,CAAC;EAE7D,OAAOD,eAAe,CAAwC,MAAM;IACnE,SAAS;;IACT,IAAIc,+BAA+B,CAACG,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE;MAC9C,OAAOf,SAAS;IACjB;IAEA,MAAMgB,KAAK,GAAGR,uBAAuB,CAACO,GAAG,CAAC,CAAC;IAC3C,MAAM;MAAEE,OAAO;MAAEC,IAAI;MAAEC;IAAS,CAAC,GAAGH,KAAK;IACzC,MAAMI,UAAU,GAAGH,OAAO,CAACI,OAAO,CAACC,QAAQ;IAC3C,MAAMC,aAAa,GAAG,CAAC,CAACL,IAAI,EAAEM,OAAO;IAErC,IAAIJ,UAAU,IAAIG,aAAa,EAAE;MAChCT,+BAA+B,CAACW,GAAG,CAAC,IAAI,CAAC;IAC1C;IAEA,IAAI,CAACL,UAAU,IAAI,CAACG,aAAa,EAAE;MAClCT,+BAA+B,CAACW,GAAG,CAAC,KAAK,CAAC;IAC3C;IAEA,MAAMC,eAAe,GAAGN,UAAU,IAAIN,+BAA+B,CAACC,GAAG,CAAC,CAAC;IAE3E,MAAMY,YAAY,GAAGD,eAAe,GACjChB,mBAAmB,GAClBD,gBAAgB,IAAIC,mBAAoB;IAE5C,IAAI,CAACiB,YAAY,EAAE;MAClB,OAAO3B,SAAS;IACjB;IAEA,IAAI4B,iBAAiB,GAAGT,QAAQ;IAChC,IAAIU,aAAa,GAAGX,IAAI;IAExB,IAAIQ,eAAe,EAAE;MACpBE,iBAAiB,GAAGX,OAAO,CAACE,QAAQ;MACpCU,aAAa,GAAGC,SAAS;IAC1B;IAEA,IAAI;MACH,MAAMC,GAAG,GAAGJ,YAAY,CAAC;QACxB,GAAGX,KAAK;QACRG,QAAQ,EAAES,iBAAiB;QAC3BV,IAAI,EAAEW,aAAa;QACnBG,MAAM,EAAErB;MACT,CAAC,CAAC;MAEF,MAAMsB,SAAS,GACd,OAAOF,GAAG,KAAK,QAAQ,IAAIA,GAAG,IAAI,IAAI,GACnC/B,SAAS,GACTK,cAAc,CAAC0B,GAAG,CAAC;MAEvB,OAAOE,SAAS;IACjB,CAAC,CAAC,OAAOC,CAAC,EAAE;MACX,IAAIC,OAAO,EAAE;QACZjC,MAAM,CAACkC,IAAI,CAAC,2CAA2C,CAAC;MACzD;MAEA,OAAOpC,SAAS;IACjB;EACD,CAAC,CAAC;AACH,CAAC","ignoreList":[]}
+{"version":3,"names":["useDerivedValue","useSharedValue","NO_STYLES","SystemStore","logger","useScreenAnimationContext","useBuildBoundsAccessor","useBuildTransitionAccessor","syncSelectedInterpolatorOptions","useDescriptorDerivations","syncScreenOptionsOverrides","useScreenOptionsContext","normalizeSlots","preserveAnimatedPropsOnly","stripInterpolatorOptions","useInterpolatedStylesMap","currentScreenKey","screenOptions","screenInterpolatorProps","screenInterpolatorPropsRevision","selectedInterpolatorOptions","nextInterpolator","currentInterpolator","boundsAccessor","transition","pendingLifecycleStartBlockCount","getValue","isGesturingDuringCloseAnimation","get","props","shouldDeferStyleBuckets","current","next","progress","isDragging","gesture","dragging","isNextClosing","closing","set","isInGestureMode","interpolatorOptionsOwner","interpolator","undefined","effectiveProgress","effectiveNext","raw","bounds","rawStyleMap","options","stylesMap","_","__DEV__","warn"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/styles/hooks/use-interpolated-style-maps.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/providers/screen/styles/hooks/use-maybe-block-visibility.js

@@ -1,26 +1,52 @@
 "use strict";
 
-import { useAnimatedProps, useAnimatedStyle, useDerivedValue } from "react-native-reanimated";
+import { useAnimatedProps, useAnimatedReaction, useAnimatedStyle, useSharedValue } from "react-native-reanimated";
 import { AnimationStore } from "../../../../stores/animation.store";
 import { SystemStore } from "../../../../stores/system.store";
 import { useDescriptorDerivations } from "../../descriptors";
+import { resolveScreenVisibilityGate } from "../helpers/visibility-gate";
 export const useMaybeBlockVisibility = isFloatingOverlay => {
   const {
     currentScreenKey
   } = useDescriptorDerivations();
-  const progress = AnimationStore.getValue(currentScreenKey, "progress");
   const {
-    pendingLifecycleStartBlockCount
+    entering,
+    progress
+  } = AnimationStore.getBag(currentScreenKey);
+  const {
+    pendingLifecycleStartBlockCount,
+    pendingLifecycleRequestKind
   } = SystemStore.getBag(currentScreenKey);
-  const shouldBlockVisibility = useDerivedValue(() => {
+  const hasVisibilityGateOpened = useSharedValue(false);
+  const shouldBlockVisibility = useSharedValue(!isFloatingOverlay);
+
+  /**
+   * Visibility has to start blocked before the first animated style pass.
+   *
+   * `useDerivedValue` can publish its computed value after `useAnimatedStyle`
+   * has already read the initial one, which briefly exposes an unhydrated
+   * screen. Keep the visible state in an eagerly initialized shared value, then
+   * let the reaction open it once the visibility gate allows the first
+   * transformed frame to render.
+   */
+  useAnimatedReaction(() => {
+    "worklet";
+
+    return resolveScreenVisibilityGate({
+      isFloatingOverlay,
+      hasVisibilityGateOpened: hasVisibilityGateOpened.get(),
+      pendingLifecycleStartBlockCount: pendingLifecycleStartBlockCount.get(),
+      pendingLifecycleRequestKind: pendingLifecycleRequestKind.get(),
+      progress: progress.get(),
+      entering: entering.get()
+    });
+  }, gate => {
     "worklet";
 
-    if (isFloatingOverlay) {
-      return false;
+    if (gate.shouldOpenGate) {
+      hasVisibilityGateOpened.set(true);
     }
-    const hasPendingLifecycleBlock = pendingLifecycleStartBlockCount.get() > 0;
-    const isWaitingForOpenToStart = progress.get() <= 0;
-    return hasPendingLifecycleBlock || isWaitingForOpenToStart;
+    shouldBlockVisibility.set(gate.shouldBlock);
   });
   const animatedStyle = useAnimatedStyle(() => {
     "worklet";

package/lib/module/shared/providers/screen/styles/hooks/use-maybe-block-visibility.js.map

@@ -1 +1 @@
-{"version":3,"names":["useAnimatedProps","useAnimatedStyle","useDerivedValue","AnimationStore","SystemStore","useDescriptorDerivations","useMaybeBlockVisibility","isFloatingOverlay","currentScreenKey","progress","getValue","pendingLifecycleStartBlockCount","getBag","shouldBlockVisibility","hasPendingLifecycleBlock","get","isWaitingForOpenToStart","animatedStyle","opacity","animatedProps","pointerEvents"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/styles/hooks/use-maybe-block-visibility.tsx"],"mappings":";;AAAA,SACCA,gBAAgB,EAChBC,gBAAgB,EAChBC,eAAe,QACT,yBAAyB;AAChC,SAASC,cAAc,QAAQ,oCAAoC;AACnE,SAASC,WAAW,QAAQ,iCAAiC;AAC7D,SAASC,wBAAwB,QAAQ,mBAAmB;AAE5D,OAAO,MAAMC,uBAAuB,GAAIC,iBAA2B,IAAK;EACvE,MAAM;IAAEC;EAAiB,CAAC,GAAGH,wBAAwB,CAAC,CAAC;EACvD,MAAMI,QAAQ,GAAGN,cAAc,CAACO,QAAQ,CAACF,gBAAgB,EAAE,UAAU,CAAC;EAEtE,MAAM;IAAEG;EAAgC,CAAC,GACxCP,WAAW,CAACQ,MAAM,CAACJ,gBAAgB,CAAC;EAErC,MAAMK,qBAAqB,GAAGX,eAAe,CAAC,MAAM;IACnD,SAAS;;IAET,IAAIK,iBAAiB,EAAE;MACtB,OAAO,KAAK;IACb;IAEA,MAAMO,wBAAwB,GAAGH,+BAA+B,CAACI,GAAG,CAAC,CAAC,GAAG,CAAC;IAC1E,MAAMC,uBAAuB,GAAGP,QAAQ,CAACM,GAAG,CAAC,CAAC,IAAI,CAAC;IAEnD,OAAOD,wBAAwB,IAAIE,uBAAuB;EAC3D,CAAC,CAAC;EAEF,MAAMC,aAAa,GAAGhB,gBAAgB,CAAC,MAAM;IAC5C,SAAS;;IAET,OAAO;MACNiB,OAAO,EAAEL,qBAAqB,CAACE,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG;IAC5C,CAAC;EACF,CAAC,CAAC;EAEF,MAAMI,aAAa,GAAGnB,gBAAgB,CAAC,MAAM;IAC5C,SAAS;;IACT,OAAO;MACNoB,aAAa,EAAEP,qBAAqB,CAACE,GAAG,CAAC,CAAC,GACtC,MAAM,GACN;IACL,CAAC;EACF,CAAC,CAAC;EAEF,OAAO;IACNE,aAAa;IACbE;EACD,CAAC;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["useAnimatedProps","useAnimatedReaction","useAnimatedStyle","useSharedValue","AnimationStore","SystemStore","useDescriptorDerivations","resolveScreenVisibilityGate","useMaybeBlockVisibility","isFloatingOverlay","currentScreenKey","entering","progress","getBag","pendingLifecycleStartBlockCount","pendingLifecycleRequestKind","hasVisibilityGateOpened","shouldBlockVisibility","get","gate","shouldOpenGate","set","shouldBlock","animatedStyle","opacity","animatedProps","pointerEvents"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/styles/hooks/use-maybe-block-visibility.tsx"],"mappings":";;AAAA,SACCA,gBAAgB,EAChBC,mBAAmB,EACnBC,gBAAgB,EAChBC,cAAc,QACR,yBAAyB;AAChC,SAASC,cAAc,QAAQ,oCAAoC;AACnE,SAASC,WAAW,QAAQ,iCAAiC;AAC7D,SAASC,wBAAwB,QAAQ,mBAAmB;AAC5D,SAASC,2BAA2B,QAAQ,4BAA4B;AAExE,OAAO,MAAMC,uBAAuB,GAAIC,iBAA2B,IAAK;EACvE,MAAM;IAAEC;EAAiB,CAAC,GAAGJ,wBAAwB,CAAC,CAAC;EACvD,MAAM;IAAEK,QAAQ;IAAEC;EAAS,CAAC,GAAGR,cAAc,CAACS,MAAM,CAACH,gBAAgB,CAAC;EAEtE,MAAM;IAAEI,+BAA+B;IAAEC;EAA4B,CAAC,GACrEV,WAAW,CAACQ,MAAM,CAACH,gBAAgB,CAAC;EAErC,MAAMM,uBAAuB,GAAGb,cAAc,CAAC,KAAK,CAAC;EACrD,MAAMc,qBAAqB,GAAGd,cAAc,CAAC,CAACM,iBAAiB,CAAC;;EAEhE;AACD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACCR,mBAAmB,CAClB,MAAM;IACL,SAAS;;IAET,OAAOM,2BAA2B,CAAC;MAClCE,iBAAiB;MACjBO,uBAAuB,EAAEA,uBAAuB,CAACE,GAAG,CAAC,CAAC;MACtDJ,+BAA+B,EAAEA,+BAA+B,CAACI,GAAG,CAAC,CAAC;MACtEH,2BAA2B,EAAEA,2BAA2B,CAACG,GAAG,CAAC,CAAC;MAC9DN,QAAQ,EAAEA,QAAQ,CAACM,GAAG,CAAC,CAAC;MACxBP,QAAQ,EAAEA,QAAQ,CAACO,GAAG,CAAC;IACxB,CAAC,CAAC;EACH,CAAC,EACAC,IAAI,IAAK;IACT,SAAS;;IAET,IAAIA,IAAI,CAACC,cAAc,EAAE;MACxBJ,uBAAuB,CAACK,GAAG,CAAC,IAAI,CAAC;IAClC;IAEAJ,qBAAqB,CAACI,GAAG,CAACF,IAAI,CAACG,WAAW,CAAC;EAC5C,CACD,CAAC;EAED,MAAMC,aAAa,GAAGrB,gBAAgB,CAAC,MAAM;IAC5C,SAAS;;IACT,OAAO;MACNsB,OAAO,EAAEP,qBAAqB,CAACC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG;IAC5C,CAAC;EACF,CAAC,CAAC;EAEF,MAAMO,aAAa,GAAGzB,gBAAgB,CAAC,MAAM;IAC5C,SAAS;;IACT,OAAO;MACN0B,aAAa,EAAET,qBAAqB,CAACC,GAAG,CAAC,CAAC,GACtC,MAAM,GACN;IACL,CAAC;EACF,CAAC,CAAC;EAEF,OAAO;IACNK,aAAa;IACbE;EACD,CAAC;AACF,CAAC","ignoreList":[]}

package/lib/module/shared/providers/screen/styles/hooks/use-resolved-slot-style-map.js

@@ -2,25 +2,42 @@
 
 import { useDerivedValue, useSharedValue } from "react-native-reanimated";
 import { NO_STYLES } from "../../../../constants";
-import { resolveSlotStyles } from "../helpers/resolve-slot-styles";
+import { useScreenAnimationContext } from "../../animation";
+import { resolveSlotStyles, reuseEqualResolvedSlots } from "../helpers/resolve-slot-styles";
 export const useResolvedStylesMap = ({
   currentStylesMap,
   ancestorStylesMap
 }) => {
+  const {
+    screenInterpolatorProps,
+    screenInterpolatorPropsRevision
+  } = useScreenAnimationContext();
   const previousStyleStatesBySlot = useSharedValue({});
+  const previousResolvedStylesMap = useSharedValue(NO_STYLES);
   return useDerivedValue(() => {
     "worklet";
 
+    screenInterpolatorPropsRevision.get();
+    const props = screenInterpolatorProps.get();
+    // Keep missing local slots alive while another route drives this screen.
+    // Custom ids and keys from slots that still exist are still reset.
+    const deferLocalSlotResets = !props.focused && !props.current.closing;
     const {
       resolvedStylesMap,
       nextPreviousStyleStatesBySlot
     } = resolveSlotStyles({
       currentStylesMap: currentStylesMap.get(),
       ancestorStylesMap: ancestorStylesMap?.get() ?? NO_STYLES,
-      previousStyleStatesBySlot: previousStyleStatesBySlot.get()
+      previousStyleStatesBySlot: previousStyleStatesBySlot.get(),
+      deferLocalSlotResets
     });
     previousStyleStatesBySlot.set(nextPreviousStyleStatesBySlot);
-    return resolvedStylesMap;
+    const stableResolvedStylesMap = reuseEqualResolvedSlots({
+      resolvedStylesMap,
+      previousResolvedStylesMap: previousResolvedStylesMap.get()
+    });
+    previousResolvedStylesMap.set(stableResolvedStylesMap);
+    return stableResolvedStylesMap;
   });
 };
 //# sourceMappingURL=use-resolved-slot-style-map.js.map

package/lib/module/shared/providers/screen/styles/hooks/use-resolved-slot-style-map.js.map

@@ -1 +1 @@
-{"version":3,"names":["useDerivedValue","useSharedValue","NO_STYLES","resolveSlotStyles","useResolvedStylesMap","currentStylesMap","ancestorStylesMap","previousStyleStatesBySlot","resolvedStylesMap","nextPreviousStyleStatesBySlot","get","set"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/styles/hooks/use-resolved-slot-style-map.tsx"],"mappings":";;AAAA,SAECA,eAAe,EACfC,cAAc,QACR,yBAAyB;AAChC,SAASC,SAAS,QAAQ,uBAAuB;AAEjD,SAECC,iBAAiB,QACX,gCAAgC;AAOvC,OAAO,MAAMC,oBAAoB,GAAGA,CAAC;EACpCC,gBAAgB;EAChBC;AAC2B,CAAC,KAAK;EACjC,MAAMC,yBAAyB,GAAGN,cAAc,CAC/C,CAAC,CACF,CAAC;EAED,OAAOD,eAAe,CAAC,MAAM;IAC5B,SAAS;;IAET,MAAM;MAAEQ,iBAAiB;MAAEC;IAA8B,CAAC,GACzDN,iBAAiB,CAAC;MACjBE,gBAAgB,EAAEA,gBAAgB,CAACK,GAAG,CAAC,CAAC;MACxCJ,iBAAiB,EAAEA,iBAAiB,EAAEI,GAAG,CAAC,CAAC,IAAIR,SAAS;MACxDK,yBAAyB,EAAEA,yBAAyB,CAACG,GAAG,CAAC;IAC1D,CAAC,CAAC;IAEHH,yBAAyB,CAACI,GAAG,CAACF,6BAA6B,CAAC;IAE5D,OAAOD,iBAAiB;EACzB,CAAC,CAAC;AACH,CAAC","ignoreList":[]}
+{"version":3,"names":["useDerivedValue","useSharedValue","NO_STYLES","useScreenAnimationContext","resolveSlotStyles","reuseEqualResolvedSlots","useResolvedStylesMap","currentStylesMap","ancestorStylesMap","screenInterpolatorProps","screenInterpolatorPropsRevision","previousStyleStatesBySlot","previousResolvedStylesMap","get","props","deferLocalSlotResets","focused","current","closing","resolvedStylesMap","nextPreviousStyleStatesBySlot","set","stableResolvedStylesMap"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/styles/hooks/use-resolved-slot-style-map.tsx"],"mappings":";;AAAA,SAECA,eAAe,EACfC,cAAc,QACR,yBAAyB;AAChC,SAASC,SAAS,QAAQ,uBAAuB;AAEjD,SAASC,yBAAyB,QAAQ,iBAAiB;AAC3D,SAECC,iBAAiB,EACjBC,uBAAuB,QACjB,gCAAgC;AAOvC,OAAO,MAAMC,oBAAoB,GAAGA,CAAC;EACpCC,gBAAgB;EAChBC;AAC2B,CAAC,KAAK;EACjC,MAAM;IAAEC,uBAAuB;IAAEC;EAAgC,CAAC,GACjEP,yBAAyB,CAAC,CAAC;EAC5B,MAAMQ,yBAAyB,GAAGV,cAAc,CAC/C,CAAC,CACF,CAAC;EACD,MAAMW,yBAAyB,GAC9BX,cAAc,CAAwCC,SAAS,CAAC;EAEjE,OAAOF,eAAe,CAAC,MAAM;IAC5B,SAAS;;IACTU,+BAA+B,CAACG,GAAG,CAAC,CAAC;IAErC,MAAMC,KAAK,GAAGL,uBAAuB,CAACI,GAAG,CAAC,CAAC;IAC3C;IACA;IACA,MAAME,oBAAoB,GAAG,CAACD,KAAK,CAACE,OAAO,IAAI,CAACF,KAAK,CAACG,OAAO,CAACC,OAAO;IAErE,MAAM;MAAEC,iBAAiB;MAAEC;IAA8B,CAAC,GACzDhB,iBAAiB,CAAC;MACjBG,gBAAgB,EAAEA,gBAAgB,CAACM,GAAG,CAAC,CAAC;MACxCL,iBAAiB,EAAEA,iBAAiB,EAAEK,GAAG,CAAC,CAAC,IAAIX,SAAS;MACxDS,yBAAyB,EAAEA,yBAAyB,CAACE,GAAG,CAAC,CAAC;MAC1DE;IACD,CAAC,CAAC;IAEHJ,yBAAyB,CAACU,GAAG,CAACD,6BAA6B,CAAC;IAC5D,MAAME,uBAAuB,GAAGjB,uBAAuB,CAAC;MACvDc,iBAAiB;MACjBP,yBAAyB,EAAEA,yBAAyB,CAACC,GAAG,CAAC;IAC1D,CAAC,CAAC;IACFD,yBAAyB,CAACS,GAAG,CAACC,uBAAuB,CAAC;IAEtD,OAAOA,uBAAuB;EAC/B,CAAC,CAAC;AACH,CAAC","ignoreList":[]}

package/lib/module/shared/providers/stack/helpers/use-closing-route-map.js

@@ -12,7 +12,7 @@ export const useClosingRouteMap = (routeKeys, animationMaps) => {
 
     const map = {};
     for (let i = 0; i < animationMaps.length; i++) {
-      if (animationMaps[i].closing.value > 0) {
+      if (animationMaps[i].closing.get() > 0) {
         const routeKey = routeKeys[i];
         if (routeKey) {
           map[routeKey] = true;

package/lib/module/shared/providers/stack/helpers/use-closing-route-map.js.map

@@ -1 +1 @@
-{"version":3,"names":["useDerivedValue","useSharedValueRef","useClosingRouteMap","routeKeys","animationMaps","map","i","length","closing","value","routeKey"],"sourceRoot":"../../../../../../src","sources":["shared/providers/stack/helpers/use-closing-route-map.ts"],"mappings":";;AAAA,SAASA,eAAe,QAAQ,yBAAyB;AACzD,SAASC,iBAAiB,QAAQ,gDAAgD;AAGlF;AACA;AACA;AACA;AACA,OAAO,MAAMC,kBAAkB,GAAGA,CACjCC,SAAmB,EACnBC,aAAkC,KACmB;EACrD,OAAOH,iBAAiB,CACvBD,eAAe,CAAC,MAAM;IACrB,SAAS;;IACT,MAAMK,GAAyB,GAAG,CAAC,CAAC;IACpC,KAAK,IAAIC,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGF,aAAa,CAACG,MAAM,EAAED,CAAC,EAAE,EAAE;MAC9C,IAAIF,aAAa,CAACE,CAAC,CAAC,CAACE,OAAO,CAACC,KAAK,GAAG,CAAC,EAAE;QACvC,MAAMC,QAAQ,GAAGP,SAAS,CAACG,CAAC,CAAC;QAC7B,IAAII,QAAQ,EAAE;UACbL,GAAG,CAACK,QAAQ,CAAC,GAAG,IAAI;QACrB;MACD;IACD;IACA,OAAOL,GAAG;EACX,CAAC,CACF,CAAC;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["useDerivedValue","useSharedValueRef","useClosingRouteMap","routeKeys","animationMaps","map","i","length","closing","get","routeKey"],"sourceRoot":"../../../../../../src","sources":["shared/providers/stack/helpers/use-closing-route-map.ts"],"mappings":";;AAAA,SAASA,eAAe,QAAQ,yBAAyB;AACzD,SAASC,iBAAiB,QAAQ,gDAAgD;AAGlF;AACA;AACA;AACA;AACA,OAAO,MAAMC,kBAAkB,GAAGA,CACjCC,SAAmB,EACnBC,aAAkC,KACmB;EACrD,OAAOH,iBAAiB,CACvBD,eAAe,CAAC,MAAM;IACrB,SAAS;;IACT,MAAMK,GAAyB,GAAG,CAAC,CAAC;IACpC,KAAK,IAAIC,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGF,aAAa,CAACG,MAAM,EAAED,CAAC,EAAE,EAAE;MAC9C,IAAIF,aAAa,CAACE,CAAC,CAAC,CAACE,OAAO,CAACC,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE;QACvC,MAAMC,QAAQ,GAAGP,SAAS,CAACG,CAAC,CAAC;QAC7B,IAAII,QAAQ,EAAE;UACbL,GAAG,CAACK,QAAQ,CAAC,GAAG,IAAI;QACrB;MACD;IACD;IACA,OAAOL,GAAG;EACX,CAAC,CACF,CAAC;AACF,CAAC","ignoreList":[]}

package/lib/module/shared/providers/stack/helpers/use-stack-derived.js

@@ -11,7 +11,7 @@ export function useStackDerived(animationMaps) {
 
     let total = 0;
     for (let i = 0; i < animationMaps.length; i++) {
-      total += animationMaps[i].progress.value;
+      total += animationMaps[i].progress.get();
     }
     return total;
   });
@@ -21,7 +21,7 @@ export function useStackDerived(animationMaps) {
     const lastIndex = animationMaps.length - 1;
     let closingFromTop = 0;
     for (let i = lastIndex; i >= 0; i--) {
-      if (animationMaps[i].closing.value > 0) closingFromTop++;else break;
+      if (animationMaps[i].closing.get() > 0) closingFromTop++;else break;
     }
     return lastIndex - closingFromTop;
   });

package/lib/module/shared/providers/stack/helpers/use-stack-derived.js.map

@@ -1 +1 @@
-{"version":3,"names":["useDerivedValue","useStackDerived","animationMaps","stackProgress","total","i","length","progress","value","optimisticFocusedIndex","lastIndex","closingFromTop","closing"],"sourceRoot":"../../../../../../src","sources":["shared/providers/stack/helpers/use-stack-derived.ts"],"mappings":";;AAAA,SAA4BA,eAAe,QAAQ,yBAAyB;AAc5E;AACA;AACA;AACA;AACA,OAAO,SAASC,eAAeA,CAC9BC,aAAkC,EACnB;EACf,MAAMC,aAAa,GAAGH,eAAe,CAAC,MAAM;IAC3C,SAAS;;IACT,IAAII,KAAK,GAAG,CAAC;IACb,KAAK,IAAIC,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGH,aAAa,CAACI,MAAM,EAAED,CAAC,EAAE,EAAE;MAC9CD,KAAK,IAAIF,aAAa,CAACG,CAAC,CAAC,CAACE,QAAQ,CAACC,KAAK;IACzC;IACA,OAAOJ,KAAK;EACb,CAAC,CAAC;EAEF,MAAMK,sBAAsB,GAAGT,eAAe,CAAC,MAAM;IACpD,SAAS;;IACT,MAAMU,SAAS,GAAGR,aAAa,CAACI,MAAM,GAAG,CAAC;IAC1C,IAAIK,cAAc,GAAG,CAAC;IACtB,KAAK,IAAIN,CAAC,GAAGK,SAAS,EAAEL,CAAC,IAAI,CAAC,EAAEA,CAAC,EAAE,EAAE;MACpC,IAAIH,aAAa,CAACG,CAAC,CAAC,CAACO,OAAO,CAACJ,KAAK,GAAG,CAAC,EAAEG,cAAc,EAAE,CAAC,KACpD;IACN;IACA,OAAOD,SAAS,GAAGC,cAAc;EAClC,CAAC,CAAC;EAEF,OAAO;IAAER,aAAa;IAAEM;EAAuB,CAAC;AACjD","ignoreList":[]}
+{"version":3,"names":["useDerivedValue","useStackDerived","animationMaps","stackProgress","total","i","length","progress","get","optimisticFocusedIndex","lastIndex","closingFromTop","closing"],"sourceRoot":"../../../../../../src","sources":["shared/providers/stack/helpers/use-stack-derived.ts"],"mappings":";;AAAA,SAA4BA,eAAe,QAAQ,yBAAyB;AAc5E;AACA;AACA;AACA;AACA,OAAO,SAASC,eAAeA,CAC9BC,aAAkC,EACnB;EACf,MAAMC,aAAa,GAAGH,eAAe,CAAC,MAAM;IAC3C,SAAS;;IACT,IAAII,KAAK,GAAG,CAAC;IACb,KAAK,IAAIC,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGH,aAAa,CAACI,MAAM,EAAED,CAAC,EAAE,EAAE;MAC9CD,KAAK,IAAIF,aAAa,CAACG,CAAC,CAAC,CAACE,QAAQ,CAACC,GAAG,CAAC,CAAC;IACzC;IACA,OAAOJ,KAAK;EACb,CAAC,CAAC;EAEF,MAAMK,sBAAsB,GAAGT,eAAe,CAAC,MAAM;IACpD,SAAS;;IACT,MAAMU,SAAS,GAAGR,aAAa,CAACI,MAAM,GAAG,CAAC;IAC1C,IAAIK,cAAc,GAAG,CAAC;IACtB,KAAK,IAAIN,CAAC,GAAGK,SAAS,EAAEL,CAAC,IAAI,CAAC,EAAEA,CAAC,EAAE,EAAE;MACpC,IAAIH,aAAa,CAACG,CAAC,CAAC,CAACO,OAAO,CAACJ,GAAG,CAAC,CAAC,GAAG,CAAC,EAAEG,cAAc,EAAE,CAAC,KACpD;IACN;IACA,OAAOD,SAAS,GAAGC,cAAc;EAClC,CAAC,CAAC;EAEF,OAAO;IAAER,aAAa;IAAEM;EAAuB,CAAC;AACjD","ignoreList":[]}

package/lib/module/shared/stores/animation.store.js

@@ -7,10 +7,8 @@ function createAnimationBag() {
     progress: makeMutable(0),
     willAnimate: makeMutable(0),
     closing: makeMutable(0),
-    animating: makeMutable(0),
-    entering: makeMutable(0),
-    settled: makeMutable(1),
-    logicallySettled: makeMutable(1)
+    progressAnimating: makeMutable(0),
+    entering: makeMutable(0)
   };
 }
 
@@ -24,11 +22,9 @@ export const AnimationStore = createStore({
   disposeBag: bag => {
     cancelAnimation(bag.progress);
     cancelAnimation(bag.willAnimate);
-    cancelAnimation(bag.animating);
+    cancelAnimation(bag.progressAnimating);
     cancelAnimation(bag.closing);
     cancelAnimation(bag.entering);
-    cancelAnimation(bag.settled);
-    cancelAnimation(bag.logicallySettled);
   }
 });
 //# sourceMappingURL=animation.store.js.map

package/lib/module/shared/stores/animation.store.js.map

@@ -1 +1 @@
-{"version":3,"names":["cancelAnimation","makeMutable","createStore","createAnimationBag","progress","willAnimate","closing","animating","entering","settled","logicallySettled","AnimationStore","createBag","disposeBag","bag"],"sourceRoot":"../../../../src","sources":["shared/stores/animation.store.ts"],"mappings":";;AAAA,SACCA,eAAe,EACfC,WAAW,QAEL,yBAAyB;AAChC,SAASC,WAAW,QAAQ,uBAAuB;AAYnD,SAASC,kBAAkBA,CAAA,EAAsB;EAChD,OAAO;IACNC,QAAQ,EAAEH,WAAW,CAAC,CAAC,CAAC;IACxBI,WAAW,EAAEJ,WAAW,CAAC,CAAC,CAAC;IAC3BK,OAAO,EAAEL,WAAW,CAAC,CAAC,CAAC;IACvBM,SAAS,EAAEN,WAAW,CAAC,CAAC,CAAC;IACzBO,QAAQ,EAAEP,WAAW,CAAC,CAAC,CAAC;IACxBQ,OAAO,EAAER,WAAW,CAAC,CAAC,CAAC;IACvBS,gBAAgB,EAAET,WAAW,CAAC,CAAC;EAChC,CAAC;AACF;;AAEA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMU,cAAc,GAAGT,WAAW,CAAoB;EAC5DU,SAAS,EAAET,kBAAkB;EAC7BU,UAAU,EAAGC,GAAG,IAAK;IACpBd,eAAe,CAACc,GAAG,CAACV,QAAQ,CAAC;IAC7BJ,eAAe,CAACc,GAAG,CAACT,WAAW,CAAC;IAChCL,eAAe,CAACc,GAAG,CAACP,SAAS,CAAC;IAC9BP,eAAe,CAACc,GAAG,CAACR,OAAO,CAAC;IAC5BN,eAAe,CAACc,GAAG,CAACN,QAAQ,CAAC;IAC7BR,eAAe,CAACc,GAAG,CAACL,OAAO,CAAC;IAC5BT,eAAe,CAACc,GAAG,CAACJ,gBAAgB,CAAC;EACtC;AACD,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["cancelAnimation","makeMutable","createStore","createAnimationBag","progress","willAnimate","closing","progressAnimating","entering","AnimationStore","createBag","disposeBag","bag"],"sourceRoot":"../../../../src","sources":["shared/stores/animation.store.ts"],"mappings":";;AAAA,SACCA,eAAe,EACfC,WAAW,QAEL,yBAAyB;AAChC,SAASC,WAAW,QAAQ,uBAAuB;AAUnD,SAASC,kBAAkBA,CAAA,EAAsB;EAChD,OAAO;IACNC,QAAQ,EAAEH,WAAW,CAAC,CAAC,CAAC;IACxBI,WAAW,EAAEJ,WAAW,CAAC,CAAC,CAAC;IAC3BK,OAAO,EAAEL,WAAW,CAAC,CAAC,CAAC;IACvBM,iBAAiB,EAAEN,WAAW,CAAC,CAAC,CAAC;IACjCO,QAAQ,EAAEP,WAAW,CAAC,CAAC;EACxB,CAAC;AACF;;AAEA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMQ,cAAc,GAAGP,WAAW,CAAoB;EAC5DQ,SAAS,EAAEP,kBAAkB;EAC7BQ,UAAU,EAAGC,GAAG,IAAK;IACpBZ,eAAe,CAACY,GAAG,CAACR,QAAQ,CAAC;IAC7BJ,eAAe,CAACY,GAAG,CAACP,WAAW,CAAC;IAChCL,eAAe,CAACY,GAAG,CAACL,iBAAiB,CAAC;IACtCP,eAAe,CAACY,GAAG,CAACN,OAAO,CAAC;IAC5BN,eAAe,CAACY,GAAG,CAACJ,QAAQ,CAAC;EAC9B;AACD,CAAC,CAAC","ignoreList":[]}

package/lib/module/shared/stores/bounds/helpers/entries.helpers.js

@@ -0,0 +1,42 @@
+"use strict";
+
+const ENTRY_PATCH_OPTIONAL_FIELDS = ["boundaryConfig"];
+export const ensureScreenEntry = (tagState, screenKey) => {
+  "worklet";
+
+  if (!tagState.screens[screenKey]) {
+    tagState.screens[screenKey] = {
+      bounds: null,
+      styles: {}
+    };
+  }
+  return tagState.screens[screenKey];
+};
+export const applyEntryPatch = (entry, patch) => {
+  "worklet";
+
+  if (patch.bounds !== undefined) {
+    entry.bounds = patch.bounds;
+  }
+  if (patch.styles !== undefined) {
+    entry.styles = patch.styles ?? {};
+  }
+  const target = entry;
+  for (let i = 0; i < ENTRY_PATCH_OPTIONAL_FIELDS.length; i++) {
+    const field = ENTRY_PATCH_OPTIONAL_FIELDS[i];
+    const value = patch[field];
+    if (value === undefined) continue;
+    if (value === null) {
+      delete target[field];
+    } else {
+      target[field] = value;
+    }
+  }
+};
+export const findMatchingScreenEntry = (tagState, screenKey) => {
+  "worklet";
+
+  if (!tagState) return null;
+  return tagState.screens[screenKey] ?? null;
+};
+//# sourceMappingURL=entries.helpers.js.map

package/lib/module/shared/stores/bounds/helpers/entries.helpers.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["ENTRY_PATCH_OPTIONAL_FIELDS","ensureScreenEntry","tagState","screenKey","screens","bounds","styles","applyEntryPatch","entry","patch","undefined","target","i","length","field","value","findMatchingScreenEntry"],"sourceRoot":"../../../../../../src","sources":["shared/stores/bounds/helpers/entries.helpers.ts"],"mappings":";;AAIA,MAAMA,2BAA2B,GAAG,CACnC,gBAAgB,CACsC;AAEvD,OAAO,MAAMC,iBAAiB,GAAGA,CAChCC,QAAkB,EAClBC,SAAoB,KACH;EACjB,SAAS;;EACT,IAAI,CAACD,QAAQ,CAACE,OAAO,CAACD,SAAS,CAAC,EAAE;IACjCD,QAAQ,CAACE,OAAO,CAACD,SAAS,CAAC,GAAG;MAC7BE,MAAM,EAAE,IAAI;MACZC,MAAM,EAAE,CAAC;IACV,CAAC;EACF;EACA,OAAOJ,QAAQ,CAACE,OAAO,CAACD,SAAS,CAAC;AACnC,CAAC;AAED,OAAO,MAAMI,eAAe,GAAGA,CAACC,KAAkB,EAAEC,KAAiB,KAAK;EACzE,SAAS;;EACT,IAAIA,KAAK,CAACJ,MAAM,KAAKK,SAAS,EAAE;IAC/BF,KAAK,CAACH,MAAM,GAAGI,KAAK,CAACJ,MAAM;EAC5B;EAEA,IAAII,KAAK,CAACH,MAAM,KAAKI,SAAS,EAAE;IAC/BF,KAAK,CAACF,MAAM,GAAGG,KAAK,CAACH,MAAM,IAAI,CAAC,CAAC;EAClC;EAEA,MAAMK,MAAM,GAAGH,KAAiD;EAChE,KAAK,IAAII,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGZ,2BAA2B,CAACa,MAAM,EAAED,CAAC,EAAE,EAAE;IAC5D,MAAME,KAAK,GAAGd,2BAA2B,CAACY,CAAC,CAAC;IAC5C,MAAMG,KAAK,GAAGN,KAAK,CAACK,KAAK,CAAC;IAC1B,IAAIC,KAAK,KAAKL,SAAS,EAAE;IAEzB,IAAIK,KAAK,KAAK,IAAI,EAAE;MACnB,OAAOJ,MAAM,CAACG,KAAK,CAAC;IACrB,CAAC,MAAM;MACNH,MAAM,CAACG,KAAK,CAAC,GAAGC,KAAK;IACtB;EACD;AACD,CAAC;AAED,OAAO,MAAMC,uBAAuB,GAAGA,CACtCd,QAA8B,EAC9BC,SAAoB,KACI;EACxB,SAAS;;EACT,IAAI,CAACD,QAAQ,EAAE,OAAO,IAAI;EAE1B,OAAOA,QAAQ,CAACE,OAAO,CAACD,SAAS,CAAC,IAAI,IAAI;AAC3C,CAAC","ignoreList":[]}

package/lib/module/shared/stores/bounds/helpers/find-latest.js

@@ -0,0 +1,19 @@
+"use strict";
+
+export const findLatestIndex = (items, matches) => {
+  "worklet";
+
+  for (let i = items.length - 1; i >= 0; i--) {
+    if (matches(items[i])) {
+      return i;
+    }
+  }
+  return -1;
+};
+export const findLatest = (items, matches) => {
+  "worklet";
+
+  const index = findLatestIndex(items, matches);
+  return index === -1 ? null : items[index] ?? null;
+};
+//# sourceMappingURL=find-latest.js.map

package/lib/module/shared/stores/bounds/helpers/find-latest.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["findLatestIndex","items","matches","i","length","findLatest","index"],"sourceRoot":"../../../../../../src","sources":["shared/stores/bounds/helpers/find-latest.ts"],"mappings":";;AAAA,OAAO,MAAMA,eAAe,GAAGA,CAC9BC,KAAmB,EACnBC,OAA6B,KACjB;EACZ,SAAS;;EACT,KAAK,IAAIC,CAAC,GAAGF,KAAK,CAACG,MAAM,GAAG,CAAC,EAAED,CAAC,IAAI,CAAC,EAAEA,CAAC,EAAE,EAAE;IAC3C,IAAID,OAAO,CAACD,KAAK,CAACE,CAAC,CAAC,CAAC,EAAE;MACtB,OAAOA,CAAC;IACT;EACD;EAEA,OAAO,CAAC,CAAC;AACV,CAAC;AAED,OAAO,MAAME,UAAU,GAAGA,CACzBJ,KAAmB,EACnBC,OAA6B,KACf;EACd,SAAS;;EACT,MAAMI,KAAK,GAAGN,eAAe,CAACC,KAAK,EAAEC,OAAO,CAAC;EAC7C,OAAOI,KAAK,KAAK,CAAC,CAAC,GAAG,IAAI,GAAIL,KAAK,CAACK,KAAK,CAAC,IAAI,IAAK;AACpD,CAAC","ignoreList":[]}