react-native-screen-transitions 3.9.0-beta.1 → 3.9.0-beta.2

package/lib/typescript/shared/types/bounds.types.d.ts

@@ -1,7 +1,7 @@
 import type { MeasuredDimensions } from "react-native-reanimated";
 import { NAVIGATION_MASK_CONTAINER_STYLE_ID, NAVIGATION_MASK_ELEMENT_STYLE_ID } from "../constants";
 import type { BoundsLink } from "../stores/bounds/types";
-import type { BoundsComputeOptions, BoundsIdentityInput, BoundsMathResult, BoundsMotion, BoundsMotionFrame, BoundsMotionTransform, BoundsStyleResult } from "../utils/bounds/types/options";
+import type { BoundsComputeOptions, BoundsIdentityInput, BoundsMotion, BoundsMotionFrame, BoundsMotionTransform, BoundsStyleResult, BoundsValuesResult } from "../utils/bounds/types/options";
 import type { ScreenInterpolationProps, TransitionInterpolatedStyle, TransitionSlotStyle } from "./animation.types";
 import type { GestureProgressMode } from "./gesture.types";
 export type { BoundsLink, BoundsLinkStatus } from "../stores/bounds/types";
@@ -255,7 +255,12 @@ type BoundsBoundNavigationAccessor = {
 };
 export type BoundsScopedAccessor = BoundsBoundNavigationAccessor & {
     styles: (options?: BoundsComputeOptions) => BoundsStyleResult;
-    math: <T extends BoundsComputeOptions = BoundsComputeOptions>(options?: T) => BoundsMathResult<T>;
+    /** Returns numeric bounds values for custom style composition. */
+    values: <T extends BoundsComputeOptions = BoundsComputeOptions>(options?: T) => BoundsValuesResult<T>;
+    /**
+     * @deprecated Use {@linkcode values}.
+     */
+    math: <T extends BoundsComputeOptions = BoundsComputeOptions>(options?: T) => BoundsValuesResult<T>;
     link: (id?: BoundsIdentityInput) => BoundsLink | null;
 };
 export type BoundsAccessor = (options: BoundsIdentityInput) => BoundsScopedAccessor;

package/lib/typescript/shared/types/bounds.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bounds.types.d.ts","sourceRoot":"","sources":["../../../../src/shared/types/bounds.types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bounds.types.d.ts","sourceRoot":"","sources":["../../../../src/shared/types/bounds.types.ts"],"names":[],"mappings":"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"}

