From 266d8857a0c4c837f3980739ea8e152cdf8c899d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olle=20M=C3=A5nsson?=
 <31876997+ollema@users.noreply.github.com>
Date: Thu, 7 Dec 2023 00:53:18 +0100
Subject: [PATCH] remove separator

---
 content/components/toolbar.md                 |  1 -
 src/components/demos/toolbar-demo.svelte      |  4 +--
 src/content/api-reference/toolbar.ts          | 15 +----------
 src/lib/bits/toolbar/_export.types.ts         |  1 -
 src/lib/bits/toolbar/_types.ts                |  4 +--
 .../components/toolbar-separator.svelte       | 26 -------------------
 src/lib/bits/toolbar/ctx.ts                   |  2 +-
 src/lib/bits/toolbar/index.ts                 |  1 -
 src/lib/bits/toolbar/types.ts                 |  3 ---
 9 files changed, 5 insertions(+), 52 deletions(-)
 delete mode 100644 src/lib/bits/toolbar/components/toolbar-separator.svelte

diff --git a/content/components/toolbar.md b/content/components/toolbar.md
index 07a55240d..89df9d399 100644
--- a/content/components/toolbar.md
+++ b/content/components/toolbar.md
@@ -25,7 +25,6 @@ description: A container for grouping a set of controls, such as buttons, links
 	<Toolbar.Group>
 		<Toolbar.GroupItem />
 	</Toolbar.Group>
-	<Toolbar.Separator />
 	<Toolbar.Link />
 	<Toolbar.Button />
 </Toolbar.Root>
diff --git a/src/components/demos/toolbar-demo.svelte b/src/components/demos/toolbar-demo.svelte
index a94706780..cfb4f26bd 100644
--- a/src/components/demos/toolbar-demo.svelte
+++ b/src/components/demos/toolbar-demo.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { Toolbar } from "$lib";
+	import { Separator, Toolbar } from "$lib";
 	import { TextB, TextItalic, TextStrikethrough } from "phosphor-svelte";
 
 	let value: string[] | undefined = ["bold"];
@@ -36,7 +36,7 @@
 		</Toolbar.GroupItem>
 	</Toolbar.Group>
 
-	<Toolbar.Separator class="w-[1px] self-stretch bg-muted" />
+	<Separator.Root class="w-[1px] self-stretch bg-muted" />
 
 	<Toolbar.Link
 		class="link nowrap flex-shrink-0"
diff --git a/src/content/api-reference/toolbar.ts b/src/content/api-reference/toolbar.ts
index cc6ef2731..c1e2fbe7b 100644
--- a/src/content/api-reference/toolbar.ts
+++ b/src/content/api-reference/toolbar.ts
@@ -59,19 +59,6 @@ const link: APISchema<Toolbar.LinkProps> = {
 	]
 };
 
-const separator: APISchema<Toolbar.SeparatorProps> = {
-	title: "Separator",
-	description: "A horizontal line to visually separate sections in the toolbar.",
-	props: { asChild },
-	slotProps: { ...builderAndAttrsSlotProps },
-	dataAttributes: [
-		{
-			name: "toolbar-separator",
-			description: "Present on the separator element."
-		}
-	]
-};
-
 const group: APISchema<Toolbar.GroupProps<"multiple">> = {
 	title: "Group",
 	description: "A group of toggle items in the toolbar.",
@@ -145,4 +132,4 @@ const groupItem: APISchema<Toolbar.GroupItemProps> = {
 	]
 };
 
