From e249428b3d46553cb975177eb6aa5216f1b96981 Mon Sep 17 00:00:00 2001
From: Eldar <61377022+EldarMuhamethanov@users.noreply.github.com>
Date: Sat, 28 Dec 2024 17:37:45 +0300
Subject: [PATCH] feat(ModalCard,ModalPage): add prop restoreFocus (#8120)

---
 .../components/ModalCard/ModalCard.test.tsx   | 56 +++++++++++++++++++
 .../ModalCard/ModalCardInternal.tsx           |  7 ++-
 .../vkui/src/components/ModalCard/types.ts    |  4 +-
 .../components/ModalPage/ModalPage.test.tsx   | 56 +++++++++++++++++++
 .../ModalPage/ModalPageInternal.tsx           |  2 +
 .../vkui/src/components/ModalPage/types.ts    |  2 +
 6 files changed, 125 insertions(+), 2 deletions(-)

diff --git a/packages/vkui/src/components/ModalCard/ModalCard.test.tsx b/packages/vkui/src/components/ModalCard/ModalCard.test.tsx
index 9790780919..82a3db5419 100644
--- a/packages/vkui/src/components/ModalCard/ModalCard.test.tsx
+++ b/packages/vkui/src/components/ModalCard/ModalCard.test.tsx
@@ -1,7 +1,11 @@
+import { act } from 'react';
+import * as React from 'react';
 import { fireEvent, render, screen } from '@testing-library/react';
 import { baselineComponent, waitCSSTransitionEnd } from '../../testing/utils';
+import { Button } from '../Button/Button';
 import { ConfigProvider } from '../ConfigProvider/ConfigProvider';
 import { ModalCard } from './ModalCard';
+import { type ModalCardProps } from './types';
 
 export const waitModalCardCSSTransitionEnd = async (el: HTMLElement) =>
   await waitCSSTransitionEnd(el);
@@ -126,4 +130,56 @@ describe(ModalCard, () => {
     expect(onClose).toHaveBeenCalledTimes(1);
     expect(onClose).toHaveBeenCalledWith('click-close-button');
   });
+
+  describe('check restoreFocus prop', () => {
+    const Fixture: React.FC<Pick<ModalCardProps, 'restoreFocus'>> = ({ restoreFocus = true }) => {
+      const [open, setOpen] = React.useState(false);
+      return (
+        <>
+          <ConfigProvider platform="vkcom">
+            <ModalCard
+              key="host"
+              id="host"
+              open={open}
+              modalDismissButtonTestId="dismiss-button"
+              data-testid="host"
+              restoreFocus={restoreFocus}
+            />
+            <Button onClick={() => setOpen((v) => !v)} data-testid="open-modal">
+              Открыть
+            </Button>
+          </ConfigProvider>
+        </>
+      );
+    };
+
+    it.each([true, false])('check restoreFocus=%s', async (restoreFocus) => {
+      jest.useFakeTimers();
+      const h = render(<Fixture restoreFocus={restoreFocus} />);
+      expect(h.queryByTestId('host')).toBeFalsy();
+
+      const openButton = h.getByTestId('open-modal');
+      await act(async () => {
+        openButton.focus();
+      });
+      fireEvent.click(openButton);
+      expect(openButton).toHaveFocus();
+
+      await waitModalCardCSSTransitionEnd(h.getByTestId('host'));
+      expect(h.queryByTestId('host')).toBeTruthy();
+      jest.runAllTimers();
+      expect(h.getByTestId('dismiss-button')).toHaveFocus();
+
+      fireEvent.click(openButton);
+      await waitModalCardCSSTransitionEnd(h.getByTestId('host'));
+      expect(h.queryByTestId('host')).toBeFalsy();
+      jest.runAllTimers();
+
+      if (restoreFocus) {
+        expect(openButton).toHaveFocus();
+      } else {
+        expect(openButton).not.toHaveFocus();
+      }
+    });
+  });
 });
