From 8cbb776ea280b19c9ac8c81fc4a019d84daf5b89 Mon Sep 17 00:00:00 2001
From: atomiks <cc.glows@gmail.com>
Date: Thu, 30 Oct 2025 18:34:55 +1100
Subject: [PATCH 1/3] [popups] Enable scroll lock on touch when modal

---
 .../react/src/combobox/positioner/ComboboxPositioner.tsx | 3 +--
 packages/react/src/menu/root/MenuRoot.tsx                | 9 +++------
 packages/react/src/popover/root/PopoverRoot.tsx          | 3 +--
 .../react/src/select/positioner/SelectPositioner.tsx     | 2 +-
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/packages/react/src/combobox/positioner/ComboboxPositioner.tsx b/packages/react/src/combobox/positioner/ComboboxPositioner.tsx
index eeed547d00e..5276914049a 100644
--- a/packages/react/src/combobox/positioner/ComboboxPositioner.tsx
+++ b/packages/react/src/combobox/positioner/ComboboxPositioner.tsx
@@ -54,7 +54,6 @@ export const ComboboxPositioner = React.forwardRef(function ComboboxPositioner(
   const modal = useStore(store, selectors.modal);
   const open = useStore(store, selectors.open);
   const mounted = useStore(store, selectors.mounted);
-  const openMethod = useStore(store, selectors.openMethod);
   const triggerElement = useStore(store, selectors.triggerElement);
   const inputElement = useStore(store, selectors.inputElement);
   const inputInsidePopup = useStore(store, selectors.inputInsidePopup);
@@ -82,7 +81,7 @@ export const ComboboxPositioner = React.forwardRef(function ComboboxPositioner(
   });
 
   useScrollLock({
-    enabled: open && modal && openMethod !== 'touch',
+    enabled: open && modal,
     mounted,
     open,
     referenceElement: triggerElement,
diff --git a/packages/react/src/menu/root/MenuRoot.tsx b/packages/react/src/menu/root/MenuRoot.tsx
index 17601d34f7e..99d0fa65064 100644
--- a/packages/react/src/menu/root/MenuRoot.tsx
+++ b/packages/react/src/menu/root/MenuRoot.tsx
@@ -190,14 +190,11 @@ export const MenuRoot: React.FC<MenuRoot.Props> = function MenuRoot(props) {
   }, []);
 
   const { mounted, setMounted, transitionStatus } = useTransitionStatus(open);
-  const {
-    openMethod,
-    triggerProps: interactionTypeProps,
-    reset: resetOpenInteractionType,
-  } = useOpenInteractionType(open);
+  const { triggerProps: interactionTypeProps, reset: resetOpenInteractionType } =
+    useOpenInteractionType(open);
 
   useScrollLock({
-    enabled: open && modal && lastOpenChangeReason !== 'trigger-hover' && openMethod !== 'touch',
+    enabled: open && modal && lastOpenChangeReason !== 'trigger-hover',
     mounted,
     open,
     referenceElement: positionerElement,
diff --git a/packages/react/src/popover/root/PopoverRoot.tsx b/packages/react/src/popover/root/PopoverRoot.tsx
index 005386abeff..04a83c61ce6 100644
--- a/packages/react/src/popover/root/PopoverRoot.tsx
+++ b/packages/react/src/popover/root/PopoverRoot.tsx
@@ -51,7 +51,6 @@ function PopoverRootComponent<Payload>({ props }: { props: PopoverRoot.Props<Pay
   const activeTriggerElement = store.useState('activeTriggerElement');
   const payload = store.useState('payload') as Payload | undefined;
   const openReason = store.useState('openReason');
-  const openMethod = store.useState('openMethod');
 
   const { mounted, setMounted, transitionStatus } = useTransitionStatus(open);
 
@@ -82,7 +81,7 @@ function PopoverRootComponent<Payload>({ props }: { props: PopoverRoot.Props<Pay
   }, [store, resolvedTriggerId, open]);
 
   useScrollLock({
-    enabled: open && modal === true && openReason !== 'trigger-hover' && openMethod !== 'touch',
+    enabled: open && modal === true && openReason !== 'trigger-hover',
     mounted,
     open,
     referenceElement: positionerElement,
diff --git a/packages/react/src/select/positioner/SelectPositioner.tsx b/packages/react/src/select/positioner/SelectPositioner.tsx
index 2f39cd55bea..35671070b25 100644
--- a/packages/react/src/select/positioner/SelectPositioner.tsx
+++ b/packages/react/src/select/positioner/SelectPositioner.tsx
@@ -96,7 +96,7 @@ export const SelectPositioner = React.forwardRef(function SelectPositioner(
   React.useImperativeHandle(alignItemWithTriggerActiveRef, () => alignItemWithTriggerActive);
 
   useScrollLock({
-    enabled: (alignItemWithTriggerActive || modal) && open && !touchModality,
+    enabled: (alignItemWithTriggerActive || modal) && open,
     mounted,
     open,
     referenceElement: triggerElement,

From 1009c88139d51adc796f1c99aefcdea221d4adea Mon Sep 17 00:00:00 2001
From: Lukas <llukas.tyla@gmail.com>
Date: Fri, 31 Oct 2025 14:53:25 +0200
Subject: [PATCH 2/3] Update experiment to use `modal` setting

---
 .../experiments/popover/popovers.tsx          | 39 ++++++++++++-------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/docs/src/app/(private)/experiments/popover/popovers.tsx b/docs/src/app/(private)/experiments/popover/popovers.tsx
index 46d686406e3..6b23bb03d9c 100644
--- a/docs/src/app/(private)/experiments/popover/popovers.tsx
+++ b/docs/src/app/(private)/experiments/popover/popovers.tsx
@@ -48,6 +48,13 @@ const contents = [
   </React.Fragment>,
 ];
 
+function PopoverWithSettings<Payload>(
+  props: Popover.Root.Props<Payload> & React.RefAttributes<HTMLDivElement>,
+) {
+  const { settings } = useExperimentSettings<Settings>();
+  return <Popover.Root modal={settings.modal} {...props} />;
+}
+
 export default function Popovers() {
   const { settings } = useExperimentSettings<Settings>();
 
@@ -68,29 +75,29 @@ export default function Popovers() {
       <h1>Popovers</h1>
       <h2>Uncontrolled, single trigger</h2>
       <div className={styles.Container}>
-        <Popover.Root>
+        <PopoverWithSettings>
           <StyledTrigger />
           {renderPopoverContent(0, settings)}
-        </Popover.Root>
-        <Popover.Root>
+        </PopoverWithSettings>
+        <PopoverWithSettings>
           <StyledTrigger />
           {renderPopoverContent(1, settings)}
-        </Popover.Root>
-        <Popover.Root>
+        </PopoverWithSettings>
+        <PopoverWithSettings>
           <StyledTrigger />
           {renderPopoverContent(2, settings)}
-        </Popover.Root>
+        </PopoverWithSettings>
       </div>
 
       <h2>Controlled, single trigger</h2>
       <div className={styles.Container}>
-        <Popover.Root
+        <PopoverWithSettings
           open={singleTriggerOpen}
           onOpenChange={(nextOpen) => setSingleTriggerOpen(nextOpen)}
         >
           <StyledTrigger />
           {renderPopoverContent(0, settings)}
-        </Popover.Root>
+        </PopoverWithSettings>
         <button type="button" className={styles.Button} onClick={() => setSingleTriggerOpen(true)}>
           Open externally
         </button>
@@ -98,7 +105,7 @@ export default function Popovers() {
 
       <h2>Uncontrolled, multiple triggers within Root</h2>
       <div className={styles.Container}>
-        <Popover.Root>
+        <PopoverWithSettings>
           {({ payload }) => (
             <React.Fragment>
               <StyledTrigger payload={0} />
@@ -107,12 +114,12 @@ export default function Popovers() {
               {renderPopoverContent(payload as number, settings)}
             </React.Fragment>
           )}
-        </Popover.Root>
+        </PopoverWithSettings>
       </div>
 
       <h2>Controlled, multiple triggers within Root</h2>
       <div className={styles.Container}>
-        <Popover.Root
+        <PopoverWithSettings
           open={controlledWithinRootOpen}
           onOpenChange={(open, eventDetails) => {
             setControlledWithinRootOpen(open);
@@ -128,7 +135,7 @@ export default function Popovers() {
               {renderPopoverContent(payload as number, settings)}
             </React.Fragment>
           )}
-        </Popover.Root>
+        </PopoverWithSettings>
         <button
           type="button"
           className={styles.Button}
@@ -218,7 +225,13 @@ function StyledPopover(props: StyledPopoverProps<number>) {
   const { settings } = useExperimentSettings<Settings>();
 
   return (
-    <Popover.Root handle={handle} open={open} onOpenChange={onOpenChange} triggerId={triggerId}>
+    <Popover.Root
+      handle={handle}
+      open={open}
+      onOpenChange={onOpenChange}
+      triggerId={triggerId}
+      modal={settings.modal}
+    >
       {({ payload }) => renderPopoverContent(payload, settings)}
     </Popover.Root>
   );

From 69eaa5e039e8bce0860ce7e1126bdfefa6bdbaff Mon Sep 17 00:00:00 2001
From: atomiks <cc.glows@gmail.com>
Date: Mon, 3 Nov 2025 16:44:51 +1100
Subject: [PATCH 3/3] lint

---
 packages/react/src/menu/root/MenuRoot.tsx | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/packages/react/src/menu/root/MenuRoot.tsx b/packages/react/src/menu/root/MenuRoot.tsx
index 32b11b7a600..8b086e01936 100644
--- a/packages/react/src/menu/root/MenuRoot.tsx
+++ b/packages/react/src/menu/root/MenuRoot.tsx
@@ -169,11 +169,8 @@ export const MenuRoot: React.FC<MenuRoot.Props> = function MenuRoot(props) {
 
   store.useSyncedValues({ mounted, transitionStatus });
 
-  const {
-    openMethod,
-    triggerProps: interactionTypeProps,
-    reset: resetOpenInteractionType,
-  } = useOpenInteractionType(open);
+  const { triggerProps: interactionTypeProps, reset: resetOpenInteractionType } =
+    useOpenInteractionType(open);
 
   useScrollLock({
     enabled: open && modal && lastOpenChangeReason !== 'trigger-hover',