From 838e7dcecd84a4dfc47892b0cd82e443983c93d3 Mon Sep 17 00:00:00 2001
From: Zack Rauen <rauenzi@outlook.com>
Date: Thu, 19 Oct 2023 11:18:14 -0400
Subject: [PATCH] Wrap modal in focus lock provider

---
 renderer/src/styles/ui/modal.css | 7 -------
 renderer/src/ui/modals/root.jsx  | 8 ++++----
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/renderer/src/styles/ui/modal.css b/renderer/src/styles/ui/modal.css
index 9f068ade..5d05ee6e 100644
--- a/renderer/src/styles/ui/modal.css
+++ b/renderer/src/styles/ui/modal.css
@@ -85,13 +85,6 @@
     max-height: 100%;
 }
 
-.bd-modal-root > div[role="dialog"] {
-    display: flex;
-    flex: 1;
-    flex-direction: column;
-    overflow: hidden;
-}
-
 .bd-close-button {
     height: 26px;
     padding: 4px;
diff --git a/renderer/src/ui/modals/root.jsx b/renderer/src/ui/modals/root.jsx
index f8848cd2..0191a5b9 100644
--- a/renderer/src/ui/modals/root.jsx
+++ b/renderer/src/ui/modals/root.jsx
@@ -34,14 +34,14 @@ export default function ModalRoot({className, transitionState, children, size =
         }
     });
 
-    return <Spring.animated.div
+    return <FocusLock disableTrack={true}>
+        <Spring.animated.div
                 className={Utilities.className("bd-modal-root", size, className, style)}
                 style={springStyles}
             >
-        <FocusLock disableTrack={true}>
         {children}
-        </FocusLock>
-    </Spring.animated.div>;
+    </Spring.animated.div>
+    </FocusLock>;
     // const [visible, setVisible] = React.useState(true);
 
     // const visible = transitionState < 2;