package/lib/typescript/shared/utils/bounds/helpers/create-bounds-accessor-core.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-bounds-accessor-core.d.ts","sourceRoot":"","sources":["../../../../../../src/shared/utils/bounds/helpers/create-bounds-accessor-core.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,cAAc,EACd,wBAAwB,EACxB,oBAAoB,EACpB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAEX,cAAc,EAId,MAAM,kBAAkB,CAAC;AAK1B,KAAK,wBAAwB,GAAG;IAC/B,MAAM,EAAE,oBAAoB,CAAC;IAC7B,QAAQ,EAAE,cAAc,CAAC;IACzB,KAAK,EAAE,wBAAwB,CAAC;IAChC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;CACxB,CAAC;AAEF,KAAK,8BAA8B,GAAG;IACrC,QAAQ,EAAE,MAAM,wBAAwB,CAAC;IACzC,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,wBAAwB,KAAK,IAAI,CAAC;CAC1D,CAAC;AA2EF,eAAO,MAAM,wBAAwB,GACpC,QAAQ,8BAA8B,KACpC,cAMF,CAAC"}
+{"version":3,"file":"create-bounds-accessor-core.d.ts","sourceRoot":"","sources":["../../../../../../src/shared/utils/bounds/helpers/create-bounds-accessor-core.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,cAAc,EACd,wBAAwB,EACxB,oBAAoB,EACpB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAEX,cAAc,EAId,MAAM,kBAAkB,CAAC;AAK1B,KAAK,wBAAwB,GAAG;IAC/B,MAAM,EAAE,oBAAoB,CAAC;IAC7B,QAAQ,EAAE,cAAc,CAAC;IACzB,KAAK,EAAE,wBAAwB,CAAC;IAChC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;CACxB,CAAC;AAEF,KAAK,8BAA8B,GAAG;IACrC,QAAQ,EAAE,MAAM,wBAAwB,CAAC;IACzC,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,wBAAwB,KAAK,IAAI,CAAC;CAC1D,CAAC;AAkFF,eAAO,MAAM,wBAAwB,GACpC,QAAQ,8BAA8B,KACpC,cAMF,CAAC"}

package/lib/typescript/shared/utils/bounds/types/options.d.ts

@@ -193,7 +193,7 @@ export type BoundsOptions = {
     /**
      * If true, the raw values will be returned instead of the computed values.
      *
-     * @deprecated Use `bounds(id).math(options)` instead of passing `raw`.
+     * @deprecated Use `bounds(id).values(options)` instead of passing `raw`.
      * @default false
      */
     raw?: boolean;
@@ -205,9 +205,13 @@ export type BoundsIdentity = {
 export type BoundsIdentityInput = BoundId | BoundsIdentity;
 export type BoundsComputeOptions = Omit<BoundsOptions, "group" | "id" | "raw">;
 export type BoundsStyleResult = StyleProps;
-export type BoundsMathResult<T extends BoundsComputeOptions = BoundsComputeOptions> = BoundsOptionsResult<T & {
+export type BoundsValuesResult<T extends BoundsComputeOptions = BoundsComputeOptions> = BoundsOptionsResult<T & {
     id: BoundId;
     raw: true;
 }>;
+/**
+ * @deprecated Use {@linkcode BoundsValuesResult}.
+ */
+export type BoundsMathResult<T extends BoundsComputeOptions = BoundsComputeOptions> = BoundsValuesResult<T>;
 export {};
 //# sourceMappingURL=options.d.ts.map

package/lib/typescript/shared/utils/bounds/types/options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../../../../../src/shared/utils/bounds/types/options.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../../../../../src/shared/utils/bounds/types/options.ts"],"names":[],"mappings":"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"}

package/package.json

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

package/src/shared/adapters/with-screen-transitions/index.tsx

@@ -25,7 +25,6 @@ import type {
 	NavigatorLayoutArgs,
 	NavigatorWithScreenTransitions,
 	ScreenLayout,
-	ScreenLayoutArgs,
 } from "./types";
 
 export type { NativeStackAdapterOptions } from "./options";
@@ -41,7 +40,18 @@ type ScreenTransitionsNavigatorTypeBag<TBag extends NavigatorTypeBagBase> =
 		ScreenOptions: NativeStackAdapterOptions<TBag["ScreenOptions"]>;
 	};
 
-function adaptNavigatorChildren(children: ReactNode): ReactNode {
+export function createTransitionScreenLayout(
+	screenLayout?: ScreenLayout,
+): ScreenLayout {
+	return (screenLayoutArgs) => (
+		<ScreenTransitionsScreenLayout
+			screenLayout={screenLayout}
+			screenLayoutArgs={screenLayoutArgs}
+		/>
+	);
+}
+
+export function adaptNavigatorChildren(children: ReactNode): ReactNode {
 	return Children.map(children, (child) => {
 		if (!isValidElement(child)) {
 			return child;
@@ -65,6 +75,22 @@ function adaptNavigatorChildren(children: ReactNode): ReactNode {
 			changed = true;
 		}
 
+		// Screen and group layouts replace the navigator default, so each override
+		// must carry the transition screen layout with it.
+		if (typeof props.layout === "function") {
+			nextProps.layout = createTransitionScreenLayout(
+				props.layout as ScreenLayout,
+			);
+			changed = true;
+		}
+
+		if (typeof props.screenLayout === "function") {
+			nextProps.screenLayout = createTransitionScreenLayout(
+				props.screenLayout as ScreenLayout,
+			);
+			changed = true;
+		}
+
 		if (props.children !== undefined && typeof props.children !== "function") {
 			nextProps.children = adaptNavigatorChildren(props.children as ReactNode);
 			changed = true;
@@ -107,13 +133,8 @@ export function withScreenTransitions(
 				[layout],
 			);
 
-			const transitionScreenLayout = useCallback(
-				(screenLayoutArgs: ScreenLayoutArgs) => (
-					<ScreenTransitionsScreenLayout
-						screenLayout={screenLayout}
-						screenLayoutArgs={screenLayoutArgs}
-					/>
-				),
+			const transitionScreenLayout = useMemo(
+				() => createTransitionScreenLayout(screenLayout),
 				[screenLayout],
 			);
 			const screenOptions = useMemo(

package/src/shared/animation/transition-blocking.ts

@@ -0,0 +1,79 @@
+import { HistoryStore } from "../stores/history.store";
+import { SystemStore } from "../stores/system.store";
+import type { ScreenKey } from "../types/screen.types";
+import { logger } from "../utils/logger";
+
+const resolveTransitionRouteKey = (
+	routeKey: ScreenKey | undefined,
+	actionName: "blockTransition" | "unblockTransition",
+): ScreenKey | undefined => {
+	if (routeKey !== undefined) {
+		if (routeKey.length === 0) {
+			logger.warn(`${actionName}: routeKey must not be empty`);
+			return undefined;
+		}
+
+		return routeKey;
+	}
+
+	const entry = HistoryStore.getMostRecent();
+	if (!entry) {
+		logger.warn(`${actionName}: No screens in history`);
+		return undefined;
+	}
+
+	return entry.descriptor.route.key;
+};
+
+/**
+ * Prevents a screen's pending lifecycle transition from starting.
+ *
+ * Calls are reference-counted. Every call must be paired with one
+ * {@linkcode unblockTransition} call for the same route. When `routeKey` is
+ * omitted, the most recently focused screen in navigation history is used.
+ *
+ * @param routeKey - Route key of the screen to block.
+ *
+ * @example
+ * ```tsx
+ * blockTransition(route.key);
+ * // Render or prepare the destination screen.
+ * unblockTransition(route.key);
+ * ```
+ *
+ * @see {@linkcode unblockTransition}
+ */
+export function blockTransition(routeKey?: ScreenKey): void {
+	const resolvedRouteKey = resolveTransitionRouteKey(
+		routeKey,
+		"blockTransition",
+	);
+	if (!resolvedRouteKey) {
+		return;
+	}
+
+	SystemStore.getBag(resolvedRouteKey).actions.blockLifecycleStart();
+}
+
+/**
+ * Releases one lifecycle transition block for a screen.
+ *
+ * The pending transition can start when the screen's final block is released.
+ * Extra calls are safe and leave the block count at zero. When `routeKey` is
+ * omitted, the most recently focused screen in navigation history is used.
+ *
+ * @param routeKey - Route key of the screen to unblock.
+ *
+ * @see {@linkcode blockTransition}
+ */
+export function unblockTransition(routeKey?: ScreenKey): void {
+	const resolvedRouteKey = resolveTransitionRouteKey(
+		routeKey,
+		"unblockTransition",
+	);
+	if (!resolvedRouteKey) {
+		return;
+	}
+
+	SystemStore.getBag(resolvedRouteKey).actions.unblockLifecycleStart();
+}

package/src/shared/components/boundary/components/boundary-target.tsx

@@ -1,5 +1,5 @@
 import type React from "react";
-import { memo, useLayoutEffect, useMemo } from "react";
+import { memo, useMemo } from "react";
 import type { View } from "react-native";
 import Animated, { useAnimatedRef } from "react-native-reanimated";
 import {
@@ -7,79 +7,72 @@ import {
 	useSlotLayoutStyles,
 } from "../../../providers/screen/styles";
 import { prepareStyleForBounds } from "../../../utils/bounds/helpers/styles/styles";
-import { logger } from "../../../utils/logger";
-import { Portal } from "../portal/components/portal";
-import {
-	TARGET_OUTSIDE_ROOT_WARNING,
-	useBoundaryRootContext,
-} from "../providers/boundary-root.provider";
+import { useRegisterTarget } from "../hooks/use-register-target";
+import { BoundaryContentPortal } from "../portal/components/boundary-content-portal";
+import { BoundaryPortal } from "../portal/components/boundary-portal";
+import { useBoundaryRootContext } from "../providers/boundary-root.provider";
 
 type BoundaryTargetProps = React.ComponentProps<typeof Animated.View>;
 
 export const BoundaryTarget = memo(function BoundaryTarget(
 	props: BoundaryTargetProps,
 ) {
-	const { style, ...rest } = props;
+	const { pointerEvents, style, ...rest } = props;
 	const targetAnimatedRef = useAnimatedRef<View>();
-	const placeholderAnimatedRef = useAnimatedRef<View>();
+	const targetEscapePlaceholderRef = useAnimatedRef<View>();
 	const rootContext = useBoundaryRootContext();
-	const registerTargetRef = rootContext?.registerTargetRef;
-	const unregisterTargetRef = rootContext?.unregisterTargetRef;
+	const boundaryId = rootContext?.boundTag.tag;
 	const isActiveTarget = rootContext?.activeTargetRef === targetAnimatedRef;
 	const portalRuntime = rootContext?.portalRuntime;
+	const portalPointerEvents =
+		typeof pointerEvents === "string" ? pointerEvents : undefined;
+	const shouldEscapeTargetToScreenHost =
+		portalRuntime?.escapeClipping === true && boundaryId !== undefined;
+
 	const shouldApplyAssociatedStyleInline =
 		isActiveTarget && portalRuntime?.enabled !== true;
 	const shouldApplyPortalLayoutStyle =
 		isActiveTarget && portalRuntime?.enabled === true;
+
 	const associatedTargetStyles = useComposedSlotStyles(
 		rootContext?.boundTag.tag,
 		style,
 	);
 	const portalLayoutStyle = useSlotLayoutStyles(rootContext?.boundTag.tag);
 	const preparedStyles = useMemo(() => prepareStyleForBounds(style), [style]);
-	// Teleported content can render outside its layout slot. The placeholder is
-	// the truthful measurement surface whenever runtime portal behavior is active.
-	const measurementRef = portalRuntime?.enabled
-		? placeholderAnimatedRef
-		: targetAnimatedRef;
 
-	useLayoutEffect(() => {
-		if (!registerTargetRef || !unregisterTargetRef) {
-			if (__DEV__) {
-				logger.warn(TARGET_OUTSIDE_ROOT_WARNING);
-			}
-			return;
-		}
+	const measurementRef = shouldEscapeTargetToScreenHost
+		? targetEscapePlaceholderRef
+		: targetAnimatedRef;
 
-		registerTargetRef(targetAnimatedRef, preparedStyles, measurementRef);
-		return () => {
-			unregisterTargetRef(targetAnimatedRef);
-		};
-	}, [
-		registerTargetRef,
-		unregisterTargetRef,
-		targetAnimatedRef,
-		preparedStyles,
-		measurementRef,
-	]);
+	useRegisterTarget({ preparedStyles, measurementRef, targetAnimatedRef });
 
 	return (
-		<Portal
-			id={rootContext?.boundTag.tag}
-			handoff={portalRuntime?.handoff}
-			escapeClipping={portalRuntime?.escapeClipping}
-			placeholderRef={placeholderAnimatedRef}
+		<BoundaryPortal
+			boundaryId={boundaryId ?? ""}
+			enabled={shouldEscapeTargetToScreenHost}
+			placeholderRef={targetEscapePlaceholderRef}
+			pointerEvents={portalPointerEvents}
 		>
-			<Animated.View
-				{...rest}
-				ref={targetAnimatedRef}
-				style={[
-					style,
-					shouldApplyAssociatedStyleInline ? associatedTargetStyles : undefined,
-					shouldApplyPortalLayoutStyle ? portalLayoutStyle : undefined,
-				]}
-				collapsable={false}
-			/>
-		</Portal>
+			<BoundaryContentPortal
+				boundaryId={boundaryId}
+				enabled={portalRuntime?.handoff === true}
+				pointerEvents={portalPointerEvents}
+			>
+				<Animated.View
+					{...rest}
+					pointerEvents={pointerEvents}
+					ref={targetAnimatedRef}
+					style={[
+						style,
+						shouldApplyAssociatedStyleInline
+							? associatedTargetStyles
+							: undefined,
+						shouldApplyPortalLayoutStyle ? portalLayoutStyle : undefined,
+					]}
+					collapsable={false}
+				/>
+			</BoundaryContentPortal>
+		</BoundaryPortal>
 	);
 });

package/src/shared/components/boundary/create-boundary-component.tsx

@@ -1,49 +1,14 @@
-import {
-	type ComponentType,
-	forwardRef,
-	memo,
-	type ReactNode,
-	useImperativeHandle,
-	useMemo,
-} from "react";
-import type { View } from "react-native";
-import Animated, { useAnimatedRef } from "react-native-reanimated";
-import { useDescriptorsStore } from "../../providers/screen/descriptors";
-import {
-	useComposedSlotStyles,
-	useSlotStackingStyles,
-} from "../../providers/screen/styles";
-import { createBoundTag } from "../../stores/bounds/helpers/link-pairs.helpers";
-import { useBoundaryMeasurement } from "./hooks/use-boundary-measurement";
-import { BoundaryLocalPortalHost } from "./portal/components/boundary-local-portal-host";
-import { Portal } from "./portal/components/portal";
-import { resolveBoundaryPortal } from "./portal/utils/resolve-portal";
-import {
-	BoundaryRootProvider,
-	useBoundaryRootState,
-} from "./providers/boundary-root.provider";
+import { type ComponentType, forwardRef, memo } from "react";
+import Animated from "react-native-reanimated";
+import { BoundaryContentPortalHost } from "./portal/components/boundary-content-portal";
+import { BoundaryPortal } from "./portal/components/boundary-portal";
+import { BoundaryRootProvider } from "./providers/boundary-root.provider";
 import type { BoundaryComponentProps } from "./types";
 
 interface CreateBoundaryComponentOptions {
 	alreadyAnimated?: boolean;
 }
 
-const hasRenderableChildren = (children: ReactNode): boolean => {
-	if (
-		children === null ||
-		children === undefined ||
-		typeof children === "boolean"
-	) {
-		return false;
-	}
-
-	if (Array.isArray(children)) {
-		return children.some(hasRenderableChildren);
-	}
-
-	return true;
-};
-
 export function createBoundaryComponent<P extends object>(
 	Wrapped: ComponentType<P>,
 	options: CreateBoundaryComponentOptions = {},
@@ -66,124 +31,44 @@ export function createBoundaryComponent<P extends object>(
 			target,
 			method,
 			style,
-			onPress,
 			handoff,
 			escapeClipping,
 			children,
 			...rest
 		} = props as any;
 
-		const boundTag = useMemo(
-			() => createBoundTag(String(id), group),
-			[id, group],
-		);
-		const portalRuntime = resolveBoundaryPortal({
-			handoff,
-			escapeClipping,
-		});
-
-		const currentScreenKey = useDescriptorsStore(
-			(s) => s.derivations.currentScreenKey,
-		);
-		const hasConfiguredInterpolator = useDescriptorsStore(
-			(s) => s.derivations.hasConfiguredInterpolator,
-		);
-		const runtimeEnabled = enabled && hasConfiguredInterpolator;
-		// Associated slot styles attach whenever the boundary is enabled,
-		// independent of whether an interpolator is configured for this transition.
-		const shouldAttachAssociatedStyles = enabled;
-		const canPortalRoot =
-			portalRuntime.enabled && hasRenderableChildren(children);
-
-		const associatedStyles = useComposedSlotStyles(boundTag.tag, style);
-		const associatedStackingStyles = useSlotStackingStyles(boundTag.tag);
-		const rootPlaceholderRef = useAnimatedRef<View>();
-
-		const {
-			ref,
-			contextValue,
-			measuredRef,
-			hasActiveTarget,
-			targetPreparedStyles,
-		} = useBoundaryRootState({
-			boundTag,
-			portalRuntime,
-			rootMeasurementRef: canPortalRoot ? rootPlaceholderRef : undefined,
-		});
-
-		useBoundaryMeasurement({
-			boundTag,
-			enabled,
-			runtimeEnabled,
-			currentScreenKey,
-			measuredRef,
-			style,
-			targetPreparedStyles,
-			handoff: portalRuntime.handoff,
-			escapeClipping: portalRuntime.escapeClipping,
-			config: { anchor, scaleMode, target, method },
-		});
-
-		useImperativeHandle(forwardedRef, () => ref.current as any, [ref]);
-
-		const shouldPortalRoot = canPortalRoot && !hasActiveTarget;
-		// A nested active target takes the full associated style, so the root keeps
-		// only its stacking context. Without a nested target, a portal'd root is the
-		// target, so its associated style is applied through the portal host instead
-		// of inline on the teleported element.
-		// Host-only handoff receivers still need the associated style: their local
-		// portal host is absolute-filled inside this root, so the root is the visual
-		// frame that animates the received payload.
-		const attachedStyle = shouldAttachAssociatedStyles
-			? hasActiveTarget
-				? associatedStackingStyles
-				: shouldPortalRoot
-					? undefined
-					: associatedStyles
-			: undefined;
-		const pressProps = typeof onPress === "function" ? { onPress } : undefined;
-
-		const localPortalHost = (
-			<BoundaryLocalPortalHost
-				boundaryId={boundTag.tag}
-				enabled={enabled && portalRuntime.handoff}
-				screenKey={currentScreenKey}
-			/>
-		);
-		const canInjectLocalPortalHost = typeof children !== "function";
-
-		const renderBoundaryRoot = (extraChildren?: ReactNode) => (
-			<AnimatedComponent
-				{...rest}
-				{...pressProps}
-				ref={ref}
-				style={[style, attachedStyle]}
-				collapsable={false}
-			>
-				{children}
-				{canInjectLocalPortalHost ? extraChildren : null}
-			</AnimatedComponent>
-		);
-		const boundaryRoot = renderBoundaryRoot(
-			shouldPortalRoot ? undefined : localPortalHost,
-		);
-
 		return (
-			<BoundaryRootProvider value={contextValue}>
-				{shouldPortalRoot ? (
-					<Portal
-						id={boundTag.tag}
-						handoff={portalRuntime.handoff}
-						escapeClipping={portalRuntime.escapeClipping}
-						placeholderRef={rootPlaceholderRef}
-						placeholderChildren={
-							portalRuntime.handoff ? localPortalHost : undefined
-						}
+			<BoundaryRootProvider
+				config={{ anchor, scaleMode, target, method }}
+				enabled={enabled}
+				escapeClipping={escapeClipping}
+				forwardedRef={forwardedRef}
+				group={group}
+				handoff={handoff}
+				id={id}
+				style={style}
+			>
+				{(root) => (
+					<BoundaryPortal
+						boundaryId={root.boundTag.tag}
+						enabled={root.shouldRenderBoundaryRootThroughPortal}
+						placeholderRef={root.rootEscapePlaceholderRef}
 					>
-						{boundaryRoot}
-					</Portal>
-				) : (
-					boundaryRoot
+						<AnimatedComponent
+							{...rest}
+							ref={root.ref}
+							style={[style, root.attachedStyle]}
+							collapsable={false}
+						>
+							<BoundaryContentPortalHost
+								boundaryId={root.boundTag.tag}
+								enabled={root.shouldRenderHandoffHost}
+								screenKey={root.currentScreenKey}
+							>
+								{children}
+							</BoundaryContentPortalHost>
+						</AnimatedComponent>
+					</BoundaryPortal>
 				)}
 			</BoundaryRootProvider>
 		);