npm - react-native-screen-transitions - Versions diffs - 4.1.0-beta.1 → 4.1.0-rc.0 - Mend

react-native-screen-transitions 4.1.0-beta.1 → 4.1.0-rc.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (1848) hide show

package/lib/typescript/providers/orchestrator/styles/helpers/resolve-slot-styles/are-resettable-states-equal.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"are-resettable-states-equal.d.ts","sourceRoot":"","sources":["../../../../../../../src/providers/orchestrator/styles/helpers/resolve-slot-styles/are-resettable-states-equal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,SAAS,CAAC;AAmD3D,eAAO,MAAM,8BAA8B,GAC1C,MAAM,2BAA2B,EACjC,OAAO,2BAA2B,YAoBlC,CAAC"}

package/lib/typescript/providers/orchestrator/styles/helpers/resolve-slot-styles/index.d.ts ADDED Viewed

@@ -0,0 +1,24 @@
+import type { NormalizedTransitionInterpolatedStyle } from "../../../../../types/animation.types";
+import type { LocalStyleLayers, ResettableStyleStatesBySlot } from "./types";
+export { areResettableStatesBySlotEqual } from "./are-resettable-states-equal";
+export type { LocalStyleLayers, ResettableStyleStatesBySlot } from "./types";
+export declare const reuseEqualResolvedSlots: ({ resolvedStylesMap, previousResolvedStylesMap, }: {
+    resolvedStylesMap: NormalizedTransitionInterpolatedStyle;
+    previousResolvedStylesMap: NormalizedTransitionInterpolatedStyle;
+}) => NormalizedTransitionInterpolatedStyle;
+/**
+ * Resolves slot styles for the current screen pass.
+ *
+ * Custom slots reset omitted keys immediately. Reserved screen slots retain
+ * omitted keys because lifecycle progress does not define a safe visual reset
+ * boundary.
+ */
+export declare const resolveSlotStyles: ({ localStylesMaps, ancestorStylesMap, previousStyleStatesBySlot, }: {
+    localStylesMaps: LocalStyleLayers;
+    ancestorStylesMap: NormalizedTransitionInterpolatedStyle;
+    previousStyleStatesBySlot: ResettableStyleStatesBySlot;
+}) => {
+    resolvedStylesMap: NormalizedTransitionInterpolatedStyle;
+    nextPreviousStyleStatesBySlot: ResettableStyleStatesBySlot;
+};
+//# sourceMappingURL=index.d.ts.map

package/lib/typescript/providers/orchestrator/styles/helpers/resolve-slot-styles/index.d.ts.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../src/providers/orchestrator/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,OAAO,EAAE,8BAA8B,EAAE,MAAM,+BAA+B,CAAC;AAC/E,YAAY,EAAE,gBAAgB,EAAE,2BAA2B,EAAE,MAAM,SAAS,CAAC;AA2Z7E,eAAO,MAAM,uBAAuB,GAAI,mDAGrC;IACF,iBAAiB,EAAE,qCAAqC,CAAC;IACzD,yBAAyB,EAAE,qCAAqC,CAAC;CACjE,KAAG,qCA0BH,CAAC;AA+EF;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,GAAI,oEAI/B;IACF,eAAe,EAAE,gBAAgB,CAAC;IAClC,iBAAiB,EAAE,qCAAqC,CAAC;IACzD,yBAAyB,EAAE,2BAA2B,CAAC;CACvD;;;CAoBA,CAAC"}

package/lib/typescript/providers/orchestrator/styles/helpers/resolve-slot-styles/materialize-slot.d.ts ADDED Viewed

@@ -0,0 +1,15 @@
+import type { NormalizedTransitionSlotStyle } from "../../../../../types/animation.types";
+import type { ResettableStyleState } from "./types";
+export declare const materializeResolvedSlot: ({ baseStyle, baseProps, boundsLocalTransform, previousState, styleKeys, propKeys, hasAnyStyleKeys, hasAnyPropKeys, hasStyleResetPatch, hasPropResetPatch, }: {
+    baseStyle: Record<string, unknown> | undefined;
+    baseProps: Record<string, unknown> | undefined;
+    boundsLocalTransform: NormalizedTransitionSlotStyle["boundsLocalTransform"];
+    previousState: ResettableStyleState | undefined;
+    styleKeys: Record<string, true> | undefined;
+    propKeys: Record<string, true> | undefined;
+    hasAnyStyleKeys: boolean;
+    hasAnyPropKeys: boolean;
+    hasStyleResetPatch: boolean;
+    hasPropResetPatch: boolean;
+}) => NormalizedTransitionSlotStyle | undefined;
+//# sourceMappingURL=materialize-slot.d.ts.map

