diff --git a/packages/bits-ui/src/lib/bits/dialog/types.ts b/packages/bits-ui/src/lib/bits/dialog/types.ts
index 4310ca3f4..abe798512 100644
--- a/packages/bits-ui/src/lib/bits/dialog/types.ts
+++ b/packages/bits-ui/src/lib/bits/dialog/types.ts
@@ -1,113 +1,16 @@
-import type { HTMLButtonAttributes } from "svelte/elements";
-import type { CreateDialogProps as MeltDialogProps } from "@melt-ui/svelte";
-import type {
-	DOMElement,
-	Expand,
-	HTMLDivAttributes,
-	HTMLHeadingAttributes,
-	OmitOpen,
-	OnChangeFn,
-	SvelteEvent,
-	Transition,
-	TransitionProps,
-} from "$lib/internal/index.js";
-import type { CustomEventHandler } from "$lib/index.js";
+import type { Snippet } from "svelte";
+import type { OnChangeFn, WithAsChild } from "$lib/internal/types.js";
 
-import type { FocusProp } from "$lib/shared/index.js";
+export type DialogRootPropsWithoutHTML = {
+	/**
+	 * The open state of the dialog.
+	 */
+	open?: boolean;
 
-export type DialogPropsWithoutHTML = Expand<
-	OmitOpen<
-		Omit<MeltDialogProps, "role" | "ids" | "forceVisible" | "openFocus" | "closeFocus">
-	> & {
-		/**
-		 * The open state of the dialog.
-		 * You can bind this to a boolean value to programmatically control the open state.
-		 *
-		 * @defaultValue false
-		 */
-		open?: MeltDialogProps["defaultOpen"] & {};
+	/**
+	 * A callback that is called when the popover's open state changes.
+	 */
+	onOpenChange?: OnChangeFn<boolean>;
 
-		/**
-		 * A callback function called when the open state changes.
-		 */
-		onOpenChange?: OnChangeFn<boolean>;
-
-		/**
-		 * Override the default autofocus behavior of the dialog when it opens
-		 */
-		openFocus?: FocusProp;
-
-		/**
-		 * Override the default autofocus behavior of the dialog after close
-		 */
-		closeFocus?: FocusProp;
-	}
->;
-
-export type DialogTriggerPropsWithoutHTML = DOMElement<HTMLButtonElement>;
-
-export type DialogClosePropsWithoutHTML = DialogTriggerPropsWithoutHTML;
-
-export type DialogContentPropsWithoutHTML<
-	T extends Transition = Transition,
-	In extends Transition = Transition,
-	Out extends Transition = Transition,
-> = Expand<TransitionProps<T, In, Out> & DOMElement>;
-
-export type DialogDescriptionPropsWithoutHTML = DOMElement;
-
-export type DialogOverlayPropsWithoutHTML<
-	T extends Transition = Transition,
-	In extends Transition = Transition,
-	Out extends Transition = Transition,
-> = Expand<TransitionProps<T, In, Out> & DOMElement>;
-
-export type DialogPortalPropsWithoutHTML = DOMElement;
-
-export type DialogTitlePropsWithoutHTML = Expand<
-	{
-		level?: "h1" | "h2" | "h3" | "h4" | "h5" | "h6";
-	} & DOMElement<HTMLHeadingElement>
->;
-
-export type DialogProps = DialogPropsWithoutHTML;
-
-export type DialogTriggerProps = DialogTriggerPropsWithoutHTML & HTMLButtonAttributes;
-export type DialogCloseProps = DialogTriggerProps;
-
-export type DialogContentProps<
-	T extends Transition = Transition,
-	In extends Transition = Transition,
-	Out extends Transition = Transition,
-> = DialogContentPropsWithoutHTML<T, In, Out> & HTMLDivAttributes;
-
-export type DialogDescriptionProps = DialogDescriptionPropsWithoutHTML & HTMLDivAttributes;
-
-export type DialogOverlayProps<
-	T extends Transition = Transition,
-	In extends Transition = Transition,
-	Out extends Transition = Transition,
-> = DialogOverlayPropsWithoutHTML<T, In, Out> & HTMLDivAttributes;
-
-export type DialogPortalProps = DialogPortalPropsWithoutHTML & HTMLDivAttributes;
-export type DialogTitleProps = DialogTitlePropsWithoutHTML & HTMLHeadingAttributes;
-
-export type DialogOverlayEvents<T extends Element = HTMLElement> = {
-	mouseup: SvelteEvent<MouseEvent, T>;
-};
-
-export type DialogContentEvents<T extends Element = HTMLElement> = {
-	pointerdown: SvelteEvent<PointerEvent, T>;
-	pointerup: SvelteEvent<PointerEvent, T>;
-	pointermove: SvelteEvent<PointerEvent, T>;
-	touchend: SvelteEvent<TouchEvent, T>;
-	touchstart: SvelteEvent<TouchEvent, T>;
-	touchcancel: SvelteEvent<TouchEvent, T>;
-	touchmove: SvelteEvent<TouchEvent, T>;
-};
-
-export type DialogTriggerEvents<T extends Element = HTMLButtonElement> = {
-	click: CustomEventHandler<MouseEvent, T>;
-	keydown: CustomEventHandler<KeyboardEvent, T>;
+	children?: Snippet;
 };
-export type DialogCloseEvents = DialogTriggerEvents;
diff --git a/packages/bits-ui/src/lib/bits/popover/components/popover-content.svelte b/packages/bits-ui/src/lib/bits/popover/components/popover-content.svelte
index 119f168f2..7c694f59a 100644
--- a/packages/bits-ui/src/lib/bits/popover/components/popover-content.svelte
+++ b/packages/bits-ui/src/lib/bits/popover/components/popover-content.svelte
@@ -12,6 +12,9 @@
 		id = useId(),
 		forceMount = false,
 		onDestroyAutoFocus = noop,
+		onEscapeKeydown = noop,
+		onInteractOutside = noop,
+		loop = true,
 		...restProps
 	}: ContentProps = $props();
 
