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

package/lib/module/shared/stores/bounds/internals/links.js

@@ -126,6 +126,14 @@ const isCompletedLink = link => {
 
   return !!link?.destination;
 };
+const getPendingSourceLink = (state, pairKey, linkKey) => {
+  "worklet";
+
+  const sourceScreenKey = getSourceScreenKeyFromPairKey(pairKey);
+  const pendingPairKey = createPendingPairKey(sourceScreenKey);
+  if (pendingPairKey === pairKey) return null;
+  return getPairLink(state, pendingPairKey, linkKey);
+};
 function getResolvedLink(pairKey, tag) {
   "worklet";
 
@@ -134,12 +142,19 @@ function getResolvedLink(pairKey, tag) {
   const group = getGroupKeyFromTag(tag);
   const requestedLink = getPairLink(state, pairKey, linkKey);
 
+  // Press-triggered zoom captures the source before navigation under a pending
+  // source<> pair. If the destination screen has no Boundary.View, nothing
+  // promotes that source into source<>destination, but zoom can still animate to
+  // its default top target from the pending source bounds.
+  const fallbackPendingLink = requestedLink ? null : getPendingSourceLink(state, pairKey, linkKey);
+  const link = requestedLink ?? fallbackPendingLink;
+
   // Group active ids can update before the new member has a full source/destination
   // link, so unresolved grouped links fall back to the initial id's measurements.
-  if (!group || isCompletedLink(requestedLink)) {
+  if (!group || isCompletedLink(link)) {
     return {
       tag,
-      link: requestedLink
+      link
     };
   }
   const initialId = state[pairKey]?.groups?.[group]?.initialId;
@@ -154,7 +169,7 @@ function getResolvedLink(pairKey, tag) {
   }
   return {
     tag,
-    link: requestedLink
+    link
   };
 }
 function getSource(pairKey, tag) {

package/lib/module/shared/stores/bounds/internals/links.js.map

@@ -1 +1 @@
-{"version":3,"names":["createGroupTag","createPendingPairKey","ensurePairGroups","ensurePairLinks","getGroupKeyFromTag","getLinkKeyFromTag","getActiveGroupId","getPairActiveGroupId","getDestination","getPairDestination","getLink","getPairLink","getSource","getPairSource","getSourceScreenKeyFromPairKey","removePairLink","pairs","toLinkKey","tag","createLinkSide","screenKey","bounds","styles","writePairLink","state","pairKey","linkKey","link","writeGroup","group","activeId","initialId","previousInitialId","groups","writeDestination","destination","initialDestination","promotePendingSource","sourceScreenKey","pendingPairKey","pendingLink","pendingGroupState","setSource","modify","source","pairLinks","existingLink","initialSource","setDestination","setActiveGroupId","get","isCompletedLink","getResolvedLink","requestedLink","initialLink"],"sourceRoot":"../../../../../../src","sources":["shared/stores/bounds/internals/links.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["createGroupTag","createPendingPairKey","ensurePairGroups","ensurePairLinks","getGroupKeyFromTag","getLinkKeyFromTag","getActiveGroupId","getPairActiveGroupId","getDestination","getPairDestination","getLink","getPairLink","getSource","getPairSource","getSourceScreenKeyFromPairKey","removePairLink","pairs","toLinkKey","tag","createLinkSide","screenKey","bounds","styles","writePairLink","state","pairKey","linkKey","link","writeGroup","group","activeId","initialId","previousInitialId","groups","writeDestination","destination","initialDestination","promotePendingSource","sourceScreenKey","pendingPairKey","pendingLink","pendingGroupState","setSource","modify","source","pairLinks","existingLink","initialSource","setDestination","setActiveGroupId","get","isCompletedLink","getPendingSourceLink","getResolvedLink","requestedLink","fallbackPendingLink","initialLink"],"sourceRoot":"../../../../../../src","sources":["shared/stores/bounds/internals/links.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/utils/bounds/navigation/zoom/build.js

@@ -293,6 +293,9 @@ export function buildZoomStyles({
   const elementGestureX = shouldTrackGestureTranslation ? dragX : 0;
   const elementGestureY = shouldTrackGestureTranslation ? dragY : 0;
   const safeUnfocusedContentScale = Math.max(Math.abs(unfocusedContentScale), EPSILON);
+  // A naturally settled close can leave this as the last emitted style frame,
+  // so drop temporary stacking here instead of waiting for a later reset pass.
+  const shouldElevateUnfocusedElement = !props.active.closing || !props.active.logicallySettled;
   const scaleShiftX = computeCenterScaleShift({
     center: elementCenterX,
     containerCenter: screenLayout.width / 2,
@@ -343,8 +346,8 @@ export function buildZoomStyles({
       scaleY: elementScaleY
     }],
     opacity: zoomOptions?.debug ? 1 : unfocusedFade,
-    zIndex: 9999,
-    elevation: 9999
+    zIndex: shouldElevateUnfocusedElement ? 9999 : 0,
+    elevation: shouldElevateUnfocusedElement ? 9999 : 0
   };
   return {
     options: zoomGestureOptions,

package/lib/module/shared/utils/bounds/navigation/zoom/build.js.map

@@ -1 +1 @@
-{"version":3,"names":["interpolate","EPSILON","NAVIGATION_MASK_CONTAINER_STYLE_ID","NAVIGATION_MASK_ELEMENT_STYLE_ID","VISIBLE_STYLE","createLinkAccessor","getSourceBorderRadius","toNumber","combineScales","composeCompensatedTranslation","computeCenterScaleShift","resolveDirectionalDragScale","resolveOpacityRangeTuple","ZOOM_DISMISS_SCALE_ORBIT_DEPTH","ZOOM_FOCUSED_ELEMENT_CLOSE_OPACITY_RANGE","ZOOM_FOCUSED_ELEMENT_OPEN_OPACITY_RANGE","ZOOM_MASK_OUTSET","ZOOM_SHARED_OPTIONS","ZOOM_UNFOCUSED_ELEMENT_CLOSE_OPACITY_RANGE","ZOOM_UNFOCUSED_ELEMENT_OPEN_OPACITY_RANGE","getZoomContentTarget","interpolateOpacityRange","resolveBackgroundScale","resolveDragScaleTuple","resolveDragTranslationTuple","resolveDirectionalDragTranslation","IDENTITY_DRAG_SCALE_OUTPUT","resolveZoomGestureHandoff","rawDrag","gestureSensitivity","releaseBoost","releaseSensitivity","gestureReleaseVelocityScale","resolveZoomGestureOptions","activeOptions","gestureProgressMode","resolveZoomDismissScaleHandoff","progress","releaseScale","targetScale","closeProgress","scaleProgress","Math","sin","PI","baseScale","orbitDepth","orbitScale","buildZoomStyles","tag","zoomOptions","props","target","focused","layouts","screen","screenLayout","zoomAnchor","anchor","boundsAccessor","link","getLink","baseRawOptions","raw","scaleMode","buildEffectiveTag","id","sourceBorderRadius","targetBorderRadius","borderRadius","focusedElementOpacity","open","value","fallback","close","unfocusedElementOpacity","sourceVisibilityStyle","style","focusedContentSlot","current","options","navigationMaskEnabled","normX","active","gesture","normY","initialGesture","direction","isHorizontalDismiss","isVerticalDismiss","abs","horizontalDragTranslation","verticalDragTranslation","dragX","translation","x","dimension","width","negativeMax","positiveMax","exponent","dragY","y","height","horizontalDragScale","verticalDragScale","backgroundScale","dragXScale","normalized","dismissDirection","shrinkMin","growMax","dragYScale","dragScale","handoffDragScale","dismissing","zoomGestureOptions","focusedContentTarget","explicitTarget","contentRaw","compute","method","maskRaw","space","focusedFade","closing","range","shouldRemoveClipping","animating","focusedMaskBorderRadius","top","right","bottom","left","maskWidth","max","maskHeight","contentTranslateX","translateX","contentTranslateY","translateY","contentScale","scale","maskTranslateX","maskTranslateY","focusedContentStyle","opacity","debug","transform","overflow","focusedStyles","unfocusedFade","unfocusedScale","didSourceComponentVisiblyHide","shouldHideUnfocusedElement","unfocusedElementTarget","elementRaw","boundTargetCenterX","destination","bounds","pageX","undefined","boundTargetCenterY","pageY","elementCenterX","elementCenterY","unfocusedContentScale","logicallySettled","shouldTrackGestureTranslation","shouldTrackGestureScale","elementGestureScale","elementGestureX","elementGestureY","safeUnfocusedContentScale","scaleShiftX","center","containerCenter","scaleShiftY","compensatedGestureX","parentScale","centerShift","epsilon","compensatedGestureY","elementTranslateX","elementTranslateY","elementScaleX","scaleX","elementScaleY","scaleY","resolvedElementStyle","zIndex","elevation","content"],"sourceRoot":"../../../../../../../src","sources":["shared/utils/bounds/navigation/zoom/build.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["interpolate","EPSILON","NAVIGATION_MASK_CONTAINER_STYLE_ID","NAVIGATION_MASK_ELEMENT_STYLE_ID","VISIBLE_STYLE","createLinkAccessor","getSourceBorderRadius","toNumber","combineScales","composeCompensatedTranslation","computeCenterScaleShift","resolveDirectionalDragScale","resolveOpacityRangeTuple","ZOOM_DISMISS_SCALE_ORBIT_DEPTH","ZOOM_FOCUSED_ELEMENT_CLOSE_OPACITY_RANGE","ZOOM_FOCUSED_ELEMENT_OPEN_OPACITY_RANGE","ZOOM_MASK_OUTSET","ZOOM_SHARED_OPTIONS","ZOOM_UNFOCUSED_ELEMENT_CLOSE_OPACITY_RANGE","ZOOM_UNFOCUSED_ELEMENT_OPEN_OPACITY_RANGE","getZoomContentTarget","interpolateOpacityRange","resolveBackgroundScale","resolveDragScaleTuple","resolveDragTranslationTuple","resolveDirectionalDragTranslation","IDENTITY_DRAG_SCALE_OUTPUT","resolveZoomGestureHandoff","rawDrag","gestureSensitivity","releaseBoost","releaseSensitivity","gestureReleaseVelocityScale","resolveZoomGestureOptions","activeOptions","gestureProgressMode","resolveZoomDismissScaleHandoff","progress","releaseScale","targetScale","closeProgress","scaleProgress","Math","sin","PI","baseScale","orbitDepth","orbitScale","buildZoomStyles","tag","zoomOptions","props","target","focused","layouts","screen","screenLayout","zoomAnchor","anchor","boundsAccessor","link","getLink","baseRawOptions","raw","scaleMode","buildEffectiveTag","id","sourceBorderRadius","targetBorderRadius","borderRadius","focusedElementOpacity","open","value","fallback","close","unfocusedElementOpacity","sourceVisibilityStyle","style","focusedContentSlot","current","options","navigationMaskEnabled","normX","active","gesture","normY","initialGesture","direction","isHorizontalDismiss","isVerticalDismiss","abs","horizontalDragTranslation","verticalDragTranslation","dragX","translation","x","dimension","width","negativeMax","positiveMax","exponent","dragY","y","height","horizontalDragScale","verticalDragScale","backgroundScale","dragXScale","normalized","dismissDirection","shrinkMin","growMax","dragYScale","dragScale","handoffDragScale","dismissing","zoomGestureOptions","focusedContentTarget","explicitTarget","contentRaw","compute","method","maskRaw","space","focusedFade","closing","range","shouldRemoveClipping","animating","focusedMaskBorderRadius","top","right","bottom","left","maskWidth","max","maskHeight","contentTranslateX","translateX","contentTranslateY","translateY","contentScale","scale","maskTranslateX","maskTranslateY","focusedContentStyle","opacity","debug","transform","overflow","focusedStyles","unfocusedFade","unfocusedScale","didSourceComponentVisiblyHide","shouldHideUnfocusedElement","unfocusedElementTarget","elementRaw","boundTargetCenterX","destination","bounds","pageX","undefined","boundTargetCenterY","pageY","elementCenterX","elementCenterY","unfocusedContentScale","logicallySettled","shouldTrackGestureTranslation","shouldTrackGestureScale","elementGestureScale","elementGestureX","elementGestureY","safeUnfocusedContentScale","shouldElevateUnfocusedElement","scaleShiftX","center","containerCenter","scaleShiftY","compensatedGestureX","parentScale","centerShift","epsilon","compensatedGestureY","elementTranslateX","elementTranslateY","elementScaleX","scaleX","elementScaleY","scaleY","resolvedElementStyle","zIndex","elevation","content"],"sourceRoot":"../../../../../../../src","sources":["shared/utils/bounds/navigation/zoom/build.ts"],"mappings":"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","ignoreList":[]}

package/lib/typescript/shared/providers/screen/styles/helpers/resolve-slot-styles/index.d.ts

@@ -1,6 +1,6 @@
 import type { NormalizedTransitionInterpolatedStyle } from "../../../../../types/animation.types";
-import type { ResettableStyleStatesBySlot } from "./types";
-export type { ResettableStyleStatesBySlot } from "./types";
+import type { LocalStyleLayers, ResettableStyleStatesBySlot } from "./types";
+export type { LocalStyleLayers, ResettableStyleStatesBySlot } from "./types";
 export declare const reuseEqualResolvedSlots: ({ resolvedStylesMap, previousResolvedStylesMap, }: {
     resolvedStylesMap: NormalizedTransitionInterpolatedStyle;
     previousResolvedStylesMap: NormalizedTransitionInterpolatedStyle;
@@ -11,8 +11,8 @@ export declare const reuseEqualResolvedSlots: ({ resolvedStylesMap, previousReso
  * animated values with undefined, so known keys and numeric values are reset to
  * concrete identity values.
  */
-export declare const resolveSlotStyles: ({ currentStylesMap, ancestorStylesMap, previousStyleStatesBySlot, deferLocalSlotResets, }: {
-    currentStylesMap: NormalizedTransitionInterpolatedStyle;
+export declare const resolveSlotStyles: ({ localStylesMaps, ancestorStylesMap, previousStyleStatesBySlot, deferLocalSlotResets, }: {
+    localStylesMaps: LocalStyleLayers;
     ancestorStylesMap: NormalizedTransitionInterpolatedStyle;
     previousStyleStatesBySlot: ResettableStyleStatesBySlot;
     deferLocalSlotResets?: boolean;

package/lib/typescript/shared/providers/screen/styles/helpers/resolve-slot-styles/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../src/shared/providers/screen/styles/helpers/resolve-slot-styles/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,qCAAqC,EAErC,MAAM,sCAAsC,CAAC;AAI9C,OAAO,KAAK,EAEX,2BAA2B,EAC3B,MAAM,SAAS,CAAC;AAEjB,YAAY,EAAE,2BAA2B,EAAE,MAAM,SAAS,CAAC;AAmQ3D,eAAO,MAAM,uBAAuB,GAAI,mDAGrC;IACF,iBAAiB,EAAE,qCAAqC,CAAC;IACzD,yBAAyB,EAAE,qCAAqC,CAAC;CACjE,KAAG,qCA0BH,CAAC;AAyEF;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,GAAI,2FAK/B;IACF,gBAAgB,EAAE,qCAAqC,CAAC;IACxD,iBAAiB,EAAE,qCAAqC,CAAC;IACzD,yBAAyB,EAAE,2BAA2B,CAAC;IACvD,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAC/B;;;CAqBA,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../src/shared/providers/screen/styles/helpers/resolve-slot-styles/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,qCAAqC,EAErC,MAAM,sCAAsC,CAAC;AAI9C,OAAO,KAAK,EACX,gBAAgB,EAEhB,2BAA2B,EAC3B,MAAM,SAAS,CAAC;AAEjB,YAAY,EAAE,gBAAgB,EAAE,2BAA2B,EAAE,MAAM,SAAS,CAAC;AAmX7E,eAAO,MAAM,uBAAuB,GAAI,mDAGrC;IACF,iBAAiB,EAAE,qCAAqC,CAAC;IACzD,yBAAyB,EAAE,qCAAqC,CAAC;CACjE,KAAG,qCA0BH,CAAC;AAiFF;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,GAAI,0FAK/B;IACF,eAAe,EAAE,gBAAgB,CAAC;IAClC,iBAAiB,EAAE,qCAAqC,CAAC;IACzD,yBAAyB,EAAE,2BAA2B,CAAC;IACvD,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAC/B;;;CAqBA,CAAC"}

package/lib/typescript/shared/providers/screen/styles/helpers/resolve-slot-styles/materialize-slot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"materialize-slot.d.ts","sourceRoot":"","sources":["../../../../../../../../src/shared/providers/screen/styles/helpers/resolve-slot-styles/materialize-slot.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,sCAAsC,CAAC;AAE1F,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAwGpD,eAAO,MAAM,uBAAuB,GAAI,uIAUrC;IACF,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;IAC/C,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;IAC/C,aAAa,EAAE,oBAAoB,GAAG,SAAS,CAAC;IAChD,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,SAAS,CAAC;IAC5C,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,SAAS,CAAC;IAC3C,eAAe,EAAE,OAAO,CAAC;IACzB,cAAc,EAAE,OAAO,CAAC;IACxB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,iBAAiB,EAAE,OAAO,CAAC;CAC3B,8CA4BA,CAAC"}
+{"version":3,"file":"materialize-slot.d.ts","sourceRoot":"","sources":["../../../../../../../../src/shared/providers/screen/styles/helpers/resolve-slot-styles/materialize-slot.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,sCAAsC,CAAC;AAE1F,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AA4GpD,eAAO,MAAM,uBAAuB,GAAI,uIAUrC;IACF,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;IAC/C,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;IAC/C,aAAa,EAAE,oBAAoB,GAAG,SAAS,CAAC;IAChD,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,SAAS,CAAC;IAC5C,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,SAAS,CAAC;IAC3C,eAAe,EAAE,OAAO,CAAC;IACzB,cAAc,EAAE,OAAO,CAAC;IACxB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,iBAAiB,EAAE,OAAO,CAAC;CAC3B,8CA4BA,CAAC"}

package/lib/typescript/shared/providers/screen/styles/helpers/resolve-slot-styles/types.d.ts

@@ -1,3 +1,5 @@
+import type { NormalizedTransitionInterpolatedStyle } from "../../../../../types/animation.types";
+export type LocalStyleLayers = NormalizedTransitionInterpolatedStyle[];
 export type ResettableStyleState = {
     styleKeys?: Record<string, true>;
     styleResetValues?: Record<string, unknown>;

package/lib/typescript/shared/providers/screen/styles/helpers/resolve-slot-styles/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../../../src/shared/providers/screen/styles/helpers/resolve-slot-styles/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,oBAAoB,GAAG;IAClC,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACjC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3C,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAChC,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC1C,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../../../src/shared/providers/screen/styles/helpers/resolve-slot-styles/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qCAAqC,EAAE,MAAM,sCAAsC,CAAC;AAElG,MAAM,MAAM,gBAAgB,GAAG,qCAAqC,EAAE,CAAC;AAEvE,MAAM,MAAM,oBAAoB,GAAG;IAClC,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACjC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3C,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAChC,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC1C,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC"}

package/lib/typescript/shared/providers/screen/styles/hooks/use-interpolated-style-maps.d.ts

@@ -1,6 +1,6 @@
-import type { NormalizedTransitionInterpolatedStyle } from "../../../../types/animation.types";
+import type { LocalStyleLayers } from "../helpers/resolve-slot-styles";
 /**
- * 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
@@ -20,9 +20,9 @@ import type { NormalizedTransitionInterpolatedStyle } from "../../../../types/an
  * 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.
  */
-export declare const useInterpolatedStylesMap: () => import("react-native-reanimated").DerivedValue<NormalizedTransitionInterpolatedStyle>;
+export declare const useInterpolatedStylesMap: () => import("react-native-reanimated").DerivedValue<LocalStyleLayers>;
 //# sourceMappingURL=use-interpolated-style-maps.d.ts.map

package/lib/typescript/shared/providers/screen/styles/hooks/use-interpolated-style-maps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-interpolated-style-maps.d.ts","sourceRoot":"","sources":["../../../../../../../src/shared/providers/screen/styles/hooks/use-interpolated-style-maps.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACX,qCAAqC,EAErC,MAAM,mCAAmC,CAAC;AAc3C;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,eAAO,MAAM,wBAAwB,6FAiHpC,CAAC"}
+{"version":3,"file":"use-interpolated-style-maps.d.ts","sourceRoot":"","sources":["../../../../../../../src/shared/providers/screen/styles/hooks/use-interpolated-style-maps.tsx"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAqFvE;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,eAAO,MAAM,wBAAwB,wEAoHpC,CAAC"}

package/lib/typescript/shared/providers/screen/styles/hooks/use-resolved-slot-style-map.d.ts

@@ -1,9 +1,10 @@
 import { type SharedValue } from "react-native-reanimated";
 import type { NormalizedTransitionInterpolatedStyle } from "../../../../types/animation.types";
+import { type LocalStyleLayers } from "../helpers/resolve-slot-styles";
 interface UseResolvedStylesMapParams {
-    currentStylesMap: SharedValue<NormalizedTransitionInterpolatedStyle>;
+    localStylesMaps: SharedValue<LocalStyleLayers>;
     ancestorStylesMap?: SharedValue<NormalizedTransitionInterpolatedStyle>;
 }
-export declare const useResolvedStylesMap: ({ currentStylesMap, ancestorStylesMap, }: UseResolvedStylesMapParams) => import("react-native-reanimated").DerivedValue<NormalizedTransitionInterpolatedStyle>;
+export declare const useResolvedStylesMap: ({ localStylesMaps, ancestorStylesMap, }: UseResolvedStylesMapParams) => import("react-native-reanimated").DerivedValue<NormalizedTransitionInterpolatedStyle>;
 export {};
 //# sourceMappingURL=use-resolved-slot-style-map.d.ts.map

package/lib/typescript/shared/providers/screen/styles/hooks/use-resolved-slot-style-map.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-resolved-slot-style-map.d.ts","sourceRoot":"","sources":["../../../../../../../src/shared/providers/screen/styles/hooks/use-resolved-slot-style-map.tsx"],"names":[],"mappings":"AAAA,OAAO,EACN,KAAK,WAAW,EAGhB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAAE,qCAAqC,EAAE,MAAM,mCAAmC,CAAC;AAQ/F,UAAU,0BAA0B;IACnC,gBAAgB,EAAE,WAAW,CAAC,qCAAqC,CAAC,CAAC;IACrE,iBAAiB,CAAC,EAAE,WAAW,CAAC,qCAAqC,CAAC,CAAC;CACvE;AAED,eAAO,MAAM,oBAAoB,GAAI,0CAGlC,0BAA0B,0FAmC5B,CAAC"}
+{"version":3,"file":"use-resolved-slot-style-map.d.ts","sourceRoot":"","sources":["../../../../../../../src/shared/providers/screen/styles/hooks/use-resolved-slot-style-map.tsx"],"names":[],"mappings":"AAAA,OAAO,EACN,KAAK,WAAW,EAGhB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAAE,qCAAqC,EAAE,MAAM,mCAAmC,CAAC;AAE/F,OAAO,EACN,KAAK,gBAAgB,EAIrB,MAAM,gCAAgC,CAAC;AAExC,UAAU,0BAA0B;IACnC,eAAe,EAAE,WAAW,CAAC,gBAAgB,CAAC,CAAC;IAC/C,iBAAiB,CAAC,EAAE,WAAW,CAAC,qCAAqC,CAAC,CAAC;CACvE;AAED,eAAO,MAAM,oBAAoB,GAAI,yCAGlC,0BAA0B,0FAoC5B,CAAC"}

package/lib/typescript/shared/stores/bounds/internals/links.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"links.d.ts","sourceRoot":"","sources":["../../../../../../src/shared/stores/bounds/internals/links.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAe9E,OAAO,KAAK,EACX,QAAQ,EACR,OAAO,EAEP,SAAS,EACT,aAAa,EACb,KAAK,EACL,OAAO,EACP,MAAM,UAAU,CAAC;AA4GlB,iBAAS,SAAS,CACjB,OAAO,EAAE,aAAa,EACtB,GAAG,EAAE,KAAK,EACV,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,kBAAkB,EAC1B,MAAM,GAAE,UAAe,EACvB,KAAK,CAAC,EAAE,QAAQ,QAiChB;AAED,iBAAS,cAAc,CACtB,OAAO,EAAE,aAAa,EACtB,GAAG,EAAE,KAAK,EACV,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,kBAAkB,EAC1B,MAAM,GAAE,UAAe,EACvB,KAAK,CAAC,EAAE,QAAQ,QAWhB;AAED,iBAAS,gBAAgB,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,KAAK,QAO5E;AAED,iBAAS,gBAAgB,CACxB,OAAO,EAAE,aAAa,EACtB,KAAK,EAAE,QAAQ,GACb,OAAO,GAAG,IAAI,CAGhB;AAED,iBAAS,OAAO,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,KAAK,GAAG,OAAO,GAAG,IAAI,CAGnE;AAOD,iBAAS,eAAe,CACvB,OAAO,EAAE,aAAa,EACtB,GAAG,EAAE,KAAK,GACR;IAAE,GAAG,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,OAAO,GAAG,IAAI,CAAA;CAAE,CA+BtC;AAED,iBAAS,SAAS,CACjB,OAAO,EAAE,aAAa,EACtB,GAAG,EAAE,KAAK,GACR,OAAO,CAAC,QAAQ,CAAC,GAAG,IAAI,CAG1B;AAED,iBAAS,cAAc,CACtB,OAAO,EAAE,aAAa,EACtB,GAAG,EAAE,KAAK,GACR,OAAO,CAAC,aAAa,CAAC,GAAG,IAAI,CAG/B;AAED,OAAO,EACN,gBAAgB,EAChB,cAAc,EACd,OAAO,EACP,eAAe,EACf,SAAS,EACT,gBAAgB,EAChB,cAAc,EACd,SAAS,GACT,CAAC"}
+{"version":3,"file":"links.d.ts","sourceRoot":"","sources":["../../../../../../src/shared/stores/bounds/internals/links.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAe9E,OAAO,KAAK,EACX,QAAQ,EACR,OAAO,EAEP,SAAS,EACT,aAAa,EACb,KAAK,EACL,OAAO,EACP,MAAM,UAAU,CAAC;AA4GlB,iBAAS,SAAS,CACjB,OAAO,EAAE,aAAa,EACtB,GAAG,EAAE,KAAK,EACV,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,kBAAkB,EAC1B,MAAM,GAAE,UAAe,EACvB,KAAK,CAAC,EAAE,QAAQ,QAiChB;AAED,iBAAS,cAAc,CACtB,OAAO,EAAE,aAAa,EACtB,GAAG,EAAE,KAAK,EACV,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,kBAAkB,EAC1B,MAAM,GAAE,UAAe,EACvB,KAAK,CAAC,EAAE,QAAQ,QAWhB;AAED,iBAAS,gBAAgB,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,KAAK,QAO5E;AAED,iBAAS,gBAAgB,CACxB,OAAO,EAAE,aAAa,EACtB,KAAK,EAAE,QAAQ,GACb,OAAO,GAAG,IAAI,CAGhB;AAED,iBAAS,OAAO,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,KAAK,GAAG,OAAO,GAAG,IAAI,CAGnE;AAqBD,iBAAS,eAAe,CACvB,OAAO,EAAE,aAAa,EACtB,GAAG,EAAE,KAAK,GACR;IAAE,GAAG,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,OAAO,GAAG,IAAI,CAAA;CAAE,CAyCtC;AAED,iBAAS,SAAS,CACjB,OAAO,EAAE,aAAa,EACtB,GAAG,EAAE,KAAK,GACR,OAAO,CAAC,QAAQ,CAAC,GAAG,IAAI,CAG1B;AAED,iBAAS,cAAc,CACtB,OAAO,EAAE,aAAa,EACtB,GAAG,EAAE,KAAK,GACR,OAAO,CAAC,aAAa,CAAC,GAAG,IAAI,CAG/B;AAED,OAAO,EACN,gBAAgB,EAChB,cAAc,EACd,OAAO,EACP,eAAe,EACf,SAAS,EACT,gBAAgB,EAChB,cAAc,EACd,SAAS,GACT,CAAC"}

package/lib/typescript/shared/utils/bounds/navigation/zoom/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../../../../../src/shared/utils/bounds/navigation/zoom/build.ts"],"names":[],"mappings":"AAqCA,OAAO,KAAK,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAyE5E,wBAAgB,eAAe,CAAC,EAC/B,GAAG,EACH,WAAW,EACX,KAAK,GACL,EAAE,qBAAqB,GAAG,qBAAqB,CA+X/C"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../../../../../src/shared/utils/bounds/navigation/zoom/build.ts"],"names":[],"mappings":"AAqCA,OAAO,KAAK,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAyE5E,wBAAgB,eAAe,CAAC,EAC/B,GAAG,EACH,WAAW,EACX,KAAK,GACL,EAAE,qBAAqB,GAAG,qBAAqB,CAmY/C"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "react-native-screen-transitions",
-	"version": "3.6.0-alpha.4",
+	"version": "3.6.0-beta.0",
 	"description": "Easy screen transitions for React Native and Expo",
 	"author": "Ed",
 	"license": "MIT",

package/src/shared/providers/screen/styles/helpers/resolve-slot-styles/index.ts

@@ -4,16 +4,17 @@ import type {
 } from "../../../../../types/animation.types";
 import { shouldSlotInherit } from "../../constants";
 import { materializeResolvedSlot } from "./materialize-slot";
-import { getResolvedSlotState, hasDisappearedKeys } from "./slot-state";
+import { getResolvedSlotState } from "./slot-state";
 import type {
+	LocalStyleLayers,
 	ResettableStyleState,
 	ResettableStyleStatesBySlot,
 } from "./types";
 
-export type { ResettableStyleStatesBySlot } from "./types";
+export type { LocalStyleLayers, ResettableStyleStatesBySlot } from "./types";
 
 type ResolveSlotStylesContext = {
-	currentStylesMap: NormalizedTransitionInterpolatedStyle;
+	localStylesMaps: LocalStyleLayers;
 	ancestorStylesMap: NormalizedTransitionInterpolatedStyle;
 	previousStyleStatesBySlot: ResettableStyleStatesBySlot;
 	deferLocalSlotResets: boolean;
@@ -42,6 +43,35 @@ const hasEitherResetPatch = (
 	return hasStyleResetPatch || hasPropResetPatch;
 };
 
+const hasDefinedBucketValue = (value: unknown) => {
+	"worklet";
+	return value !== undefined && value !== null;
+};
+
+const hasResettableDisappearedKeys = (
+	previousKeys: Record<string, true> | undefined,
+	previousResetValues: Record<string, unknown> | undefined,
+	currentKeys: Record<string, true> | undefined,
+) => {
+	"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,
@@ -58,10 +88,18 @@ const getResolvedSlotOutput = ({
 
 	const hasStyleResetPatch =
 		resetDroppedKeys &&
-		hasDisappearedKeys(previousState?.styleKeys, state.styleKeys);
+		hasResettableDisappearedKeys(
+			previousState?.styleKeys,
+			previousState?.styleResetValues,
+			state.styleKeys,
+		);
 	const hasPropResetPatch =
 		resetDroppedKeys &&
-		hasDisappearedKeys(previousState?.propKeys, state.propKeys);
+		hasResettableDisappearedKeys(
+			previousState?.propKeys,
+			previousState?.propResetValues,
+			state.propKeys,
+		);
 	const hasResetPatch = hasEitherResetPatch(
 		hasStyleResetPatch,
 		hasPropResetPatch,
@@ -92,30 +130,105 @@ const getResolvedSlotOutput = ({
 	};
 };
 
+const hasLocalStyleSource = (context: ResolveSlotStylesContext) => {
+	"worklet";
+	return context.localStylesMaps.length > 0;
+};
+
+const hasLocalSlot = (context: ResolveSlotStylesContext, slotId: string) => {
+	"worklet";
+
+	for (let index = 0; index < context.localStylesMaps.length; index++) {
+		if (context.localStylesMaps[index]?.[slotId] !== undefined) {
+			return true;
+		}
+	}
+
+	return false;
+};
+
 const shouldDeferMissingLocalSlotReset = (
 	context: ResolveSlotStylesContext,
 	slotId: string,
 ) => {
 	"worklet";
 	const canInherit = shouldSlotInherit(slotId);
-	const hasCurrentSlot = context.currentStylesMap[slotId] !== undefined;
+	const localSlotExists = hasLocalSlot(context, slotId);
 	const hasInheritedSlot =
 		canInherit && context.ancestorStylesMap[slotId] !== undefined;
 
 	return (
 		context.deferLocalSlotResets &&
+		!hasLocalStyleSource(context) &&
 		!canInherit &&
-		!hasCurrentSlot &&
+		!localSlotExists &&
 		!hasInheritedSlot
 	);
 };
 
+const mergeBucket = (
+	resolvedBucket: Record<string, unknown> | undefined,
+	source: Record<string, unknown> | undefined,
+) => {
+	"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: ResolveSlotStylesContext,
+	slotId: string,
+) => {
+	"worklet";
+	let mergedStyle: Record<string, unknown> | undefined;
+	let mergedProps: Record<string, unknown> | undefined;
+
+	for (let index = 0; index < context.localStylesMaps.length; index++) {
+		const slot = context.localStylesMaps[index]?.[slotId];
+
+		if (slot === undefined) {
+			continue;
+		}
+
+		mergedStyle = mergeBucket(
+			mergedStyle,
+			slot.style as Record<string, unknown> | undefined,
+		);
+		mergedProps = mergeBucket(mergedProps, slot.props);
+	}
+
+	if (!mergedStyle && !mergedProps) {
+		return undefined;
+	}
+
+	return {
+		style: mergedStyle,
+		props: mergedProps,
+	};
+};
+
 const getSlotForId = (context: ResolveSlotStylesContext, slotId: string) => {
 	"worklet";
-	const currentSlot = context.currentStylesMap[slotId];
 
-	if (currentSlot !== undefined) {
-		return currentSlot;
+	if (hasLocalSlot(context, slotId)) {
+		return getMergedLocalSlot(context, slotId);
 	}
 
 	if (shouldSlotInherit(slotId)) {
@@ -326,9 +439,19 @@ const appendResolvedSlot = (
 
 const appendCurrentSlots = (context: ResolveSlotStylesContext) => {
 	"worklet";
+	const appendedSlotIds: Record<string, true> = {};
+
+	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;
+			}
 
-	for (const slotId in context.currentStylesMap) {
-		appendResolvedSlot(context, slotId);
+			appendedSlotIds[slotId] = true;
+			appendResolvedSlot(context, slotId);
+		}
 	}
 };
 
@@ -337,9 +460,7 @@ const shouldAppendInheritedSlot = (
 	slotId: string,
 ) => {
 	"worklet";
-	return (
-		shouldSlotInherit(slotId) && context.currentStylesMap[slotId] === undefined
-	);
+	return shouldSlotInherit(slotId) && !hasLocalSlot(context, slotId);
 };
 
 const appendInheritedSlots = (context: ResolveSlotStylesContext) => {
@@ -361,7 +482,7 @@ const shouldAppendPreviousSlot = (
 		shouldSlotInherit(slotId) &&
 		context.ancestorStylesMap[slotId] !== undefined;
 
-	return context.currentStylesMap[slotId] === undefined && !inheritedSlotExists;
+	return !hasLocalSlot(context, slotId) && !inheritedSlotExists;
 };
 
 const appendPreviousSlots = (context: ResolveSlotStylesContext) => {
@@ -381,12 +502,12 @@ const appendPreviousSlots = (context: ResolveSlotStylesContext) => {
  * concrete identity values.
  */
 export const resolveSlotStyles = ({
-	currentStylesMap,
+	localStylesMaps,
 	ancestorStylesMap,
 	previousStyleStatesBySlot,
 	deferLocalSlotResets = false,
 }: {
-	currentStylesMap: NormalizedTransitionInterpolatedStyle;
+	localStylesMaps: LocalStyleLayers;
 	ancestorStylesMap: NormalizedTransitionInterpolatedStyle;
 	previousStyleStatesBySlot: ResettableStyleStatesBySlot;
 	deferLocalSlotResets?: boolean;
@@ -395,7 +516,7 @@ export const resolveSlotStyles = ({
 	const resolvedStylesMap: NormalizedTransitionInterpolatedStyle = {};
 	const nextPreviousStyleStatesBySlot: ResettableStyleStatesBySlot = {};
 	const context = {
-		currentStylesMap,
+		localStylesMaps,
 		ancestorStylesMap,
 		previousStyleStatesBySlot,
 		deferLocalSlotResets,

package/src/shared/providers/screen/styles/helpers/resolve-slot-styles/materialize-slot.ts

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

package/src/shared/providers/screen/styles/helpers/resolve-slot-styles/types.ts

@@ -1,3 +1,7 @@
+import type { NormalizedTransitionInterpolatedStyle } from "../../../../../types/animation.types";
+
+export type LocalStyleLayers = NormalizedTransitionInterpolatedStyle[];
+
 export type ResettableStyleState = {
 	styleKeys?: Record<string, true>;
 	styleResetValues?: Record<string, unknown>;