react-native-screen-transitions 2.4.2-beta.0 → 2.4.2-beta.1

package/src/integrations/blank-stack/components/Header.tsx

@@ -8,6 +8,7 @@ import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { useScreenAnimation } from "../../../hooks/animation/use-screen-animation";
 import { KeysProvider, useKeys } from "../../../providers/keys";
 import type {
+  BlankStackDescriptor,
   BlankStackHeaderProps,
   BlankStackScene,
 } from "../../../types/blank-stack.navigator";
@@ -89,7 +90,6 @@ const FloatHeader = () => {
   const next = scenes[headerIndex + 1]?.descriptor;
 
   return (
-    //@ts-expect-error
     <KeysProvider current={current} previous={previous} next={next}>
       <HeaderHost scene={scene} focusedIndex={focusedIndex} isFloating />
     </KeysProvider>
@@ -98,17 +98,15 @@ const FloatHeader = () => {
 
 const ScreenHeader = () => {
   const { focusedIndex } = useStackNavigationContext();
-  const { current } = useKeys();
+  const { current } = useKeys<BlankStackDescriptor>();
 
   const options = current.options;
 
-  // @ts-expect-error
   if (!options.headerShown || options.headerMode !== "screen") {
     return null;
   }
 
   const scene: BlankStackScene = {
-    //@ts-expect-error
     descriptor: current,
     route: current.route,
   };

package/src/integrations/blank-stack/components/StackView.tsx

@@ -5,12 +5,11 @@ import {
 } from "@react-navigation/native";
 import { GestureHandlerRootView } from "react-native-gesture-handler";
 import { ScreenContainer } from "react-native-screens";
-import { RootTransitionAware } from "../../../components/root-transition-aware";
-import { ScreenTransitionProvider } from "../../../providers/screen-transition-provider";
 import type { BlankStackDescriptor } from "../../../types/blank-stack.navigator";
 import { withStackNavigationProvider } from "../utils/with-stack-navigation";
 import { Header } from "./Header";
 import { Screen } from "./Screens";
+import { ScreenTransitionProvider } from "../providers/screen-transition-provider";
 
 function isFabric() {
   return "nativeFabricUIManager" in global;
@@ -28,10 +27,8 @@ const SceneView = ({ descriptor }: SceneViewProps) => {
   return (
     <NavigationContext.Provider value={navigation}>
       <NavigationRouteContext.Provider value={route}>
-        <RootTransitionAware>
-          {descriptor.options.headerMode === "screen" && <Header.Screen />}
-          {render()}
-        </RootTransitionAware>
+        {descriptor.options.headerMode === "screen" && <Header.Screen />}
+        {render()}
       </NavigationRouteContext.Provider>
     </NavigationContext.Provider>
   );
@@ -81,11 +78,8 @@ export const StackView = withStackNavigationProvider(
                   freezeOnBlur={descriptor.options.freezeOnBlur}
                 >
                   <ScreenTransitionProvider
-                    // @ts-expect-error
                     previous={previousDescriptor}
-                    // @ts-expect-error
                     current={descriptor}
-                    // @ts-expect-error
                     next={nextDescriptor}
                   >
                     <SceneView

package/src/integrations/blank-stack/navigators/createBlankStackNavigator.tsx

@@ -109,14 +109,3 @@ export function createBlankStackNavigator<
 >(config?: Config): TypedNavigator<TypeBag, Config> {
   return createNavigatorFactory(BlankStackNavigator)(config);
 }
-
-import { withLayoutContext } from "expo-router";
-
-const { Navigator } = createBlankStackNavigator();
-
-export const BlankStack = withLayoutContext<
-  BlankStackNavigationOptions,
-  typeof Navigator,
-  StackNavigationState<ParamListBase>,
-  BlankStackNavigationEventMap
->(Navigator);

package/src/integrations/blank-stack/providers/screen-transition-provider.tsx

@@ -0,0 +1,8 @@
+import type { BlankStackDescriptor } from "../../../types/blank-stack.navigator";
+import { ScreenLifecycleController } from "../../../components/controllers/screen-lifecycle.blank";
+import { createScreenTransitionProvider } from "../../../providers/create-screen-transition-provider";
+
+export const ScreenTransitionProvider =
+	createScreenTransitionProvider<BlankStackDescriptor>(
+		ScreenLifecycleController,
+	);

package/src/integrations/blank-stack/utils/with-stack-navigation/index.tsx

@@ -12,7 +12,7 @@ import type {
   StackNavigationContextProps,
   StackNavigationContextValue,
 } from "./_types";
-import { calculateActiveScreensLimit } from "./_utils/calculateActiveScreensLimit";
+import { calculateActiveScreensLimit } from "./_utils/calculate-active-screens-limit";
 
 export const StackNavigationContext =
   createContext<StackNavigationContextValue | null>(null);

package/src/integrations/native-stack/providers/screen-transition-provider.tsx

@@ -0,0 +1,8 @@
+import type { NativeStackDescriptor } from "../../../types/native-stack.navigator";
+import { ScreenLifecycleController } from "../../../components/controllers/screen-lifecycle";
+import { createScreenTransitionProvider } from "../../../providers/create-screen-transition-provider";
+
+export const ScreenTransitionProvider =
+  createScreenTransitionProvider<NativeStackDescriptor>(
+    ScreenLifecycleController
+  );

package/src/integrations/native-stack/views/NativeStackView.native.tsx

@@ -32,7 +32,7 @@ import {
   ScreenStack,
   ScreenStackItem,
 } from "react-native-screens";
-import { ScreenTransitionProvider } from "../../../providers/screen-transition-provider";
+import { ScreenTransitionProvider } from "../providers/screen-transition-provider";
 import type {
   NativeStackDescriptor,
   NativeStackDescriptorMap,

package/src/providers/create-screen-transition-provider.tsx

@@ -0,0 +1,46 @@
+import type React from "react";
+import type { Descriptor } from "@react-navigation/native";
+import { RootTransitionAware } from "../components/root-transition-aware";
+import { ScreenGestureProvider } from "./gestures";
+import { KeysProvider } from "./keys";
+import { TransitionStylesProvider } from "./transition-styles";
+
+type AnyDescriptor = Descriptor<any, any, any>;
+
+type ScreenLifecycleComponent = React.ComponentType<{
+	children: React.ReactNode;
+}>;
+
+type ScreenTransitionProviderProps<DescriptorType extends AnyDescriptor> = {
+	previous?: DescriptorType;
+	current: DescriptorType;
+	next?: DescriptorType;
+	children: React.ReactNode;
+};
+
+export function createScreenTransitionProvider<
+	DescriptorType extends AnyDescriptor,
+>(ScreenLifecycleComponent: ScreenLifecycleComponent) {
+	return function ScreenTransitionProvider({
+		previous,
+		current,
+		next,
+		children,
+	}: ScreenTransitionProviderProps<DescriptorType>) {
+		return (
+			<KeysProvider<DescriptorType>
+				previous={previous}
+				current={current}
+				next={next}
+			>
+				<ScreenGestureProvider>
+					<ScreenLifecycleComponent>
+						<TransitionStylesProvider>
+							<RootTransitionAware>{children}</RootTransitionAware>
+						</TransitionStylesProvider>
+					</ScreenLifecycleComponent>
+				</ScreenGestureProvider>
+			</KeysProvider>
+		);
+	};
+}

package/src/providers/keys.tsx

@@ -1,38 +1,50 @@
 import { createContext, useContext, useMemo } from "react";
+import type { Descriptor } from "@react-navigation/native";
 import type { NativeStackDescriptor } from "../types/native-stack.navigator";
 
-interface KeysContextType {
-  previous?: NativeStackDescriptor;
-  current: NativeStackDescriptor;
-  next?: NativeStackDescriptor;
-}
+type AnyDescriptor = Descriptor<any, any, any>;
 
-const KeysContext = createContext<KeysContextType | undefined>(undefined);
+type KeysContextValue = {
+  previous?: AnyDescriptor;
+  current: AnyDescriptor;
+  next?: AnyDescriptor;
+};
 
-interface KeysProviderProps {
+type KeysProviderProps<DescriptorType extends AnyDescriptor> = {
   children: React.ReactNode;
-  previous?: NativeStackDescriptor;
-  current: NativeStackDescriptor;
-  next?: NativeStackDescriptor;
-}
+  previous?: DescriptorType;
+  current: DescriptorType;
+  next?: DescriptorType;
+};
+
+type KeysContextType<DescriptorType extends AnyDescriptor> = {
+  previous?: DescriptorType;
+  current: DescriptorType;
+  next?: DescriptorType;
+};
+
+const KeysContext = createContext<KeysContextValue | undefined>(undefined);
 
-export const KeysProvider = ({
+export const KeysProvider = <DescriptorType extends AnyDescriptor>({
   children,
   previous,
   current,
   next,
-}: KeysProviderProps) => {
+}: KeysProviderProps<DescriptorType>) => {
   const value = useMemo(
     () => ({ previous, current, next }),
     [previous, current, next]
-  );
+  ) as KeysContextValue;
+
   return <KeysContext.Provider value={value}>{children}</KeysContext.Provider>;
 };
 
-export const useKeys = (): KeysContextType => {
+export const useKeys = <
+  DescriptorType extends AnyDescriptor = NativeStackDescriptor
+>(): KeysContextType<DescriptorType> => {
   const context = useContext(KeysContext);
   if (context === undefined) {
     throw new Error("useKeys must be used within a KeysProvider");
   }
-  return context;
+  return context as KeysContextType<DescriptorType>;
 };

package/src/types/blank-stack.navigator.ts

@@ -11,7 +11,6 @@ import type {
   StackRouterOptions,
   Theme,
 } from "@react-navigation/native";
-import type { StyleProp, ViewStyle } from "react-native";
 import type { DerivedValue } from "react-native-reanimated";
 import type { EdgeInsets } from "react-native-safe-area-context";
 import type { ScreenProps } from "react-native-screens";
@@ -233,10 +232,6 @@ export type BlankStackNavigationOptions = BlankStackScreenTransitionConfig & {
    * @platform android, ios
    */
   statusBarStyle?: ScreenProps["statusBarStyle"];
-  /**
-   * Style object for the scene content.
-   */
-  contentStyle?: StyleProp<ViewStyle>;
   /**
    * Whether inactive screens should be suspended from re-rendering. Defaults to `false`.
    * Defaults to `true` when `enableFreeze()` is run at the top of the application.

package/lib/commonjs/integrations/blank-stack/utils/with-stack-navigation/_utils/calculateActiveScreensLimit.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["calculateActiveScreensLimit","routes","descriptors","length","limit","i","route","shouldKeepPrevious","key","options","detachPreviousScreen","Math","min"],"sourceRoot":"../../../../../../../src","sources":["integrations/blank-stack/utils/with-stack-navigation/_utils/calculateActiveScreensLimit.ts"],"mappings":";;;;;;AAGO,SAASA,2BAA2BA,CACzCC,MAAgD,EAChDC,WAAoC,EAC5B;EACR,IAAID,MAAM,CAACE,MAAM,KAAK,CAAC,EAAE;IACvB,OAAO,CAAC;EACV;EAEA,IAAIC,KAAK,GAAG,CAAC;EAEb,KAAK,IAAIC,CAAC,GAAGJ,MAAM,CAACE,MAAM,GAAG,CAAC,EAAEE,CAAC,IAAI,CAAC,EAAEA,CAAC,EAAE,EAAE;IAC3C,MAAMC,KAAK,GAAGL,MAAM,CAACI,CAAC,CAAC;IAEvB,MAAME,kBAAkB,GACtBL,WAAW,GAAGI,KAAK,CAACE,GAAG,CAAC,EAAEC,OAAO,EAAEC,oBAAoB,KAAK,IAAI;IAElE,IAAIH,kBAAkB,EAAE;MACtBH,KAAK,EAAE;MACP;IACF;IAEA;EACF;EAEA,OAAOO,IAAI,CAACC,GAAG,CAACR,KAAK,EAAEH,MAAM,CAACE,MAAM,CAAC;AACvC","ignoreList":[]}

package/lib/commonjs/providers/screen-transition-provider.js

@@ -1,34 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.ScreenTransitionProvider = ScreenTransitionProvider;
-var _screenLifecycle = require("../components/controllers/screen-lifecycle");
-var _rootTransitionAware = require("../components/root-transition-aware");
-var _gestures = require("../providers/gestures");
-var _keys = require("../providers/keys");
-var _transitionStyles = require("../providers/transition-styles");
-var _jsxRuntime = require("react/jsx-runtime");
-function ScreenTransitionProvider({
-  previous,
-  current,
-  next,
-  children
-}) {
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_keys.KeysProvider, {
-    previous: previous,
-    current: current,
-    next: next,
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_gestures.ScreenGestureProvider, {
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_screenLifecycle.ScreenLifecycleController, {
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_transitionStyles.TransitionStylesProvider, {
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_rootTransitionAware.RootTransitionAware, {
-            children: children
-          })
-        })
-      })
-    })
-  });
-}
-//# sourceMappingURL=screen-transition-provider.js.map

package/lib/commonjs/providers/screen-transition-provider.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["_screenLifecycle","require","_rootTransitionAware","_gestures","_keys","_transitionStyles","_jsxRuntime","ScreenTransitionProvider","previous","current","next","children","jsx","KeysProvider","ScreenGestureProvider","ScreenLifecycleController","TransitionStylesProvider","RootTransitionAware"],"sourceRoot":"../../../src","sources":["providers/screen-transition-provider.tsx"],"mappings":";;;;;;AACA,IAAAA,gBAAA,GAAAC,OAAA;AACA,IAAAC,oBAAA,GAAAD,OAAA;AACA,IAAAE,SAAA,GAAAF,OAAA;AACA,IAAAG,KAAA,GAAAH,OAAA;AACA,IAAAI,iBAAA,GAAAJ,OAAA;AAA0E,IAAAK,WAAA,GAAAL,OAAA;AAUnE,SAASM,wBAAwBA,CAAC;EACvCC,QAAQ;EACRC,OAAO;EACPC,IAAI;EACJC;AACK,CAAC,EAAE;EACR,oBACE,IAAAL,WAAA,CAAAM,GAAA,EAACR,KAAA,CAAAS,YAAY;IAACL,QAAQ,EAAEA,QAAS;IAACC,OAAO,EAAEA,OAAQ;IAACC,IAAI,EAAEA,IAAK;IAAAC,QAAA,eAC7D,IAAAL,WAAA,CAAAM,GAAA,EAACT,SAAA,CAAAW,qBAAqB;MAAAH,QAAA,eACpB,IAAAL,WAAA,CAAAM,GAAA,EAACZ,gBAAA,CAAAe,yBAAyB;QAAAJ,QAAA,eACxB,IAAAL,WAAA,CAAAM,GAAA,EAACP,iBAAA,CAAAW,wBAAwB;UAAAL,QAAA,eACvB,IAAAL,WAAA,CAAAM,GAAA,EAACV,oBAAA,CAAAe,mBAAmB;YAAAN,QAAA,EAAEA;UAAQ,CAAsB;QAAC,CAC7B;MAAC,CACF;IAAC,CACP;EAAC,CACZ,CAAC;AAEnB","ignoreList":[]}

package/lib/module/integrations/blank-stack/utils/with-stack-navigation/_utils/calculateActiveScreensLimit.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["calculateActiveScreensLimit","routes","descriptors","length","limit","i","route","shouldKeepPrevious","key","options","detachPreviousScreen","Math","min"],"sourceRoot":"../../../../../../../src","sources":["integrations/blank-stack/utils/with-stack-navigation/_utils/calculateActiveScreensLimit.ts"],"mappings":";;AAGA,OAAO,SAASA,2BAA2BA,CACzCC,MAAgD,EAChDC,WAAoC,EAC5B;EACR,IAAID,MAAM,CAACE,MAAM,KAAK,CAAC,EAAE;IACvB,OAAO,CAAC;EACV;EAEA,IAAIC,KAAK,GAAG,CAAC;EAEb,KAAK,IAAIC,CAAC,GAAGJ,MAAM,CAACE,MAAM,GAAG,CAAC,EAAEE,CAAC,IAAI,CAAC,EAAEA,CAAC,EAAE,EAAE;IAC3C,MAAMC,KAAK,GAAGL,MAAM,CAACI,CAAC,CAAC;IAEvB,MAAME,kBAAkB,GACtBL,WAAW,GAAGI,KAAK,CAACE,GAAG,CAAC,EAAEC,OAAO,EAAEC,oBAAoB,KAAK,IAAI;IAElE,IAAIH,kBAAkB,EAAE;MACtBH,KAAK,EAAE;MACP;IACF;IAEA;EACF;EAEA,OAAOO,IAAI,CAACC,GAAG,CAACR,KAAK,EAAEH,MAAM,CAACE,MAAM,CAAC;AACvC","ignoreList":[]}

package/lib/module/providers/screen-transition-provider.js

@@ -1,30 +0,0 @@
-"use strict";
-
-import { ScreenLifecycleController } from "../components/controllers/screen-lifecycle";
-import { RootTransitionAware } from "../components/root-transition-aware";
-import { ScreenGestureProvider } from "../providers/gestures";
-import { KeysProvider } from "../providers/keys";
-import { TransitionStylesProvider } from "../providers/transition-styles";
-import { jsx as _jsx } from "react/jsx-runtime";
-export function ScreenTransitionProvider({
-  previous,
-  current,
-  next,
-  children
-}) {
-  return /*#__PURE__*/_jsx(KeysProvider, {
-    previous: previous,
-    current: current,
-    next: next,
-    children: /*#__PURE__*/_jsx(ScreenGestureProvider, {
-      children: /*#__PURE__*/_jsx(ScreenLifecycleController, {
-        children: /*#__PURE__*/_jsx(TransitionStylesProvider, {
-          children: /*#__PURE__*/_jsx(RootTransitionAware, {
-            children: children
-          })
-        })
-      })
-    })
-  });
-}
-//# sourceMappingURL=screen-transition-provider.js.map

package/lib/module/providers/screen-transition-provider.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["ScreenLifecycleController","RootTransitionAware","ScreenGestureProvider","KeysProvider","TransitionStylesProvider","jsx","_jsx","ScreenTransitionProvider","previous","current","next","children"],"sourceRoot":"../../../src","sources":["providers/screen-transition-provider.tsx"],"mappings":";;AACA,SAASA,yBAAyB,QAAQ,4CAA4C;AACtF,SAASC,mBAAmB,QAAQ,qCAAqC;AACzE,SAASC,qBAAqB,QAAQ,uBAAuB;AAC7D,SAASC,YAAY,QAAQ,mBAAmB;AAChD,SAASC,wBAAwB,QAAQ,gCAAgC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAU1E,OAAO,SAASC,wBAAwBA,CAAC;EACvCC,QAAQ;EACRC,OAAO;EACPC,IAAI;EACJC;AACK,CAAC,EAAE;EACR,oBACEL,IAAA,CAACH,YAAY;IAACK,QAAQ,EAAEA,QAAS;IAACC,OAAO,EAAEA,OAAQ;IAACC,IAAI,EAAEA,IAAK;IAAAC,QAAA,eAC7DL,IAAA,CAACJ,qBAAqB;MAAAS,QAAA,eACpBL,IAAA,CAACN,yBAAyB;QAAAW,QAAA,eACxBL,IAAA,CAACF,wBAAwB;UAAAO,QAAA,eACvBL,IAAA,CAACL,mBAAmB;YAAAU,QAAA,EAAEA;UAAQ,CAAsB;QAAC,CAC7B;MAAC,CACF;IAAC,CACP;EAAC,CACZ,CAAC;AAEnB","ignoreList":[]}

package/lib/typescript/integrations/blank-stack/utils/with-stack-navigation/_utils/calculateActiveScreensLimit.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"calculateActiveScreensLimit.d.ts","sourceRoot":"","sources":["../../../../../../../src/integrations/blank-stack/utils/with-stack-navigation/_utils/calculateActiveScreensLimit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC/E,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,4CAA4C,CAAC;AAE1F,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,eAAe,CAAC,aAAa,EAAE,MAAM,CAAC,EAAE,EAChD,WAAW,EAAE,uBAAuB,GACnC,MAAM,CAsBR"}

package/lib/typescript/providers/screen-transition-provider.d.ts

@@ -1,11 +0,0 @@
-import type React from "react";
-import type { NativeStackDescriptor } from "../types/native-stack.navigator";
-type Props = {
-    previous?: NativeStackDescriptor;
-    current: NativeStackDescriptor;
-    next?: NativeStackDescriptor;
-    children: React.ReactNode;
-};
-export declare function ScreenTransitionProvider({ previous, current, next, children, }: Props): import("react/jsx-runtime").JSX.Element;
-export {};
-//# sourceMappingURL=screen-transition-provider.d.ts.map

package/lib/typescript/providers/screen-transition-provider.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"screen-transition-provider.d.ts","sourceRoot":"","sources":["../../../src/providers/screen-transition-provider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAM/B,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAE7E,KAAK,KAAK,GAAG;IACX,QAAQ,CAAC,EAAE,qBAAqB,CAAC;IACjC,OAAO,EAAE,qBAAqB,CAAC;IAC/B,IAAI,CAAC,EAAE,qBAAqB,CAAC;IAC7B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B,CAAC;AAEF,wBAAgB,wBAAwB,CAAC,EACvC,QAAQ,EACR,OAAO,EACP,IAAI,EACJ,QAAQ,GACT,EAAE,KAAK,2CAYP"}

package/src/providers/screen-transition-provider.tsx

@@ -1,33 +0,0 @@
-import type React from "react";
-import { ScreenLifecycleController } from "../components/controllers/screen-lifecycle";
-import { RootTransitionAware } from "../components/root-transition-aware";
-import { ScreenGestureProvider } from "../providers/gestures";
-import { KeysProvider } from "../providers/keys";
-import { TransitionStylesProvider } from "../providers/transition-styles";
-import type { NativeStackDescriptor } from "../types/native-stack.navigator";
-
-type Props = {
-  previous?: NativeStackDescriptor;
-  current: NativeStackDescriptor;
-  next?: NativeStackDescriptor;
-  children: React.ReactNode;
-};
-
-export function ScreenTransitionProvider({
-  previous,
-  current,
-  next,
-  children,
-}: Props) {
-  return (
-    <KeysProvider previous={previous} current={current} next={next}>
-      <ScreenGestureProvider>
-        <ScreenLifecycleController>
-          <TransitionStylesProvider>
-            <RootTransitionAware>{children}</RootTransitionAware>
-          </TransitionStylesProvider>
-        </ScreenLifecycleController>
-      </ScreenGestureProvider>
-    </KeysProvider>
-  );
-}