@@ -24,8 +27,16 @@
 	{...restProps}
 	present={state.root.open.value || forceMount}
 	{id}
-	onInteractOutside={state.root.close}
-	onEscape={state.root.close}
+	onInteractOutside={(e) => {
+		onInteractOutside(e);
+		if (e.defaultPrevented) return;
+		state.root.close();
+	}}
+	onEscapeKeydown={(e) => {
+		// TODO: users should be able to cancel this
+		onEscapeKeydown(e);
+		state.root.close();
+	}}
 	onDestroyAutoFocus={(e) => {
 		onDestroyAutoFocus(e);
 		if (e.defaultPrevented) return;
@@ -33,7 +44,7 @@
 		state.root.triggerNode?.value?.focus();
 	}}
 	trapped
-	loop
+	{loop}
 >
 	{#snippet popper({ props })}
 		{@const mergedProps = mergeProps(restProps, state.props, props)}
diff --git a/packages/bits-ui/src/lib/bits/popover/types.ts b/packages/bits-ui/src/lib/bits/popover/types.ts
index bae972d88..42111a4db 100644
--- a/packages/bits-ui/src/lib/bits/popover/types.ts
+++ b/packages/bits-ui/src/lib/bits/popover/types.ts
@@ -1,5 +1,6 @@
 import type { Snippet } from "svelte";
 import type { ArrowProps, ArrowPropsWithoutHTML } from "../utilities/arrow/types.js";
+import type { PopperLayerProps } from "../utilities/popper-layer/types.js";
 import type {
 	EventCallback,
 	OnChangeFn,
@@ -8,7 +9,6 @@ import type {
 	WithAsChild,
 } from "$lib/internal/index.js";
 import type { CustomEventHandler } from "$lib/index.js";
-import type { FloatingLayer } from "$lib/bits/utilities/floating-layer/index.js";
 
 export type PopoverRootPropsWithoutHTML = {
 	/**
@@ -27,23 +27,9 @@ export type PopoverRootPropsWithoutHTML = {
 	children?: Snippet;
 };
 
-export type PopoverRootProps = PopoverRootPropsWithoutHTML & PrimitiveDivAttributes;
+export type PopoverRootProps = PopoverRootPropsWithoutHTML;
 
-export type PopoverContentPropsWithoutHTML = WithAsChild<
-	Partial<Omit<FloatingLayer.ContentProps, "content">> & {
-		forceMount?: boolean;
-	} & {
-		onMountAutoFocus?: EventCallback;
-		onDestroyAutoFocus?: EventCallback;
-	} & {
-		/**
-		 * Whether to prevent scrolling the body when the popover is open or not.
-		 *
-		 * @defaultValue true
-		 */
-		preventScroll?: boolean;
-	}
->;
+export type PopoverContentPropsWithoutHTML = WithAsChild<PopperLayerProps>;
 
 export type PopoverContentProps = PopoverContentPropsWithoutHTML & PrimitiveDivAttributes;
 
diff --git a/packages/bits-ui/src/lib/bits/utilities/dismissable-layer/dismissable-layer.svelte b/packages/bits-ui/src/lib/bits/utilities/dismissable-layer/dismissable-layer.svelte
index a7ae166f0..3d615c9b1 100644
--- a/packages/bits-ui/src/lib/bits/utilities/dismissable-layer/dismissable-layer.svelte
+++ b/packages/bits-ui/src/lib/bits/utilities/dismissable-layer/dismissable-layer.svelte
@@ -1,20 +1,20 @@
 <script lang="ts">
-	import type { DismissableLayerProps } from "./types.js";
+	import type { DismissableLayerImplProps } from "./types.js";
 	import { useDismissableLayer } from "./useDismissableLayer.svelte.js";
 	import { noop, readonlyBox } from "$lib/internal/index.js";
 
 	let {
-		behaviorType = "close",
+		interactOutsideBehavior = "close",
 		onInteractOutside = noop,
 		onInteractOutsideStart = noop,
 		id,
 		children,
 		present,
-	}: DismissableLayerProps = $props();
+	}: DismissableLayerImplProps = $props();
 
 	useDismissableLayer({
 		id: readonlyBox(() => id),
-		behaviorType: readonlyBox(() => behaviorType),
+		interactOutsideBehavior: readonlyBox(() => interactOutsideBehavior),
 		onInteractOutside: readonlyBox(() => onInteractOutside),
 		onInteractOutsideStart: readonlyBox(() => onInteractOutsideStart),
 		present: readonlyBox(() => present),
diff --git a/packages/bits-ui/src/lib/bits/utilities/dismissable-layer/types.ts b/packages/bits-ui/src/lib/bits/utilities/dismissable-layer/types.ts
index 044e3fca4..0e73c966d 100644
--- a/packages/bits-ui/src/lib/bits/utilities/dismissable-layer/types.ts
+++ b/packages/bits-ui/src/lib/bits/utilities/dismissable-layer/types.ts
@@ -10,13 +10,6 @@ export type InteractOutsideBehaviorType =
 	| "ignore";
 
 export type DismissableLayerProps = {
-	/**
-	 * DOM ID of the node.
-	 */
-	id: string;
-
-	children?: Snippet;
-
 	/**
 	 * Callback fired when an outside interaction event completes,
 	 * which is either a `pointerup`, `mouseup`, or `touchend`
@@ -44,14 +37,23 @@ export type DismissableLayerProps = {
 	 *
 	 * @defaultValue `close`
 	 */
-	behaviorType?: InteractOutsideBehaviorType;
+	interactOutsideBehavior?: InteractOutsideBehaviorType;
+};
 
+export type DismissableLayerImplProps = {
 	/**
 	 * Whether the layer is active. Currently, we determine this with the
 	 * `presence` returned from the `presence` layer.
 	 */
 	present: boolean;
-};
+
+	/**
+	 * ID of the layer.
+	 */
+	id: string;
+
+	children?: Snippet;
+} & DismissableLayerProps;
 
 export type InteractOutsideInterceptEventType =
 	| "pointerdown"
diff --git a/packages/bits-ui/src/lib/bits/utilities/dismissable-layer/useDismissableLayer.svelte.ts b/packages/bits-ui/src/lib/bits/utilities/dismissable-layer/useDismissableLayer.svelte.ts
index 60ebcfd08..8375c5327 100644
--- a/packages/bits-ui/src/lib/bits/utilities/dismissable-layer/useDismissableLayer.svelte.ts
+++ b/packages/bits-ui/src/lib/bits/utilities/dismissable-layer/useDismissableLayer.svelte.ts
@@ -1,5 +1,6 @@
 import { untrack } from "svelte";
 import type {
+	DismissableLayerImplProps,
 	DismissableLayerProps,
 	InteractOutsideBehaviorType,
 	InteractOutsideEvent,
@@ -36,7 +37,7 @@ const interactOutsideEndEvents = [
 ] satisfies InteractOutsideInterceptEventType[];
 
 type DismissableLayerStateProps = ReadonlyBoxedValues<
-	Required<Omit<DismissableLayerProps, "children">>
+	Required<Omit<DismissableLayerImplProps, "children">>
 >;
 
 export class DismissableLayerState {
@@ -60,7 +61,7 @@ export class DismissableLayerState {
 
 	constructor(props: DismissableLayerStateProps) {
 		this.node = useNodeById(props.id);
-		this.#behaviorType = props.behaviorType;
+		this.#behaviorType = props.interactOutsideBehavior;
 		this.#interactOutsideStartProp = props.onInteractOutsideStart;
 		this.#interactOutsideProp = props.onInteractOutside;
 		this.#present = props.present;
diff --git a/packages/bits-ui/src/lib/bits/utilities/escape-layer/escape-layer.svelte b/packages/bits-ui/src/lib/bits/utilities/escape-layer/escape-layer.svelte
index 82de07397..56cb8c6d8 100644
--- a/packages/bits-ui/src/lib/bits/utilities/escape-layer/escape-layer.svelte
+++ b/packages/bits-ui/src/lib/bits/utilities/escape-layer/escape-layer.svelte
@@ -1,13 +1,18 @@
 <script lang="ts">
-	import type { EscapeLayerProps } from "./types.js";
+	import type { EscapeLayerImplProps } from "./types.js";
 	import { useEscapeLayer } from "./useEscapeLayer.svelte.js";
 	import { noop, readonlyBox } from "$lib/internal/index.js";
 
-	let { behaviorType = "close", onEscape = noop, children, present }: EscapeLayerProps = $props();
+	let {
+		behaviorType = "close",
+		onEscapeKeydown = noop,
+		children,
+		present,
+	}: EscapeLayerImplProps = $props();
 
 	useEscapeLayer({
 		behaviorType: readonlyBox(() => behaviorType),
-		onEscape: readonlyBox(() => onEscape),
+		onEscapeKeydown: readonlyBox(() => onEscapeKeydown),
 		present: readonlyBox(() => present),
 	});
 </script>
diff --git a/packages/bits-ui/src/lib/bits/utilities/escape-layer/types.ts b/packages/bits-ui/src/lib/bits/utilities/escape-layer/types.ts
index f0dd2e5b4..39090c132 100644
--- a/packages/bits-ui/src/lib/bits/utilities/escape-layer/types.ts
+++ b/packages/bits-ui/src/lib/bits/utilities/escape-layer/types.ts
@@ -7,12 +7,10 @@ export type EscapeBehaviorType =
 	| "ignore";
 
 export type EscapeLayerProps = {
-	children?: Snippet;
-
 	/**
 	 * Callback fired when escape is pressed.
 	 */
-	onEscape?: (e: KeyboardEvent) => void;
+	onEscapeKeydown?: (e: KeyboardEvent) => void;
 
 	/**
 	 * Escape behavior type.
@@ -24,10 +22,15 @@ export type EscapeLayerProps = {
 	 * @defaultValue `close`
 	 */
 	behaviorType?: EscapeBehaviorType;
+};
 
+// internal props not exposed to the user but used in the implementation
+export type EscapeLayerImplProps = {
 	/**
 	 * Whether the layer is enabled. Currently, we determine this with the
 	 * `presence` returned from the `presence` layer.
 	 */
 	present: boolean;
-};
+
+	children?: Snippet;
+} & EscapeLayerProps;
diff --git a/packages/bits-ui/src/lib/bits/utilities/escape-layer/useEscapeLayer.svelte.ts b/packages/bits-ui/src/lib/bits/utilities/escape-layer/useEscapeLayer.svelte.ts
index 4c2414d8b..71395df82 100644
--- a/packages/bits-ui/src/lib/bits/utilities/escape-layer/useEscapeLayer.svelte.ts
+++ b/packages/bits-ui/src/lib/bits/utilities/escape-layer/useEscapeLayer.svelte.ts
@@ -1,5 +1,5 @@
 import { untrack } from "svelte";
-import type { EscapeBehaviorType, EscapeLayerProps } from "./types.js";
+import type { EscapeBehaviorType, EscapeLayerImplProps } from "./types.js";
 import type { ReadonlyBox, ReadonlyBoxedValues } from "$lib/internal/box.svelte.js";
 import { type EventCallback, addEventListener } from "$lib/internal/events.js";
 import { kbd } from "$lib/internal/kbd.js";
@@ -7,7 +7,7 @@ import { noop } from "$lib/internal/callbacks.js";
 
 const layers = new Map<EscapeLayerState, ReadonlyBox<EscapeBehaviorType>>();
 
-type EscapeLayerStateProps = ReadonlyBoxedValues<Required<Omit<EscapeLayerProps, "children">>>;
+type EscapeLayerStateProps = ReadonlyBoxedValues<Required<Omit<EscapeLayerImplProps, "children">>>;
 
 export class EscapeLayerState {
 	#onEscapeProp: ReadonlyBox<EventCallback<KeyboardEvent>>;
@@ -16,7 +16,7 @@ export class EscapeLayerState {
 
 	constructor(props: EscapeLayerStateProps) {
 		this.#behaviorType = props.behaviorType;
-		this.#onEscapeProp = props.onEscape;
+		this.#onEscapeProp = props.onEscapeKeydown;
 		this.#present = props.present;
 
 		let unsubEvents = noop;
diff --git a/packages/bits-ui/src/lib/bits/utilities/floating-layer/components/floating-layer-content.svelte b/packages/bits-ui/src/lib/bits/utilities/floating-layer/components/floating-layer-content.svelte
index aba68ce22..4f6eb2572 100644
--- a/packages/bits-ui/src/lib/bits/utilities/floating-layer/components/floating-layer-content.svelte
+++ b/packages/bits-ui/src/lib/bits/utilities/floating-layer/components/floating-layer-content.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { setFloatingContentState } from "../useFloatingLayer.svelte.js";
-	import type { ContentProps } from "./index.js";
+	import type { ContentImplProps } from "./index.js";
 	import { mergeProps, readonlyBox, useId } from "$lib/internal/index.js";
 	import { useBodyScrollLock } from "$lib/internal/useBodyScrollLock.svelte.js";
 
@@ -24,7 +24,8 @@
 		style = {},
 		present,
 		wrapperId = useId(),
-	}: ContentProps = $props();
+		preventScroll = true,
+	}: ContentImplProps = $props();
 
 	const state = setFloatingContentState({
 		side: readonlyBox(() => side),
@@ -47,9 +48,15 @@
 		wrapperId: readonlyBox(() => wrapperId),
 	});
 
-	const mergedProps = $derived(mergeProps(state.wrapperProps));
+	const mergedProps = $derived(
+		mergeProps(state.wrapperProps, {
+			style: {
+				pointerEvents: "auto",
+			},
+		})
+	);
 
-	useBodyScrollLock(true);
+	useBodyScrollLock(preventScroll);
 </script>
 
 <div {...mergedProps}>
diff --git a/packages/bits-ui/src/lib/bits/utilities/floating-layer/components/index.ts b/packages/bits-ui/src/lib/bits/utilities/floating-layer/components/index.ts
index c64cdb147..8e3d3eba0 100644
--- a/packages/bits-ui/src/lib/bits/utilities/floating-layer/components/index.ts
+++ b/packages/bits-ui/src/lib/bits/utilities/floating-layer/components/index.ts
@@ -4,6 +4,7 @@ export { default as Content } from "./floating-layer-content.svelte";
 export { default as Root } from "./floating-layer.svelte";
 
 export type {
+	FloatingLayerContentImplProps as ContentImplProps,
 	FloatingLayerContentProps as ContentProps,
 	FloatingLayerAnchorProps as AnchorProps,
 } from "../types.js";
diff --git a/packages/bits-ui/src/lib/bits/utilities/floating-layer/types.ts b/packages/bits-ui/src/lib/bits/utilities/floating-layer/types.ts
index b9f227ae7..84c9ee3ae 100644
--- a/packages/bits-ui/src/lib/bits/utilities/floating-layer/types.ts
+++ b/packages/bits-ui/src/lib/bits/utilities/floating-layer/types.ts
@@ -4,7 +4,6 @@ import type { Arrayable } from "$lib/internal/types.js";
 import type { Direction, StyleProperties } from "$lib/shared/index.js";
 
 export type FloatingLayerContentProps = {
-	id: string;
 	/**
 	 * The preferred side of the anchor to render against when open.
 	 * Will be reversed when collisions occur.
@@ -76,11 +75,6 @@ export type FloatingLayerContentProps = {
 
 	updatePositionStrategy?: "optimized" | "always";
 
-	/**
-	 * Callback that is called when the floating element is placed.
-	 */
-	onPlaced?: () => void;
-
 	content?: Snippet<[{ props: Record<string, unknown> }]>;
 
 	/**
@@ -95,10 +89,13 @@ export type FloatingLayerContentProps = {
 	dir?: Direction;
 
 	/**
-	 * The style properties to apply to the content.
+	 * Whether to prevent scrolling the body when the content is open.
 	 */
-	style?: StyleProperties;
+	preventScroll?: boolean;
+};
 
+export type FloatingLayerContentImplProps = {
+	id: string;
 	/**
 	 * Whether the floating layer is present.
 	 */
@@ -108,7 +105,17 @@ export type FloatingLayerContentProps = {
 	 * The ID of the content wrapper element.
 	 */
 	wrapperId?: string;
-};
+
+	/**
+	 * The style properties to apply to the content.
+	 */
+	style?: StyleProperties;
+
+	/**
+	 * Callback that is called when the floating element is placed.
+	 */
+	onPlaced?: () => void;
+} & FloatingLayerContentProps;
 
 export type FloatingLayerAnchorProps = {
 	id: string;
diff --git a/packages/bits-ui/src/lib/bits/utilities/focus-scope/focus-scope.svelte b/packages/bits-ui/src/lib/bits/utilities/focus-scope/focus-scope.svelte
index d8da1be80..0dbb1d81e 100644
--- a/packages/bits-ui/src/lib/bits/utilities/focus-scope/focus-scope.svelte
+++ b/packages/bits-ui/src/lib/bits/utilities/focus-scope/focus-scope.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import type { FocusScopeProps } from "./types.js";
+	import type { FocusScopeImplProps } from "./types.js";
 	import { useFocusScope } from "./useFocusScope.svelte.js";
 	import { readonlyBox } from "$lib/internal/box.svelte.js";
 	import { noop } from "$lib/internal/callbacks.js";
@@ -11,7 +11,7 @@
 		onDestroyAutoFocus = noop,
 		onMountAutoFocus = noop,
 		focusScope,
-	}: FocusScopeProps = $props();
+	}: FocusScopeImplProps = $props();
 
 	const state = useFocusScope({
 		trapped: readonlyBox(() => trapped),
diff --git a/packages/bits-ui/src/lib/bits/utilities/focus-scope/types.ts b/packages/bits-ui/src/lib/bits/utilities/focus-scope/types.ts
index e54129a24..da4731b13 100644
--- a/packages/bits-ui/src/lib/bits/utilities/focus-scope/types.ts
+++ b/packages/bits-ui/src/lib/bits/utilities/focus-scope/types.ts
@@ -3,11 +3,6 @@ import type { FocusScopeContainerProps } from "./useFocusScope.svelte.js";
 import type { EventCallback } from "$lib/internal/events.js";
 
 export type FocusScopeProps = {
-	/**
-	 * The ID of the focus scope container node.
-	 */
-	id: string;
-
 	/**
 	 * When `true` will loop through the tabbable elements in the focus scope.
 	 *
@@ -15,13 +10,6 @@ export type FocusScopeProps = {
 	 */
 	loop?: boolean;
 
-	/**
-	 * Whether focus is trapped within the focus scope.
-	 *
-	 * @defaultValue false
-	 */
-	trapped?: boolean;
-
 	/**
 	 * Event handler called when auto-focusing onMount.
 	 * Can be prevented.
@@ -33,6 +21,20 @@ export type FocusScopeProps = {
 	 * Can be prevented.
 	 */
 	onDestroyAutoFocus?: EventCallback;
+};
+
+export type FocusScopeImplProps = {
+	/**
+	 * The ID of the focus scope container node.
+	 */
+	id: string;
+
+	/**
+	 * Whether focus is trapped within the focus scope.
+	 *
+	 * @defaultValue false
+	 */
+	trapped?: boolean;
 
 	focusScope?: Snippet<[{ props: FocusScopeContainerProps }]>;
-};
+} & FocusScopeProps;
diff --git a/packages/bits-ui/src/lib/bits/utilities/popper-layer/popper-layer.svelte b/packages/bits-ui/src/lib/bits/utilities/popper-layer/popper-layer.svelte
index d12dd688f..eaa7d4dc2 100644
--- a/packages/bits-ui/src/lib/bits/utilities/popper-layer/popper-layer.svelte
+++ b/packages/bits-ui/src/lib/bits/utilities/popper-layer/popper-layer.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import type { PopperLayerProps } from "./index.js";
+	import type { PopperLayerImplProps } from "./types.js";
 	import { FloatingLayer } from "$lib/bits/utilities/floating-layer/index.js";
 	import { EscapeLayer } from "$lib/bits/utilities/escape-layer/index.js";
 	import { DismissableLayer } from "$lib/bits/utilities/dismissable-layer/index.js";
@@ -8,7 +8,7 @@
 	import { FocusScope } from "$lib/bits/utilities/focus-scope/index.js";
 	import { mergeProps } from "$lib/internal/mergeProps.js";
 
-	let { popper, ...restProps }: PopperLayerProps = $props();
+	let { popper, ...restProps }: PopperLayerImplProps = $props();
 </script>
 
 <PresenceLayer {...restProps}>
diff --git a/packages/bits-ui/src/lib/bits/utilities/popper-layer/types.ts b/packages/bits-ui/src/lib/bits/utilities/popper-layer/types.ts
index d91730df2..15b68c356 100644
--- a/packages/bits-ui/src/lib/bits/utilities/popper-layer/types.ts
+++ b/packages/bits-ui/src/lib/bits/utilities/popper-layer/types.ts
@@ -1,15 +1,32 @@
 import type { Snippet } from "svelte";
-import type { EscapeLayerProps } from "../escape-layer/types.js";
-import type { DismissableLayerProps } from "../dismissable-layer/types.js";
-import type { FloatingLayerContentProps } from "../floating-layer/types.js";
-import type { TextSelectionLayerProps } from "../text-selection-layer/types.js";
-import type { PresenceLayerProps } from "../presence-layer/types.js";
-import type { FocusScopeProps } from "../focus-scope/types.js";
+import type { EscapeLayerImplProps, EscapeLayerProps } from "../escape-layer/types.js";
+import type {
+	DismissableLayerImplProps,
+	DismissableLayerProps,
+} from "../dismissable-layer/types.js";
+import type {
+	FloatingLayerContentImplProps,
+	FloatingLayerContentProps,
+} from "../floating-layer/types.js";
+import type {
+	TextSelectionLayerImplProps,
+	TextSelectionLayerProps,
+} from "../text-selection-layer/types.js";
+import type { PresenceLayerImplProps, PresenceLayerProps } from "../presence-layer/types.js";
+import type { FocusScopeImplProps, FocusScopeProps } from "../focus-scope/types.js";
 
 export type PopperLayerProps = EscapeLayerProps &
 	DismissableLayerProps &
 	FloatingLayerContentProps &
 	PresenceLayerProps &
-	TextSelectionLayerProps & {
+	TextSelectionLayerProps &
+	FocusScopeProps;
+
+export type PopperLayerImplProps = EscapeLayerImplProps &
+	DismissableLayerImplProps &
+	FloatingLayerContentImplProps &
+	PresenceLayerImplProps &
+	TextSelectionLayerImplProps &
+	FocusScopeImplProps & {
 		popper: Snippet<[{ props: Record<string, unknown> }]>;
-	} & FocusScopeProps;
+	};
diff --git a/packages/bits-ui/src/lib/bits/utilities/presence-layer/presence-layer.svelte b/packages/bits-ui/src/lib/bits/utilities/presence-layer/presence-layer.svelte
index 1382a7801..dc39a2be4 100644
--- a/packages/bits-ui/src/lib/bits/utilities/presence-layer/presence-layer.svelte
+++ b/packages/bits-ui/src/lib/bits/utilities/presence-layer/presence-layer.svelte
@@ -1,16 +1,9 @@
 <script lang="ts">
-	import type { PresenceLayerProps } from "./types.js";
+	import type { PresenceLayerImplProps } from "./types.js";
 	import { readonlyBox } from "$lib/internal/box.svelte.js";
 	import { usePresence } from "$lib/bits/utilities/presence-layer/usePresence.svelte.js";
 
-	let {
-		present,
-		forceMount: forceMountProp = false,
-		presence,
-		id,
-	}: PresenceLayerProps = $props();
-
-	const forceMount = readonlyBox(() => forceMountProp);
+	let { present, forceMount = false, presence, id }: PresenceLayerImplProps = $props();
 
 	const isPresent = usePresence(
 		readonlyBox(() => present),
@@ -18,6 +11,6 @@
 	);
 </script>
 
-{#if forceMount.value || present || isPresent.value}
+{#if forceMount || present || isPresent.value}
 	{@render presence?.({ present: isPresent })}
 {/if}
diff --git a/packages/bits-ui/src/lib/bits/utilities/presence-layer/types.ts b/packages/bits-ui/src/lib/bits/utilities/presence-layer/types.ts
index 18ee8b8c3..8bd5041d6 100644
--- a/packages/bits-ui/src/lib/bits/utilities/presence-layer/types.ts
+++ b/packages/bits-ui/src/lib/bits/utilities/presence-layer/types.ts
@@ -2,16 +2,17 @@ import type { Snippet } from "svelte";
 
 export type PresenceLayerProps = {
 	/**
-	 * The presence status.
+	 * Whether to force mount the component.
 	 */
-	present: boolean;
+	forceMount?: boolean;
+};
 
+export type PresenceLayerImplProps = PresenceLayerProps & {
+	id: string;
 	/**
-	 * Whether to force mount the component.
+	 * The presence status.
 	 */
-	forceMount?: boolean;
+	present: boolean;
 
 	presence?: Snippet<[{ present: { value: boolean } }]>;
-
-	id: string;
 };
diff --git a/packages/bits-ui/src/lib/bits/utilities/text-selection-layer/text-selection-layer.svelte b/packages/bits-ui/src/lib/bits/utilities/text-selection-layer/text-selection-layer.svelte
index 885c3c6bf..881bfebea 100644
--- a/packages/bits-ui/src/lib/bits/utilities/text-selection-layer/text-selection-layer.svelte
+++ b/packages/bits-ui/src/lib/bits/utilities/text-selection-layer/text-selection-layer.svelte
@@ -1,20 +1,20 @@
 <script lang="ts">
-	import type { TextSelectionLayerProps } from "./types.js";
+	import type { TextSelectionLayerImplProps } from "./types.js";
 	import { useTextSelectionLayer } from "./useTextSelectionLayer.svelte.js";
 	import { noop, readonlyBox } from "$lib/internal/index.js";
 
 	let {
-		enabled = true,
+		preventOverflowTextSelection = true,
 		onPointerDown = noop,
 		onPointerUp = noop,
 		id,
 		children,
 		present,
-	}: TextSelectionLayerProps = $props();
+	}: TextSelectionLayerImplProps = $props();
 
 	useTextSelectionLayer({
 		id: readonlyBox(() => id),
-		enabled: readonlyBox(() => enabled),
+		preventOverflowTextSelection: readonlyBox(() => preventOverflowTextSelection),
 		onPointerDown: readonlyBox(() => onPointerDown),
 		onPointerUp: readonlyBox(() => onPointerUp),
 		present: readonlyBox(() => present),
diff --git a/packages/bits-ui/src/lib/bits/utilities/text-selection-layer/types.ts b/packages/bits-ui/src/lib/bits/utilities/text-selection-layer/types.ts
index da5b093a4..6a3cb8c1c 100644
--- a/packages/bits-ui/src/lib/bits/utilities/text-selection-layer/types.ts
+++ b/packages/bits-ui/src/lib/bits/utilities/text-selection-layer/types.ts
@@ -3,6 +3,21 @@ import type { Snippet } from "svelte";
 export type PointerHandler = (e: PointerEvent) => void;
 
 export type TextSelectionLayerProps = {
+	/**
+	 * Passing `true` will prevent the overflow of text selection
+	 * outside the element, provided the element is the top layer.
+	 * @defaultValue `true`
+	 */
+	preventOverflowTextSelection?: boolean;
+};
+
+export type TextSelectionLayerImplProps = {
+	/**
+	 * Whether the layer is enabled. Currently, we determine this with the
+	 * `presence` returned from the `presence` layer.
+	 */
+	present: boolean;
+
 	/**
 	 * DOM ID of the node.
 	 */
@@ -20,17 +35,4 @@ export type TextSelectionLayerProps = {
 	 * Callback fired when pointerup event triggers.
 	 */
 	onPointerUp?: PointerHandler;
-
-	/**
-	 * Passing `enabled: true` will prevent the overflow of text selection
-	 * outside the element, provided the element is the top layer.
-	 * @defaultValue `true`
-	 */
-	enabled?: boolean;
-
-	/**
-	 * Whether the layer is enabled. Currently, we determine this with the
-	 * `presence` returned from the `presence` layer.
-	 */
-	present: boolean;
-};
+} & TextSelectionLayerProps;
diff --git a/packages/bits-ui/src/lib/bits/utilities/text-selection-layer/useTextSelectionLayer.svelte.ts b/packages/bits-ui/src/lib/bits/utilities/text-selection-layer/useTextSelectionLayer.svelte.ts
index df179f929..77494d4fe 100644
--- a/packages/bits-ui/src/lib/bits/utilities/text-selection-layer/useTextSelectionLayer.svelte.ts
+++ b/packages/bits-ui/src/lib/bits/utilities/text-selection-layer/useTextSelectionLayer.svelte.ts
@@ -1,5 +1,5 @@
 import { untrack } from "svelte";
-import type { TextSelectionLayerProps } from "./types.js";
+import type { TextSelectionLayerImplProps, TextSelectionLayerProps } from "./types.js";
 import {
 	type Box,
 	type EventCallback,
@@ -14,7 +14,7 @@ import {
 	useNodeById,
 } from "$lib/internal/index.js";
 
-type StateProps = ReadonlyBoxedValues<Required<Omit<TextSelectionLayerProps, "children">>>;
+type StateProps = ReadonlyBoxedValues<Required<Omit<TextSelectionLayerImplProps, "children">>>;
 
 const layers = new Map<TextSelectionLayerState, ReadonlyBox<boolean>>();
 
@@ -28,7 +28,7 @@ export class TextSelectionLayerState {
 
 	constructor(props: StateProps) {
 		this.#node = useNodeById(props.id);
-		this.#enabled = props.enabled;
+		this.#enabled = props.preventOverflowTextSelection;
 		this.#onPointerDownProp = props.onPointerDown;
 		this.#onPointerUpProp = props.onPointerUp;
 		this.#present = props.present;
diff --git a/sites/docs/src/lib/components/demos/popover-demo.svelte b/sites/docs/src/lib/components/demos/popover-demo.svelte
index 2b4d49a30..86c6b0feb 100644
--- a/sites/docs/src/lib/components/demos/popover-demo.svelte
+++ b/sites/docs/src/lib/components/demos/popover-demo.svelte
@@ -17,7 +17,6 @@
 		<Popover.Content
 			class="z-30 w-full max-w-[328px] rounded-[12px] border border-dark-10 bg-background p-4 shadow-popover data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2"
 			sideOffset={8}
-			style={{ pointerEvents: "auto" }}
 		>
 			<Popover.Arrow class="text-white" />
 			<div class="flex items-center">