From 52325d008a3c2a1c304dc67c6923848115c0b05b Mon Sep 17 00:00:00 2001
From: Hunter Johnston <johnstonhuntera@gmail.com>
Date: Mon, 22 Jul 2024 11:38:36 -0400
Subject: [PATCH] more tidying

---
 .../bits-ui/src/lib/bits/accordion/types.ts   | 10 +---
 .../components/alert-dialog-content.svelte    |  2 +-
 .../src/lib/bits/aspect-ratio/types.ts        |  3 +-
 packages/bits-ui/src/lib/bits/avatar/types.ts |  6 +--
 .../calendar/components/calendar-cell.svelte  |  2 +-
 .../bits-ui/src/lib/bits/calendar/types.ts    |  8 ++-
 .../bits-ui/src/lib/bits/checkbox/types.ts    |  8 +--
 .../bits-ui/src/lib/bits/collapsible/types.ts |  9 +---
 .../components/combobox-content.svelte        |  2 +-
 .../components/combobox-group-label.svelte    |  2 +-
 .../combobox/components/combobox-group.svelte |  2 +-
 .../bits-ui/src/lib/bits/combobox/types.ts    |  7 +--
 .../src/lib/bits/context-menu/types.ts        |  3 +-
 .../bits-ui/src/lib/bits/date-field/types.ts  |  9 +---
 .../components/date-picker-calendar.svelte    |  2 +-
 .../bits-ui/src/lib/bits/date-picker/types.ts |  9 +---
 .../src/lib/bits/date-range-field/types.ts    |  9 +---
 .../date-range-picker-calendar.svelte         |  2 +-
 .../components/date-range-picker.svelte       |  2 +-
 .../src/lib/bits/date-range-picker/types.ts   |  8 +--
 .../dialog/components/dialog-close.svelte     |  2 +-
 .../dialog/components/dialog-content.svelte   |  2 +-
 .../components/dialog-description.svelte      |  2 +-
 .../dialog/components/dialog-overlay.svelte   |  2 +-
 .../dialog/components/dialog-title.svelte     |  2 +-
 .../dialog/components/dialog-trigger.svelte   |  2 +-
 packages/bits-ui/src/lib/bits/dialog/types.ts | 10 +---
 packages/bits-ui/src/lib/bits/label/types.ts  |  3 +-
 .../components/link-preview-content.svelte    |  2 +-
 .../components/link-preview-trigger.svelte    |  2 +-
 .../src/lib/bits/link-preview/types.ts        | 11 +---
 .../listbox/components/listbox-content.svelte |  2 +-
 .../components/listbox-group-label.svelte     |  2 +-
 .../listbox/components/listbox-group.svelte   |  2 +-
 .../listbox/components/listbox-item.svelte    |  2 +-
 .../listbox/components/listbox-label.svelte   |  2 +-
 .../bits-ui/src/lib/bits/listbox/types.ts     |  9 +---
 .../menu/components/menu-checkbox-item.svelte |  2 +-
 .../lib/bits/menu/components/menu-item.svelte |  2 +-
 packages/bits-ui/src/lib/bits/menu/types.ts   | 10 +---
 .../bits-ui/src/lib/bits/menubar/types.ts     | 10 +---
 .../components/navigation-menu-sub.svelte     |  2 +-
 .../navigation-menu-viewport.svelte           |  2 +-
 .../src/lib/bits/navigation-menu/types.ts     |  6 +--
 .../components/pagination-next-button.svelte  |  2 +-
 .../components/pagination-page.svelte         |  2 +-
 .../components/pagination-prev-button.svelte  |  2 +-
 .../pagination/components/pagination.svelte   | 13 ++---
 .../lib/bits/pagination/pagination.svelte.ts  |  6 ++-
 .../bits-ui/src/lib/bits/pagination/types.ts  |  8 +--
 .../bits-ui/src/lib/bits/pin-input/types.ts   |  3 +-
 .../popover/components/popover-close.svelte   |  2 +-
 .../popover/components/popover-content.svelte |  2 +-
 .../popover/components/popover-trigger.svelte |  2 +-
 .../bits-ui/src/lib/bits/popover/types.ts     | 10 +---
 .../bits/progress/components/progress.svelte  |  2 +-
 .../bits-ui/src/lib/bits/progress/types.ts    |  3 +-
 .../components/radio-group-item.svelte        | 11 ++--
 .../radio-group/components/radio-group.svelte |  2 +-
 .../bits-ui/src/lib/bits/radio-group/types.ts | 10 +---
 .../components/range-calendar-cell.svelte     |  2 +-
 .../components/range-calendar-day.svelte      |  2 +-
 .../components/range-calendar.svelte          |  2 +-
 .../src/lib/bits/range-calendar/types.ts      |  8 +--
 .../scroll-area-scrollbar-shared.svelte       |  2 +-
 .../bits-ui/src/lib/bits/scroll-area/types.ts |  2 +-
 .../components/select-content-floating.svelte |  2 +-
 .../select-content-item-aligned.svelte        |  5 +-
 .../components/select-group-label.svelte      |  2 +-
 .../select/components/select-group.svelte     |  2 +-
 .../bits/select/components/select-icon.svelte |  2 +-
 .../select/components/select-item-text.svelte |  2 +-
 .../bits/select/components/select-item.svelte |  2 +-
 .../select-scroll-down-button-mounted.svelte  |  2 +-
 .../select-scroll-up-button-mounted.svelte    |  2 +-
 .../select/components/select-separator.svelte |  2 +-
 .../select/components/select-trigger.svelte   |  2 +-
 .../select/components/select-value.svelte     |  2 +-
 .../select/components/select-viewport.svelte  |  2 +-
 packages/bits-ui/src/lib/bits/select/types.ts |  7 +--
 .../bits-ui/src/lib/bits/separator/types.ts   |  3 +-
 packages/bits-ui/src/lib/bits/slider/types.ts |  8 +--
 .../lib/bits/switch/components/switch.svelte  |  2 +-
 packages/bits-ui/src/lib/bits/switch/types.ts | 10 +---
 .../lib/bits/tabs/components/tabs-list.svelte |  2 +-
 .../bits/tabs/components/tabs-trigger.svelte  |  2 +-
 .../src/lib/bits/tabs/components/tabs.svelte  |  2 +-
 packages/bits-ui/src/lib/bits/tabs/types.ts   |  9 +---
 .../components/toggle-group-item.svelte       |  2 +-
 .../components/toggle-group.svelte            |  2 +-
 .../src/lib/bits/toggle-group/types.ts        |  9 +---
 .../lib/bits/toggle/components/toggle.svelte  |  2 +-
 packages/bits-ui/src/lib/bits/toggle/types.ts |  8 +--
 .../toolbar/components/toolbar-button.svelte  |  2 +-
 .../components/toolbar-group-item.svelte      |  2 +-
 .../toolbar/components/toolbar-group.svelte   |  2 +-
 .../toolbar/components/toolbar-link.svelte    |  2 +-
 .../bits/toolbar/components/toolbar.svelte    |  2 +-
 .../bits-ui/src/lib/bits/toolbar/types.ts     |  5 +-
 .../tooltip/components/tooltip-content.svelte |  2 +-
 .../tooltip/components/tooltip-trigger.svelte |  2 +-
 .../bits-ui/src/lib/bits/tooltip/types.ts     | 10 +---
 .../src/lib/bits/utilities/arrow/types.ts     |  3 +-
 .../bits/utilities/floating-layer/types.ts    |  4 +-
 .../floating-layer/useFloatingLayer.svelte.ts | 17 ++++---
 .../bits/utilities/visually-hidden/types.ts   |  3 +-
 packages/bits-ui/src/lib/internal/is.ts       |  4 ++
 packages/bits-ui/src/lib/internal/types.ts    | 50 ++-----------------
 .../lib/internal/useBodyScrollLock.svelte.ts  |  4 +-
 .../src/lib/internal/useTimeoutFn.svelte.ts   |  4 +-
 packages/bits-ui/src/lib/shared/attributes.ts | 50 +++++++++++++++++++
 packages/bits-ui/src/lib/shared/index.ts      |  1 +
 .../tests/accordion/AccordionMultiTest.svelte |  3 +-
 .../AccordionMultiTestControlled.svelte       |  3 +-
 packages/bits-ui/src/tests/utils.ts           | 10 ++--
 115 files changed, 236 insertions(+), 342 deletions(-)
 create mode 100644 packages/bits-ui/src/lib/shared/attributes.ts

