react-native-screen-transitions 3.6.0-alpha.0 → 3.6.0-alpha.2

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

@@ -9,9 +9,12 @@ var _constants = require("../../../../constants");
 var _system = require("../../../../stores/system.store");
 var _logger = require("../../../../utils/logger");
 var _animation = require("../../animation");
+var _useBuildBoundsAccessor = require("../../animation/helpers/accessors/use-build-bounds-accessor");
+var _selectedInterpolatorOptions = require("../../animation/helpers/selected-interpolator-options");
 var _descriptors = require("../../descriptors");
 var _options = require("../../options");
 var _normalizeSlots = require("../helpers/normalize-slots");
+var _preserveAnimatedPropsOnly = require("../helpers/preserve-animated-props-only");
 var _stripInterpolatorOptions = require("../helpers/strip-interpolator-options");
 /**
  * Builds the raw interpolated styles map for the current screen pass.
@@ -29,10 +32,10 @@ var _stripInterpolatorOptions = require("../helpers/strip-interpolator-options")
  * normal interpolator selection once the gesture-driven close is no longer in
  * play.
  *
- * The hook also suppresses interpolated styles while lifecycle start is blocked
- * for pending destination measurement. That keeps the opening screen visually
- * neutral until the system has a usable viewport measurement, then allows the
- * interpolator to take over once the blocker clears.
+ * 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
@@ -45,22 +48,32 @@ const useInterpolatedStylesMap = () => {
   const screenOptions = (0, _options.useScreenOptionsContext)();
   const {
     screenInterpolatorProps,
-    screenInterpolatorFrameUpdater,
+    screenInterpolatorPropsRevision,
+    selectedInterpolatorOptions,
     nextInterpolator,
-    currentInterpolator,
-    boundsAccessor
+    currentInterpolator
   } = (0, _animation.useScreenAnimationContext)();
+  const boundsAccessor = (0, _useBuildBoundsAccessor.useBuildBoundsAccessor)();
   const pendingLifecycleStartBlockCount = _system.SystemStore.getValue(currentScreenKey, "pendingLifecycleStartBlockCount");
   const isGesturingDuringCloseAnimation = (0, _reactNativeReanimated.useSharedValue)(false);
   return (0, _reactNativeReanimated.useDerivedValue)(() => {
     "worklet";
 
-    if (pendingLifecycleStartBlockCount.get() > 0) {
-      (0, _options.syncScreenOptionsOverrides)(undefined, screenOptions);
-      return _constants.NO_STYLES;
-    }
-    screenInterpolatorFrameUpdater.get();
+    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,
@@ -79,8 +92,10 @@ const useInterpolatedStylesMap = () => {
       isGesturingDuringCloseAnimation.set(false);
     }
     const isInGestureMode = !!isDragging || isGesturingDuringCloseAnimation.get();
-    const interpolator = isInGestureMode ? currentInterpolator : nextInterpolator ?? currentInterpolator;
+    const interpolatorOptionsOwner = isInGestureMode || !nextInterpolator ? "current" : "next";
+    const interpolator = interpolatorOptionsOwner === "current" ? currentInterpolator : nextInterpolator;
     if (!interpolator) {
+      (0, _selectedInterpolatorOptions.syncSelectedInterpolatorOptions)(selectedInterpolatorOptions, "current");
       (0, _options.syncScreenOptionsOverrides)(undefined, screenOptions);
       return _constants.NO_STYLES;
     }
@@ -98,13 +113,15 @@ const useInterpolatedStylesMap = () => {
         bounds: boundsAccessor
       });
       const rawStyleMap = typeof raw === "object" && raw != null ? raw : undefined;
-      (0, _options.syncScreenOptionsOverrides)(rawStyleMap, screenOptions);
+      (0, _selectedInterpolatorOptions.syncSelectedInterpolatorOptions)(selectedInterpolatorOptions, interpolatorOptionsOwner, rawStyleMap?.options);
+      (0, _options.syncScreenOptionsOverrides)(interpolatorOptionsOwner === "current" ? rawStyleMap : undefined, screenOptions);
       const stylesMap = !rawStyleMap ? _constants.NO_STYLES : (0, _normalizeSlots.normalizeSlots)((0, _stripInterpolatorOptions.stripInterpolatorOptions)(rawStyleMap));
-      return stylesMap;
+      return shouldDeferStyleBuckets ? (0, _preserveAnimatedPropsOnly.preserveAnimatedPropsOnly)(stylesMap) : stylesMap;
     } catch (_) {
       if (__DEV__) {
         _logger.logger.warn("screenStyleInterpolator must be a worklet");
       }
+      (0, _selectedInterpolatorOptions.syncSelectedInterpolatorOptions)(selectedInterpolatorOptions, "current");
       (0, _options.syncScreenOptionsOverrides)(undefined, screenOptions);
       return _constants.NO_STYLES;
     }

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

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeReanimated","require","_constants","_system","_logger","_animation","_descriptors","_options","_normalizeSlots","_stripInterpolatorOptions","useInterpolatedStylesMap","currentScreenKey","useDescriptorDerivations","screenOptions","useScreenOptionsContext","screenInterpolatorProps","screenInterpolatorFrameUpdater","nextInterpolator","currentInterpolator","boundsAccessor","useScreenAnimationContext","pendingLifecycleStartBlockCount","SystemStore","getValue","isGesturingDuringCloseAnimation","useSharedValue","useDerivedValue","get","syncScreenOptionsOverrides","undefined","NO_STYLES","props","current","next","progress","isDragging","gesture","dragging","isNextClosing","closing","set","isInGestureMode","interpolator","effectiveProgress","effectiveNext","raw","bounds","rawStyleMap","stylesMap","normalizeSlots","stripInterpolatorOptions","_","__DEV__","logger","warn","exports"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/styles/hooks/use-interpolated-style-maps.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_reactNativeReanimated","require","_constants","_system","_logger","_animation","_useBuildBoundsAccessor","_selectedInterpolatorOptions","_descriptors","_options","_normalizeSlots","_preserveAnimatedPropsOnly","_stripInterpolatorOptions","useInterpolatedStylesMap","currentScreenKey","useDescriptorDerivations","screenOptions","useScreenOptionsContext","screenInterpolatorProps","screenInterpolatorPropsRevision","selectedInterpolatorOptions","nextInterpolator","currentInterpolator","useScreenAnimationContext","boundsAccessor","useBuildBoundsAccessor","pendingLifecycleStartBlockCount","SystemStore","getValue","isGesturingDuringCloseAnimation","useSharedValue","useDerivedValue","get","props","shouldDeferStyleBuckets","current","next","progress","isDragging","gesture","dragging","isNextClosing","closing","set","isInGestureMode","interpolatorOptionsOwner","interpolator","syncSelectedInterpolatorOptions","syncScreenOptionsOverrides","undefined","NO_STYLES","effectiveProgress","effectiveNext","raw","bounds","rawStyleMap","options","stylesMap","normalizeSlots","stripInterpolatorOptions","preserveAnimatedPropsOnly","_","__DEV__","logger","warn","exports"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/styles/hooks/use-interpolated-style-maps.tsx"],"mappings":"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","ignoreList":[]}

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

@@ -8,28 +8,49 @@ var _reactNativeReanimated = require("react-native-reanimated");
 var _animation = require("../../../../stores/animation.store");
 var _system = require("../../../../stores/system.store");
 var _descriptors = require("../../descriptors");
+var _visibilityGate = require("../helpers/visibility-gate");
 const useMaybeBlockVisibility = isFloatingOverlay => {
   const {
     currentScreenKey
   } = (0, _descriptors.useDescriptorDerivations)();
-  const progress = _animation.AnimationStore.getValue(currentScreenKey, "progress");
   const {
-    pendingLifecycleStartBlockCount
+    entering,
+    progress
+  } = _animation.AnimationStore.getBag(currentScreenKey);
+  const {
+    pendingLifecycleStartBlockCount,
+    pendingLifecycleRequestKind
   } = _system.SystemStore.getBag(currentScreenKey);
-  const shouldBlockVisibility = (0, _reactNativeReanimated.useDerivedValue)(() => {
+  const hasVisibilityGateOpened = (0, _reactNativeReanimated.useSharedValue)(false);
+  const shouldBlockVisibility = (0, _reactNativeReanimated.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.
+   */
+  (0, _reactNativeReanimated.useAnimatedReaction)(() => {
     "worklet";
 
-    if (isFloatingOverlay) {
-      return false;
-    }
-    const hasPendingLifecycleBlock = pendingLifecycleStartBlockCount.get() > 0;
+    return (0, _visibilityGate.resolveScreenVisibilityGate)({
+      isFloatingOverlay,
+      hasVisibilityGateOpened: hasVisibilityGateOpened.get(),
+      pendingLifecycleStartBlockCount: pendingLifecycleStartBlockCount.get(),
+      pendingLifecycleRequestKind: pendingLifecycleRequestKind.get(),
+      progress: progress.get(),
+      entering: entering.get()
+    });
+  }, gate => {
+    "worklet";
 
-    // Hide the screen during the tiny pre-animation open window as well.
-    // The destination measurement blocker can be registered one frame after
-    // mount, which would otherwise flash the reset state before the block
-    // count turns visible to this provider.
-    const isWaitingForOpenToStart = progress.get() <= 0;
-    return hasPendingLifecycleBlock || isWaitingForOpenToStart;
+    if (gate.shouldOpenGate) {
+      hasVisibilityGateOpened.set(true);
+    }
+    shouldBlockVisibility.set(gate.shouldBlock);
   });
   const animatedStyle = (0, _reactNativeReanimated.useAnimatedStyle)(() => {
     "worklet";

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

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeReanimated","require","_animation","_system","_descriptors","useMaybeBlockVisibility","isFloatingOverlay","currentScreenKey","useDescriptorDerivations","progress","AnimationStore","getValue","pendingLifecycleStartBlockCount","SystemStore","getBag","shouldBlockVisibility","useDerivedValue","hasPendingLifecycleBlock","get","isWaitingForOpenToStart","animatedStyle","useAnimatedStyle","opacity","animatedProps","useAnimatedProps","pointerEvents","exports"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/styles/hooks/use-maybe-block-visibility.tsx"],"mappings":";;;;;;AAAA,IAAAA,sBAAA,GAAAC,OAAA;AAKA,IAAAC,UAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AACA,IAAAG,YAAA,GAAAH,OAAA;AAEO,MAAMI,uBAAuB,GAAIC,iBAA2B,IAAK;EACvE,MAAM;IAAEC;EAAiB,CAAC,GAAG,IAAAC,qCAAwB,EAAC,CAAC;EACvD,MAAMC,QAAQ,GAAGC,yBAAc,CAACC,QAAQ,CAACJ,gBAAgB,EAAE,UAAU,CAAC;EAEtE,MAAM;IAAEK;EAAgC,CAAC,GACxCC,mBAAW,CAACC,MAAM,CAACP,gBAAgB,CAAC;EAErC,MAAMQ,qBAAqB,GAAG,IAAAC,sCAAe,EAAC,MAAM;IACnD,SAAS;;IAET,IAAIV,iBAAiB,EAAE;MACtB,OAAO,KAAK;IACb;IAEA,MAAMW,wBAAwB,GAAGL,+BAA+B,CAACM,GAAG,CAAC,CAAC,GAAG,CAAC;;IAE1E;IACA;IACA;IACA;IACA,MAAMC,uBAAuB,GAAGV,QAAQ,CAACS,GAAG,CAAC,CAAC,IAAI,CAAC;IAEnD,OAAOD,wBAAwB,IAAIE,uBAAuB;EAC3D,CAAC,CAAC;EAEF,MAAMC,aAAa,GAAG,IAAAC,uCAAgB,EAAC,MAAM;IAC5C,SAAS;;IAET,OAAO;MACNC,OAAO,EAAEP,qBAAqB,CAACG,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG;IAC5C,CAAC;EACF,CAAC,CAAC;EAEF,MAAMK,aAAa,GAAG,IAAAC,uCAAgB,EAAC,MAAM;IAC5C,SAAS;;IACT,OAAO;MACNC,aAAa,EAAEV,qBAAqB,CAACG,GAAG,CAAC,CAAC,GACtC,MAAM,GACN;IACL,CAAC;EACF,CAAC,CAAC;EAEF,OAAO;IACNE,aAAa;IACbG;EACD,CAAC;AACF,CAAC;AAACG,OAAA,CAAArB,uBAAA,GAAAA,uBAAA","ignoreList":[]}
+{"version":3,"names":["_reactNativeReanimated","require","_animation","_system","_descriptors","_visibilityGate","useMaybeBlockVisibility","isFloatingOverlay","currentScreenKey","useDescriptorDerivations","entering","progress","AnimationStore","getBag","pendingLifecycleStartBlockCount","pendingLifecycleRequestKind","SystemStore","hasVisibilityGateOpened","useSharedValue","shouldBlockVisibility","useAnimatedReaction","resolveScreenVisibilityGate","get","gate","shouldOpenGate","set","shouldBlock","animatedStyle","useAnimatedStyle","opacity","animatedProps","useAnimatedProps","pointerEvents","exports"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/styles/hooks/use-maybe-block-visibility.tsx"],"mappings":";;;;;;AAAA,IAAAA,sBAAA,GAAAC,OAAA;AAMA,IAAAC,UAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AACA,IAAAG,YAAA,GAAAH,OAAA;AACA,IAAAI,eAAA,GAAAJ,OAAA;AAEO,MAAMK,uBAAuB,GAAIC,iBAA2B,IAAK;EACvE,MAAM;IAAEC;EAAiB,CAAC,GAAG,IAAAC,qCAAwB,EAAC,CAAC;EACvD,MAAM;IAAEC,QAAQ;IAAEC;EAAS,CAAC,GAAGC,yBAAc,CAACC,MAAM,CAACL,gBAAgB,CAAC;EAEtE,MAAM;IAAEM,+BAA+B;IAAEC;EAA4B,CAAC,GACrEC,mBAAW,CAACH,MAAM,CAACL,gBAAgB,CAAC;EAErC,MAAMS,uBAAuB,GAAG,IAAAC,qCAAc,EAAC,KAAK,CAAC;EACrD,MAAMC,qBAAqB,GAAG,IAAAD,qCAAc,EAAC,CAACX,iBAAiB,CAAC;;EAEhE;AACD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACC,IAAAa,0CAAmB,EAClB,MAAM;IACL,SAAS;;IAET,OAAO,IAAAC,2CAA2B,EAAC;MAClCd,iBAAiB;MACjBU,uBAAuB,EAAEA,uBAAuB,CAACK,GAAG,CAAC,CAAC;MACtDR,+BAA+B,EAAEA,+BAA+B,CAACQ,GAAG,CAAC,CAAC;MACtEP,2BAA2B,EAAEA,2BAA2B,CAACO,GAAG,CAAC,CAAC;MAC9DX,QAAQ,EAAEA,QAAQ,CAACW,GAAG,CAAC,CAAC;MACxBZ,QAAQ,EAAEA,QAAQ,CAACY,GAAG,CAAC;IACxB,CAAC,CAAC;EACH,CAAC,EACAC,IAAI,IAAK;IACT,SAAS;;IAET,IAAIA,IAAI,CAACC,cAAc,EAAE;MACxBP,uBAAuB,CAACQ,GAAG,CAAC,IAAI,CAAC;IAClC;IAEAN,qBAAqB,CAACM,GAAG,CAACF,IAAI,CAACG,WAAW,CAAC;EAC5C,CACD,CAAC;EAED,MAAMC,aAAa,GAAG,IAAAC,uCAAgB,EAAC,MAAM;IAC5C,SAAS;;IACT,OAAO;MACNC,OAAO,EAAEV,qBAAqB,CAACG,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG;IAC5C,CAAC;EACF,CAAC,CAAC;EAEF,MAAMQ,aAAa,GAAG,IAAAC,uCAAgB,EAAC,MAAM;IAC5C,SAAS;;IACT,OAAO;MACNC,aAAa,EAAEb,qBAAqB,CAACG,GAAG,CAAC,CAAC,GACtC,MAAM,GACN;IACL,CAAC;EACF,CAAC,CAAC;EAEF,OAAO;IACNK,aAAa;IACbG;EACD,CAAC;AACF,CAAC;AAACG,OAAA,CAAA3B,uBAAA,GAAAA,uBAAA","ignoreList":[]}

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

@@ -14,13 +14,14 @@ const useResolvedStylesMap = ({
 }) => {
   const {
     screenInterpolatorProps,
-    screenInterpolatorFrameUpdater
+    screenInterpolatorPropsRevision
   } = (0, _animation.useScreenAnimationContext)();
   const previousStyleStatesBySlot = (0, _reactNativeReanimated.useSharedValue)({});
+  const previousResolvedStylesMap = (0, _reactNativeReanimated.useSharedValue)(_constants.NO_STYLES);
   return (0, _reactNativeReanimated.useDerivedValue)(() => {
     "worklet";
 
-    screenInterpolatorFrameUpdater.get();
+    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.
@@ -35,7 +36,12 @@ const useResolvedStylesMap = ({
       deferLocalSlotResets
     });
     previousStyleStatesBySlot.set(nextPreviousStyleStatesBySlot);
-    return resolvedStylesMap;
+    const stableResolvedStylesMap = (0, _resolveSlotStyles.reuseEqualResolvedSlots)({
+      resolvedStylesMap,
+      previousResolvedStylesMap: previousResolvedStylesMap.get()
+    });
+    previousResolvedStylesMap.set(stableResolvedStylesMap);
+    return stableResolvedStylesMap;
   });
 };
 exports.useResolvedStylesMap = useResolvedStylesMap;

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

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeReanimated","require","_constants","_animation","_resolveSlotStyles","useResolvedStylesMap","currentStylesMap","ancestorStylesMap","screenInterpolatorProps","screenInterpolatorFrameUpdater","useScreenAnimationContext","previousStyleStatesBySlot","useSharedValue","useDerivedValue","get","props","deferLocalSlotResets","focused","current","closing","resolvedStylesMap","nextPreviousStyleStatesBySlot","resolveSlotStyles","NO_STYLES","set","exports"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/styles/hooks/use-resolved-slot-style-map.tsx"],"mappings":";;;;;;AAAA,IAAAA,sBAAA,GAAAC,OAAA;AAKA,IAAAC,UAAA,GAAAD,OAAA;AAEA,IAAAE,UAAA,GAAAF,OAAA;AACA,IAAAG,kBAAA,GAAAH,OAAA;AAUO,MAAMI,oBAAoB,GAAGA,CAAC;EACpCC,gBAAgB;EAChBC;AAC2B,CAAC,KAAK;EACjC,MAAM;IAAEC,uBAAuB;IAAEC;EAA+B,CAAC,GAChE,IAAAC,oCAAyB,EAAC,CAAC;EAC5B,MAAMC,yBAAyB,GAAG,IAAAC,qCAAc,EAC/C,CAAC,CACF,CAAC;EAED,OAAO,IAAAC,sCAAe,EAAC,MAAM;IAC5B,SAAS;;IACTJ,8BAA8B,CAACK,GAAG,CAAC,CAAC;IAEpC,MAAMC,KAAK,GAAGP,uBAAuB,CAACM,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,GACzD,IAAAC,oCAAiB,EAAC;MACjBhB,gBAAgB,EAAEA,gBAAgB,CAACQ,GAAG,CAAC,CAAC;MACxCP,iBAAiB,EAAEA,iBAAiB,EAAEO,GAAG,CAAC,CAAC,IAAIS,oBAAS;MACxDZ,yBAAyB,EAAEA,yBAAyB,CAACG,GAAG,CAAC,CAAC;MAC1DE;IACD,CAAC,CAAC;IAEHL,yBAAyB,CAACa,GAAG,CAACH,6BAA6B,CAAC;IAE5D,OAAOD,iBAAiB;EACzB,CAAC,CAAC;AACH,CAAC;AAACK,OAAA,CAAApB,oBAAA,GAAAA,oBAAA","ignoreList":[]}
+{"version":3,"names":["_reactNativeReanimated","require","_constants","_animation","_resolveSlotStyles","useResolvedStylesMap","currentStylesMap","ancestorStylesMap","screenInterpolatorProps","screenInterpolatorPropsRevision","useScreenAnimationContext","previousStyleStatesBySlot","useSharedValue","previousResolvedStylesMap","NO_STYLES","useDerivedValue","get","props","deferLocalSlotResets","focused","current","closing","resolvedStylesMap","nextPreviousStyleStatesBySlot","resolveSlotStyles","set","stableResolvedStylesMap","reuseEqualResolvedSlots","exports"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/styles/hooks/use-resolved-slot-style-map.tsx"],"mappings":";;;;;;AAAA,IAAAA,sBAAA,GAAAC,OAAA;AAKA,IAAAC,UAAA,GAAAD,OAAA;AAEA,IAAAE,UAAA,GAAAF,OAAA;AACA,IAAAG,kBAAA,GAAAH,OAAA;AAWO,MAAMI,oBAAoB,GAAGA,CAAC;EACpCC,gBAAgB;EAChBC;AAC2B,CAAC,KAAK;EACjC,MAAM;IAAEC,uBAAuB;IAAEC;EAAgC,CAAC,GACjE,IAAAC,oCAAyB,EAAC,CAAC;EAC5B,MAAMC,yBAAyB,GAAG,IAAAC,qCAAc,EAC/C,CAAC,CACF,CAAC;EACD,MAAMC,yBAAyB,GAC9B,IAAAD,qCAAc,EAAwCE,oBAAS,CAAC;EAEjE,OAAO,IAAAC,sCAAe,EAAC,MAAM;IAC5B,SAAS;;IACTN,+BAA+B,CAACO,GAAG,CAAC,CAAC;IAErC,MAAMC,KAAK,GAAGT,uBAAuB,CAACQ,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,GACzD,IAAAC,oCAAiB,EAAC;MACjBlB,gBAAgB,EAAEA,gBAAgB,CAACU,GAAG,CAAC,CAAC;MACxCT,iBAAiB,EAAEA,iBAAiB,EAAES,GAAG,CAAC,CAAC,IAAIF,oBAAS;MACxDH,yBAAyB,EAAEA,yBAAyB,CAACK,GAAG,CAAC,CAAC;MAC1DE;IACD,CAAC,CAAC;IAEHP,yBAAyB,CAACc,GAAG,CAACF,6BAA6B,CAAC;IAC5D,MAAMG,uBAAuB,GAAG,IAAAC,0CAAuB,EAAC;MACvDL,iBAAiB;MACjBT,yBAAyB,EAAEA,yBAAyB,CAACG,GAAG,CAAC;IAC1D,CAAC,CAAC;IACFH,yBAAyB,CAACY,GAAG,CAACC,uBAAuB,CAAC;IAEtD,OAAOA,uBAAuB;EAC/B,CAAC,CAAC;AACH,CAAC;AAACE,OAAA,CAAAvB,oBAAA,GAAAA,oBAAA","ignoreList":[]}

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

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

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

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeReanimated","require","_createStore","createAnimationBag","progress","makeMutable","willAnimate","closing","animating","entering","settled","logicallySettled","AnimationStore","exports","createStore","createBag","disposeBag","bag","cancelAnimation"],"sourceRoot":"../../../../src","sources":["shared/stores/animation.store.ts"],"mappings":";;;;;;AAAA,IAAAA,sBAAA,GAAAC,OAAA;AAKA,IAAAC,YAAA,GAAAD,OAAA;AAYA,SAASE,kBAAkBA,CAAA,EAAsB;EAChD,OAAO;IACNC,QAAQ,EAAE,IAAAC,kCAAW,EAAC,CAAC,CAAC;IACxBC,WAAW,EAAE,IAAAD,kCAAW,EAAC,CAAC,CAAC;IAC3BE,OAAO,EAAE,IAAAF,kCAAW,EAAC,CAAC,CAAC;IACvBG,SAAS,EAAE,IAAAH,kCAAW,EAAC,CAAC,CAAC;IACzBI,QAAQ,EAAE,IAAAJ,kCAAW,EAAC,CAAC,CAAC;IACxBK,OAAO,EAAE,IAAAL,kCAAW,EAAC,CAAC,CAAC;IACvBM,gBAAgB,EAAE,IAAAN,kCAAW,EAAC,CAAC;EAChC,CAAC;AACF;;AAEA;AACA;AACA;AACA;AACA;AACO,MAAMO,cAAc,GAAAC,OAAA,CAAAD,cAAA,GAAG,IAAAE,wBAAW,EAAoB;EAC5DC,SAAS,EAAEZ,kBAAkB;EAC7Ba,UAAU,EAAGC,GAAG,IAAK;IACpB,IAAAC,sCAAe,EAACD,GAAG,CAACb,QAAQ,CAAC;IAC7B,IAAAc,sCAAe,EAACD,GAAG,CAACX,WAAW,CAAC;IAChC,IAAAY,sCAAe,EAACD,GAAG,CAACT,SAAS,CAAC;IAC9B,IAAAU,sCAAe,EAACD,GAAG,CAACV,OAAO,CAAC;IAC5B,IAAAW,sCAAe,EAACD,GAAG,CAACR,QAAQ,CAAC;IAC7B,IAAAS,sCAAe,EAACD,GAAG,CAACP,OAAO,CAAC;IAC5B,IAAAQ,sCAAe,EAACD,GAAG,CAACN,gBAAgB,CAAC;EACtC;AACD,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["_reactNativeReanimated","require","_createStore","createAnimationBag","progress","makeMutable","willAnimate","closing","progressAnimating","entering","AnimationStore","exports","createStore","createBag","disposeBag","bag","cancelAnimation"],"sourceRoot":"../../../../src","sources":["shared/stores/animation.store.ts"],"mappings":";;;;;;AAAA,IAAAA,sBAAA,GAAAC,OAAA;AAKA,IAAAC,YAAA,GAAAD,OAAA;AAUA,SAASE,kBAAkBA,CAAA,EAAsB;EAChD,OAAO;IACNC,QAAQ,EAAE,IAAAC,kCAAW,EAAC,CAAC,CAAC;IACxBC,WAAW,EAAE,IAAAD,kCAAW,EAAC,CAAC,CAAC;IAC3BE,OAAO,EAAE,IAAAF,kCAAW,EAAC,CAAC,CAAC;IACvBG,iBAAiB,EAAE,IAAAH,kCAAW,EAAC,CAAC,CAAC;IACjCI,QAAQ,EAAE,IAAAJ,kCAAW,EAAC,CAAC;EACxB,CAAC;AACF;;AAEA;AACA;AACA;AACA;AACA;AACO,MAAMK,cAAc,GAAAC,OAAA,CAAAD,cAAA,GAAG,IAAAE,wBAAW,EAAoB;EAC5DC,SAAS,EAAEV,kBAAkB;EAC7BW,UAAU,EAAGC,GAAG,IAAK;IACpB,IAAAC,sCAAe,EAACD,GAAG,CAACX,QAAQ,CAAC;IAC7B,IAAAY,sCAAe,EAACD,GAAG,CAACT,WAAW,CAAC;IAChC,IAAAU,sCAAe,EAACD,GAAG,CAACP,iBAAiB,CAAC;IACtC,IAAAQ,sCAAe,EAACD,GAAG,CAACR,OAAO,CAAC;IAC5B,IAAAS,sCAAe,EAACD,GAAG,CAACN,QAAQ,CAAC;EAC9B;AACD,CAAC,CAAC","ignoreList":[]}

package/lib/commonjs/shared/stores/bounds/helpers/link-pairs.helpers.js

@@ -0,0 +1,125 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.removePairLink = exports.isScreenPairKeyForScreen = exports.getSourceScreenKeyFromPairKey = exports.getSource = exports.getLinkKeyFromTag = exports.getLink = exports.getGroupKeyFromTag = exports.getDestinationScreenKeyFromPairKey = exports.getDestination = exports.getActiveGroupId = exports.ensurePairState = exports.ensurePairLinks = exports.ensurePairGroups = exports.createScreenPairKey = exports.createPendingPairKey = exports.createGroupTag = void 0;
+const PAIR_SEPARATOR = "<>";
+const createScreenPairKey = (sourceScreenKey, destinationScreenKey) => {
+  "worklet";
+
+  return `${sourceScreenKey}${PAIR_SEPARATOR}${destinationScreenKey}`;
+};
+exports.createScreenPairKey = createScreenPairKey;
+const createPendingPairKey = sourceScreenKey => {
+  "worklet";
+
+  return createScreenPairKey(sourceScreenKey, "");
+};
+exports.createPendingPairKey = createPendingPairKey;
+const getSourceScreenKeyFromPairKey = pairKey => {
+  "worklet";
+
+  const separatorIndex = pairKey.indexOf(PAIR_SEPARATOR);
+  if (separatorIndex === -1) return pairKey;
+  return pairKey.slice(0, separatorIndex);
+};
+exports.getSourceScreenKeyFromPairKey = getSourceScreenKeyFromPairKey;
+const getDestinationScreenKeyFromPairKey = pairKey => {
+  "worklet";
+
+  const separatorIndex = pairKey.indexOf(PAIR_SEPARATOR);
+  if (separatorIndex === -1) return "";
+  return pairKey.slice(separatorIndex + PAIR_SEPARATOR.length);
+};
+exports.getDestinationScreenKeyFromPairKey = getDestinationScreenKeyFromPairKey;
+const isScreenPairKeyForScreen = (pairKey, screenKey) => {
+  "worklet";
+
+  return pairKey === createPendingPairKey(screenKey) || pairKey.startsWith(`${screenKey}${PAIR_SEPARATOR}`) || pairKey.endsWith(`${PAIR_SEPARATOR}${screenKey}`);
+};
+exports.isScreenPairKeyForScreen = isScreenPairKeyForScreen;
+const getLinkKeyFromTag = tag => {
+  "worklet";
+
+  const separatorIndex = tag.indexOf(":");
+  if (separatorIndex === -1) return tag;
+  return tag.slice(separatorIndex + 1);
+};
+exports.getLinkKeyFromTag = getLinkKeyFromTag;
+const getGroupKeyFromTag = tag => {
+  "worklet";
+
+  const separatorIndex = tag.indexOf(":");
+  if (separatorIndex === -1) return null;
+  return tag.slice(0, separatorIndex);
+};
+exports.getGroupKeyFromTag = getGroupKeyFromTag;
+const createGroupTag = (group, linkKey) => {
+  "worklet";
+
+  return `${group}:${linkKey}`;
+};
+exports.createGroupTag = createGroupTag;
+const ensurePairState = (state, pairKey) => {
+  "worklet";
+
+  if (!state[pairKey]) {
+    state[pairKey] = {
+      links: {},
+      groups: {}
+    };
+  }
+  state[pairKey].groups ??= {};
+  return state[pairKey];
+};
+exports.ensurePairState = ensurePairState;
+const ensurePairLinks = (state, pairKey) => {
+  "worklet";
+
+  return ensurePairState(state, pairKey).links;
+};
+exports.ensurePairLinks = ensurePairLinks;
+const ensurePairGroups = (state, pairKey) => {
+  "worklet";
+
+  return ensurePairState(state, pairKey).groups;
+};
+exports.ensurePairGroups = ensurePairGroups;
+const removePairLink = (state, pairKey, linkKey) => {
+  "worklet";
+
+  const pair = state[pairKey];
+  if (!pair) return;
+  delete pair.links[linkKey];
+  for (const key in pair.links) {
+    if (pair.links[key]) return;
+  }
+  delete state[pairKey];
+};
+exports.removePairLink = removePairLink;
+const getLink = (state, pairKey, linkKey) => {
+  "worklet";
+
+  return state[pairKey]?.links[linkKey] ?? null;
+};
+exports.getLink = getLink;
+const getSource = (state, pairKey, linkKey) => {
+  "worklet";
+
+  return getLink(state, pairKey, linkKey)?.source ?? null;
+};
+exports.getSource = getSource;
+const getDestination = (state, pairKey, linkKey) => {
+  "worklet";
+
+  return getLink(state, pairKey, linkKey)?.destination ?? null;
+};
+exports.getDestination = getDestination;
+const getActiveGroupId = (state, pairKey, group) => {
+  "worklet";
+
+  return state[pairKey]?.groups?.[group]?.activeId ?? null;
+};
+exports.getActiveGroupId = getActiveGroupId;
+//# sourceMappingURL=link-pairs.helpers.js.map

package/lib/commonjs/shared/stores/bounds/helpers/link-pairs.helpers.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["PAIR_SEPARATOR","createScreenPairKey","sourceScreenKey","destinationScreenKey","exports","createPendingPairKey","getSourceScreenKeyFromPairKey","pairKey","separatorIndex","indexOf","slice","getDestinationScreenKeyFromPairKey","length","isScreenPairKeyForScreen","screenKey","startsWith","endsWith","getLinkKeyFromTag","tag","getGroupKeyFromTag","createGroupTag","group","linkKey","ensurePairState","state","links","groups","ensurePairLinks","ensurePairGroups","removePairLink","pair","key","getLink","getSource","source","getDestination","destination","getActiveGroupId","activeId"],"sourceRoot":"../../../../../../src","sources":["shared/stores/bounds/helpers/link-pairs.helpers.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/shared/stores/bounds/index.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.BoundStore = void 0;
 var _clear = require("./internals/clear");
 var _entries = require("./internals/entries");
-var _groups = require("./internals/groups");
 var _links = require("./internals/links");
 var _resolver = require("./internals/resolver");
 const BoundStore = exports.BoundStore = {
@@ -18,22 +17,15 @@ const BoundStore = exports.BoundStore = {
   link: {
     setSource: _links.setSource,
     setDestination: _links.setDestination,
-    getMatched: _links.getMatchedLink,
-    getPair: _resolver.resolveTransitionPair,
-    getPending: _links.getPendingLink,
-    hasSource: _links.hasSourceLink,
-    hasDestination: _links.hasDestinationLink
-  },
-  group: {
-    setActiveId: _groups.setGroupActiveId,
-    setInitialId: _groups.setGroupInitialId,
-    getActiveId: _groups.getGroupActiveId,
-    getInitialId: _groups.getGroupInitialId
+    setActiveGroupId: _links.setActiveGroupId,
+    getLink: _links.getLink,
+    getSource: _links.getSource,
+    getDestination: _links.getDestination,
+    getActiveGroupId: _links.getActiveGroupId,
+    getPair: _resolver.resolveTransitionPair
   },
   cleanup: {
-    byScreen: _clear.clear,
-    byAncestor: _clear.clearByAncestor,
-    byBranch: _clear.clearByBranch
+    byScreen: _clear.clear
   }
 };
 //# sourceMappingURL=index.js.map

package/lib/commonjs/shared/stores/bounds/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_clear","require","_entries","_groups","_links","_resolver","BoundStore","exports","entry","set","setEntry","get","getEntry","remove","removeEntry","link","setSource","setDestination","getMatched","getMatchedLink","getPair","resolveTransitionPair","getPending","getPendingLink","hasSource","hasSourceLink","hasDestination","hasDestinationLink","group","setActiveId","setGroupActiveId","setInitialId","setGroupInitialId","getActiveId","getGroupActiveId","getInitialId","getGroupInitialId","cleanup","byScreen","clear","byAncestor","clearByAncestor","byBranch","clearByBranch"],"sourceRoot":"../../../../../src","sources":["shared/stores/bounds/index.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,QAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AAMA,IAAAG,MAAA,GAAAH,OAAA;AAQA,IAAAI,SAAA,GAAAJ,OAAA;AAcO,MAAMK,UAAU,GAAAC,OAAA,CAAAD,UAAA,GAAG;EACzBE,KAAK,EAAE;IACNC,GAAG,EAAEC,iBAAQ;IACbC,GAAG,EAAEC,iBAAQ;IACbC,MAAM,EAAEC;EACT,CAAC;EACDC,IAAI,EAAE;IACLC,SAAS,EAATA,gBAAS;IACTC,cAAc,EAAdA,qBAAc;IACdC,UAAU,EAAEC,qBAAc;IAC1BC,OAAO,EAAEC,+BAAqB;IAC9BC,UAAU,EAAEC,qBAAc;IAC1BC,SAAS,EAAEC,oBAAa;IACxBC,cAAc,EAAEC;EACjB,CAAC;EACDC,KAAK,EAAE;IACNC,WAAW,EAAEC,wBAAgB;IAC7BC,YAAY,EAAEC,yBAAiB;IAC/BC,WAAW,EAAEC,wBAAgB;IAC7BC,YAAY,EAAEC;EACf,CAAC;EACDC,OAAO,EAAE;IACRC,QAAQ,EAAEC,YAAK;IACfC,UAAU,EAAEC,sBAAe;IAC3BC,QAAQ,EAAEC;EACX;AACD,CAAC","ignoreList":[]}
+{"version":3,"names":["_clear","require","_entries","_links","_resolver","BoundStore","exports","entry","set","setEntry","get","getEntry","remove","removeEntry","link","setSource","setDestination","setActiveGroupId","getLink","getSource","getDestination","getActiveGroupId","getPair","resolveTransitionPair","cleanup","byScreen","clear"],"sourceRoot":"../../../../../src","sources":["shared/stores/bounds/index.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,QAAA,GAAAD,OAAA;AACA,IAAAE,MAAA,GAAAF,OAAA;AASA,IAAAG,SAAA,GAAAH,OAAA;AAcO,MAAMI,UAAU,GAAAC,OAAA,CAAAD,UAAA,GAAG;EACzBE,KAAK,EAAE;IACNC,GAAG,EAAEC,iBAAQ;IACbC,GAAG,EAAEC,iBAAQ;IACbC,MAAM,EAAEC;EACT,CAAC;EACDC,IAAI,EAAE;IACLC,SAAS,EAATA,gBAAS;IACTC,cAAc,EAAdA,qBAAc;IACdC,gBAAgB,EAAhBA,uBAAgB;IAChBC,OAAO,EAAPA,cAAO;IACPC,SAAS,EAATA,gBAAS;IACTC,cAAc,EAAdA,qBAAc;IACdC,gBAAgB,EAAhBA,uBAAgB;IAChBC,OAAO,EAAEC;EACV,CAAC;EACDC,OAAO,EAAE;IACRC,QAAQ,EAAEC;EACX;AACD,CAAC","ignoreList":[]}

package/lib/commonjs/shared/stores/bounds/internals/clear.js

@@ -4,62 +4,33 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.clear = clear;
-exports.clearByAncestor = clearByAncestor;
-exports.clearByBranch = clearByBranch;
 var _keys = require("../helpers/keys");
-var _matching = require("../helpers/matching");
+var _linkPairs = require("../helpers/link-pairs.helpers");
 var _state = require("./state");
-const clearRegistry = (shouldClearScreen, shouldClearLink) => {
+function clear(screenKey) {
   "worklet";
 
-  _state.registry.modify(state => {
+  _state.boundaryRegistry.modify(state => {
     "worklet";
 
     for (const tag in state) {
       const tagState = state[tag];
-      for (const entryScreenKey in tagState.screens) {
-        const screenEntry = tagState.screens[entryScreenKey];
-        if (shouldClearScreen(entryScreenKey, screenEntry)) {
-          delete tagState.screens[entryScreenKey];
-        }
-      }
-      for (let i = tagState.linkStack.length - 1; i >= 0; i--) {
-        const link = tagState.linkStack[i];
-        if (shouldClearLink(link)) {
-          tagState.linkStack.splice(i, 1);
-        }
-      }
-      if (!(0, _keys.hasAnyKeys)(tagState.screens) && tagState.linkStack.length === 0) {
+      delete tagState.screens[screenKey];
+      if (!(0, _keys.hasAnyKeys)(tagState.screens)) {
         delete state[tag];
       }
     }
     return state;
   });
-};
-function clear(screenKey) {
-  "worklet";
-
-  clearRegistry(entryScreenKey => entryScreenKey === screenKey, link => {
-    return (0, _matching.matchesScreenKey)(link.source, screenKey) || (0, _matching.matchesScreenKey)(link.destination, screenKey);
-  });
-}
-function clearByAncestor(ancestorKey) {
-  "worklet";
-
-  clearRegistry((entryScreenKey, screenEntry) => {
-    return entryScreenKey === ancestorKey || (screenEntry.ancestorKeys?.includes(ancestorKey) ?? false);
-  }, link => {
-    return (0, _matching.matchesScreenKey)(link.source, ancestorKey) || (0, _matching.matchesScreenKey)(link.destination, ancestorKey);
-  });
-}
-function clearByBranch(branchNavigatorKey) {
-  "worklet";
+  _state.pairs.modify(state => {
+    "worklet";
 
-  if (!branchNavigatorKey) return;
-  clearRegistry((_entryScreenKey, screenEntry) => {
-    return screenEntry.navigatorKey === branchNavigatorKey || (screenEntry.ancestorNavigatorKeys?.includes(branchNavigatorKey) ?? false);
-  }, link => {
-    return (0, _matching.matchesNavigatorKey)(link.source, branchNavigatorKey) || (0, _matching.matchesNavigatorKey)(link.destination, branchNavigatorKey);
+    for (const pairKey in state) {
+      if ((0, _linkPairs.isScreenPairKeyForScreen)(pairKey, screenKey)) {
+        delete state[pairKey];
+      }
+    }
+    return state;
   });
 }
 //# sourceMappingURL=clear.js.map

package/lib/commonjs/shared/stores/bounds/internals/clear.js.map

@@ -1 +1 @@
-{"version":3,"names":["_keys","require","_matching","_state","clearRegistry","shouldClearScreen","shouldClearLink","registry","modify","state","tag","tagState","entryScreenKey","screens","screenEntry","i","linkStack","length","link","splice","hasAnyKeys","clear","screenKey","matchesScreenKey","source","destination","clearByAncestor","ancestorKey","ancestorKeys","includes","clearByBranch","branchNavigatorKey","_entryScreenKey","navigatorKey","ancestorNavigatorKeys","matchesNavigatorKey"],"sourceRoot":"../../../../../../src","sources":["shared/stores/bounds/internals/clear.ts"],"mappings":";;;;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,SAAA,GAAAD,OAAA;AAEA,IAAAE,MAAA,GAAAF,OAAA;AASA,MAAMG,aAAa,GAAGA,CACrBC,iBAAkC,EAClCC,eAA8B,KAC1B;EACJ,SAAS;;EACTC,eAAQ,CAACC,MAAM,CAA2BC,KAAQ,IAAQ;IACzD,SAAS;;IACT,KAAK,MAAMC,GAAG,IAAID,KAAK,EAAE;MACxB,MAAME,QAAQ,GAAGF,KAAK,CAACC,GAAG,CAAC;MAE3B,KAAK,MAAME,cAAc,IAAID,QAAQ,CAACE,OAAO,EAAE;QAC9C,MAAMC,WAAW,GAAGH,QAAQ,CAACE,OAAO,CAACD,cAAc,CAAC;QACpD,IAAIP,iBAAiB,CAACO,cAAc,EAAEE,WAAW,CAAC,EAAE;UACnD,OAAOH,QAAQ,CAACE,OAAO,CAACD,cAAc,CAAC;QACxC;MACD;MAEA,KAAK,IAAIG,CAAC,GAAGJ,QAAQ,CAACK,SAAS,CAACC,MAAM,GAAG,CAAC,EAAEF,CAAC,IAAI,CAAC,EAAEA,CAAC,EAAE,EAAE;QACxD,MAAMG,IAAI,GAAGP,QAAQ,CAACK,SAAS,CAACD,CAAC,CAAC;QAClC,IAAIT,eAAe,CAACY,IAAI,CAAC,EAAE;UAC1BP,QAAQ,CAACK,SAAS,CAACG,MAAM,CAACJ,CAAC,EAAE,CAAC,CAAC;QAChC;MACD;MAEA,IAAI,CAAC,IAAAK,gBAAU,EAACT,QAAQ,CAACE,OAAO,CAAC,IAAIF,QAAQ,CAACK,SAAS,CAACC,MAAM,KAAK,CAAC,EAAE;QACrE,OAAOR,KAAK,CAACC,GAAG,CAAC;MAClB;IACD;IAEA,OAAOD,KAAK;EACb,CAAC,CAAC;AACH,CAAC;AAED,SAASY,KAAKA,CAACC,SAAoB,EAAE;EACpC,SAAS;;EACTlB,aAAa,CACXQ,cAAc,IAAKA,cAAc,KAAKU,SAAS,EAC/CJ,IAAI,IAAK;IACT,OACC,IAAAK,0BAAgB,EAACL,IAAI,CAACM,MAAM,EAAEF,SAAS,CAAC,IACxC,IAAAC,0BAAgB,EAACL,IAAI,CAACO,WAAW,EAAEH,SAAS,CAAC;EAE/C,CACD,CAAC;AACF;AAEA,SAASI,eAAeA,CAACC,WAAsB,EAAE;EAChD,SAAS;;EACTvB,aAAa,CACZ,CAACQ,cAAc,EAAEE,WAAW,KAAK;IAChC,OACCF,cAAc,KAAKe,WAAW,KAC7Bb,WAAW,CAACc,YAAY,EAAEC,QAAQ,CAACF,WAAW,CAAC,IAAI,KAAK,CAAC;EAE5D,CAAC,EACAT,IAAI,IAAK;IACT,OACC,IAAAK,0BAAgB,EAACL,IAAI,CAACM,MAAM,EAAEG,WAAW,CAAC,IAC1C,IAAAJ,0BAAgB,EAACL,IAAI,CAACO,WAAW,EAAEE,WAAW,CAAC;EAEjD,CACD,CAAC;AACF;AAEA,SAASG,aAAaA,CAACC,kBAAgC,EAAE;EACxD,SAAS;;EACT,IAAI,CAACA,kBAAkB,EAAE;EAEzB3B,aAAa,CACZ,CAAC4B,eAAe,EAAElB,WAAW,KAAK;IACjC,OACCA,WAAW,CAACmB,YAAY,KAAKF,kBAAkB,KAC9CjB,WAAW,CAACoB,qBAAqB,EAAEL,QAAQ,CAACE,kBAAkB,CAAC,IAC/D,KAAK,CAAC;EAET,CAAC,EACAb,IAAI,IAAK;IACT,OACC,IAAAiB,6BAAmB,EAACjB,IAAI,CAACM,MAAM,EAAEO,kBAAkB,CAAC,IACpD,IAAAI,6BAAmB,EAACjB,IAAI,CAACO,WAAW,EAAEM,kBAAkB,CAAC;EAE3D,CACD,CAAC;AACF","ignoreList":[]}
+{"version":3,"names":["_keys","require","_linkPairs","_state","clear","screenKey","boundaryRegistry","modify","state","tag","tagState","screens","hasAnyKeys","pairs","pairKey","isScreenPairKeyForScreen"],"sourceRoot":"../../../../../../src","sources":["shared/stores/bounds/internals/clear.ts"],"mappings":";;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AAEA,IAAAE,MAAA,GAAAF,OAAA;AAEA,SAASG,KAAKA,CAACC,SAAoB,EAAE;EACpC,SAAS;;EAETC,uBAAgB,CAACC,MAAM,CAAkCC,KAAQ,IAAQ;IACxE,SAAS;;IACT,KAAK,MAAMC,GAAG,IAAID,KAAK,EAAE;MACxB,MAAME,QAAQ,GAAGF,KAAK,CAACC,GAAG,CAAC;MAC3B,OAAOC,QAAQ,CAACC,OAAO,CAACN,SAAS,CAAC;MAElC,IAAI,CAAC,IAAAO,gBAAU,EAACF,QAAQ,CAACC,OAAO,CAAC,EAAE;QAClC,OAAOH,KAAK,CAACC,GAAG,CAAC;MAClB;IACD;IAEA,OAAOD,KAAK;EACb,CAAC,CAAC;EAEFK,YAAK,CAACN,MAAM,CAA4BC,KAAQ,IAAQ;IACvD,SAAS;;IACT,KAAK,MAAMM,OAAO,IAAIN,KAAK,EAAE;MAC5B,IAAI,IAAAO,mCAAwB,EAACD,OAAO,EAAET,SAAS,CAAC,EAAE;QACjD,OAAOG,KAAK,CAACM,OAAO,CAAC;MACtB;IACD;IAEA,OAAON,KAAK;EACb,CAAC,CAAC;AACH","ignoreList":[]}