Skip to content

Commit 4cf47c8

Browse files
authored
fix(prevent-scroll): wait for presence to finish before enabling scroll (#447)
1 parent 6cb0499 commit 4cf47c8

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

packages/core/src/combobox/combobox-content.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ export function ComboboxContent<T extends ValidComponent = "div">(
120120

121121
createPreventScroll({
122122
element: () => ref ?? null,
123-
enabled: () => context.isOpen() && context.preventScroll(),
123+
enabled: () => context.contentPresent() && context.preventScroll(),
124124
});
125125

126126
createFocusScope(

packages/core/src/dialog/dialog-content.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ export function DialogContent<T extends ValidComponent = "div">(
202202

203203
createPreventScroll({
204204
element: () => ref ?? null,
205-
enabled: () => context.isOpen() && context.preventScroll(),
205+
enabled: () => context.contentPresent() && context.preventScroll(),
206206
});
207207

208208
createFocusScope(

packages/core/src/menu/menu-content.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export function MenuContent<T extends ValidComponent = "div">(
3737

3838
createPreventScroll({
3939
element: () => ref ?? null,
40-
enabled: () => context.isOpen() && rootContext.preventScroll(),
40+
enabled: () => context.contentPresent() && rootContext.preventScroll(),
4141
});
4242

4343
return (

packages/core/src/popover/popover-content.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ export function PopoverContent<T extends ValidComponent = "div">(
206206

207207
createPreventScroll({
208208
element: () => ref ?? null,
209-
enabled: () => context.isOpen() && context.preventScroll(),
209+
enabled: () => context.contentPresent() && context.preventScroll(),
210210
});
211211

212212
createFocusScope(

packages/core/src/select/select-content.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ export function SelectContent<T extends ValidComponent = "div">(
111111

112112
createPreventScroll({
113113
element: () => ref ?? null,
114-
enabled: () => context.isOpen() && context.preventScroll(),
114+
enabled: () => context.contentPresent() && context.preventScroll(),
115115
});
116116

117117
createFocusScope(

0 commit comments

Comments
 (0)