diff --git a/packages/bits-ui/src/lib/bits/accordion/types.ts b/packages/bits-ui/src/lib/bits/accordion/types.ts
index 3d213dc8b..776d426c7 100644
--- a/packages/bits-ui/src/lib/bits/accordion/types.ts
+++ b/packages/bits-ui/src/lib/bits/accordion/types.ts
@@ -1,11 +1,5 @@
-import type {
-	EventCallback,
-	OnChangeFn,
-	PrimitiveButtonAttributes,
-	PrimitiveDivAttributes,
-	WithChild,
-	Without,
-} from "$lib/internal/index.js";
+import type { EventCallback, OnChangeFn, WithChild, Without } from "$lib/internal/index.js";
+import type { PrimitiveButtonAttributes, PrimitiveDivAttributes } from "$lib/shared/attributes.js";
 import type { Orientation } from "$lib/shared/index.js";
 
 export type BaseAccordionRootPropsWithoutHTML = {
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 2b9a95330..2e2cd9536 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
@@ -66,7 +66,7 @@
 					<DismissableLayer {...mergedProps} enabled={present.current}>
 						<TextSelectionLayer {...mergedProps} enabled={present.current}>
 							{#if child}
-								{@render child?.({
+								{@render child({
 									props: mergeProps(mergedProps, focusScopeProps, {
 										hidden: !present.current,
 									}),
diff --git a/packages/bits-ui/src/lib/bits/aspect-ratio/types.ts b/packages/bits-ui/src/lib/bits/aspect-ratio/types.ts
index b4d09c34d..8e57301e8 100644
--- a/packages/bits-ui/src/lib/bits/aspect-ratio/types.ts
+++ b/packages/bits-ui/src/lib/bits/aspect-ratio/types.ts
@@ -1,4 +1,5 @@
-import type { PrimitiveDivAttributes, WithChild, Without } from "$lib/internal/index.js";
+import type { WithChild, Without } from "$lib/internal/index.js";
+import type { PrimitiveDivAttributes } from "$lib/shared/attributes.js";
 
 export type AspectRatioPropsWithoutHTML = WithChild<{
 	ratio?: number;
diff --git a/packages/bits-ui/src/lib/bits/avatar/types.ts b/packages/bits-ui/src/lib/bits/avatar/types.ts
index 7bf64acbc..a88d94372 100644
--- a/packages/bits-ui/src/lib/bits/avatar/types.ts
+++ b/packages/bits-ui/src/lib/bits/avatar/types.ts
@@ -1,11 +1,9 @@
+import type { OnChangeFn, WithChild, Without } from "$lib/internal/index.js";
 import type {
-	OnChangeFn,
 	PrimitiveDivAttributes,
 	PrimitiveImgAttributes,
 	PrimitiveSpanAttributes,
-	WithChild,
-	Without,
-} from "$lib/internal/index.js";
+} from "$lib/shared/attributes.js";
 
 export type AvatarImageLoadingStatus = "loading" | "loaded" | "error";
 
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 9d1c8b0e3..b11e12584 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
@@ -29,7 +29,7 @@
 </script>
 
 {#if child}
-	{@render child?.({
+	{@render child({
 		props: mergedProps,
 		...cellState.snippetProps,
 	})}
diff --git a/packages/bits-ui/src/lib/bits/calendar/types.ts b/packages/bits-ui/src/lib/bits/calendar/types.ts
index 1519e8d8f..3a20077c7 100644
--- a/packages/bits-ui/src/lib/bits/calendar/types.ts
+++ b/packages/bits-ui/src/lib/bits/calendar/types.ts
@@ -1,6 +1,7 @@
 import type { DateValue } from "@internationalized/date";
+import type { OnChangeFn, WithChild, Without } from "$lib/internal/types.js";
+import type { DateMatcher, Month, WeekStartsOn } from "$lib/shared/date/types.js";
 import type {
-	OnChangeFn,
 	PrimitiveButtonAttributes,
 	PrimitiveDivAttributes,
 	PrimitiveHeaderAttributes,
@@ -10,10 +11,7 @@ import type {
 	PrimitiveThAttributes,
 	PrimitiveTheadAttrbutes,
 	PrimitiveTrAttributes,
-	WithChild,
-	Without,
-} from "$lib/internal/types.js";
-import type { DateMatcher, Month, WeekStartsOn } from "$lib/shared/date/types.js";
+} from "$lib/shared/attributes.js";
 
 export type CalendarRootSnippetProps = {
 	months: Month<DateValue>[];
diff --git a/packages/bits-ui/src/lib/bits/checkbox/types.ts b/packages/bits-ui/src/lib/bits/checkbox/types.ts
index 335a334bb..7a303d535 100644
--- a/packages/bits-ui/src/lib/bits/checkbox/types.ts
+++ b/packages/bits-ui/src/lib/bits/checkbox/types.ts
@@ -1,9 +1,5 @@
-import type {
-	OnChangeFn,
-	PrimitiveButtonAttributes,
-	WithChild,
-	Without,
-} from "$lib/internal/index.js";
+import type { OnChangeFn, WithChild, Without } from "$lib/internal/index.js";
+import type { PrimitiveButtonAttributes } from "$lib/shared/attributes.js";
 
 export type CheckboxRootSnippetProps = { checked: boolean | "indeterminate" };
 
diff --git a/packages/bits-ui/src/lib/bits/collapsible/types.ts b/packages/bits-ui/src/lib/bits/collapsible/types.ts
index 9f3c514b8..4d803e942 100644
--- a/packages/bits-ui/src/lib/bits/collapsible/types.ts
+++ b/packages/bits-ui/src/lib/bits/collapsible/types.ts
@@ -1,10 +1,5 @@
-import type {
-	OnChangeFn,
-	PrimitiveButtonAttributes,
-	PrimitiveDivAttributes,
-	WithChild,
-	Without,
-} from "$lib/internal/index.js";
+import type { OnChangeFn, WithChild, Without } from "$lib/internal/index.js";
+import type { PrimitiveButtonAttributes, PrimitiveDivAttributes } from "$lib/shared/attributes.js";
 
 export type CollapsibleRootPropsWithoutHTML = WithChild<{
 	/**
diff --git a/packages/bits-ui/src/lib/bits/combobox/components/combobox-content.svelte b/packages/bits-ui/src/lib/bits/combobox/components/combobox-content.svelte
index c70aec477..30f754001 100644
--- a/packages/bits-ui/src/lib/bits/combobox/components/combobox-content.svelte
+++ b/packages/bits-ui/src/lib/bits/combobox/components/combobox-content.svelte
@@ -71,7 +71,7 @@
 			},
 		})}
 		{#if child}
-			{@render child?.({ props: finalProps })}
+			{@render child({ props: finalProps })}
 		{:else}
 			<div {...finalProps}>
 				{@render children?.()}
diff --git a/packages/bits-ui/src/lib/bits/combobox/components/combobox-group-label.svelte b/packages/bits-ui/src/lib/bits/combobox/components/combobox-group-label.svelte
index 252854267..c3a810f2c 100644
--- a/packages/bits-ui/src/lib/bits/combobox/components/combobox-group-label.svelte
+++ b/packages/bits-ui/src/lib/bits/combobox/components/combobox-group-label.svelte
@@ -25,7 +25,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps })}
+	{@render child({ props: mergedProps })}
 {:else}
 	<div {...mergedProps}>
 		{@render children?.()}
diff --git a/packages/bits-ui/src/lib/bits/combobox/components/combobox-group.svelte b/packages/bits-ui/src/lib/bits/combobox/components/combobox-group.svelte
index c900e3ab0..e76efc9bd 100644
--- a/packages/bits-ui/src/lib/bits/combobox/components/combobox-group.svelte
+++ b/packages/bits-ui/src/lib/bits/combobox/components/combobox-group.svelte
@@ -25,7 +25,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps })}
+	{@render child({ props: mergedProps })}
 {:else}
 	<div {...mergedProps}>
 		{@render children?.()}
diff --git a/packages/bits-ui/src/lib/bits/combobox/types.ts b/packages/bits-ui/src/lib/bits/combobox/types.ts
index f0d82dea6..c322cf380 100644
--- a/packages/bits-ui/src/lib/bits/combobox/types.ts
+++ b/packages/bits-ui/src/lib/bits/combobox/types.ts
@@ -1,12 +1,9 @@
+import type { OnChangeFn, WithChild, WithChildren, Without } from "$lib/internal/types.js";
 import type {
-	OnChangeFn,
 	PrimitiveButtonAttributes,
 	PrimitiveDivAttributes,
 	PrimitiveInputAttributes,
-	WithChild,
-	WithChildren,
-	Without,
-} from "$lib/internal/types.js";
+} from "$lib/shared/attributes.js";
 import type { PortalProps } from "../utilities/portal/types.js";
 import type { PopperLayerProps } from "../utilities/popper-layer/types.js";
 import type { ArrowProps, ArrowPropsWithoutHTML } from "../utilities/arrow/types.js";
diff --git a/packages/bits-ui/src/lib/bits/context-menu/types.ts b/packages/bits-ui/src/lib/bits/context-menu/types.ts
index ba3834d82..3c2a8a20b 100644
--- a/packages/bits-ui/src/lib/bits/context-menu/types.ts
+++ b/packages/bits-ui/src/lib/bits/context-menu/types.ts
@@ -1,5 +1,6 @@
 import type { MenuContentProps, MenuContentPropsWithoutHTML } from "../menu/types.js";
-import type { PrimitiveDivAttributes, WithChild, Without } from "$lib/internal/types.js";
+import type { WithChild, Without } from "$lib/internal/types.js";
+import type { PrimitiveDivAttributes } from "$lib/shared/attributes.js";
 
 export type ContextMenuContentPropsWithoutHTML = MenuContentPropsWithoutHTML;
 
diff --git a/packages/bits-ui/src/lib/bits/date-field/types.ts b/packages/bits-ui/src/lib/bits/date-field/types.ts
index da70f22c5..6e164319e 100644
--- a/packages/bits-ui/src/lib/bits/date-field/types.ts
+++ b/packages/bits-ui/src/lib/bits/date-field/types.ts
@@ -1,13 +1,8 @@
 import type { DateValue } from "@internationalized/date";
 import type { SegmentPart } from "$lib/shared/index.js";
 import type { Snippet } from "svelte";
-import type {
-	OnChangeFn,
-	PrimitiveDivAttributes,
-	PrimitiveSpanAttributes,
-	WithChild,
-	Without,
-} from "$lib/internal/types.js";
+import type { OnChangeFn, WithChild, Without } from "$lib/internal/types.js";
+import type { PrimitiveDivAttributes, PrimitiveSpanAttributes } from "$lib/shared/attributes.js";
 import type { EditableSegmentPart } from "$lib/shared/date/field/types.js";
 import type { DateMatcher, Granularity } from "$lib/shared/date/types.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 98284cfb4..354293c43 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
@@ -47,7 +47,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps, ...calendarState.snippetProps })}
+	{@render child({ props: mergedProps, ...calendarState.snippetProps })}
 {:else}
 	<div {...mergedProps}>
 		{@render children?.(calendarState.snippetProps)}
diff --git a/packages/bits-ui/src/lib/bits/date-picker/types.ts b/packages/bits-ui/src/lib/bits/date-picker/types.ts
index 34c9b77e3..cbd18129f 100644
--- a/packages/bits-ui/src/lib/bits/date-picker/types.ts
+++ b/packages/bits-ui/src/lib/bits/date-picker/types.ts
@@ -1,11 +1,6 @@
 import type { DateValue } from "@internationalized/date";
-import type {
-	OnChangeFn,
-	PrimitiveDivAttributes,
-	WithChild,
-	WithChildren,
-	Without,
-} from "$lib/internal/types.js";
+import type { OnChangeFn, WithChild, WithChildren, Without } from "$lib/internal/types.js";
+import type { PrimitiveDivAttributes } from "$lib/shared/attributes.js";
 import type { EditableSegmentPart } from "$lib/shared/date/field/types.js";
 import type { DateMatcher, Granularity, WeekStartsOn } from "$lib/shared/date/types.js";
 import type { CalendarRootSnippetProps } from "$lib/types.js";
diff --git a/packages/bits-ui/src/lib/bits/date-range-field/types.ts b/packages/bits-ui/src/lib/bits/date-range-field/types.ts
index b5e895e21..4eb82035f 100644
--- a/packages/bits-ui/src/lib/bits/date-range-field/types.ts
+++ b/packages/bits-ui/src/lib/bits/date-range-field/types.ts
@@ -1,11 +1,6 @@
 import type { DateValue } from "@internationalized/date";
-import type {
-	OnChangeFn,
-	PrimitiveDivAttributes,
-	PrimitiveSpanAttributes,
-	WithChild,
-	Without,
-} from "$lib/internal/types.js";
+import type { OnChangeFn, WithChild, Without } from "$lib/internal/types.js";
+import type { PrimitiveDivAttributes, PrimitiveSpanAttributes } from "$lib/shared/attributes.js";
 import type { DateMatcher, Granularity } from "$lib/shared/date/types.js";
 import type { DateRange, EditableSegmentPart, SegmentPart } from "$lib/shared/index.js";
 import type { DateFieldSegmentProps, DateFieldSegmentPropsWithoutHTML } from "$lib/types.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 7d5e846b1..d20639300 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
@@ -48,7 +48,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps, ...rangeCalendarState.snippetProps })}
+	{@render child({ props: mergedProps, ...rangeCalendarState.snippetProps })}
 {:else}
 	<div {...mergedProps}>
 		{@render children?.(rangeCalendarState.snippetProps)}
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 19ecc64c5..34e63e271 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
@@ -167,7 +167,7 @@
 
 <FloatingLayer.Root>
 	{#if child}
-		{@render child?.({ props: mergedProps })}
+		{@render child({ props: mergedProps })}
 	{:else}
 		<div {...mergedProps}>
 			{@render children?.()}
diff --git a/packages/bits-ui/src/lib/bits/date-range-picker/types.ts b/packages/bits-ui/src/lib/bits/date-range-picker/types.ts
index dcef60a4f..9bdda241d 100644
--- a/packages/bits-ui/src/lib/bits/date-range-picker/types.ts
+++ b/packages/bits-ui/src/lib/bits/date-range-picker/types.ts
@@ -1,10 +1,6 @@
 import type { DateValue } from "@internationalized/date";
-import type {
-	OnChangeFn,
-	PrimitiveDivAttributes,
-	WithChild,
-	Without,
-} from "$lib/internal/types.js";
+import type { OnChangeFn, WithChild, Without } from "$lib/internal/types.js";
+import type { PrimitiveDivAttributes } from "$lib/shared/attributes.js";
 import type { EditableSegmentPart } from "$lib/shared/date/field/types.js";
 import type { DateMatcher, Granularity, WeekStartsOn } from "$lib/shared/date/types.js";
 import type { DateRange } from "$lib/shared/index.js";
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 a9c30b8f9..be9c6c538 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
@@ -25,7 +25,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps })}
+	{@render child({ props: mergedProps })}
 {:else}
 	<button {...mergedProps}>
 		{@render children?.()}
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 20e172ff8..64f1da3b6 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
@@ -68,7 +68,7 @@
 					>
 						<TextSelectionLayer {...mergedProps} enabled={present.current}>
 							{#if child}
-								{@render child?.({
+								{@render child({
 									props: mergeProps(mergedProps, focusScopeProps, {
 										hidden: !present.current,
 									}),
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 28c80a973..939cbb319 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
@@ -25,7 +25,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps })}
+	{@render child({ props: mergedProps })}
 {:else}
 	<div {...mergedProps}>
 		{@render children?.()}
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 83e0f8bf6..b660615bc 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
@@ -29,7 +29,7 @@
 <PresenceLayer {id} present={overlayState.root.open.current || forceMount}>
 	{#snippet presence({ present })}
 		{#if child}
-			{@render child?.({ props: mergeProps(mergedProps, { hidden: !present.current }) })}
+			{@render child({ props: mergeProps(mergedProps, { hidden: !present.current }) })}
 		{:else}
 			<div {...mergeProps(mergedProps, { hidden: !present.current })}>
 				{@render children?.()}
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 7ab1714c6..6f4b4534b 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
@@ -27,7 +27,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps })}
+	{@render child({ props: mergedProps })}
 {:else}
 	<div {...mergedProps}>
 		{@render children?.()}
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 a8bd36606..77a24467d 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
@@ -25,7 +25,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps })}
+	{@render child({ props: mergedProps })}
 {:else}
 	<button {...mergedProps}>
 		{@render children?.()}
diff --git a/packages/bits-ui/src/lib/bits/dialog/types.ts b/packages/bits-ui/src/lib/bits/dialog/types.ts
index 01472f64f..781581ca0 100644
--- a/packages/bits-ui/src/lib/bits/dialog/types.ts
+++ b/packages/bits-ui/src/lib/bits/dialog/types.ts
@@ -3,14 +3,8 @@ import type { DismissableLayerProps } from "../utilities/dismissable-layer/types
 import type { PresenceLayerProps } from "../utilities/presence-layer/types.js";
 import type { FocusScopeProps } from "../utilities/focus-scope/types.js";
 import type { TextSelectionLayerProps } from "../utilities/text-selection-layer/types.js";
-import type {
-	OnChangeFn,
-	PrimitiveButtonAttributes,
-	PrimitiveDivAttributes,
-	WithChild,
-	WithChildren,
-	Without,
-} from "$lib/internal/types.js";
+import type { OnChangeFn, WithChild, WithChildren, Without } from "$lib/internal/types.js";
+import type { PrimitiveDivAttributes, PrimitiveButtonAttributes } from "$lib/shared/attributes.js";
 import type { PortalProps } from "$lib/bits/utilities/portal/index.js";
 
 export type DialogRootPropsWithoutHTML = WithChildren<{
diff --git a/packages/bits-ui/src/lib/bits/label/types.ts b/packages/bits-ui/src/lib/bits/label/types.ts
index 1e5fbbe02..314e164ab 100644
--- a/packages/bits-ui/src/lib/bits/label/types.ts
+++ b/packages/bits-ui/src/lib/bits/label/types.ts
@@ -1,4 +1,5 @@
-import type { PrimitiveLabelAttributes, WithChild, Without } from "$lib/internal/types.js";
+import type { WithChild, Without } from "$lib/internal/types.js";
+import type { PrimitiveLabelAttributes } from "$lib/shared/attributes.js";
 
 export type LabelRootPropsWithoutHTML = WithChild<{
 	for?: string;
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 ba782323a..2a8e10150 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
@@ -81,7 +81,7 @@
 			},
 		})}
 		{#if child}
-			{@render child?.({ props: mergedProps })}
+			{@render child({ props: mergedProps })}
 		{:else}
 			<div {...mergedProps} bind:this={ref}>
 				{@render children?.()}
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 3d7b7a9b9..1601d76e2 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
@@ -27,7 +27,7 @@
 
 <FloatingLayer.Anchor {id}>
 	{#if child}
-		{@render child?.({ props: mergedProps })}
+		{@render child({ props: mergedProps })}
 	{:else}
 		<a {...mergedProps}>
 			{@render children?.()}
diff --git a/packages/bits-ui/src/lib/bits/link-preview/types.ts b/packages/bits-ui/src/lib/bits/link-preview/types.ts
index 7de66cb97..337cb3bbc 100644
--- a/packages/bits-ui/src/lib/bits/link-preview/types.ts
+++ b/packages/bits-ui/src/lib/bits/link-preview/types.ts
@@ -1,12 +1,5 @@
-import type {
-	OnChangeFn,
-	PrimitiveAnchorAttributes,
-	PrimitiveDivAttributes,
-	PrimitiveElementAttributes,
-	WithChild,
-	WithChildren,
-	Without,
-} from "$lib/internal/types.js";
+import type { OnChangeFn, WithChild, WithChildren, Without } from "$lib/internal/types.js";
+import type { PrimitiveAnchorAttributes, PrimitiveDivAttributes } from "$lib/shared/attributes.js";
 import type { ArrowProps, ArrowPropsWithoutHTML } from "../utilities/arrow/types.js";
 import type { DismissableLayerProps } from "../utilities/dismissable-layer/types.js";
 import type { EscapeLayerProps } from "../utilities/escape-layer/types.js";
diff --git a/packages/bits-ui/src/lib/bits/listbox/components/listbox-content.svelte b/packages/bits-ui/src/lib/bits/listbox/components/listbox-content.svelte
index 46cb07af8..4efa5ec23 100644
--- a/packages/bits-ui/src/lib/bits/listbox/components/listbox-content.svelte
+++ b/packages/bits-ui/src/lib/bits/listbox/components/listbox-content.svelte
@@ -25,7 +25,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps })}
+	{@render child({ props: mergedProps })}
 {:else}
 	<div {...mergedProps}>
 		{@render children?.()}
diff --git a/packages/bits-ui/src/lib/bits/listbox/components/listbox-group-label.svelte b/packages/bits-ui/src/lib/bits/listbox/components/listbox-group-label.svelte
index 561fa0be0..79f69fefc 100644
--- a/packages/bits-ui/src/lib/bits/listbox/components/listbox-group-label.svelte
+++ b/packages/bits-ui/src/lib/bits/listbox/components/listbox-group-label.svelte
@@ -25,7 +25,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps })}
+	{@render child({ props: mergedProps })}
 {:else}
 	<div {...mergedProps}>
 		{@render children?.()}
diff --git a/packages/bits-ui/src/lib/bits/listbox/components/listbox-group.svelte b/packages/bits-ui/src/lib/bits/listbox/components/listbox-group.svelte
index 16ed70266..4ab78b05c 100644
--- a/packages/bits-ui/src/lib/bits/listbox/components/listbox-group.svelte
+++ b/packages/bits-ui/src/lib/bits/listbox/components/listbox-group.svelte
@@ -25,7 +25,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps })}
+	{@render child({ props: mergedProps })}
 {:else}
 	<div {...mergedProps}>
 		{@render children?.()}
diff --git a/packages/bits-ui/src/lib/bits/listbox/components/listbox-item.svelte b/packages/bits-ui/src/lib/bits/listbox/components/listbox-item.svelte
index 8f272c4ab..733e8e531 100644
--- a/packages/bits-ui/src/lib/bits/listbox/components/listbox-item.svelte
+++ b/packages/bits-ui/src/lib/bits/listbox/components/listbox-item.svelte
@@ -36,7 +36,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps, selected: itemState.isSelected })}
+	{@render child({ props: mergedProps, selected: itemState.isSelected })}
 {:else}
 	<div {...mergedProps}>
 		{#if children}
diff --git a/packages/bits-ui/src/lib/bits/listbox/components/listbox-label.svelte b/packages/bits-ui/src/lib/bits/listbox/components/listbox-label.svelte
index 253631e2e..e4948453e 100644
--- a/packages/bits-ui/src/lib/bits/listbox/components/listbox-label.svelte
+++ b/packages/bits-ui/src/lib/bits/listbox/components/listbox-label.svelte
@@ -25,7 +25,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps })}
+	{@render child({ props: mergedProps })}
 {:else}
 	<div {...mergedProps}>
 		{@render children?.()}
diff --git a/packages/bits-ui/src/lib/bits/listbox/types.ts b/packages/bits-ui/src/lib/bits/listbox/types.ts
index 6f25f61fe..8a1aefb3e 100644
--- a/packages/bits-ui/src/lib/bits/listbox/types.ts
+++ b/packages/bits-ui/src/lib/bits/listbox/types.ts
@@ -1,10 +1,5 @@
-import type {
-	OnChangeFn,
-	PrimitiveDivAttributes,
-	WithChild,
-	WithChildren,
-	Without,
-} from "$lib/internal/types.js";
+import type { OnChangeFn, WithChild, WithChildren, Without } from "$lib/internal/types.js";
+import type { PrimitiveDivAttributes } from "$lib/shared/attributes.js";
 import type { Orientation } from "$lib/shared/index.js";
 
 export type ListboxRootBasePropsWithoutHTML = WithChildren<{
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 6154abd19..d502f5e12 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
@@ -47,7 +47,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps, checked })}
+	{@render child({ props: mergedProps, checked })}
 {:else}
 	<div {...mergedProps}>
 		{@render children?.({ checked })}
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 9342b0e1d..a88f3a2cd 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
@@ -30,7 +30,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps })}
+	{@render child({ props: mergedProps })}
 {:else}
 	<div {...mergedProps}>
 		{@render children?.()}
diff --git a/packages/bits-ui/src/lib/bits/menu/types.ts b/packages/bits-ui/src/lib/bits/menu/types.ts
index 3b2992b89..f2cd06072 100644
--- a/packages/bits-ui/src/lib/bits/menu/types.ts
+++ b/packages/bits-ui/src/lib/bits/menu/types.ts
@@ -1,13 +1,7 @@
 import type { PopperLayerProps } from "../utilities/popper-layer/types.js";
 import type { ArrowProps, ArrowPropsWithoutHTML } from "../utilities/arrow/types.js";
-import type {
-	OnChangeFn,
-	PrimitiveButtonAttributes,
-	PrimitiveDivAttributes,
-	WithChild,
-	WithChildren,
-	Without,
-} from "$lib/internal/types.js";
+import type { OnChangeFn, WithChild, WithChildren, Without } from "$lib/internal/types.js";
+import type { PrimitiveButtonAttributes, PrimitiveDivAttributes } from "$lib/shared/attributes.js";
 import type { Direction } from "$lib/shared/index.js";
 import type { PortalProps } from "$lib/bits/utilities/portal/types.js";
 
diff --git a/packages/bits-ui/src/lib/bits/menubar/types.ts b/packages/bits-ui/src/lib/bits/menubar/types.ts
index 623fae492..502ef80c8 100644
--- a/packages/bits-ui/src/lib/bits/menubar/types.ts
+++ b/packages/bits-ui/src/lib/bits/menubar/types.ts
@@ -1,12 +1,6 @@
 import type { MenuContentProps, MenuContentPropsWithoutHTML } from "../menu/types.js";
-import type {
-	OnChangeFn,
-	PrimitiveButtonAttributes,
-	PrimitiveDivAttributes,
-	WithChild,
-	WithChildren,
-	Without,
-} from "$lib/internal/types.js";
+import type { OnChangeFn, WithChild, WithChildren, Without } from "$lib/internal/types.js";
+import type { PrimitiveButtonAttributes, PrimitiveDivAttributes } from "$lib/shared/attributes.js";
 import type { Direction } from "$lib/shared/index.js";
 
 export type MenubarRootPropsWithoutHTML = WithChild<{
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 283374245..d4822da45 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
@@ -40,7 +40,7 @@
 </script>
 
 {#if asChild}
-	{@render child?.({ props: mergedProps })}
+	{@render child({ props: mergedProps })}
 {:else}
 	<div {...mergedProps}>
 		{@render children?.()}
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 91a9ea058..14468090a 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
@@ -29,7 +29,7 @@
 <PresenceLayer {id} present={forceMount || viewportState.open}>
 	{#snippet presence()}
 		{#if child}
-			{@render child?.({ props: mergedProps })}
+			{@render child({ props: mergedProps })}
 		{:else}
 			<div {...mergedProps}>
 				{@render children?.()}
diff --git a/packages/bits-ui/src/lib/bits/navigation-menu/types.ts b/packages/bits-ui/src/lib/bits/navigation-menu/types.ts
index ef3f6b9d4..390fed69b 100644
--- a/packages/bits-ui/src/lib/bits/navigation-menu/types.ts
+++ b/packages/bits-ui/src/lib/bits/navigation-menu/types.ts
@@ -1,15 +1,13 @@
 import type { InteractOutsideEvent } from "@melt-ui/svelte";
+import type { OnChangeFn, WithChild, Without } from "$lib/internal/types.js";
 import type {
-	OnChangeFn,
 	PrimitiveAnchorAttributes,
 	PrimitiveButtonAttributes,
 	PrimitiveDivAttributes,
 	PrimitiveElementAttributes,
 	PrimitiveLiAttributes,
 	PrimitiveUListAttributes,
-	WithChild,
-	Without,
-} from "$lib/internal/types.js";
+} from "$lib/shared/attributes.js";
 import type { Direction, Orientation } from "$lib/shared/index.js";
 
 export type NavigationMenuRootPropsWithoutHTML = WithChild<{
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 50d9c4177..a4afbe6a8 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
@@ -26,7 +26,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps })}
+	{@render child({ props: mergedProps })}
 {:else}
 	<button {...mergedProps}>
 		{@render children?.()}
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 23241e852..a16faeb13 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
@@ -27,7 +27,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps })}
+	{@render child({ props: mergedProps })}
 {:else}
 	<button {...mergedProps}>
 		{#if children}
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 0fed57e22..b60e3a06c 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
@@ -26,7 +26,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps })}
+	{@render child({ props: mergedProps })}
 {:else}
 	<button {...mergedProps}>
 		{@render children?.()}
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 cdbb47ae5..b8d944bec 100644
--- a/packages/bits-ui/src/lib/bits/pagination/components/pagination.svelte
+++ b/packages/bits-ui/src/lib/bits/pagination/components/pagination.svelte
@@ -2,7 +2,7 @@
 	import { box } from "svelte-toolbelt";
 	import type { RootProps } from "../index.js";
 	import { usePaginationRoot } from "../pagination.svelte.js";
-	import { styleToString, useId } from "$lib/internal/index.js";
+	import { mergeProps, useId } from "$lib/internal/index.js";
 
 	let {
 		id = useId(),
@@ -16,7 +16,6 @@
 		orientation = "horizontal",
 		child,
 		children,
-		style = {},
 		...restProps
 	}: RootProps = $props();
 
@@ -40,17 +39,13 @@
 		),
 	});
 
-	const mergedProps = $derived({
-		...restProps,
-		...rootState.props,
-		style: styleToString(style),
-	});
+	const mergedProps = $derived(mergeProps(restProps, rootState.props));
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps, pages: rootState.pages, range: rootState.range })}
+	{@render child({ props: mergedProps, ...rootState.snippetProps })}
 {:else}
 	<div {...mergedProps}>
-		{@render children?.({ pages: rootState.pages, range: rootState.range })}
+		{@render children?.(rootState.snippetProps)}
 	</div>
 {/if}
diff --git a/packages/bits-ui/src/lib/bits/pagination/pagination.svelte.ts b/packages/bits-ui/src/lib/bits/pagination/pagination.svelte.ts
index f98ef5d42..b7abc8d4b 100644
--- a/packages/bits-ui/src/lib/bits/pagination/pagination.svelte.ts
+++ b/packages/bits-ui/src/lib/bits/pagination/pagination.svelte.ts
@@ -1,4 +1,3 @@
-import { box } from "svelte-toolbelt";
 import type { Page, PageItem } from "./types.js";
 import {
 	type ReadableBoxedValues,
@@ -102,6 +101,11 @@ class PaginationRootState {
 		return new PaginationButtonState(props, this);
 	}
 
+	snippetProps = $derived.by(() => ({
+		pages: this.pages,
+		range: this.range,
+	}));
+
 	props = $derived.by(
 		() =>
 			({
diff --git a/packages/bits-ui/src/lib/bits/pagination/types.ts b/packages/bits-ui/src/lib/bits/pagination/types.ts
index 7713b3e4c..0d2d602b2 100644
--- a/packages/bits-ui/src/lib/bits/pagination/types.ts
+++ b/packages/bits-ui/src/lib/bits/pagination/types.ts
@@ -1,9 +1,5 @@
-import type {
-	PrimitiveButtonAttributes,
-	PrimitiveDivAttributes,
-	WithChild,
-	Without,
-} from "$lib/internal/types.js";
+import type { WithChild, Without } from "$lib/internal/types.js";
+import type { PrimitiveButtonAttributes, PrimitiveDivAttributes } from "$lib/shared/attributes.js";
 import type { OnChangeFn } from "$lib/internal/index.js";
 
 type PaginationSnippetProps = {
diff --git a/packages/bits-ui/src/lib/bits/pin-input/types.ts b/packages/bits-ui/src/lib/bits/pin-input/types.ts
index a63803ff5..d9f1c57f6 100644
--- a/packages/bits-ui/src/lib/bits/pin-input/types.ts
+++ b/packages/bits-ui/src/lib/bits/pin-input/types.ts
@@ -1,5 +1,6 @@
 import type { Snippet } from "svelte";
-import type { OnChangeFn, PrimitiveInputAttributes, Without } from "$lib/internal/types.js";
+import type { OnChangeFn, Without } from "$lib/internal/types.js";
+import type { PrimitiveInputAttributes } from "$lib/shared/attributes.js";
 
 export type PinInputRootPropsWithoutHTML = {
 	/**
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 df8ea4966..63696a364 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
@@ -24,7 +24,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps })}
+	{@render child({ props: mergedProps })}
 {:else}
 	<button {...mergedProps}>
 		{@render children?.()}
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 5e0d97c26..d470d04f6 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
@@ -64,7 +64,7 @@
 			},
 		})}
 		{#if child}
-			{@render child?.({ props: finalProps })}
+			{@render child({ props: finalProps })}
 		{:else}
 			<div {...finalProps}>
 				{@render children?.()}
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 ac6008ad4..dd4179002 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
@@ -27,7 +27,7 @@
 
 <FloatingLayer.Anchor {id}>
 	{#if child}
-		{@render child?.({ props: mergedProps })}
+		{@render child({ props: mergedProps })}
 	{:else}
 		<button {...mergedProps}>
 			{@render children?.()}
diff --git a/packages/bits-ui/src/lib/bits/popover/types.ts b/packages/bits-ui/src/lib/bits/popover/types.ts
index bb13e3876..05779ab79 100644
--- a/packages/bits-ui/src/lib/bits/popover/types.ts
+++ b/packages/bits-ui/src/lib/bits/popover/types.ts
@@ -1,13 +1,7 @@
 import type { ArrowProps, ArrowPropsWithoutHTML } from "../utilities/arrow/types.js";
 import type { PopperLayerProps } from "../utilities/popper-layer/types.js";
-import type {
-	OnChangeFn,
-	PrimitiveButtonAttributes,
-	PrimitiveDivAttributes,
-	WithChild,
-	WithChildren,
-	Without,
-} from "$lib/internal/index.js";
+import type { OnChangeFn, WithChild, WithChildren, Without } from "$lib/internal/index.js";
+import type { PrimitiveButtonAttributes, PrimitiveDivAttributes } from "$lib/shared/attributes.js";
 
 export type PopoverRootPropsWithoutHTML = WithChildren<{
 	/**
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 f9857b97a..87f185b99 100644
--- a/packages/bits-ui/src/lib/bits/progress/components/progress.svelte
+++ b/packages/bits-ui/src/lib/bits/progress/components/progress.svelte
@@ -29,7 +29,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps })}
+	{@render child({ props: mergedProps })}
 {:else}
 	<div {...mergedProps}>
 		{@render children?.()}
diff --git a/packages/bits-ui/src/lib/bits/progress/types.ts b/packages/bits-ui/src/lib/bits/progress/types.ts
index d2905148b..7988a8646 100644
--- a/packages/bits-ui/src/lib/bits/progress/types.ts
+++ b/packages/bits-ui/src/lib/bits/progress/types.ts
@@ -1,4 +1,5 @@
-import type { PrimitiveDivAttributes, WithChild, Without } from "$lib/internal/index.js";
+import type { WithChild, Without } from "$lib/internal/index.js";
+import type { PrimitiveDivAttributes } from "$lib/shared/attributes.js";
 
 export type ProgressRootPropsWithoutHTML = WithChild<{
 	/**
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 9d44b1381..17d88b63b 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
@@ -2,7 +2,7 @@
 	import { box } from "svelte-toolbelt";
 	import type { ItemProps } from "../index.js";
 	import { useRadioGroupItem } from "../radio-group.svelte.js";
-	import { styleToString, useId } from "$lib/internal/index.js";
+	import { mergeProps, useId } from "$lib/internal/index.js";
 
 	let {
 		id = useId(),
@@ -11,7 +11,6 @@
 		value,
 		disabled = false,
 		ref = $bindable(null),
-		style = {},
 		...restProps
 	}: ItemProps = $props();
 
@@ -25,15 +24,11 @@
 		),
 	});
 
-	const mergedProps = $derived({
-		...restProps,
-		...itemState.props,
-		style: styleToString(style),
-	});
+	const mergedProps = $derived(mergeProps(restProps, itemState.props));
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps, checked: itemState.checked })}
+	{@render child({ props: mergedProps, checked: itemState.checked })}
 {:else}
 	<button {...mergedProps}>
 		{@render children?.({ checked: itemState.checked })}
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 78f9e9b50..95136b7d1 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
@@ -44,7 +44,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps })}
+	{@render child({ props: mergedProps })}
 {:else}
 	<div {...mergedProps}>
 		{@render children?.()}
diff --git a/packages/bits-ui/src/lib/bits/radio-group/types.ts b/packages/bits-ui/src/lib/bits/radio-group/types.ts
index 97e03d03e..4d3aa3f97 100644
--- a/packages/bits-ui/src/lib/bits/radio-group/types.ts
+++ b/packages/bits-ui/src/lib/bits/radio-group/types.ts
@@ -1,12 +1,6 @@
-import type {
-	EventCallback,
-	OnChangeFn,
-	PrimitiveButtonAttributes,
-	PrimitiveDivAttributes,
-	WithChild,
-	Without,
-} from "$lib/internal/index.js";
+import type { EventCallback, OnChangeFn, WithChild, Without } from "$lib/internal/index.js";
 import type { Orientation } from "$lib/index.js";
+import type { PrimitiveButtonAttributes, PrimitiveDivAttributes } from "$lib/shared/attributes.js";
 
 export type RadioGroupRootPropsWithoutHTML = WithChild<{
 	/**
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 61dde3f9d..dbffe2ed9 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
@@ -29,7 +29,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps, ...cellState.snippetProps })}
+	{@render child({ props: mergedProps, ...cellState.snippetProps })}
 {:else}
 	<td {...mergedProps}>
 		{@render children?.(cellState.snippetProps)}
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 0a85db2dd..96380b90d 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
@@ -19,7 +19,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps, ...dayState.snippetProps })}
+	{@render child({ props: mergedProps, ...dayState.snippetProps })}
 {:else}
 	<div {...mergedProps}>
 		{@render children?.(dayState.snippetProps)}
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 b4ca101e4..d8c142f49 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
@@ -121,7 +121,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps, ...rootState.snippetProps })}
+	{@render child({ props: mergedProps, ...rootState.snippetProps })}
 {:else}
 	<div {...mergedProps}>
 		{@render children?.(rootState.snippetProps)}
diff --git a/packages/bits-ui/src/lib/bits/range-calendar/types.ts b/packages/bits-ui/src/lib/bits/range-calendar/types.ts
index 9ee640fc7..f6977de7c 100644
--- a/packages/bits-ui/src/lib/bits/range-calendar/types.ts
+++ b/packages/bits-ui/src/lib/bits/range-calendar/types.ts
@@ -1,12 +1,8 @@
 import type { DateValue } from "@internationalized/date";
 import type { DateMatcher, Month } from "$lib/shared/date/types.js";
-import type {
-	OnChangeFn,
-	PrimitiveDivAttributes,
-	WithChild,
-	Without,
-} from "$lib/internal/types.js";
+import type { OnChangeFn, WithChild, Without } from "$lib/internal/types.js";
 import type { DateRange } from "$lib/shared/index.js";
+import type { PrimitiveDivAttributes } from "$lib/shared/attributes.js";
 
 export type RangeCalendarRootSnippetProps = {
 	months: Month<DateValue>[];
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 2daca8735..9989484da 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
@@ -11,7 +11,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps })}
+	{@render child({ props: mergedProps })}
 {:else}
 	<div {...mergedProps}>
 		{@render children?.()}
diff --git a/packages/bits-ui/src/lib/bits/scroll-area/types.ts b/packages/bits-ui/src/lib/bits/scroll-area/types.ts
index 051fd08c8..0a1072765 100644
--- a/packages/bits-ui/src/lib/bits/scroll-area/types.ts
+++ b/packages/bits-ui/src/lib/bits/scroll-area/types.ts
@@ -1,4 +1,4 @@
-import type { PrimitiveDivAttributes, WithChildren } from "$lib/internal/types.js";
+import type { PrimitiveDivAttributes } from "$lib/shared/attributes.js";
 import type { Direction, Orientation, WithChild, Without } from "$lib/shared/index.js";
 
 export type ScrollAreaType = "hover" | "scroll" | "auto" | "always";
diff --git a/packages/bits-ui/src/lib/bits/select/components/select-content-floating.svelte b/packages/bits-ui/src/lib/bits/select/components/select-content-floating.svelte
index 758b05c13..edb74b22a 100644
--- a/packages/bits-ui/src/lib/bits/select/components/select-content-floating.svelte
+++ b/packages/bits-ui/src/lib/bits/select/components/select-content-floating.svelte
@@ -34,7 +34,7 @@
 			style: contentFloatingState.props.style,
 		})}
 		{#if child}
-			{@render child?.({ props: finalProps })}
+			{@render child({ props: finalProps })}
 		{:else}
 			<div {...finalProps}>
 				{@render children?.()}
diff --git a/packages/bits-ui/src/lib/bits/select/components/select-content-item-aligned.svelte b/packages/bits-ui/src/lib/bits/select/components/select-content-item-aligned.svelte
index a14b11464..6089bdbd4 100644
--- a/packages/bits-ui/src/lib/bits/select/components/select-content-item-aligned.svelte
+++ b/packages/bits-ui/src/lib/bits/select/components/select-content-item-aligned.svelte
@@ -1,9 +1,10 @@
 <script lang="ts">
 	import { box } from "svelte-toolbelt";
 	import { useSelectItemAlignedPosition } from "../select.svelte.js";
-	import type { PrimitiveDivAttributes, WithChild } from "$lib/internal/types.js";
+	import type { WithChild } from "$lib/internal/types.js";
 	import { mergeProps } from "$lib/internal/mergeProps.js";
 	import { useBodyScrollLock } from "$lib/internal/useBodyScrollLock.svelte.js";
+	import type { PrimitiveDivAttributes } from "$lib/shared/attributes.js";
 
 	let {
 		child,
@@ -28,7 +29,7 @@
 
 <div {...mergedWrapperProps}>
 	{#if child}
-		{@render child?.({ props: mergedProps })}
+		{@render child({ props: mergedProps })}
 	{:else}
 		<div {...mergedProps}>
 			{@render children?.()}
diff --git a/packages/bits-ui/src/lib/bits/select/components/select-group-label.svelte b/packages/bits-ui/src/lib/bits/select/components/select-group-label.svelte
index ae7036693..3fc9efd0f 100644
--- a/packages/bits-ui/src/lib/bits/select/components/select-group-label.svelte
+++ b/packages/bits-ui/src/lib/bits/select/components/select-group-label.svelte
@@ -25,7 +25,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps })}
+	{@render child({ props: mergedProps })}
 {:else}
 	<div {...mergedProps}>
 		{@render children?.()}
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 351f9e264..ba6d9c153 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
@@ -24,7 +24,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps })}
+	{@render child({ props: mergedProps })}
 {:else}
 	<div {...mergedProps}>
 		{@render children?.()}
diff --git a/packages/bits-ui/src/lib/bits/select/components/select-icon.svelte b/packages/bits-ui/src/lib/bits/select/components/select-icon.svelte
index 0f1b6b6bc..8ff60d722 100644
--- a/packages/bits-ui/src/lib/bits/select/components/select-icon.svelte
+++ b/packages/bits-ui/src/lib/bits/select/components/select-icon.svelte
@@ -25,7 +25,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps })}
+	{@render child({ props: mergedProps })}
 {:else}
 	<span {...mergedProps}>
 		{#if children}
diff --git a/packages/bits-ui/src/lib/bits/select/components/select-item-text.svelte b/packages/bits-ui/src/lib/bits/select/components/select-item-text.svelte
index 2a72cfd24..fd4a7498e 100644
--- a/packages/bits-ui/src/lib/bits/select/components/select-item-text.svelte
+++ b/packages/bits-ui/src/lib/bits/select/components/select-item-text.svelte
@@ -32,7 +32,7 @@
 {/if}
 
 {#if child}
-	{@render child?.({ props: mergedProps })}
+	{@render child({ props: mergedProps })}
 {:else}
 	<span {...mergedProps}>
 		{@render children?.()}
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 8872ea273..eaa838899 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
@@ -31,7 +31,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps, selected: itemState.isSelected })}
+	{@render child({ props: mergedProps, selected: itemState.isSelected })}
 {:else}
 	<div {...mergedProps}>
 		{@render children?.({ selected: itemState.isSelected })}
diff --git a/packages/bits-ui/src/lib/bits/select/components/select-scroll-down-button-mounted.svelte b/packages/bits-ui/src/lib/bits/select/components/select-scroll-down-button-mounted.svelte
index 160bc5568..b2937412f 100644
--- a/packages/bits-ui/src/lib/bits/select/components/select-scroll-down-button-mounted.svelte
+++ b/packages/bits-ui/src/lib/bits/select/components/select-scroll-down-button-mounted.svelte
@@ -25,7 +25,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: restProps })}
+	{@render child({ props: restProps })}
 {:else}
 	<div {...restProps}>
 		{@render children?.()}
diff --git a/packages/bits-ui/src/lib/bits/select/components/select-scroll-up-button-mounted.svelte b/packages/bits-ui/src/lib/bits/select/components/select-scroll-up-button-mounted.svelte
index d2732da14..bdbf97c54 100644
--- a/packages/bits-ui/src/lib/bits/select/components/select-scroll-up-button-mounted.svelte
+++ b/packages/bits-ui/src/lib/bits/select/components/select-scroll-up-button-mounted.svelte
@@ -25,7 +25,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: restProps })}
+	{@render child({ props: restProps })}
 {:else}
 	<div {...restProps}>
 		{@render children?.()}
diff --git a/packages/bits-ui/src/lib/bits/select/components/select-separator.svelte b/packages/bits-ui/src/lib/bits/select/components/select-separator.svelte
index 07ba215f7..eaa30faa5 100644
--- a/packages/bits-ui/src/lib/bits/select/components/select-separator.svelte
+++ b/packages/bits-ui/src/lib/bits/select/components/select-separator.svelte
@@ -25,7 +25,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps })}
+	{@render child({ props: mergedProps })}
 {:else}
 	<div {...mergedProps}>
 		{@render children?.()}
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 341812faf..9efa33e63 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
@@ -29,7 +29,7 @@
 
 <FloatingLayer.Anchor {id}>
 	{#if child}
-		{@render child?.({ props: mergedProps })}
+		{@render child({ props: mergedProps })}
 	{:else}
 		<button {...mergedProps}>
 			{@render children?.()}
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 5474c671e..351f83d8b 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
@@ -23,7 +23,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps })}
+	{@render child({ props: mergedProps })}
 {:else}
 	<span {...mergedProps} bind:this={ref}>
 		{#if valueState.showPlaceholder}
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 9ad2d955f..8b226135f 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
@@ -25,7 +25,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps })}
+	{@render child({ props: mergedProps })}
 {:else}
 	<div {...mergedProps}>
 		{@render children?.()}
diff --git a/packages/bits-ui/src/lib/bits/select/types.ts b/packages/bits-ui/src/lib/bits/select/types.ts
index 7ab4c8dad..7091599e8 100644
--- a/packages/bits-ui/src/lib/bits/select/types.ts
+++ b/packages/bits-ui/src/lib/bits/select/types.ts
@@ -1,14 +1,11 @@
 import type { PopperLayerProps } from "../utilities/popper-layer/types.js";
 import type { ArrowProps, ArrowPropsWithoutHTML } from "../utilities/arrow/types.js";
+import type { OnChangeFn, WithChild, WithChildren, Without } from "$lib/internal/types.js";
 import type {
-	OnChangeFn,
 	PrimitiveButtonAttributes,
 	PrimitiveDivAttributes,
 	PrimitiveSpanAttributes,
-	WithChild,
-	WithChildren,
-	Without,
-} from "$lib/internal/types.js";
+} from "$lib/shared/attributes.js";
 import type { Direction } from "$lib/shared/index.js";
 import type { PortalProps } from "$lib/bits/utilities/portal/index.js";
 
diff --git a/packages/bits-ui/src/lib/bits/separator/types.ts b/packages/bits-ui/src/lib/bits/separator/types.ts
index cf3396992..0ee716fc7 100644
--- a/packages/bits-ui/src/lib/bits/separator/types.ts
+++ b/packages/bits-ui/src/lib/bits/separator/types.ts
@@ -1,5 +1,6 @@
-import type { PrimitiveDivAttributes, WithChild, Without } from "$lib/internal/index.js";
+import type { WithChild, Without } from "$lib/internal/index.js";
 import type { Orientation } from "$lib/shared/index.js";
+import type { PrimitiveDivAttributes } from "$lib/shared/attributes.js";
 
 export type SeparatorRootPropsWithoutHTML = WithChild<{
 	/**
diff --git a/packages/bits-ui/src/lib/bits/slider/types.ts b/packages/bits-ui/src/lib/bits/slider/types.ts
index d74390b8d..f04b05f51 100644
--- a/packages/bits-ui/src/lib/bits/slider/types.ts
+++ b/packages/bits-ui/src/lib/bits/slider/types.ts
@@ -1,9 +1,5 @@
-import type {
-	OnChangeFn,
-	PrimitiveSpanAttributes,
-	WithChild,
-	Without,
-} from "$lib/internal/types.js";
+import type { OnChangeFn, WithChild, Without } from "$lib/internal/types.js";
+import type { PrimitiveSpanAttributes } from "$lib/shared/attributes.js";
 import type { Direction, Orientation } from "$lib/shared/index.js";
 
 export type SliderRootSnippetProps = {
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 2638c8b3b..e1833d0f3 100644
--- a/packages/bits-ui/src/lib/bits/switch/components/switch.svelte
+++ b/packages/bits-ui/src/lib/bits/switch/components/switch.svelte
@@ -44,7 +44,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps, checked: rootState.checked.current })}
+	{@render child({ props: mergedProps, checked: rootState.checked.current })}
 {:else}
 	<button bind:this={ref} {...mergedProps}>
 		{@render children?.({ checked: rootState.checked.current })}
diff --git a/packages/bits-ui/src/lib/bits/switch/types.ts b/packages/bits-ui/src/lib/bits/switch/types.ts
index b984d367b..e624459a3 100644
--- a/packages/bits-ui/src/lib/bits/switch/types.ts
+++ b/packages/bits-ui/src/lib/bits/switch/types.ts
@@ -1,11 +1,5 @@
-import type {
-	EventCallback,
-	OnChangeFn,
-	PrimitiveButtonAttributes,
-	PrimitiveSpanAttributes,
-	WithChild,
-	Without,
-} from "$lib/internal/index.js";
+import type { EventCallback, OnChangeFn, WithChild, Without } from "$lib/internal/index.js";
+import type { PrimitiveButtonAttributes, PrimitiveSpanAttributes } from "$lib/shared/attributes.js";
 
 type SwitchRootSnippetProps = {
 	checked: boolean;
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 2158437c3..1ce4f9360 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
@@ -25,7 +25,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps })}
+	{@render child({ props: mergedProps })}
 {:else}
 	<div {...mergedProps}>
 		{@render children?.()}
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 242f6c085..b6be36103 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
@@ -30,7 +30,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps })}
+	{@render child({ props: mergedProps })}
 {:else}
 	<button {...mergedProps}>
 		{@render children?.()}
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 efbbfb1e1..68a006f1a 100644
--- a/packages/bits-ui/src/lib/bits/tabs/components/tabs.svelte
+++ b/packages/bits-ui/src/lib/bits/tabs/components/tabs.svelte
@@ -44,7 +44,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps })}
+	{@render child({ props: mergedProps })}
 {:else}
 	<div {...mergedProps}>
 		{@render children?.()}
diff --git a/packages/bits-ui/src/lib/bits/tabs/types.ts b/packages/bits-ui/src/lib/bits/tabs/types.ts
index b00cf8dac..92e731baf 100644
--- a/packages/bits-ui/src/lib/bits/tabs/types.ts
+++ b/packages/bits-ui/src/lib/bits/tabs/types.ts
@@ -1,11 +1,6 @@
-import type {
-	OnChangeFn,
-	PrimitiveButtonAttributes,
-	PrimitiveDivAttributes,
-	WithChild,
-	Without,
-} from "$lib/internal/index.js";
+import type { OnChangeFn, WithChild, Without } from "$lib/internal/index.js";
 import type { Orientation } from "$lib/index.js";
+import type { PrimitiveButtonAttributes, PrimitiveDivAttributes } from "$lib/shared/attributes.js";
 
 export type TabsActivationMode = "manual" | "automatic";
 
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 1bd4e09c0..d38abab65 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
@@ -30,7 +30,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps, pressed: itemState.isPressed })}
+	{@render child({ props: mergedProps, pressed: itemState.isPressed })}
 {:else}
 	<button bind:this={ref} {...mergedProps}>
 		{@render children?.({ pressed: itemState.isPressed })}
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 2f4c1300a..96a81e51e 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
@@ -46,7 +46,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps })}
+	{@render child({ props: mergedProps })}
 {:else}
 	<div {...mergedProps}>
 		{@render children?.()}
diff --git a/packages/bits-ui/src/lib/bits/toggle-group/types.ts b/packages/bits-ui/src/lib/bits/toggle-group/types.ts
index a0dc32b1a..63a1312f8 100644
--- a/packages/bits-ui/src/lib/bits/toggle-group/types.ts
+++ b/packages/bits-ui/src/lib/bits/toggle-group/types.ts
@@ -1,10 +1,5 @@
-import type {
-	OnChangeFn,
-	PrimitiveButtonAttributes,
-	PrimitiveDivAttributes,
-	WithChild,
-	Without,
-} from "$lib/internal/index.js";
+import type { OnChangeFn, WithChild, Without } from "$lib/internal/index.js";
+import type { PrimitiveButtonAttributes, PrimitiveDivAttributes } from "$lib/shared/attributes.js";
 import type { Orientation } from "$lib/index.js";
 
 export type BaseToggleGroupRootProps = {
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 f84226b64..a3481c00b 100644
--- a/packages/bits-ui/src/lib/bits/toggle/components/toggle.svelte
+++ b/packages/bits-ui/src/lib/bits/toggle/components/toggle.svelte
@@ -39,7 +39,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps, pressed: toggleState.pressed.current })}
+	{@render child({ props: mergedProps, pressed: toggleState.pressed.current })}
 {:else}
 	<button {...mergedProps}>
 		{@render children?.({ pressed: toggleState.pressed.current })}
diff --git a/packages/bits-ui/src/lib/bits/toggle/types.ts b/packages/bits-ui/src/lib/bits/toggle/types.ts
index 81f6b4b8c..aefff58e0 100644
--- a/packages/bits-ui/src/lib/bits/toggle/types.ts
+++ b/packages/bits-ui/src/lib/bits/toggle/types.ts
@@ -1,9 +1,5 @@
-import type {
-	OnChangeFn,
-	PrimitiveButtonAttributes,
-	WithChild,
-	Without,
-} from "$lib/internal/index.js";
+import type { OnChangeFn, WithChild, Without } from "$lib/internal/index.js";
+import type { PrimitiveButtonAttributes } from "$lib/shared/attributes.js";
 
 export type ToggleRootSnippetProps = {
 	pressed: boolean;
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 576e4249e..561d2e87d 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
@@ -28,7 +28,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps })}
+	{@render child({ props: mergedProps })}
 {:else}
 	<button {...mergedProps}>
 		{@render children?.()}
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 d24a29001..48dcfc05e 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
@@ -30,7 +30,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps, pressed: groupItemState.isPressed })}
+	{@render child({ props: mergedProps, pressed: groupItemState.isPressed })}
 {:else}
 	<button {...mergedProps}>
 		{@render children?.({ pressed: groupItemState.isPressed })}
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 57e1c35ea..cfa5284c2 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
@@ -40,7 +40,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps })}
+	{@render child({ props: mergedProps })}
 {:else}
 	<div {...mergedProps}>
 		{@render children?.()}
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 4e9bd58be..2f7bf5aac 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
@@ -26,7 +26,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps })}
+	{@render child({ props: mergedProps })}
 {:else}
 	<a {href} {...mergedProps}>
 		{@render children?.()}
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 c9cc5d8fc..edd68113e 100644
--- a/packages/bits-ui/src/lib/bits/toolbar/components/toolbar.svelte
+++ b/packages/bits-ui/src/lib/bits/toolbar/components/toolbar.svelte
@@ -29,7 +29,7 @@
 </script>
 
 {#if child}
-	{@render child?.({ props: mergedProps })}
+	{@render child({ props: mergedProps })}
 {:else}
 	<div {...mergedProps}>
 		{@render children?.()}
diff --git a/packages/bits-ui/src/lib/bits/toolbar/types.ts b/packages/bits-ui/src/lib/bits/toolbar/types.ts
index 62aa123d0..af35ea67e 100644
--- a/packages/bits-ui/src/lib/bits/toolbar/types.ts
+++ b/packages/bits-ui/src/lib/bits/toolbar/types.ts
@@ -4,13 +4,12 @@ import type {
 	ToggleGroupRootPropsWithoutHTML,
 } from "../toggle-group/types.js";
 import type { Orientation } from "$lib/shared/index.js";
+import type { WithChild, Without } from "$lib/internal/types.js";
 import type {
 	PrimitiveAnchorAttributes,
 	PrimitiveButtonAttributes,
 	PrimitiveDivAttributes,
-	WithChild,
-	Without,
-} from "$lib/internal/types.js";
+} from "$lib/shared/attributes.js";
 
 export type ToolbarRootPropsWithoutHTML = WithChild<{
 	/**
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 2dc2de30d..2e6286d3d 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
@@ -78,7 +78,7 @@
 			},
 		})}
 		{#if child}
-			{@render child?.({ props: mergedProps })}
+			{@render child({ props: mergedProps })}
 		{:else}
 			<div {...mergedProps} bind:this={ref}>
 				{@render children?.()}
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 6ee7d9a4e..698f3fd71 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
@@ -30,7 +30,7 @@
 
 <FloatingLayer.Anchor {id}>
 	{#if child}
-		{@render child?.({ props: mergedProps })}
+		{@render child({ props: mergedProps })}
 	{:else}
 		<button {...mergedProps}>
 			{@render children?.()}
diff --git a/packages/bits-ui/src/lib/bits/tooltip/types.ts b/packages/bits-ui/src/lib/bits/tooltip/types.ts
index 76e7a4f91..a9f0ba0f3 100644
--- a/packages/bits-ui/src/lib/bits/tooltip/types.ts
+++ b/packages/bits-ui/src/lib/bits/tooltip/types.ts
@@ -2,14 +2,8 @@ import type { FloatingLayerContentProps } from "../utilities/floating-layer/type
 import type { ArrowProps, ArrowPropsWithoutHTML } from "../utilities/arrow/types.js";
 import type { DismissableLayerProps } from "../utilities/dismissable-layer/types.js";
 import type { EscapeLayerProps } from "../utilities/escape-layer/types.js";
-import type {
-	OnChangeFn,
-	PrimitiveButtonAttributes,
-	PrimitiveDivAttributes,
-	WithChild,
-	WithChildren,
-	Without,
-} from "$lib/internal/types.js";
+import type { OnChangeFn, WithChild, WithChildren, Without } from "$lib/internal/types.js";
+import type { PrimitiveButtonAttributes, PrimitiveDivAttributes } from "$lib/shared/attributes.js";
 import type { PortalProps } from "$lib/bits/utilities/portal/types.js";
 
 export type TooltipProviderPropsWithoutHTML = WithChildren<{
diff --git a/packages/bits-ui/src/lib/bits/utilities/arrow/types.ts b/packages/bits-ui/src/lib/bits/utilities/arrow/types.ts
index 35473756b..f1c8de094 100644
--- a/packages/bits-ui/src/lib/bits/utilities/arrow/types.ts
+++ b/packages/bits-ui/src/lib/bits/utilities/arrow/types.ts
@@ -1,4 +1,5 @@
-import type { PrimitiveSpanAttributes, WithChild } from "$lib/internal/types.js";
+import type { WithChild } from "$lib/internal/types.js";
+import type { PrimitiveSpanAttributes } from "$lib/shared/attributes.js";
 
 export type ArrowPropsWithoutHTML = WithChild<{
 	/**
diff --git a/packages/bits-ui/src/lib/bits/utilities/floating-layer/types.ts b/packages/bits-ui/src/lib/bits/utilities/floating-layer/types.ts
index 99ac779f6..1cd28d448 100644
--- a/packages/bits-ui/src/lib/bits/utilities/floating-layer/types.ts
+++ b/packages/bits-ui/src/lib/bits/utilities/floating-layer/types.ts
@@ -1,5 +1,5 @@
 import type { Snippet } from "svelte";
-import type { ReadableBox, WritableBox } from "svelte-toolbelt";
+import type { ReadableBox } from "svelte-toolbelt";
 import type { Align, Boundary, Side } from "./useFloatingLayer.svelte.js";
 import type { Arrayable } from "$lib/internal/types.js";
 import type { Direction, StyleProperties } from "$lib/shared/index.js";
@@ -111,7 +111,7 @@ export type FloatingLayerContentImplProps = {
 	/**
 	 * The style properties to apply to the content.
 	 */
-	style?: StyleProperties;
+	style?: StyleProperties | string | null;
 
 	/**
 	 * Callback that is called when the floating element is placed.
diff --git a/packages/bits-ui/src/lib/bits/utilities/floating-layer/useFloatingLayer.svelte.ts b/packages/bits-ui/src/lib/bits/utilities/floating-layer/useFloatingLayer.svelte.ts
index 5b7f99084..245dc9dc4 100644
--- a/packages/bits-ui/src/lib/bits/utilities/floating-layer/useFloatingLayer.svelte.ts
+++ b/packages/bits-ui/src/lib/bits/utilities/floating-layer/useFloatingLayer.svelte.ts
@@ -11,10 +11,11 @@ import {
 	shift,
 	size,
 } from "@floating-ui/dom";
-import { type ReadableBox, box } from "svelte-toolbelt";
+import { box } from "svelte-toolbelt";
 import {
 	type Arrayable,
 	type Box,
+	isNotNull,
 	type ReadableBoxedValues,
 	styleToString,
 	useId,
@@ -26,6 +27,7 @@ import { useFloating } from "$lib/internal/floating-svelte/useFloating.svelte.js
 import type { Measurable, UseFloatingReturn } from "$lib/internal/floating-svelte/types.js";
 import type { Direction, StyleProperties } from "$lib/shared/index.js";
 import { createContext } from "$lib/internal/createContext.js";
+import { cssToStyleObj } from "$lib/internal/cssToStyleObj.js";
 
 export const SIDE_OPTIONS = ["top", "right", "bottom", "left"] as const;
 export const ALIGN_OPTIONS = ["start", "center", "end"] as const;
@@ -90,6 +92,11 @@ class FloatingContentState {
 	wrapperId: FloatingContentStateProps["wrapperId"];
 
 	style: FloatingContentStateProps["style"];
+
+	transformedStyle = $derived.by(() => {
+		if (typeof this.style === "string") return cssToStyleObj(this.style);
+		if (!this.style) return {};
+	});
 	dir: FloatingContentStateProps["dir"];
 	side: FloatingContentStateProps["side"];
 	sideOffset: FloatingContentStateProps["sideOffset"];
@@ -204,7 +211,7 @@ class FloatingContentState {
 						visibility: "hidden",
 						"pointer-events": "none",
 					}),
-					...this.style.current,
+					...this.transformedStyle,
 				},
 				// Floating UI calculates logical alignment based the `dir` attribute
 				dir: this.dir.current,
@@ -216,7 +223,7 @@ class FloatingContentState {
 				"data-side": this.placedSide,
 				"data-align": this.placedAlign,
 				style: styleToString({
-					...this.style.current,
+					...this.transformedStyle,
 					// if the FloatingContent hasn't been placed yet (not all measurements done)
 					// we prevent animations so that users's animation don't kick in too early referring wrong sides
 					// animation: !this.floating.isPositioned ? "none" : undefined,
@@ -398,10 +405,6 @@ export function useFloatingAnchorState(props: FloatingAnchorStateProps): Floatin
 // HELPERS
 //
 
-function isNotNull<T>(value: T | null): value is T {
-	return value !== null;
-}
-
 function transformOrigin(options: { arrowWidth: number; arrowHeight: number }): Middleware {
 	return {
 		name: "transformOrigin",
diff --git a/packages/bits-ui/src/lib/bits/utilities/visually-hidden/types.ts b/packages/bits-ui/src/lib/bits/utilities/visually-hidden/types.ts
index 4d560db87..035eb22b6 100644
--- a/packages/bits-ui/src/lib/bits/utilities/visually-hidden/types.ts
+++ b/packages/bits-ui/src/lib/bits/utilities/visually-hidden/types.ts
@@ -1,3 +1,4 @@
-import type { PrimitiveSpanAttributes, WithChild } from "$lib/internal/types.js";
+import type { WithChild } from "$lib/internal/types.js";
+import type { PrimitiveSpanAttributes } from "$lib/shared/attributes.js";
 
 export type VisuallyHiddenProps = WithChild<PrimitiveSpanAttributes>;
diff --git a/packages/bits-ui/src/lib/internal/is.ts b/packages/bits-ui/src/lib/internal/is.ts
index 49a137e3e..07ec4edca 100644
--- a/packages/bits-ui/src/lib/internal/is.ts
+++ b/packages/bits-ui/src/lib/internal/is.ts
@@ -45,3 +45,7 @@ export function isTouch(e: PointerEvent) {
 export function isFocusVisible(element: Element) {
 	return element.matches(":focus-visible");
 }
+
+export function isNotNull<T>(value: T | null): value is T {
+	return value !== null;
+}
diff --git a/packages/bits-ui/src/lib/internal/types.ts b/packages/bits-ui/src/lib/internal/types.ts
index 165ee8944..39b8bede6 100644
--- a/packages/bits-ui/src/lib/internal/types.ts
+++ b/packages/bits-ui/src/lib/internal/types.ts
@@ -1,52 +1,10 @@
 import type { Snippet } from "svelte";
-import type {
-	HTMLAnchorAttributes,
-	HTMLAttributes,
-	HTMLButtonAttributes,
-	HTMLImgAttributes,
-	HTMLInputAttributes,
-	HTMLLabelAttributes,
-	HTMLLiAttributes,
-	HTMLTableAttributes,
-	HTMLTdAttributes,
-	HTMLThAttributes,
-	SVGAttributes,
-} from "svelte/elements";
+
 import type { Box, ReadableBoxedValues, WritableBoxedValues } from "./box.svelte.js";
 import type { StyleProperties } from "$lib/shared/index.js";
 
-export type HTMLDivAttributes = HTMLAttributes<HTMLDivElement>;
-export type HTMLSpanAttributes = HTMLAttributes<HTMLSpanElement>;
-export type HTMLHeadingAttributes = HTMLAttributes<HTMLHeadingElement>;
-export type HTMLUListAttributes = HTMLAttributes<HTMLUListElement>;
-export type HTMLElementAttributes = HTMLAttributes<HTMLElement>;
-export type HTMLTableSectionAttributes = HTMLAttributes<HTMLTableSectionElement>;
-export type HTMLTableRowAttributes = HTMLAttributes<HTMLTableRowElement>;
-export type SVGElementAttributes = SVGAttributes<SVGElement>;
-
 export type OnChangeFn<T> = (value: T) => void;
 
-type Primitive<T> = Omit<T, "style" | "id" | "children"> & { id?: string };
-export type PrimitiveButtonAttributes = Primitive<HTMLButtonAttributes>;
-export type PrimitiveDivAttributes = Primitive<HTMLDivAttributes>;
-export type PrimitiveInputAttributes = Primitive<HTMLInputAttributes>;
-export type PrimitiveSpanAttributes = Primitive<HTMLSpanAttributes>;
-export type PrimitiveImgAttributes = Primitive<HTMLImgAttributes>;
-export type PrimitiveHeadingAttributes = Primitive<HTMLHeadingAttributes>;
-export type PrimitiveLabelAttributes = Primitive<HTMLLabelAttributes>;
-export type PrimitiveSVGAttributes = Primitive<SVGElementAttributes>;
-export type PrimitiveAnchorAttributes = Primitive<HTMLAnchorAttributes>;
-export type PrimitiveLiAttributes = Primitive<HTMLLiAttributes>;
-export type PrimitiveElementAttributes = Primitive<HTMLElementAttributes>;
-export type PrimitiveUListAttributes = Primitive<HTMLUListAttributes>;
-export type PrimitiveTdAttributes = Primitive<HTMLTdAttributes>;
-export type PrimitiveThAttributes = Primitive<HTMLThAttributes>;
-export type PrimitiveTableAttributes = Primitive<HTMLTableAttributes>;
-export type PrimitiveTbodyAttributes = Primitive<HTMLTableSectionAttributes>;
-export type PrimitiveTrAttributes = Primitive<HTMLTableRowAttributes>;
-export type PrimitiveTheadAttrbutes = Primitive<HTMLTableSectionAttributes>;
-export type PrimitiveHeaderAttributes = Primitive<HTMLElementAttributes>;
-
 export type ElementRef = Box<HTMLElement | null>;
 
 export type WithChild<
@@ -69,12 +27,12 @@ export type WithChild<
 		? Snippet<[{ props: Record<string, unknown> }]>
 		: Snippet<[SnippetProps & { props: Record<string, unknown> }]>;
 	children?: SnippetProps extends { _default: never } ? Snippet : Snippet<[SnippetProps]>;
-	style?: StyleProperties;
-	ref?: Ref | null;
+	style?: StyleProperties | string | null | undefined;
+	ref?: Ref | null | undefined;
 };
 
 export type WithChildren<Props = {}> = Props & {
-	children?: Snippet;
+	children?: Snippet | undefined;
 };
 
 /**
diff --git a/packages/bits-ui/src/lib/internal/useBodyScrollLock.svelte.ts b/packages/bits-ui/src/lib/internal/useBodyScrollLock.svelte.ts
index 13796ede8..2abb70933 100644
--- a/packages/bits-ui/src/lib/internal/useBodyScrollLock.svelte.ts
+++ b/packages/bits-ui/src/lib/internal/useBodyScrollLock.svelte.ts
@@ -1,6 +1,6 @@
 import { SvelteMap } from "svelte/reactivity";
 import { box } from "svelte-toolbelt";
-import type { NoopFn } from "./types.js";
+import type { Fn } from "./types.js";
 import { isBrowser, isIOS } from "./is.js";
 import { addEventListener } from "./events.js";
 import { afterTick } from "./afterTick.js";
@@ -27,7 +27,7 @@ const useBodyLockStackCount = createSharedHook(() => {
 
 	let initialBodyStyle: Partial<CSSStyleDeclaration> = $state<Partial<CSSStyleDeclaration>>({});
 
-	let stopTouchMoveListener: NoopFn | null = null;
+	let stopTouchMoveListener: Fn | null = null;
 
 	function resetBodyStyle() {
 		if (!isBrowser) return;
diff --git a/packages/bits-ui/src/lib/internal/useTimeoutFn.svelte.ts b/packages/bits-ui/src/lib/internal/useTimeoutFn.svelte.ts
index 0329500ff..9fe56ecb3 100644
--- a/packages/bits-ui/src/lib/internal/useTimeoutFn.svelte.ts
+++ b/packages/bits-ui/src/lib/internal/useTimeoutFn.svelte.ts
@@ -1,7 +1,7 @@
 import { box } from "svelte-toolbelt";
 import { onDestroy } from "svelte";
 import type { Box } from "./box.svelte.js";
-import type { AnyFn, NoopFn } from "./types.js";
+import type { AnyFn, Fn } from "./types.js";
 import { isBrowser } from "./is.js";
 
 export type UseTimeoutFnOptions = {
@@ -22,7 +22,7 @@ export type Stoppable<StartFnArgs extends unknown[] = unknown[]> = {
 	/**
 	 * Stop the effect from executing
 	 */
-	stop: NoopFn;
+	stop: Fn;
 
 	/**
 	 * Start the effects
diff --git a/packages/bits-ui/src/lib/shared/attributes.ts b/packages/bits-ui/src/lib/shared/attributes.ts
new file mode 100644
index 000000000..5747a80bc
--- /dev/null
+++ b/packages/bits-ui/src/lib/shared/attributes.ts
@@ -0,0 +1,50 @@
+import type {
+	HTMLAnchorAttributes,
+	HTMLAttributes,
+	HTMLButtonAttributes,
+	HTMLImgAttributes,
+	HTMLInputAttributes,
+	HTMLLabelAttributes,
+	HTMLLiAttributes,
+	HTMLTableAttributes,
+	HTMLTdAttributes,
+	HTMLThAttributes,
+	SVGAttributes,
+} from "svelte/elements";
+
+export type HTMLDivAttributes = HTMLAttributes<HTMLDivElement>;
+export type HTMLSpanAttributes = HTMLAttributes<HTMLSpanElement>;
+export type HTMLHeadingAttributes = HTMLAttributes<HTMLHeadingElement>;
+export type HTMLUListAttributes = HTMLAttributes<HTMLUListElement>;
+export type HTMLElementAttributes = HTMLAttributes<HTMLElement>;
+export type HTMLTableSectionAttributes = HTMLAttributes<HTMLTableSectionElement>;
+export type HTMLTableRowAttributes = HTMLAttributes<HTMLTableRowElement>;
+export type SVGElementAttributes = SVGAttributes<SVGElement>;
+
+/**
+ * We override the `id` prop type to not allow it to be `null`. We rely on the
+ * `id` heavily in the internals of Bits UI for node references. We also override
+ * children to allow for custom children snippet props. We extend `style` to allow
+ * for either a `StyleProperties` object or a string of CSS properties.
+ */
+type Primitive<T> = Omit<T, "style" | "id" | "children"> & { id?: string };
+
+export type PrimitiveButtonAttributes = Primitive<HTMLButtonAttributes>;
+export type PrimitiveDivAttributes = Primitive<HTMLDivAttributes>;
+export type PrimitiveInputAttributes = Primitive<HTMLInputAttributes>;
+export type PrimitiveSpanAttributes = Primitive<HTMLSpanAttributes>;
+export type PrimitiveImgAttributes = Primitive<HTMLImgAttributes>;
+export type PrimitiveHeadingAttributes = Primitive<HTMLHeadingAttributes>;
+export type PrimitiveLabelAttributes = Primitive<HTMLLabelAttributes>;
+export type PrimitiveSVGAttributes = Primitive<SVGElementAttributes>;
+export type PrimitiveAnchorAttributes = Primitive<HTMLAnchorAttributes>;
+export type PrimitiveLiAttributes = Primitive<HTMLLiAttributes>;
+export type PrimitiveElementAttributes = Primitive<HTMLElementAttributes>;
+export type PrimitiveUListAttributes = Primitive<HTMLUListAttributes>;
+export type PrimitiveTdAttributes = Primitive<HTMLTdAttributes>;
+export type PrimitiveThAttributes = Primitive<HTMLThAttributes>;
+export type PrimitiveTableAttributes = Primitive<HTMLTableAttributes>;
+export type PrimitiveTbodyAttributes = Primitive<HTMLTableSectionAttributes>;
+export type PrimitiveTrAttributes = Primitive<HTMLTableRowAttributes>;
+export type PrimitiveTheadAttrbutes = Primitive<HTMLTableSectionAttributes>;
+export type PrimitiveHeaderAttributes = Primitive<HTMLElementAttributes>;
diff --git a/packages/bits-ui/src/lib/shared/index.ts b/packages/bits-ui/src/lib/shared/index.ts
index d758ff138..328bbc247 100644
--- a/packages/bits-ui/src/lib/shared/index.ts
+++ b/packages/bits-ui/src/lib/shared/index.ts
@@ -44,3 +44,4 @@ export type { Month } from "./date/types.js";
 export type { WithChild, Without } from "$lib/internal/types.js";
 export { mergeProps } from "$lib/internal/mergeProps.js";
 export { useId } from "$lib/internal/useId.js";
+export * from "./attributes.js";
diff --git a/packages/bits-ui/src/tests/accordion/AccordionMultiTest.svelte b/packages/bits-ui/src/tests/accordion/AccordionMultiTest.svelte
index 71212752c..b7f0b950e 100644
--- a/packages/bits-ui/src/tests/accordion/AccordionMultiTest.svelte
+++ b/packages/bits-ui/src/tests/accordion/AccordionMultiTest.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import { Accordion } from "$lib/index.js";
-	import type { OnChangeFn, PrimitiveDivAttributes } from "$lib/internal/types.js";
+	import type { OnChangeFn } from "$lib/internal/types.js";
+	import type { PrimitiveDivAttributes } from "$lib/shared/attributes.js";
 
 	type Item = {
 		value: string;
diff --git a/packages/bits-ui/src/tests/accordion/AccordionMultiTestControlled.svelte b/packages/bits-ui/src/tests/accordion/AccordionMultiTestControlled.svelte
index 1bbb489b3..0995660dc 100644
--- a/packages/bits-ui/src/tests/accordion/AccordionMultiTestControlled.svelte
+++ b/packages/bits-ui/src/tests/accordion/AccordionMultiTestControlled.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import { Accordion } from "$lib/index.js";
-	import type { OnChangeFn, PrimitiveDivAttributes } from "$lib/internal/types.js";
+	import type { OnChangeFn } from "$lib/internal/types.js";
+	import type { PrimitiveDivAttributes } from "$lib/shared/attributes.js";
 
 	type Item = {
 		value: string;
diff --git a/packages/bits-ui/src/tests/utils.ts b/packages/bits-ui/src/tests/utils.ts
index aa6d6393e..db67ca920 100644
--- a/packages/bits-ui/src/tests/utils.ts
+++ b/packages/bits-ui/src/tests/utils.ts
@@ -42,17 +42,17 @@ export function setupUserEvents(): CustomUserEvents {
 
 	const click = async (element: HTMLElement) => {
 		await originalClick(element);
-		await sleep(20);
+		await sleep(10);
 	};
 
 	const keyboard = async (keys: string) => {
 		await originalKeyboard(keys);
-		await sleep(20);
+		await sleep(10);
 	};
 
 	const pointer: typeof originalPointer = async (input) => {
 		await originalPointer(input);
-		await sleep(20);
+		await sleep(10);
 	};
 
 	const pointerDownUp = async (target: HTMLElement | null) => {
@@ -60,7 +60,7 @@ export function setupUserEvents(): CustomUserEvents {
 		await fireEvent.pointerDown(target);
 		await fireEvent.pointerUp(target);
 		await fireEvent.click(target);
-		await sleep(20);
+		await sleep(10);
 	};
 
 	Object.assign(user, { click, keyboard, pointer, pointerDownUp });
@@ -70,5 +70,5 @@ export function setupUserEvents(): CustomUserEvents {
 
 export async function fireFocus(node: HTMLElement) {
 	node.focus();
-	await sleep(20);
+	await sleep(10);
 }