From 0be4664184e2ae39aecd52e7522b1811cfecbd1f Mon Sep 17 00:00:00 2001
From: "Jeong, Sejun" <sejun@zigbang.com>
Date: Thu, 3 Jul 2025 15:18:54 +0900
Subject: [PATCH 1/2] fix(dialog): make RemoveScroll and
 disableOutsidePointerEvents work with forceMount

Enable RemoveScroll and disableOutsidePointerEvents only when open to make it work properly when forceMount
---
 packages/react/dialog/src/dialog.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/react/dialog/src/dialog.tsx b/packages/react/dialog/src/dialog.tsx
index 7bf964798..c4853c7b4 100644
--- a/packages/react/dialog/src/dialog.tsx
+++ b/packages/react/dialog/src/dialog.tsx
@@ -203,7 +203,7 @@ const DialogOverlayImpl = React.forwardRef<DialogOverlayImplElement, DialogOverl
     return (
       // Make sure `Content` is scrollable even when it doesn't live inside `RemoveScroll`
       // ie. when `Overlay` and `Content` are siblings
-      <RemoveScroll as={Slot} allowPinchZoom shards={[context.contentRef]}>
+      <RemoveScroll enable={context.isOpen} as={Slot} allowPinchZoom shards={[context.contentRef]}>
         <Primitive.div
           data-state={getState(context.open)}
           {...overlayProps}
@@ -275,7 +275,7 @@ const DialogContentModal = React.forwardRef<DialogContentTypeElement, DialogCont
         // we make sure focus isn't trapped once `DialogContent` has been closed
         // (closed !== unmounted when animating out)
         trapFocus={context.open}
-        disableOutsidePointerEvents
+        disableOutsidePointerEvents={context.open}
         onCloseAutoFocus={composeEventHandlers(props.onCloseAutoFocus, (event) => {
           event.preventDefault();
           context.triggerRef.current?.focus();

From 8c8487e288a18cf4829c99be6a25155ba199aacb Mon Sep 17 00:00:00 2001
From: "Jeong, Sejun" <sejun@zigbang.com>
Date: Thu, 3 Jul 2025 15:35:55 +0900
Subject: [PATCH 2/2] chore: create changeset for #3615

---
 .changeset/green-needles-jump.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/green-needles-jump.md

diff --git a/.changeset/green-needles-jump.md b/.changeset/green-needles-jump.md
new file mode 100644
index 000000000..4164b2eba
--- /dev/null
+++ b/.changeset/green-needles-jump.md
@@ -0,0 +1,5 @@
+---
+"@radix-ui/react-dialog": patch
+---
+
+Fix Dialog's RemoveScroll and disableOutsidePointerEvents work with forceMount