fix: menu onChange functions (#191)

huntabyte · Dec 1, 2023 · 3ead70e · 3ead70e
1 parent 788214f
commit 3ead70e
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 10 deletions.
diff --git a/.changeset/rude-panthers-cough.md b/.changeset/rude-panthers-cough.md
@@ -0,0 +1,5 @@
+---
+"bits-ui": patch
+---
+
+fix: bug where menu `onChange` functions were being called before change  
diff --git a/src/lib/bits/context-menu/components/ContextMenuCheckboxItem.svelte b/src/lib/bits/context-menu/components/ContextMenuCheckboxItem.svelte
@@ -18,8 +18,10 @@
 		disabled,
 		defaultChecked: checked,
 		onCheckedChange: ({ next }) => {
-			checked = next;
-			onCheckedChange?.(next);
+			if (checked !== next) {
+				onCheckedChange?.(next);
+				checked = next;
+			}
 			return next;
 		}
 	});

diff --git a/src/lib/bits/context-menu/components/ContextMenuRadioGroup.svelte b/src/lib/bits/context-menu/components/ContextMenuRadioGroup.svelte
@@ -14,7 +14,7 @@
 	} = setRadioGroupCtx({
 		defaultValue: value,
 		onValueChange: ({ next }) => {
-			if (next) {
+			if (next && value !== next) {
 				onValueChange?.(next);
 				value = next;
 			}

diff --git a/src/lib/bits/dropdown-menu/components/DropdownMenuCheckboxItem.svelte b/src/lib/bits/dropdown-menu/components/DropdownMenuCheckboxItem.svelte
@@ -19,8 +19,10 @@
 		disabled,
 		defaultChecked: checked,
 		onCheckedChange: ({ next }) => {
-			onCheckedChange?.(next);
-			checked = next;
+			if (checked !== next) {
+				onCheckedChange?.(next);
+				checked = next;
+			}
 			return next;
 		}
 	});

diff --git a/src/lib/bits/dropdown-menu/components/DropdownMenuRadioGroup.svelte b/src/lib/bits/dropdown-menu/components/DropdownMenuRadioGroup.svelte
@@ -14,7 +14,7 @@
 	} = setRadioGroupCtx({
 		defaultValue: value,
 		onValueChange: ({ next }) => {
-			if (next) {
+			if (next && value !== next) {
 				onValueChange?.(next);
 				value = next;
 			}

diff --git a/src/lib/bits/menubar/components/MenubarCheckboxItem.svelte b/src/lib/bits/menubar/components/MenubarCheckboxItem.svelte
@@ -19,8 +19,10 @@
 		disabled,
 		defaultChecked: checked,
 		onCheckedChange: ({ next }) => {
-			onCheckedChange?.(next);
-			checked = next;
+			if (checked !== next) {
+				onCheckedChange?.(next);
+				checked = next;
+			}
 			return next;
 		}
 	});

diff --git a/src/lib/bits/menubar/components/MenubarRadioGroup.svelte b/src/lib/bits/menubar/components/MenubarRadioGroup.svelte
@@ -14,9 +14,9 @@
 	} = setRadioGroupCtx({
 		defaultValue: value,
 		onValueChange: ({ next }) => {
-			if (next) {
-				value = next;
+			if (next && next !== value) {
 				onValueChange?.(next);
+				value = next;
 			}
 			return next;
 		}