package/lib/typescript/providers/orchestrator/styles/helpers/resolve-slot-styles/materialize-slot.d.ts.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"materialize-slot.d.ts","sourceRoot":"","sources":["../../../../../../../src/providers/orchestrator/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,6JAWrC;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,oBAAoB,EAAE,6BAA6B,CAAC,sBAAsB,CAAC,CAAC;IAC5E,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/providers/orchestrator/styles/helpers/resolve-slot-styles/reset-values.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"reset-values.d.ts","sourceRoot":"","sources":["../../../../../../../src/providers/orchestrator/styles/helpers/resolve-slot-styles/reset-values.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,kBAAkB,GAAI,KAAK,MAAM,EAAE,QAAQ,OAAO,0BAS9D,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,KAAK,MAAM,EAAE,QAAQ,OAAO,0BAS7D,CAAC"}

package/lib/typescript/providers/orchestrator/styles/helpers/resolve-slot-styles/slot-state.d.ts ADDED Viewed

@@ -0,0 +1,13 @@
+import type { NormalizedTransitionSlotStyle } from "../../../../../types/animation.types";
+import type { ResettableStyleState } from "./types";
+export declare const getResolvedSlotState: (slot: NormalizedTransitionSlotStyle | undefined) => {
+    baseStyle: Record<string, unknown> | undefined;
+    baseProps: Record<string, unknown> | undefined;
+    styleKeys: Record<string, true> | undefined;
+    propKeys: Record<string, true> | undefined;
+    hasAnyStyleKeys: boolean;
+    hasAnyPropKeys: boolean;
+    hasAnyKeys: boolean;
+    nextState: ResettableStyleState | undefined;
+};
+//# sourceMappingURL=slot-state.d.ts.map

package/lib/typescript/providers/orchestrator/styles/helpers/resolve-slot-styles/slot-state.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"slot-state.d.ts","sourceRoot":"","sources":["../../../../../../../src/providers/orchestrator/styles/helpers/resolve-slot-styles/slot-state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,sCAAsC,CAAC;AAE1F,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAgFpD,eAAO,MAAM,oBAAoB,GAChC,MAAM,6BAA6B,GAAG,SAAS;;;;;;;;;CAsC/C,CAAC"}

package/lib/typescript/providers/orchestrator/styles/helpers/resolve-slot-styles/types.d.ts ADDED Viewed

@@ -0,0 +1,10 @@
+import type { NormalizedTransitionInterpolatedStyle } from "../../../../../types/animation.types";
+export type LocalStyleLayers = NormalizedTransitionInterpolatedStyle[];
+export type ResettableStyleState = {
+    styleKeys?: Record<string, true>;
+    styleResetValues?: Record<string, unknown>;
+    propKeys?: Record<string, true>;
+    propResetValues?: Record<string, unknown>;
+};
+export type ResettableStyleStatesBySlot = Record<string, ResettableStyleState>;
+//# sourceMappingURL=types.d.ts.map

package/lib/typescript/providers/orchestrator/styles/helpers/resolve-slot-styles/types.d.ts.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../../src/providers/orchestrator/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/providers/orchestrator/styles/helpers/select-interpolator-frame.d.ts.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"select-interpolator-frame.d.ts","sourceRoot":"","sources":["../../../../../../src/providers/orchestrator/styles/helpers/select-interpolator-frame.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAEtE,MAAM,MAAM,yBAAyB,GAAG,IAAI,CAC3C,uBAAuB,EACvB,UAAU,GAAG,oBAAoB,GAAG,MAAM,GAAG,SAAS,GAAG,QAAQ,GAAG,UAAU,CAC9E,CAAC;AAEF,eAAO,MAAM,uBAAuB,GACnC,OAAO,uBAAuB,EAC9B,gBAAgB,OAAO,KACrB,yBAsBF,CAAC"}

package/lib/typescript/providers/orchestrator/styles/helpers/strip-interpolator-options.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"strip-interpolator-options.d.ts","sourceRoot":"","sources":["../../../../../../src/providers/orchestrator/styles/helpers/strip-interpolator-options.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,wBAAwB,GAAI,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,wBAgBhE,CAAC"}

package/lib/typescript/providers/orchestrator/styles/hooks/slot-resolvers.d.ts.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"slot-resolvers.d.ts","sourceRoot":"","sources":["../../../../../../src/providers/orchestrator/styles/hooks/slot-resolvers.tsx"],"names":[],"mappings":"AASA,eAAO,MAAM,aAAa,GAAI,QAAQ,MAAM,GAAG,SAAS,wIAavD,CAAC;AAEF,eAAO,MAAM,qBAAqB,GACjC,QAAQ,MAAM,GAAG,SAAS,EAC1B,OAAO,OAAO,wIAkBd,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,GAAI,QAAQ,MAAM,GAAG,SAAS,wGAc/D,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAI,QAAQ,MAAM,GAAG,SAAS,wGAmC7D,CAAC;AAEF,eAAO,MAAM,YAAY,GAAI,QAAQ,MAAM,GAAG,SAAS,KAMhD,GACN,CAAC"}

