react-native-screen-transitions 3.6.0-alpha.3 → 3.6.0-beta.0

package/lib/commonjs/shared/providers/screen/options/helpers.js

@@ -68,6 +68,11 @@ const resolveSheetScrollGestureBehaviorOption = (value, fallback) => {
 
   return value === "expand-and-collapse" || value === "collapse-only" ? value : fallback;
 };
+const resolveGestureTrackingOption = (value, fallback) => {
+  "worklet";
+
+  return value === "auto" || value === "never" || value === "always" ? value : fallback;
+};
 const resolveBackdropBehaviorOption = (value, fallback) => {
   "worklet";
 
@@ -109,14 +114,14 @@ const areGestureDirectionsEqual = (left, right) => {
 const areScreenOptionsEqual = (left, right) => {
   "worklet";
 
-  return left.navigationMaskEnabled === right.navigationMaskEnabled && left.gestureEnabled === right.gestureEnabled && left.experimental_allowDisabledGestureTracking === right.experimental_allowDisabledGestureTracking && areGestureDirectionsEqual(left.gestureDirection, right.gestureDirection) && left.gestureSensitivity === right.gestureSensitivity && left.gestureVelocityImpact === right.gestureVelocityImpact && left.gestureSnapVelocityImpact === right.gestureSnapVelocityImpact && left.gestureReleaseVelocityScale === right.gestureReleaseVelocityScale && left.gestureResponseDistance === right.gestureResponseDistance && left.gestureProgressMode === right.gestureProgressMode && left.gestureDrivesProgress === right.gestureDrivesProgress && areGestureActivationAreasEqual(left.gestureActivationArea, right.gestureActivationArea) && left.gestureSnapLocked === right.gestureSnapLocked && left.sheetScrollGestureBehavior === right.sheetScrollGestureBehavior && left.backdropBehavior === right.backdropBehavior && left.baseOptions === right.baseOptions;
+  return left.navigationMaskEnabled === right.navigationMaskEnabled && left.gestureEnabled === right.gestureEnabled && left.gestureTracking === right.gestureTracking && areGestureDirectionsEqual(left.gestureDirection, right.gestureDirection) && left.gestureSensitivity === right.gestureSensitivity && left.gestureVelocityImpact === right.gestureVelocityImpact && left.gestureSnapVelocityImpact === right.gestureSnapVelocityImpact && left.gestureReleaseVelocityScale === right.gestureReleaseVelocityScale && left.gestureResponseDistance === right.gestureResponseDistance && left.gestureProgressMode === right.gestureProgressMode && left.gestureDrivesProgress === right.gestureDrivesProgress && areGestureActivationAreasEqual(left.gestureActivationArea, right.gestureActivationArea) && left.gestureSnapLocked === right.gestureSnapLocked && left.sheetScrollGestureBehavior === right.sheetScrollGestureBehavior && left.backdropBehavior === right.backdropBehavior && left.baseOptions === right.baseOptions;
 };
 const resolveBaseScreenOptions = options => {
   const gestureProgressMode = resolveGestureProgressModeOption(options.gestureProgressMode, options.gestureDrivesProgress, _constants.DEFAULT_GESTURE_PROGRESS_MODE);
   return {
     navigationMaskEnabled: resolveBooleanOption(options.navigationMaskEnabled, undefined),
     gestureEnabled: resolveBooleanOption(options.gestureEnabled, undefined),
-    experimental_allowDisabledGestureTracking: resolveBooleanOption(options.experimental_allowDisabledGestureTracking, false),
+    gestureTracking: resolveGestureTrackingOption(options.gestureTracking, _constants.DEFAULT_GESTURE_TRACKING),
     gestureDirection: resolveGestureDirectionOption(options.gestureDirection, _constants.DEFAULT_GESTURE_DIRECTION),
     gestureSensitivity: resolveNumberOption(options.gestureSensitivity, _constants.DEFAULT_GESTURE_SENSITIVITY),
     gestureVelocityImpact: resolveNumberOption(options.gestureVelocityImpact, _constants.DEFAULT_GESTURE_VELOCITY_IMPACT),
@@ -153,9 +158,9 @@ const syncScreenOptionsOverrides = (raw, screenOptions) => {
   const base = screenOptions.get().baseOptions;
   const gestureProgressMode = resolveGestureProgressModeOption(options?.gestureProgressMode, options?.gestureDrivesProgress, base.gestureProgressMode);
   const next = {
-    navigationMaskEnabled: resolveBooleanOption(options?.navigationMaskEnabled, base.navigationMaskEnabled),
+    navigationMaskEnabled: base.navigationMaskEnabled,
     gestureEnabled: resolveBooleanOption(options?.gestureEnabled, base.gestureEnabled),
-    experimental_allowDisabledGestureTracking: resolveBooleanOption(options?.experimental_allowDisabledGestureTracking, base.experimental_allowDisabledGestureTracking),
+    gestureTracking: base.gestureTracking,
     gestureDirection: resolveGestureDirectionOption(options?.gestureDirection, base.gestureDirection),
     gestureSensitivity: resolveNumberOption(options?.gestureSensitivity, base.gestureSensitivity),
     gestureVelocityImpact: resolveNumberOption(options?.gestureVelocityImpact, base.gestureVelocityImpact),

package/lib/commonjs/shared/providers/screen/options/helpers.js.map

@@ -1 +1 @@
-{"version":3,"names":["_constants","require","_gestureProgressMode","_resolveScreenTransitionOptions","cloneGestureDirection","direction","Array","isArray","cloneGestureActivationArea","activationArea","resolveBooleanOption","value","fallback","resolveNumberOption","Number","isFinite","isGestureDirection","resolveGestureDirectionOption","every","isActivationArea","resolveGestureActivationAreaOption","area","isValid","left","undefined","right","top","bottom","resolveSheetScrollGestureBehaviorOption","resolveBackdropBehaviorOption","resolveGestureProgressModeOption","gestureProgressMode","gestureDrivesProgress","isGestureProgressMode","resolveGestureProgressMode","areGestureActivationAreasEqual","areGestureDirectionsEqual","length","i","areScreenOptionsEqual","navigationMaskEnabled","gestureEnabled","experimental_allowDisabledGestureTracking","gestureDirection","gestureSensitivity","gestureVelocityImpact","gestureSnapVelocityImpact","gestureReleaseVelocityScale","gestureResponseDistance","gestureActivationArea","gestureSnapLocked","sheetScrollGestureBehavior","backdropBehavior","baseOptions","resolveBaseScreenOptions","options","DEFAULT_GESTURE_PROGRESS_MODE","DEFAULT_GESTURE_DIRECTION","DEFAULT_GESTURE_SENSITIVITY","DEFAULT_GESTURE_VELOCITY_IMPACT","DEFAULT_GESTURE_SNAP_VELOCITY_IMPACT","DEFAULT_GESTURE_RELEASE_VELOCITY_SCALE","gestureProgressModeDrivesProgress","DEFAULT_GESTURE_ACTIVATION_AREA","DEFAULT_GESTURE_SNAP_LOCKED","resolveSheetScrollGestureBehavior","DEFAULT_SHEET_SCROLL_GESTURE_BEHAVIOR","exports","syncScreenOptionsBase","screenOptions","base","next","get","set","syncScreenOptionsOverrides","raw"],"sourceRoot":"../../../../../../src","sources":["shared/providers/screen/options/helpers.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_constants","require","_gestureProgressMode","_resolveScreenTransitionOptions","cloneGestureDirection","direction","Array","isArray","cloneGestureActivationArea","activationArea","resolveBooleanOption","value","fallback","resolveNumberOption","Number","isFinite","isGestureDirection","resolveGestureDirectionOption","every","isActivationArea","resolveGestureActivationAreaOption","area","isValid","left","undefined","right","top","bottom","resolveSheetScrollGestureBehaviorOption","resolveGestureTrackingOption","resolveBackdropBehaviorOption","resolveGestureProgressModeOption","gestureProgressMode","gestureDrivesProgress","isGestureProgressMode","resolveGestureProgressMode","areGestureActivationAreasEqual","areGestureDirectionsEqual","length","i","areScreenOptionsEqual","navigationMaskEnabled","gestureEnabled","gestureTracking","gestureDirection","gestureSensitivity","gestureVelocityImpact","gestureSnapVelocityImpact","gestureReleaseVelocityScale","gestureResponseDistance","gestureActivationArea","gestureSnapLocked","sheetScrollGestureBehavior","backdropBehavior","baseOptions","resolveBaseScreenOptions","options","DEFAULT_GESTURE_PROGRESS_MODE","DEFAULT_GESTURE_TRACKING","DEFAULT_GESTURE_DIRECTION","DEFAULT_GESTURE_SENSITIVITY","DEFAULT_GESTURE_VELOCITY_IMPACT","DEFAULT_GESTURE_SNAP_VELOCITY_IMPACT","DEFAULT_GESTURE_RELEASE_VELOCITY_SCALE","gestureProgressModeDrivesProgress","DEFAULT_GESTURE_ACTIVATION_AREA","DEFAULT_GESTURE_SNAP_LOCKED","resolveSheetScrollGestureBehavior","DEFAULT_SHEET_SCROLL_GESTURE_BEHAVIOR","exports","syncScreenOptionsBase","screenOptions","base","next","get","set","syncScreenOptionsOverrides","raw"],"sourceRoot":"../../../../../../src","sources":["shared/providers/screen/options/helpers.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/shared/providers/screen/styles/helpers/resolve-slot-styles/index.js

@@ -20,6 +20,27 @@ const hasEitherResetPatch = (hasStyleResetPatch, hasPropResetPatch) => {
 
   return hasStyleResetPatch || hasPropResetPatch;
 };
+const hasDefinedBucketValue = value => {
+  "worklet";
+
+  return value !== undefined && value !== null;
+};
+const hasResettableDisappearedKeys = (previousKeys, previousResetValues, currentKeys) => {
+  "worklet";
+
+  if (!previousKeys || !previousResetValues) {
+    return false;
+  }
+  for (const key in previousKeys) {
+    if (currentKeys !== undefined && currentKeys[key] === true) {
+      continue;
+    }
+    if (previousResetValues[key] !== undefined) {
+      return true;
+    }
+  }
+  return false;
+};
 const getResolvedSlotOutput = ({
   slot,
   previousState,
@@ -29,8 +50,8 @@ const getResolvedSlotOutput = ({
   "worklet";
 
   const state = (0, _slotState.getResolvedSlotState)(slot);
-  const hasStyleResetPatch = resetDroppedKeys && (0, _slotState.hasDisappearedKeys)(previousState?.styleKeys, state.styleKeys);
-  const hasPropResetPatch = resetDroppedKeys && (0, _slotState.hasDisappearedKeys)(previousState?.propKeys, state.propKeys);
+  const hasStyleResetPatch = resetDroppedKeys && hasResettableDisappearedKeys(previousState?.styleKeys, previousState?.styleResetValues, state.styleKeys);
+  const hasPropResetPatch = resetDroppedKeys && hasResettableDisappearedKeys(previousState?.propKeys, previousState?.propResetValues, state.propKeys);
   const hasResetPatch = hasEitherResetPatch(hasStyleResetPatch, hasPropResetPatch);
   const nextState = state.nextState ?? (carryPreviousState ? previousState : undefined);
   if (!hasResetPatch) {
@@ -54,20 +75,72 @@ const getResolvedSlotOutput = ({
     nextState
   };
 };
+const hasLocalStyleSource = context => {
+  "worklet";
+
+  return context.localStylesMaps.length > 0;
+};
+const hasLocalSlot = (context, slotId) => {
+  "worklet";
+
+  for (let index = 0; index < context.localStylesMaps.length; index++) {
+    if (context.localStylesMaps[index]?.[slotId] !== undefined) {
+      return true;
+    }
+  }
+  return false;
+};
 const shouldDeferMissingLocalSlotReset = (context, slotId) => {
   "worklet";
 
   const canInherit = (0, _constants.shouldSlotInherit)(slotId);
-  const hasCurrentSlot = context.currentStylesMap[slotId] !== undefined;
+  const localSlotExists = hasLocalSlot(context, slotId);
   const hasInheritedSlot = canInherit && context.ancestorStylesMap[slotId] !== undefined;
-  return context.deferLocalSlotResets && !canInherit && !hasCurrentSlot && !hasInheritedSlot;
+  return context.deferLocalSlotResets && !hasLocalStyleSource(context) && !canInherit && !localSlotExists && !hasInheritedSlot;
+};
+const mergeBucket = (resolvedBucket, source) => {
+  "worklet";
+
+  if (!source) {
+    return resolvedBucket;
+  }
+  let nextBucket = resolvedBucket;
+  for (const key in source) {
+    const value = source[key];
+    if (!hasDefinedBucketValue(value)) {
+      continue;
+    }
+    nextBucket = nextBucket ?? {};
+    nextBucket[key] = value;
+  }
+  return nextBucket;
+};
+const getMergedLocalSlot = (context, slotId) => {
+  "worklet";
+
+  let mergedStyle;
+  let mergedProps;
+  for (let index = 0; index < context.localStylesMaps.length; index++) {
+    const slot = context.localStylesMaps[index]?.[slotId];
+    if (slot === undefined) {
+      continue;
+    }
+    mergedStyle = mergeBucket(mergedStyle, slot.style);
+    mergedProps = mergeBucket(mergedProps, slot.props);
+  }
+  if (!mergedStyle && !mergedProps) {
+    return undefined;
+  }
+  return {
+    style: mergedStyle,
+    props: mergedProps
+  };
 };
 const getSlotForId = (context, slotId) => {
   "worklet";
 
-  const currentSlot = context.currentStylesMap[slotId];
-  if (currentSlot !== undefined) {
-    return currentSlot;
+  if (hasLocalSlot(context, slotId)) {
+    return getMergedLocalSlot(context, slotId);
   }
   if ((0, _constants.shouldSlotInherit)(slotId)) {
     return context.ancestorStylesMap[slotId];
@@ -224,14 +297,22 @@ const appendResolvedSlot = (context, slotId) => {
 const appendCurrentSlots = context => {
   "worklet";
 
-  for (const slotId in context.currentStylesMap) {
-    appendResolvedSlot(context, slotId);
+  const appendedSlotIds = {};
+  for (let index = 0; index < context.localStylesMaps.length; index++) {
+    const stylesMap = context.localStylesMaps[index];
+    for (const slotId in stylesMap) {
+      if (stylesMap[slotId] === undefined || appendedSlotIds[slotId]) {
+        continue;
+      }
+      appendedSlotIds[slotId] = true;
+      appendResolvedSlot(context, slotId);
+    }
   }
 };
 const shouldAppendInheritedSlot = (context, slotId) => {
   "worklet";
 
-  return (0, _constants.shouldSlotInherit)(slotId) && context.currentStylesMap[slotId] === undefined;
+  return (0, _constants.shouldSlotInherit)(slotId) && !hasLocalSlot(context, slotId);
 };
 const appendInheritedSlots = context => {
   "worklet";
@@ -246,7 +327,7 @@ const shouldAppendPreviousSlot = (context, slotId) => {
   "worklet";
 
   const inheritedSlotExists = (0, _constants.shouldSlotInherit)(slotId) && context.ancestorStylesMap[slotId] !== undefined;
-  return context.currentStylesMap[slotId] === undefined && !inheritedSlotExists;
+  return !hasLocalSlot(context, slotId) && !inheritedSlotExists;
 };
 const appendPreviousSlots = context => {
   "worklet";
@@ -265,7 +346,7 @@ const appendPreviousSlots = context => {
  * concrete identity values.
  */
 const resolveSlotStyles = ({
-  currentStylesMap,
+  localStylesMaps,
   ancestorStylesMap,
   previousStyleStatesBySlot,
   deferLocalSlotResets = false
@@ -275,7 +356,7 @@ const resolveSlotStyles = ({
   const resolvedStylesMap = {};
   const nextPreviousStyleStatesBySlot = {};
   const context = {
-    currentStylesMap,
+    localStylesMaps,
     ancestorStylesMap,
     previousStyleStatesBySlot,
     deferLocalSlotResets,

package/lib/commonjs/shared/providers/screen/styles/helpers/resolve-slot-styles/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_constants","require","_materializeSlot","_slotState","getForwardedSlot","slot","hasAnyKeys","undefined","hasEitherResetPatch","hasStyleResetPatch","hasPropResetPatch","getResolvedSlotOutput","previousState","resetDroppedKeys","carryPreviousState","state","getResolvedSlotState","hasDisappearedKeys","styleKeys","propKeys","hasResetPatch","nextState","resolvedSlot","materializeResolvedSlot","baseStyle","baseProps","hasAnyStyleKeys","hasAnyPropKeys","shouldDeferMissingLocalSlotReset","context","slotId","canInherit","shouldSlotInherit","hasCurrentSlot","currentStylesMap","hasInheritedSlot","ancestorStylesMap","deferLocalSlotResets","getSlotForId","currentSlot","writeResolvedSlotOutput","nextPreviousStyleStatesBySlot","resolvedStylesMap","areTransformItemsEqual","left","right","leftObject","rightObject","key","areTransformArraysEqual","Array","isArray","length","i","areFlatObjectsEqual","leftValue","rightValue","areSlotsEqual","style","props","reuseEqualResolvedSlots","previousResolvedStylesMap","changed","stableStylesMap","nextSlot","previousSlot","exports","appendResolvedSlot","shouldDeferReset","previousStyleStatesBySlot","appendCurrentSlots","shouldAppendInheritedSlot","appendInheritedSlots","shouldAppendPreviousSlot","inheritedSlotExists","appendPreviousSlots","resolveSlotStyles"],"sourceRoot":"../../../../../../../../src","sources":["shared/providers/screen/styles/helpers/resolve-slot-styles/index.ts"],"mappings":";;;;;;AAIA,IAAAA,UAAA,GAAAC,OAAA;AACA,IAAAC,gBAAA,GAAAD,OAAA;AACA,IAAAE,UAAA,GAAAF,OAAA;AAiBA,MAAMG,gBAAgB,GAAGA,CACxBC,IAA+C,EAC/CC,UAAmB,KACf;EACJ,SAAS;;EAET,IAAI,CAACA,UAAU,EAAE;IAChB,OAAOC,SAAS;EACjB;EAEA,OAAOF,IAAI;AACZ,CAAC;AAED,MAAMG,mBAAmB,GAAGA,CAC3BC,kBAA2B,EAC3BC,iBAA0B,KACtB;EACJ,SAAS;;EACT,OAAOD,kBAAkB,IAAIC,iBAAiB;AAC/C,CAAC;AAED,MAAMC,qBAAqB,GAAGA,CAAC;EAC9BN,IAAI;EACJO,aAAa;EACbC,gBAAgB;EAChBC;AAMD,CAAC,KAAK;EACL,SAAS;;EACT,MAAMC,KAAK,GAAG,IAAAC,+BAAoB,EAACX,IAAI,CAAC;EAExC,MAAMI,kBAAkB,GACvBI,gBAAgB,IAChB,IAAAI,6BAAkB,EAACL,aAAa,EAAEM,SAAS,EAAEH,KAAK,CAACG,SAAS,CAAC;EAC9D,MAAMR,iBAAiB,GACtBG,gBAAgB,IAChB,IAAAI,6BAAkB,EAACL,aAAa,EAAEO,QAAQ,EAAEJ,KAAK,CAACI,QAAQ,CAAC;EAC5D,MAAMC,aAAa,GAAGZ,mBAAmB,CACxCC,kBAAkB,EAClBC,iBACD,CAAC;EACD,MAAMW,SAAS,GACdN,KAAK,CAACM,SAAS,KAAKP,kBAAkB,GAAGF,aAAa,GAAGL,SAAS,CAAC;EAEpE,IAAI,CAACa,aAAa,EAAE;IACnB,OAAO;MACNE,YAAY,EAAElB,gBAAgB,CAACC,IAAI,EAAEU,KAAK,CAACT,UAAU,CAAC;MACtDe;IACD,CAAC;EACF;EAEA,OAAO;IACNC,YAAY,EAAE,IAAAC,wCAAuB,EAAC;MACrCC,SAAS,EAAET,KAAK,CAACS,SAAS;MAC1BC,SAAS,EAAEV,KAAK,CAACU,SAAS;MAC1Bb,aAAa;MACbM,SAAS,EAAEH,KAAK,CAACG,SAAS;MAC1BC,QAAQ,EAAEJ,KAAK,CAACI,QAAQ;MACxBO,eAAe,EAAEX,KAAK,CAACW,eAAe;MACtCC,cAAc,EAAEZ,KAAK,CAACY,cAAc;MACpClB,kBAAkB;MAClBC;IACD,CAAC,CAAC;IACFW;EACD,CAAC;AACF,CAAC;AAED,MAAMO,gCAAgC,GAAGA,CACxCC,OAAiC,EACjCC,MAAc,KACV;EACJ,SAAS;;EACT,MAAMC,UAAU,GAAG,IAAAC,4BAAiB,EAACF,MAAM,CAAC;EAC5C,MAAMG,cAAc,GAAGJ,OAAO,CAACK,gBAAgB,CAACJ,MAAM,CAAC,KAAKvB,SAAS;EACrE,MAAM4B,gBAAgB,GACrBJ,UAAU,IAAIF,OAAO,CAACO,iBAAiB,CAACN,MAAM,CAAC,KAAKvB,SAAS;EAE9D,OACCsB,OAAO,CAACQ,oBAAoB,IAC5B,CAACN,UAAU,IACX,CAACE,cAAc,IACf,CAACE,gBAAgB;AAEnB,CAAC;AAED,MAAMG,YAAY,GAAGA,CAACT,OAAiC,EAAEC,MAAc,KAAK;EAC3E,SAAS;;EACT,MAAMS,WAAW,GAAGV,OAAO,CAACK,gBAAgB,CAACJ,MAAM,CAAC;EAEpD,IAAIS,WAAW,KAAKhC,SAAS,EAAE;IAC9B,OAAOgC,WAAW;EACnB;EAEA,IAAI,IAAAP,4BAAiB,EAACF,MAAM,CAAC,EAAE;IAC9B,OAAOD,OAAO,CAACO,iBAAiB,CAACN,MAAM,CAAC;EACzC;EAEA,OAAOvB,SAAS;AACjB,CAAC;AAED,MAAMiC,uBAAuB,GAAGA,CAAC;EAChCX,OAAO;EACPC,MAAM;EACNR,YAAY;EACZD;AAMD,CAAC,KAAK;EACL,SAAS;;EAET,IAAIA,SAAS,EAAE;IACdQ,OAAO,CAACY,6BAA6B,CAACX,MAAM,CAAC,GAAGT,SAAS;EAC1D;EAEA,IAAI,CAACC,YAAY,EAAE;IAClB;EACD;EAEAO,OAAO,CAACa,iBAAiB,CAACZ,MAAM,CAAC,GAAGR,YAAY;AACjD,CAAC;AAED,MAAMqB,sBAAsB,GAAGA,CAACC,IAAa,EAAEC,KAAc,KAAc;EAC1E,SAAS;;EACT,IAAID,IAAI,KAAKC,KAAK,EAAE;IACnB,OAAO,IAAI;EACZ;EAEA,IACC,OAAOD,IAAI,KAAK,QAAQ,IACxBA,IAAI,KAAK,IAAI,IACb,OAAOC,KAAK,KAAK,QAAQ,IACzBA,KAAK,KAAK,IAAI,EACb;IACD,OAAO,KAAK;EACb;EAEA,MAAMC,UAAU,GAAGF,IAA+B;EAClD,MAAMG,WAAW,GAAGF,KAAgC;EAEpD,KAAK,MAAMG,GAAG,IAAIF,UAAU,EAAE;IAC7B,IAAIA,UAAU,CAACE,GAAG,CAAC,KAAKD,WAAW,CAACC,GAAG,CAAC,EAAE;MACzC,OAAO,KAAK;IACb;EACD;EAEA,KAAK,MAAMA,GAAG,IAAID,WAAW,EAAE;IAC9B,IAAI,EAAEC,GAAG,IAAIF,UAAU,CAAC,EAAE;MACzB,OAAO,KAAK;IACb;EACD;EAEA,OAAO,IAAI;AACZ,CAAC;AAED,MAAMG,uBAAuB,GAAGA,CAACL,IAAa,EAAEC,KAAc,KAAc;EAC3E,SAAS;;EACT,IAAID,IAAI,KAAKC,KAAK,EAAE;IACnB,OAAO,IAAI;EACZ;EAEA,IAAI,CAACK,KAAK,CAACC,OAAO,CAACP,IAAI,CAAC,IAAI,CAACM,KAAK,CAACC,OAAO,CAACN,KAAK,CAAC,EAAE;IAClD,OAAO,KAAK;EACb;EAEA,IAAID,IAAI,CAACQ,MAAM,KAAKP,KAAK,CAACO,MAAM,EAAE;IACjC,OAAO,KAAK;EACb;EAEA,KAAK,IAAIC,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGT,IAAI,CAACQ,MAAM,EAAEC,CAAC,EAAE,EAAE;IACrC,IAAI,CAACV,sBAAsB,CAACC,IAAI,CAACS,CAAC,CAAC,EAAER,KAAK,CAACQ,CAAC,CAAC,CAAC,EAAE;MAC/C,OAAO,KAAK;IACb;EACD;EAEA,OAAO,IAAI;AACZ,CAAC;AAED,MAAMC,mBAAmB,GAAGA,CAACV,IAAa,EAAEC,KAAc,KAAc;EACvE,SAAS;;EACT,IAAID,IAAI,KAAKC,KAAK,EAAE;IACnB,OAAO,IAAI;EACZ;EAEA,IACC,OAAOD,IAAI,KAAK,QAAQ,IACxBA,IAAI,KAAK,IAAI,IACb,OAAOC,KAAK,KAAK,QAAQ,IACzBA,KAAK,KAAK,IAAI,IACdK,KAAK,CAACC,OAAO,CAACP,IAAI,CAAC,IACnBM,KAAK,CAACC,OAAO,CAACN,KAAK,CAAC,EACnB;IACD,OAAO,KAAK;EACb;EAEA,MAAMC,UAAU,GAAGF,IAA+B;EAClD,MAAMG,WAAW,GAAGF,KAAgC;EAEpD,KAAK,MAAMG,GAAG,IAAIF,UAAU,EAAE;IAC7B,MAAMS,SAAS,GAAGT,UAAU,CAACE,GAAG,CAAC;IACjC,MAAMQ,UAAU,GAAGT,WAAW,CAACC,GAAG,CAAC;IAEnC,IAAIA,GAAG,KAAK,WAAW,EAAE;MACxB,IAAI,CAACC,uBAAuB,CAACM,SAAS,EAAEC,UAAU,CAAC,EAAE;QACpD,OAAO,KAAK;MACb;MACA;IACD;IAEA,IAAI,CAACb,sBAAsB,CAACY,SAAS,EAAEC,UAAU,CAAC,EAAE;MACnD,OAAO,KAAK;IACb;EACD;EAEA,KAAK,MAAMR,GAAG,IAAID,WAAW,EAAE;IAC9B,IAAI,EAAEC,GAAG,IAAIF,UAAU,CAAC,EAAE;MACzB,OAAO,KAAK;IACb;EACD;EAEA,OAAO,IAAI;AACZ,CAAC;AAED,MAAMW,aAAa,GAAGA,CACrBb,IAA+C,EAC/CC,KAAgD,KAC5C;EACJ,SAAS;;EACT,IAAID,IAAI,KAAKC,KAAK,EAAE;IACnB,OAAO,IAAI;EACZ;EAEA,IAAI,CAACD,IAAI,IAAI,CAACC,KAAK,EAAE;IACpB,OAAO,KAAK;EACb;EAEA,OACCS,mBAAmB,CAACV,IAAI,CAACc,KAAK,EAAEb,KAAK,CAACa,KAAK,CAAC,IAC5CJ,mBAAmB,CAACV,IAAI,CAACe,KAAK,EAAEd,KAAK,CAACc,KAAK,CAAC;AAE9C,CAAC;AAEM,MAAMC,uBAAuB,GAAGA,CAAC;EACvClB,iBAAiB;EACjBmB;AAID,CAAC,KAA4C;EAC5C,SAAS;;EACT,IAAIC,OAAO,GAAG,KAAK;EACnB,MAAMC,eAAsD,GAAG,CAAC,CAAC;EAEjE,KAAK,MAAMjC,MAAM,IAAIY,iBAAiB,EAAE;IACvC,MAAMsB,QAAQ,GAAGtB,iBAAiB,CAACZ,MAAM,CAAC;IAC1C,MAAMmC,YAAY,GAAGJ,yBAAyB,CAAC/B,MAAM,CAAC;IAEtD,IAAI2B,aAAa,CAACO,QAAQ,EAAEC,YAAY,CAAC,EAAE;MAC1CF,eAAe,CAACjC,MAAM,CAAC,GAAGmC,YAAY;MACtC;IACD;IAEAH,OAAO,GAAG,IAAI;IACdC,eAAe,CAACjC,MAAM,CAAC,GAAGkC,QAAQ;EACnC;EAEA,KAAK,MAAMlC,MAAM,IAAI+B,yBAAyB,EAAE;IAC/C,IAAI,EAAE/B,MAAM,IAAIY,iBAAiB,CAAC,EAAE;MACnCoB,OAAO,GAAG,IAAI;MACd;IACD;EACD;EAEA,OAAOA,OAAO,GAAGC,eAAe,GAAGF,yBAAyB;AAC7D,CAAC;AAACK,OAAA,CAAAN,uBAAA,GAAAA,uBAAA;AAEF,MAAMO,kBAAkB,GAAGA,CAC1BtC,OAAiC,EACjCC,MAAc,KACV;EACJ,SAAS;;EACT,MAAMsC,gBAAgB,GAAGxC,gCAAgC,CAACC,OAAO,EAAEC,MAAM,CAAC;EAC1E,MAAM;IAAER,YAAY;IAAED;EAAU,CAAC,GAAGV,qBAAqB,CAAC;IACzDN,IAAI,EAAEiC,YAAY,CAACT,OAAO,EAAEC,MAAM,CAAC;IACnClB,aAAa,EAAEiB,OAAO,CAACwC,yBAAyB,CAACvC,MAAM,CAAC;IACxDjB,gBAAgB,EAAE,CAACuD,gBAAgB;IACnCtD,kBAAkB,EAAEsD;EACrB,CAAC,CAAC;EAEF5B,uBAAuB,CAAC;IACvBX,OAAO;IACPC,MAAM;IACNR,YAAY;IACZD;EACD,CAAC,CAAC;AACH,CAAC;AAED,MAAMiD,kBAAkB,GAAIzC,OAAiC,IAAK;EACjE,SAAS;;EAET,KAAK,MAAMC,MAAM,IAAID,OAAO,CAACK,gBAAgB,EAAE;IAC9CiC,kBAAkB,CAACtC,OAAO,EAAEC,MAAM,CAAC;EACpC;AACD,CAAC;AAED,MAAMyC,yBAAyB,GAAGA,CACjC1C,OAAiC,EACjCC,MAAc,KACV;EACJ,SAAS;;EACT,OACC,IAAAE,4BAAiB,EAACF,MAAM,CAAC,IAAID,OAAO,CAACK,gBAAgB,CAACJ,MAAM,CAAC,KAAKvB,SAAS;AAE7E,CAAC;AAED,MAAMiE,oBAAoB,GAAI3C,OAAiC,IAAK;EACnE,SAAS;;EAET,KAAK,MAAMC,MAAM,IAAID,OAAO,CAACO,iBAAiB,EAAE;IAC/C,IAAImC,yBAAyB,CAAC1C,OAAO,EAAEC,MAAM,CAAC,EAAE;MAC/CqC,kBAAkB,CAACtC,OAAO,EAAEC,MAAM,CAAC;IACpC;EACD;AACD,CAAC;AAED,MAAM2C,wBAAwB,GAAGA,CAChC5C,OAAiC,EACjCC,MAAc,KACV;EACJ,SAAS;;EACT,MAAM4C,mBAAmB,GACxB,IAAA1C,4BAAiB,EAACF,MAAM,CAAC,IACzBD,OAAO,CAACO,iBAAiB,CAACN,MAAM,CAAC,KAAKvB,SAAS;EAEhD,OAAOsB,OAAO,CAACK,gBAAgB,CAACJ,MAAM,CAAC,KAAKvB,SAAS,IAAI,CAACmE,mBAAmB;AAC9E,CAAC;AAED,MAAMC,mBAAmB,GAAI9C,OAAiC,IAAK;EAClE,SAAS;;EAET,KAAK,MAAMC,MAAM,IAAID,OAAO,CAACwC,yBAAyB,EAAE;IACvD,IAAII,wBAAwB,CAAC5C,OAAO,EAAEC,MAAM,CAAC,EAAE;MAC9CqC,kBAAkB,CAACtC,OAAO,EAAEC,MAAM,CAAC;IACpC;EACD;AACD,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACO,MAAM8C,iBAAiB,GAAGA,CAAC;EACjC1C,gBAAgB;EAChBE,iBAAiB;EACjBiC,yBAAyB;EACzBhC,oBAAoB,GAAG;AAMxB,CAAC,KAAK;EACL,SAAS;;EACT,MAAMK,iBAAwD,GAAG,CAAC,CAAC;EACnE,MAAMD,6BAA0D,GAAG,CAAC,CAAC;EACrE,MAAMZ,OAAO,GAAG;IACfK,gBAAgB;IAChBE,iBAAiB;IACjBiC,yBAAyB;IACzBhC,oBAAoB;IACpBK,iBAAiB;IACjBD;EACD,CAAC;EAED6B,kBAAkB,CAACzC,OAAO,CAAC;EAC3B2C,oBAAoB,CAAC3C,OAAO,CAAC;EAC7B8C,mBAAmB,CAAC9C,OAAO,CAAC;EAE5B,OAAO;IACNa,iBAAiB;IACjBD;EACD,CAAC;AACF,CAAC;AAACyB,OAAA,CAAAU,iBAAA,GAAAA,iBAAA","ignoreList":[]}
+{"version":3,"names":["_constants","require","_materializeSlot","_slotState","getForwardedSlot","slot","hasAnyKeys","undefined","hasEitherResetPatch","hasStyleResetPatch","hasPropResetPatch","hasDefinedBucketValue","value","hasResettableDisappearedKeys","previousKeys","previousResetValues","currentKeys","key","getResolvedSlotOutput","previousState","resetDroppedKeys","carryPreviousState","state","getResolvedSlotState","styleKeys","styleResetValues","propKeys","propResetValues","hasResetPatch","nextState","resolvedSlot","materializeResolvedSlot","baseStyle","baseProps","hasAnyStyleKeys","hasAnyPropKeys","hasLocalStyleSource","context","localStylesMaps","length","hasLocalSlot","slotId","index","shouldDeferMissingLocalSlotReset","canInherit","shouldSlotInherit","localSlotExists","hasInheritedSlot","ancestorStylesMap","deferLocalSlotResets","mergeBucket","resolvedBucket","source","nextBucket","getMergedLocalSlot","mergedStyle","mergedProps","style","props","getSlotForId","writeResolvedSlotOutput","nextPreviousStyleStatesBySlot","resolvedStylesMap","areTransformItemsEqual","left","right","leftObject","rightObject","areTransformArraysEqual","Array","isArray","i","areFlatObjectsEqual","leftValue","rightValue","areSlotsEqual","reuseEqualResolvedSlots","previousResolvedStylesMap","changed","stableStylesMap","nextSlot","previousSlot","exports","appendResolvedSlot","shouldDeferReset","previousStyleStatesBySlot","appendCurrentSlots","appendedSlotIds","stylesMap","shouldAppendInheritedSlot","appendInheritedSlots","shouldAppendPreviousSlot","inheritedSlotExists","appendPreviousSlots","resolveSlotStyles"],"sourceRoot":"../../../../../../../../src","sources":["shared/providers/screen/styles/helpers/resolve-slot-styles/index.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/shared/providers/screen/styles/helpers/resolve-slot-styles/materialize-slot.js

@@ -27,7 +27,10 @@ const materializeResolvedBucket = ({
       continue;
     }
     const previousResetValue = previousResetValues?.[key];
-    resolvedBucket[key] = previousResetValue !== undefined ? previousResetValue : resetValues?.[key];
+    const resetValue = previousResetValue !== undefined ? previousResetValue : resetValues?.[key];
+    if (resetValue !== undefined) {
+      resolvedBucket[key] = resetValue;
+    }
   }
   if (source) {
     for (const key in source) {

package/lib/commonjs/shared/providers/screen/styles/helpers/resolve-slot-styles/materialize-slot.js.map

@@ -1 +1 @@
-{"version":3,"names":["_constants","require","materializeResolvedBucket","source","previousKeys","previousResetValues","currentKeys","hasAnyKeys","hasResetPatch","resetValues","undefined","resolvedBucket","keysToReset","key","previousResetValue","value","materializeResolvedStyle","baseStyle","previousState","styleKeys","hasAnyStyleKeys","hasStyleResetPatch","styleResetValues","STYLE_RESET_VALUES","materializeResolvedProps","baseProps","propKeys","hasAnyPropKeys","hasPropResetPatch","propResetValues","PROP_RESET_VALUES","materializeResolvedSlot","resolvedSlot","resolvedStyle","resolvedProps","style","props","exports"],"sourceRoot":"../../../../../../../../src","sources":["shared/providers/screen/styles/helpers/resolve-slot-styles/materialize-slot.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_constants","require","materializeResolvedBucket","source","previousKeys","previousResetValues","currentKeys","hasAnyKeys","hasResetPatch","resetValues","undefined","resolvedBucket","keysToReset","key","previousResetValue","resetValue","value","materializeResolvedStyle","baseStyle","previousState","styleKeys","hasAnyStyleKeys","hasStyleResetPatch","styleResetValues","STYLE_RESET_VALUES","materializeResolvedProps","baseProps","propKeys","hasAnyPropKeys","hasPropResetPatch","propResetValues","PROP_RESET_VALUES","materializeResolvedSlot","resolvedSlot","resolvedStyle","resolvedProps","style","props","exports"],"sourceRoot":"../../../../../../../../src","sources":["shared/providers/screen/styles/helpers/resolve-slot-styles/materialize-slot.ts"],"mappings":"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","ignoreList":[]}

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

@@ -1,2 +1,6 @@
 "use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 //# sourceMappingURL=types.js.map

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

@@ -16,8 +16,58 @@ 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");
+const NO_STYLE_LAYERS = [];
+const normalizeRawStyleMap = (rawStyleMap, shouldDeferStyleBuckets) => {
+  "worklet";
+
+  if (!rawStyleMap) {
+    return _constants.NO_STYLES;
+  }
+  const stylesMap = (0, _normalizeSlots.normalizeSlots)((0, _stripInterpolatorOptions.stripInterpolatorOptions)(rawStyleMap));
+  return shouldDeferStyleBuckets ? (0, _preserveAnimatedPropsOnly.preserveAnimatedPropsOnly)(stylesMap) : stylesMap;
+};
+const runInterpolator = ({
+  interpolator,
+  props,
+  progress,
+  next,
+  bounds,
+  shouldDeferStyleBuckets
+}) => {
+  "worklet";
+
+  if (!interpolator) {
+    return undefined;
+  }
+  try {
+    const raw = interpolator({
+      ...props,
+      progress,
+      next,
+      bounds
+    });
+    const rawStyleMap = typeof raw === "object" && raw != null ? raw : undefined;
+    return {
+      rawStyleMap,
+      stylesMap: normalizeRawStyleMap(rawStyleMap, shouldDeferStyleBuckets)
+    };
+  } catch (_) {
+    if (__DEV__) {
+      _logger.logger.warn("screenStyleInterpolator must be a worklet");
+    }
+    return undefined;
+  }
+};
+const appendLayer = (layers, result) => {
+  "worklet";
+
+  if (result) {
+    layers.push(result.stylesMap);
+  }
+};
+
 /**
- * Builds the raw interpolated styles map for the current screen pass.
+ * Builds the raw interpolated style layers 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
@@ -37,9 +87,9 @@ var _stripInterpolatorOptions = require("../helpers/strip-interpolator-options")
  * 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.
+ * The result is ordered from lowest to highest priority. Resolution happens
+ * downstream, where slot ids determine whether slots inherit from ancestors and
+ * where higher owner layers override lower owner layers per key.
  */
 const useInterpolatedStylesMap = () => {
   const {
@@ -93,38 +143,45 @@ const useInterpolatedStylesMap = () => {
     }
     const isInGestureMode = !!isDragging || isGesturingDuringCloseAnimation.get();
     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;
-    }
     let effectiveProgress = progress;
     let effectiveNext = next;
     if (isInGestureMode) {
       effectiveProgress = current.progress;
       effectiveNext = undefined;
     }
-    try {
-      const raw = interpolator({
-        ...props,
-        progress: effectiveProgress,
-        next: effectiveNext,
-        bounds: boundsAccessor
-      });
-      const rawStyleMap = typeof raw === "object" && raw != null ? raw : undefined;
-      (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 shouldDeferStyleBuckets ? (0, _preserveAnimatedPropsOnly.preserveAnimatedPropsOnly)(stylesMap) : stylesMap;
-    } catch (_) {
-      if (__DEV__) {
-        _logger.logger.warn("screenStyleInterpolator must be a worklet");
+    const currentResult = runInterpolator({
+      interpolator: currentInterpolator,
+      props,
+      progress: effectiveProgress,
+      next: effectiveNext,
+      bounds: boundsAccessor,
+      shouldDeferStyleBuckets
+    });
+    if (interpolatorOptionsOwner === "current") {
+      (0, _selectedInterpolatorOptions.syncSelectedInterpolatorOptions)(selectedInterpolatorOptions, "current", currentResult?.rawStyleMap?.options);
+      (0, _options.syncScreenOptionsOverrides)(currentResult?.rawStyleMap, screenOptions);
+      if (!currentResult) {
+        return NO_STYLE_LAYERS;
       }
-      (0, _selectedInterpolatorOptions.syncSelectedInterpolatorOptions)(selectedInterpolatorOptions, "current");
-      (0, _options.syncScreenOptionsOverrides)(undefined, screenOptions);
-      return _constants.NO_STYLES;
+      return [currentResult.stylesMap];
+    }
+    const nextResult = runInterpolator({
+      interpolator: nextInterpolator,
+      props,
+      progress: effectiveProgress,
+      next: effectiveNext,
+      bounds: boundsAccessor,
+      shouldDeferStyleBuckets
+    });
+    (0, _selectedInterpolatorOptions.syncSelectedInterpolatorOptions)(selectedInterpolatorOptions, "next", nextResult?.rawStyleMap?.options);
+    (0, _options.syncScreenOptionsOverrides)(undefined, screenOptions);
+    const layers = [];
+    appendLayer(layers, currentResult);
+    appendLayer(layers, nextResult);
+    if (layers.length === 0) {
+      return NO_STYLE_LAYERS;
     }
+    return layers;
   });
 };
 exports.useInterpolatedStylesMap = useInterpolatedStylesMap;

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","_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":";;;;;;AAAA,IAAAA,sBAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AAKA,IAAAG,OAAA,GAAAH,OAAA;AACA,IAAAI,UAAA,GAAAJ,OAAA;AACA,IAAAK,uBAAA,GAAAL,OAAA;AACA,IAAAM,4BAAA,GAAAN,OAAA;AACA,IAAAO,YAAA,GAAAP,OAAA;AACA,IAAAQ,QAAA,GAAAR,OAAA;AAIA,IAAAS,eAAA,GAAAT,OAAA;AACA,IAAAU,0BAAA,GAAAV,OAAA;AACA,IAAAW,yBAAA,GAAAX,OAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMY,wBAAwB,GAAGA,CAAA,KAAM;EAC7C,MAAM;IAAEC;EAAiB,CAAC,GAAG,IAAAC,qCAAwB,EAAC,CAAC;EACvD,MAAMC,aAAa,GAAG,IAAAC,gCAAuB,EAAC,CAAC;EAC/C,MAAM;IACLC,uBAAuB;IACvBC,+BAA+B;IAC/BC,2BAA2B;IAC3BC,gBAAgB;IAChBC;EACD,CAAC,GAAG,IAAAC,oCAAyB,EAAC,CAAC;EAC/B,MAAMC,cAAc,GAAG,IAAAC,8CAAsB,EAAC,CAAC;EAC/C,MAAMC,+BAA+B,GAAGC,mBAAW,CAACC,QAAQ,CAC3Dd,gBAAgB,EAChB,iCACD,CAAC;EAED,MAAMe,+BAA+B,GAAG,IAAAC,qCAAc,EAAC,KAAK,CAAC;EAE7D,OAAO,IAAAC,sCAAe,EAAwC,MAAM;IACnE,SAAS;;IACTZ,+BAA+B,CAACa,GAAG,CAAC,CAAC;IACrC,MAAMC,KAAK,GAAGf,uBAAuB,CAACc,GAAG,CAAC,CAAC;;IAE3C;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;IACE,MAAME,uBAAuB,GAAGR,+BAA+B,CAACM,GAAG,CAAC,CAAC,GAAG,CAAC;IAEzE,MAAM;MAAEG,OAAO;MAAEC,IAAI;MAAEC;IAAS,CAAC,GAAGJ,KAAK;IACzC,MAAMK,UAAU,GAAGH,OAAO,CAACI,OAAO,CAACC,QAAQ;IAC3C,MAAMC,aAAa,GAAG,CAAC,CAACL,IAAI,EAAEM,OAAO;;IAErC;IACA;IACA;IACA,IAAIJ,UAAU,IAAIG,aAAa,EAAE;MAChCZ,+BAA+B,CAACc,GAAG,CAAC,IAAI,CAAC;IAC1C;IAEA,IAAI,CAACL,UAAU,IAAI,CAACG,aAAa,EAAE;MAClCZ,+BAA+B,CAACc,GAAG,CAAC,KAAK,CAAC;IAC3C;IAEA,MAAMC,eAAe,GACpB,CAAC,CAACN,UAAU,IAAIT,+BAA+B,CAACG,GAAG,CAAC,CAAC;IAEtD,MAAMa,wBAAwB,GAC7BD,eAAe,IAAI,CAACvB,gBAAgB,GAAG,SAAS,GAAG,MAAM;IAC1D,MAAMyB,YAAY,GACjBD,wBAAwB,KAAK,SAAS,GACnCvB,mBAAmB,GACnBD,gBAAgB;IAEpB,IAAI,CAACyB,YAAY,EAAE;MAClB,IAAAC,4DAA+B,EAAC3B,2BAA2B,EAAE,SAAS,CAAC;MACvE,IAAA4B,mCAA0B,EAACC,SAAS,EAAEjC,aAAa,CAAC;MACpD,OAAOkC,oBAAS;IACjB;IAEA,IAAIC,iBAAiB,GAAGd,QAAQ;IAChC,IAAIe,aAAa,GAAGhB,IAAI;IAExB,IAAIQ,eAAe,EAAE;MACpBO,iBAAiB,GAAGhB,OAAO,CAACE,QAAQ;MACpCe,aAAa,GAAGH,SAAS;IAC1B;IAEA,IAAI;MACH,MAAMI,GAAG,GAAGP,YAAY,CAAC;QACxB,GAAGb,KAAK;QACRI,QAAQ,EAAEc,iBAAiB;QAC3Bf,IAAI,EAAEgB,aAAa;QACnBE,MAAM,EAAE9B;MACT,CAAC,CAAC;MAEF,MAAM+B,WAAoD,GACzD,OAAOF,GAAG,KAAK,QAAQ,IAAIA,GAAG,IAAI,IAAI,GAAGA,GAAG,GAAGJ,SAAS;MAEzD,IAAAF,4DAA+B,EAC9B3B,2BAA2B,EAC3ByB,wBAAwB,EACxBU,WAAW,EAAEC,OACd,CAAC;MACD,IAAAR,mCAA0B,EACzBH,wBAAwB,KAAK,SAAS,GAAGU,WAAW,GAAGN,SAAS,EAChEjC,aACD,CAAC;MAED,MAAMyC,SAAS,GAAG,CAACF,WAAW,GAC3BL,oBAAS,GACT,IAAAQ,8BAAc,EAAC,IAAAC,kDAAwB,EAACJ,WAAW,CAAC,CAAC;MAExD,OAAOrB,uBAAuB,GAC3B,IAAA0B,oDAAyB,EAACH,SAAS,CAAC,GACpCA,SAAS;IACb,CAAC,CAAC,OAAOI,CAAC,EAAE;MACX,IAAIC,OAAO,EAAE;QACZC,cAAM,CAACC,IAAI,CAAC,2CAA2C,CAAC;MACzD;MAEA,IAAAjB,4DAA+B,EAAC3B,2BAA2B,EAAE,SAAS,CAAC;MACvE,IAAA4B,mCAA0B,EAACC,SAAS,EAAEjC,aAAa,CAAC;MACpD,OAAOkC,oBAAS;IACjB;EACD,CAAC,CAAC;AACH,CAAC;AAACe,OAAA,CAAApD,wBAAA,GAAAA,wBAAA","ignoreList":[]}
+{"version":3,"names":["_reactNativeReanimated","require","_constants","_system","_logger","_animation","_useBuildBoundsAccessor","_selectedInterpolatorOptions","_descriptors","_options","_normalizeSlots","_preserveAnimatedPropsOnly","_stripInterpolatorOptions","NO_STYLE_LAYERS","normalizeRawStyleMap","rawStyleMap","shouldDeferStyleBuckets","NO_STYLES","stylesMap","normalizeSlots","stripInterpolatorOptions","preserveAnimatedPropsOnly","runInterpolator","interpolator","props","progress","next","bounds","undefined","raw","_","__DEV__","logger","warn","appendLayer","layers","result","push","useInterpolatedStylesMap","currentScreenKey","useDescriptorDerivations","screenOptions","useScreenOptionsContext","screenInterpolatorProps","screenInterpolatorPropsRevision","selectedInterpolatorOptions","nextInterpolator","currentInterpolator","useScreenAnimationContext","boundsAccessor","useBuildBoundsAccessor","pendingLifecycleStartBlockCount","SystemStore","getValue","isGesturingDuringCloseAnimation","useSharedValue","useDerivedValue","get","current","isDragging","gesture","dragging","isNextClosing","closing","set","isInGestureMode","interpolatorOptionsOwner","effectiveProgress","effectiveNext","currentResult","syncSelectedInterpolatorOptions","options","syncScreenOptionsOverrides","nextResult","length","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-resolved-slot-style-map.js

@@ -9,7 +9,7 @@ var _constants = require("../../../../constants");
 var _animation = require("../../animation");
 var _resolveSlotStyles = require("../helpers/resolve-slot-styles");
 const useResolvedStylesMap = ({
-  currentStylesMap,
+  localStylesMaps,
   ancestorStylesMap
 }) => {
   const {
@@ -23,14 +23,15 @@ const useResolvedStylesMap = ({
 
     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.
+    // Keep missing local slots alive only when another route drives this screen
+    // and no active local style layer is available. Once a current/next layer
+    // runs, omitted local slots and dropped keys are intentional reset signals.
     const deferLocalSlotResets = !props.focused && !props.current.closing;
     const {
       resolvedStylesMap,
       nextPreviousStyleStatesBySlot
     } = (0, _resolveSlotStyles.resolveSlotStyles)({
-      currentStylesMap: currentStylesMap.get(),
+      localStylesMaps: localStylesMaps.get(),
       ancestorStylesMap: ancestorStylesMap?.get() ?? _constants.NO_STYLES,
       previousStyleStatesBySlot: previousStyleStatesBySlot.get(),
       deferLocalSlotResets

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","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":[]}
+{"version":3,"names":["_reactNativeReanimated","require","_constants","_animation","_resolveSlotStyles","useResolvedStylesMap","localStylesMaps","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;AAYO,MAAMI,oBAAoB,GAAGA,CAAC;EACpCC,eAAe;EACfC;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;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,eAAe,EAAEA,eAAe,CAACU,GAAG,CAAC,CAAC;MACtCT,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/providers/screen/styles/styles.provider.js

@@ -25,9 +25,9 @@ const {
   isFloatingOverlay
 }) => {
   const parentContext = (0, _react.useContext)(ScreenStylesContext);
-  const rawStylesMap = (0, _useInterpolatedStyleMaps.useInterpolatedStylesMap)();
+  const rawStylesMaps = (0, _useInterpolatedStyleMaps.useInterpolatedStylesMap)();
   const stylesMap = (0, _useResolvedSlotStyleMap.useResolvedStylesMap)({
-    currentStylesMap: rawStylesMap,
+    localStylesMaps: rawStylesMaps,
     ancestorStylesMap: parentContext?.stylesMap
   });
   const {

package/lib/commonjs/shared/providers/screen/styles/styles.provider.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","_reactNativeReanimated","_interopRequireDefault","_createProvider","_maybeFloatingContainer","_useInterpolatedStyleMaps","_useMaybeBlockVisibility","_useResolvedSlotStyleMap","_jsxRuntime","e","__esModule","default","ScreenStylesProvider","ScreenStylesContext","useScreenStylesContext","useScreenStyles","createProvider","guarded","children","isFloatingOverlay","parentContext","useContext","rawStylesMap","useInterpolatedStylesMap","stylesMap","useResolvedStylesMap","currentStylesMap","ancestorStylesMap","animatedStyle","animatedProps","useMaybeBlockVisibility","value","jsx","MaybeFloatingContainer","View","style","styles","container","exports","StyleSheet","create","flex"],"sourceRoot":"../../../../../../src","sources":["shared/providers/screen/styles/styles.provider.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,sBAAA,GAAAC,sBAAA,CAAAH,OAAA;AAEA,IAAAI,eAAA,GAAAD,sBAAA,CAAAH,OAAA;AACA,IAAAK,uBAAA,GAAAL,OAAA;AACA,IAAAM,yBAAA,GAAAN,OAAA;AACA,IAAAO,wBAAA,GAAAP,OAAA;AACA,IAAAQ,wBAAA,GAAAR,OAAA;AAA2E,IAAAS,WAAA,GAAAT,OAAA;AAAA,SAAAG,uBAAAO,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAWpE,MAAM;EACZG,oBAAoB;EACpBC,mBAAmB;EACnBC,sBAAsB,EAAEC;AACzB,CAAC,GAAG,IAAAC,uBAAc,EAAC,cAAc,EAAE;EAClCC,OAAO,EAAE;AACV,CAAC,CAAC,CAAkC,CAAC;EAAEC,QAAQ;EAAEC;AAAkB,CAAC,KAAK;EACxE,MAAMC,aAAa,GAAG,IAAAC,iBAAU,EAACR,mBAAmB,CAAC;EAErD,MAAMS,YAAY,GAAG,IAAAC,kDAAwB,EAAC,CAAC;EAE/C,MAAMC,SAAS,GAAG,IAAAC,6CAAoB,EAAC;IACtCC,gBAAgB,EAAEJ,YAAY;IAC9BK,iBAAiB,EAAEP,aAAa,EAAEI;EACnC,CAAC,CAAC;EAEF,MAAM;IAAEI,aAAa;IAAEC;EAAc,CAAC,GACrC,IAAAC,gDAAuB,EAACX,iBAAiB,CAAC;EAE3C,OAAO;IACNY,KAAK,EAAE;MACNP;IACD,CAAC;IACDN,QAAQ,eACP,IAAAV,WAAA,CAAAwB,GAAA,EAAC5B,uBAAA,CAAA6B,sBAAsB;MAACd,iBAAiB,EAAEA,iBAAkB;MAAAD,QAAA,eAC5D,IAAAV,WAAA,CAAAwB,GAAA,EAAC/B,sBAAA,CAAAU,OAAQ,CAACuB,IAAI;QACbC,KAAK,EAAE,CAACC,MAAM,CAACC,SAAS,EAAET,aAAa,CAAE;QACzCC,aAAa,EAAEA,aAAc;QAAAX,QAAA,EAE5BA;MAAQ,CACK;IAAC,CACO;EAE1B,CAAC;AACF,CAAC,CAAC;AAACoB,OAAA,CAAAvB,eAAA,GAAAA,eAAA;AAAAuB,OAAA,CAAAzB,mBAAA,GAAAA,mBAAA;AAAAyB,OAAA,CAAA1B,oBAAA,GAAAA,oBAAA;AAEH,MAAMwB,MAAM,GAAGG,uBAAU,CAACC,MAAM,CAAC;EAChCH,SAAS,EAAE;IAAEI,IAAI,EAAE;EAAE;AACtB,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNative","_reactNativeReanimated","_interopRequireDefault","_createProvider","_maybeFloatingContainer","_useInterpolatedStyleMaps","_useMaybeBlockVisibility","_useResolvedSlotStyleMap","_jsxRuntime","e","__esModule","default","ScreenStylesProvider","ScreenStylesContext","useScreenStylesContext","useScreenStyles","createProvider","guarded","children","isFloatingOverlay","parentContext","useContext","rawStylesMaps","useInterpolatedStylesMap","stylesMap","useResolvedStylesMap","localStylesMaps","ancestorStylesMap","animatedStyle","animatedProps","useMaybeBlockVisibility","value","jsx","MaybeFloatingContainer","View","style","styles","container","exports","StyleSheet","create","flex"],"sourceRoot":"../../../../../../src","sources":["shared/providers/screen/styles/styles.provider.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,sBAAA,GAAAC,sBAAA,CAAAH,OAAA;AAEA,IAAAI,eAAA,GAAAD,sBAAA,CAAAH,OAAA;AACA,IAAAK,uBAAA,GAAAL,OAAA;AACA,IAAAM,yBAAA,GAAAN,OAAA;AACA,IAAAO,wBAAA,GAAAP,OAAA;AACA,IAAAQ,wBAAA,GAAAR,OAAA;AAA2E,IAAAS,WAAA,GAAAT,OAAA;AAAA,SAAAG,uBAAAO,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAWpE,MAAM;EACZG,oBAAoB;EACpBC,mBAAmB;EACnBC,sBAAsB,EAAEC;AACzB,CAAC,GAAG,IAAAC,uBAAc,EAAC,cAAc,EAAE;EAClCC,OAAO,EAAE;AACV,CAAC,CAAC,CAAkC,CAAC;EAAEC,QAAQ;EAAEC;AAAkB,CAAC,KAAK;EACxE,MAAMC,aAAa,GAAG,IAAAC,iBAAU,EAACR,mBAAmB,CAAC;EAErD,MAAMS,aAAa,GAAG,IAAAC,kDAAwB,EAAC,CAAC;EAEhD,MAAMC,SAAS,GAAG,IAAAC,6CAAoB,EAAC;IACtCC,eAAe,EAAEJ,aAAa;IAC9BK,iBAAiB,EAAEP,aAAa,EAAEI;EACnC,CAAC,CAAC;EAEF,MAAM;IAAEI,aAAa;IAAEC;EAAc,CAAC,GACrC,IAAAC,gDAAuB,EAACX,iBAAiB,CAAC;EAE3C,OAAO;IACNY,KAAK,EAAE;MACNP;IACD,CAAC;IACDN,QAAQ,eACP,IAAAV,WAAA,CAAAwB,GAAA,EAAC5B,uBAAA,CAAA6B,sBAAsB;MAACd,iBAAiB,EAAEA,iBAAkB;MAAAD,QAAA,eAC5D,IAAAV,WAAA,CAAAwB,GAAA,EAAC/B,sBAAA,CAAAU,OAAQ,CAACuB,IAAI;QACbC,KAAK,EAAE,CAACC,MAAM,CAACC,SAAS,EAAET,aAAa,CAAE;QACzCC,aAAa,EAAEA,aAAc;QAAAX,QAAA,EAE5BA;MAAQ,CACK;IAAC,CACO;EAE1B,CAAC;AACF,CAAC,CAAC;AAACoB,OAAA,CAAAvB,eAAA,GAAAA,eAAA;AAAAuB,OAAA,CAAAzB,mBAAA,GAAAA,mBAAA;AAAAyB,OAAA,CAAA1B,oBAAA,GAAAA,oBAAA;AAEH,MAAMwB,MAAM,GAAGG,uBAAU,CAACC,MAAM,CAAC;EAChCH,SAAS,EAAE;IAAEI,IAAI,EAAE;EAAE;AACtB,CAAC,CAAC","ignoreList":[]}