Let ModalCard render without portal in e2e

VKCOM · Oct 31, 2024 · d95c854 · d95c854
1 parent 0386808
commit d95c854
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/packages/vkui/src/components/ModalCard/ModalCard.e2e-playground.tsx b/packages/vkui/src/components/ModalCard/ModalCard.e2e-playground.tsx
@@ -130,6 +130,7 @@ export const ModalCardPlayground = (props: ComponentPlaygroundProps) => {
         <div style={{ height: 500, transform: 'translateZ(0)' }}>
           <ModalRoot
             activeModal={props.nav}
+            usePortal={false}
             // Note: с включенным фокусом ломаются скриншоты на движке Webkit из-за фокуса сразу
             // на несколько окон
             noFocusToDialog

diff --git a/packages/vkui/src/components/ModalRoot/ModalRoot.tsx b/packages/vkui/src/components/ModalRoot/ModalRoot.tsx
@@ -545,7 +545,7 @@ class ModalRootTouchComponent extends React.Component<
     }
 
     return (
-      <ModalPopoutPortal className={styles.host}>
+      <ModalPopoutPortal className={styles.host} usePortal={this.props.usePortal}>
         <TouchRootContext.Provider value={true}>
           <ModalRootContext.Provider value={this.modalRootContext}>
             <Touch

diff --git a/packages/vkui/src/components/ModalRoot/types.ts b/packages/vkui/src/components/ModalRoot/types.ts
@@ -1,5 +1,6 @@
 import type { DOMContextInterface } from '../../lib/dom';
 import type { HasPlatform } from '../../types';
+import type { AppRootPortalProps } from '../AppRoot/AppRootPortal';
 import type { ConfigProviderContextInterface } from '../ConfigProvider/ConfigProviderContext';
 
 export type ModalType = 'page' | 'card';
@@ -105,6 +106,8 @@ export interface ModalRootProps {
    * Отключает фокус на контейнер диалогового окна при открытии.
    */
   noFocusToDialog?: boolean;
+
+  usePortal?: AppRootPortalProps['usePortal'];
 }
 
 export interface ModalRootWithDOMProps extends HasPlatform, ModalRootProps, DOMContextInterface {