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

package/lib/module/shared/components/screen-container/layers/backdrop.js

@@ -2,12 +2,11 @@
 
 import { memo, useCallback, useMemo } from "react";
 import { Pressable, StyleSheet } from "react-native";
-import Animated, { runOnUI, useAnimatedProps, useAnimatedStyle } from "react-native-reanimated";
+import Animated, { runOnUI } from "react-native-reanimated";
 import { DefaultSnapSpec } from "../../../configs/specs";
-import { NO_PROPS, NO_STYLES } from "../../../constants";
 import { useNavigationHelpers } from "../../../hooks/navigation/use-navigation-helpers";
 import { useDescriptors } from "../../../providers/screen/descriptors";
-import { useScreenStyles } from "../../../providers/screen/styles";
+import { useSlotProps, useSlotStyles } from "../../../providers/screen/styles";
 import { AnimationStore } from "../../../stores/animation.store";
 import { GestureStore } from "../../../stores/gesture.store";
 import { SystemStore } from "../../../stores/system.store";
@@ -18,9 +17,6 @@ export const BackdropLayer = /*#__PURE__*/memo(function BackdropLayer({
   backdropBehavior,
   isBackdropActive
 }) {
-  const {
-    stylesMap
-  } = useScreenStyles();
   const {
     current
   } = useDescriptors();
@@ -84,16 +80,8 @@ export const BackdropLayer = /*#__PURE__*/memo(function BackdropLayer({
       })();
     }
   }, [animations, targetProgress, resolvedAutoSnapPoint, backdropBehavior, current, dismissScreen, routeKey]);
