[core][material-ui] Prevent scrolling when restoring after FocusTrap

Fixes mui#43299
joshkel · Aug 14, 2024 · d1774c0 · d1774c0
1 parent 8968394
commit d1774c0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packages/mui-base/src/FocusTrap/FocusTrap.tsx b/packages/mui-base/src/FocusTrap/FocusTrap.tsx
@@ -201,7 +201,7 @@ function FocusTrap(props: FocusTrapProps): React.JSX.Element {
         // Once IE11 support is dropped the focus() call can be unconditional.
         if (nodeToRestore.current && (nodeToRestore.current as HTMLElement).focus) {
           ignoreNextEnforceFocus.current = true;
-          (nodeToRestore.current as HTMLElement).focus();
+          (nodeToRestore.current as HTMLElement).focus({ preventScroll: true });
         }
 
         nodeToRestore.current = null;

diff --git a/packages/mui-material/src/Unstable_TrapFocus/FocusTrap.tsx b/packages/mui-material/src/Unstable_TrapFocus/FocusTrap.tsx
@@ -193,7 +193,7 @@ function FocusTrap(props: FocusTrapProps): React.JSX.Element {
         // Once IE11 support is dropped the focus() call can be unconditional.
         if (nodeToRestore.current && (nodeToRestore.current as HTMLElement).focus) {
           ignoreNextEnforceFocus.current = true;
-          (nodeToRestore.current as HTMLElement).focus();
+          (nodeToRestore.current as HTMLElement).focus({ preventScroll: true });
         }
 
         nodeToRestore.current = null;