diff --git a/packages/vkui/src/components/ModalCard/ModalCardInternal.tsx b/packages/vkui/src/components/ModalCard/ModalCardInternal.tsx
index 835966a2a2..34e2e2cf98 100644
--- a/packages/vkui/src/components/ModalCard/ModalCardInternal.tsx
+++ b/packages/vkui/src/components/ModalCard/ModalCardInternal.tsx
@@ -66,6 +66,7 @@ export const ModalCardInternal = ({
   dismissButtonMode,
   dismissLabel,
   noFocusToDialog,
+  restoreFocus,
   onOpen,
   onOpened,
   onClose = noop,
@@ -136,7 +137,11 @@ export const ModalCardInternal = ({
   );
 
   useScrollLock(!hidden);
-  useFocusTrap(ref, { autoFocus: !noFocusToDialog, disabled: !opened || hidden });
+  useFocusTrap(ref, {
+    autoFocus: !noFocusToDialog,
+    disabled: !opened || hidden,
+    restoreFocus,
+  });
 
   return (
     <ModalOutlet hidden={hidden} onKeyDown={handleEscKeyDown}>
diff --git a/packages/vkui/src/components/ModalCard/types.ts b/packages/vkui/src/components/ModalCard/types.ts
index fb724529a0..9b31dcfb09 100644
--- a/packages/vkui/src/components/ModalCard/types.ts
+++ b/packages/vkui/src/components/ModalCard/types.ts
@@ -1,4 +1,5 @@
 import type { UIEvent } from 'react';
+import { type UseFocusTrapProps } from '../../hooks/useFocusTrap';
 import type { NavIdProps } from '../../lib/getNavId';
 import type { UseBottomSheetHandlers } from '../../lib/sheet';
 import type { ModalCardBaseProps } from '../ModalCardBase/ModalCardBase';
@@ -11,7 +12,8 @@ export type ModalCardCloseReason =
 
 export interface ModalCardProps
   extends NavIdProps,
-    Omit<ModalCardBaseProps, 'id' | 'onClose' | 'onTransitionEnd' | keyof UseBottomSheetHandlers> {
+    Omit<ModalCardBaseProps, 'id' | 'onClose' | 'onTransitionEnd' | keyof UseBottomSheetHandlers>,
+    Pick<UseFocusTrapProps, 'restoreFocus'> {
   /**
    * Состояние видимости.
    *
diff --git a/packages/vkui/src/components/ModalPage/ModalPage.test.tsx b/packages/vkui/src/components/ModalPage/ModalPage.test.tsx
index 6aef5168e7..6dbf12ae50 100644
--- a/packages/vkui/src/components/ModalPage/ModalPage.test.tsx
+++ b/packages/vkui/src/components/ModalPage/ModalPage.test.tsx
@@ -1,8 +1,12 @@
+import { act } from 'react';
+import * as React from 'react';
 import { fireEvent, render } from '@testing-library/react';
 import { ViewWidth } from '../../lib/adaptivity';
 import { baselineComponent, waitCSSTransitionEnd } from '../../testing/utils';
 import { AdaptivityProvider } from '../AdaptivityProvider/AdaptivityProvider';
+import { Button } from '../Button/Button';
 import { ConfigProvider } from '../ConfigProvider/ConfigProvider';
+import { type ModalCardProps } from '../ModalCard/types';
 import { ModalPage } from './ModalPage';
 
 export const waitModalPageCSSTransitionEnd = async (el: HTMLElement) =>
@@ -133,4 +137,56 @@ describe(ModalPage, () => {
     expect(onClose).toHaveBeenCalledTimes(1);
     expect(onClose).toHaveBeenCalledWith('click-close-button', expect.any(Object));
   });
+
+  describe('check restoreFocus prop', () => {
+    const Fixture: React.FC<Pick<ModalCardProps, 'restoreFocus'>> = ({ restoreFocus = true }) => {
+      const [open, setOpen] = React.useState(false);
+      return (
+        <>
+          <ConfigProvider platform="vkcom">
+            <ModalPage
+              key="host"
+              id="host"
+              open={open}
+              restoreFocus={restoreFocus}
+              modalDismissButtonTestId="dismiss-button"
+              data-testid="host"
+            />
+            <Button onClick={() => setOpen((v) => !v)} data-testid="open-modal">
+              Открыть
+            </Button>
+          </ConfigProvider>
+        </>
+      );
+    };
+
+    it.each([true, false])('check restoreFocus=%s', async (restoreFocus) => {
+      jest.useFakeTimers();
+      const h = render(<Fixture restoreFocus={restoreFocus} />);
+      expect(h.queryByTestId('host')).toBeFalsy();
+
+      const openButton = h.getByTestId('open-modal');
+      await act(async () => {
+        openButton.focus();
+      });
+      fireEvent.click(openButton);
+      expect(openButton).toHaveFocus();
+
+      await waitModalPageCSSTransitionEnd(h.getByTestId('host'));
+      expect(h.queryByTestId('host')).toBeTruthy();
+      jest.runAllTimers();
+      expect(h.getByTestId('dismiss-button')).toHaveFocus();
+
+      fireEvent.click(openButton);
+      await waitModalPageCSSTransitionEnd(h.getByTestId('host'));
+      expect(h.queryByTestId('host')).toBeFalsy();
+      jest.runAllTimers();
+
+      if (restoreFocus) {
+        expect(openButton).toHaveFocus();
+      } else {
+        expect(openButton).not.toHaveFocus();
+      }
+    });
+  });
 });
diff --git a/packages/vkui/src/components/ModalPage/ModalPageInternal.tsx b/packages/vkui/src/components/ModalPage/ModalPageInternal.tsx
index 0eeca38da0..f72b159556 100644
--- a/packages/vkui/src/components/ModalPage/ModalPageInternal.tsx
+++ b/packages/vkui/src/components/ModalPage/ModalPageInternal.tsx
@@ -70,6 +70,7 @@ export const ModalPageInternal = ({
   hideCloseButton,
   preventClose,
   disableContentPanningGesture,
+  restoreFocus,
   onOpen,
   onOpened,
   onClose = noop,
@@ -166,6 +167,7 @@ export const ModalPageInternal = ({
       <FocusTrap
         {...restProps}
         autoFocus={!noFocusToDialog}
+        restoreFocus={restoreFocus}
         role="dialog"
         aria-modal="true"
         disabled={!opened || hidden}
diff --git a/packages/vkui/src/components/ModalPage/types.ts b/packages/vkui/src/components/ModalPage/types.ts
index d95363cebf..2f9f14e34b 100644
--- a/packages/vkui/src/components/ModalPage/types.ts
+++ b/packages/vkui/src/components/ModalPage/types.ts
@@ -1,4 +1,5 @@
 import type { CSSProperties, ReactNode, Ref, UIEvent } from 'react';
+import { type UseFocusTrapProps } from '../../hooks/useFocusTrap';
 import type { NavIdProps } from '../../lib/getNavId';
 import type { HTMLAttributesWithRootRef } from '../../types';
 
@@ -15,6 +16,7 @@ type OmittedStyleAttribute = {
 export interface ModalPageProps
   extends NavIdProps,
     Omit<HTMLAttributesWithRootRef<HTMLDivElement>, 'id' | 'style'>,
+    Pick<UseFocusTrapProps, 'restoreFocus'>,
     OmittedStyleAttribute {
   /**
    * Состояние видимости.