-  const animatedBackdropStyle = useAnimatedStyle(() => {
-    "worklet";
-
-    return stylesMap.get().backdrop?.style ?? NO_STYLES;
-  });
-  const animatedBackdropProps = useAnimatedProps(() => {
-    "worklet";
-
-    return stylesMap.get().backdrop?.props ?? NO_PROPS;
-  });
+  const animatedBackdropStyle = useSlotStyles("backdrop");
+  const animatedBackdropProps = useSlotProps("backdrop");
   return /*#__PURE__*/_jsxs(Pressable, {
     style: StyleSheet.absoluteFill,
     pointerEvents: isBackdropActive ? "auto" : "none",

package/lib/module/shared/components/screen-container/layers/backdrop.js.map

@@ -1 +1 @@
-{"version":3,"names":["memo","useCallback","useMemo","Pressable","StyleSheet","Animated","runOnUI","useAnimatedProps","useAnimatedStyle","DefaultSnapSpec","NO_PROPS","NO_STYLES","useNavigationHelpers","useDescriptors","useScreenStyles","AnimationStore","GestureStore","SystemStore","animateToProgress","findCollapseTarget","jsx","_jsx","jsxs","_jsxs","BackdropLayer","backdropBehavior","isBackdropActive","stylesMap","current","dismissScreen","BackdropComponent","options","backdropComponent","routeKey","route","key","animations","getBag","targetProgress","resolvedAutoSnapPoint","AnimatedBackdropComponent","createAnimatedComponent","handleBackdropPress","rawSnapPoints","snapPoints","canDismiss","gestureEnabled","length","gestures","transitionSpec","resolvedSnaps","i","point","resolvedPoint","get","push","target","shouldDismiss","transitionProgress","dismissing","set","spec","open","expand","close","collapse","onAnimationFinish","undefined","animatedBackdropStyle","backdrop","style","animatedBackdropProps","props","absoluteFill","pointerEvents","onPress","children","animatedProps","View"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-container/layers/backdrop.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["memo","useCallback","useMemo","Pressable","StyleSheet","Animated","runOnUI","DefaultSnapSpec","useNavigationHelpers","useDescriptors","useSlotProps","useSlotStyles","AnimationStore","GestureStore","SystemStore","animateToProgress","findCollapseTarget","jsx","_jsx","jsxs","_jsxs","BackdropLayer","backdropBehavior","isBackdropActive","current","dismissScreen","BackdropComponent","options","backdropComponent","routeKey","route","key","animations","getBag","targetProgress","resolvedAutoSnapPoint","AnimatedBackdropComponent","createAnimatedComponent","handleBackdropPress","rawSnapPoints","snapPoints","canDismiss","gestureEnabled","length","gestures","transitionSpec","resolvedSnaps","i","point","resolvedPoint","get","push","target","shouldDismiss","transitionProgress","dismissing","set","spec","open","expand","close","collapse","onAnimationFinish","undefined","animatedBackdropStyle","animatedBackdropProps","style","absoluteFill","pointerEvents","onPress","children","animatedProps","View"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-container/layers/backdrop.tsx"],"mappings":";;AAAA,SAASA,IAAI,EAAEC,WAAW,EAAEC,OAAO,QAAQ,OAAO;AAClD,SAASC,SAAS,EAAEC,UAAU,QAAQ,cAAc;AACpD,OAAOC,QAAQ,IAAIC,OAAO,QAAQ,yBAAyB;AAC3D,SAASC,eAAe,QAAQ,wBAAwB;AACxD,SAASC,oBAAoB,QAAQ,kDAAkD;AACvF,SAASC,cAAc,QAAQ,uCAAuC;AACtE,SAASC,YAAY,EAAEC,aAAa,QAAQ,kCAAkC;AAC9E,SAASC,cAAc,QAAQ,iCAAiC;AAChE,SAASC,YAAY,QAAQ,+BAA+B;AAC5D,SAASC,WAAW,QAAQ,8BAA8B;AAE1D,SAASC,iBAAiB,QAAQ,8CAA8C;AAChF,SAASC,kBAAkB,QAAQ,iCAAiC;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAErE,OAAO,MAAMC,aAAa,gBAAGrB,IAAI,CAAC,SAASqB,aAAaA,CAAC;EACxDC,gBAAgB;EAChBC;AAID,CAAC,EAAE;EACF,MAAM;IAAEC;EAAQ,CAAC,GAAGf,cAAc,CAAC,CAAC;EACpC,MAAM;IAAEgB;EAAc,CAAC,GAAGjB,oBAAoB,CAAC,CAAC;EAEhD,MAAMkB,iBAAiB,GAAGF,OAAO,CAACG,OAAO,CAACC,iBAAiB;EAC3D,MAAMC,QAAQ,GAAGL,OAAO,CAACM,KAAK,CAACC,GAAG;EAClC,MAAMC,UAAU,GAAGpB,cAAc,CAACqB,MAAM,CAACJ,QAAQ,CAAC;EAClD,MAAM;IAAEK,cAAc;IAAEC;EAAsB,CAAC,GAC9CrB,WAAW,CAACmB,MAAM,CAACJ,QAAQ,CAAC;EAE7B,MAAMO,yBAAyB,GAAGlC,OAAO,CACxC,MACCwB,iBAAiB,GACdrB,QAAQ,CAACgC,uBAAuB,CAACX,iBAAiB,CAAC,GACnD,IAAI,EACR,CAACA,iBAAiB,CACnB,CAAC;EAED,MAAMY,mBAAmB,GAAGrC,WAAW,CAAC,MAAM;IAC7C,IAAIqB,gBAAgB,KAAK,SAAS,EAAE;MACnCG,aAAa,CAAC,CAAC;MACf;IACD;IAEA,IAAIH,gBAAgB,KAAK,UAAU,EAAE;MACpC,MAAMiB,aAAa,GAAGf,OAAO,CAACG,OAAO,CAACa,UAAU;MAChD,MAAMC,UAAU,GAAGjB,OAAO,CAACG,OAAO,CAACe,cAAc,KAAK,KAAK;;MAE3D;MACA,IAAI,CAACH,aAAa,IAAIA,aAAa,CAACI,MAAM,KAAK,CAAC,EAAE;QACjDlB,aAAa,CAAC,CAAC;QACf;MACD;MAEA,MAAMmB,QAAQ,GAAG/B,YAAY,CAACoB,MAAM,CAACJ,QAAQ,CAAC;MAC9C,MAAMgB,cAAc,GAAGrB,OAAO,CAACG,OAAO,CAACkB,cAAc;MAErDvC,OAAO,CAAC,MAAM;QACb,SAAS;;QACT,MAAMwC,aAAuB,GAAG,EAAE;QAElC,KAAK,IAAIC,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGR,aAAa,CAACI,MAAM,EAAEI,CAAC,EAAE,EAAE;UAC9C,MAAMC,KAAK,GAAGT,aAAa,CAACQ,CAAC,CAAC;UAC9B,MAAME,aAAa,GAClBD,KAAK,KAAK,MAAM,GAAGb,qBAAqB,CAACe,GAAG,CAAC,CAAC,GAAGF,KAAK;UAEvD,IAAI,OAAOC,aAAa,KAAK,QAAQ,EAAE;YACtCH,aAAa,CAACK,IAAI,CAACF,aAAa,CAAC;UAClC;QACD;QAEA,MAAM;UAAEG,MAAM;UAAEC;QAAc,CAAC,GAAGrC,kBAAkB,CACnDgB,UAAU,CAACsB,kBAAkB,CAACJ,GAAG,CAAC,CAAC,EACnCJ,aAAa,EACbL,UACD,CAAC;;QAED;QACA,IAAIG,QAAQ,CAACW,UAAU,CAACL,GAAG,CAAC,CAAC,EAAE;QAE/BN,QAAQ,CAACW,UAAU,CAACC,GAAG,CAACH,aAAa,GAAG,CAAC,GAAG,CAAC,CAAC;QAE9C,MAAMI,IAAI,GAAGJ,aAAa,GACvBR,cAAc,GACd;UACAa,IAAI,EAAEb,cAAc,EAAEc,MAAM,IAAIpD,eAAe;UAC/CqD,KAAK,EAAEf,cAAc,EAAEgB,QAAQ,IAAItD;QACpC,CAAC;QAEHQ,iBAAiB,CAAC;UACjBqC,MAAM;UACNK,IAAI;UACJzB,UAAU;UACVE,cAAc;UACd4B,iBAAiB,EAAET,aAAa,GAAG5B,aAAa,GAAGsC;QACpD,CAAC,CAAC;MACH,CAAC,CAAC,CAAC,CAAC;IACL;EACD,CAAC,EAAE,CACF/B,UAAU,EACVE,cAAc,EACdC,qBAAqB,EACrBb,gBAAgB,EAChBE,OAAO,EACPC,aAAa,EACbI,QAAQ,CACR,CAAC;EAEF,MAAMmC,qBAAqB,GAAGrD,aAAa,CAAC,UAAU,CAAC;EACvD,MAAMsD,qBAAqB,GAAGvD,YAAY,CAAC,UAAU,CAAC;EAEtD,oBACCU,KAAA,CAACjB,SAAS;IACT+D,KAAK,EAAE9D,UAAU,CAAC+D,YAAa;IAC/BC,aAAa,EAAE7C,gBAAgB,GAAG,MAAM,GAAG,MAAO;IAClD8C,OAAO,EAAE9C,gBAAgB,GAAGe,mBAAmB,GAAGyB,SAAU;IAAAO,QAAA,GAK3DlC,yBAAyB,iBACzBlB,IAAA,CAACkB,yBAAyB;MACzB8B,KAAK,EAAE,CAAC9D,UAAU,CAAC+D,YAAY,CAAE;MACjCI,aAAa,EAAEN;IAAsB,CACrC,CACD,eACD/C,IAAA,CAACb,QAAQ,CAACmE,IAAI;MAACN,KAAK,EAAE,CAAC9D,UAAU,CAAC+D,YAAY,EAAEH,qBAAqB;IAAE,CAAE,CAAC;EAAA,CAChE,CAAC;AAEd,CAAC,CAAC","ignoreList":[]}

package/lib/module/shared/components/screen-container/layers/content.js

@@ -4,12 +4,11 @@
 import { memo } from "react";
 import { StyleSheet, View } from "react-native";
 import { GestureDetector } from "react-native-gesture-handler";
-import Animated, { useAnimatedProps, useAnimatedStyle } from "react-native-reanimated";
-import { NO_PROPS, NO_STYLES } from "../../../constants";
+import Animated from "react-native-reanimated";
 import { useDescriptors } from "../../../providers/screen/descriptors";
 import { useGestureContext } from "../../../providers/screen/gestures";
 import { OriginProvider } from "../../../providers/screen/origin.provider";
-import { useScreenStyles } from "../../../providers/screen/styles";
+import { useSlotProps, useSlotStyles } from "../../../providers/screen/styles";
 import { ScreenFallbackHost } from "../../boundary/portal/components/host";
 import { useContentLayout } from "../hooks/use-content-layout";
 import { MaybeMaskedNavigationContainer } from "./maybe-masked-navigation-container";
@@ -20,9 +19,6 @@ export const ContentLayer = /*#__PURE__*/memo(({
   pointerEvents,
   isBackdropActive
 }) => {
-  const {
-    stylesMap
-  } = useScreenStyles();
   const {
     current
   } = useDescriptors();
@@ -31,16 +27,8 @@ export const ContentLayer = /*#__PURE__*/memo(({
   const contentPointerEvents = isBackdropActive ? "box-none" : pointerEvents;
   const hasAutoSnapPoint = current.options.snapPoints?.includes("auto") ?? false;
   const handleContentLayout = useContentLayout();
-  const animatedContentStyle = useAnimatedStyle(() => {
-    "worklet";
-
-    return stylesMap.get().content?.style || NO_STYLES;
-  });
-  const animatedContentProps = useAnimatedProps(() => {
-    "worklet";
-
-    return stylesMap.get().content?.props ?? NO_PROPS;
-  });
+  const animatedContentStyle = useSlotStyles("content");
+  const animatedContentProps = useSlotProps("content");
   return /*#__PURE__*/_jsx(GestureDetector, {
     gesture: gestureContext.detectorGesture,
     children: /*#__PURE__*/_jsx(Animated.View, {

package/lib/module/shared/components/screen-container/layers/content.js.map

@@ -1 +1 @@
-{"version":3,"names":["memo","StyleSheet","View","GestureDetector","Animated","useAnimatedProps","useAnimatedStyle","NO_PROPS","NO_STYLES","useDescriptors","useGestureContext","OriginProvider","useScreenStyles","ScreenFallbackHost","useContentLayout","MaybeMaskedNavigationContainer","SurfaceContainer","jsx","_jsx","jsxs","_jsxs","ContentLayer","children","pointerEvents","isBackdropActive","stylesMap","current","gestureContext","isNavigationMaskEnabled","options","navigationMaskEnabled","contentPointerEvents","hasAutoSnapPoint","snapPoints","includes","handleContentLayout","animatedContentStyle","get","content","style","animatedContentProps","props","gesture","detectorGesture","styles","animatedProps","enabled","collapsable","onLayout","create","flex"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-container/layers/content.tsx"],"mappings":";;AAAA;AACA,SAASA,IAAI,QAAQ,OAAO;AAC5B,SAASC,UAAU,EAAEC,IAAI,QAAQ,cAAc;AAC/C,SAASC,eAAe,QAAQ,8BAA8B;AAC9D,OAAOC,QAAQ,IACdC,gBAAgB,EAChBC,gBAAgB,QACV,yBAAyB;AAChC,SAASC,QAAQ,EAAEC,SAAS,QAAQ,oBAAoB;AACxD,SAASC,cAAc,QAAQ,uCAAuC;AACtE,SAASC,iBAAiB,QAAQ,oCAAoC;AACtE,SAASC,cAAc,QAAQ,2CAA2C;AAC1E,SAASC,eAAe,QAAQ,kCAAkC;AAClE,SAASC,kBAAkB,QAAQ,uCAAuC;AAC1E,SAASC,gBAAgB,QAAQ,6BAA6B;AAC9D,SAASC,8BAA8B,QAAQ,qCAAqC;AACpF,SAASC,gBAAgB,QAAQ,qBAAqB;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAQvD,OAAO,MAAMC,YAAY,gBAAGrB,IAAI,CAC/B,CAAC;EAAEsB,QAAQ;EAAEC,aAAa;EAAEC;AAAwB,CAAC,KAAK;EACzD,MAAM;IAAEC;EAAU,CAAC,GAAGb,eAAe,CAAC,CAAC;EACvC,MAAM;IAAEc;EAAQ,CAAC,GAAGjB,cAAc,CAAC,CAAC;EAEpC,MAAMkB,cAAc,GAAGjB,iBAAiB,CAAC,CAAC;EAC1C,MAAMkB,uBAAuB,GAAG,CAAC,CAACF,OAAO,CAACG,OAAO,CAACC,qBAAqB;EACvE,MAAMC,oBAAoB,GAAGP,gBAAgB,GAAG,UAAU,GAAGD,aAAa;EAE1E,MAAMS,gBAAgB,GACrBN,OAAO,CAACG,OAAO,CAACI,UAAU,EAAEC,QAAQ,CAAC,MAAM,CAAC,IAAI,KAAK;EAEtD,MAAMC,mBAAmB,GAAGrB,gBAAgB,CAAC,CAAC;EAE9C,MAAMsB,oBAAoB,GAAG9B,gBAAgB,CAAC,MAAM;IACnD,SAAS;;IACT,OAAOmB,SAAS,CAACY,GAAG,CAAC,CAAC,CAACC,OAAO,EAAEC,KAAK,IAAI/B,SAAS;EACnD,CAAC,CAAC;EAEF,MAAMgC,oBAAoB,GAAGnC,gBAAgB,CAAC,MAAM;IACnD,SAAS;;IACT,OAAOoB,SAAS,CAACY,GAAG,CAAC,CAAC,CAACC,OAAO,EAAEG,KAAK,IAAIlC,QAAQ;EAClD,CAAC,CAAC;EAEF,oBACCW,IAAA,CAACf,eAAe;IAACuC,OAAO,EAAEf,cAAc,CAAEgB,eAAgB;IAAArB,QAAA,eACzDJ,IAAA,CAACd,QAAQ,CAACF,IAAI;MACbqC,KAAK,EAAE,CAACK,MAAM,CAACN,OAAO,EAAEF,oBAAoB,CAAE;MAC9CS,aAAa,EAAEL,oBAAqB;MACpCjB,aAAa,EAAEQ,oBAAqB;MAAAT,QAAA,eAEpCJ,IAAA,CAACH,8BAA8B;QAC9BQ,aAAa,EAAEQ,oBAAqB;QACpCe,OAAO,EAAElB,uBAAwB;QAAAN,QAAA,eAEjCJ,IAAA,CAACF,gBAAgB;UAACO,aAAa,EAAEQ,oBAAqB;UAAAT,QAAA,eACrDF,KAAA,CAACT,cAAc;YAAAW,QAAA,GACbU,gBAAgB,gBAChBd,IAAA,CAAChB,IAAI;cAAC6C,WAAW,EAAE,KAAM;cAACC,QAAQ,EAAEb,mBAAoB;cAAAb,QAAA,EACtDA;YAAQ,CACJ,CAAC,GAEPA,QACA,eACDJ,IAAA,CAACL,kBAAkB,IAAE,CAAC;UAAA,CACP;QAAC,CACA;MAAC,CACY;IAAC,CACnB;EAAC,CACA,CAAC;AAEpB,CACD,CAAC;AAED,MAAM+B,MAAM,GAAG3C,UAAU,CAACgD,MAAM,CAAC;EAChCX,OAAO,EAAE;IACRY,IAAI,EAAE;EACP;AACD,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["memo","StyleSheet","View","GestureDetector","Animated","useDescriptors","useGestureContext","OriginProvider","useSlotProps","useSlotStyles","ScreenFallbackHost","useContentLayout","MaybeMaskedNavigationContainer","SurfaceContainer","jsx","_jsx","jsxs","_jsxs","ContentLayer","children","pointerEvents","isBackdropActive","current","gestureContext","isNavigationMaskEnabled","options","navigationMaskEnabled","contentPointerEvents","hasAutoSnapPoint","snapPoints","includes","handleContentLayout","animatedContentStyle","animatedContentProps","gesture","detectorGesture","style","styles","content","animatedProps","enabled","collapsable","onLayout","create","flex"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-container/layers/content.tsx"],"mappings":";;AAAA;AACA,SAASA,IAAI,QAAQ,OAAO;AAC5B,SAASC,UAAU,EAAEC,IAAI,QAAQ,cAAc;AAC/C,SAASC,eAAe,QAAQ,8BAA8B;AAC9D,OAAOC,QAAQ,MAAM,yBAAyB;AAC9C,SAASC,cAAc,QAAQ,uCAAuC;AACtE,SAASC,iBAAiB,QAAQ,oCAAoC;AACtE,SAASC,cAAc,QAAQ,2CAA2C;AAC1E,SAASC,YAAY,EAAEC,aAAa,QAAQ,kCAAkC;AAC9E,SAASC,kBAAkB,QAAQ,uCAAuC;AAC1E,SAASC,gBAAgB,QAAQ,6BAA6B;AAC9D,SAASC,8BAA8B,QAAQ,qCAAqC;AACpF,SAASC,gBAAgB,QAAQ,qBAAqB;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAQvD,OAAO,MAAMC,YAAY,gBAAGlB,IAAI,CAC/B,CAAC;EAAEmB,QAAQ;EAAEC,aAAa;EAAEC;AAAwB,CAAC,KAAK;EACzD,MAAM;IAAEC;EAAQ,CAAC,GAAGjB,cAAc,CAAC,CAAC;EAEpC,MAAMkB,cAAc,GAAGjB,iBAAiB,CAAC,CAAC;EAC1C,MAAMkB,uBAAuB,GAAG,CAAC,CAACF,OAAO,CAACG,OAAO,CAACC,qBAAqB;EACvE,MAAMC,oBAAoB,GAAGN,gBAAgB,GAAG,UAAU,GAAGD,aAAa;EAE1E,MAAMQ,gBAAgB,GACrBN,OAAO,CAACG,OAAO,CAACI,UAAU,EAAEC,QAAQ,CAAC,MAAM,CAAC,IAAI,KAAK;EAEtD,MAAMC,mBAAmB,GAAGpB,gBAAgB,CAAC,CAAC;EAE9C,MAAMqB,oBAAoB,GAAGvB,aAAa,CAAC,SAAS,CAAC;EACrD,MAAMwB,oBAAoB,GAAGzB,YAAY,CAAC,SAAS,CAAC;EAEpD,oBACCO,IAAA,CAACZ,eAAe;IAAC+B,OAAO,EAAEX,cAAc,CAAEY,eAAgB;IAAAhB,QAAA,eACzDJ,IAAA,CAACX,QAAQ,CAACF,IAAI;MACbkC,KAAK,EAAE,CAACC,MAAM,CAACC,OAAO,EAAEN,oBAAoB,CAAE;MAC9CO,aAAa,EAAEN,oBAAqB;MACpCb,aAAa,EAAEO,oBAAqB;MAAAR,QAAA,eAEpCJ,IAAA,CAACH,8BAA8B;QAC9BQ,aAAa,EAAEO,oBAAqB;QACpCa,OAAO,EAAEhB,uBAAwB;QAAAL,QAAA,eAEjCJ,IAAA,CAACF,gBAAgB;UAACO,aAAa,EAAEO,oBAAqB;UAAAR,QAAA,eACrDF,KAAA,CAACV,cAAc;YAAAY,QAAA,GACbS,gBAAgB,gBAChBb,IAAA,CAACb,IAAI;cAACuC,WAAW,EAAE,KAAM;cAACC,QAAQ,EAAEX,mBAAoB;cAAAZ,QAAA,EACtDA;YAAQ,CACJ,CAAC,GAEPA,QACA,eACDJ,IAAA,CAACL,kBAAkB,IAAE,CAAC;UAAA,CACP;QAAC,CACA;MAAC,CACY;IAAC,CACnB;EAAC,CACA,CAAC;AAEpB,CACD,CAAC;AAED,MAAM2B,MAAM,GAAGpC,UAAU,CAAC0C,MAAM,CAAC;EAChCL,OAAO,EAAE;IACRM,IAAI,EAAE;EACP;AACD,CAAC,CAAC","ignoreList":[]}

package/lib/module/shared/components/screen-container/layers/maybe-masked-navigation-container.js

@@ -2,9 +2,9 @@
 
 import { memo, useCallback } from "react";
 import { StyleSheet, View } from "react-native";
-import Animated, { useAnimatedStyle } from "react-native-reanimated";
-import { NAVIGATION_MASK_CONTAINER_STYLE_ID, NAVIGATION_MASK_ELEMENT_STYLE_ID, NO_STYLES } from "../../../constants";
-import { useScreenStyles } from "../../../providers/screen/styles";
+import Animated from "react-native-reanimated";
+import { NAVIGATION_MASK_CONTAINER_STYLE_ID, NAVIGATION_MASK_ELEMENT_STYLE_ID } from "../../../constants";
+import { useSlotStyles } from "../../../providers/screen/styles";
 import { logger } from "../../../utils/logger";
 import { jsx as _jsx } from "react/jsx-runtime";
 let LazyMaskedView = View;
@@ -31,25 +31,14 @@ const MaskedNavigationContainer = /*#__PURE__*/memo(({
   children,
   pointerEvents
 }) => {
-  const {
-    stylesMap
-  } = useScreenStyles();
   const maybeLogWarning = useCallback(() => {
     if (LazyMaskedView !== View) return;
     if (hasWarnedMissingMaskedView) return;
     hasWarnedMissingMaskedView = true;
     logger.warn("navigationMaskEnabled requires @react-native-masked-view/masked-view. Install it to enable navigation bounds masking.");
   }, []);
-  const animatedNavigationMaskStyle = useAnimatedStyle(() => {
-    "worklet";
-
-    return stylesMap.get()[NAVIGATION_MASK_ELEMENT_STYLE_ID]?.style || NO_STYLES;
-  });
-  const animatedNavigationMaskContainerStyle = useAnimatedStyle(() => {
-    "worklet";
-
-    return stylesMap.get()[NAVIGATION_MASK_CONTAINER_STYLE_ID]?.style || NO_STYLES;
-  });
+  const animatedNavigationMaskStyle = useSlotStyles(NAVIGATION_MASK_ELEMENT_STYLE_ID);
+  const animatedNavigationMaskContainerStyle = useSlotStyles(NAVIGATION_MASK_CONTAINER_STYLE_ID);
   return /*#__PURE__*/_jsx(LazyMaskedView, {
     style: styles.navigationMaskedRoot
     // @ts-expect-error masked-view package types are too strict here

package/lib/module/shared/components/screen-container/layers/maybe-masked-navigation-container.js.map

@@ -1 +1 @@
-{"version":3,"names":["memo","useCallback","StyleSheet","View","Animated","useAnimatedStyle","NAVIGATION_MASK_CONTAINER_STYLE_ID","NAVIGATION_MASK_ELEMENT_STYLE_ID","NO_STYLES","useScreenStyles","logger","jsx","_jsx","LazyMaskedView","require","default","_","hasWarnedMissingMaskedView","MaybeMaskedNavigationContainer","enabled","children","pointerEvents","MaskedNavigationContainer","stylesMap","maybeLogWarning","warn","animatedNavigationMaskStyle","get","style","animatedNavigationMaskContainerStyle","styles","navigationMaskedRoot","maskElement","navigationMaskElement","onLayout","navigationContainer","collapsable","create","flex","backgroundColor"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-container/layers/maybe-masked-navigation-container.tsx"],"mappings":";;AAAA,SAASA,IAAI,EAAEC,WAAW,QAAQ,OAAO;AACzC,SAASC,UAAU,EAAEC,IAAI,QAAwB,cAAc;AAC/D,OAAOC,QAAQ,IAAIC,gBAAgB,QAAQ,yBAAyB;AACpE,SACCC,kCAAkC,EAClCC,gCAAgC,EAChCC,SAAS,QACH,oBAAoB;AAC3B,SAASC,eAAe,QAAQ,kCAAkC;AAClE,SAASC,MAAM,QAAQ,uBAAuB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAQ/C,IAAIC,cAAc,GAAGV,IAAI;AAEzB,IAAI;EACHU,cAAc,GAAGC,OAAO,CAAC,uCAAuC,CAAC,CAACC,OAAO;AAC1E,CAAC,CAAC,OAAOC,CAAC,EAAE;EACX;AAAA;AAGD,IAAIC,0BAA0B,GAAG,KAAK;AAEtC,OAAO,MAAMC,8BAA8B,gBAAGlB,IAAI,CACjD,CAAC;EAAEmB,OAAO;EAAEC,QAAQ;EAAEC;AAAqB,CAAC,KAAK;EAChD,IAAI,CAACF,OAAO,IAAIN,cAAc,KAAKV,IAAI,EAAE;IACxC,OAAOiB,QAAQ;EAChB;EAEA,oBACCR,IAAA,CAACU,yBAAyB;IAACD,aAAa,EAAEA,aAAc;IAAAD,QAAA,EACtDA;EAAQ,CACiB,CAAC;AAE9B,CACD,CAAC;AAED,MAAME,yBAAyB,gBAAGtB,IAAI,CACrC,CAAC;EACAoB,QAAQ;EACRC;AAID,CAAC,KAAK;EACL,MAAM;IAAEE;EAAU,CAAC,GAAGd,eAAe,CAAC,CAAC;EAEvC,MAAMe,eAAe,GAAGvB,WAAW,CAAC,MAAM;IACzC,IAAIY,cAAc,KAAKV,IAAI,EAAE;IAC7B,IAAIc,0BAA0B,EAAE;IAEhCA,0BAA0B,GAAG,IAAI;IACjCP,MAAM,CAACe,IAAI,CACV,uHACD,CAAC;EACF,CAAC,EAAE,EAAE,CAAC;EAEN,MAAMC,2BAA2B,GAAGrB,gBAAgB,CAAC,MAAM;IAC1D,SAAS;;IACT,OACCkB,SAAS,CAACI,GAAG,CAAC,CAAC,CAACpB,gCAAgC,CAAC,EAAEqB,KAAK,IAAIpB,SAAS;EAEvE,CAAC,CAAC;EAEF,MAAMqB,oCAAoC,GAAGxB,gBAAgB,CAAC,MAAM;IACnE,SAAS;;IACT,OACCkB,SAAS,CAACI,GAAG,CAAC,CAAC,CAACrB,kCAAkC,CAAC,EAAEsB,KAAK,IAAIpB,SAAS;EAEzE,CAAC,CAAC;EAEF,oBACCI,IAAA,CAACC,cAAc;IACde,KAAK,EAAEE,MAAM,CAACC;IACd;IAAA;IACAC,WAAW,eACVpB,IAAA,CAACR,QAAQ,CAACD,IAAI;MACbyB,KAAK,EAAE,CAACE,MAAM,CAACG,qBAAqB,EAAEP,2BAA2B,CAAE;MACnEL,aAAa,EAAC;IAAM,CACpB,CACD;IACDA,aAAa,EAAEA,aAAc;IAC7Ba,QAAQ,EAAEV,eAAgB;IAAAJ,QAAA,eAE1BR,IAAA,CAACR,QAAQ,CAACD,IAAI;MACbyB,KAAK,EAAE,CACNE,MAAM,CAACK,mBAAmB,EAC1BN,oCAAoC,CACnC;MACFO,WAAW,EAAE,KAAM;MAAAhB,QAAA,EAElBA;IAAQ,CACK;EAAC,CACD,CAAC;AAEnB,CACD,CAAC;AAED,MAAMU,MAAM,GAAG5B,UAAU,CAACmC,MAAM,CAAC;EAChCN,oBAAoB,EAAE;IACrBO,IAAI,EAAE;EACP,CAAC;EACDH,mBAAmB,EAAE;IACpBG,IAAI,EAAE;EACP,CAAC;EACDL,qBAAqB,EAAE;IACtBM,eAAe,EAAE;EAClB;AACD,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["memo","useCallback","StyleSheet","View","Animated","NAVIGATION_MASK_CONTAINER_STYLE_ID","NAVIGATION_MASK_ELEMENT_STYLE_ID","useSlotStyles","logger","jsx","_jsx","LazyMaskedView","require","default","_","hasWarnedMissingMaskedView","MaybeMaskedNavigationContainer","enabled","children","pointerEvents","MaskedNavigationContainer","maybeLogWarning","warn","animatedNavigationMaskStyle","animatedNavigationMaskContainerStyle","style","styles","navigationMaskedRoot","maskElement","navigationMaskElement","onLayout","navigationContainer","collapsable","create","flex","backgroundColor"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-container/layers/maybe-masked-navigation-container.tsx"],"mappings":";;AAAA,SAASA,IAAI,EAAEC,WAAW,QAAQ,OAAO;AACzC,SAASC,UAAU,EAAEC,IAAI,QAAwB,cAAc;AAC/D,OAAOC,QAAQ,MAAM,yBAAyB;AAC9C,SACCC,kCAAkC,EAClCC,gCAAgC,QAC1B,oBAAoB;AAC3B,SAASC,aAAa,QAAQ,kCAAkC;AAChE,SAASC,MAAM,QAAQ,uBAAuB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAQ/C,IAAIC,cAAc,GAAGR,IAAI;AAEzB,IAAI;EACHQ,cAAc,GAAGC,OAAO,CAAC,uCAAuC,CAAC,CAACC,OAAO;AAC1E,CAAC,CAAC,OAAOC,CAAC,EAAE;EACX;AAAA;AAGD,IAAIC,0BAA0B,GAAG,KAAK;AAEtC,OAAO,MAAMC,8BAA8B,gBAAGhB,IAAI,CACjD,CAAC;EAAEiB,OAAO;EAAEC,QAAQ;EAAEC;AAAqB,CAAC,KAAK;EAChD,IAAI,CAACF,OAAO,IAAIN,cAAc,KAAKR,IAAI,EAAE;IACxC,OAAOe,QAAQ;EAChB;EAEA,oBACCR,IAAA,CAACU,yBAAyB;IAACD,aAAa,EAAEA,aAAc;IAAAD,QAAA,EACtDA;EAAQ,CACiB,CAAC;AAE9B,CACD,CAAC;AAED,MAAME,yBAAyB,gBAAGpB,IAAI,CACrC,CAAC;EACAkB,QAAQ;EACRC;AAID,CAAC,KAAK;EACL,MAAME,eAAe,GAAGpB,WAAW,CAAC,MAAM;IACzC,IAAIU,cAAc,KAAKR,IAAI,EAAE;IAC7B,IAAIY,0BAA0B,EAAE;IAEhCA,0BAA0B,GAAG,IAAI;IACjCP,MAAM,CAACc,IAAI,CACV,uHACD,CAAC;EACF,CAAC,EAAE,EAAE,CAAC;EAEN,MAAMC,2BAA2B,GAAGhB,aAAa,CAChDD,gCACD,CAAC;EACD,MAAMkB,oCAAoC,GAAGjB,aAAa,CACzDF,kCACD,CAAC;EAED,oBACCK,IAAA,CAACC,cAAc;IACdc,KAAK,EAAEC,MAAM,CAACC;IACd;IAAA;IACAC,WAAW,eACVlB,IAAA,CAACN,QAAQ,CAACD,IAAI;MACbsB,KAAK,EAAE,CAACC,MAAM,CAACG,qBAAqB,EAAEN,2BAA2B,CAAE;MACnEJ,aAAa,EAAC;IAAM,CACpB,CACD;IACDA,aAAa,EAAEA,aAAc;IAC7BW,QAAQ,EAAET,eAAgB;IAAAH,QAAA,eAE1BR,IAAA,CAACN,QAAQ,CAACD,IAAI;MACbsB,KAAK,EAAE,CACNC,MAAM,CAACK,mBAAmB,EAC1BP,oCAAoC,CACnC;MACFQ,WAAW,EAAE,KAAM;MAAAd,QAAA,EAElBA;IAAQ,CACK;EAAC,CACD,CAAC;AAEnB,CACD,CAAC;AAED,MAAMQ,MAAM,GAAGxB,UAAU,CAAC+B,MAAM,CAAC;EAChCN,oBAAoB,EAAE;IACrBO,IAAI,EAAE;EACP,CAAC;EACDH,mBAAmB,EAAE;IACpBG,IAAI,EAAE;EACP,CAAC;EACDL,qBAAqB,EAAE;IACtBM,eAAe,EAAE;EAClB;AACD,CAAC,CAAC","ignoreList":[]}

package/lib/module/shared/components/screen-container/layers/surface-container.js

@@ -2,10 +2,9 @@
 
 import { memo, useMemo } from "react";
 import { StyleSheet } from "react-native";
-import Animated, { useAnimatedProps, useAnimatedStyle } from "react-native-reanimated";
-import { NO_PROPS, NO_STYLES } from "../../../constants";
+import Animated from "react-native-reanimated";
 import { useDescriptors } from "../../../providers/screen/descriptors";
-import { useScreenStyles } from "../../../providers/screen/styles";
+import { useSlotProps, useSlotStyles } from "../../../providers/screen/styles";
 import { jsx as _jsx } from "react/jsx-runtime";
 export const SurfaceContainer = /*#__PURE__*/memo(({
   children,
@@ -30,19 +29,8 @@ const AnimatedSurface = /*#__PURE__*/memo(({
   pointerEvents,
   SurfaceComponent
 }) => {
-  const {
-    stylesMap
-  } = useScreenStyles();
-  const animatedSurfaceStyle = useAnimatedStyle(() => {
-    "worklet";
-
-    return stylesMap.get().surface?.style ?? NO_STYLES;
-  });
-  const animatedSurfaceProps = useAnimatedProps(() => {
-    "worklet";
-
-    return stylesMap.get().surface?.props ?? NO_PROPS;
-  });
+  const animatedSurfaceStyle = useSlotStyles("surface");
+  const animatedSurfaceProps = useSlotProps("surface");
   return /*#__PURE__*/_jsx(SurfaceComponent, {
     style: [styles.surface, animatedSurfaceStyle],
     animatedProps: animatedSurfaceProps,

package/lib/module/shared/components/screen-container/layers/surface-container.js.map

@@ -1 +1 @@
-{"version":3,"names":["memo","useMemo","StyleSheet","Animated","useAnimatedProps","useAnimatedStyle","NO_PROPS","NO_STYLES","useDescriptors","useScreenStyles","jsx","_jsx","SurfaceContainer","children","pointerEvents","current","SurfaceComponent","options","surfaceComponent","AnimatedSurfaceComponent","createAnimatedComponent","AnimatedSurface","stylesMap","animatedSurfaceStyle","get","surface","style","animatedSurfaceProps","props","styles","animatedProps","create","flex"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-container/layers/surface-container.tsx"],"mappings":";;AAAA,SAA6BA,IAAI,EAAEC,OAAO,QAAQ,OAAO;AACzD,SAASC,UAAU,QAAwB,cAAc;AACzD,OAAOC,QAAQ,IACdC,gBAAgB,EAChBC,gBAAgB,QACV,yBAAyB;AAChC,SAASC,QAAQ,EAAEC,SAAS,QAAQ,oBAAoB;AACxD,SAASC,cAAc,QAAQ,uCAAuC;AACtE,SAASC,eAAe,QAAQ,kCAAkC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAOnE,OAAO,MAAMC,gBAAgB,gBAAGZ,IAAI,CAAC,CAAC;EAAEa,QAAQ;EAAEC;AAAqB,CAAC,KAAK;EAC5E,MAAM;IAAEC;EAAQ,CAAC,GAAGP,cAAc,CAAC,CAAC;EAEpC,MAAMQ,gBAAgB,GAAGD,OAAO,CAACE,OAAO,CAACC,gBAAgB;EAEzD,MAAMC,wBAAwB,GAAGlB,OAAO,CAA4B,MAAM;IACzE,OAAOe,gBAAgB,GACpBb,QAAQ,CAACiB,uBAAuB,CAACJ,gBAAgB,CAAC,GAClD,IAAI;EACR,CAAC,EAAE,CAACA,gBAAgB,CAAC,CAAC;EAEtB,IAAI,CAACG,wBAAwB,EAAE,OAAON,QAAQ;EAE9C,oBACCF,IAAA,CAACU,eAAe;IACfL,gBAAgB,EAAEG,wBAAyB;IAC3CL,aAAa,EAAEA,aAAc;IAAAD,QAAA,EAE5BA;EAAQ,CACO,CAAC;AAEpB,CAAC,CAAC;AAQF,MAAMQ,eAAe,gBAAGrB,IAAI,CAC3B,CAAC;EAAEa,QAAQ;EAAEC,aAAa;EAAEE;AAAuC,CAAC,KAAK;EACxE,MAAM;IAAEM;EAAU,CAAC,GAAGb,eAAe,CAAC,CAAC;EAEvC,MAAMc,oBAAoB,GAAGlB,gBAAgB,CAAC,MAAM;IACnD,SAAS;;IACT,OAAOiB,SAAS,CAACE,GAAG,CAAC,CAAC,CAACC,OAAO,EAAEC,KAAK,IAAInB,SAAS;EACnD,CAAC,CAAC;EAEF,MAAMoB,oBAAoB,GAAGvB,gBAAgB,CAAC,MAAM;IACnD,SAAS;;IACT,OAAOkB,SAAS,CAACE,GAAG,CAAC,CAAC,CAACC,OAAO,EAAEG,KAAK,IAAItB,QAAQ;EAClD,CAAC,CAAC;EAEF,oBACCK,IAAA,CAACK,gBAAgB;IAChBU,KAAK,EAAE,CAACG,MAAM,CAACJ,OAAO,EAAEF,oBAAoB,CAAE;IAC9CO,aAAa,EAAEH,oBAAqB;IACpCb,aAAa,EAAEA,aAAc;IAAAD,QAAA,EAE5BA;EAAQ,CACQ,CAAC;AAErB,CACD,CAAC;AAED,MAAMgB,MAAM,GAAG3B,UAAU,CAAC6B,MAAM,CAAC;EAChCN,OAAO,EAAE;IACRO,IAAI,EAAE;EACP;AACD,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["memo","useMemo","StyleSheet","Animated","useDescriptors","useSlotProps","useSlotStyles","jsx","_jsx","SurfaceContainer","children","pointerEvents","current","SurfaceComponent","options","surfaceComponent","AnimatedSurfaceComponent","createAnimatedComponent","AnimatedSurface","animatedSurfaceStyle","animatedSurfaceProps","style","styles","surface","animatedProps","create","flex"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-container/layers/surface-container.tsx"],"mappings":";;AAAA,SAA6BA,IAAI,EAAEC,OAAO,QAAQ,OAAO;AACzD,SAASC,UAAU,QAAwB,cAAc;AACzD,OAAOC,QAAQ,MAAM,yBAAyB;AAC9C,SAASC,cAAc,QAAQ,uCAAuC;AACtE,SAASC,YAAY,EAAEC,aAAa,QAAQ,kCAAkC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAO/E,OAAO,MAAMC,gBAAgB,gBAAGT,IAAI,CAAC,CAAC;EAAEU,QAAQ;EAAEC;AAAqB,CAAC,KAAK;EAC5E,MAAM;IAAEC;EAAQ,CAAC,GAAGR,cAAc,CAAC,CAAC;EAEpC,MAAMS,gBAAgB,GAAGD,OAAO,CAACE,OAAO,CAACC,gBAAgB;EAEzD,MAAMC,wBAAwB,GAAGf,OAAO,CAA4B,MAAM;IACzE,OAAOY,gBAAgB,GACpBV,QAAQ,CAACc,uBAAuB,CAACJ,gBAAgB,CAAC,GAClD,IAAI;EACR,CAAC,EAAE,CAACA,gBAAgB,CAAC,CAAC;EAEtB,IAAI,CAACG,wBAAwB,EAAE,OAAON,QAAQ;EAE9C,oBACCF,IAAA,CAACU,eAAe;IACfL,gBAAgB,EAAEG,wBAAyB;IAC3CL,aAAa,EAAEA,aAAc;IAAAD,QAAA,EAE5BA;EAAQ,CACO,CAAC;AAEpB,CAAC,CAAC;AAQF,MAAMQ,eAAe,gBAAGlB,IAAI,CAC3B,CAAC;EAAEU,QAAQ;EAAEC,aAAa;EAAEE;AAAuC,CAAC,KAAK;EACxE,MAAMM,oBAAoB,GAAGb,aAAa,CAAC,SAAS,CAAC;EACrD,MAAMc,oBAAoB,GAAGf,YAAY,CAAC,SAAS,CAAC;EAEpD,oBACCG,IAAA,CAACK,gBAAgB;IAChBQ,KAAK,EAAE,CAACC,MAAM,CAACC,OAAO,EAAEJ,oBAAoB,CAAE;IAC9CK,aAAa,EAAEJ,oBAAqB;IACpCT,aAAa,EAAEA,aAAc;IAAAD,QAAA,EAE5BA;EAAQ,CACQ,CAAC;AAErB,CACD,CAAC;AAED,MAAMY,MAAM,GAAGpB,UAAU,CAACuB,MAAM,CAAC;EAChCF,OAAO,EAAE;IACRG,IAAI,EAAE;EACP;AACD,CAAC,CAAC","ignoreList":[]}

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

@@ -1,7 +1,10 @@
 "use strict";
 
-import { createContext, useCallback, useContext, useLayoutEffect, useRef, useSyncExternalStore } from "react";
-import { jsx as _jsx } from "react/jsx-runtime";
+import { createContext, useCallback, useContext, useLayoutEffect, useMemo, useRef, useSyncExternalStore } from "react";
+import { useDerivedValue } from "react-native-reanimated";
+import { syncStackProgressValues } from "../../providers/screen/animation/helpers/stack-progress";
+import { AnimationStore } from "../../stores/animation.store";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const createStackStore = initialSnapshot => {
   let snapshot = initialSnapshot;
   const listeners = new Set();
@@ -29,6 +32,16 @@ const createStackStore = initialSnapshot => {
 };
 const StackContext = /*#__PURE__*/createContext(null);
 StackContext.displayName = "Stack";
+function StackProgressOwner({
+  routeKeys
+}) {
+  const visualProgressValues = useMemo(() => routeKeys.map(routeKey => AnimationStore.getValue(routeKey, "visualProgress")), [routeKeys]);
+  const stackProgressValues = useMemo(() => routeKeys.map(routeKey => AnimationStore.getValue(routeKey, "stackProgress")), [routeKeys]);
+  useDerivedValue(() => {
+    syncStackProgressValues(visualProgressValues, stackProgressValues);
+  });
+  return null;
+}
 export function StackProvider({
   children,
   value
@@ -48,9 +61,11 @@ export function StackProvider({
     pendingNotifyRef.current = false;
     store.notify();
   });
-  return /*#__PURE__*/_jsx(StackContext.Provider, {
+  return /*#__PURE__*/_jsxs(StackContext.Provider, {
     value: store,
-    children: children
+    children: [/*#__PURE__*/_jsx(StackProgressOwner, {
+      routeKeys: value.routeKeys
+    }), children]
   });
 }
 function useStackStore() {

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

@@ -1 +1 @@
-{"version":3,"names":["createContext","useCallback","useContext","useLayoutEffect","useRef","useSyncExternalStore","jsx","_jsx","createStackStore","initialSnapshot","snapshot","listeners","Set","getSnapshot","notify","listener","setSnapshot","nextSnapshot","Object","is","subscribe","add","delete","StackContext","displayName","StackProvider","children","value","storeRef","pendingNotifyRef","store","current","Provider","useStackStore","Error","useStack","selector","selectorRef","stack","getSelectedSnapshot"],"sourceRoot":"../../../../../src","sources":["shared/hooks/navigation/use-stack.tsx"],"mappings":";;AACA,SACCA,aAAa,EAEbC,WAAW,EACXC,UAAU,EACVC,eAAe,EACfC,MAAM,EACNC,oBAAoB,QACd,OAAO;AAAC,SAAAC,GAAA,IAAAC,IAAA;AA+Cf,MAAMC,gBAAgB,GACrBC,eAAkC,IACR;EAC1B,IAAIC,QAAQ,GAAGD,eAAe;EAC9B,MAAME,SAAS,GAAG,IAAIC,GAAG,CAAa,CAAC;EAEvC,OAAO;IACNC,WAAW,EAAEA,CAAA,KAAMH,QAAQ;IAC3BI,MAAM,EAAEA,CAAA,KAAM;MACb,KAAK,MAAMC,QAAQ,IAAIJ,SAAS,EAAE;QACjCI,QAAQ,CAAC,CAAC;MACX;IACD,CAAC;IACDC,WAAW,EAAGC,YAAY,IAAK;MAC9B,IAAIC,MAAM,CAACC,EAAE,CAACT,QAAQ,EAAEO,YAAY,CAAC,EAAE;QACtC,OAAO,KAAK;MACb;MAEAP,QAAQ,GAAGO,YAAY;MACvB,OAAO,IAAI;IACZ,CAAC;IACDG,SAAS,EAAGL,QAAQ,IAAK;MACxBJ,SAAS,CAACU,GAAG,CAACN,QAAQ,CAAC;MACvB,OAAO,MAAM;QACZJ,SAAS,CAACW,MAAM,CAACP,QAAQ,CAAC;MAC3B,CAAC;IACF;EACD,CAAC;AACF,CAAC;AAED,MAAMQ,YAAY,gBAAGvB,aAAa,CAAuB,IAAI,CAAC;AAC9DuB,YAAY,CAACC,WAAW,GAAG,OAAO;AAElC,OAAO,SAASC,aAAaA,CAAC;EAC7BC,QAAQ;EACRC;AAID,CAAC,EAAE;EACF,MAAMC,QAAQ,GAAGxB,MAAM,CAA8B,IAAI,CAAC;EAC1D,MAAMyB,gBAAgB,GAAGzB,MAAM,CAAC,KAAK,CAAC;EAEtC,IAAI0B,KAAK,GAAGF,QAAQ,CAACG,OAAO;EAC5B,IAAI,CAACD,KAAK,EAAE;IACXA,KAAK,GAAGtB,gBAAgB,CAACmB,KAAK,CAAC;IAC/BC,QAAQ,CAACG,OAAO,GAAGD,KAAK;EACzB;EAEAD,gBAAgB,CAACE,OAAO,GACvBD,KAAK,CAACd,WAAW,CAACW,KAAK,CAAC,IAAIE,gBAAgB,CAACE,OAAO;EAErD5B,eAAe,CAAC,MAAM;IACrB,IAAI,CAAC0B,gBAAgB,CAACE,OAAO,EAAE;MAC9B;IACD;IAEAF,gBAAgB,CAACE,OAAO,GAAG,KAAK;IAChCD,KAAK,CAAChB,MAAM,CAAC,CAAC;EACf,CAAC,CAAC;EAEF,oBACCP,IAAA,CAACgB,YAAY,CAACS,QAAQ;IAACL,KAAK,EAAEG,KAAM;IAAAJ,QAAA,EAAEA;EAAQ,CAAwB,CAAC;AAEzE;AAEA,SAASO,aAAaA,CAAA,EAAkB;EACvC,MAAMH,KAAK,GAAG5B,UAAU,CAACqB,YAAY,CAAC;EAEtC,IAAIO,KAAK,KAAK,IAAI,EAAE;IACnB,MAAM,IAAII,KAAK,CAAC,+CAA+C,CAAC;EACjE;EAEA,OAAOJ,KAAK;AACb;AAIA,OAAO,SAASK,QAAQA,CACvBC,QAA2B,EACH;EACxB,MAAMN,KAAK,GAAGG,aAAa,CAAC,CAAC;EAC7B,MAAMI,WAAW,GAAGjC,MAAM,CACzBgC,QAAQ,KAAME,KAAK,IAAKA,KAAK,CAC9B,CAAC;EACDD,WAAW,CAACN,OAAO,GAAGK,QAAQ,KAAME,KAAK,IAAKA,KAAK,CAAC;EAEpD,MAAMC,mBAAmB,GAAGtC,WAAW,CACtC,MAAMoC,WAAW,CAACN,OAAO,CAACD,KAAK,CAACjB,WAAW,CAAC,CAAC,CAAC,EAC9C,CAACiB,KAAK,CACP,CAAC;EAED,OAAOzB,oBAAoB,CAC1ByB,KAAK,CAACV,SAAS,EACfmB,mBAAmB,EACnBA,mBACD,CAAC;AACF","ignoreList":[]}
+{"version":3,"names":["createContext","useCallback","useContext","useLayoutEffect","useMemo","useRef","useSyncExternalStore","useDerivedValue","syncStackProgressValues","AnimationStore","jsx","_jsx","jsxs","_jsxs","createStackStore","initialSnapshot","snapshot","listeners","Set","getSnapshot","notify","listener","setSnapshot","nextSnapshot","Object","is","subscribe","add","delete","StackContext","displayName","StackProgressOwner","routeKeys","visualProgressValues","map","routeKey","getValue","stackProgressValues","StackProvider","children","value","storeRef","pendingNotifyRef","store","current","Provider","useStackStore","Error","useStack","selector","selectorRef","stack","getSelectedSnapshot"],"sourceRoot":"../../../../../src","sources":["shared/hooks/navigation/use-stack.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/providers/screen/animation/helpers/pipeline.js

@@ -4,28 +4,110 @@ import { useMemo } from "react";
 import { useWindowDimensions } from "react-native";
 import { useDerivedValue, useSharedValue } from "react-native-reanimated";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { DEFAULT_SCREEN_TRANSITION_STATE } from "../../../../constants";
+import { createScreenTransitionState, DEFAULT_SCREEN_TRANSITION_STATE } from "../../../../constants";
 import { useStack } from "../../../../hooks/navigation/use-stack";
-import { AnimationStore } from "../../../../stores/animation.store";
 import { useDescriptors } from "../../descriptors";
+import { buildScreenTransitionOptions } from "./build-screen-transition-options";
 import { updateDerivations } from "./derivations";
 import { hasTransitionsEnabled } from "./has-transitions-enabled";
 import { hydrateTransitionState } from "./hydrate-transition-state";
-import { deriveStackProgress } from "./stack-progress";
+import { resolveStackProgress } from "./stack-progress";
 import { useBuildTransitionState } from "./use-build-transition-state";
-const createInitialBaseInterpolatorProps = (dimensions, insets) => {
-  const current = {
-    ...DEFAULT_SCREEN_TRANSITION_STATE,
-    layouts: {
-      screen: dimensions
-    }
-  };
-  return {
+import { toPlainRoute, toPlainValue } from "./worklet";
+const getInitialSettledProgress = descriptor => {
+  const {
+    snapPoints,
+    initialSnapIndex = 0
+  } = descriptor.options;
+  if (!snapPoints?.length) {
+    return 1;
+  }
+  const clampedIndex = Math.min(Math.max(0, initialSnapIndex), snapPoints.length - 1);
+  const snapPoint = snapPoints[clampedIndex];
+  return typeof snapPoint === "number" ? snapPoint : 0;
+};
+const applyInitialProgress = ({
+  state,
+  dimensions,
+  progress,
+  entering = 0,
+  closing = 0,
+  animating = 0,
+  willAnimate = 0,
+  settled = entering || closing || animating ? 0 : 1
+}) => {
+  state.progress = progress;
+  state.transitionProgress = progress;
+  state.entering = entering;
+  state.closing = closing;
+  state.animating = animating;
+  state.willAnimate = willAnimate;
+  state.settled = settled;
+  state.logicallySettled = settled;
+  state.layouts.screen = dimensions;
+  return state;
+};
+const createInitialTransitionState = ({
+  descriptor,
+  dimensions,
+  progress,
+  entering,
+  animating,
+  willAnimate,
+  settled
+}) => {
+  const meta = descriptor.options.meta ? toPlainValue(descriptor.options.meta) : undefined;
+  const state = createScreenTransitionState(toPlainRoute(descriptor.route), meta, buildScreenTransitionOptions(descriptor.options));
+  return applyInitialProgress({
+    state,
+    dimensions,
+    progress,
+    entering,
+    animating,
+    willAnimate,
+    settled
+  });
+};
+const createInitialInterpolatorProps = ({
+  dimensions,
+  insets,
+  currentDescriptor,
+  nextDescriptor,
+  prevDescriptor
+}) => {
+  const hasIncomingNext = !!nextDescriptor;
+  const isFocusedEntering = !!prevDescriptor && !nextDescriptor;
+  const shouldAnimateInitialMount = !prevDescriptor && !nextDescriptor && !!currentDescriptor.options.experimental_animateOnInitialMount;
+  const currentProgress = hasIncomingNext || !isFocusedEntering && !shouldAnimateInitialMount ? getInitialSettledProgress(currentDescriptor) : 0;
+  const currentEntering = isFocusedEntering || shouldAnimateInitialMount ? 1 : 0;
+  const current = createInitialTransitionState({
+    descriptor: currentDescriptor,
+    dimensions,
+    progress: currentProgress,
+    entering: currentEntering,
+    animating: currentEntering,
+    willAnimate: currentEntering
+  });
+  const previous = prevDescriptor ? createInitialTransitionState({
+    descriptor: prevDescriptor,
+    dimensions,
+    progress: getInitialSettledProgress(prevDescriptor)
+  }) : undefined;
+  const next = nextDescriptor ? createInitialTransitionState({
+    descriptor: nextDescriptor,
+    dimensions,
+    progress: 0,
+    entering: 1,
+    animating: 1,
+    willAnimate: 1,
+    settled: 0
+  }) : undefined;
+  const frame = {
     layouts: current.layouts,
     insets,
-    previous: undefined,
+    previous,
     current,
-    next: undefined,
+    next,
     progress: 0,
     stackProgress: 0,
     logicallySettled: 1,
@@ -33,15 +115,41 @@ const createInitialBaseInterpolatorProps = (dimensions, insets) => {
     active: current,
     inactive: undefined
   };
+  updateDerivations(frame);
+  frame.stackProgress = frame.progress;
+  frame.logicallySettled = frame.active.settled;
+  return frame;
+};
+const hydrateInterpolatorFrame = ({
+  frame,
+  dimensions,
+  insets,
+  currentAnimation,
+  nextAnimation,
+  prevAnimation,
+  nextHasTransitions,
+  interpolatorOptions
+}) => {
+  "worklet";
+
+  const shouldApplyOptionsToCurrent = interpolatorOptions.owner === "current";
+  const shouldApplyOptionsToNext = interpolatorOptions.owner === "next" && !!nextAnimation && nextHasTransitions;
+  const previousCurrentProgress = currentAnimation?.visualProgress.get();
+  const previousNextProgress = nextAnimation && nextHasTransitions ? nextAnimation.visualProgress.get() : undefined;
+  frame.previous = prevAnimation ? hydrateTransitionState(prevAnimation, dimensions) : undefined;
+  frame.current = currentAnimation ? hydrateTransitionState(currentAnimation, dimensions, shouldApplyOptionsToCurrent ? interpolatorOptions.options : undefined) : DEFAULT_SCREEN_TRANSITION_STATE;
+  frame.next = nextAnimation && nextHasTransitions ? hydrateTransitionState(nextAnimation, dimensions, shouldApplyOptionsToNext ? interpolatorOptions.options : undefined) : undefined;
+  frame.layouts = frame.current.layouts;
+  frame.insets = insets;
+  updateDerivations(frame);
+  frame.stackProgress = resolveStackProgress(currentAnimation?.stackProgress, frame.progress, frame.current.progress, previousCurrentProgress, frame.next?.progress, previousNextProgress);
+  frame.logicallySettled = frame.active.settled;
+  return frame;
 };
 export function useScreenAnimationPipeline() {
-  const {
-    flags,
-    routeKeys
-  } = useStack();
+  const transitionsAlwaysOn = useStack(stack => stack.flags.TRANSITIONS_ALWAYS_ON);
   const dimensions = useWindowDimensions();
   const insets = useSafeAreaInsets();
-  const transitionsAlwaysOn = flags.TRANSITIONS_ALWAYS_ON;
   const {
     current: currDescriptor,
     next: nextDescriptor,
@@ -50,14 +158,16 @@ export function useScreenAnimationPipeline() {
   const currentAnimation = useBuildTransitionState(currDescriptor);
   const nextAnimation = useBuildTransitionState(nextDescriptor);
   const prevAnimation = useBuildTransitionState(prevDescriptor);
-  const currentRouteKey = currDescriptor?.route?.key;
-  const currentIndex = routeKeys.indexOf(currentRouteKey);
-  const visualProgressValues = useMemo(() => {
-    return routeKeys.map(routeKey => AnimationStore.getValue(routeKey, "visualProgress"));
-  }, [routeKeys]);
   const nextRouteKey = nextDescriptor?.route?.key;
   const nextHasTransitions = !!nextRouteKey && hasTransitionsEnabled(nextDescriptor?.options, transitionsAlwaysOn);
-  const screenInterpolatorProps = useSharedValue(createInitialBaseInterpolatorProps(dimensions, insets));
+  const initialInterpolatorProps = useMemo(() => createInitialInterpolatorProps({
+    dimensions,
+    insets,
+    currentDescriptor: currDescriptor,
+    nextDescriptor,
+    prevDescriptor
+  }), [dimensions, insets, currDescriptor, nextDescriptor, prevDescriptor]);
+  const screenInterpolatorProps = useSharedValue(initialInterpolatorProps);
   const selectedInterpolatorOptions = useSharedValue({
     owner: "current"
   });
@@ -71,17 +181,16 @@ export function useScreenAnimationPipeline() {
       "worklet";
 
       const interpolatorOptions = selectedInterpolatorOptions.get();
-      const shouldApplyOptionsToCurrent = interpolatorOptions.owner === "current";
-      const shouldApplyOptionsToNext = interpolatorOptions.owner === "next" && !!nextAnimation && nextHasTransitions;
-      frame.previous = prevAnimation ? hydrateTransitionState(prevAnimation, dimensions) : undefined;
-      frame.current = currentAnimation ? hydrateTransitionState(currentAnimation, dimensions, shouldApplyOptionsToCurrent ? interpolatorOptions.options : undefined) : DEFAULT_SCREEN_TRANSITION_STATE;
-      frame.next = nextAnimation && nextHasTransitions ? hydrateTransitionState(nextAnimation, dimensions, shouldApplyOptionsToNext ? interpolatorOptions.options : undefined) : undefined;
-      frame.layouts = frame.current.layouts;
-      frame.insets = insets;
-      updateDerivations(frame);
-      frame.stackProgress = deriveStackProgress(routeKeys, visualProgressValues, currentIndex, frame.progress, currentRouteKey, frame.current.progress, nextRouteKey, frame.next?.progress);
-      frame.logicallySettled = frame.active.settled;
-      return frame;
+      return hydrateInterpolatorFrame({
+        frame,
+        dimensions,
+        insets,
+        currentAnimation,
+        nextAnimation,
+        prevAnimation,
+        nextHasTransitions,
+        interpolatorOptions
+      });
     }, false);
 
     // Critical reactive dependency for `screenInterpolatorProps`.

package/lib/module/shared/providers/screen/animation/helpers/pipeline.js.map

@@ -1 +1 @@
-{"version":3,"names":["useMemo","useWindowDimensions","useDerivedValue","useSharedValue","useSafeAreaInsets","DEFAULT_SCREEN_TRANSITION_STATE","useStack","AnimationStore","useDescriptors","updateDerivations","hasTransitionsEnabled","hydrateTransitionState","deriveStackProgress","useBuildTransitionState","createInitialBaseInterpolatorProps","dimensions","insets","current","layouts","screen","previous","undefined","next","progress","stackProgress","logicallySettled","focused","active","inactive","useScreenAnimationPipeline","flags","routeKeys","transitionsAlwaysOn","TRANSITIONS_ALWAYS_ON","currDescriptor","nextDescriptor","prevDescriptor","currentAnimation","nextAnimation","prevAnimation","currentRouteKey","route","key","currentIndex","indexOf","visualProgressValues","map","routeKey","getValue","nextRouteKey","nextHasTransitions","options","screenInterpolatorProps","selectedInterpolatorOptions","owner","propsRevisionState","value","screenInterpolatorPropsRevision","modify","frame","interpolatorOptions","get","shouldApplyOptionsToCurrent","shouldApplyOptionsToNext","settled","revision","nextInterpolator","screenStyleInterpolator","currentInterpolator"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/animation/helpers/pipeline.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useMemo","useWindowDimensions","useDerivedValue","useSharedValue","useSafeAreaInsets","createScreenTransitionState","DEFAULT_SCREEN_TRANSITION_STATE","useStack","useDescriptors","buildScreenTransitionOptions","updateDerivations","hasTransitionsEnabled","hydrateTransitionState","resolveStackProgress","useBuildTransitionState","toPlainRoute","toPlainValue","getInitialSettledProgress","descriptor","snapPoints","initialSnapIndex","options","length","clampedIndex","Math","min","max","snapPoint","applyInitialProgress","state","dimensions","progress","entering","closing","animating","willAnimate","settled","transitionProgress","logicallySettled","layouts","screen","createInitialTransitionState","meta","undefined","route","createInitialInterpolatorProps","insets","currentDescriptor","nextDescriptor","prevDescriptor","hasIncomingNext","isFocusedEntering","shouldAnimateInitialMount","experimental_animateOnInitialMount","currentProgress","currentEntering","current","previous","next","frame","stackProgress","focused","active","inactive","hydrateInterpolatorFrame","currentAnimation","nextAnimation","prevAnimation","nextHasTransitions","interpolatorOptions","shouldApplyOptionsToCurrent","owner","shouldApplyOptionsToNext","previousCurrentProgress","visualProgress","get","previousNextProgress","useScreenAnimationPipeline","transitionsAlwaysOn","stack","flags","TRANSITIONS_ALWAYS_ON","currDescriptor","nextRouteKey","key","initialInterpolatorProps","screenInterpolatorProps","selectedInterpolatorOptions","propsRevisionState","value","screenInterpolatorPropsRevision","modify","revision","nextInterpolator","screenStyleInterpolator","currentInterpolator"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/animation/helpers/pipeline.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/providers/screen/animation/helpers/stack-progress.js

@@ -1,20 +1,30 @@
 "use strict";
 
-export const deriveStackProgress = (routeKeys, visualProgressValues, currentIndex, fallbackProgress, currentRouteKey, currentProgress, nextRouteKey, nextProgress) => {
+export const syncStackProgressValues = (visualProgressValues, stackProgressValues) => {
   "worklet";
 
-  if (currentIndex < 0) return fallbackProgress;
   let total = 0;
-  for (let i = currentIndex; i < visualProgressValues.length; i++) {
-    const routeKey = routeKeys[i];
-    if (routeKey === currentRouteKey) {
-      total += currentProgress;
-    } else if (routeKey === nextRouteKey && nextProgress !== undefined) {
-      total += nextProgress;
-    } else {
-      total += visualProgressValues[i].get();
+  for (let i = visualProgressValues.length - 1; i >= 0; i--) {
+    total += visualProgressValues[i]?.get() ?? 0;
+    const stackProgress = stackProgressValues[i];
+    if (stackProgress && stackProgress.get() !== total) {
+      stackProgress.set(total);
     }
   }
+};
+export const resolveStackProgress = (stackProgress, fallbackProgress, currentProgress, previousCurrentProgress, nextProgress, previousNextProgress) => {
+  "worklet";
+
+  if (!stackProgress) {
+    return fallbackProgress;
+  }
+  let total = stackProgress.get();
+  if (previousCurrentProgress !== undefined) {
+    total += currentProgress - previousCurrentProgress;
+  }
+  if (nextProgress !== undefined && previousNextProgress !== undefined) {
+    total += nextProgress - previousNextProgress;
+  }
   return total;
 };
 //# sourceMappingURL=stack-progress.js.map