Flytt onBeforeClose til å være siste sjekk i handleModalClick

navikt · Feb 23, 2024 · f22d48e · f22d48e
1 parent 50666f2
commit f22d48e
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/@navikt/core/react/src/modal/Modal.tsx b/@navikt/core/react/src/modal/Modal.tsx
@@ -169,10 +169,6 @@ export const Modal = forwardRef<HTMLDialogElement, ModalProps>(
         return;
       }
 
-      if (onBeforeClose !== undefined && onBeforeClose() === false) {
-        return;
-      }
-
       const modalRect = modalRef.current.getBoundingClientRect();
 
       if (!clickWasOutside(mouseClickStart.current, modalRect)) {
@@ -185,6 +181,10 @@ export const Modal = forwardRef<HTMLDialogElement, ModalProps>(
         return;
       }
 
+      if (onBeforeClose !== undefined && onBeforeClose() === false) {
+        return;
+      }
+
       modalRef.current.close();
     };