From e2e97b4ac44da732cd27089611b34d2c0878dbf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Grimm?= <pawel@doist.com>
Date: Fri, 30 Aug 2024 12:01:51 -0500
Subject: [PATCH] fix: Disable cross-frame focus lock (#840)

---
 CHANGELOG.md        | 4 ++++
 package-lock.json   | 4 ++--
 package.json        | 2 +-
 src/modal/modal.tsx | 7 ++++++-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0ebb0990..636260f01 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 Reactist follows [semantic versioning](https://semver.org/) and doesn't introduce breaking changes (API-wise) in minor or patch releases. However, the appearance of a component might change in a minor or patch release so keep an eye on redesigns and make sure your app still looks and feels like you expect it.
 
+# v25.1.1
+
+-   [Fix] Restrict focus locking in the `Modal` component to its containing document/iframe.
+
 # v25.1.0
 
 -   [Feat] Add `xsmall` size to the `Modal` component
diff --git a/package-lock.json b/package-lock.json
index 262973ffd..19925100a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@doist/reactist",
-    "version": "25.1.0",
+    "version": "25.1.1",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "@doist/reactist",
-            "version": "25.1.0",
+            "version": "25.1.1",
             "hasInstallScript": true,
             "license": "MIT",
             "dependencies": {
diff --git a/package.json b/package.json
index 384c795b0..c9ebb13bf 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
         "email": "henning@doist.com",
         "url": "http://doist.com"
     },
-    "version": "25.1.0",
+    "version": "25.1.1",
     "license": "MIT",
     "homepage": "https://github.com/Doist/reactist#readme",
     "repository": {
diff --git a/src/modal/modal.tsx b/src/modal/modal.tsx
index e8c8761e8..e3ee2c34c 100644
--- a/src/modal/modal.tsx
+++ b/src/modal/modal.tsx
@@ -247,7 +247,12 @@ export function Modal({
                 onPointerDown={hideOnInteractOutside ? handleBackdropClick : undefined}
                 ref={backdropRef}
             >
-                <FocusLock autoFocus={autoFocus} whiteList={isNotInternalFrame} returnFocus={true}>
+                <FocusLock
+                    autoFocus={autoFocus}
+                    whiteList={isNotInternalFrame}
+                    returnFocus={true}
+                    crossFrame={false}
+                >
                     <Dialog
                         {...props}
                         ref={dialogRef}