fix: toolbar onValueChange firing (#448)

huntabyte · Apr 11, 2024 · 98af8ac · 98af8ac
1 parent b1751ae
commit 98af8ac
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 16 deletions.
diff --git a/.changeset/fifty-stingrays-flash.md b/.changeset/fifty-stingrays-flash.md
@@ -0,0 +1,5 @@
+---
+"bits-ui": patch
+---
+
+fix: toolbar onValueChange firing
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
@@ -2,6 +2,7 @@
 	import { melt } from "@melt-ui/svelte";
 	import { setGroupCtx } from "../ctx.js";
 	import type { GroupProps } from "../index.js";
+	import { arraysAreEqual } from "$lib/internal/arrays.js";
 
 	type T = $$Generic<"single" | "multiple">;
 	type $$Props = GroupProps<T>;
@@ -24,8 +25,11 @@
 		defaultValue: value,
 		onValueChange: (({ next }: { next: $$Props["value"] }) => {
 			if (Array.isArray(next)) {
-				onValueChange?.(next);
-				value = next;
+				if (!Array.isArray(value) || !arraysAreEqual(value, next)) {
+					onValueChange?.(next);
+					value = next;
+					return next;
+				}
 				return next;
 			}
 
@@ -39,7 +43,8 @@
 
 	const attrs = getAttrs("group");
 
-	$: value !== undefined && localValue.set(value);
+	$: value !== undefined &&
+		localValue.set(Array.isArray(value) ? ([...value] as $$Props["value"]) : (value as any));
 
 	$: updateOption("disabled", disabled);
 	$: updateOption("type", type);

diff --git a/packages/bits-ui/src/tests/toolbar/Toolbar.spec.ts b/packages/bits-ui/src/tests/toolbar/Toolbar.spec.ts
@@ -205,9 +205,6 @@ describe("toolbar", () => {
 			singleProps: { onValueChange: singleOnValueChange },
 		});
 
-		expect(newMultipleValue).toStrictEqual(["bold"]);
-		expect(newSingleValue).toBe(undefined);
-
 		await user.click(groupMultipleItemStrikethrough);
 		expect(newMultipleValue).toStrictEqual(["bold", "strikethrough"]);
 

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/sites/docs/package.json b/sites/docs/package.json
@@ -15,6 +15,7 @@
 		"check": "pnpm build:content && svelte-kit sync && svelte-check --tsconfig ./tsconfig.json"
 	},
 	"devDependencies": {
+		"@melt-ui/pp": "^0.3.0",
 		"@prettier/sync": "0.3.0",
 		"@sveltejs/adapter-cloudflare": "^4.2.0",
 		"@sveltejs/kit": "^2.5.0",

diff --git a/sites/docs/svelte.config.js b/sites/docs/svelte.config.js
@@ -3,6 +3,7 @@ import url from "node:url";
 import adapter from "@sveltejs/adapter-cloudflare";
 import { vitePreprocess } from "@sveltejs/vite-plugin-svelte";
 import { mdsx } from "mdsx";
+import { preprocessMeltUI, sequence } from "@melt-ui/pp";
 import { mdsxConfig } from "./mdsx.config.js";
 
 const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
@@ -11,13 +12,16 @@ const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
 const config = {
 	preprocess: [
 		mdsx(mdsxConfig),
-		vitePreprocess({
-			style: {
-				css: {
-					postcss: path.join(__dirname, "postcss.config.cjs"),
+		sequence([
+			vitePreprocess({
+				style: {
+					css: {
+						postcss: path.join(__dirname, "postcss.config.cjs"),
+					},
 				},
-			},
-		}),
+			}),
+			preprocessMeltUI(),
+		]),
 	],
 	extensions: [".svelte", ".md"],