package/lib/typescript/providers/orchestrator/styles/hooks/use-interpolated-style-maps.d.ts.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"use-interpolated-style-maps.d.ts","sourceRoot":"","sources":["../../../../../../src/providers/orchestrator/styles/hooks/use-interpolated-style-maps.tsx"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EACX,uBAAuB,EAEvB,MAAM,wBAAwB,CAAC;AAKhC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAqEvE;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,eAAO,MAAM,wBAAwB,GAAI,eAEtC;IACF,QAAQ,EAAE,uBAAuB,CAAC;CAClC,qEA6KA,CAAC"}

package/lib/typescript/providers/orchestrator/styles/hooks/use-resolved-slot-style-map.d.ts ADDED Viewed

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

package/lib/typescript/providers/orchestrator/styles/hooks/use-resolved-slot-style-map.d.ts.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"use-resolved-slot-style-map.d.ts","sourceRoot":"","sources":["../../../../../../src/providers/orchestrator/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;AAG/F,OAAO,EAEN,KAAK,gBAAgB,EAIrB,MAAM,gCAAgC,CAAC;AAExC,UAAU,0BAA0B;IACnC,eAAe,EAAE,WAAW,CAAC,gBAAgB,CAAC,CAAC;CAC/C;AAED,eAAO,MAAM,oBAAoB,GAAI,sBAElC,0BAA0B,0FAyC5B,CAAC"}

package/lib/typescript/providers/orchestrator/styles/index.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/providers/orchestrator/styles/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EACN,qBAAqB,EACrB,mBAAmB,EACnB,YAAY,EACZ,qBAAqB,EACrB,aAAa,GACb,MAAM,wBAAwB,CAAC;AAEhC,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC"}

package/lib/typescript/providers/orchestrator/styles/types.d.ts ADDED Viewed

@@ -0,0 +1,3 @@
+import type { NAVIGATION_MASK_CONTAINER_STYLE_ID, NAVIGATION_MASK_ELEMENT_STYLE_ID } from "../../../constants";
+export type ScreenSlotName = "overlay" | "content" | "surface" | "backdrop" | "clip" | typeof NAVIGATION_MASK_CONTAINER_STYLE_ID | typeof NAVIGATION_MASK_ELEMENT_STYLE_ID;
+//# sourceMappingURL=types.d.ts.map

package/lib/typescript/providers/orchestrator/styles/types.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/providers/orchestrator/styles/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,kCAAkC,EAClC,gCAAgC,EAChC,MAAM,oBAAoB,CAAC;AAE5B,MAAM,MAAM,cAAc,GACvB,SAAS,GACT,SAAS,GACT,SAAS,GACT,UAAU,GACV,MAAM,GACN,OAAO,kCAAkC,GACzC,OAAO,gCAAgC,CAAC"}

package/lib/typescript/utils/animation/animate-to-progress.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import type { SharedValue } from "react-native-reanimated";
-import type { MotionAnimationValues } from "../../providers/screen/motion/types";
+import type { MotionAnimationValues } from "../../providers/motion/types";
 import type { TransitionSpec } from "../../types/animation.types";
 interface AnimateToProgressProps {
     /**

package/lib/typescript/utils/animation/animate-to-progress.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"animate-to-progress.d.ts","sourceRoot":"","sources":["../../../../src/utils/animation/animate-to-progress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAG3D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,~~qCAAqC~~,CAAC;~~AACjF~~,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAGlE,UAAU,sBAAsB;IAC/B;;;;;OAKG;IACH,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;IAClC,IAAI,CAAC,EAAE,cAAc,CAAC;IACtB,UAAU,EAAE,qBAAqB,CAAC;IAClC,cAAc,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACpC,iBAAiB,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACvC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,iFAAiF;IACjF,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CACjC;AAsBD,eAAO,MAAM,6BAA6B,GACzC,iBAAiB,MAAM,EACvB,gBAAgB,MAAM;;;CAOtB,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,8HAU/B,sBAAsB,SAgGxB,CAAC"}
1	+ {"version":3,"file":"animate-to-progress.d.ts","sourceRoot":"","sources":["../../../../src/utils/animation/animate-to-progress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAG3D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAGlE,UAAU,sBAAsB;IAC/B;;;;;OAKG;IACH,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;IAClC,IAAI,CAAC,EAAE,cAAc,CAAC;IACtB,UAAU,EAAE,qBAAqB,CAAC;IAClC,cAAc,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACpC,iBAAiB,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACvC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,iFAAiF;IACjF,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CACjC;AAsBD,eAAO,MAAM,6BAA6B,GACzC,iBAAiB,MAAM,EACvB,gBAAgB,MAAM;;;CAOtB,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,8HAU/B,sBAAsB,SAgGxB,CAAC"}

package/lib/typescript/utils/create-provider.d.ts CHANGED Viewed

@@ -20,7 +20,9 @@
  * Providers created with `global: true` return a `key` from their factory.
  * Both generated store hooks accept that key to subscribe to the original
  * provider store from outside its React context. Arrays of keys return ordered
- * snapshots (null for unmounted keys) and apply the selector to each store.
+ * snapshots (null for unavailable keys) and apply the selector to each store.
+ * Route-owned registrations survive Activity cleanup until their route closes
+ * or disappears; providers outside a route lifetime unregister on cleanup.
  */
 import { type ReactNode } from "react";
 type ProviderStoreHook<ContextValue> = {
@@ -55,7 +57,9 @@ type ProviderFactoryResult<ContextValue, Global extends boolean> = {
 });
 export default function createProvider<ProviderName extends string, Global extends boolean = false>(name: ProviderName, options?: {
     global?: Global;
-}): <ProviderProps extends object, ContextValue>(factory: (props: ProviderProps) => ProviderFactoryResult<ContextValue, Global>) => (Global extends true ? { [P in ProviderName as `get${P}Store`]: (key: string) => ContextValue; } : unknown) & {
+}): <ProviderProps extends object, ContextValue>(factory: (props: ProviderProps) => ProviderFactoryResult<ContextValue, Global>, lifecycle?: {
+    getRouteActivity: (value: ContextValue, key: string) => string | undefined;
+}) => (Global extends true ? { [P in ProviderName as `get${P}Store`]: (key: string) => ContextValue; } : unknown) & {
     StoreProvider: {
         ({ children, registerGlobally, storeKey, value, }: {
             children?: ReactNode;

package/lib/typescript/utils/create-provider.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"create-provider.d.ts","sourceRoot":"","sources":["../../../src/utils/create-provider.tsx"],"names":[],"mappings":"AAAA~~;;;;;;;;;;;;;;;;;;;;;;;GAuBG~~;AACH,OAAO,EAEN,KAAK,SAAS,~~EAMd~~,MAAM,OAAO,CAAC;AAEf,KAAK,iBAAiB,CAAC,YAAY,IAAI;IACtC,IAAI,YAAY,CAAC;IACjB,CAAC,QAAQ,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,QAAQ,GAAG,QAAQ,CAAC;CAClE,CAAC;AAEF,KAAK,uBAAuB,CAAC,YAAY,IAAI;IAC5C,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC,YAAY,GAAG,IAAI,CAAC,EAAE,CAAC;IAC5D,CAAC,QAAQ,EACR,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,QAAQ,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,QAAQ,GACzC,SAAS,CAAC,QAAQ,GAAG,IAAI,CAAC,EAAE,CAAC;IAChC,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,CAAC;IAC5B,CAAC,QAAQ,EACR,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,QAAQ,GACzC,QAAQ,CAAC;CACZ,CAAC;AAEF,KAAK,yBAAyB,CAAC,YAAY,IAAI;IAC9C,IAAI,YAAY,GAAG,IAAI,CAAC;IACxB,CAAC,QAAQ,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI,KAAK,QAAQ,GAAG,QAAQ,CAAC;CACzE,CAAC;AAEF,KAAK,+BAA+B,CAAC,YAAY,IAAI;IACpD,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC,YAAY,GAAG,IAAI,CAAC,EAAE,CAAC;IAC5D,CAAC,QAAQ,EACR,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,QAAQ,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,QAAQ,GACzC,SAAS,CAAC,QAAQ,GAAG,IAAI,CAAC,EAAE,CAAC;IAChC,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,YAAY,GAAG,IAAI,CAAC;IAC1C,CAAC,QAAQ,EACR,GAAG,EAAE,MAAM,GAAG,IAAI,EAClB,QAAQ,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,QAAQ,GACzC,QAAQ,GAAG,IAAI,CAAC;CACnB,CAAC;AAEF,KAAK,yBAAyB,CAC7B,YAAY,EACZ,MAAM,SAAS,OAAO,IACnB,iBAAiB,CAAC,YAAY,CAAC,GAClC,CAAC,MAAM,SAAS,IAAI,GAAG,uBAAuB,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,CAAC;AAEzE,KAAK,iCAAiC,CACrC,YAAY,EACZ,MAAM,SAAS,OAAO,IACnB,yBAAyB,CAAC,YAAY,CAAC,GAC1C,CAAC,MAAM,SAAS,IAAI,GACjB,+BAA+B,CAAC,YAAY,CAAC,GAC7C,OAAO,CAAC,CAAC;AAEb,KAAK,qBAAqB,CAAC,YAAY,EAAE,MAAM,SAAS,OAAO,IAAI;IAClE,KAAK,EAAE,YAAY,CAAC;IACpB,QAAQ,CAAC,EAAE,SAAS,CAAC;CACrB,GAAG,CAAC,MAAM,SAAS,IAAI,GAAG;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,GAAG,CAAC,EAAE,KAAK,CAAA;CAAE,CAAC,CAAC;~~AAgI9D~~,MAAM,CAAC,OAAO,UAAU,cAAc,CACrC,YAAY,SAAS,MAAM,EAC3B,MAAM,SAAS,OAAO,GAAG,KAAK,EAC7B,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,IAC1C,aAAa,SAAS,MAAM,EAAE,YAAY,EACjD,SAAS,CACR,KAAK,EAAE,aAAa,KAChB,qBAAqB,CAAC,YAAY,EAAE,MAAM,CAAC,~~KAoR3C~~,CAAC,MAAM,SAAS,IAAI,GACtB,GACC,CAAC,IAAI,YAAY,IAAI,MAAM,CAAC,OAAO,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,YAAY,GACpE,GACA,OAAO,CAAC,GAAG;IAAE,aAAa;~~2DAvH1B~~;YACF,QAAQ,CAAC,EAAE,SAAS,CAAC;YACrB,gBAAgB,CAAC,EAAE,OAAO,CAAC;YAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;YAClB,KAAK,EAAE,YAAY,CAAC;SACpB;;~~MAkHkD~~;CAAE,GAAG,GACtD,CAAC,IAAI,YAAY,IAAI,GAAG,CAAC,UAAU,GAAG,KAAK,CAAC,EAAE;eA5DjB,MAAM;eAAa,SAAS;WA4DJ,GACtD,GAAG,GACF,CAAC,IAAI,YAAY,IAAI,cAAc,CAAC,OAAO,GAAG,iCAAiC,CAC/E,YAAY,EACZ,MAAM,CACN,GACD,GAAG,GACF,CAAC,IAAI,YAAY,IAAI,MAAM,CAAC,OAAO,GAAG,yBAAyB,CAC/D,YAAY,EACZ,MAAM,CACN,GACD,CAEF"}
1	+ {"version":3,"file":"create-provider.d.ts","sourceRoot":"","sources":["../../../src/utils/create-provider.tsx"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

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

package/src/adapters/with-screen-transitions/lifecycle/index.tsx CHANGED Viewed

@@ -1,5 +1,5 @@
-import { useScreenLifecycle } from "../../../components/screen/lifecycle/use-screen-lifecycle";
-import { useBuilderStore } from "../../../providers/screen/builder";
+import { useScreenLifecycle } from "../../../navigators/blank-stack/components/lifecycle/use-screen-lifecycle";
+import { useBuilderStore } from "../../../providers/builder";
 import { useNativeCloseTransitionIntent } from "./use-native-close-transition-intent";
 export function NativeStackLifecycle() {

package/src/adapters/with-screen-transitions/lifecycle/use-native-close-transition-intent.ts CHANGED Viewed

@@ -1,10 +1,10 @@
 import { useLayoutEffect, useRef } from "react";
-import { resetStoresForScreen } from "../../../components/screen/lifecycle/hooks/helpers/reset-stores-for-screen";
-import { useNavigationHelpers } from "../../../hooks/navigation/use-navigation-helpers";
 import useStableCallback from "../../../hooks/use-stable-callback";
-import type { BaseDescriptor } from "../../../providers/screen/builder";
-import { useScreenRelationships } from "../../../providers/screen/builder/topology";
-import { useOptionalMotionStore } from "../../../providers/screen/motion";
+import { resetStoresForScreen } from "../../../navigators/blank-stack/components/lifecycle/hooks/helpers/reset-stores-for-screen";
+import { useNavigationHelpers } from "../../../navigators/blank-stack/hooks/use-navigation-helpers";
+import type { BaseDescriptor } from "../../../providers/builder";
+import { useScreenRelationships } from "../../../providers/builder/topology";
+import { useOptionalMotionStore } from "../../../providers/motion";
 import {
 	dispatchCloseAction,
 	isCloseActionReplay,

package/src/adapters/with-screen-transitions/stack-layout.tsx CHANGED Viewed

@@ -1,10 +1,14 @@
 import type { NavigationState, Route } from "@react-navigation/native";
-import { useMemo } from "react";
+import { memo, type ReactNode, useMemo } from "react";
 import { StyleSheet } from "react-native";
 import { GestureHandlerRootView } from "react-native-gesture-handler";
 import { Overlay } from "../../components/overlay";
-import { Screen } from "../../components/screen/screen";
-import { BlankStackStoreProvider } from "../../providers/stack/blank-stack.provider";
+import { ScreenLayers } from "../../components/screen-layers";
+import { useNavigationHelpers } from "../../navigators/blank-stack/hooks/use-navigation-helpers";
+import { BlankStackStoreProvider } from "../../navigators/blank-stack/state/blank-stack.provider";
+import { BuilderProvider } from "../../providers/builder";
+import { MotionProvider } from "../../providers/motion";
+import { OrchestratorProvider } from "../../providers/orchestrator";
 import type { BaseStackDescriptor, BaseStackRoute } from "../../types";
 import {
 	ScreenTransitionsAdapterProvider,
@@ -171,7 +175,7 @@ function ScreenTransitionsStackContent({
 	return (
 		<ScreenTransitionsAdapterProvider value={adapterContextValue}>
 			<BlankStackStoreProvider value={blankStackValue}>
-				<Overlay.Float />
+				<Overlay />
 				{children}
 			</BlankStackStoreProvider>
 		</ScreenTransitionsAdapterProvider>
@@ -188,6 +192,24 @@ export function ScreenTransitionsStackLayout(
 	);
 }
+const NativeSceneMotion = memo(function NativeSceneMotion({
+	children,
+}: {
+	children: ReactNode;
+}) {
+	const { requestDismiss } = useNavigationHelpers();
+	return (
+		<MotionProvider onDismissRequest={requestDismiss}>
+			<OrchestratorProvider>
+				<ScreenLayers onDismissRequest={requestDismiss}>
+					{children}
+				</ScreenLayers>
+			</OrchestratorProvider>
+			<NativeStackLifecycle />
+		</MotionProvider>
+	);
+});
 export function ScreenTransitionsScreenLayout({
 	screenLayout,
 	screenLayoutArgs,
@@ -201,16 +223,27 @@ export function ScreenTransitionsScreenLayout({
 		? screenLayout(screenLayoutArgs)
 		: screenLayoutArgs.children;
-	if (sceneIndex === undefined) {
+	const scene = sceneIndex === undefined ? undefined : scenes[sceneIndex];
+	const descriptors = useMemo(
+		() =>
+			scene
+				? {
+						current: scene.descriptor,
+						previous: scene.previousDescriptor,
+						next: scene.nextDescriptor,
+					}
+				: undefined,
+		[scene],
+	);
+	if (!scene || !descriptors) {
 		return <>{children}</>;
 	}
-	const scene = scenes[sceneIndex];
 	return (
-		<Screen routeKey={scene.route.key} lifecycle={NativeStackLifecycle}>
-			{children}
-		</Screen>
+		<BuilderProvider routeKey={scene.route.key} descriptors={descriptors}>
+			<NativeSceneMotion>{children}</NativeSceneMotion>
+		</BuilderProvider>
 	);
 }

package/src/components/boundary/components/boundary-lifecycle.tsx CHANGED Viewed

@@ -1,7 +1,7 @@
 import { memo, useMemo } from "react";
 import type { View } from "react-native";
 import type { AnimatedRef } from "react-native-reanimated";
-import { useBuilderStore } from "../../../providers/screen/builder";
+import { useBuilderStore } from "../../../providers/builder";
 import type { BoundTag } from "../../../stores/bounds/types";
 import { prepareStyleForBounds } from "../../../utils/bounds/helpers/styles/styles";
 import { useBoundaryPresence } from "../hooks/lifecycles/use-boundary-presence";

package/src/components/boundary/helpers/presentation.ts CHANGED Viewed

@@ -6,9 +6,9 @@ import type {
 } from "../../../stores/bounds/internals/state";
 import type { BoundaryHandoffTarget } from "../../../types/animation.types";
-export type { BoundaryPairPresentation } from "../../../providers/screen/orchestrator/helpers/use-pair-presentation";
+export type { BoundaryPairPresentation } from "../../../providers/orchestrator/helpers/use-pair-presentation";
-import type { BoundaryPairPresentation } from "../../../providers/screen/orchestrator/helpers/use-pair-presentation";
+import type { BoundaryPairPresentation } from "../../../providers/orchestrator/helpers/use-pair-presentation";
 export type BoundaryPresentationState = {
 	presentations: readonly (

package/src/components/boundary/hooks/lifecycles/use-initial-destination-measurement.ts CHANGED Viewed

@@ -7,9 +7,9 @@ import {
 	withTiming,
 } from "react-native-reanimated";
 import { scheduleOnUI } from "react-native-worklets";
-import { useBuilderStore } from "../../../../providers/screen/builder";
-import { useMotionStore } from "../../../../providers/screen/motion";
-import { useBlankStackStore } from "../../../../providers/stack/blank-stack.provider";
+import { useBlankStackStore } from "../../../../navigators/blank-stack/state/blank-stack.provider";
+import { useBuilderStore } from "../../../../providers/builder";
+import { useMotionStore } from "../../../../providers/motion";
 import {
 	createScreenPairKey,
 	getSourceScreenKeyFromPairKey,

package/src/components/boundary/hooks/lifecycles/use-initial-source-measurement.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { useAnimatedReaction, useSharedValue } from "react-native-reanimated";
-import { useBuilderStore } from "../../../../providers/screen/builder";
+import { useBuilderStore } from "../../../../providers/builder";
 import { getPairKeyForSource } from "../../../../stores/bounds/internals/links";
 import { pairs } from "../../../../stores/bounds/internals/state";
 import type { BoundTag } from "../../../../stores/bounds/types";

package/src/components/boundary/hooks/lifecycles/use-refresh-boundary.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import { useAnimatedReaction } from "react-native-reanimated";
-import { useBuilderStore } from "../../../../providers/screen/builder";
-import { useOptionalMotionStore } from "../../../../providers/screen/motion";
+import { useBuilderStore } from "../../../../providers/builder";
+import { useOptionalMotionStore } from "../../../../providers/motion";
 import {
 	getPairKeyForDestination,
 	getPairKeyForSource,

package/src/components/boundary/hooks/use-boundary-presentation.ts CHANGED Viewed

@@ -1,18 +1,18 @@
 import { useMemo } from "react";
 import { useDerivedValue, useSharedValue } from "react-native-reanimated";
 import { NO_PROPS, NO_STYLES } from "../../../constants";
-import { useBuilderStore } from "../../../providers/screen/builder";
-import { useScreenRelationships } from "../../../providers/screen/builder/topology";
+import { useOptionalBlankStackStore } from "../../../navigators/blank-stack/state/blank-stack.provider";
+import { useBuilderStore } from "../../../providers/builder";
+import { useScreenRelationships } from "../../../providers/builder/topology";
 import {
 	useOptionalOrchestratorStore,
 	useOrchestratorStore,
-} from "../../../providers/screen/orchestrator";
+} from "../../../providers/orchestrator";
 import {
 	areResettableStatesBySlotEqual,
 	type ResettableStyleStatesBySlot,
 	resolveSlotStyles,
-} from "../../../providers/screen/orchestrator/styles/helpers/resolve-slot-styles";
-import { useOptionalBlankStackStore } from "../../../providers/stack/blank-stack.provider";
+} from "../../../providers/orchestrator/styles/helpers/resolve-slot-styles";
 import {
 	boundaryRegistry,
 	pairs,

package/src/components/boundary/hooks/use-composed-boundary-style.ts CHANGED Viewed

@@ -8,7 +8,7 @@ import { NO_STYLES } from "../../../constants";
 import {
 	composeSlotStyleWithLocalTransform,
 	getLocalTransformForSlotComposition,
-} from "../../../providers/screen/orchestrator/styles/helpers/compose-slot-style";
+} from "../../../providers/orchestrator/styles/helpers/compose-slot-style";
 import type { NormalizedTransitionInterpolatedStyle } from "../../../types/animation.types";
 export function useComposedBoundaryStyle(

package/src/components/boundary/hooks/use-measurer.ts CHANGED Viewed

@@ -2,7 +2,7 @@ import { useCallback } from "react";
 import type { View } from "react-native";
 import { useWindowDimensions } from "react-native";
 import type { AnimatedRef, StyleProps } from "react-native-reanimated";
-import { useMotionStore } from "../../../providers/screen/motion";
+import { useMotionStore } from "../../../providers/motion";
 import { setEntry } from "../../../stores/bounds/internals/entries";
 import {
 	setDestination,

package/src/components/boundary/portal/components/portal-overlay.tsx CHANGED Viewed

@@ -14,8 +14,8 @@ import Animated, {
 	useAnimatedStyle,
 } from "react-native-reanimated";
 import { NO_STYLES } from "../../../../constants";
-import { useBuilderStore } from "../../../../providers/screen/builder";
-import { composeSlotStyleWithLocalTransform } from "../../../../providers/screen/orchestrator/styles/helpers/compose-slot-style";
+import { useBuilderStore } from "../../../../providers/builder";
+import { composeSlotStyleWithLocalTransform } from "../../../../providers/orchestrator/styles/helpers/compose-slot-style";
 import { resolvePortalOffsetStyle } from "../helpers/offset-style";
 import { useHostMeasurement } from "../hooks/use-host-measurement";
 import { registerHost, unregisterHost } from "../stores/host-registry.store";
@@ -55,12 +55,8 @@ export const PortalOverlay = memo(function PortalOverlay({
 	const { height: viewportHeight, width: viewportWidth } =
 		useWindowDimensions();
-	const measurementKey = activeBoundaryHosts.length
-		? activeBoundaryHosts.map((host) => host.portalHostName).join("|")
-		: null;
 	const measurement = useHostMeasurement({
-		measurementKey,
+		enabled: activeBoundaryHosts.length > 0,
 		boundaryMeasurements: activeBoundaryHosts.map(
 			(host) => host.localMeasurement,
 		),

package/src/components/boundary/portal/hooks/use-host-measurement.ts CHANGED Viewed

@@ -5,97 +5,78 @@ import {
 	measure,
 	useAnimatedReaction,
 	useAnimatedRef,
-	useDerivedValue,
 	useSharedValue,
 	withDelay,
 	withTiming,
 } from "react-native-reanimated";
 import type { BoundaryLocalMeasurementValue } from "../../types";
 const HOST_MEASUREMENT_RETRY_DELAY_MS = 16;
 const MAX_HOST_MEASUREMENT_ATTEMPTS = 20;
 type UseHostMeasurementParams = {
-	measurementKey: string | null;
+	enabled: boolean;
 	boundaryMeasurements: BoundaryLocalMeasurementValue[];
 };
 export const useHostMeasurement = ({
-	measurementKey,
+	enabled,
 	boundaryMeasurements,
 }: UseHostMeasurementParams) => {
 	const hostRef = useAnimatedRef<View>();
-	const measurement = useSharedValue<{
-		key: string;
-		bounds: MeasuredDimensions;
-	} | null>(null);
-	const hostBounds = useDerivedValue(() => {
-		const captured = measurement.get();
-		return captured?.key === measurementKey ? captured.bounds : null;
-	});
+	const hostBounds = useSharedValue<MeasuredDimensions | null>(null);
 	const retryToken = useSharedValue(0);
-	const attempts = useSharedValue({ key: measurementKey, count: 0 });
+	const attempts = useSharedValue(0);
+	const measureHost = () => {
+		"worklet";
+		const count = attempts.get() + 1;
+		attempts.set(count);
+		const measured = measure(hostRef);
+		if (measured && measured.width > 0 && measured.height > 0) {
+			hostBounds.set({ ...measured });
+		} else if (count < MAX_HOST_MEASUREMENT_ATTEMPTS) {
+			retryToken.set(
+				withDelay(
+					HOST_MEASUREMENT_RETRY_DELAY_MS,
+					withTiming(count, { duration: 0 }),
+				),
+			);
+		}
+	};
 	useAnimatedReaction(
 		() => {
 			"worklet";
-			if (!measurementKey) {
-				return null;
-			}
-			// Hosts mount before their screen is visible. Wait for source capture
-			// rather than caching the screen's initial offscreen position.
+			if (!enabled) return null;
+			const captures = [];
 			let hasSource = false;
-			for (const measurement of boundaryMeasurements) {
-				if (measurement.get()) {
-					hasSource = true;
-					break;
-				}
+			for (const value of boundaryMeasurements) {
+				const capture = value.get();
+				captures.push(capture);
+				if (capture) hasSource = true;
 			}
-			if (!hasSource) return null;
-			return [
-				measurementKey,
-				measurement.get()?.key ?? null,
-				retryToken.get(),
-			] as const;
+			return hasSource ? captures : null;
 		},
-		(state) => {
+		(captures) => {
 			"worklet";
-			if (!state) {
-				cancelAnimation(retryToken);
-				return;
-			}
-			const [requestedKey, completedKey] = state;
-			if (requestedKey === completedKey) {
-				return;
-			}
 			cancelAnimation(retryToken);
-			const count =
-				attempts.get().key === requestedKey ? attempts.get().count : 0;
-			if (count >= MAX_HOST_MEASUREMENT_ATTEMPTS) return;
-			attempts.set({ key: requestedKey, count: count + 1 });
-			const measured = measure(hostRef);
-			if (!measured || measured.width <= 0 || measured.height <= 0) {
-				if (count + 1 < MAX_HOST_MEASUREMENT_ATTEMPTS) {
-					retryToken.set(
-						withDelay(
-							HOST_MEASUREMENT_RETRY_DELAY_MS,
-							withTiming(retryToken.get() + 1, { duration: 0 }),
-						),
-					);
-				}
-				return;
-			}
+			retryToken.set(0);
+			attempts.set(0);
+			hostBounds.set(null);
+			// Measure anew on every source capture, even for the same portal/pair.
+			// Hold only this transition's position; never reuse an earlier capture.
+			if (captures) measureHost();
+		},
+	);
-			measurement.set({ key: requestedKey, bounds: { ...measured } });
+	useAnimatedReaction(
+		() => retryToken.get(),
+		(token) => {
+			"worklet";
+			if (token > 0) measureHost();
 		},
 	);
-	return {
-		hostBounds,
-		hostRef,
-	};
+	return { hostBounds, hostRef };
 };

package/src/components/boundary/providers/boundary-root.provider.tsx CHANGED Viewed

@@ -9,8 +9,8 @@ import {
 import type { View } from "react-native";
 import type { AnimatedRef } from "react-native-reanimated";
 import { useAnimatedRef, useSharedValue } from "react-native-reanimated";
-import { useBuilderStore } from "../../../providers/screen/builder";
-import { useBlankStackStore } from "../../../providers/stack/blank-stack.provider";
+import { useBlankStackStore } from "../../../navigators/blank-stack/state/blank-stack.provider";
+import { useBuilderStore } from "../../../providers/builder";
 import { createBoundTag } from "../../../stores/bounds/helpers/link-pairs.helpers";
 import type { BoundTag } from "../../../stores/bounds/types";
 import createProvider from "../../../utils/create-provider";

package/src/components/create-transition-aware-component.tsx CHANGED Viewed

@@ -7,13 +7,10 @@ import Animated, { useComposedEventHandler } from "react-native-reanimated";
 import {
 	ScrollMetadataOwnerProvider,
 	useScrollGestureCoordination,
-} from "../providers/screen/motion/gestures/scroll-coordination";
-import {
-	useSlotProps,
-	useSlotStyles,
-} from "../providers/screen/orchestrator/styles";
+} from "../providers/motion/gestures/scroll-coordination";
+import { useSlotProps, useSlotStyles } from "../providers/orchestrator/styles";
 import type { TransitionAwareProps } from "../types/screen.types";
-import { useContentLayout } from "./screen/container/hooks/use-content-layout";
+import { useContentLayout } from "./screen-layers/hooks/use-content-layout";
 interface CreateTransitionAwareComponentOptions {
 	isScrollable?: boolean;