fix(prevent-scroll): wait for presence to finish before enabling scro…

…ll (#447)
kobaltedev · Jul 22, 2024 · 4cf47c8 · 4cf47c8
1 parent 6cb0499
commit 4cf47c8
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/packages/core/src/combobox/combobox-content.tsx b/packages/core/src/combobox/combobox-content.tsx
@@ -120,7 +120,7 @@ export function ComboboxContent<T extends ValidComponent = "div">(
 
 	createPreventScroll({
 		element: () => ref ?? null,
-		enabled: () => context.isOpen() && context.preventScroll(),
+		enabled: () => context.contentPresent() && context.preventScroll(),
 	});
 
 	createFocusScope(

diff --git a/packages/core/src/dialog/dialog-content.tsx b/packages/core/src/dialog/dialog-content.tsx
@@ -202,7 +202,7 @@ export function DialogContent<T extends ValidComponent = "div">(
 
 	createPreventScroll({
 		element: () => ref ?? null,
-		enabled: () => context.isOpen() && context.preventScroll(),
+		enabled: () => context.contentPresent() && context.preventScroll(),
 	});
 
 	createFocusScope(

diff --git a/packages/core/src/menu/menu-content.tsx b/packages/core/src/menu/menu-content.tsx
@@ -37,7 +37,7 @@ export function MenuContent<T extends ValidComponent = "div">(
 
 	createPreventScroll({
 		element: () => ref ?? null,
-		enabled: () => context.isOpen() && rootContext.preventScroll(),
+		enabled: () => context.contentPresent() && rootContext.preventScroll(),
 	});
 
 	return (

diff --git a/packages/core/src/popover/popover-content.tsx b/packages/core/src/popover/popover-content.tsx
@@ -206,7 +206,7 @@ export function PopoverContent<T extends ValidComponent = "div">(
 
 	createPreventScroll({
 		element: () => ref ?? null,
-		enabled: () => context.isOpen() && context.preventScroll(),
+		enabled: () => context.contentPresent() && context.preventScroll(),
 	});
 
 	createFocusScope(

diff --git a/packages/core/src/select/select-content.tsx b/packages/core/src/select/select-content.tsx
@@ -111,7 +111,7 @@ export function SelectContent<T extends ValidComponent = "div">(
 
 	createPreventScroll({
 		element: () => ref ?? null,
-		enabled: () => context.isOpen() && context.preventScroll(),
+		enabled: () => context.contentPresent() && context.preventScroll(),
 	});
 
 	createFocusScope(