chore(Modal): remove FloatingFocusManager (#2224)

resolves #2215
digdir · Aug 12, 2024 · 795bbe1 · 795bbe1
1 parent 23192dd
commit 795bbe1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/.changeset/shaggy-bears-tan.md b/.changeset/shaggy-bears-tan.md
@@ -0,0 +1,5 @@
+---
+"@digdir/designsystemet-react": patch
+---
+
+Modal: remove `FloatingFocusManager`
diff --git a/packages/react/src/components/Modal/ModalDialog.tsx b/packages/react/src/components/Modal/ModalDialog.tsx
@@ -1,8 +1,4 @@
-import {
-  FloatingFocusManager,
-  useFloating,
-  useMergeRefs,
-} from '@floating-ui/react';
+import { useMergeRefs } from '@floating-ui/react';
 import { Slot } from '@radix-ui/react-slot';
 import cl from 'clsx/lite';
 import type { DialogHTMLAttributes } from 'react';
@@ -48,7 +44,6 @@ export const ModalDialog = forwardRef<HTMLDialogElement, ModalDialogProps>(
 
     // This local ref is used to make sure the modal works without a ModalRoot
     const modalDialogRef = useRef<HTMLDialogElement>(null);
-    const { context } = useFloating();
     const { modalRef, setOpen, setCloseModal } = useContext(ModalContext);
     const open = useModalState(modalDialogRef);
 
@@ -119,12 +114,7 @@ export const ModalDialog = forwardRef<HTMLDialogElement, ModalDialogProps>(
         onCancel={onCancel}
         {...rest}
       >
-        {open && (
-          <FloatingFocusManager context={context}>
-            {/* biome-ignore lint/complexity/noUselessFragments: Workaround for @radix-ui/react-slot support */}
-            <>{children}</>
-          </FloatingFocusManager>
-        )}
+        {children}
       </Component>
     );
   },