Revert to use open state

mui · Jan 23, 2025 · b2ffe65 · b2ffe65
1 parent 3f111ad
commit b2ffe65
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/packages/react/src/dialog/root/useDialogRoot.ts b/packages/react/src/dialog/root/useDialogRoot.ts
@@ -70,7 +70,7 @@ export function useDialogRoot(params: useDialogRoot.Parameters): useDialogRoot.R
     },
   });
 
-  useScrollLock(mounted && modal, popupElement);
+  useScrollLock(open && modal, popupElement);
 
   const handleFloatingUIOpenChange = (
     nextOpen: boolean,

diff --git a/packages/react/src/menu/root/useMenuRoot.ts b/packages/react/src/menu/root/useMenuRoot.ts
@@ -76,7 +76,7 @@ export function useMenuRoot(parameters: useMenuRoot.Parameters): useMenuRoot.Ret
 
   const { mounted, setMounted, transitionStatus } = useTransitionStatus(open);
 
-  useScrollLock(mounted && modal, triggerElement);
+  useScrollLock(open && modal, triggerElement);
 
   const setOpen = useEventCallback(
     (nextOpen: boolean, event?: Event, reason?: OpenChangeReason) => {

diff --git a/packages/react/src/select/positioner/useSelectPositioner.ts b/packages/react/src/select/positioner/useSelectPositioner.ts
@@ -10,7 +10,7 @@ export function useSelectPositioner(
 ): useSelectPositioner.ReturnValue {
   const { open, alignItemToTrigger, mounted, triggerElement, modal } = useSelectRootContext();
 
-  useScrollLock((alignItemToTrigger || modal) && mounted, triggerElement);
+  useScrollLock((alignItemToTrigger || modal) && open, triggerElement);
 
   const positioning = useAnchorPositioning({
     ...params,

diff --git a/packages/react/src/utils/useScrollLock.ts b/packages/react/src/utils/useScrollLock.ts
@@ -149,6 +149,9 @@ export function useScrollLock(enabled = true, referenceElement?: Element | null)
   );
 
   usePreventScroll({
+    // react-aria will remove the scrollbar offset immediately upon close, since we use `open`,
+    // not `mounted`, to disable/enable the scroll lock. However since there are no inset
+    // scrollbars, no layouting issues occur.
     isDisabled: !isReactAriaHook,
   });