From 8d1756ddb4efd5d73e6d82d7b1e41d7634c494c6 Mon Sep 17 00:00:00 2001
From: Hunter Johnston <johnstonhuntera@gmail.com>
Date: Tue, 9 Jan 2024 15:28:00 -0500
Subject: [PATCH] fix: menubar props

---
 .changeset/good-tigers-turn.md                      | 5 +++++
 .changeset/shaggy-ears-brush.md                     | 5 +++++
 src/lib/bits/menubar/components/menubar-menu.svelte | 3 ---
 src/lib/bits/menubar/components/menubar.svelte      | 4 +++-
 4 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/good-tigers-turn.md
 create mode 100644 .changeset/shaggy-ears-brush.md

diff --git a/.changeset/good-tigers-turn.md b/.changeset/good-tigers-turn.md
new file mode 100644
index 000000000..0f152ebb9
--- /dev/null
+++ b/.changeset/good-tigers-turn.md
@@ -0,0 +1,5 @@
+---
+"bits-ui": minor
+---
+
+Menubar: move `preventScroll` prop from `Menubar.Menu` to `Menubar.Root`
diff --git a/.changeset/shaggy-ears-brush.md b/.changeset/shaggy-ears-brush.md
new file mode 100644
index 000000000..2611e4be9
--- /dev/null
+++ b/.changeset/shaggy-ears-brush.md
@@ -0,0 +1,5 @@
+---
+"bits-ui": patch
+---
+
+Alert Dialog: Fix bug with exit transitions
diff --git a/src/lib/bits/menubar/components/menubar-menu.svelte b/src/lib/bits/menubar/components/menubar-menu.svelte
index c89863543..ff65a0151 100644
--- a/src/lib/bits/menubar/components/menubar-menu.svelte
+++ b/src/lib/bits/menubar/components/menubar-menu.svelte
@@ -9,7 +9,6 @@
 	export let portal: $$Props["portal"] = undefined;
 	export let open: $$Props["open"] = undefined;
 	export let onOpenChange: $$Props["onOpenChange"] = undefined;
-	export let preventScroll: $$Props["preventScroll"] = undefined;
 	export let loop: $$Props["loop"] = undefined;
 	export let dir: $$Props["dir"] = undefined;
 	export let typeahead: $$Props["typeahead"] = undefined;
@@ -27,7 +26,6 @@
 		closeOnOutsideClick,
 		closeOnEscape,
 		portal,
-		preventScroll,
 		loop,
 		dir,
 		typeahead,
@@ -57,7 +55,6 @@
 	$: updateOption("closeOnOutsideClick", closeOnOutsideClick);
 	$: updateOption("closeOnEscape", closeOnEscape);
 	$: updateOption("portal", portal);
-	$: updateOption("preventScroll", preventScroll);
 	$: updateOption("loop", loop);
 	$: updateOption("dir", dir);
 	$: updateOption("closeFocus", closeFocus);
diff --git a/src/lib/bits/menubar/components/menubar.svelte b/src/lib/bits/menubar/components/menubar.svelte
index 4670f2af9..5afe3f964 100644
--- a/src/lib/bits/menubar/components/menubar.svelte
+++ b/src/lib/bits/menubar/components/menubar.svelte
@@ -10,6 +10,7 @@
 	export let closeOnEscape: $$Props["closeOnEscape"] = true;
 	export let asChild: $$Props["asChild"] = false;
 	export let id: $$Props["id"] = undefined;
+	export let preventScroll: $$Props["preventScroll"] = undefined;
 	export let el: $$Props["el"] = undefined;
 
 	const {
@@ -17,7 +18,7 @@
 		updateOption,
 		ids,
 		getMenubarAttrs
-	} = setCtx({ loop, closeOnEscape });
+	} = setCtx({ loop, closeOnEscape, preventScroll });
 
 	const idValues = derived([ids.menubar], ([$menubarId]) => ({
 		menubar: $menubarId
@@ -30,6 +31,7 @@
 
 	$: updateOption("loop", loop);
 	$: updateOption("closeOnEscape", closeOnEscape);
+	$: updateOption("preventScroll", preventScroll);
 	$: builder = $menubar;
 	$: Object.assign(builder, attrs);
 </script>