-export const toolbar = [root, button, link, separator, group, groupItem];
+export const toolbar = [root, button, link, group, groupItem];
diff --git a/src/lib/bits/toolbar/_export.types.ts b/src/lib/bits/toolbar/_export.types.ts
index a755160a1..ca866acc7 100644
--- a/src/lib/bits/toolbar/_export.types.ts
+++ b/src/lib/bits/toolbar/_export.types.ts
@@ -2,7 +2,6 @@ export type {
 	Props as ToolbarProps,
 	ButtonProps as ToolbarButtonProps,
 	LinkProps as ToolbarLinkProps,
-	SeparatorProps as ToolbarSeparatorProps,
 	GroupProps as ToolbarGroupProps,
 	GroupItemProps as ToolbarItemProps,
 	//
diff --git a/src/lib/bits/toolbar/_types.ts b/src/lib/bits/toolbar/_types.ts
index 824233082..9fd17acfe 100644
--- a/src/lib/bits/toolbar/_types.ts
+++ b/src/lib/bits/toolbar/_types.ts
@@ -12,8 +12,6 @@ type ButtonProps = AsChild;
 
 type LinkProps = AsChild;
 
-type SeparatorProps = AsChild;
-
 type GroupProps<T extends "single" | "multiple"> = Expand<
 	OmitValue<CreateToolbarGroupProps<T>> & {
 		/**
@@ -60,4 +58,4 @@ type GroupItemProps = Expand<
 	} & AsChild
 >;
 
-export type { Props, ButtonProps, LinkProps, SeparatorProps, GroupProps, GroupItemProps };
+export type { Props, ButtonProps, LinkProps, GroupProps, GroupItemProps };
diff --git a/src/lib/bits/toolbar/components/toolbar-separator.svelte b/src/lib/bits/toolbar/components/toolbar-separator.svelte
deleted file mode 100644
index ae30f60e9..000000000
--- a/src/lib/bits/toolbar/components/toolbar-separator.svelte
+++ /dev/null
@@ -1,26 +0,0 @@
-<script lang="ts">
-	import { melt } from "@melt-ui/svelte";
-	import { getAttrs, getCtx } from "../ctx.js";
-	import type { SeparatorProps } from "../types.js";
-
-	type $$Props = SeparatorProps;
-
-	export let asChild: $$Props["asChild"] = false;
-
-	const {
-		elements: { separator }
-	} = getCtx();
-
-	const attrs = getAttrs("separator");
-
-	$: builder = $separator;
-	$: Object.assign(builder, attrs);
-</script>
-
-{#if asChild}
-	<slot {builder} />
-{:else}
-	<div use:melt={builder} {...$$restProps}>
-		<slot {builder} />
-	</div>
-{/if}
diff --git a/src/lib/bits/toolbar/ctx.ts b/src/lib/bits/toolbar/ctx.ts
index 12ae5939b..e0df73e90 100644
--- a/src/lib/bits/toolbar/ctx.ts
+++ b/src/lib/bits/toolbar/ctx.ts
@@ -11,7 +11,7 @@ import { getContext, setContext } from "svelte";
 const NAME = "toolbar";
 const GROUP_NAME = "toolbar-group";
 
-const PARTS = ["root", "button", "link", "separator", "group", "group-item"] as const;
+const PARTS = ["root", "button", "link", "group", "group-item"] as const;
 
 export const getAttrs = createBitAttrs(NAME, PARTS);
 
diff --git a/src/lib/bits/toolbar/index.ts b/src/lib/bits/toolbar/index.ts
index 26c0f5395..d0e04e1ca 100644
--- a/src/lib/bits/toolbar/index.ts
+++ b/src/lib/bits/toolbar/index.ts
@@ -1,7 +1,6 @@
 export { default as Root } from "./components/toolbar.svelte";
 export { default as Button } from "./components/toolbar-button.svelte";
 export { default as Link } from "./components/toolbar-link.svelte";
-export { default as Separator } from "./components/toolbar-separator.svelte";
 export { default as Group } from "./components/toolbar-group.svelte";
 export { default as GroupItem } from "./components/toolbar-group-item.svelte";
 
diff --git a/src/lib/bits/toolbar/types.ts b/src/lib/bits/toolbar/types.ts
index ddd151ce3..2e94b250c 100644
--- a/src/lib/bits/toolbar/types.ts
+++ b/src/lib/bits/toolbar/types.ts
@@ -9,8 +9,6 @@ type ButtonProps = I.ButtonProps & HTMLButtonAttributes;
 
 type LinkProps = I.LinkProps & HTMLAnchorAttributes;
 
-type SeparatorProps = I.SeparatorProps & HTMLDivAttributes;
-
 type GroupProps<T extends "single" | "multiple"> = I.GroupProps<T> & HTMLDivAttributes;
 
 type GroupItemProps = I.GroupItemProps & HTMLButtonAttributes;
@@ -35,7 +33,6 @@ export type {
 	Props,
 	ButtonProps,
 	LinkProps,
-	SeparatorProps,
 	GroupProps,
 	GroupItemProps,
 	//