Forbedrer hindring av escape-tast for å lukke utloggingsvarsel

navikt · Dec 18, 2023 · 9a5c89e · 9a5c89e
1 parent e3b9788
commit 9a5c89e
Showing 1 changed file with 19 additions and 3 deletions.
diff --git a/src/komponenter/header/logoutWarning/LogoutWarning.tsx b/src/komponenter/header/logoutWarning/LogoutWarning.tsx
@@ -22,6 +22,20 @@ export const LogoutWarning = () => {
     } = useLoginStatus();
     const [isOpen, setIsOpen] = React.useState(false);
     const { language } = useSelector((state: AppState) => state.language);
+    const dialogRef = React.useRef<HTMLDialogElement>(null);
+
+    useEffect(() => {
+        const dialog = dialogRef.current;
+        if (!dialog) {
+            return;
+        }
+
+        window.addEventListener('keydown', onKeydownHandler);
+
+        return () => {
+            window.removeEventListener('keydown', onKeydownHandler);
+        };
+    }, [dialogRef.current]);
 
     useEffect(() => {
         if (isTokenExpiring || isSessionExpiring) {
@@ -34,8 +48,10 @@ export const LogoutWarning = () => {
         setIsOpen(false);
     };
 
-    const onBeforeCloseHandler = () => {
-        return false;
+    const onKeydownHandler = (e: KeyboardEvent) => {
+        if (e.key === 'Escape') {
+            e.preventDefault();
+        }
     };
 
     if (typeof document === 'undefined') {
@@ -71,12 +87,12 @@ export const LogoutWarning = () => {
         <Modal
             open={isOpen}
             onClose={onCloseHandler}
-            onBeforeClose={onBeforeCloseHandler}
             header={{
                 heading: finnTekst(titleId, language, minutesToSessionEnd.toString()),
                 closeButton: false,
             }}
             className={classNames(styles.logoutWarning, isOpen && styles.visible)}
+            ref={dialogRef}
         >
             <Modal.Body className={styles.content}>
                 <BodyLong spacing>{finnTekst(textBodyId, language)}</BodyLong>