next: fix pointer event restoration (#695)

huntabyte · Sep 29, 2024 · d519a0e · d519a0e
1 parent 18c2ff1
commit d519a0e
Show file tree

Hide file tree

Showing 6 changed files with 5,437 additions and 6,418 deletions.
diff --git a/.changeset/clever-suns-reflect.md b/.changeset/clever-suns-reflect.md
@@ -0,0 +1,5 @@
+---
+"bits-ui": patch
+---
+
+next: fix pointer event restoration
diff --git a/packages/bits-ui/src/lib/bits/menu/components/menu-sub-content.svelte b/packages/bits-ui/src/lib/bits/menu/components/menu-sub-content.svelte
@@ -118,6 +118,7 @@
 	}}
 	preventScroll={false}
 	{loop}
+	trapFocus={false}
 >
 	{#snippet popper({ props })}
 		{@const finalProps = mergeProps(props, mergedProps, {

diff --git a/packages/bits-ui/src/lib/bits/menu/menu.svelte.ts b/packages/bits-ui/src/lib/bits/menu/menu.svelte.ts
@@ -415,6 +415,9 @@ class MenuContentState {
 				onblur: this.#onblur,
 				onpointermove: this.#onpointermove,
 				onfocus: this.#onfocus,
+				style: {
+					pointerEvents: "auto",
+				},
 			}) as const
 	);
 

diff --git a/packages/bits-ui/src/lib/bits/utilities/popper-layer/popper-layer.svelte b/packages/bits-ui/src/lib/bits/utilities/popper-layer/popper-layer.svelte
@@ -74,7 +74,9 @@
 			{customAnchor}
 		>
 			{#snippet content({ props: floatingProps })}
-				<ScrollLock {preventScroll} />
+				{#if preventScroll}
+					<ScrollLock {preventScroll} />
+				{/if}
 				<FocusScope
 					{id}
 					{onOpenAutoFocus}

diff --git a/packages/bits-ui/src/lib/bits/utilities/scroll-lock/scroll-lock.svelte b/packages/bits-ui/src/lib/bits/utilities/scroll-lock/scroll-lock.svelte
@@ -1,13 +1,8 @@
 <script lang="ts">
-	import { untrack } from "svelte";
 	import type { ScrollLockProps } from "./index.js";
 	import { useBodyScrollLock } from "$lib/internal/useBodyScrollLock.svelte.js";
 
 	let { preventScroll = true }: ScrollLockProps = $props();
 
-	$effect(() => {
-		if (preventScroll) {
-			untrack(() => useBodyScrollLock(preventScroll));
-		}
-	});
+	useBodyScrollLock(preventScroll);
 </script>