fix: restore focus in FocusScope containment without scrolling the dialog into view

packages/react-aria/src/focus/FocusScope.tsx

@@ -410,7 +410,7 @@ function useFocusContainment(scopeRef: RefObject<Element[] | null>, contain?: bo
         // If a focus event occurs outside the active scope (e.g. user tabs from browser location bar),
         // restore focus to the previously focused node or the first tabbable element in the active scope.
         if (focusedNode.current) {
-          focusedNode.current.focus();
+          focusElement(focusedNode.current);
         } else if (activeScope && activeScope.current) {
           focusFirstInScope(activeScope.current);
         }
@@ -444,7 +444,7 @@ function useFocusContainment(scopeRef: RefObject<Element[] | null>, contain?: bo
           let target = getEventTarget(e) as FocusableElement;
           if (target && target.isConnected) {
             focusedNode.current = target;
-            focusedNode.current?.focus();
+            focusElement(focusedNode.current);
           } else if (activeScope.current) {
             focusFirstInScope(activeScope.current);
           }

packages/react-aria/test/focus/FocusScope.test.js

@@ -23,13 +23,22 @@ import {DialogContainer} from '@adobe/react-spectrum/DialogContainer';
 import {enableShadowDOM} from 'react-stately/private/flags/flags';
 import {FocusScope, useFocusManager} from '../../src/focus/FocusScope';
 import {focusScopeTree} from '../../src/focus/FocusScope';
+import {focusSafely} from '../../src/interactions/focusSafely';
 import {Provider} from '@adobe/react-spectrum/Provider';
 import React, {useEffect, useState} from 'react';
 import ReactDOM from 'react-dom';
 import {Example as StorybookExample} from '../../stories/focus/FocusScope.stories';
 import {useEvent} from '../../src/utils/useEvent';
 import userEvent from '@testing-library/user-event';
 
+jest.mock('../../src/interactions/focusSafely', () => {
+  let actual = jest.requireActual('../../src/interactions/focusSafely');
+  return {
+    ...actual,
+    focusSafely: jest.fn(actual.focusSafely)
+  };
+});
+
 describe('FocusScope', function () {
   let user;
 
@@ -324,11 +333,13 @@ describe('FocusScope', function () {
       });
       expect(document.activeElement).toBe(input2);
 
+      focusSafely.mockClear();
       act(() => {
         outside.focus();
       });
       fireEvent.focusIn(outside);
       expect(document.activeElement).toBe(input2);
+      expect(focusSafely).toHaveBeenCalledWith(input2);
     });
 
     it('should restore focus to the last focused element in the scope on focus out', async function () {
@@ -357,13 +368,16 @@ describe('FocusScope', function () {
       });
       expect(document.activeElement).toBe(input2);
 
+      focusSafely.mockClear();
+
       act(() => {
         input2.blur();
       });
       act(() => {
         jest.runAllTimers();
       });
       expect(document.activeElement).toBe(input2);
+      expect(focusSafely).toHaveBeenCalledWith(input2);
       fireEvent.focusOut(input2);
       expect(document.activeElement).toBe(input2);
     });