Fix: [IGL-105] Made dismissOnEscape optional & removed contain From f…

…ocusScrope (#613)
gsoft-inc · Dec 19, 2023 · 0dda883 · 0dda883
1 parent d8e91b5
commit 0dda883
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.changeset/cuddly-boats-switch.md b/.changeset/cuddly-boats-switch.md
@@ -0,0 +1,6 @@
+---
+"@igloo-ui/dialog": patch
+"@igloo-ui/modal": patch
+---
+
+dismissOnEscape is now optional. 'contain' was removed from FocusScope inside Modal. This was causing errors in OV when dialog displayed above modal.
diff --git a/packages/Dialog/src/Dialog.tsx b/packages/Dialog/src/Dialog.tsx
@@ -12,7 +12,7 @@ export interface DialogProps extends React.ComponentProps<"div"> {
     /** Add a data-test tag for automated tests */
     dataTest?: string;
     /** Whether to close the dialog when the escape key is pressed */
-    dismissOnEscape: boolean;
+    dismissOnEscape?: boolean;
     /** The text for the dismiss button */
     dismissText?: string;
     /** Whether the dialog is open or not */

diff --git a/packages/Modal/src/Modal.tsx b/packages/Modal/src/Modal.tsx
@@ -72,7 +72,7 @@ export interface ModalProps extends OverlayProps, AriaDialogProps {
     /** Whether to close the modal when the escape key is pressed
    * @default true
    */
-    dismissOnEscape: boolean;
+    dismissOnEscape?: boolean;
 }
 
 const Modal: React.FunctionComponent<ModalProps> = (props: ModalProps) => {
@@ -168,7 +168,7 @@ const Modal: React.FunctionComponent<ModalProps> = (props: ModalProps) => {
             </AnimatePresence>
             <AnimatePresence onExitComplete={onExitComplete}>
                 {isOpen && (
-                    <FocusScope restoreFocus autoFocus contain>
+                    <FocusScope restoreFocus autoFocus>
                         <m.div className="ids-modal__wrapper">
                             <m.div
                                 key={`${keyValue}_modal`}