diff --git a/.changeset/twenty-zebras-kick.md b/.changeset/twenty-zebras-kick.md
new file mode 100644
index 000000000..3c7a62d07
--- /dev/null
+++ b/.changeset/twenty-zebras-kick.md
@@ -0,0 +1,5 @@
+---
+"bits-ui": patch
+---
+
+Improve runtime performance with optimized internal `mergeProps` and `boxWith` implementations, less reactive work in Select/Tooltip/Menu, and smarter body scroll locking when a dialog overlay handles pointer blocking.
diff --git a/eslint.config.js b/eslint.config.js
index b9e23c6ad..8e5d706bc 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -29,6 +29,7 @@ export default tseslint.config(
 		},
 		rules: {
 			"svelte/no-navigation-without-resolve": "off",
+			"svelte/no-unused-svelte-ignore": "off",
 		},
 	},
 	{
diff --git a/packages/bits-ui/src/lib/bits/accordion/accordion.svelte.ts b/packages/bits-ui/src/lib/bits/accordion/accordion.svelte.ts
index 04e03726a..feb79ddf2 100644
--- a/packages/bits-ui/src/lib/bits/accordion/accordion.svelte.ts
+++ b/packages/bits-ui/src/lib/bits/accordion/accordion.svelte.ts
@@ -1,11 +1,11 @@
 import {
 	afterTick,
 	attachRef,
-	boxWith,
 	type Box,
 	type ReadableBoxedValues,
 	type WritableBoxedValues,
 } from "svelte-toolbelt";
+import { boxWith } from "$lib/internal/box.svelte.js";
 import { Context, watch } from "runed";
 import type {
 	BitsKeyboardEvent,
diff --git a/packages/bits-ui/src/lib/bits/accordion/components/accordion-content.svelte b/packages/bits-ui/src/lib/bits/accordion/components/accordion-content.svelte
index 5b72457d2..8ffcbd3e8 100644
--- a/packages/bits-ui/src/lib/bits/accordion/components/accordion-content.svelte
+++ b/packages/bits-ui/src/lib/bits/accordion/components/accordion-content.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { mergeProps, boxWith } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { AccordionContentState } from "../accordion.svelte.js";
 	import type { AccordionContentProps } from "../types.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/accordion/components/accordion-header.svelte b/packages/bits-ui/src/lib/bits/accordion/components/accordion-header.svelte
index 841ba71e7..b2b269f6d 100644
--- a/packages/bits-ui/src/lib/bits/accordion/components/accordion-header.svelte
+++ b/packages/bits-ui/src/lib/bits/accordion/components/accordion-header.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { AccordionHeaderProps } from "../types.js";
 	import { AccordionHeaderState } from "../accordion.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/accordion/components/accordion-item.svelte b/packages/bits-ui/src/lib/bits/accordion/components/accordion-item.svelte
index fe7a0c14e..930f9afce 100644
--- a/packages/bits-ui/src/lib/bits/accordion/components/accordion-item.svelte
+++ b/packages/bits-ui/src/lib/bits/accordion/components/accordion-item.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { AccordionItemProps } from "../types.js";
 	import { AccordionItemState } from "../accordion.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/accordion/components/accordion-trigger.svelte b/packages/bits-ui/src/lib/bits/accordion/components/accordion-trigger.svelte
index 1e786b415..ca039000e 100644
--- a/packages/bits-ui/src/lib/bits/accordion/components/accordion-trigger.svelte
+++ b/packages/bits-ui/src/lib/bits/accordion/components/accordion-trigger.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { AccordionTriggerProps } from "../types.js";
 	import { AccordionTriggerState } from "../accordion.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/accordion/components/accordion.svelte b/packages/bits-ui/src/lib/bits/accordion/components/accordion.svelte
index 138e9197d..cf7adf3d8 100644
--- a/packages/bits-ui/src/lib/bits/accordion/components/accordion.svelte
+++ b/packages/bits-ui/src/lib/bits/accordion/components/accordion.svelte
@@ -1,5 +1,7 @@
 <script lang="ts">
-	import { type WritableBox, boxWith, mergeProps } from "svelte-toolbelt";
+	import { type WritableBox } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { AccordionRootState } from "../accordion.svelte.js";
 	import type { AccordionRootProps } from "../types.js";
 	import { noop } from "$lib/internal/noop.js";
@@ -38,6 +40,7 @@
 	);
 
 	const rootState = AccordionRootState.create({
+		// svelte-ignore state_referenced_locally
 		type,
 		value: boxWith(
 			() => value!,
diff --git a/packages/bits-ui/src/lib/bits/alert-dialog/components/alert-dialog-action.svelte b/packages/bits-ui/src/lib/bits/alert-dialog/components/alert-dialog-action.svelte
index ed4aa6234..c54cae135 100644
--- a/packages/bits-ui/src/lib/bits/alert-dialog/components/alert-dialog-action.svelte
+++ b/packages/bits-ui/src/lib/bits/alert-dialog/components/alert-dialog-action.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { AlertDialogActionProps } from "../types.js";
 	import { DialogActionState } from "$lib/bits/dialog/dialog.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/alert-dialog/components/alert-dialog-cancel.svelte b/packages/bits-ui/src/lib/bits/alert-dialog/components/alert-dialog-cancel.svelte
index 3aa064467..ea1a8115e 100644
--- a/packages/bits-ui/src/lib/bits/alert-dialog/components/alert-dialog-cancel.svelte
+++ b/packages/bits-ui/src/lib/bits/alert-dialog/components/alert-dialog-cancel.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { AlertDialogCancelProps } from "../types.js";
 	import { AlertDialogCancelState } from "$lib/bits/dialog/dialog.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/alert-dialog/components/alert-dialog-content.svelte b/packages/bits-ui/src/lib/bits/alert-dialog/components/alert-dialog-content.svelte
index 4860bcf31..355f2f02a 100644
--- a/packages/bits-ui/src/lib/bits/alert-dialog/components/alert-dialog-content.svelte
+++ b/packages/bits-ui/src/lib/bits/alert-dialog/components/alert-dialog-content.svelte
@@ -1,5 +1,7 @@
 <script lang="ts">
-	import { afterSleep, boxWith, mergeProps } from "svelte-toolbelt";
+	import { afterSleep } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { AlertDialogContentProps } from "../types.js";
 	import DismissibleLayer from "$lib/bits/utilities/dismissible-layer/dismissible-layer.svelte";
 	import EscapeLayer from "$lib/bits/utilities/escape-layer/escape-layer.svelte";
@@ -38,6 +40,10 @@
 	});
 
 	const mergedProps = $derived(mergeProps(restProps, contentState.props));
+
+	function shouldBlockPointerEvents() {
+		return contentState.root.overlayNode === null;
+	}
 </script>
 
 {#if contentState.shouldRender || forceMount}
@@ -83,14 +89,18 @@
 					>
 						{#if child}
 							{#if contentState.root.opts.open.current}
-								<ScrollLock {preventScroll} {restoreScrollDelay} />
+								<ScrollLock
+									{preventScroll}
+									{restoreScrollDelay}
+									{shouldBlockPointerEvents}
+								/>
 							{/if}
 							{@render child({
 								props: mergeProps(mergedProps, focusScopeProps),
 								...contentState.snippetProps,
 							})}
 						{:else}
-							<ScrollLock {preventScroll} />
+							<ScrollLock {preventScroll} {shouldBlockPointerEvents} />
 							<div {...mergeProps(mergedProps, focusScopeProps)}>
 								{@render children?.()}
 							</div>
diff --git a/packages/bits-ui/src/lib/bits/alert-dialog/components/alert-dialog.svelte b/packages/bits-ui/src/lib/bits/alert-dialog/components/alert-dialog.svelte
index e9fd9b480..8c213e244 100644
--- a/packages/bits-ui/src/lib/bits/alert-dialog/components/alert-dialog.svelte
+++ b/packages/bits-ui/src/lib/bits/alert-dialog/components/alert-dialog.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { boxWith } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
 	import type { AlertDialogRootProps } from "../types.js";
 	import { noop } from "$lib/internal/noop.js";
 	import { DialogRootState } from "$lib/bits/dialog/dialog.svelte.js";
diff --git a/packages/bits-ui/src/lib/bits/aspect-ratio/components/aspect-ratio.svelte b/packages/bits-ui/src/lib/bits/aspect-ratio/components/aspect-ratio.svelte
index 7757ca48b..7e88ff30a 100644
--- a/packages/bits-ui/src/lib/bits/aspect-ratio/components/aspect-ratio.svelte
+++ b/packages/bits-ui/src/lib/bits/aspect-ratio/components/aspect-ratio.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { AspectRatioRootProps } from "../types.js";
 	import { AspectRatioRootState } from "../aspect-ratio.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/avatar/components/avatar-fallback.svelte b/packages/bits-ui/src/lib/bits/avatar/components/avatar-fallback.svelte
index 3a90105fb..f984a2de8 100644
--- a/packages/bits-ui/src/lib/bits/avatar/components/avatar-fallback.svelte
+++ b/packages/bits-ui/src/lib/bits/avatar/components/avatar-fallback.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { AvatarFallbackProps } from "../types.js";
 	import { AvatarFallbackState } from "../avatar.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/avatar/components/avatar-image.svelte b/packages/bits-ui/src/lib/bits/avatar/components/avatar-image.svelte
index 75a8d069d..6f8c95d7e 100644
--- a/packages/bits-ui/src/lib/bits/avatar/components/avatar-image.svelte
+++ b/packages/bits-ui/src/lib/bits/avatar/components/avatar-image.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { AvatarImageProps } from "../types.js";
 	import { AvatarImageState } from "../avatar.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/avatar/components/avatar.svelte b/packages/bits-ui/src/lib/bits/avatar/components/avatar.svelte
index fc4d7cdd2..45b7f2fcd 100644
--- a/packages/bits-ui/src/lib/bits/avatar/components/avatar.svelte
+++ b/packages/bits-ui/src/lib/bits/avatar/components/avatar.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { AvatarRootProps } from "../types.js";
 	import { AvatarRootState } from "../avatar.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/calendar/components/calendar-cell.svelte b/packages/bits-ui/src/lib/bits/calendar/components/calendar-cell.svelte
index 3efba405c..78016d95a 100644
--- a/packages/bits-ui/src/lib/bits/calendar/components/calendar-cell.svelte
+++ b/packages/bits-ui/src/lib/bits/calendar/components/calendar-cell.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { CalendarCellState } from "../calendar.svelte.js";
 	import type { CalendarCellProps } from "../types.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/calendar/components/calendar-day.svelte b/packages/bits-ui/src/lib/bits/calendar/components/calendar-day.svelte
index 5a3882c49..784084109 100644
--- a/packages/bits-ui/src/lib/bits/calendar/components/calendar-day.svelte
+++ b/packages/bits-ui/src/lib/bits/calendar/components/calendar-day.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { CalendarDayState } from "../calendar.svelte.js";
 	import type { CalendarDayProps } from "../types.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/calendar/components/calendar-grid-body.svelte b/packages/bits-ui/src/lib/bits/calendar/components/calendar-grid-body.svelte
index 42fae5eac..306711f17 100644
--- a/packages/bits-ui/src/lib/bits/calendar/components/calendar-grid-body.svelte
+++ b/packages/bits-ui/src/lib/bits/calendar/components/calendar-grid-body.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { CalendarGridBodyProps } from "../types.js";
 	import { CalendarGridBodyState } from "../calendar.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/calendar/components/calendar-grid-head.svelte b/packages/bits-ui/src/lib/bits/calendar/components/calendar-grid-head.svelte
index ba85ee2e2..dbe25602b 100644
--- a/packages/bits-ui/src/lib/bits/calendar/components/calendar-grid-head.svelte
+++ b/packages/bits-ui/src/lib/bits/calendar/components/calendar-grid-head.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { CalendarGridHeadState } from "../calendar.svelte.js";
 	import type { CalendarGridHeadProps } from "../types.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/calendar/components/calendar-grid-row.svelte b/packages/bits-ui/src/lib/bits/calendar/components/calendar-grid-row.svelte
index 592ec5417..4e236ba74 100644
--- a/packages/bits-ui/src/lib/bits/calendar/components/calendar-grid-row.svelte
+++ b/packages/bits-ui/src/lib/bits/calendar/components/calendar-grid-row.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { CalendarGridRowState } from "../calendar.svelte.js";
 	import type { CalendarGridRowProps } from "../types.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/calendar/components/calendar-grid.svelte b/packages/bits-ui/src/lib/bits/calendar/components/calendar-grid.svelte
index 79b9f2023..3c1014a04 100644
--- a/packages/bits-ui/src/lib/bits/calendar/components/calendar-grid.svelte
+++ b/packages/bits-ui/src/lib/bits/calendar/components/calendar-grid.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { CalendarGridState } from "../calendar.svelte.js";
 	import type { CalendarGridProps } from "../types.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/calendar/components/calendar-head-cell.svelte b/packages/bits-ui/src/lib/bits/calendar/components/calendar-head-cell.svelte
index 749dc7e3e..b4768cd25 100644
--- a/packages/bits-ui/src/lib/bits/calendar/components/calendar-head-cell.svelte
+++ b/packages/bits-ui/src/lib/bits/calendar/components/calendar-head-cell.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { CalendarHeadCellState } from "../calendar.svelte.js";
 	import type { CalendarHeadCellProps } from "../types.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/calendar/components/calendar-header.svelte b/packages/bits-ui/src/lib/bits/calendar/components/calendar-header.svelte
index 64f104972..43b7a7f54 100644
--- a/packages/bits-ui/src/lib/bits/calendar/components/calendar-header.svelte
+++ b/packages/bits-ui/src/lib/bits/calendar/components/calendar-header.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { CalendarHeaderState } from "../calendar.svelte.js";
 	import type { CalendarHeaderProps } from "../types.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/calendar/components/calendar-heading.svelte b/packages/bits-ui/src/lib/bits/calendar/components/calendar-heading.svelte
index 588c4a701..48086770d 100644
--- a/packages/bits-ui/src/lib/bits/calendar/components/calendar-heading.svelte
+++ b/packages/bits-ui/src/lib/bits/calendar/components/calendar-heading.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { CalendarHeadingProps } from "../types.js";
 	import { CalendarHeadingState } from "../calendar.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/calendar/components/calendar-month-select.svelte b/packages/bits-ui/src/lib/bits/calendar/components/calendar-month-select.svelte
index 459e21f68..1df5f5339 100644
--- a/packages/bits-ui/src/lib/bits/calendar/components/calendar-month-select.svelte
+++ b/packages/bits-ui/src/lib/bits/calendar/components/calendar-month-select.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { CalendarMonthSelectProps } from "../types.js";
 	import { CalendarMonthSelectState } from "../calendar.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/calendar/components/calendar-next-button.svelte b/packages/bits-ui/src/lib/bits/calendar/components/calendar-next-button.svelte
index 3456b264f..aeebc6e34 100644
--- a/packages/bits-ui/src/lib/bits/calendar/components/calendar-next-button.svelte
+++ b/packages/bits-ui/src/lib/bits/calendar/components/calendar-next-button.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { CalendarNextButtonState } from "../calendar.svelte.js";
 	import type { CalendarNextButtonProps } from "../types.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/calendar/components/calendar-prev-button.svelte b/packages/bits-ui/src/lib/bits/calendar/components/calendar-prev-button.svelte
index c354cec0a..0a4dfe951 100644
--- a/packages/bits-ui/src/lib/bits/calendar/components/calendar-prev-button.svelte
+++ b/packages/bits-ui/src/lib/bits/calendar/components/calendar-prev-button.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { CalendarPrevButtonProps } from "../types.js";
 	import { CalendarPrevButtonState } from "../calendar.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/calendar/components/calendar-year-select.svelte b/packages/bits-ui/src/lib/bits/calendar/components/calendar-year-select.svelte
index 11658a93a..618485e51 100644
--- a/packages/bits-ui/src/lib/bits/calendar/components/calendar-year-select.svelte
+++ b/packages/bits-ui/src/lib/bits/calendar/components/calendar-year-select.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { CalendarYearSelectProps } from "../types.js";
 	import { CalendarYearSelectState } from "../calendar.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/calendar/components/calendar.svelte b/packages/bits-ui/src/lib/bits/calendar/components/calendar.svelte
index d26170ec4..6d5b778cf 100644
--- a/packages/bits-ui/src/lib/bits/calendar/components/calendar.svelte
+++ b/packages/bits-ui/src/lib/bits/calendar/components/calendar.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import { watch } from "runed";
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { type DateValue } from "@internationalized/date";
 	import { CalendarRootState } from "../calendar.svelte.js";
 	import type { CalendarRootProps } from "../types.js";
@@ -41,6 +42,7 @@
 		...restProps
 	}: CalendarRootProps = $props();
 
+	// svelte-ignore state_referenced_locally
 	const defaultPlaceholder = getDefaultDate({
 		defaultValue: value,
 		minValue,
diff --git a/packages/bits-ui/src/lib/bits/checkbox/components/checkbox-group-label.svelte b/packages/bits-ui/src/lib/bits/checkbox/components/checkbox-group-label.svelte
index c8b24b0e5..4b47c528f 100644
--- a/packages/bits-ui/src/lib/bits/checkbox/components/checkbox-group-label.svelte
+++ b/packages/bits-ui/src/lib/bits/checkbox/components/checkbox-group-label.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { CheckboxGroupLabelProps } from "../types.js";
 	import { CheckboxGroupLabelState } from "../checkbox.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/checkbox/components/checkbox-group.svelte b/packages/bits-ui/src/lib/bits/checkbox/components/checkbox-group.svelte
index 403eb0c6c..916986be3 100644
--- a/packages/bits-ui/src/lib/bits/checkbox/components/checkbox-group.svelte
+++ b/packages/bits-ui/src/lib/bits/checkbox/components/checkbox-group.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { CheckboxGroupProps } from "../types.js";
 	import { CheckboxGroupState } from "../checkbox.svelte.js";
 	import { noop } from "$lib/internal/noop.js";
diff --git a/packages/bits-ui/src/lib/bits/checkbox/components/checkbox.svelte b/packages/bits-ui/src/lib/bits/checkbox/components/checkbox.svelte
index 940b347d2..1989f1be6 100644
--- a/packages/bits-ui/src/lib/bits/checkbox/components/checkbox.svelte
+++ b/packages/bits-ui/src/lib/bits/checkbox/components/checkbox.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { CheckboxRootProps } from "../types.js";
 	import { CheckboxGroupContext, CheckboxRootState } from "../checkbox.svelte.js";
 	import CheckboxInput from "./checkbox-input.svelte";
@@ -28,6 +29,7 @@
 
 	const group = CheckboxGroupContext.getOr(null);
 
+	// svelte-ignore state_referenced_locally
 	if (group && value) {
 		if (group.opts.value.current.includes(value)) {
 			checked = true;
diff --git a/packages/bits-ui/src/lib/bits/collapsible/collapsible.svelte.ts b/packages/bits-ui/src/lib/bits/collapsible/collapsible.svelte.ts
index a98bf561a..37c1ad2ed 100644
--- a/packages/bits-ui/src/lib/bits/collapsible/collapsible.svelte.ts
+++ b/packages/bits-ui/src/lib/bits/collapsible/collapsible.svelte.ts
@@ -1,10 +1,10 @@
 import {
 	afterTick,
 	attachRef,
-	boxWith,
 	type ReadableBoxedValues,
 	type WritableBoxedValues,
 } from "svelte-toolbelt";
+import { boxWith } from "$lib/internal/box.svelte.js";
 import { Context, watch } from "runed";
 import {
 	createBitsAttrs,
diff --git a/packages/bits-ui/src/lib/bits/collapsible/components/collapsible-content.svelte b/packages/bits-ui/src/lib/bits/collapsible/components/collapsible-content.svelte
index fee1ba9f3..7c93f11ba 100644
--- a/packages/bits-ui/src/lib/bits/collapsible/components/collapsible-content.svelte
+++ b/packages/bits-ui/src/lib/bits/collapsible/components/collapsible-content.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { CollapsibleContentState } from "../collapsible.svelte.js";
 	import type { CollapsibleContentProps } from "../types.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/collapsible/components/collapsible-trigger.svelte b/packages/bits-ui/src/lib/bits/collapsible/components/collapsible-trigger.svelte
index ac27fb849..808d29df6 100644
--- a/packages/bits-ui/src/lib/bits/collapsible/components/collapsible-trigger.svelte
+++ b/packages/bits-ui/src/lib/bits/collapsible/components/collapsible-trigger.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { CollapsibleTriggerProps } from "../types.js";
 	import { CollapsibleTriggerState } from "../collapsible.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/collapsible/components/collapsible.svelte b/packages/bits-ui/src/lib/bits/collapsible/components/collapsible.svelte
index 360797db2..0d23302cf 100644
--- a/packages/bits-ui/src/lib/bits/collapsible/components/collapsible.svelte
+++ b/packages/bits-ui/src/lib/bits/collapsible/components/collapsible.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { CollapsibleRootProps } from "../types.js";
 	import { CollapsibleRootState } from "../collapsible.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/combobox/components/combobox-input.svelte b/packages/bits-ui/src/lib/bits/combobox/components/combobox-input.svelte
index 712c401bf..718aec90d 100644
--- a/packages/bits-ui/src/lib/bits/combobox/components/combobox-input.svelte
+++ b/packages/bits-ui/src/lib/bits/combobox/components/combobox-input.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { ComboboxInputProps } from "../types.js";
 	import { useId } from "$lib/internal/use-id.js";
 	import { FloatingLayer } from "$lib/bits/utilities/floating-layer/index.js";
@@ -23,6 +24,7 @@
 		clearOnDeselect: boxWith(() => clearOnDeselect),
 	});
 
+	// svelte-ignore state_referenced_locally
 	if (defaultValue) {
 		inputState.root.opts.inputValue.current = defaultValue;
 	}
diff --git a/packages/bits-ui/src/lib/bits/combobox/components/combobox-trigger.svelte b/packages/bits-ui/src/lib/bits/combobox/components/combobox-trigger.svelte
index ee0d0bcaf..391a25e1b 100644
--- a/packages/bits-ui/src/lib/bits/combobox/components/combobox-trigger.svelte
+++ b/packages/bits-ui/src/lib/bits/combobox/components/combobox-trigger.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { ComboboxTriggerProps } from "../types.js";
 	import { useId } from "$lib/internal/use-id.js";
 	import { SelectComboTriggerState } from "$lib/bits/select/select.svelte.js";
diff --git a/packages/bits-ui/src/lib/bits/combobox/components/combobox.svelte b/packages/bits-ui/src/lib/bits/combobox/components/combobox.svelte
index 927477c9d..27a17b281 100644
--- a/packages/bits-ui/src/lib/bits/combobox/components/combobox.svelte
+++ b/packages/bits-ui/src/lib/bits/combobox/components/combobox.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { type WritableBox, boxWith } from "svelte-toolbelt";
+	import { type WritableBox } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
 	import type { ComboboxRootProps } from "../types.js";
 	import { noop } from "$lib/internal/noop.js";
 	import FloatingLayer from "$lib/bits/utilities/floating-layer/components/floating-layer.svelte";
diff --git a/packages/bits-ui/src/lib/bits/command/components/_command-label.svelte b/packages/bits-ui/src/lib/bits/command/components/_command-label.svelte
index 6f12cbd97..b9dcd927c 100644
--- a/packages/bits-ui/src/lib/bits/command/components/_command-label.svelte
+++ b/packages/bits-ui/src/lib/bits/command/components/_command-label.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { boxWith } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
 	import { CommandLabelState } from "../command.svelte.js";
 
 	import type { WithChildren } from "$lib/internal/types.js";
diff --git a/packages/bits-ui/src/lib/bits/command/components/command-empty.svelte b/packages/bits-ui/src/lib/bits/command/components/command-empty.svelte
index 462dded85..995bfa5eb 100644
--- a/packages/bits-ui/src/lib/bits/command/components/command-empty.svelte
+++ b/packages/bits-ui/src/lib/bits/command/components/command-empty.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { CommandEmptyProps } from "../types.js";
 	import { CommandEmptyState } from "../command.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/command/components/command-group-heading.svelte b/packages/bits-ui/src/lib/bits/command/components/command-group-heading.svelte
index c21c7d3e4..0832fb4dd 100644
--- a/packages/bits-ui/src/lib/bits/command/components/command-group-heading.svelte
+++ b/packages/bits-ui/src/lib/bits/command/components/command-group-heading.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { CommandGroupHeadingState } from "../command.svelte.js";
 	import type { CommandGroupHeadingProps } from "../types.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/command/components/command-group-items.svelte b/packages/bits-ui/src/lib/bits/command/components/command-group-items.svelte
index 2af6e60d5..0f9ff8ecc 100644
--- a/packages/bits-ui/src/lib/bits/command/components/command-group-items.svelte
+++ b/packages/bits-ui/src/lib/bits/command/components/command-group-items.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { CommandGroupItemsProps } from "../types.js";
 	import { CommandGroupItemsState } from "../command.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/command/components/command-group.svelte b/packages/bits-ui/src/lib/bits/command/components/command-group.svelte
index 94cc2dc68..41eb21f0d 100644
--- a/packages/bits-ui/src/lib/bits/command/components/command-group.svelte
+++ b/packages/bits-ui/src/lib/bits/command/components/command-group.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { CommandGroupProps } from "../types.js";
 	import { CommandGroupContainerState } from "../command.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/command/components/command-input.svelte b/packages/bits-ui/src/lib/bits/command/components/command-input.svelte
index 6bb7befb6..d291dda69 100644
--- a/packages/bits-ui/src/lib/bits/command/components/command-input.svelte
+++ b/packages/bits-ui/src/lib/bits/command/components/command-input.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { CommandInputProps } from "../types.js";
 	import { CommandInputState } from "../command.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/command/components/command-item.svelte b/packages/bits-ui/src/lib/bits/command/components/command-item.svelte
index b4531b43d..8ab7de7b2 100644
--- a/packages/bits-ui/src/lib/bits/command/components/command-item.svelte
+++ b/packages/bits-ui/src/lib/bits/command/components/command-item.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { CommandItemProps } from "../types.js";
 	import { CommandItemState } from "../command.svelte.js";
 	import { noop } from "$lib/internal/noop.js";
diff --git a/packages/bits-ui/src/lib/bits/command/components/command-link-item.svelte b/packages/bits-ui/src/lib/bits/command/components/command-link-item.svelte
index 2b5868e32..82c60a848 100644
--- a/packages/bits-ui/src/lib/bits/command/components/command-link-item.svelte
+++ b/packages/bits-ui/src/lib/bits/command/components/command-link-item.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { CommandLinkItemProps } from "../types.js";
 	import { CommandItemState } from "../command.svelte.js";
 	import { noop } from "$lib/internal/noop.js";
diff --git a/packages/bits-ui/src/lib/bits/command/components/command-list.svelte b/packages/bits-ui/src/lib/bits/command/components/command-list.svelte
index 29c5bddf7..a36100ecc 100644
--- a/packages/bits-ui/src/lib/bits/command/components/command-list.svelte
+++ b/packages/bits-ui/src/lib/bits/command/components/command-list.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { CommandListProps } from "../types.js";
 	import { CommandListState } from "../command.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/command/components/command-loading.svelte b/packages/bits-ui/src/lib/bits/command/components/command-loading.svelte
index 7b4a5aa19..329179518 100644
--- a/packages/bits-ui/src/lib/bits/command/components/command-loading.svelte
+++ b/packages/bits-ui/src/lib/bits/command/components/command-loading.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { CommandLoadingProps } from "../types.js";
 	import { CommandLoadingState } from "../command.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/command/components/command-separator.svelte b/packages/bits-ui/src/lib/bits/command/components/command-separator.svelte
index 281fc56e3..240ab8769 100644
--- a/packages/bits-ui/src/lib/bits/command/components/command-separator.svelte
+++ b/packages/bits-ui/src/lib/bits/command/components/command-separator.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { CommandSeparatorProps } from "../types.js";
 	import { CommandSeparatorState } from "../command.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/command/components/command-viewport.svelte b/packages/bits-ui/src/lib/bits/command/components/command-viewport.svelte
index b9cde9ee6..77ba9f400 100644
--- a/packages/bits-ui/src/lib/bits/command/components/command-viewport.svelte
+++ b/packages/bits-ui/src/lib/bits/command/components/command-viewport.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { CommandViewportState } from "../command.svelte.js";
 	import type { CommandViewportProps } from "../types.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/command/components/command.svelte b/packages/bits-ui/src/lib/bits/command/components/command.svelte
index f1962c197..b8eae07c1 100644
--- a/packages/bits-ui/src/lib/bits/command/components/command.svelte
+++ b/packages/bits-ui/src/lib/bits/command/components/command.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { CommandRootState } from "../command.svelte.js";
 	import type { CommandRootProps } from "../types.js";
 	import CommandLabel from "./_command-label.svelte";
diff --git a/packages/bits-ui/src/lib/bits/context-menu/components/context-menu-content-static.svelte b/packages/bits-ui/src/lib/bits/context-menu/components/context-menu-content-static.svelte
index e34602781..770354c9b 100644
--- a/packages/bits-ui/src/lib/bits/context-menu/components/context-menu-content-static.svelte
+++ b/packages/bits-ui/src/lib/bits/context-menu/components/context-menu-content-static.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { ContextMenuContentStaticProps } from "../types.js";
 	import { CONTEXT_MENU_TRIGGER_ATTR, MenuContentState } from "$lib/bits/menu/menu.svelte.js";
 	import { useId } from "$lib/internal/use-id.js";
diff --git a/packages/bits-ui/src/lib/bits/context-menu/components/context-menu-content.svelte b/packages/bits-ui/src/lib/bits/context-menu/components/context-menu-content.svelte
index 1c3e98504..a1bfa70bc 100644
--- a/packages/bits-ui/src/lib/bits/context-menu/components/context-menu-content.svelte
+++ b/packages/bits-ui/src/lib/bits/context-menu/components/context-menu-content.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { ContextMenuContentProps } from "../types.js";
 	import { CONTEXT_MENU_TRIGGER_ATTR, MenuContentState } from "$lib/bits/menu/menu.svelte.js";
 	import { useId } from "$lib/internal/use-id.js";
diff --git a/packages/bits-ui/src/lib/bits/context-menu/components/context-menu-trigger.svelte b/packages/bits-ui/src/lib/bits/context-menu/components/context-menu-trigger.svelte
index 26f8c0d81..f0258d641 100644
--- a/packages/bits-ui/src/lib/bits/context-menu/components/context-menu-trigger.svelte
+++ b/packages/bits-ui/src/lib/bits/context-menu/components/context-menu-trigger.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { ContextMenuTriggerProps } from "../types.js";
 	import { ContextMenuTriggerState } from "$lib/bits/menu/menu.svelte.js";
 	import { useId } from "$lib/internal/use-id.js";
diff --git a/packages/bits-ui/src/lib/bits/context-menu/components/context-menu.svelte b/packages/bits-ui/src/lib/bits/context-menu/components/context-menu.svelte
index 184becfb0..0d83def37 100644
--- a/packages/bits-ui/src/lib/bits/context-menu/components/context-menu.svelte
+++ b/packages/bits-ui/src/lib/bits/context-menu/components/context-menu.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { boxWith } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
 	import type { ContextMenuRootProps } from "../types.js";
 	import FloatingLayer from "$lib/bits/utilities/floating-layer/components/floating-layer.svelte";
 	import { noop } from "$lib/internal/noop.js";
diff --git a/packages/bits-ui/src/lib/bits/date-field/components/date-field-input.svelte b/packages/bits-ui/src/lib/bits/date-field/components/date-field-input.svelte
index c72818305..485c26426 100644
--- a/packages/bits-ui/src/lib/bits/date-field/components/date-field-input.svelte
+++ b/packages/bits-ui/src/lib/bits/date-field/components/date-field-input.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { DateFieldInputState } from "../date-field.svelte.js";
 	import type { DateFieldInputProps } from "../types.js";
 	import DateFieldHiddenInput from "./date-field-hidden-input.svelte";
diff --git a/packages/bits-ui/src/lib/bits/date-field/components/date-field-label.svelte b/packages/bits-ui/src/lib/bits/date-field/components/date-field-label.svelte
index f948493da..ffb4be3b1 100644
--- a/packages/bits-ui/src/lib/bits/date-field/components/date-field-label.svelte
+++ b/packages/bits-ui/src/lib/bits/date-field/components/date-field-label.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { DateFieldLabelState } from "../date-field.svelte.js";
 	import type { DateFieldLabelProps } from "../types.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/date-field/components/date-field-segment.svelte b/packages/bits-ui/src/lib/bits/date-field/components/date-field-segment.svelte
index e57570c98..f67e91f3a 100644
--- a/packages/bits-ui/src/lib/bits/date-field/components/date-field-segment.svelte
+++ b/packages/bits-ui/src/lib/bits/date-field/components/date-field-segment.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { DateFieldSegmentState } from "../date-field.svelte.js";
 	import type { DateFieldSegmentProps } from "../types.js";
 	import { createId } from "$lib/internal/create-id.js";
@@ -15,6 +16,7 @@
 		...restProps
 	}: DateFieldSegmentProps = $props();
 
+	// svelte-ignore state_referenced_locally
 	const segmentState = DateFieldSegmentState.create(part, {
 		id: boxWith(() => id),
 		ref: boxWith(
diff --git a/packages/bits-ui/src/lib/bits/date-field/components/date-field.svelte b/packages/bits-ui/src/lib/bits/date-field/components/date-field.svelte
index a72de9497..912fbcfca 100644
--- a/packages/bits-ui/src/lib/bits/date-field/components/date-field.svelte
+++ b/packages/bits-ui/src/lib/bits/date-field/components/date-field.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { watch } from "runed";
-	import { boxWith } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
 	import { DateFieldRootState } from "../date-field.svelte.js";
 	import type { DateFieldRootProps } from "../types.js";
 	import { noop } from "$lib/internal/noop.js";
diff --git a/packages/bits-ui/src/lib/bits/date-field/date-field.svelte.ts b/packages/bits-ui/src/lib/bits/date-field/date-field.svelte.ts
index 1da2a23ea..b4ad2c7f6 100644
--- a/packages/bits-ui/src/lib/bits/date-field/date-field.svelte.ts
+++ b/packages/bits-ui/src/lib/bits/date-field/date-field.svelte.ts
@@ -2,7 +2,6 @@ import type { Updater } from "svelte/store";
 import type { DateValue } from "@internationalized/date";
 import {
 	type WritableBox,
-	boxWith,
 	onDestroyEffect,
 	attachRef,
 	DOMContext,
@@ -10,6 +9,7 @@ import {
 	type WritableBoxedValues,
 	simpleBox,
 } from "svelte-toolbelt";
+import { boxWith } from "$lib/internal/box.svelte.js";
 import { onMount, untrack } from "svelte";
 import { Context, watch } from "runed";
 import type { DateRangeFieldRootState } from "../date-range-field/date-range-field.svelte.js";
diff --git a/packages/bits-ui/src/lib/bits/date-picker/components/date-picker-calendar.svelte b/packages/bits-ui/src/lib/bits/date-picker/components/date-picker-calendar.svelte
index 1fc92004a..0ae232b45 100644
--- a/packages/bits-ui/src/lib/bits/date-picker/components/date-picker-calendar.svelte
+++ b/packages/bits-ui/src/lib/bits/date-picker/components/date-picker-calendar.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { DatePickerCalendarProps } from "../types.js";
 	import { DatePickerRootContext } from "../date-picker.svelte.js";
 	import { CalendarRootState } from "$lib/bits/calendar/calendar.svelte.js";
diff --git a/packages/bits-ui/src/lib/bits/date-picker/components/date-picker-content-static.svelte b/packages/bits-ui/src/lib/bits/date-picker/components/date-picker-content-static.svelte
index 0a0ead39b..aef152afa 100644
--- a/packages/bits-ui/src/lib/bits/date-picker/components/date-picker-content-static.svelte
+++ b/packages/bits-ui/src/lib/bits/date-picker/components/date-picker-content-static.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { mergeProps } from "svelte-toolbelt";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { DatePickerContentStaticProps } from "../types.js";
 	import PopoverContentStatic from "$lib/bits/popover/components/popover-content-static.svelte";
 	import { pickerOpenFocus } from "$lib/internal/date-time/calendar-helpers.svelte.js";
diff --git a/packages/bits-ui/src/lib/bits/date-picker/components/date-picker-content.svelte b/packages/bits-ui/src/lib/bits/date-picker/components/date-picker-content.svelte
index 2647568a4..7101518cf 100644
--- a/packages/bits-ui/src/lib/bits/date-picker/components/date-picker-content.svelte
+++ b/packages/bits-ui/src/lib/bits/date-picker/components/date-picker-content.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { mergeProps } from "svelte-toolbelt";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { DatePickerContentProps } from "../types.js";
 	import PopoverContent from "$lib/bits/popover/components/popover-content.svelte";
 	import { pickerOpenFocus } from "$lib/internal/date-time/calendar-helpers.svelte.js";
diff --git a/packages/bits-ui/src/lib/bits/date-picker/components/date-picker-trigger.svelte b/packages/bits-ui/src/lib/bits/date-picker/components/date-picker-trigger.svelte
index 32fad41d3..30d3b6df7 100644
--- a/packages/bits-ui/src/lib/bits/date-picker/components/date-picker-trigger.svelte
+++ b/packages/bits-ui/src/lib/bits/date-picker/components/date-picker-trigger.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { mergeProps } from "svelte-toolbelt";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { DatePickerTriggerProps } from "../types.js";
 	import PopoverTrigger from "$lib/bits/popover/components/popover-trigger.svelte";
 	import { dateFieldAttrs } from "$lib/bits/date-field/date-field.svelte.js";
diff --git a/packages/bits-ui/src/lib/bits/date-picker/components/date-picker.svelte b/packages/bits-ui/src/lib/bits/date-picker/components/date-picker.svelte
index 630e460b6..acc9809ba 100644
--- a/packages/bits-ui/src/lib/bits/date-picker/components/date-picker.svelte
+++ b/packages/bits-ui/src/lib/bits/date-picker/components/date-picker.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	// Date Picker composes the DateField, Popover, and Calendar components
 	import { watch } from "runed";
-	import { boxWith } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
 	import type { DateValue } from "@internationalized/date";
 	import { DatePickerRootState } from "../date-picker.svelte.js";
 	import type { DatePickerRootProps } from "../types.js";
@@ -50,6 +50,7 @@
 		yearFormat = "numeric",
 	}: DatePickerRootProps = $props();
 
+	// svelte-ignore state_referenced_locally
 	const defaultPlaceholder = getDefaultDate({
 		granularity,
 		defaultValue: value,
diff --git a/packages/bits-ui/src/lib/bits/date-range-field/components/date-range-field-input.svelte b/packages/bits-ui/src/lib/bits/date-range-field/components/date-range-field-input.svelte
index 1e0cac74b..5f2c40ef2 100644
--- a/packages/bits-ui/src/lib/bits/date-range-field/components/date-range-field-input.svelte
+++ b/packages/bits-ui/src/lib/bits/date-range-field/components/date-range-field-input.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { DateRangeFieldInputProps } from "../types.js";
 	import { DateRangeFieldInputState } from "../date-range-field.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
@@ -26,6 +27,7 @@
 			),
 			name: boxWith(() => name),
 		},
+		// svelte-ignore state_referenced_locally
 		type
 	);
 
diff --git a/packages/bits-ui/src/lib/bits/date-range-field/components/date-range-field-label.svelte b/packages/bits-ui/src/lib/bits/date-range-field/components/date-range-field-label.svelte
index 618b9fbe5..60d83fdd5 100644
--- a/packages/bits-ui/src/lib/bits/date-range-field/components/date-range-field-label.svelte
+++ b/packages/bits-ui/src/lib/bits/date-range-field/components/date-range-field-label.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { DateRangeFieldLabelState } from "../date-range-field.svelte.js";
 	import type { DateRangeFieldLabelProps } from "../types.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/date-range-field/components/date-range-field.svelte b/packages/bits-ui/src/lib/bits/date-range-field/components/date-range-field.svelte
index 7e9b58bb6..f7f8b8a8d 100644
--- a/packages/bits-ui/src/lib/bits/date-range-field/components/date-range-field.svelte
+++ b/packages/bits-ui/src/lib/bits/date-range-field/components/date-range-field.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import { watch } from "runed";
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { DateValue } from "@internationalized/date";
 	import { DateRangeFieldRootState } from "../date-range-field.svelte.js";
 	import type { DateRangeFieldRootProps } from "../types.js";
diff --git a/packages/bits-ui/src/lib/bits/date-range-field/date-range-field.svelte.ts b/packages/bits-ui/src/lib/bits/date-range-field/date-range-field.svelte.ts
index 9700a5bfd..b40d3a4f3 100644
--- a/packages/bits-ui/src/lib/bits/date-range-field/date-range-field.svelte.ts
+++ b/packages/bits-ui/src/lib/bits/date-range-field/date-range-field.svelte.ts
@@ -1,12 +1,12 @@
 import type { DateValue } from "@internationalized/date";
 import {
-	boxWith,
 	onDestroyEffect,
 	attachRef,
 	DOMContext,
 	type ReadableBoxedValues,
 	type WritableBoxedValues,
 } from "svelte-toolbelt";
+import { boxWith } from "$lib/internal/box.svelte.js";
 import { Context, watch } from "runed";
 import { DateFieldInputState, DateFieldRootState } from "../date-field/date-field.svelte.js";
 import { useId } from "$lib/internal/use-id.js";
diff --git a/packages/bits-ui/src/lib/bits/date-range-picker/components/date-range-picker-calendar.svelte b/packages/bits-ui/src/lib/bits/date-range-picker/components/date-range-picker-calendar.svelte
index e1184f5b8..48c4e943b 100644
--- a/packages/bits-ui/src/lib/bits/date-range-picker/components/date-range-picker-calendar.svelte
+++ b/packages/bits-ui/src/lib/bits/date-range-picker/components/date-range-picker-calendar.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { DateRangePickerCalendarProps } from "../types.js";
 	import { DateRangePickerRootContext } from "../date-range-picker.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/date-range-picker/components/date-range-picker-trigger.svelte b/packages/bits-ui/src/lib/bits/date-range-picker/components/date-range-picker-trigger.svelte
index 4181a68e7..9fb8740ae 100644
--- a/packages/bits-ui/src/lib/bits/date-range-picker/components/date-range-picker-trigger.svelte
+++ b/packages/bits-ui/src/lib/bits/date-range-picker/components/date-range-picker-trigger.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { mergeProps } from "svelte-toolbelt";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { DateRangePickerTriggerProps } from "../types.js";
 	import PopoverTrigger from "$lib/bits/popover/components/popover-trigger.svelte";
 	import { dateRangeFieldAttrs } from "$lib/bits/date-range-field/date-range-field.svelte.js";
diff --git a/packages/bits-ui/src/lib/bits/date-range-picker/components/date-range-picker.svelte b/packages/bits-ui/src/lib/bits/date-range-picker/components/date-range-picker.svelte
index cb7324aa9..e74ade7a8 100644
--- a/packages/bits-ui/src/lib/bits/date-range-picker/components/date-range-picker.svelte
+++ b/packages/bits-ui/src/lib/bits/date-range-picker/components/date-range-picker.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import { watch } from "runed";
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { DateValue } from "@internationalized/date";
 	import { DateRangePickerRootState } from "../date-range-picker.svelte.js";
 	import type { DateRangePickerRootProps } from "../types.js";
@@ -82,6 +83,7 @@
 		}
 	);
 
+	// svelte-ignore state_referenced_locally
 	const defaultPlaceholder = getDefaultDate({
 		granularity,
 		defaultValue: value?.start,
diff --git a/packages/bits-ui/src/lib/bits/dialog/components/dialog-close.svelte b/packages/bits-ui/src/lib/bits/dialog/components/dialog-close.svelte
index 71d13d036..f08c636ec 100644
--- a/packages/bits-ui/src/lib/bits/dialog/components/dialog-close.svelte
+++ b/packages/bits-ui/src/lib/bits/dialog/components/dialog-close.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { DialogCloseState } from "../dialog.svelte.js";
 	import type { DialogCloseProps } from "../types.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/dialog/components/dialog-content.svelte b/packages/bits-ui/src/lib/bits/dialog/components/dialog-content.svelte
index f3794b1a5..32d35679c 100644
--- a/packages/bits-ui/src/lib/bits/dialog/components/dialog-content.svelte
+++ b/packages/bits-ui/src/lib/bits/dialog/components/dialog-content.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { DialogContentState } from "../dialog.svelte.js";
 	import type { DialogContentProps } from "../types.js";
 	import DismissibleLayer from "$lib/bits/utilities/dismissible-layer/dismissible-layer.svelte";
@@ -36,6 +37,10 @@
 	});
 
 	const mergedProps = $derived(mergeProps(restProps, contentState.props));
+
+	function shouldBlockPointerEvents() {
+		return contentState.root.overlayNode === null;
+	}
 </script>
 
 {#if contentState.shouldRender || forceMount}
@@ -75,14 +80,18 @@
 					>
 						{#if child}
 							{#if contentState.root.opts.open.current}
-								<ScrollLock {preventScroll} {restoreScrollDelay} />
+								<ScrollLock
+									{preventScroll}
+									{restoreScrollDelay}
+									{shouldBlockPointerEvents}
+								/>
 							{/if}
 							{@render child({
 								props: mergeProps(mergedProps, focusScopeProps),
 								...contentState.snippetProps,
 							})}
 						{:else}
-							<ScrollLock {preventScroll} />
+							<ScrollLock {preventScroll} {shouldBlockPointerEvents} />
 							<div {...mergeProps(mergedProps, focusScopeProps)}>
 								{@render children?.()}
 							</div>
diff --git a/packages/bits-ui/src/lib/bits/dialog/components/dialog-description.svelte b/packages/bits-ui/src/lib/bits/dialog/components/dialog-description.svelte
index aa6898125..f09abf9e6 100644
--- a/packages/bits-ui/src/lib/bits/dialog/components/dialog-description.svelte
+++ b/packages/bits-ui/src/lib/bits/dialog/components/dialog-description.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { DialogDescriptionState } from "../dialog.svelte.js";
 	import type { DialogDescriptionProps } from "../types.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/dialog/components/dialog-overlay.svelte b/packages/bits-ui/src/lib/bits/dialog/components/dialog-overlay.svelte
index e94223012..14e584c46 100644
--- a/packages/bits-ui/src/lib/bits/dialog/components/dialog-overlay.svelte
+++ b/packages/bits-ui/src/lib/bits/dialog/components/dialog-overlay.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { DialogOverlayState } from "../dialog.svelte.js";
 	import type { DialogOverlayProps } from "../types.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/dialog/components/dialog-title.svelte b/packages/bits-ui/src/lib/bits/dialog/components/dialog-title.svelte
index 292279a47..c2157921f 100644
--- a/packages/bits-ui/src/lib/bits/dialog/components/dialog-title.svelte
+++ b/packages/bits-ui/src/lib/bits/dialog/components/dialog-title.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { DialogTitleState } from "../dialog.svelte.js";
 	import type { DialogTitleProps } from "../types.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/dialog/components/dialog-trigger.svelte b/packages/bits-ui/src/lib/bits/dialog/components/dialog-trigger.svelte
index 9f72af50b..1b1ebb751 100644
--- a/packages/bits-ui/src/lib/bits/dialog/components/dialog-trigger.svelte
+++ b/packages/bits-ui/src/lib/bits/dialog/components/dialog-trigger.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { DialogTriggerState } from "../dialog.svelte.js";
 	import type { DialogTriggerProps } from "../types.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/dialog/components/dialog.svelte b/packages/bits-ui/src/lib/bits/dialog/components/dialog.svelte
index f4309137a..1414e8725 100644
--- a/packages/bits-ui/src/lib/bits/dialog/components/dialog.svelte
+++ b/packages/bits-ui/src/lib/bits/dialog/components/dialog.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { boxWith } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
 	import { DialogRootState } from "../dialog.svelte.js";
 	import type { DialogRootProps } from "../types.js";
 	import { noop } from "$lib/internal/noop.js";
diff --git a/packages/bits-ui/src/lib/bits/dialog/dialog.svelte.ts b/packages/bits-ui/src/lib/bits/dialog/dialog.svelte.ts
index 2faab9849..1a648dec9 100644
--- a/packages/bits-ui/src/lib/bits/dialog/dialog.svelte.ts
+++ b/packages/bits-ui/src/lib/bits/dialog/dialog.svelte.ts
@@ -1,10 +1,10 @@
 import {
 	attachRef,
-	boxWith,
 	onDestroyEffect,
 	type ReadableBoxedValues,
 	type WritableBoxedValues,
 } from "svelte-toolbelt";
+import { boxWith } from "$lib/internal/box.svelte.js";
 import { Context, watch } from "runed";
 import {
 	createBitsAttrs,
diff --git a/packages/bits-ui/src/lib/bits/dropdown-menu/components/dropdown-menu-content-static.svelte b/packages/bits-ui/src/lib/bits/dropdown-menu/components/dropdown-menu-content-static.svelte
index 97188df40..4bd1c26f1 100644
--- a/packages/bits-ui/src/lib/bits/dropdown-menu/components/dropdown-menu-content-static.svelte
+++ b/packages/bits-ui/src/lib/bits/dropdown-menu/components/dropdown-menu-content-static.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { DropdownMenuContentStaticProps } from "../types.js";
 	import { MenuContentState } from "$lib/bits/menu/menu.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/dropdown-menu/components/dropdown-menu-content.svelte b/packages/bits-ui/src/lib/bits/dropdown-menu/components/dropdown-menu-content.svelte
index ded8ee843..8a8e95fcc 100644
--- a/packages/bits-ui/src/lib/bits/dropdown-menu/components/dropdown-menu-content.svelte
+++ b/packages/bits-ui/src/lib/bits/dropdown-menu/components/dropdown-menu-content.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { DropdownMenuContentProps } from "../types.js";
 	import { MenuContentState } from "$lib/bits/menu/menu.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/label/components/label.svelte b/packages/bits-ui/src/lib/bits/label/components/label.svelte
index ab2c543df..8b5a6362f 100644
--- a/packages/bits-ui/src/lib/bits/label/components/label.svelte
+++ b/packages/bits-ui/src/lib/bits/label/components/label.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { LabelRootProps } from "../types.js";
 	import { LabelRootState } from "../label.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/link-preview/components/link-preview-content-static.svelte b/packages/bits-ui/src/lib/bits/link-preview/components/link-preview-content-static.svelte
index bde52757e..e0abb8792 100644
--- a/packages/bits-ui/src/lib/bits/link-preview/components/link-preview-content-static.svelte
+++ b/packages/bits-ui/src/lib/bits/link-preview/components/link-preview-content-static.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { LinkPreviewContentStaticProps } from "../types.js";
 	import { LinkPreviewContentState } from "../link-preview.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/link-preview/components/link-preview-content.svelte b/packages/bits-ui/src/lib/bits/link-preview/components/link-preview-content.svelte
index 65c36a650..1b19fe229 100644
--- a/packages/bits-ui/src/lib/bits/link-preview/components/link-preview-content.svelte
+++ b/packages/bits-ui/src/lib/bits/link-preview/components/link-preview-content.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { LinkPreviewContentProps } from "../types.js";
 	import { LinkPreviewContentState } from "../link-preview.svelte.js";
 	import PopperLayer from "$lib/bits/utilities/popper-layer/popper-layer.svelte";
diff --git a/packages/bits-ui/src/lib/bits/link-preview/components/link-preview-trigger.svelte b/packages/bits-ui/src/lib/bits/link-preview/components/link-preview-trigger.svelte
index 512b1f39a..023cac115 100644
--- a/packages/bits-ui/src/lib/bits/link-preview/components/link-preview-trigger.svelte
+++ b/packages/bits-ui/src/lib/bits/link-preview/components/link-preview-trigger.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { LinkPreviewTriggerProps } from "../types.js";
 	import { LinkPreviewTriggerState } from "../link-preview.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/link-preview/components/link-preview.svelte b/packages/bits-ui/src/lib/bits/link-preview/components/link-preview.svelte
index 70823566c..327a995a2 100644
--- a/packages/bits-ui/src/lib/bits/link-preview/components/link-preview.svelte
+++ b/packages/bits-ui/src/lib/bits/link-preview/components/link-preview.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { boxWith } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
 	import type { LinkPreviewRootProps } from "../types.js";
 	import { LinkPreviewRootState } from "../link-preview.svelte.js";
 	import { noop } from "$lib/internal/noop.js";
diff --git a/packages/bits-ui/src/lib/bits/link-preview/link-preview.svelte.ts b/packages/bits-ui/src/lib/bits/link-preview/link-preview.svelte.ts
index cceabf5fb..7163ac4a8 100644
--- a/packages/bits-ui/src/lib/bits/link-preview/link-preview.svelte.ts
+++ b/packages/bits-ui/src/lib/bits/link-preview/link-preview.svelte.ts
@@ -5,8 +5,8 @@ import {
 	DOMContext,
 	type ReadableBoxedValues,
 	type WritableBoxedValues,
-	boxWith,
 } from "svelte-toolbelt";
+import { boxWith } from "$lib/internal/box.svelte.js";
 import { Context, watch } from "runed";
 import { on } from "svelte/events";
 import {
diff --git a/packages/bits-ui/src/lib/bits/menu/components/menu-arrow.svelte b/packages/bits-ui/src/lib/bits/menu/components/menu-arrow.svelte
index b7ff082a4..f02710049 100644
--- a/packages/bits-ui/src/lib/bits/menu/components/menu-arrow.svelte
+++ b/packages/bits-ui/src/lib/bits/menu/components/menu-arrow.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { mergeProps } from "svelte-toolbelt";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { MenuArrowProps } from "../types.js";
 	import { MenuArrowState } from "../menu.svelte.js";
 	import FloatingLayerArrow from "$lib/bits/utilities/floating-layer/components/floating-layer-arrow.svelte";
diff --git a/packages/bits-ui/src/lib/bits/menu/components/menu-checkbox-group.svelte b/packages/bits-ui/src/lib/bits/menu/components/menu-checkbox-group.svelte
index 288795a1d..94286f321 100644
--- a/packages/bits-ui/src/lib/bits/menu/components/menu-checkbox-group.svelte
+++ b/packages/bits-ui/src/lib/bits/menu/components/menu-checkbox-group.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { MenuCheckboxGroupProps } from "../types.js";
 	import { MenuCheckboxGroupState } from "../menu.svelte.js";
 	import { noop } from "$lib/internal/noop.js";
diff --git a/packages/bits-ui/src/lib/bits/menu/components/menu-checkbox-item.svelte b/packages/bits-ui/src/lib/bits/menu/components/menu-checkbox-item.svelte
index 7699244ac..eefce58c2 100644
--- a/packages/bits-ui/src/lib/bits/menu/components/menu-checkbox-item.svelte
+++ b/packages/bits-ui/src/lib/bits/menu/components/menu-checkbox-item.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { MenuCheckboxItemProps } from "../types.js";
 	import { MenuCheckboxGroupContext, MenuCheckboxItemState } from "../menu.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
@@ -26,6 +27,7 @@
 
 	const group = MenuCheckboxGroupContext.getOr(null);
 
+	// svelte-ignore state_referenced_locally
 	if (group && value) {
 		if (group.opts.value.current.includes(value)) {
 			checked = true;
diff --git a/packages/bits-ui/src/lib/bits/menu/components/menu-content-static.svelte b/packages/bits-ui/src/lib/bits/menu/components/menu-content-static.svelte
index 27c4f1c2d..54897becf 100644
--- a/packages/bits-ui/src/lib/bits/menu/components/menu-content-static.svelte
+++ b/packages/bits-ui/src/lib/bits/menu/components/menu-content-static.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { MenuContentStaticProps } from "../types.js";
 	import { MenuContentState } from "../menu.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/menu/components/menu-content.svelte b/packages/bits-ui/src/lib/bits/menu/components/menu-content.svelte
index a89aec890..d871f03d6 100644
--- a/packages/bits-ui/src/lib/bits/menu/components/menu-content.svelte
+++ b/packages/bits-ui/src/lib/bits/menu/components/menu-content.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { MenuContentProps } from "../types.js";
 	import { MenuContentState } from "../menu.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/menu/components/menu-group-heading.svelte b/packages/bits-ui/src/lib/bits/menu/components/menu-group-heading.svelte
index 9bc8b0aa4..ba46143d3 100644
--- a/packages/bits-ui/src/lib/bits/menu/components/menu-group-heading.svelte
+++ b/packages/bits-ui/src/lib/bits/menu/components/menu-group-heading.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { MenuGroupHeadingProps } from "../types.js";
 	import { MenuGroupHeadingState } from "../menu.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/menu/components/menu-group.svelte b/packages/bits-ui/src/lib/bits/menu/components/menu-group.svelte
index d016d001a..0d0152bdf 100644
--- a/packages/bits-ui/src/lib/bits/menu/components/menu-group.svelte
+++ b/packages/bits-ui/src/lib/bits/menu/components/menu-group.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { MenuGroupProps } from "../types.js";
 	import { MenuGroupState } from "../menu.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/menu/components/menu-item.svelte b/packages/bits-ui/src/lib/bits/menu/components/menu-item.svelte
index 8f569f3d6..02406d9dd 100644
--- a/packages/bits-ui/src/lib/bits/menu/components/menu-item.svelte
+++ b/packages/bits-ui/src/lib/bits/menu/components/menu-item.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { MenuItemProps } from "../types.js";
 	import { MenuItemState } from "../menu.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/menu/components/menu-radio-group.svelte b/packages/bits-ui/src/lib/bits/menu/components/menu-radio-group.svelte
index 5b75b8da3..0d255ef33 100644
--- a/packages/bits-ui/src/lib/bits/menu/components/menu-radio-group.svelte
+++ b/packages/bits-ui/src/lib/bits/menu/components/menu-radio-group.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { MenuRadioGroupProps } from "../types.js";
 	import { MenuRadioGroupState } from "../menu.svelte.js";
 	import { noop } from "$lib/internal/noop.js";
diff --git a/packages/bits-ui/src/lib/bits/menu/components/menu-radio-item.svelte b/packages/bits-ui/src/lib/bits/menu/components/menu-radio-item.svelte
index 25325d080..29951447e 100644
--- a/packages/bits-ui/src/lib/bits/menu/components/menu-radio-item.svelte
+++ b/packages/bits-ui/src/lib/bits/menu/components/menu-radio-item.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { MenuRadioItemProps } from "../types.js";
 	import { MenuRadioItemState } from "../menu.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/menu/components/menu-separator.svelte b/packages/bits-ui/src/lib/bits/menu/components/menu-separator.svelte
index 4c426e6f3..f6a798f3f 100644
--- a/packages/bits-ui/src/lib/bits/menu/components/menu-separator.svelte
+++ b/packages/bits-ui/src/lib/bits/menu/components/menu-separator.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { MenuSeparatorProps } from "../types.js";
 	import { MenuSeparatorState } from "../menu.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/menu/components/menu-sub-content-static.svelte b/packages/bits-ui/src/lib/bits/menu/components/menu-sub-content-static.svelte
index 0176faf9f..07b3da7db 100644
--- a/packages/bits-ui/src/lib/bits/menu/components/menu-sub-content-static.svelte
+++ b/packages/bits-ui/src/lib/bits/menu/components/menu-sub-content-static.svelte
@@ -1,5 +1,7 @@
 <script lang="ts">
-	import { afterTick, boxWith, mergeProps } from "svelte-toolbelt";
+	import { afterTick } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { MenuSubContentStaticProps } from "../types.js";
 	import { MenuContentState } from "../menu.svelte.js";
 	import { SUB_CLOSE_KEYS } from "../utils.js";
diff --git a/packages/bits-ui/src/lib/bits/menu/components/menu-sub-content.svelte b/packages/bits-ui/src/lib/bits/menu/components/menu-sub-content.svelte
index f8eda1d0b..2f5a0265e 100644
--- a/packages/bits-ui/src/lib/bits/menu/components/menu-sub-content.svelte
+++ b/packages/bits-ui/src/lib/bits/menu/components/menu-sub-content.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { MenuSubContentProps } from "../types.js";
 	import { MenuOpenEvent, MenuContentState } from "../menu.svelte.js";
 	import { SUB_CLOSE_KEYS } from "../utils.js";
diff --git a/packages/bits-ui/src/lib/bits/menu/components/menu-sub-trigger.svelte b/packages/bits-ui/src/lib/bits/menu/components/menu-sub-trigger.svelte
index c309297e8..693adf8b4 100644
--- a/packages/bits-ui/src/lib/bits/menu/components/menu-sub-trigger.svelte
+++ b/packages/bits-ui/src/lib/bits/menu/components/menu-sub-trigger.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { MenuSubTriggerProps } from "../types.js";
 	import { MenuSubTriggerState } from "../menu.svelte.js";
 	import FloatingLayerAnchor from "$lib/bits/utilities/floating-layer/components/floating-layer-anchor.svelte";
diff --git a/packages/bits-ui/src/lib/bits/menu/components/menu-sub.svelte b/packages/bits-ui/src/lib/bits/menu/components/menu-sub.svelte
index a4f7253f2..089ca1307 100644
--- a/packages/bits-ui/src/lib/bits/menu/components/menu-sub.svelte
+++ b/packages/bits-ui/src/lib/bits/menu/components/menu-sub.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { boxWith } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
 	import type { MenuSubProps } from "../types.js";
 	import { MenuSubmenuState } from "../menu.svelte.js";
 	import FloatingLayer from "$lib/bits/utilities/floating-layer/components/floating-layer.svelte";
diff --git a/packages/bits-ui/src/lib/bits/menu/components/menu-trigger.svelte b/packages/bits-ui/src/lib/bits/menu/components/menu-trigger.svelte
index e4aa1960d..2c6819951 100644
--- a/packages/bits-ui/src/lib/bits/menu/components/menu-trigger.svelte
+++ b/packages/bits-ui/src/lib/bits/menu/components/menu-trigger.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { MenuTriggerProps } from "../types.js";
 	import { DropdownMenuTriggerState } from "../menu.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/menu/components/menu.svelte b/packages/bits-ui/src/lib/bits/menu/components/menu.svelte
index 737b5887b..bc6f72264 100644
--- a/packages/bits-ui/src/lib/bits/menu/components/menu.svelte
+++ b/packages/bits-ui/src/lib/bits/menu/components/menu.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { boxWith } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
 	import type { MenuRootProps } from "../types.js";
 	import { MenuMenuState, MenuRootState } from "../menu.svelte.js";
 	import { noop } from "$lib/internal/noop.js";
diff --git a/packages/bits-ui/src/lib/bits/menu/menu.svelte.ts b/packages/bits-ui/src/lib/bits/menu/menu.svelte.ts
index e76c06d14..b89bfe3f0 100644
--- a/packages/bits-ui/src/lib/bits/menu/menu.svelte.ts
+++ b/packages/bits-ui/src/lib/bits/menu/menu.svelte.ts
@@ -1,6 +1,5 @@
 import {
 	afterTick,
-	mergeProps,
 	onDestroyEffect,
 	attachRef,
 	DOMContext,
@@ -9,9 +8,10 @@ import {
 	type ReadableBoxedValues,
 	type WritableBoxedValues,
 	simpleBox,
-	boxWith,
 	type ReadableBox,
 } from "svelte-toolbelt";
+import { boxWith } from "$lib/internal/box.svelte.js";
+import { mergeProps } from "$lib/internal/merge-props.js";
 import { Context, watch } from "runed";
 import {
 	FIRST_LAST_KEYS,
@@ -1333,14 +1333,13 @@ export class MenuItemState {
 		this.#isPointerDown = true;
 	}
 
-	readonly props = $derived.by(() =>
-		mergeProps(this.item.props, {
-			onclick: this.onclick,
-			onpointerdown: this.onpointerdown,
-			onpointerup: this.onpointerup,
-			onkeydown: this.onkeydown,
-		})
-	);
+	readonly props = $derived.by(() => ({
+		...this.item.props,
+		onclick: this.onclick,
+		onpointerdown: this.onpointerdown,
+		onpointerup: this.onpointerup,
+		onkeydown: this.onkeydown,
+	}));
 }
 
 interface MenuSubTriggerStateOpts
diff --git a/packages/bits-ui/src/lib/bits/menubar/components/menubar-content-static.svelte b/packages/bits-ui/src/lib/bits/menubar/components/menubar-content-static.svelte
index dfacbf2a0..9813423b2 100644
--- a/packages/bits-ui/src/lib/bits/menubar/components/menubar-content-static.svelte
+++ b/packages/bits-ui/src/lib/bits/menubar/components/menubar-content-static.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { MenubarContentStaticProps } from "../types.js";
 	import { MenubarContentState } from "../menubar.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/menubar/components/menubar-content.svelte b/packages/bits-ui/src/lib/bits/menubar/components/menubar-content.svelte
index 1d6f5cc6f..9c8f12549 100644
--- a/packages/bits-ui/src/lib/bits/menubar/components/menubar-content.svelte
+++ b/packages/bits-ui/src/lib/bits/menubar/components/menubar-content.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { MenubarContentProps } from "../types.js";
 	import { MenubarContentState } from "../menubar.svelte.js";
 	import MenuContent from "$lib/bits/menu/components/menu-content.svelte";
diff --git a/packages/bits-ui/src/lib/bits/menubar/components/menubar-menu.svelte b/packages/bits-ui/src/lib/bits/menubar/components/menubar-menu.svelte
index 4491f4078..241002349 100644
--- a/packages/bits-ui/src/lib/bits/menubar/components/menubar-menu.svelte
+++ b/packages/bits-ui/src/lib/bits/menubar/components/menubar-menu.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { boxWith } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
 	import type { MenubarMenuProps } from "../types.js";
 	import { MenubarMenuState } from "../menubar.svelte.js";
 	import Menu from "$lib/bits/menu/components/menu.svelte";
diff --git a/packages/bits-ui/src/lib/bits/menubar/components/menubar-trigger.svelte b/packages/bits-ui/src/lib/bits/menubar/components/menubar-trigger.svelte
index 21eeeaf13..ad671cec7 100644
--- a/packages/bits-ui/src/lib/bits/menubar/components/menubar-trigger.svelte
+++ b/packages/bits-ui/src/lib/bits/menubar/components/menubar-trigger.svelte
@@ -1,5 +1,7 @@
 <script lang="ts">
-	import { attachRef, boxWith, mergeProps } from "svelte-toolbelt";
+	import { attachRef } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { MenubarTriggerProps } from "../types.js";
 	import { MenubarTriggerState } from "../menubar.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/menubar/components/menubar.svelte b/packages/bits-ui/src/lib/bits/menubar/components/menubar.svelte
index 892114565..530399fb6 100644
--- a/packages/bits-ui/src/lib/bits/menubar/components/menubar.svelte
+++ b/packages/bits-ui/src/lib/bits/menubar/components/menubar.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { MenubarRootProps } from "../types.js";
 	import { MenubarRootState } from "../menubar.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/menubar/menubar.svelte.ts b/packages/bits-ui/src/lib/bits/menubar/menubar.svelte.ts
index 8bbba2b6e..11eb12d73 100644
--- a/packages/bits-ui/src/lib/bits/menubar/menubar.svelte.ts
+++ b/packages/bits-ui/src/lib/bits/menubar/menubar.svelte.ts
@@ -1,11 +1,11 @@
 import {
 	type ReadableBox,
 	afterTick,
-	boxWith,
 	attachRef,
 	type ReadableBoxedValues,
 	type WritableBoxedValues,
 } from "svelte-toolbelt";
+import { boxWith } from "$lib/internal/box.svelte.js";
 import { Context, watch } from "runed";
 import type { InteractOutsideBehaviorType } from "../utilities/dismissible-layer/types.js";
 import type { Direction } from "$lib/shared/index.js";
diff --git a/packages/bits-ui/src/lib/bits/meter/components/meter.svelte b/packages/bits-ui/src/lib/bits/meter/components/meter.svelte
index fc7a0acf6..0c8a355dc 100644
--- a/packages/bits-ui/src/lib/bits/meter/components/meter.svelte
+++ b/packages/bits-ui/src/lib/bits/meter/components/meter.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { MeterRootProps } from "../types.js";
 	import { MeterRootState } from "../meter.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-content-impl.svelte b/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-content-impl.svelte
index d8118aa9b..1b04dad69 100644
--- a/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-content-impl.svelte
+++ b/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-content-impl.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { untrack, type Snippet } from "svelte";
 	import type { NavigationMenuContentProps } from "../types.js";
 	import {
@@ -44,9 +45,11 @@
 				}
 			),
 		},
+		// svelte-ignore state_referenced_locally
 		itemState
 	);
 
+	// svelte-ignore state_referenced_locally
 	if (itemState) {
 		NavigationMenuItemContext.set(itemState);
 	}
diff --git a/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-content.svelte b/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-content.svelte
index 447734fc4..456bae947 100644
--- a/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-content.svelte
+++ b/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-content.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { NavigationMenuContentState } from "../navigation-menu.svelte.js";
 	import NavigationMenuContentImpl from "./navigation-menu-content-impl.svelte";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-indicator-impl.svelte b/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-indicator-impl.svelte
index 15c542ac1..7f8fd4ab8 100644
--- a/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-indicator-impl.svelte
+++ b/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-indicator-impl.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { NavigationMenuIndicatorProps } from "../types.js";
 	import { NavigationMenuIndicatorImplState } from "../navigation-menu.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-indicator.svelte b/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-indicator.svelte
index c10988e3a..85158d117 100644
--- a/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-indicator.svelte
+++ b/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-indicator.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { NavigationMenuIndicatorProps } from "../types.js";
 	import { NavigationMenuIndicatorState } from "../navigation-menu.svelte.js";
 	import NavigationMenuIndicatorImpl from "./navigation-menu-indicator-impl.svelte";
diff --git a/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-item.svelte b/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-item.svelte
index a78f0ea29..023aefabe 100644
--- a/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-item.svelte
+++ b/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-item.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { NavigationMenuItemProps } from "../types.js";
 	import { NavigationMenuItemState } from "../navigation-menu.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-link.svelte b/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-link.svelte
index b0bf2c767..196cfff24 100644
--- a/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-link.svelte
+++ b/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-link.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { NavigationMenuLinkProps } from "../types.js";
 	import { NavigationMenuLinkState } from "../navigation-menu.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-list.svelte b/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-list.svelte
index 8892936fa..f1958fb96 100644
--- a/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-list.svelte
+++ b/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-list.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { NavigationMenuListProps } from "../types.js";
 	import { NavigationMenuListState } from "../navigation-menu.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-sub.svelte b/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-sub.svelte
index 8b61390d2..8f58f23c7 100644
--- a/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-sub.svelte
+++ b/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-sub.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { NavigationMenuSubProps } from "../types.js";
 	import { NavigationMenuSubState } from "../navigation-menu.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-trigger.svelte b/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-trigger.svelte
index c7241d182..638829936 100644
--- a/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-trigger.svelte
+++ b/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-trigger.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { NavigationMenuTriggerProps } from "../types.js";
 	import { NavigationMenuTriggerState } from "../navigation-menu.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-viewport.svelte b/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-viewport.svelte
index d1557e122..337a87c3f 100644
--- a/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-viewport.svelte
+++ b/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-viewport.svelte
@@ -4,7 +4,8 @@
 	import { createId } from "$lib/internal/create-id.js";
 	import { getDataTransitionAttrs } from "$lib/internal/attrs.js";
 	import PresenceLayer from "$lib/bits/utilities/presence-layer/presence-layer.svelte";
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { Mounted } from "$lib/bits/utilities/index.js";
 
 	const uid = $props.id();
diff --git a/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu.svelte b/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu.svelte
index 1067f7a9d..31eb8cf3f 100644
--- a/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu.svelte
+++ b/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { NavigationMenuRootProps } from "../types.js";
 	import { NavigationMenuRootState } from "../navigation-menu.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/navigation-menu/navigation-menu.svelte.ts b/packages/bits-ui/src/lib/bits/navigation-menu/navigation-menu.svelte.ts
index 2c933d0c1..c91c8d468 100644
--- a/packages/bits-ui/src/lib/bits/navigation-menu/navigation-menu.svelte.ts
+++ b/packages/bits-ui/src/lib/bits/navigation-menu/navigation-menu.svelte.ts
@@ -15,8 +15,8 @@ import {
 	DOMContext,
 	getWindow,
 	simpleBox,
-	boxWith,
 } from "svelte-toolbelt";
+import { boxWith } from "$lib/internal/box.svelte.js";
 import { Context, useDebounce, watch } from "runed";
 import { untrack, type Snippet } from "svelte";
 import { SvelteMap } from "svelte/reactivity";
diff --git a/packages/bits-ui/src/lib/bits/pagination/components/pagination-next-button.svelte b/packages/bits-ui/src/lib/bits/pagination/components/pagination-next-button.svelte
index 96adde22e..3e979fc99 100644
--- a/packages/bits-ui/src/lib/bits/pagination/components/pagination-next-button.svelte
+++ b/packages/bits-ui/src/lib/bits/pagination/components/pagination-next-button.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { PaginationNextButtonProps } from "../types.js";
 	import { PaginationButtonState } from "../pagination.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/pagination/components/pagination-page.svelte b/packages/bits-ui/src/lib/bits/pagination/components/pagination-page.svelte
index c482fc472..09ad0534a 100644
--- a/packages/bits-ui/src/lib/bits/pagination/components/pagination-page.svelte
+++ b/packages/bits-ui/src/lib/bits/pagination/components/pagination-page.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { PaginationPageProps } from "../types.js";
 	import { PaginationPageState } from "../pagination.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/pagination/components/pagination-prev-button.svelte b/packages/bits-ui/src/lib/bits/pagination/components/pagination-prev-button.svelte
index aef803766..60ab74984 100644
--- a/packages/bits-ui/src/lib/bits/pagination/components/pagination-prev-button.svelte
+++ b/packages/bits-ui/src/lib/bits/pagination/components/pagination-prev-button.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { PaginationPrevButtonProps } from "../types.js";
 	import { PaginationButtonState } from "../pagination.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/pagination/components/pagination.svelte b/packages/bits-ui/src/lib/bits/pagination/components/pagination.svelte
index 6ce46897e..db51d8510 100644
--- a/packages/bits-ui/src/lib/bits/pagination/components/pagination.svelte
+++ b/packages/bits-ui/src/lib/bits/pagination/components/pagination.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { PaginationRootProps } from "../types.js";
 	import { PaginationRootState } from "../pagination.svelte.js";
 	import { noop } from "$lib/internal/noop.js";
diff --git a/packages/bits-ui/src/lib/bits/pin-input/components/pin-input-cell.svelte b/packages/bits-ui/src/lib/bits/pin-input/components/pin-input-cell.svelte
index 3839650bb..030f336c5 100644
--- a/packages/bits-ui/src/lib/bits/pin-input/components/pin-input-cell.svelte
+++ b/packages/bits-ui/src/lib/bits/pin-input/components/pin-input-cell.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { PinInputCellProps } from "../types.js";
 	import { PinInputCellState } from "../pin-input.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/pin-input/components/pin-input.svelte b/packages/bits-ui/src/lib/bits/pin-input/components/pin-input.svelte
index f4427d24c..ef8b65ea2 100644
--- a/packages/bits-ui/src/lib/bits/pin-input/components/pin-input.svelte
+++ b/packages/bits-ui/src/lib/bits/pin-input/components/pin-input.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { PinInputRootProps } from "../types.js";
 	import { PinInputRootState } from "../pin-input.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/popover/components/popover-close.svelte b/packages/bits-ui/src/lib/bits/popover/components/popover-close.svelte
index b04288e14..36cdeb420 100644
--- a/packages/bits-ui/src/lib/bits/popover/components/popover-close.svelte
+++ b/packages/bits-ui/src/lib/bits/popover/components/popover-close.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { PopoverCloseProps } from "../types.js";
 	import { PopoverCloseState } from "../popover.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/popover/components/popover-content-static.svelte b/packages/bits-ui/src/lib/bits/popover/components/popover-content-static.svelte
index 4624ab4a8..0f30970a0 100644
--- a/packages/bits-ui/src/lib/bits/popover/components/popover-content-static.svelte
+++ b/packages/bits-ui/src/lib/bits/popover/components/popover-content-static.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { PopoverContentStaticProps } from "../types.js";
 	import { PopoverContentState } from "../popover.svelte.js";
 	import PopperLayer from "$lib/bits/utilities/popper-layer/popper-layer.svelte";
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 5ded1f710..da4f4f4a5 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
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { PopoverContentProps } from "../types.js";
 	import { PopoverContentState } from "../popover.svelte.js";
 	import PopperLayer from "$lib/bits/utilities/popper-layer/popper-layer.svelte";
diff --git a/packages/bits-ui/src/lib/bits/popover/components/popover-overlay.svelte b/packages/bits-ui/src/lib/bits/popover/components/popover-overlay.svelte
index 79c4a9418..45442dec2 100644
--- a/packages/bits-ui/src/lib/bits/popover/components/popover-overlay.svelte
+++ b/packages/bits-ui/src/lib/bits/popover/components/popover-overlay.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { PopoverOverlayState } from "../popover.svelte.js";
 	import type { PopoverOverlayProps } from "../types.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/popover/components/popover-trigger.svelte b/packages/bits-ui/src/lib/bits/popover/components/popover-trigger.svelte
index 54e908df3..fee909761 100644
--- a/packages/bits-ui/src/lib/bits/popover/components/popover-trigger.svelte
+++ b/packages/bits-ui/src/lib/bits/popover/components/popover-trigger.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { PopoverTriggerProps } from "../types.js";
 	import { PopoverTriggerState } from "../popover.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/popover/components/popover.svelte b/packages/bits-ui/src/lib/bits/popover/components/popover.svelte
index 3fd3dec54..4323280ae 100644
--- a/packages/bits-ui/src/lib/bits/popover/components/popover.svelte
+++ b/packages/bits-ui/src/lib/bits/popover/components/popover.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { boxWith } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
 	import type { PopoverRootProps } from "../types.js";
 	import { PopoverRootState } from "../popover.svelte.js";
 	import FloatingLayer from "$lib/bits/utilities/floating-layer/components/floating-layer.svelte";
diff --git a/packages/bits-ui/src/lib/bits/popover/popover.svelte.ts b/packages/bits-ui/src/lib/bits/popover/popover.svelte.ts
index 850a6dc67..e7aae2ed0 100644
--- a/packages/bits-ui/src/lib/bits/popover/popover.svelte.ts
+++ b/packages/bits-ui/src/lib/bits/popover/popover.svelte.ts
@@ -2,9 +2,9 @@ import {
 	type ReadableBoxedValues,
 	type WritableBoxedValues,
 	attachRef,
-	boxWith,
 	DOMContext,
 } from "svelte-toolbelt";
+import { boxWith } from "$lib/internal/box.svelte.js";
 import { Context, watch } from "runed";
 import { kbd } from "$lib/internal/kbd.js";
 import {
diff --git a/packages/bits-ui/src/lib/bits/progress/components/progress.svelte b/packages/bits-ui/src/lib/bits/progress/components/progress.svelte
index 8413ce86d..4d75ad01b 100644
--- a/packages/bits-ui/src/lib/bits/progress/components/progress.svelte
+++ b/packages/bits-ui/src/lib/bits/progress/components/progress.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { ProgressRootProps } from "../types.js";
 	import { ProgressRootState } from "../progress.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/radio-group/components/radio-group-item.svelte b/packages/bits-ui/src/lib/bits/radio-group/components/radio-group-item.svelte
index 4c5d17a7b..b2f970988 100644
--- a/packages/bits-ui/src/lib/bits/radio-group/components/radio-group-item.svelte
+++ b/packages/bits-ui/src/lib/bits/radio-group/components/radio-group-item.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { RadioGroupItemProps } from "../types.js";
 	import { RadioGroupItemState } from "../radio-group.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/radio-group/components/radio-group.svelte b/packages/bits-ui/src/lib/bits/radio-group/components/radio-group.svelte
index 32cd97058..ed075dd28 100644
--- a/packages/bits-ui/src/lib/bits/radio-group/components/radio-group.svelte
+++ b/packages/bits-ui/src/lib/bits/radio-group/components/radio-group.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { RadioGroupRootProps } from "../types.js";
 	import { RadioGroupRootState } from "../radio-group.svelte.js";
 	import RadioGroupInput from "./radio-group-input.svelte";
diff --git a/packages/bits-ui/src/lib/bits/range-calendar/components/range-calendar-cell.svelte b/packages/bits-ui/src/lib/bits/range-calendar/components/range-calendar-cell.svelte
index 769203cd3..4f98a5c03 100644
--- a/packages/bits-ui/src/lib/bits/range-calendar/components/range-calendar-cell.svelte
+++ b/packages/bits-ui/src/lib/bits/range-calendar/components/range-calendar-cell.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { RangeCalendarCellProps } from "../types.js";
 	import { RangeCalendarCellState } from "../range-calendar.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/range-calendar/components/range-calendar-day.svelte b/packages/bits-ui/src/lib/bits/range-calendar/components/range-calendar-day.svelte
index b04f117b3..2b5ee6a5b 100644
--- a/packages/bits-ui/src/lib/bits/range-calendar/components/range-calendar-day.svelte
+++ b/packages/bits-ui/src/lib/bits/range-calendar/components/range-calendar-day.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { RangeCalendarDayProps } from "../types.js";
 	import { RangeCalendarDayState } from "../range-calendar.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/range-calendar/components/range-calendar.svelte b/packages/bits-ui/src/lib/bits/range-calendar/components/range-calendar.svelte
index 3d7833435..b4c7a8cca 100644
--- a/packages/bits-ui/src/lib/bits/range-calendar/components/range-calendar.svelte
+++ b/packages/bits-ui/src/lib/bits/range-calendar/components/range-calendar.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import { watch } from "runed";
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { type DateValue } from "@internationalized/date";
 	import type { RangeCalendarRootProps } from "../types.js";
 	import { RangeCalendarRootState } from "../range-calendar.svelte.js";
@@ -50,7 +51,9 @@
 
 	const defaultPlaceholder = getDefaultDate({
 		defaultValue: value?.start,
+		// svelte-ignore state_referenced_locally
 		minValue,
+		// svelte-ignore state_referenced_locally
 		maxValue,
 	});
 
diff --git a/packages/bits-ui/src/lib/bits/rating-group/components/rating-group-item.svelte b/packages/bits-ui/src/lib/bits/rating-group/components/rating-group-item.svelte
index 64517aeb0..99fa354c4 100644
--- a/packages/bits-ui/src/lib/bits/rating-group/components/rating-group-item.svelte
+++ b/packages/bits-ui/src/lib/bits/rating-group/components/rating-group-item.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { RatingGroupItemProps } from "../types.js";
 	import { RatingGroupItemState } from "../rating-group.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/rating-group/components/rating-group.svelte b/packages/bits-ui/src/lib/bits/rating-group/components/rating-group.svelte
index 9c6e264f1..e62dad6d2 100644
--- a/packages/bits-ui/src/lib/bits/rating-group/components/rating-group.svelte
+++ b/packages/bits-ui/src/lib/bits/rating-group/components/rating-group.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { RatingGroupRootProps } from "../types.js";
 	import { RatingGroupRootState } from "../rating-group.svelte.js";
 	import RatingGroupInput from "./rating-group-input.svelte";
diff --git a/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-corner-impl.svelte b/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-corner-impl.svelte
index 7bec72e13..686f954d4 100644
--- a/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-corner-impl.svelte
+++ b/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-corner-impl.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { ScrollAreaCornerProps } from "../types.js";
 	import { ScrollAreaCornerImplState } from "../scroll-area.svelte.js";
 
diff --git a/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-auto.svelte b/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-auto.svelte
index 72e8b2611..1c8b1fc34 100644
--- a/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-auto.svelte
+++ b/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-auto.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { mergeProps } from "svelte-toolbelt";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { ScrollAreaScrollbarAutoState } from "../scroll-area.svelte.js";
 	import type { _ScrollbarStubProps } from "../types.js";
 	import ScrollAreaScrollbarVisible from "./scroll-area-scrollbar-visible.svelte";
diff --git a/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-hover.svelte b/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-hover.svelte
index c086e0b2e..224b8ba97 100644
--- a/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-hover.svelte
+++ b/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-hover.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { mergeProps } from "svelte-toolbelt";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import {
 		ScrollAreaScrollbarAutoState,
 		ScrollAreaScrollbarHoverState,
diff --git a/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-scroll.svelte b/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-scroll.svelte
index d530c8438..28d6947c3 100644
--- a/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-scroll.svelte
+++ b/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-scroll.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { mergeProps } from "svelte-toolbelt";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { ScrollAreaScrollbarScrollState } from "../scroll-area.svelte.js";
 	import type { _ScrollbarStubProps } from "../types.js";
 	import ScrollAreaScrollbarVisible from "./scroll-area-scrollbar-visible.svelte";
diff --git a/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-shared.svelte b/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-shared.svelte
index 7032347de..6560fd368 100644
--- a/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-shared.svelte
+++ b/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-shared.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { mergeProps } from "svelte-toolbelt";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { ScrollAreaScrollbarSharedState } from "../scroll-area.svelte.js";
 	import type { _ScrollbarStubProps } from "../types.js";
 
diff --git a/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-x.svelte b/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-x.svelte
index f8f18b8fa..71645bf0f 100644
--- a/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-x.svelte
+++ b/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-x.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import { IsMounted } from "runed";
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { ScrollAreaScrollbarXState } from "../scroll-area.svelte.js";
 	import type { _ScrollbarStubProps } from "../types.js";
 	import ScrollAreaScrollbarShared from "./scroll-area-scrollbar-shared.svelte";
diff --git a/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-y.svelte b/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-y.svelte
index 953f520c9..692519a87 100644
--- a/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-y.svelte
+++ b/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-y.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import { IsMounted } from "runed";
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { ScrollAreaScrollbarYState } from "../scroll-area.svelte.js";
 	import type { _ScrollbarStubProps } from "../types.js";
 	import ScrollAreaScrollbarShared from "./scroll-area-scrollbar-shared.svelte";
diff --git a/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar.svelte b/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar.svelte
index 6ceb40628..5301f812c 100644
--- a/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar.svelte
+++ b/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { boxWith } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
 	import type { ScrollAreaScrollbarProps } from "../types.js";
 	import { ScrollAreaScrollbarState } from "../scroll-area.svelte.js";
 	import ScrollAreaScrollbarAuto from "./scroll-area-scrollbar-auto.svelte";
diff --git a/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-thumb-impl.svelte b/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-thumb-impl.svelte
index 801046008..f191d9230 100644
--- a/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-thumb-impl.svelte
+++ b/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-thumb-impl.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { IsMounted } from "runed";
 	import type { ScrollAreaThumbProps } from "../types.js";
 	import { ScrollAreaThumbImplState } from "../scroll-area.svelte.js";
diff --git a/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-viewport.svelte b/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-viewport.svelte
index 43b4e02a4..e91965a16 100644
--- a/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-viewport.svelte
+++ b/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-viewport.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { ScrollAreaViewportProps } from "../types.js";
 	import { ScrollAreaViewportState } from "../scroll-area.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area.svelte b/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area.svelte
index 536ac4fa7..dd1f58284 100644
--- a/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area.svelte
+++ b/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { ScrollAreaRootProps } from "../types.js";
 	import { ScrollAreaRootState } from "../scroll-area.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/select/components/select-content-static.svelte b/packages/bits-ui/src/lib/bits/select/components/select-content-static.svelte
index 946129293..4860fe3f9 100644
--- a/packages/bits-ui/src/lib/bits/select/components/select-content-static.svelte
+++ b/packages/bits-ui/src/lib/bits/select/components/select-content-static.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { SelectContentStaticProps } from "../types.js";
 	import { SelectContentState } from "../select.svelte.js";
 	import PopperLayer from "$lib/bits/utilities/popper-layer/popper-layer.svelte";
diff --git a/packages/bits-ui/src/lib/bits/select/components/select-content.svelte b/packages/bits-ui/src/lib/bits/select/components/select-content.svelte
index 0f62885f8..134e20217 100644
--- a/packages/bits-ui/src/lib/bits/select/components/select-content.svelte
+++ b/packages/bits-ui/src/lib/bits/select/components/select-content.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { SelectContentProps } from "../types.js";
 	import { SelectContentState } from "../select.svelte.js";
 	import PopperLayer from "$lib/bits/utilities/popper-layer/popper-layer.svelte";
diff --git a/packages/bits-ui/src/lib/bits/select/components/select-group-heading.svelte b/packages/bits-ui/src/lib/bits/select/components/select-group-heading.svelte
index 7def5698c..287b1bae4 100644
--- a/packages/bits-ui/src/lib/bits/select/components/select-group-heading.svelte
+++ b/packages/bits-ui/src/lib/bits/select/components/select-group-heading.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { SelectGroupHeadingProps } from "../types.js";
 	import { SelectGroupHeadingState } from "../select.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/select/components/select-group.svelte b/packages/bits-ui/src/lib/bits/select/components/select-group.svelte
index d92d85b3a..915244fd2 100644
--- a/packages/bits-ui/src/lib/bits/select/components/select-group.svelte
+++ b/packages/bits-ui/src/lib/bits/select/components/select-group.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { SelectGroupState } from "../select.svelte.js";
 	import type { SelectGroupProps } from "../types.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/select/components/select-hidden-input.svelte b/packages/bits-ui/src/lib/bits/select/components/select-hidden-input.svelte
index 744b3338e..94473bb8b 100644
--- a/packages/bits-ui/src/lib/bits/select/components/select-hidden-input.svelte
+++ b/packages/bits-ui/src/lib/bits/select/components/select-hidden-input.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { boxWith } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
 	import { SelectHiddenInputState } from "../select.svelte.js";
 	import type { HTMLInputAttributes } from "svelte/elements";
 	import HiddenInput from "$lib/bits/utilities/hidden-input.svelte";
diff --git a/packages/bits-ui/src/lib/bits/select/components/select-item.svelte b/packages/bits-ui/src/lib/bits/select/components/select-item.svelte
index e2e6cb834..12a16de3e 100644
--- a/packages/bits-ui/src/lib/bits/select/components/select-item.svelte
+++ b/packages/bits-ui/src/lib/bits/select/components/select-item.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { SelectItemState } from "../select.svelte.js";
 	import type { SelectItemProps } from "../types.js";
 	import { createId } from "$lib/internal/create-id.js";
 	import { noop } from "$lib/internal/noop.js";
-	import Mounted from "$lib/bits/utilities/mounted.svelte";
 
 	const uid = $props.id();
 
@@ -44,5 +44,3 @@
 		{@render children?.(itemState.snippetProps)}
 	</div>
 {/if}
-
-<Mounted bind:mounted={itemState.mounted} />
diff --git a/packages/bits-ui/src/lib/bits/select/components/select-scroll-down-button.svelte b/packages/bits-ui/src/lib/bits/select/components/select-scroll-down-button.svelte
index 44af9bcd0..78d0e5c45 100644
--- a/packages/bits-ui/src/lib/bits/select/components/select-scroll-down-button.svelte
+++ b/packages/bits-ui/src/lib/bits/select/components/select-scroll-down-button.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { SelectScrollDownButtonProps } from "../types.js";
 	import { SelectScrollDownButtonState } from "../select.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/select/components/select-scroll-up-button.svelte b/packages/bits-ui/src/lib/bits/select/components/select-scroll-up-button.svelte
index d49e08b42..612a5f002 100644
--- a/packages/bits-ui/src/lib/bits/select/components/select-scroll-up-button.svelte
+++ b/packages/bits-ui/src/lib/bits/select/components/select-scroll-up-button.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { SelectScrollUpButtonProps } from "../types.js";
 	import { SelectScrollUpButtonState } from "../select.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/select/components/select-trigger.svelte b/packages/bits-ui/src/lib/bits/select/components/select-trigger.svelte
index d0ecf2c47..d8703cf04 100644
--- a/packages/bits-ui/src/lib/bits/select/components/select-trigger.svelte
+++ b/packages/bits-ui/src/lib/bits/select/components/select-trigger.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { SelectTriggerState } from "../select.svelte.js";
 	import type { SelectTriggerProps } from "../types.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/select/components/select-value.svelte b/packages/bits-ui/src/lib/bits/select/components/select-value.svelte
index 64f116dd3..cc795477f 100644
--- a/packages/bits-ui/src/lib/bits/select/components/select-value.svelte
+++ b/packages/bits-ui/src/lib/bits/select/components/select-value.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { SelectValueState } from "../select.svelte.js";
 	import type { SelectValueProps } from "../types.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/select/components/select-viewport.svelte b/packages/bits-ui/src/lib/bits/select/components/select-viewport.svelte
index 4c5ca7146..6e1ab2c8f 100644
--- a/packages/bits-ui/src/lib/bits/select/components/select-viewport.svelte
+++ b/packages/bits-ui/src/lib/bits/select/components/select-viewport.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { SelectViewportProps } from "../types.js";
 	import { SelectViewportState } from "../select.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/select/components/select.svelte b/packages/bits-ui/src/lib/bits/select/components/select.svelte
index 5c68f14b8..f395c05e0 100644
--- a/packages/bits-ui/src/lib/bits/select/components/select.svelte
+++ b/packages/bits-ui/src/lib/bits/select/components/select.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
 	import FloatingLayer from "$lib/bits/utilities/floating-layer/components/floating-layer.svelte";
 	import { noop } from "$lib/internal/noop.js";
-	import { type WritableBox, boxWith } from "svelte-toolbelt";
+	import { type WritableBox } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
 	import { SelectRootState } from "../select.svelte.js";
 	import type { SelectRootProps } from "../types.js";
 	import SelectHiddenInput from "./select-hidden-input.svelte";
@@ -43,6 +44,7 @@
 	let inputValue = $state("");
 
 	const rootState = SelectRootState.create({
+		// svelte-ignore state_referenced_locally
 		type,
 		value: boxWith(
 			() => value!,
diff --git a/packages/bits-ui/src/lib/bits/select/select.svelte.ts b/packages/bits-ui/src/lib/bits/select/select.svelte.ts
index 508f904b4..6960d698b 100644
--- a/packages/bits-ui/src/lib/bits/select/select.svelte.ts
+++ b/packages/bits-ui/src/lib/bits/select/select.svelte.ts
@@ -8,8 +8,8 @@ import {
 	type ReadableBoxedValues,
 	type WritableBoxedValues,
 	type Box,
-	boxWith,
 } from "svelte-toolbelt";
+import { boxWith } from "$lib/internal/box.svelte.js";
 import { on } from "svelte/events";
 import { backward, forward, next, prev } from "$lib/internal/arrays.js";
 import {
@@ -163,16 +163,14 @@ abstract class SelectBaseRootState {
 	setHighlightedToFirstCandidate(initial = false) {
 		this.setHighlightedNode(null);
 
-		let nodes = this.getCandidateNodes();
+		const nodes = this.getCandidateNodes();
 		if (!nodes.length) return;
 
 		// don't consider nodes that aren't visible within the viewport
 		if (this.viewportNode) {
 			const viewportRect = this.viewportNode.getBoundingClientRect();
 
-			nodes = nodes.filter((node) => {
-				if (!this.viewportNode) return false;
-
+			for (const node of nodes) {
 				const nodeRect = node.getBoundingClientRect();
 
 				const isNodeFullyVisible =
@@ -181,8 +179,12 @@ abstract class SelectBaseRootState {
 					nodeRect.bottom <= viewportRect.bottom &&
 					nodeRect.top >= viewportRect.top;
 
-				return isNodeFullyVisible;
-			});
+				if (isNodeFullyVisible) {
+					this.setHighlightedNode(node, initial);
+					return;
+				}
+			}
+			return;
 		}
 
 		this.setHighlightedNode(nodes[0]!, initial);
@@ -234,6 +236,17 @@ abstract class SelectBaseRootState {
 	getBitsAttr: typeof selectAttrs.getAttr = (part) => {
 		return selectAttrs.getAttr(part, this.isCombobox ? "combobox" : undefined);
 	};
+
+	#initialHighlightPending = false;
+
+	protected scheduleInitialHighlight(fn: () => void) {
+		if (this.#initialHighlightPending) return;
+		this.#initialHighlightPending = true;
+		afterTick(() => {
+			this.#initialHighlightPending = false;
+			fn();
+		});
+	}
 }
 
 interface SelectSingleRootStateOpts
@@ -297,7 +310,7 @@ export class SelectSingleRootState extends SelectBaseRootState {
 	}
 
 	setInitialHighlightedNode() {
-		afterTick(() => {
+		this.scheduleInitialHighlight(() => {
 			if (
 				this.highlightedNode &&
 				this.domContext.getDocument().contains(this.highlightedNode)
@@ -361,7 +374,7 @@ class SelectMultipleRootState extends SelectBaseRootState {
 	}
 
 	setInitialHighlightedNode() {
-		afterTick(() => {
+		this.scheduleInitialHighlight(() => {
 			if (!this.domContext) return;
 			if (
 				this.highlightedNode &&
@@ -1130,12 +1143,13 @@ export class SelectItemState {
 		() => this.root.highlightedValue === this.opts.value.current
 	);
 	readonly prevHighlighted = new Previous(() => this.isHighlighted);
-	mounted = $state(false);
 
 	constructor(opts: SelectItemStateOpts, root: SelectRoot) {
 		this.opts = opts;
 		this.root = root;
-		this.attachment = attachRef(opts.ref);
+		this.attachment = attachRef(opts.ref, (node) => {
+			if (node) this.root.setInitialHighlightedNode();
+		});
 
 		watch([() => this.isHighlighted, () => this.prevHighlighted.current], () => {
 			if (this.isHighlighted) {
@@ -1145,14 +1159,6 @@ export class SelectItemState {
 			}
 		});
 
-		watch(
-			() => this.mounted,
-			() => {
-				if (!this.mounted) return;
-				this.root.setInitialHighlightedNode();
-			}
-		);
-
 		this.onpointerdown = this.onpointerdown.bind(this);
 		this.onpointerup = this.onpointerup.bind(this);
 		this.onpointermove = this.onpointermove.bind(this);
@@ -1241,17 +1247,12 @@ export class SelectItemState {
 			({
 				id: this.opts.id.current,
 				role: "option",
-				"aria-selected": this.root.includesItem(this.opts.value.current)
-					? "true"
-					: undefined,
+				"aria-selected": this.isSelected ? "true" : undefined,
 				"data-value": this.opts.value.current,
 				"data-disabled": boolToEmptyStrOrUndef(this.opts.disabled.current),
 				"data-highlighted":
-					this.root.highlightedValue === this.opts.value.current &&
-					!this.opts.disabled.current
-						? ""
-						: undefined,
-				"data-selected": this.root.includesItem(this.opts.value.current) ? "" : undefined,
+					this.isHighlighted && !this.opts.disabled.current ? "" : undefined,
+				"data-selected": this.isSelected ? "" : undefined,
 				"data-label": this.opts.label.current,
 				[this.root.getBitsAttr("item")]: "",
 				onpointermove: this.onpointermove,
diff --git a/packages/bits-ui/src/lib/bits/separator/components/separator.svelte b/packages/bits-ui/src/lib/bits/separator/components/separator.svelte
index 88fcc8c03..0a543391a 100644
--- a/packages/bits-ui/src/lib/bits/separator/components/separator.svelte
+++ b/packages/bits-ui/src/lib/bits/separator/components/separator.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { SeparatorRootState } from "../separator.svelte.js";
 	import type { SeparatorRootProps } from "../types.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/slider/components/slider-range.svelte b/packages/bits-ui/src/lib/bits/slider/components/slider-range.svelte
index bb115543c..dbeeecb33 100644
--- a/packages/bits-ui/src/lib/bits/slider/components/slider-range.svelte
+++ b/packages/bits-ui/src/lib/bits/slider/components/slider-range.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { SliderRangeProps } from "../types.js";
 	import { SliderRangeState } from "../slider.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/slider/components/slider-thumb-label.svelte b/packages/bits-ui/src/lib/bits/slider/components/slider-thumb-label.svelte
index 2398c0083..0e2bd91b1 100644
--- a/packages/bits-ui/src/lib/bits/slider/components/slider-thumb-label.svelte
+++ b/packages/bits-ui/src/lib/bits/slider/components/slider-thumb-label.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { SliderThumbLabelProps } from "../types.js";
 	import { SliderRootContext, SliderThumbLabelState } from "../slider.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/slider/components/slider-thumb.svelte b/packages/bits-ui/src/lib/bits/slider/components/slider-thumb.svelte
index f8058b165..b5b145adf 100644
--- a/packages/bits-ui/src/lib/bits/slider/components/slider-thumb.svelte
+++ b/packages/bits-ui/src/lib/bits/slider/components/slider-thumb.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { SliderThumbProps } from "../types.js";
 	import { SliderThumbState } from "../slider.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/slider/components/slider-tick-label.svelte b/packages/bits-ui/src/lib/bits/slider/components/slider-tick-label.svelte
index f6fbcc965..c47cf74e4 100644
--- a/packages/bits-ui/src/lib/bits/slider/components/slider-tick-label.svelte
+++ b/packages/bits-ui/src/lib/bits/slider/components/slider-tick-label.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { SliderTickLabelProps } from "../types.js";
 	import { SliderRootContext, SliderTickLabelState } from "../slider.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/slider/components/slider-tick.svelte b/packages/bits-ui/src/lib/bits/slider/components/slider-tick.svelte
index a9bd385c5..5c11917fb 100644
--- a/packages/bits-ui/src/lib/bits/slider/components/slider-tick.svelte
+++ b/packages/bits-ui/src/lib/bits/slider/components/slider-tick.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { SliderTickProps } from "../types.js";
 	import { SliderTickState } from "../slider.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/slider/components/slider.svelte b/packages/bits-ui/src/lib/bits/slider/components/slider.svelte
index d687d350a..6ef65c04b 100644
--- a/packages/bits-ui/src/lib/bits/slider/components/slider.svelte
+++ b/packages/bits-ui/src/lib/bits/slider/components/slider.svelte
@@ -1,5 +1,7 @@
 <script lang="ts">
-	import { boxWith, mergeProps, type WritableBox } from "svelte-toolbelt";
+	import { type WritableBox } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { SliderRootProps } from "../types.js";
 	import { SliderRootState } from "../slider.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
@@ -83,6 +85,7 @@
 		autoSort: boxWith(() => autoSort),
 		orientation: boxWith(() => orientation),
 		thumbPositioning: boxWith(() => thumbPositioning),
+		// svelte-ignore state_referenced_locally
 		type,
 		trackPadding: boxWith(() => trackPadding),
 	});
diff --git a/packages/bits-ui/src/lib/bits/switch/components/switch-thumb.svelte b/packages/bits-ui/src/lib/bits/switch/components/switch-thumb.svelte
index 1ef315260..5d81cdabe 100644
--- a/packages/bits-ui/src/lib/bits/switch/components/switch-thumb.svelte
+++ b/packages/bits-ui/src/lib/bits/switch/components/switch-thumb.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { SwitchThumbProps } from "../types.js";
 	import { SwitchThumbState } from "../switch.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/switch/components/switch.svelte b/packages/bits-ui/src/lib/bits/switch/components/switch.svelte
index d38f7387f..c36573e95 100644
--- a/packages/bits-ui/src/lib/bits/switch/components/switch.svelte
+++ b/packages/bits-ui/src/lib/bits/switch/components/switch.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { SwitchRootProps } from "../types.js";
 	import { SwitchRootState } from "../switch.svelte.js";
 	import SwitchInput from "./switch-input.svelte";
diff --git a/packages/bits-ui/src/lib/bits/tabs/components/tabs-content.svelte b/packages/bits-ui/src/lib/bits/tabs/components/tabs-content.svelte
index 66deaeba9..b19f5c150 100644
--- a/packages/bits-ui/src/lib/bits/tabs/components/tabs-content.svelte
+++ b/packages/bits-ui/src/lib/bits/tabs/components/tabs-content.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { TabsContentProps } from "../types.js";
 	import { TabsContentState } from "../tabs.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/tabs/components/tabs-list.svelte b/packages/bits-ui/src/lib/bits/tabs/components/tabs-list.svelte
index 367922cd7..ec256bf54 100644
--- a/packages/bits-ui/src/lib/bits/tabs/components/tabs-list.svelte
+++ b/packages/bits-ui/src/lib/bits/tabs/components/tabs-list.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { TabsListProps } from "../types.js";
 	import { TabsListState } from "../tabs.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/tabs/components/tabs-trigger.svelte b/packages/bits-ui/src/lib/bits/tabs/components/tabs-trigger.svelte
index 3d4778d66..26a20d049 100644
--- a/packages/bits-ui/src/lib/bits/tabs/components/tabs-trigger.svelte
+++ b/packages/bits-ui/src/lib/bits/tabs/components/tabs-trigger.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { TabsTriggerProps } from "../types.js";
 	import { TabsTriggerState } from "../tabs.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/tabs/components/tabs.svelte b/packages/bits-ui/src/lib/bits/tabs/components/tabs.svelte
index 615031d1a..bd68d43cc 100644
--- a/packages/bits-ui/src/lib/bits/tabs/components/tabs.svelte
+++ b/packages/bits-ui/src/lib/bits/tabs/components/tabs.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { TabsRootProps } from "../types.js";
 	import { TabsRootState } from "../tabs.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/time-field/components/time-field-input.svelte b/packages/bits-ui/src/lib/bits/time-field/components/time-field-input.svelte
index ec10694c8..860f7d643 100644
--- a/packages/bits-ui/src/lib/bits/time-field/components/time-field-input.svelte
+++ b/packages/bits-ui/src/lib/bits/time-field/components/time-field-input.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { TimeFieldInputState } from "../time-field.svelte.js";
 	import type { TimeFieldInputProps } from "../types.js";
 	import DateFieldHiddenInput from "./time-field-hidden-input.svelte";
diff --git a/packages/bits-ui/src/lib/bits/time-field/components/time-field-label.svelte b/packages/bits-ui/src/lib/bits/time-field/components/time-field-label.svelte
index 5dc1510a2..f871ae9df 100644
--- a/packages/bits-ui/src/lib/bits/time-field/components/time-field-label.svelte
+++ b/packages/bits-ui/src/lib/bits/time-field/components/time-field-label.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { TimeFieldLabelState } from "../time-field.svelte.js";
 	import type { TimeFieldLabelProps } from "../types.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/time-field/components/time-field-segment.svelte b/packages/bits-ui/src/lib/bits/time-field/components/time-field-segment.svelte
index 65323e93a..eebb6a5e4 100644
--- a/packages/bits-ui/src/lib/bits/time-field/components/time-field-segment.svelte
+++ b/packages/bits-ui/src/lib/bits/time-field/components/time-field-segment.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { DateFieldSegmentState } from "../time-field.svelte.js";
 	import type { TimeFieldSegmentProps } from "../types.js";
 	import { createId } from "$lib/internal/create-id.js";
@@ -14,7 +15,7 @@
 		part,
 		...restProps
 	}: TimeFieldSegmentProps = $props();
-
+	// svelte-ignore state_referenced_locally
 	const segmentState = DateFieldSegmentState.create(part, {
 		id: boxWith(() => id),
 		ref: boxWith(
diff --git a/packages/bits-ui/src/lib/bits/time-field/components/time-field.svelte b/packages/bits-ui/src/lib/bits/time-field/components/time-field.svelte
index 229e7b909..7a30c1852 100644
--- a/packages/bits-ui/src/lib/bits/time-field/components/time-field.svelte
+++ b/packages/bits-ui/src/lib/bits/time-field/components/time-field.svelte
@@ -6,7 +6,7 @@
 
 <script lang="ts" generics="T extends TimeValue = Time">
 	import { watch } from "runed";
-	import { boxWith } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
 	import { TimeFieldRootState } from "../time-field.svelte.js";
 	import type { TimeFieldRootProps } from "../types.js";
 	import { noop } from "$lib/internal/noop.js";
diff --git a/packages/bits-ui/src/lib/bits/time-range-field/components/time-range-field-input.svelte b/packages/bits-ui/src/lib/bits/time-range-field/components/time-range-field-input.svelte
index ca32367d4..f0fb9bfd5 100644
--- a/packages/bits-ui/src/lib/bits/time-range-field/components/time-range-field-input.svelte
+++ b/packages/bits-ui/src/lib/bits/time-range-field/components/time-range-field-input.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { TimeRangeFieldInputProps } from "../types.js";
 	import { TimeRangeFieldInputState } from "../time-range-field.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
@@ -26,6 +27,7 @@
 			),
 			name: boxWith(() => name),
 		},
+		// svelte-ignore state_referenced_locally
 		type
 	);
 
diff --git a/packages/bits-ui/src/lib/bits/time-range-field/components/time-range-field-label.svelte b/packages/bits-ui/src/lib/bits/time-range-field/components/time-range-field-label.svelte
index 6532e314e..e46d910ab 100644
--- a/packages/bits-ui/src/lib/bits/time-range-field/components/time-range-field-label.svelte
+++ b/packages/bits-ui/src/lib/bits/time-range-field/components/time-range-field-label.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { TimeRangeFieldLabelState } from "../time-range-field.svelte.js";
 	import type { TimeRangeFieldLabelProps } from "../types.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/time-range-field/components/time-range-field.svelte b/packages/bits-ui/src/lib/bits/time-range-field/components/time-range-field.svelte
index 99a7de789..f69d6491b 100644
--- a/packages/bits-ui/src/lib/bits/time-range-field/components/time-range-field.svelte
+++ b/packages/bits-ui/src/lib/bits/time-range-field/components/time-range-field.svelte
@@ -7,7 +7,8 @@
 
 <script lang="ts" generics="T extends TimeValue = Time">
 	import { watch } from "runed";
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { TimeRangeFieldRootState } from "../time-range-field.svelte.js";
 	import type { TimeRangeFieldRootProps } from "../types.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/time-range-field/time-range-field.svelte.ts b/packages/bits-ui/src/lib/bits/time-range-field/time-range-field.svelte.ts
index 076ec30b4..0a4a2fa40 100644
--- a/packages/bits-ui/src/lib/bits/time-range-field/time-range-field.svelte.ts
+++ b/packages/bits-ui/src/lib/bits/time-range-field/time-range-field.svelte.ts
@@ -1,12 +1,12 @@
 import type { Time } from "@internationalized/date";
 import {
-	boxWith,
 	onDestroyEffect,
 	attachRef,
 	DOMContext,
 	type ReadableBoxedValues,
 	type WritableBoxedValues,
 } from "svelte-toolbelt";
+import { boxWith } from "$lib/internal/box.svelte.js";
 import { Context, watch } from "runed";
 import { TimeFieldRootState } from "../time-field/time-field.svelte.js";
 import { TimeFieldInputState } from "../time-field/time-field.svelte.js";
diff --git a/packages/bits-ui/src/lib/bits/toggle-group/components/toggle-group-item.svelte b/packages/bits-ui/src/lib/bits/toggle-group/components/toggle-group-item.svelte
index ae482201e..9f8b07d2f 100644
--- a/packages/bits-ui/src/lib/bits/toggle-group/components/toggle-group-item.svelte
+++ b/packages/bits-ui/src/lib/bits/toggle-group/components/toggle-group-item.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { ToggleGroupItemProps } from "../types.js";
 	import { ToggleGroupItemState } from "../toggle-group.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/toggle-group/components/toggle-group.svelte b/packages/bits-ui/src/lib/bits/toggle-group/components/toggle-group.svelte
index 1efd24ac9..8adcbc061 100644
--- a/packages/bits-ui/src/lib/bits/toggle-group/components/toggle-group.svelte
+++ b/packages/bits-ui/src/lib/bits/toggle-group/components/toggle-group.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { type WritableBox, boxWith } from "svelte-toolbelt";
+	import { type WritableBox } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
 	import { mergeProps } from "svelte-toolbelt";
 	import type { ToggleGroupRootProps } from "../types.js";
 	import { ToggleGroupRootState } from "../toggle-group.svelte.js";
@@ -53,6 +54,7 @@
 		loop: boxWith(() => loop),
 		orientation: boxWith(() => orientation),
 		rovingFocus: boxWith(() => rovingFocus),
+		// svelte-ignore state_referenced_locally
 		type,
 		ref: boxWith(
 			() => ref,
diff --git a/packages/bits-ui/src/lib/bits/toggle/components/toggle.svelte b/packages/bits-ui/src/lib/bits/toggle/components/toggle.svelte
index 6457bdefd..354a3a91a 100644
--- a/packages/bits-ui/src/lib/bits/toggle/components/toggle.svelte
+++ b/packages/bits-ui/src/lib/bits/toggle/components/toggle.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { ToggleRootProps } from "../types.js";
 	import { ToggleRootState } from "../toggle.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/toolbar/components/toolbar-button.svelte b/packages/bits-ui/src/lib/bits/toolbar/components/toolbar-button.svelte
index 701edf088..8a97b515c 100644
--- a/packages/bits-ui/src/lib/bits/toolbar/components/toolbar-button.svelte
+++ b/packages/bits-ui/src/lib/bits/toolbar/components/toolbar-button.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { ToolbarButtonProps } from "../types.js";
 	import { ToolbarButtonState } from "../toolbar.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/toolbar/components/toolbar-group-item.svelte b/packages/bits-ui/src/lib/bits/toolbar/components/toolbar-group-item.svelte
index d50e0817c..e0057e67d 100644
--- a/packages/bits-ui/src/lib/bits/toolbar/components/toolbar-group-item.svelte
+++ b/packages/bits-ui/src/lib/bits/toolbar/components/toolbar-group-item.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { ToolbarGroupItemProps } from "../types.js";
 	import { ToolbarGroupItemState } from "../toolbar.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/toolbar/components/toolbar-group.svelte b/packages/bits-ui/src/lib/bits/toolbar/components/toolbar-group.svelte
index 0b17911a7..40cf67f01 100644
--- a/packages/bits-ui/src/lib/bits/toolbar/components/toolbar-group.svelte
+++ b/packages/bits-ui/src/lib/bits/toolbar/components/toolbar-group.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { type WritableBox, boxWith } from "svelte-toolbelt";
+	import { type WritableBox } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
 	import { mergeProps } from "svelte-toolbelt";
 	import type { ToolbarGroupProps } from "../types.js";
 	import { ToolbarGroupState } from "../toolbar.svelte.js";
@@ -39,6 +40,7 @@
 	const groupState = ToolbarGroupState.create({
 		id: boxWith(() => id),
 		disabled: boxWith(() => disabled),
+		// svelte-ignore state_referenced_locally
 		type,
 		value: boxWith(
 			() => value!,
diff --git a/packages/bits-ui/src/lib/bits/toolbar/components/toolbar-link.svelte b/packages/bits-ui/src/lib/bits/toolbar/components/toolbar-link.svelte
index bd1619f12..fcc171799 100644
--- a/packages/bits-ui/src/lib/bits/toolbar/components/toolbar-link.svelte
+++ b/packages/bits-ui/src/lib/bits/toolbar/components/toolbar-link.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { ToolbarLinkState } from "../toolbar.svelte.js";
 	import type { ToolbarLinkProps } from "../types.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/toolbar/components/toolbar.svelte b/packages/bits-ui/src/lib/bits/toolbar/components/toolbar.svelte
index 49c94d1a5..0515c2f03 100644
--- a/packages/bits-ui/src/lib/bits/toolbar/components/toolbar.svelte
+++ b/packages/bits-ui/src/lib/bits/toolbar/components/toolbar.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { ToolbarRootProps } from "../types.js";
 	import { ToolbarRootState } from "../toolbar.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/tooltip/components/tooltip-content-static.svelte b/packages/bits-ui/src/lib/bits/tooltip/components/tooltip-content-static.svelte
index 601b71574..aeb31f971 100644
--- a/packages/bits-ui/src/lib/bits/tooltip/components/tooltip-content-static.svelte
+++ b/packages/bits-ui/src/lib/bits/tooltip/components/tooltip-content-static.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { TooltipContentStaticProps } from "../types.js";
 	import { TooltipContentState } from "../tooltip.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/tooltip/components/tooltip-content.svelte b/packages/bits-ui/src/lib/bits/tooltip/components/tooltip-content.svelte
index 0b2e7117e..d06ce7061 100644
--- a/packages/bits-ui/src/lib/bits/tooltip/components/tooltip-content.svelte
+++ b/packages/bits-ui/src/lib/bits/tooltip/components/tooltip-content.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { TooltipContentProps } from "../types.js";
 	import { TooltipContentState } from "../tooltip.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
@@ -85,7 +86,11 @@
 				{ style }
 			)}
 			{#if child}
-				{@render child({ props: finalProps, wrapperProps: finalWrapperProps, ...contentState.snippetProps })}
+				{@render child({
+					props: finalProps,
+					wrapperProps: finalWrapperProps,
+					...contentState.snippetProps,
+				})}
 			{:else}
 				<div {...finalWrapperProps}>
 					<div {...finalProps}>
@@ -122,7 +127,11 @@
 				{ style }
 			)}
 			{#if child}
-				{@render child({ props: finalProps, wrapperProps: finalWrapperProps, ...contentState.snippetProps })}
+				{@render child({
+					props: finalProps,
+					wrapperProps: finalWrapperProps,
+					...contentState.snippetProps,
+				})}
 			{:else}
 				<div {...finalWrapperProps}>
 					<div {...finalProps}>
diff --git a/packages/bits-ui/src/lib/bits/tooltip/components/tooltip-provider.svelte b/packages/bits-ui/src/lib/bits/tooltip/components/tooltip-provider.svelte
index 48dc05061..cdd159c04 100644
--- a/packages/bits-ui/src/lib/bits/tooltip/components/tooltip-provider.svelte
+++ b/packages/bits-ui/src/lib/bits/tooltip/components/tooltip-provider.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { boxWith } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
 	import type { TooltipProviderProps } from "../types.js";
 	import { TooltipProviderState } from "../tooltip.svelte.js";
 
diff --git a/packages/bits-ui/src/lib/bits/tooltip/components/tooltip-trigger.svelte b/packages/bits-ui/src/lib/bits/tooltip/components/tooltip-trigger.svelte
index 05dc3125f..4028d87f7 100644
--- a/packages/bits-ui/src/lib/bits/tooltip/components/tooltip-trigger.svelte
+++ b/packages/bits-ui/src/lib/bits/tooltip/components/tooltip-trigger.svelte
@@ -3,7 +3,8 @@
 </script>
 
 <script lang="ts" generics="T = never">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { TooltipTriggerProps } from "../types.js";
 	import { TooltipTriggerState } from "../tooltip.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
diff --git a/packages/bits-ui/src/lib/bits/tooltip/components/tooltip.svelte b/packages/bits-ui/src/lib/bits/tooltip/components/tooltip.svelte
index 6c2fc11c0..e6db40cfc 100644
--- a/packages/bits-ui/src/lib/bits/tooltip/components/tooltip.svelte
+++ b/packages/bits-ui/src/lib/bits/tooltip/components/tooltip.svelte
@@ -3,7 +3,7 @@
 </script>
 
 <script lang="ts" generics="T = never">
-	import { boxWith } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
 	import type { TooltipRootProps } from "../types.js";
 	import { TooltipRootState } from "../tooltip.svelte.js";
 	import FloatingLayer from "$lib/bits/utilities/floating-layer/components/floating-layer.svelte";
diff --git a/packages/bits-ui/src/lib/bits/tooltip/tooltip.svelte.ts b/packages/bits-ui/src/lib/bits/tooltip/tooltip.svelte.ts
index 45c072f8d..ef9dbb248 100644
--- a/packages/bits-ui/src/lib/bits/tooltip/tooltip.svelte.ts
+++ b/packages/bits-ui/src/lib/bits/tooltip/tooltip.svelte.ts
@@ -5,8 +5,8 @@ import {
 	type WritableBoxedValues,
 	type ReadableBoxedValues,
 	simpleBox,
-	boxWith,
 } from "svelte-toolbelt";
+import { boxWith } from "$lib/internal/box.svelte.js";
 import { on } from "svelte/events";
 import { Context, watch } from "runed";
 import { isElement, isFocusVisible } from "$lib/internal/is.js";
@@ -282,10 +282,13 @@ export class TooltipRootState {
 		this.provider = provider;
 		this.tether = opts.tether.current?.state ?? null;
 		this.registry = this.tether?.registry ?? new TooltipTriggerRegistryState();
-		this.#timerFn = new TimeoutFn(() => {
-			this.#wasOpenDelayed = true;
-			this.opts.open.current = true;
-		}, this.delayDuration ?? 0);
+		this.#timerFn = new TimeoutFn(
+			() => {
+				this.#wasOpenDelayed = true;
+				this.opts.open.current = true;
+			},
+			() => this.delayDuration ?? 0
+		);
 
 		if (this.tether) {
 			this.tether.root = this;
@@ -306,17 +309,6 @@ export class TooltipRootState {
 			},
 		});
 
-		watch(
-			() => this.delayDuration,
-			() => {
-				if (this.delayDuration === undefined) return;
-				this.#timerFn = new TimeoutFn(() => {
-					this.#wasOpenDelayed = true;
-					this.opts.open.current = true;
-				}, this.delayDuration);
-			}
-		);
-
 		watch(
 			() => this.opts.open.current,
 			(isOpen) => {
@@ -482,8 +474,8 @@ export class TooltipTriggerState {
 	readonly root: TooltipRootState | null;
 	readonly tether: TooltipTetherState | null;
 	readonly attachment: RefAttachment;
-	#isPointerDown = simpleBox(false);
-	#hasPointerMoveOpened = $state(false);
+	#isPointerDown = { current: false };
+	#hasPointerMoveOpened = false;
 	domContext: DOMContext;
 	#transitCheckTimeout: number | null = null;
 	#mounted = false;
@@ -501,19 +493,11 @@ export class TooltipTriggerState {
 		this.attachment = attachRef(this.opts.ref, (v) => this.#register(v));
 
 		watch(
-			() => this.opts.id.current,
-			() => {
-				this.#register(this.opts.ref.current);
-			}
-		);
-		watch(
-			() => this.opts.payload.current,
-			() => {
-				this.#register(this.opts.ref.current);
-			}
-		);
-		watch(
-			() => this.opts.disabled.current,
+			[
+				() => this.opts.id.current,
+				() => this.opts.payload.current,
+				() => this.opts.disabled.current,
+			],
 			() => {
 				this.#register(this.opts.ref.current);
 			}
diff --git a/packages/bits-ui/src/lib/bits/utilities/arrow/arrow.svelte b/packages/bits-ui/src/lib/bits/utilities/arrow/arrow.svelte
index b795e75e9..351d4d9c1 100644
--- a/packages/bits-ui/src/lib/bits/utilities/arrow/arrow.svelte
+++ b/packages/bits-ui/src/lib/bits/utilities/arrow/arrow.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { mergeProps } from "svelte-toolbelt";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { ArrowProps } from "./types.js";
 	import { useId } from "$lib/internal/use-id.js";
 
diff --git a/packages/bits-ui/src/lib/bits/utilities/config/bits-config.ts b/packages/bits-ui/src/lib/bits/utilities/config/bits-config.ts
index 8ccb148b4..4dd926619 100644
--- a/packages/bits-ui/src/lib/bits/utilities/config/bits-config.ts
+++ b/packages/bits-ui/src/lib/bits/utilities/config/bits-config.ts
@@ -1,5 +1,6 @@
 import { Context } from "runed";
-import { boxWith, type ReadableBox, type ReadableBoxedValues } from "svelte-toolbelt";
+import { type ReadableBox, type ReadableBoxedValues } from "svelte-toolbelt";
+import { boxWith } from "$lib/internal/box.svelte.js";
 import type { BitsConfigPropsWithoutChildren } from "$lib/bits/utilities/config/types.js";
 
 type BitsConfigStateProps = ReadableBoxedValues<BitsConfigPropsWithoutChildren>;
diff --git a/packages/bits-ui/src/lib/bits/utilities/config/components/bits-config.svelte b/packages/bits-ui/src/lib/bits/utilities/config/components/bits-config.svelte
index 006003633..be77f7262 100644
--- a/packages/bits-ui/src/lib/bits/utilities/config/components/bits-config.svelte
+++ b/packages/bits-ui/src/lib/bits/utilities/config/components/bits-config.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type { BitsConfigProps } from "$lib/bits/utilities/config/types.js";
 	import { useBitsConfig } from "../bits-config.js";
-	import { boxWith } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
 
 	let { children, defaultPortalTo, defaultLocale }: BitsConfigProps = $props();
 
diff --git a/packages/bits-ui/src/lib/bits/utilities/config/prop-resolvers.ts b/packages/bits-ui/src/lib/bits/utilities/config/prop-resolvers.ts
index 4e249941d..b938138fa 100644
--- a/packages/bits-ui/src/lib/bits/utilities/config/prop-resolvers.ts
+++ b/packages/bits-ui/src/lib/bits/utilities/config/prop-resolvers.ts
@@ -1,4 +1,5 @@
-import { boxWith, type Getter, type ReadableBox } from "svelte-toolbelt";
+import { type Getter, type ReadableBox } from "svelte-toolbelt";
+import { boxWith } from "$lib/internal/box.svelte.js";
 import { type BitsConfigState, getBitsConfig } from "./bits-config.js";
 
 /**
diff --git a/packages/bits-ui/src/lib/bits/utilities/dismissible-layer/dismissible-layer.svelte b/packages/bits-ui/src/lib/bits/utilities/dismissible-layer/dismissible-layer.svelte
index e6cb9828e..7f0a45f76 100644
--- a/packages/bits-ui/src/lib/bits/utilities/dismissible-layer/dismissible-layer.svelte
+++ b/packages/bits-ui/src/lib/bits/utilities/dismissible-layer/dismissible-layer.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { boxWith } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
 	import type { DismissibleLayerImplProps } from "./types.js";
 	import { DismissibleLayerState } from "./use-dismissable-layer.svelte.js";
 	import { noop } from "$lib/internal/noop.js";
@@ -22,6 +22,7 @@
 		enabled: boxWith(() => enabled),
 		onFocusOutside: boxWith(() => onFocusOutside),
 		isValidEvent: boxWith(() => isValidEvent),
+		// svelte-ignore state_referenced_locally
 		ref,
 	});
 </script>
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 0fe91e50a..6b0767ebb 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,5 +1,5 @@
 <script lang="ts">
-	import { boxWith } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
 	import type { EscapeLayerImplProps } from "./types.js";
 	import { EscapeLayerState } from "./use-escape-layer.svelte.js";
 	import { noop } from "$lib/internal/noop.js";
@@ -16,6 +16,7 @@
 		escapeKeydownBehavior: boxWith(() => escapeKeydownBehavior),
 		onEscapeKeydown: boxWith(() => onEscapeKeydown),
 		enabled: boxWith(() => enabled),
+		// svelte-ignore state_referenced_locally
 		ref,
 	});
 </script>
diff --git a/packages/bits-ui/src/lib/bits/utilities/floating-layer/components/floating-layer-anchor.svelte b/packages/bits-ui/src/lib/bits/utilities/floating-layer/components/floating-layer-anchor.svelte
index bd1c2c90d..14d4c9851 100644
--- a/packages/bits-ui/src/lib/bits/utilities/floating-layer/components/floating-layer-anchor.svelte
+++ b/packages/bits-ui/src/lib/bits/utilities/floating-layer/components/floating-layer-anchor.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { boxWith } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
 	import { FloatingAnchorState } from "../use-floating-layer.svelte.js";
 	import type { AnchorProps } from "./index.js";
 	import type { Measurable } from "$lib/internal/floating-svelte/types.js";
@@ -10,8 +10,10 @@
 		{
 			id: boxWith(() => id),
 			virtualEl: boxWith(() => virtualEl as unknown as Measurable | null),
+			// svelte-ignore state_referenced_locally
 			ref,
 		},
+		// svelte-ignore state_referenced_locally
 		tooltip
 	);
 </script>
diff --git a/packages/bits-ui/src/lib/bits/utilities/floating-layer/components/floating-layer-arrow.svelte b/packages/bits-ui/src/lib/bits/utilities/floating-layer/components/floating-layer-arrow.svelte
index 027636255..a04d89f2d 100644
--- a/packages/bits-ui/src/lib/bits/utilities/floating-layer/components/floating-layer-arrow.svelte
+++ b/packages/bits-ui/src/lib/bits/utilities/floating-layer/components/floating-layer-arrow.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { FloatingArrowState } from "../use-floating-layer.svelte.js";
 	import { Arrow, type ArrowProps } from "$lib/bits/utilities/arrow/index.js";
 	import { useId } from "$lib/internal/use-id.js";
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 4b14001b7..a568c4a77 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,5 +1,6 @@
 <script lang="ts">
-	import { boxWith, mergeProps } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import { FloatingContentState } from "../use-floating-layer.svelte.js";
 	import type { ContentImplProps } from "./index.js";
 	import { useId } from "$lib/internal/use-id.js";
@@ -50,6 +51,7 @@
 			wrapperId: boxWith(() => wrapperId),
 			customAnchor: boxWith(() => customAnchor),
 		},
+		// svelte-ignore state_referenced_locally
 		tooltip
 	);
 
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 c81c3be12..748887349 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 { boxWith } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
 	import type { FocusScopeImplProps } from "./types.js";
 	import { noop } from "$lib/internal/noop.js";
 	import { FocusScope } from "./focus-scope.svelte.js";
@@ -17,9 +17,11 @@
 	const focusScopeState = FocusScope.use({
 		enabled: boxWith(() => enabled),
 		trap: boxWith(() => trapFocus),
+		// svelte-ignore state_referenced_locally
 		loop: loop,
 		onCloseAutoFocus: boxWith(() => onCloseAutoFocus),
 		onOpenAutoFocus: boxWith(() => onOpenAutoFocus),
+		// svelte-ignore state_referenced_locally
 		ref,
 	});
 </script>
diff --git a/packages/bits-ui/src/lib/bits/utilities/hidden-input.svelte b/packages/bits-ui/src/lib/bits/utilities/hidden-input.svelte
index 89504af55..a2bc99a94 100644
--- a/packages/bits-ui/src/lib/bits/utilities/hidden-input.svelte
+++ b/packages/bits-ui/src/lib/bits/utilities/hidden-input.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { mergeProps, srOnlyStyles } from "svelte-toolbelt";
+	import { srOnlyStyles } from "svelte-toolbelt";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { HTMLInputAttributes } from "svelte/elements";
 
 	let { value = $bindable(), ...restProps }: HTMLInputAttributes = $props();
diff --git a/packages/bits-ui/src/lib/bits/utilities/popper-layer/popper-layer-inner.svelte b/packages/bits-ui/src/lib/bits/utilities/popper-layer/popper-layer-inner.svelte
index 336805c1b..16cd2cb3d 100644
--- a/packages/bits-ui/src/lib/bits/utilities/popper-layer/popper-layer-inner.svelte
+++ b/packages/bits-ui/src/lib/bits/utilities/popper-layer/popper-layer-inner.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { mergeProps } from "svelte-toolbelt";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import ScrollLock from "../scroll-lock/scroll-lock.svelte";
 	import type { PopperLayerImplProps } from "./types.js";
 	import PopperContent from "./popper-content.svelte";
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 8a7bb7d16..78bfde9df 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,5 +1,5 @@
 <script lang="ts">
-	import { boxWith } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
 	import type { PresenceLayerImplProps } from "./types.js";
 	import { Presence } from "./presence.svelte.js";
 
@@ -7,6 +7,7 @@
 
 	const presenceState = new Presence({
 		open: boxWith(() => open),
+		// svelte-ignore state_referenced_locally
 		ref,
 	});
 </script>
diff --git a/packages/bits-ui/src/lib/bits/utilities/scroll-lock/scroll-lock.svelte b/packages/bits-ui/src/lib/bits/utilities/scroll-lock/scroll-lock.svelte
index 2fbdb4e4b..14363cc12 100644
--- a/packages/bits-ui/src/lib/bits/utilities/scroll-lock/scroll-lock.svelte
+++ b/packages/bits-ui/src/lib/bits/utilities/scroll-lock/scroll-lock.svelte
@@ -2,9 +2,18 @@
 	import type { ScrollLockProps } from "./index.js";
 	import { BodyScrollLock } from "$lib/internal/body-scroll-lock.svelte.js";
 
-	let { preventScroll = true, restoreScrollDelay = null }: ScrollLockProps = $props();
+	type ScrollLockImplProps = ScrollLockProps & {
+		shouldBlockPointerEvents?: () => boolean;
+	};
 
+	let {
+		preventScroll = true,
+		restoreScrollDelay = null,
+		shouldBlockPointerEvents,
+	}: ScrollLockImplProps = $props();
+
+	// svelte-ignore state_referenced_locally
 	if (preventScroll) {
-		new BodyScrollLock(preventScroll, () => restoreScrollDelay);
+		new BodyScrollLock(preventScroll, () => restoreScrollDelay, shouldBlockPointerEvents);
 	}
 </script>
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 4b85a14ce..f75d3adb7 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,5 +1,5 @@
 <script lang="ts">
-	import { boxWith } from "svelte-toolbelt";
+	import { boxWith } from "$lib/internal/box.svelte.js";
 	import type { TextSelectionLayerImplProps } from "./types.js";
 	import { TextSelectionLayerState } from "./use-text-selection-layer.svelte.js";
 	import { noop } from "$lib/internal/noop.js";
@@ -19,6 +19,7 @@
 		onPointerDown: boxWith(() => onPointerDown),
 		onPointerUp: boxWith(() => onPointerUp),
 		enabled: boxWith(() => enabled && preventOverflowTextSelection),
+		// svelte-ignore state_referenced_locally
 		ref,
 	});
 </script>
diff --git a/packages/bits-ui/src/lib/bits/utilities/visually-hidden/visually-hidden.svelte b/packages/bits-ui/src/lib/bits/utilities/visually-hidden/visually-hidden.svelte
index 173d00189..6d43f6bc6 100644
--- a/packages/bits-ui/src/lib/bits/utilities/visually-hidden/visually-hidden.svelte
+++ b/packages/bits-ui/src/lib/bits/utilities/visually-hidden/visually-hidden.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { mergeProps } from "svelte-toolbelt";
+	import { mergeProps } from "$lib/internal/merge-props.js";
 	import type { VisuallyHiddenProps } from "./types.js";
 	import type { StyleProperties } from "$lib/shared/index.js";
 
diff --git a/packages/bits-ui/src/lib/internal/body-scroll-lock.svelte.ts b/packages/bits-ui/src/lib/internal/body-scroll-lock.svelte.ts
index 716b34fdf..77088c92c 100644
--- a/packages/bits-ui/src/lib/internal/body-scroll-lock.svelte.ts
+++ b/packages/bits-ui/src/lib/internal/body-scroll-lock.svelte.ts
@@ -1,11 +1,6 @@
 import { SvelteMap } from "svelte/reactivity";
-import {
-	type Getter,
-	type ReadableBox,
-	afterTick,
-	boxWith,
-	onDestroyEffect,
-} from "svelte-toolbelt";
+import { type Getter, type ReadableBox, afterTick, onDestroyEffect } from "svelte-toolbelt";
+import { boxWith } from "./box.svelte.js";
 import type { Fn } from "./types.js";
 import { isIOS } from "./is.js";
 import { useId } from "./use-id.js";
@@ -20,6 +15,7 @@ export interface ScrollBodyOption {
 }
 /** A map of lock ids to their `locked` state. */
 const lockMap = new SvelteMap<string, boolean>();
+const pointerEventsMap = new SvelteMap<string, () => boolean>();
 
 let initialBodyStyle: string | null = $state<string | null>(null);
 let stopTouchMoveListener: Fn | null = null;
@@ -33,6 +29,21 @@ const anyLocked = boxWith(() => {
 	return false;
 });
 
+const anyPointerEventsNoneWanted = boxWith(() => {
+	if (!anyLocked.current) return false;
+	for (const [id, wantsPointerEventsNone] of pointerEventsMap) {
+		if (lockMap.get(id) && wantsPointerEventsNone()) return true;
+	}
+	return false;
+});
+
+function anyActiveLockWantsPointerEventsNone() {
+	for (const [id, wantsPointerEventsNone] of pointerEventsMap) {
+		if (lockMap.get(id) && wantsPointerEventsNone()) return true;
+	}
+	return false;
+}
+
 /**
  * We track the time we scheduled the cleanup to prevent race conditions
  * when multiple locks are created/destroyed in the same tick, ensuring
@@ -161,12 +172,27 @@ const bodyLockStackCount = new SharedState(() => {
 			 * focus/interaction.
 			 */
 			afterTick(() => {
-				document.body.style.pointerEvents = "none";
+				if (anyActiveLockWantsPointerEventsNone()) {
+					document.body.style.pointerEvents = "none";
+				}
 				document.body.style.overflow = "hidden";
 			});
 		}
 	);
 
+	watch(
+		() => anyPointerEventsNoneWanted.current,
+		() => {
+			if (!anyPointerEventsNoneWanted.current) return;
+			ensureInitialStyleCaptured();
+			afterTick(() => {
+				if (anyActiveLockWantsPointerEventsNone()) {
+					document.body.style.pointerEvents = "none";
+				}
+			});
+		}
+	);
+
 	onDestroyEffect(() => {
 		return () => {
 			stopTouchMoveListener?.();
@@ -193,7 +219,8 @@ export class BodyScrollLock {
 
 	constructor(
 		initialState?: boolean | undefined,
-		restoreScrollDelay: Getter<number | null> = () => null
+		restoreScrollDelay: Getter<number | null> = () => null,
+		shouldBlockPointerEvents: () => boolean = () => true
 	) {
 		this.#initialState = initialState;
 		this.#restoreScrollDelay = restoreScrollDelay;
@@ -214,6 +241,7 @@ export class BodyScrollLock {
 		this.#countState.ensureInitialStyleCaptured();
 
 		this.#countState.lockMap.set(this.#id, this.#initialState ?? false);
+		pointerEventsMap.set(this.#id, shouldBlockPointerEvents);
 
 		this.locked = boxWith(
 			() => this.#countState.lockMap.get(this.#id) ?? false,
@@ -222,6 +250,7 @@ export class BodyScrollLock {
 
 		onDestroyEffect(() => {
 			this.#countState.lockMap.delete(this.#id);
+			pointerEventsMap.delete(this.#id);
 
 			// if not the last lock, we don't need to do anything
 			if (isAnyLocked(this.#countState.lockMap)) return;
diff --git a/packages/bits-ui/src/lib/internal/box-auto-reset.svelte.ts b/packages/bits-ui/src/lib/internal/box-auto-reset.svelte.ts
index 69d8c91ac..1d5801c2b 100644
--- a/packages/bits-ui/src/lib/internal/box-auto-reset.svelte.ts
+++ b/packages/bits-ui/src/lib/internal/box-auto-reset.svelte.ts
@@ -1,4 +1,5 @@
-import { type WritableBox, boxWith } from "svelte-toolbelt";
+import { type WritableBox } from "svelte-toolbelt";
+import { boxWith } from "./box.svelte.js";
 import { noop } from "./noop.js";
 
 type BoxAutoResetOptions<T> = {
diff --git a/packages/bits-ui/src/lib/internal/box.svelte.ts b/packages/bits-ui/src/lib/internal/box.svelte.ts
new file mode 100644
index 000000000..794794d41
--- /dev/null
+++ b/packages/bits-ui/src/lib/internal/box.svelte.ts
@@ -0,0 +1,55 @@
+/** Class-based drop-in for svelte-toolbelt's `boxWith`. */
+import { boxWith as toolbeltBoxWith, type ReadableBox, type WritableBox } from "svelte-toolbelt";
+
+const readonlyProbe = toolbeltBoxWith(() => null);
+const writableProbe = toolbeltBoxWith(
+	() => null,
+	() => {}
+);
+const BoxSymbol = Object.getOwnPropertySymbols(readonlyProbe)[0]!;
+const isWritableSymbol = Object.getOwnPropertySymbols(writableProbe).find((s) => s !== BoxSymbol)!;
+
+class ReadBox<T> {
+	readonly #getter: () => T;
+
+	constructor(getter: () => T) {
+		this.#getter = getter;
+	}
+
+	get current(): T {
+		return this.#getter();
+	}
+}
+// oxlint-disable-next-line no-explicit-any
+(ReadBox.prototype as any)[BoxSymbol] = true;
+
+class WriteBox<T> {
+	readonly #getter: () => T;
+	readonly #setter: (v: T) => void;
+	readonly #value: T = $derived.by(() => this.#getter());
+
+	constructor(getter: () => T, setter: (v: T) => void) {
+		this.#getter = getter;
+		this.#setter = setter;
+	}
+
+	get current(): T {
+		return this.#value;
+	}
+
+	set current(v: T) {
+		this.#setter(v);
+	}
+}
+// oxlint-disable-next-line no-explicit-any
+(WriteBox.prototype as any)[BoxSymbol] = true;
+// oxlint-disable-next-line no-explicit-any
+(WriteBox.prototype as any)[isWritableSymbol] = true;
+
+export function boxWith<T>(getter: () => T): ReadableBox<T>;
+export function boxWith<T>(getter: () => T, setter: (v: T) => void): WritableBox<T>;
+export function boxWith<T>(getter: () => T, setter?: (v: T) => void) {
+	return (setter
+		? new WriteBox(getter, setter)
+		: new ReadBox(getter)) as unknown as WritableBox<T>;
+}
diff --git a/packages/bits-ui/src/lib/internal/merge-props-toolbelt-suite.test.ts b/packages/bits-ui/src/lib/internal/merge-props-toolbelt-suite.test.ts
new file mode 100644
index 000000000..83f36177d
--- /dev/null
+++ b/packages/bits-ui/src/lib/internal/merge-props-toolbelt-suite.test.ts
@@ -0,0 +1,515 @@
+/**
+ * Vendored verbatim from svelte-toolbelt's merge-props test suite so the
+ * internal performance-tuned `mergeProps` is held to the exact same contract:
+ * https://github.com/huntabyte/svelte-toolbelt/blob/main/src/lib/utils/merge-props.test.ts
+ * Only the import specifier differs.
+ */
+import { describe, expect, it, vi } from "vitest";
+import { mergeProps } from "./merge-props.js";
+
+describe("mergeProps", () => {
+	it("should merge objects", () => {
+		const props1 = { a: 1, b: 2 };
+		const props2 = { c: 3 };
+		const result = mergeProps(props1, props2);
+		expect(result).toEqual({ a: 1, b: 2, c: 3 });
+	});
+
+	it("should override values with the last one", () => {
+		const props1 = { a: 1 };
+		const props2 = { a: 2 };
+		const result = mergeProps(props1, props2);
+		expect(result).toEqual({ a: 2 });
+	});
+
+	it("should compose event handlers", () => {
+		const handler1 = vi.fn();
+		const handler2 = vi.fn();
+		const props1 = { onclick: handler1 };
+		const props2 = { onclick: handler2 };
+		const result = mergeProps(props1, props2);
+
+		result.onclick(new Event("click"));
+
+		expect(handler1).toHaveBeenCalled();
+		expect(handler2).toHaveBeenCalled();
+	});
+
+	it("should chain non-event handler functions", () => {
+		const handler1 = vi.fn();
+		const handler2 = vi.fn();
+		const props1 = { foo: handler1 };
+		const props2 = { foo: handler2 };
+		const result = mergeProps(props1, props2);
+
+		result.foo();
+
+		expect(handler1).toHaveBeenCalled();
+		expect(handler2).toHaveBeenCalled();
+	});
+
+	it("should handle chaining with one property being undefined", () => {
+		const handler1 = vi.fn();
+		const props1 = { foo: handler1 };
+		const props2 = { foo: undefined };
+		const result = mergeProps(props1, props2);
+
+		// @ts-expect-error - we're testing to see if the undefined value is handled
+		result.foo();
+
+		expect(handler1).toHaveBeenCalled();
+	});
+
+	it("should merge class strings", () => {
+		const props1 = { class: "foo" };
+		const props2 = { class: "bar" };
+		const result = mergeProps(props1, props2);
+		expect(result).toEqual({ class: "foo bar" });
+	});
+
+	it("should merge style objects", () => {
+		const props1 = { style: { color: "red" } };
+		const props2 = { style: { fontSize: "16px" } };
+		const result = mergeProps(props1, props2);
+		expect(result).toEqual({ style: "color: red; font-size: 16px;" });
+	});
+
+	it("should merge class strings with style objects", () => {
+		const props1 = { style: { fontSize: "16px", pointerEvents: "auto", color: "red" } };
+		const props2 = { style: "pointer-events: none; font-size: 48px;" };
+		const props3 = { style: { backgroundColor: "blue" } };
+		const props4 = { style: "background-color: red;" };
+		const result = mergeProps(props1, props2, props3, props4);
+		expect(result).toEqual({
+			style: "font-size: 48px; pointer-events: none; color: red; background-color: red;"
+		});
+	});
+
+	it("should merge multiple css variables", () => {
+		const props1 = {
+			style: {
+				"--foo": "red",
+				"--bar": "blue"
+			}
+		};
+
+		const props2 = {
+			style: {
+				"--foo": "green",
+				"--baz": "yellow"
+			}
+		};
+
+		const result = mergeProps(props1, props2);
+
+		expect(result.style).toEqual("--foo: green; --bar: blue; --baz: yellow;");
+	});
+
+	it("should merge style strings", () => {
+		const props1 = { style: "color: red;" };
+		const props2 = { style: "font-size: 16px;" };
+		const result = mergeProps(props1, props2);
+		expect(result).toEqual({ style: "color: red; font-size: 16px;" });
+	});
+
+	it("should handle sparse arrays", () => {
+		const props1 = { a: 1 };
+		const props2 = { b: 2 };
+		const result = mergeProps(undefined, props1, null, props2);
+		expect(result).toEqual({ a: 1, b: 2 });
+	});
+
+	it("should handle nested objects", () => {
+		const props1 = { obj: { a: 1 } };
+		const props2 = { obj: { b: 2 } };
+		const result = mergeProps(props1, props2);
+		expect(result).toEqual({ obj: { b: 2 } });
+	});
+
+	it("should handle the hidden attribute", () => {
+		const props1 = { hidden: true };
+		const props2 = { hidden: false };
+		const props3 = { hidden: "until-found" };
+		const result = mergeProps(props1, props2);
+		expect(result).toEqual({ hidden: undefined });
+
+		const result2 = mergeProps(props2, props1);
+		expect(result2).toEqual({ hidden: true });
+
+		const result3 = mergeProps(props1, props3);
+		expect(result3).toEqual({ hidden: "until-found" });
+	});
+
+	it("should handle the disabled attribute", () => {
+		const props1 = { disabled: true };
+		const props2 = { disabled: false };
+		const result = mergeProps(props1, props2);
+		expect(result).toEqual({ disabled: undefined });
+
+		const result2 = mergeProps(props2, props1);
+		expect(result2).toEqual({ disabled: true });
+	});
+
+	it("should chain non-function event handlers", () => {
+		const handler1 = vi.fn();
+		const handler2 = vi.fn();
+		const props1 = { onValueChange: handler1 };
+		const props2 = { onValueChange: handler2 };
+		const result = mergeProps(props1, props2);
+
+		result.onValueChange();
+
+		expect(handler1).toHaveBeenCalled();
+		expect(handler2).toHaveBeenCalled();
+	});
+
+	it("should handle merging of styles if styles only provided in props2", () => {
+		const props1 = {};
+
+		const props2 = {
+			style: "color: blue;"
+		};
+		const result = mergeProps(props1, props2);
+		expect(result).toEqual({ style: "color: blue;" });
+	});
+
+	it("should merge classnames via clsx", () => {
+		const props1 = { class: "text-lg font-bold" };
+		const props2 = { class: ["bg-blue-500", "hover:bg-blue-600"] };
+		const result = mergeProps(props1, props2);
+		expect(result).toEqual({ class: "text-lg font-bold bg-blue-500 hover:bg-blue-600" });
+	});
+
+	it("should handle symbol as keys", () => {
+		const symbol = Symbol("foo");
+		const symbol2 = Symbol("foo2");
+		const props1 = { [symbol]: "bar" };
+		const props2 = { [symbol]: "baz", [symbol2]: "qux" };
+		const result = mergeProps(props1, props2);
+		expect(result).toEqual({ [symbol]: "baz", [symbol2]: "qux" });
+	});
+
+	it("should handle multiple symbols with same description", () => {
+		const symbol1 = Symbol("foo");
+		const symbol2 = Symbol("foo"); // same description, different symbol
+		const props1 = { [symbol1]: "bar" };
+		const props2 = { [symbol2]: "baz" };
+		const result = mergeProps(props1, props2);
+		expect(result).toEqual({ [symbol1]: "bar", [symbol2]: "baz" });
+	});
+
+	it("should handle mixed string and symbol keys", () => {
+		const symbol = Symbol("foo");
+		const props1 = { [symbol]: "bar", a: 1 };
+		const props2 = { [symbol]: "baz", b: 2 };
+		const result = mergeProps(props1, props2);
+		expect(result).toEqual({ [symbol]: "baz", a: 1, b: 2 });
+	});
+
+	it("should handle undefined symbol values", () => {
+		const symbol = Symbol("foo");
+		const props1 = { [symbol]: "bar" };
+		const props2 = { [symbol]: undefined };
+		const result = mergeProps(props1, props2);
+		expect(result).toEqual({ [symbol]: "bar" });
+	});
+
+	it("should handle null symbol values", () => {
+		const symbol = Symbol("foo");
+		const props1 = { [symbol]: "bar" };
+		const props2 = { [symbol]: null };
+		const result = mergeProps(props1, props2);
+		expect(result).toEqual({ [symbol]: null });
+	});
+
+	it("should handle complex nested objects with symbols", () => {
+		const symbol = Symbol("foo");
+		const props1 = {
+			[symbol]: { nested: { value: 1 } },
+			obj: { a: 1 }
+		};
+		const props2 = {
+			[symbol]: { nested: { value: 2 } },
+			obj: { b: 2 }
+		};
+		const result = mergeProps(props1, props2);
+		expect(result).toEqual({
+			[symbol]: { nested: { value: 2 } },
+			obj: { b: 2 }
+		});
+	});
+
+	it("should handle symbols with function values", () => {
+		const symbol = Symbol("foo");
+		const handler1 = vi.fn();
+		const handler2 = vi.fn();
+		const props1 = { [symbol]: handler1 };
+		const props2 = { [symbol]: handler2 };
+		const result = mergeProps(props1, props2);
+
+		(result[symbol] as () => void)();
+		expect(handler1).not.toHaveBeenCalled();
+		expect(handler2).toHaveBeenCalled();
+	});
+
+	it("should handle symbols with style objects", () => {
+		const symbol = Symbol("style");
+		const props1 = { [symbol]: { color: "red" } };
+		const props2 = { [symbol]: { fontSize: "16px" } };
+		const result = mergeProps(props1, props2);
+		expect(result).toEqual({ [symbol]: { fontSize: "16px" } });
+	});
+
+	it("should handle symbols with class values", () => {
+		const symbol = Symbol("class");
+		const props1 = { [symbol]: "foo" };
+		const props2 = { [symbol]: "bar" };
+		const result = mergeProps(props1, props2);
+		expect(result).toEqual({ [symbol]: "bar" });
+	});
+
+	it("should handle multiple props with multiple symbols", () => {
+		const symbol1 = Symbol("foo");
+		const symbol2 = Symbol("bar");
+		const symbol3 = Symbol("baz");
+		const props1 = { [symbol1]: "a", [symbol2]: "b" };
+		const props2 = { [symbol2]: "c", [symbol3]: "d" };
+		const props3 = { [symbol1]: "e", [symbol3]: "f" };
+		const result = mergeProps(props1, props2, props3);
+		expect(result).toEqual({
+			[symbol1]: "e",
+			[symbol2]: "c",
+			[symbol3]: "f"
+		});
+	});
+
+	it("should handle CSS variables and camelCase in styles", () => {
+		const props1 = {
+			style: {
+				"--custom-color": "red",
+				backgroundColor: "blue",
+				"--spacing-unit": "8px",
+				"--border-radius": "4px"
+			}
+		};
+		const props2 = {
+			style: {
+				"--custom-color": "green",
+				backgroundColor: "yellow",
+				"--border-width": "2px"
+			}
+		};
+		const result = mergeProps(props1, props2);
+		expect(result.style).toEqual(
+			"--custom-color: green; background-color: yellow; --spacing-unit: 8px; --border-radius: 4px; --border-width: 2px;"
+		);
+	});
+
+	it("should handle complex class combinations with arrays, objects, and conditionals", () => {
+		const props1 = {
+			class: [
+				"base",
+				{ "conditional-true": true, "conditional-false": false },
+				["nested", "array"],
+				undefined,
+				null
+			]
+		};
+		const props2 = {
+			class: {
+				"override-true": true,
+				"override-false": false
+			}
+		};
+		const result = mergeProps(props1, props2);
+		expect(result.class).toEqual("base conditional-true nested array override-true");
+	});
+
+	it("should handle multiple event handlers with different event types", () => {
+		const clickHandler1 = vi.fn();
+		const clickHandler2 = vi.fn();
+		const inputHandler1 = vi.fn();
+		const inputHandler2 = vi.fn();
+		const keydownHandler1 = vi.fn();
+		const keydownHandler2 = vi.fn();
+
+		const props1 = {
+			onclick: clickHandler1,
+			oninput: inputHandler1,
+			onkeydown: keydownHandler1
+		};
+		const props2 = {
+			onclick: clickHandler2,
+			oninput: inputHandler2,
+			onkeydown: keydownHandler2
+		};
+
+		const result = mergeProps(props1, props2);
+
+		result.onclick(new Event("click"));
+		result.oninput(new Event("input"));
+		result.onkeydown(new Event("keydown"));
+
+		expect(clickHandler1).toHaveBeenCalled();
+		expect(clickHandler2).toHaveBeenCalled();
+		expect(inputHandler1).toHaveBeenCalled();
+		expect(inputHandler2).toHaveBeenCalled();
+		expect(keydownHandler1).toHaveBeenCalled();
+		expect(keydownHandler2).toHaveBeenCalled();
+	});
+
+	it("should handle complex function chaining with different return types", () => {
+		const fn1 = vi.fn().mockReturnValue(1);
+		const fn2 = vi.fn().mockReturnValue("string");
+		const fn3 = vi.fn().mockReturnValue({ obj: true });
+
+		const props1 = { complexFn: fn1 };
+		const props2 = { complexFn: fn2 };
+		const props3 = { complexFn: fn3 };
+
+		const result = mergeProps(props1, props2, props3);
+		result.complexFn();
+
+		expect(fn1).toHaveBeenCalled();
+		expect(fn2).toHaveBeenCalled();
+		expect(fn3).toHaveBeenCalled();
+		expect(fn3).toHaveReturnedWith({ obj: true });
+	});
+
+	it("should handle style merging with !important and vendor prefixes", () => {
+		const props1 = {
+			style: {
+				color: "red !important",
+				WebkitTransition: "all 0.3s",
+				MozTransition: "all 0.3s",
+				msTransition: "all 0.3s"
+			}
+		};
+		const props2 = {
+			style: {
+				color: "blue",
+				WebkitTransform: "scale(1.1)",
+				MozTransform: "scale(1.1)",
+				msTransform: "scale(1.1)"
+			}
+		};
+		const result = mergeProps(props1, props2);
+		expect(result.style).toEqual(
+			"color: blue; -webkit-transition: all 0.3s; -moz-transition: all 0.3s; ms-transition: all 0.3s; -webkit-transform: scale(1.1); -moz-transform: scale(1.1); ms-transform: scale(1.1);"
+		);
+	});
+
+	it("should handle merging of custom event handlers with different parameter types", () => {
+		const handler1 = vi.fn();
+		const handler2 = vi.fn();
+		const handler3 = vi.fn();
+
+		const props1 = { onCustomEvent: handler1 };
+		const props2 = { onCustomEvent: handler2 };
+		const props3 = { onCustomEvent: handler3 };
+
+		const result = mergeProps(props1, props2, props3);
+
+		// Test with different parameter types
+		result.onCustomEvent("string");
+		result.onCustomEvent(123);
+		result.onCustomEvent({ complex: "object" });
+		result.onCustomEvent(new Event("custom"));
+
+		expect(handler1).toHaveBeenCalledTimes(4);
+		expect(handler2).toHaveBeenCalledTimes(4);
+		expect(handler3).toHaveBeenCalledTimes(4);
+	});
+
+	it("should handle merging of style with calc() and var() functions", () => {
+		const props1 = {
+			style: {
+				width: "calc(100% - 20px)",
+				"--custom-width": "50px",
+				height: "var(--custom-height, 100px)"
+			}
+		};
+		const props2 = {
+			style: {
+				"--custom-width": "75px",
+				"--custom-height": "200px",
+				margin: "calc(var(--custom-width) / 2)"
+			}
+		};
+		const result = mergeProps(props1, props2);
+		expect(result.style).toEqual(
+			"width: calc(100% - 20px); --custom-width: 75px; height: var(--custom-height, 100px); --custom-height: 200px; margin: calc(var(--custom-width) / 2);"
+		);
+	});
+
+	it("should handle style merging with complex units and values", () => {
+		const props1 = {
+			style: {
+				width: "100vw",
+				height: "calc(100vh - 60px)",
+				transform: "translate3d(0, 0, 0) rotate(45deg)",
+				background: "linear-gradient(45deg, #ff0000, #00ff00)",
+				boxShadow: "0 0 10px rgba(0,0,0,0.5)",
+				transition: "all 0.3s cubic-bezier(0.4, 0, 0.2, 1)"
+			}
+		};
+		const props2 = {
+			style: {
+				transform: "scale(1.1)",
+				background: "radial-gradient(circle, #0000ff, #ff00ff)",
+				boxShadow: "inset 0 0 5px rgba(255,255,255,0.5)"
+			}
+		};
+		const result = mergeProps(props1, props2);
+		expect(result.style).toEqual(
+			"width: 100vw; height: calc(100vh - 60px); transform: scale(1.1); background: radial-gradient(circle, #0000ff, #ff00ff); box-shadow: inset 0 0 5px rgba(255,255,255,0.5); transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);"
+		);
+	});
+
+	it("should handle style merging with empty and invalid values", () => {
+		const props1 = {
+			style: {
+				color: "",
+				backgroundColor: null,
+				fontSize: undefined,
+				border: "1px solid black",
+				invalid: 123
+			}
+		};
+		const props2 = {
+			style: {
+				color: "red",
+				backgroundColor: "blue",
+				fontSize: "16px",
+				invalid: "string"
+			}
+		};
+		const result = mergeProps(props1, props2);
+		expect(result.style).toEqual(
+			"color: red; background-color: blue; font-size: 16px; border: 1px solid black; invalid: string;"
+		);
+	});
+
+	it("should handle style merging with shorthand properties", () => {
+		const props1 = {
+			style: {
+				margin: "10px",
+				padding: "5px 10px",
+				border: "1px solid black",
+				background: "red"
+			}
+		};
+		const props2 = {
+			style: {
+				marginTop: "20px",
+				paddingLeft: "15px",
+				borderColor: "blue",
+				backgroundColor: "green"
+			}
+		};
+		const result = mergeProps(props1, props2);
+		expect(result.style).toEqual(
+			"margin: 10px; padding: 5px 10px; border: 1px solid black; background: red; margin-top: 20px; padding-left: 15px; border-color: blue; background-color: green;"
+		);
+	});
+});
diff --git a/packages/bits-ui/src/lib/internal/merge-props.test.ts b/packages/bits-ui/src/lib/internal/merge-props.test.ts
new file mode 100644
index 000000000..ece859ebc
--- /dev/null
+++ b/packages/bits-ui/src/lib/internal/merge-props.test.ts
@@ -0,0 +1,123 @@
+import { describe, expect, it, vi } from "vitest";
+import { mergeProps as mergePropsToolbelt } from "svelte-toolbelt";
+import { mergeProps } from "./merge-props.js";
+
+function expectParity(...args: (Record<string, unknown> | null | undefined)[]) {
+	const ours = mergeProps(...args) as Record<string, unknown>;
+	const theirs = mergePropsToolbelt(...args) as Record<string, unknown>;
+	expect(Object.keys(ours).sort()).toEqual(Object.keys(theirs).sort());
+	for (const key of Object.keys(theirs)) {
+		if (typeof theirs[key] === "function") {
+			expect(typeof ours[key]).toBe("function");
+		} else {
+			expect(ours[key]).toEqual(theirs[key]);
+		}
+	}
+}
+
+describe("mergeProps parity with svelte-toolbelt", () => {
+	it("merges plain values with last-wins", () => {
+		expectParity({ a: 1, b: "x" }, { b: "y", c: true });
+		expectParity({ a: 1 }, { a: undefined });
+		expectParity({}, { a: null });
+		expectParity(null, { a: 1 }, undefined, { b: 2 });
+	});
+
+	it("merges string classes", () => {
+		expectParity({ class: "a" }, { class: "b" });
+		expectParity({ class: "" }, { class: "b" });
+		expectParity({ class: "a" }, { class: "" });
+		expectParity({}, { class: "b" });
+		expectParity({ class: "a" }, {});
+		expectParity({ class: "a" }, { class: undefined });
+	});
+
+	it("merges clsx-style class values", () => {
+		expectParity({ class: ["a", { b: true, c: false }] }, { class: "d" });
+		expectParity({ class: "a" }, { class: { b: true } });
+		expectParity({ class: 5 }, { class: ["x", ["y"]] });
+		expectParity({ class: null }, { class: [null, undefined, "z"] });
+		expectParity({ class: new Date() }, { class: "b" });
+		expectParity({ class: "a" }, { class: new Date() });
+	});
+
+	it("merges styles", () => {
+		expectParity({ style: "color: red" }, { style: "background: blue" });
+		expectParity({ style: { color: "red" } }, { style: "background: blue" });
+		expectParity({ style: "color: red" }, { style: { background: "blue" } });
+		expectParity({ style: { color: "red" } }, { style: { background: "blue" } });
+		expectParity({ style: "color: red; --x: 1" }, {});
+		expectParity({}, { style: { "--x": "1", paddingLeft: "2px" } });
+		expectParity({ style: "-webkit-line-clamp: 2" }, { style: "color: red" });
+	});
+
+	it("composes event handlers with defaultPrevented short-circuit", () => {
+		const aCalls: string[] = [];
+		const makeHandlers = () => ({
+			first: vi.fn((e: Event) => {
+				aCalls.push("first");
+				e.preventDefault();
+			}),
+			second: vi.fn(() => aCalls.push("second")),
+		});
+
+		const h1 = makeHandlers();
+		const ours = mergeProps({ onclick: h1.first }, { onclick: h1.second }) as {
+			onclick: (e: Event) => void;
+		};
+		const event = new Event("click", { cancelable: true });
+		ours.onclick(event);
+		expect(h1.first).toHaveBeenCalledOnce();
+		expect(h1.second).not.toHaveBeenCalled();
+
+		const h2 = makeHandlers();
+		const theirs = mergePropsToolbelt({ onclick: h2.first }, { onclick: h2.second }) as {
+			onclick: (e: Event) => void;
+		};
+		theirs.onclick(new Event("click", { cancelable: true }));
+		expect(h2.first).toHaveBeenCalledOnce();
+		expect(h2.second).not.toHaveBeenCalled();
+	});
+
+	it("chains non-event functions", () => {
+		const calls: string[] = [];
+		const merged = mergeProps(
+			{ onCustomThing: () => calls.push("a") },
+			{ onCustomThing: () => calls.push("b") }
+		) as { onCustomThing: (...args: unknown[]) => void };
+		merged.onCustomThing();
+		expect(calls).toEqual(["a", "b"]);
+	});
+
+	it("keeps a handler when only one side provides it", () => {
+		const fn = vi.fn();
+		const merged = mergeProps({ onclick: fn }, { id: "x" }) as {
+			onclick: () => void;
+		};
+		merged.onclick();
+		expect(fn).toHaveBeenCalledOnce();
+	});
+
+	it("removes hidden/disabled when false", () => {
+		expectParity({ hidden: true }, { hidden: false });
+		expectParity({ disabled: true }, { disabled: false });
+		expectParity({}, { hidden: false, disabled: false });
+		expectParity({ hidden: false }, { hidden: true });
+	});
+
+	it("carries symbol keys (attachments)", () => {
+		const sym = Symbol("attachment");
+		const fn = () => {};
+		const ours = mergeProps({}, { [sym]: fn }) as Record<symbol, unknown>;
+		const theirs = mergePropsToolbelt({}, { [sym]: fn }) as Record<symbol, unknown>;
+		expect(ours[sym]).toBe(fn);
+		expect(theirs[sym]).toBe(fn);
+	});
+
+	it("converts merged style objects to strings", () => {
+		const ours = mergeProps({}, { style: { color: "red", "--x": "1" } });
+		const theirs = mergePropsToolbelt({}, { style: { color: "red", "--x": "1" } });
+		expect(ours.style).toBe(theirs.style);
+		expect(typeof ours.style).toBe("string");
+	});
+});
diff --git a/packages/bits-ui/src/lib/internal/merge-props.ts b/packages/bits-ui/src/lib/internal/merge-props.ts
new file mode 100644
index 000000000..71f0ea405
--- /dev/null
+++ b/packages/bits-ui/src/lib/internal/merge-props.ts
@@ -0,0 +1,261 @@
+/**
+ * Performance-tuned drop-in for svelte-toolbelt's `mergeProps`.
+ * Modified from https://github.com/adobe/react-spectrum/blob/main/packages/%40react-aria/utils/src/mergeProps.ts
+ * (see NOTICE.txt for source)
+ */
+import type { ClassValue } from "svelte/elements";
+import { composeHandlers, cssToStyleObj, executeCallbacks, styleToString } from "svelte-toolbelt";
+
+type Props = Record<string, unknown>;
+type PropsArg = Props | null | undefined;
+type TupleTypes<T> = { [P in keyof T]: T[P] } extends { [key: number]: infer V }
+	? NullToObject<V>
+	: never;
+type NullToObject<T> = T extends null | undefined ? object : T;
+// oxlint-disable-next-line no-explicit-any
+type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (k: infer I) => void
+	? I
+	: never;
+
+/** DOM event handler names that mergeProps composes instead of chaining. */
+const EVENT_LIST_SET = new Set([
+	"onabort",
+	"onanimationcancel",
+	"onanimationend",
+	"onanimationiteration",
+	"onanimationstart",
+	"onauxclick",
+	"onbeforeinput",
+	"onbeforetoggle",
+	"onblur",
+	"oncancel",
+	"oncanplay",
+	"oncanplaythrough",
+	"onchange",
+	"onclick",
+	"onclose",
+	"oncompositionend",
+	"oncompositionstart",
+	"oncompositionupdate",
+	"oncontextlost",
+	"oncontextmenu",
+	"oncontextrestored",
+	"oncopy",
+	"oncuechange",
+	"oncut",
+	"ondblclick",
+	"ondrag",
+	"ondragend",
+	"ondragenter",
+	"ondragleave",
+	"ondragover",
+	"ondragstart",
+	"ondrop",
+	"ondurationchange",
+	"onemptied",
+	"onended",
+	"onerror",
+	"onfocus",
+	"onfocusin",
+	"onfocusout",
+	"onformdata",
+	"ongotpointercapture",
+	"oninput",
+	"oninvalid",
+	"onkeydown",
+	"onkeypress",
+	"onkeyup",
+	"onload",
+	"onloadeddata",
+	"onloadedmetadata",
+	"onloadstart",
+	"onlostpointercapture",
+	"onmousedown",
+	"onmouseenter",
+	"onmouseleave",
+	"onmousemove",
+	"onmouseout",
+	"onmouseover",
+	"onmouseup",
+	"onpaste",
+	"onpause",
+	"onplay",
+	"onplaying",
+	"onpointercancel",
+	"onpointerdown",
+	"onpointerenter",
+	"onpointerleave",
+	"onpointermove",
+	"onpointerout",
+	"onpointerover",
+	"onpointerup",
+	"onprogress",
+	"onratechange",
+	"onreset",
+	"onresize",
+	"onscroll",
+	"onscrollend",
+	"onsecuritypolicyviolation",
+	"onseeked",
+	"onseeking",
+	"onselect",
+	"onselectionchange",
+	"onselectstart",
+	"onslotchange",
+	"onstalled",
+	"onsubmit",
+	"onsuspend",
+	"ontimeupdate",
+	"ontoggle",
+	"ontouchcancel",
+	"ontouchend",
+	"ontouchmove",
+	"ontouchstart",
+	"ontransitioncancel",
+	"ontransitionend",
+	"ontransitionrun",
+	"ontransitionstart",
+	"onvolumechange",
+	"onwaiting",
+	"onwebkitanimationend",
+	"onwebkitanimationiteration",
+	"onwebkitanimationstart",
+	"onwebkittransitionend",
+	"onwheel",
+]);
+
+/** clsx-compatible class value check. */
+function isClassValue(value: unknown): value is ClassValue {
+	if (value === null || value === undefined) return true;
+	const t = typeof value;
+	if (t === "string" || t === "number" || t === "bigint" || t === "boolean") return true;
+	if (Array.isArray(value)) return value.every((item) => isClassValue(item));
+	if (t === "object") return Object.getPrototypeOf(value) === Object.prototype;
+	return false;
+}
+
+function classValueToString(value: ClassValue): string {
+	if (typeof value === "string") return value;
+	if (typeof value === "number" || typeof value === "bigint") return String(value);
+	if (typeof value === "boolean" || value === null || value === undefined) return "";
+	if (Array.isArray(value)) {
+		let out = "";
+		for (const item of value) {
+			const str = classValueToString(item as ClassValue);
+			if (str) out = out ? `${out} ${str}` : str;
+		}
+		return out;
+	}
+	let out = "";
+	for (const key in value) {
+		if (value[key]) out = out ? `${out} ${key}` : key;
+	}
+	return out;
+}
+
+function mergeClass(a: unknown, b: unknown): unknown {
+	if (typeof a === "string") {
+		if (typeof b === "string") return a && b ? `${a} ${b}` : a || b;
+		if (b === null || b === undefined) return a;
+	}
+	const aIsClassValue = isClassValue(a);
+	const bIsClassValue = isClassValue(b);
+	if (aIsClassValue && bIsClassValue) {
+		const aStr = classValueToString(a as ClassValue);
+		const bStr = classValueToString(b as ClassValue);
+		return aStr && bStr ? `${aStr} ${bStr}` : aStr || bStr;
+	}
+	if (aIsClassValue) return classValueToString(a as ClassValue);
+	if (bIsClassValue) return classValueToString(b as ClassValue);
+	return a;
+}
+
+function mergeStyle(a: unknown, b: unknown): unknown {
+	const aIsObject = typeof a === "object";
+	const bIsObject = typeof b === "object";
+	const aIsString = typeof a === "string";
+	const bIsString = typeof b === "string";
+	if (aIsObject && bIsObject) return { ...a, ...b };
+	if (aIsObject && bIsString) return { ...a, ...cssToStyleObj(b as string) };
+	if (aIsString && bIsObject) return { ...cssToStyleObj(a as string), ...b };
+	if (aIsString && bIsString)
+		return { ...cssToStyleObj(a as string), ...cssToStyleObj(b as string) };
+	if (aIsObject) return a;
+	if (bIsObject) return b;
+	if (aIsString) return a;
+	if (bIsString) return b;
+	return a;
+}
+
+/**
+ * Given a list of prop objects, merges them into a single object.
+ * - Automatically composes event handlers (e.g. `onclick`, `oninput`, etc.)
+ * - Chains regular functions with the same name so they are called in order
+ * - Merges class values (strings, arrays, objects)
+ * - Merges style objects and converts them to strings
+ * - Handles a bug with Svelte where setting the `hidden`/`disabled` attribute to
+ *   `false` doesn't remove it
+ * - Overrides other values with the last one
+ */
+export function mergeProps<T extends PropsArg[]>(
+	...args: T
+): UnionToIntersection<TupleTypes<T>> & { style?: string } {
+	const result: Props = { ...args[0] };
+
+	for (let i = 1; i < args.length; i++) {
+		const props = args[i];
+		if (!props) continue;
+
+		for (const key of Object.keys(props)) {
+			const b = props[key];
+			const a = result[key];
+
+			if (a === undefined) {
+				if (key === "class") {
+					result[key] = typeof b === "string" ? b : mergeClass(undefined, b);
+				} else {
+					result[key] = b;
+				}
+				continue;
+			}
+
+			const aIsFunction = typeof a === "function";
+			const bIsFunction = typeof b === "function";
+
+			if (aIsFunction && bIsFunction && EVENT_LIST_SET.has(key)) {
+				result[key] = composeHandlers(
+					a as (...args: unknown[]) => unknown,
+					b as (...args: unknown[]) => unknown
+				);
+			} else if (aIsFunction && bIsFunction) {
+				result[key] = executeCallbacks(a, b);
+			} else if (key === "class") {
+				result[key] = mergeClass(a, b);
+			} else if (key === "style") {
+				result[key] = mergeStyle(a, b);
+			} else {
+				result[key] = b !== undefined ? b : a;
+			}
+		}
+
+		const symbols = Object.getOwnPropertySymbols(props);
+		for (const key of symbols) {
+			const b = (props as Record<symbol, unknown>)[key];
+			result[key as unknown as string] =
+				b !== undefined ? b : result[key as unknown as string];
+		}
+	}
+
+	if (typeof result.style === "object" && result.style !== null) {
+		result.style = styleToString(result.style as Record<string, string>).replaceAll("\n", " ");
+	}
+
+	if (result.hidden === false) {
+		delete result.hidden;
+	}
+	if (result.disabled === false) {
+		delete result.disabled;
+	}
+
+	return result as UnionToIntersection<TupleTypes<T>> & { style?: string };
+}
diff --git a/packages/bits-ui/src/lib/internal/timeout-fn.ts b/packages/bits-ui/src/lib/internal/timeout-fn.ts
index 49903f11f..1c76352ee 100644
--- a/packages/bits-ui/src/lib/internal/timeout-fn.ts
+++ b/packages/bits-ui/src/lib/internal/timeout-fn.ts
@@ -2,11 +2,11 @@ import { onDestroyEffect } from "svelte-toolbelt";
 import type { AnyFn } from "./types.js";
 
 export class TimeoutFn<T extends AnyFn> {
-	readonly #interval: number;
+	readonly #interval: number | (() => number);
 	readonly #cb: T;
 	#timer: number | null = null;
 
-	constructor(cb: T, interval: number) {
+	constructor(cb: T, interval: number | (() => number)) {
 		this.#cb = cb;
 		this.#interval = interval;
 
@@ -29,10 +29,12 @@ export class TimeoutFn<T extends AnyFn> {
 
 	start(...args: Parameters<T> | []) {
 		this.#clear();
+		const interval =
+			typeof this.#interval === "function" ? this.#interval() : this.#interval;
 		this.#timer = window.setTimeout(() => {
 			this.#timer = null;
 
 			this.#cb(...args);
-		}, this.#interval);
+		}, interval);
 	}
 }
diff --git a/packages/bits-ui/src/lib/shared/index.ts b/packages/bits-ui/src/lib/shared/index.ts
index 9264ce0ff..4916ba5a1 100644
--- a/packages/bits-ui/src/lib/shared/index.ts
+++ b/packages/bits-ui/src/lib/shared/index.ts
@@ -62,7 +62,7 @@ export type {
 	TimeOnInvalid,
 } from "./date/types.js";
 export type { WithChild, Without, WithChildren } from "$lib/internal/types.js";
-export { mergeProps } from "svelte-toolbelt";
+export { mergeProps } from "$lib/internal/merge-props.js";
 export { useId } from "$lib/internal/use-id.js";
 export * from "./attributes.js";
 export * from "./types.js";
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index aa81d31f9..988188c34 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -3,6 +3,7 @@ packages:
   - docs
   - tests
   - bundle-analyzer
+  - bench
 
 catalog:
   '@sveltejs/kit': 2.49.5
diff --git a/tests/other/setup-browser-test.ts b/tests/other/setup-browser-test.ts
index 570b9f0e1..8aadd2721 100644
--- a/tests/other/setup-browser-test.ts
+++ b/tests/other/setup-browser-test.ts
@@ -1,2 +1,33 @@
 /// <reference types="@vitest/browser/matchers" />
 /// <reference types="@vitest/browser/providers/playwright" />
+import { afterEach } from "vitest";
+import { cleanup } from "vitest-browser-svelte";
+
+afterEach(async () => {
+	document.dispatchEvent(
+		new KeyboardEvent("keydown", {
+			key: "Escape",
+			code: "Escape",
+			bubbles: true,
+			cancelable: true,
+		})
+	);
+
+	cleanup();
+
+	const style = document.body.style;
+	style.removeProperty("pointer-events");
+	style.removeProperty("overflow");
+	style.removeProperty("padding-right");
+	style.removeProperty("margin-right");
+	style.removeProperty("--scrollbar-width");
+
+	await new Promise((r) => setTimeout(r, 30));
+
+	for (const [state] of globalThis.bitsDismissableLayers ?? []) {
+		const ref = state.opts.ref.current;
+		if (!ref?.isConnected) {
+			globalThis.bitsDismissableLayers.delete(state);
+		}
+	}
+});
diff --git a/tests/src/tests/browser-utils.ts b/tests/src/tests/browser-utils.ts
index 89b5023d1..1181ff7e1 100644
--- a/tests/src/tests/browser-utils.ts
+++ b/tests/src/tests/browser-utils.ts
@@ -86,6 +86,23 @@ export async function expectExists(loc: Locator) {
 	await expect.element(loc).toBeInTheDocument();
 }
 
+export async function waitForDismissableLayerReady(loc: Locator) {
+	await expect.element(loc).toHaveAttribute("data-state", "open");
+	await new Promise((r) => setTimeout(r, 15));
+}
+
+export async function rightClickCenter(loc: Locator) {
+	const el = loc.element() as HTMLElement;
+	const rect = el.getBoundingClientRect();
+	await loc.click({
+		button: "right",
+		position: {
+			x: rect.width / 2,
+			y: rect.height / 2,
+		},
+	});
+}
+
 export async function focusAndExpectToHaveFocus(loc: Locator) {
 	(loc.element() as HTMLElement).focus();
 	await expect.element(loc).toHaveFocus();
diff --git a/tests/src/tests/context-menu/context-menu-integration-test.svelte b/tests/src/tests/context-menu/context-menu-integration-test.svelte
index 0b884133b..c9f544d69 100644
--- a/tests/src/tests/context-menu/context-menu-integration-test.svelte
+++ b/tests/src/tests/context-menu/context-menu-integration-test.svelte
@@ -73,28 +73,36 @@
 			aria-expanded={undefined}
 			aria-controls={undefined}
 		>
-			<Popover.Root>
-				<Popover.Trigger data-testid="popover-trigger-1">open</Popover.Trigger>
-				<Popover.Portal>
-					<Popover.Content data-testid="popover-content-1">Hello</Popover.Content>
-				</Popover.Portal>
-			</Popover.Root>
-			<Select.Root type="single">
-				<Select.Trigger data-testid="select-trigger-1">open</Select.Trigger>
-				<Select.Portal>
-					<Select.Content data-testid="select-content-1">
-						<Select.Item value="1">Hello</Select.Item>
-					</Select.Content>
-				</Select.Portal>
-			</Select.Root>
-			<Select.Root type="single">
-				<Select.Trigger data-testid="select-trigger-2">open</Select.Trigger>
-				<Select.Portal>
-					<Select.Content data-testid="select-content-2">
-						<Select.Item value="1">Hello</Select.Item>
-					</Select.Content>
-				</Select.Portal>
-			</Select.Root>
+			<div class="flex flex-col items-start gap-4 p-4">
+				<Popover.Root>
+					<Popover.Trigger data-testid="popover-trigger-1" class="min-h-10 min-w-40">
+						open popover
+					</Popover.Trigger>
+					<Popover.Portal>
+						<Popover.Content data-testid="popover-content-1">Hello</Popover.Content>
+					</Popover.Portal>
+				</Popover.Root>
+				<Select.Root type="single">
+					<Select.Trigger data-testid="select-trigger-1" class="min-h-10 min-w-40">
+						open select 1
+					</Select.Trigger>
+					<Select.Portal>
+						<Select.Content data-testid="select-content-1">
+							<Select.Item value="1">Hello</Select.Item>
+						</Select.Content>
+					</Select.Portal>
+				</Select.Root>
+				<Select.Root type="single">
+					<Select.Trigger data-testid="select-trigger-2" class="min-h-10 min-w-40">
+						open select 2
+					</Select.Trigger>
+					<Select.Portal>
+						<Select.Content data-testid="select-content-2">
+							<Select.Item value="1">Hello</Select.Item>
+						</Select.Content>
+					</Select.Portal>
+				</Select.Root>
+			</div>
 		</ContextMenu.Trigger>
 		<ContextMenu.Portal>
 			<ContextMenu.Content data-testid="context-content-0">
diff --git a/tests/src/tests/context-menu/context-menu.browser.test.ts b/tests/src/tests/context-menu/context-menu.browser.test.ts
index f331e6ecf..bb5cec673 100644
--- a/tests/src/tests/context-menu/context-menu.browser.test.ts
+++ b/tests/src/tests/context-menu/context-menu.browser.test.ts
@@ -12,6 +12,8 @@ import {
 	getPointerAwayFromSubmenuIntentClientCoords,
 	getPointerLeaveTowardSubmenuClientCoords,
 	getPointerMidpointTowardSubmenuClientCoords,
+	rightClickCenter,
+	waitForDismissableLayerReady,
 } from "../browser-utils";
 import ContextMenuIntegrationTest from "./context-menu-integration-test.svelte";
 import ContextMenuNestedTest from "./context-menu-nested-test.svelte";
@@ -54,6 +56,12 @@ async function open(props: ContextMenuSetupProps = {}) {
 	return { ...t };
 }
 
+function renderIntegrationTest() {
+	const t = render(ContextMenuIntegrationTest);
+	onTestFinished(() => t.unmount());
+	return t;
+}
+
 async function openSubmenu(props: Awaited<ReturnType<typeof open>>) {
 	const t = props;
 	await userEvent.keyboard(kbd.ARROW_DOWN);
@@ -515,16 +523,19 @@ it("calls `onValueChange` when the value of the checkbox group changes", async (
 });
 
 it("should allow switching between context menus via right-click", async () => {
-	render(ContextMenuIntegrationTest);
-	await page.getByTestId("context-trigger-1").click({ button: "right" });
+	renderIntegrationTest();
+	const trigger1 = page.getByTestId("context-trigger-1");
+	const trigger2 = page.getByTestId("context-trigger-2");
+	await rightClickCenter(trigger1);
 	await expectExists(page.getByTestId("context-content-1"));
-	await page.getByTestId("context-trigger-2").click({ button: "right" });
+	await waitForDismissableLayerReady(page.getByTestId("context-content-1"));
+	await rightClickCenter(trigger2);
 	await expectNotExists(page.getByTestId("context-content-1"));
 	await expectExists(page.getByTestId("context-content-2"));
 });
 
 it("should open inside of a dialog", async () => {
-	render(ContextMenuIntegrationTest);
+	renderIntegrationTest();
 	await page.getByTestId("dialog-trigger").click();
 	await expectExists(page.getByTestId("dialog-content"));
 	await page.getByTestId("context-trigger-3").click({ button: "right" });
@@ -536,7 +547,7 @@ it("should open inside of a dialog", async () => {
 });
 
 it("should not close the dialog when the context menu trigger is left clicked", async () => {
-	render(ContextMenuIntegrationTest);
+	renderIntegrationTest();
 	await page.getByTestId("dialog-trigger").click();
 	await expectExists(page.getByTestId("dialog-content"));
 	await page.getByTestId("context-trigger-3").click();
@@ -546,7 +557,7 @@ it("should not close the dialog when the context menu trigger is left clicked",
 });
 
 it("should not close the popover when the context menu trigger is left clicked", async () => {
-	render(ContextMenuIntegrationTest);
+	renderIntegrationTest();
 	await page.getByTestId("popover-trigger").click();
 	await expectExists(page.getByTestId("popover-content"));
 	await page.getByTestId("context-trigger-4").click();
@@ -556,37 +567,35 @@ it("should not close the popover when the context menu trigger is left clicked",
 });
 
 it("should close a nested popover when interacting with a sibling select trigger inside the same context menu trigger", async () => {
-	render(ContextMenuIntegrationTest);
+	renderIntegrationTest();
 	await page.getByTestId("popover-trigger-1").click();
-	await expectExists(page.getByTestId("popover-content-1"));
+	await waitForDismissableLayerReady(page.getByTestId("popover-content-1"));
 	await page.getByTestId("select-trigger-1").click();
-	await new Promise((resolve) => setTimeout(resolve, 50));
 	await expectNotExists(page.getByTestId("popover-content-1"));
 	await expectExists(page.getByTestId("select-content-1"));
 });
 
 it("should close a nested select when interacting with the popover trigger inside the same context menu trigger", async () => {
-	render(ContextMenuIntegrationTest);
+	renderIntegrationTest();
 	await page.getByTestId("select-trigger-1").click();
-	await expectExists(page.getByTestId("select-content-1"));
+	await waitForDismissableLayerReady(page.getByTestId("select-content-1"));
 	await page.getByTestId("popover-trigger-1").click();
-	await new Promise((resolve) => setTimeout(resolve, 50));
 	await expectNotExists(page.getByTestId("select-content-1"));
 	await expectExists(page.getByTestId("popover-content-1"));
 });
 
 it("should close the first nested select when opening the sibling select inside the same context menu trigger", async () => {
-	render(ContextMenuIntegrationTest);
+	renderIntegrationTest();
 	await page.getByTestId("select-trigger-1").click();
-	await expectExists(page.getByTestId("select-content-1"));
+	await waitForDismissableLayerReady(page.getByTestId("select-content-1"));
 	await page.getByTestId("select-trigger-2").click();
-	await new Promise((resolve) => setTimeout(resolve, 50));
 	await expectNotExists(page.getByTestId("select-content-1"));
 	await expectExists(page.getByTestId("select-content-2"));
 });
 
 it("should open nested context menus", async () => {
-	render(ContextMenuNestedTest);
+	const t = render(ContextMenuNestedTest);
+	onTestFinished(() => t.unmount());
 	await page.getByTestId("trigger").click({ button: "right" });
 	await expectExists(page.getByTestId("content"));
 	await page.getByTestId("nested-trigger").click({ button: "right" });
@@ -595,7 +604,8 @@ it("should open nested context menus", async () => {
 });
 
 it("should open nested submenus in context menu", async () => {
-	render(ContextMenuNestedSubmenuTest);
+	const t = render(ContextMenuNestedSubmenuTest);
+	onTestFinished(() => t.unmount());
 	await page.getByTestId("trigger").click({ button: "right" });
 	await expectExists(page.getByTestId("content"));
 
@@ -608,7 +618,7 @@ it("should open nested submenus in context menu", async () => {
 });
 
 it("should allow overriding the pointer events style", async () => {
-	setup({ triggerProps: { style: { pointerEvents: undefined } } });
+	await setup({ triggerProps: { style: { pointerEvents: undefined } } });
 	const trigger = page.getByTestId("trigger");
 	await trigger.click({ button: "right" });
 	await expectExists(page.getByTestId("content"));
@@ -617,7 +627,8 @@ it("should allow overriding the pointer events style", async () => {
 });
 
 it("should open when right clicked inside a tooltip trigger", async () => {
-	render(ContextMenuTooltipTest);
+	const t = render(ContextMenuTooltipTest);
+	onTestFinished(() => t.unmount());
 
 	await page.getByTestId("tooltip-trigger").hover();
 	await page.getByTestId("context-menu-trigger").click({ button: "right" });
diff --git a/tests/src/tests/popover/popover.browser.test.ts b/tests/src/tests/popover/popover.browser.test.ts
index 701f2ce1f..6e4d56f26 100644
--- a/tests/src/tests/popover/popover.browser.test.ts
+++ b/tests/src/tests/popover/popover.browser.test.ts
@@ -7,7 +7,12 @@ import PopoverForceMountTest, {
 	type PopoverForceMountTestProps,
 } from "./popover-force-mount-test.svelte";
 import PopoverSiblingsTest from "./popover-siblings-test.svelte";
-import { expectExists, expectNotExists, observeTransitionAttrs } from "../browser-utils";
+import {
+	expectExists,
+	expectNotExists,
+	observeTransitionAttrs,
+	waitForDismissableLayerReady,
+} from "../browser-utils";
 import { page, userEvent } from "@vitest/browser/context";
 import PopoverMultipleTriggersTest from "./popover-multiple-triggers-test.svelte";
 import PopoverOverlayTest from "./popover-overlay-test.svelte";
@@ -362,17 +367,25 @@ it("should forceMount the content when `forceMount` is true and the `open` snipp
 });
 
 it("should correctly handle focus when closing one popover by clicking another popover's trigger", async () => {
+	window.scrollTo(0, 0);
 	render(PopoverSiblingsTest);
+
 	await page.getByTestId("open-1").click();
 	await expectExists(page.getByTestId("content-1"));
+	await waitForDismissableLayerReady(page.getByTestId("content-1"));
+
 	await page.getByTestId("open-2").click();
-	await expectNotExists(page.getByTestId("content-1"));
 	await expectExists(page.getByTestId("content-2"));
+	await expectNotExists(page.getByTestId("content-1"));
+	await waitForDismissableLayerReady(page.getByTestId("content-2"));
 	await expect.element(page.getByTestId("close-2")).toHaveFocus();
+
 	await page.getByTestId("open-3").click();
-	await expectNotExists(page.getByTestId("content-2"));
 	await expectExists(page.getByTestId("content-3"));
+	await expectNotExists(page.getByTestId("content-2"));
+	await waitForDismissableLayerReady(page.getByTestId("content-3"));
 	await expect.element(page.getByTestId("close-3")).toHaveFocus();
+
 	await page.getByTestId("close-3").click();
 	await expectNotExists(page.getByTestId("content-3"));
 });