fix(sdds-*,plasma-*,caldera-online): Update Portal component usage

salute-developers · Jul 16, 2024 · 719734a · 719734a
1 parent 885bb38
commit 719734a
Show file tree

Hide file tree

Showing 27 changed files with 25 additions and 98 deletions.
diff --git a/packages/caldera-online/api/caldera-online.api.md b/packages/caldera-online/api/caldera-online.api.md
@@ -58,6 +58,7 @@ import { PopupInfo } from '@salutejs/plasma-new-hope/styled-components';
 import { PopupPlacement } from '@salutejs/plasma-new-hope/styled-components';
 import { PopupProps } from '@salutejs/plasma-new-hope/styled-components';
 import { PopupProvider } from '@salutejs/plasma-new-hope/styled-components';
+import { Portal } from '@salutejs/plasma-new-hope/styled-components';
 import { PortalProps } from '@salutejs/plasma-new-hope/styled-components';
 import { PropsType } from '@salutejs/plasma-new-hope/types/engines/types';
 import { RadioGroup } from '@salutejs/plasma-new-hope/styled-components';
@@ -88,7 +89,6 @@ import { ToastRole } from '@salutejs/plasma-new-hope/styled-components';
 import { usePopupContext } from '@salutejs/plasma-new-hope/styled-components';
 import { useSegment } from '@salutejs/plasma-new-hope/styled-components';
 import { useToast } from '@salutejs/plasma-new-hope/styled-components';
-import { Variants } from '@salutejs/plasma-new-hope/types/engines/types';
 
 export { addFocus }
 
@@ -441,8 +441,7 @@ export { PopupProps }
 
 export { PopupProvider }
 
-// @public (undocumented)
-export const Portal: FunctionComponent<PropsType<Variants> & PortalProps & RefAttributes<HTMLDivElement>>;
+export { Portal }
 
 export { PortalProps }
 

diff --git a/packages/caldera-online/src/components/Portal/Portal.stories.tsx b/packages/caldera-online/src/components/Portal/Portal.stories.tsx
@@ -7,7 +7,7 @@ import styled from 'styled-components';
 import { Button } from '../Button/Button';
 import { BodyM } from '../Typography';
 
-import { Portal } from './Portal';
+import { Portal } from '.';
 
 const meta: Meta<typeof Portal> = {
     title: 'Controls/Portal',

diff --git a/packages/caldera-online/src/components/Portal/Portal.tsx b/packages/caldera-online/src/components/Portal/Portal.tsx
diff --git a/packages/caldera-online/src/components/Portal/index.ts b/packages/caldera-online/src/components/Portal/index.ts
@@ -1,3 +1,3 @@
-export { Portal } from './Portal';
+export { Portal } from '@salutejs/plasma-new-hope/styled-components';
 
 export type { PortalProps } from '@salutejs/plasma-new-hope/styled-components';
diff --git a/packages/plasma-b2c/api/plasma-b2c.api.md b/packages/plasma-b2c/api/plasma-b2c.api.md
@@ -185,6 +185,7 @@ import { PopupProps as PopupBaseProps } from '@salutejs/plasma-new-hope/styled-c
 import { PopupProvider as PopupBaseProvider } from '@salutejs/plasma-new-hope/styled-components';
 import { PopupInfo } from '@salutejs/plasma-new-hope/styled-components';
 import { PopupProps } from '@salutejs/plasma-hope';
+import { Portal } from '@salutejs/plasma-new-hope/styled-components';
 import { PortalProps } from '@salutejs/plasma-new-hope/styled-components';
 import { PreviewGallery } from '@salutejs/plasma-hope';
 import { PreviewGalleryItemProps } from '@salutejs/plasma-hope';
@@ -1672,8 +1673,7 @@ export { PopupInfo }
 
 export { PopupProps }
 
-// @public (undocumented)
-export const Portal: FunctionComponent<PropsType<Variants> & PortalProps & RefAttributes<HTMLDivElement>>;
+export { Portal }
 
 export { PortalProps }
 

diff --git a/packages/plasma-b2c/src/components/Portal/Portal.stories.tsx b/packages/plasma-b2c/src/components/Portal/Portal.stories.tsx
@@ -7,7 +7,7 @@ import styled from 'styled-components';
 import { Button } from '../Button/Button';
 import { BodyM } from '../Typography';
 
-import { Portal } from './Portal';
+import { Portal } from '.';
 
 const meta: Meta<typeof Portal> = {
     title: 'Controls/Portal',

diff --git a/packages/plasma-b2c/src/components/Portal/Portal.tsx b/packages/plasma-b2c/src/components/Portal/Portal.tsx
diff --git a/packages/plasma-b2c/src/components/Portal/index.ts b/packages/plasma-b2c/src/components/Portal/index.ts
@@ -1,3 +1,3 @@
-export { Portal } from './Portal';
+export { Portal } from '@salutejs/plasma-new-hope/styled-components';
 
 export type { PortalProps } from '@salutejs/plasma-new-hope/styled-components';
diff --git a/packages/plasma-new-hope/src/components/Popover/Popover.tsx b/packages/plasma-new-hope/src/components/Popover/Popover.tsx
@@ -3,10 +3,9 @@ import type { CSSProperties } from 'react';
 import { usePopper } from 'react-popper';
 import { useFocusTrap, useForkRef } from '@salutejs/plasma-core';
 
-import { component, mergeConfig } from '../../engines';
 import type { RootProps } from '../../engines/types';
 import { cx } from '../../utils';
-import { portalConfig } from '../Portal';
+import { Portal } from '../Portal';
 
 import { base as viewCSS } from './variations/_view/base';
 import type { PopoverPlacement, PopoverProps } from './Popover.types';
@@ -16,9 +15,6 @@ import { classes } from './Popover.tokens';
 export const ESCAPE_KEYCODE = 27;
 export const POPOVER_PORTAL_ID = 'plasma-popover-root';
 
-const mergedPortalConfig = mergeConfig(portalConfig);
-const Portal = component(mergedPortalConfig);
-
 /**
  * Всплывающее окно с возможностью позиционирования
  * и вызова по клику либо ховеру.

diff --git a/packages/plasma-new-hope/src/components/Popup/Popup.tsx b/packages/plasma-new-hope/src/components/Popup/Popup.tsx
@@ -3,8 +3,7 @@ import { useForkRef, safeUseId } from '@salutejs/plasma-core';
 
 import { RootProps } from '../../engines/types';
 import { cx } from '../../utils';
-import { portalConfig } from '../Portal';
-import { component, mergeConfig } from '../../engines';
+import { Portal } from '../Portal';
 
 import type { PopupPlacementBasic, PopupPlacement, PopupPositionType, PopupProps } from './Popup.types';
 import { POPUP_PORTAL_ID } from './PopupContext';
@@ -79,9 +78,6 @@ export const handlePosition = (
     };
 };
 
-const mergedPortalConfig = mergeConfig(portalConfig);
-const Portal = component(mergedPortalConfig);
-
 /**
  * Базовый копмонент Popup.
  */

diff --git a/packages/plasma-new-hope/src/components/Portal/index.tsx b/packages/plasma-new-hope/src/components/Portal/index.tsx
@@ -1,2 +1,2 @@
-export { portalConfig, portalRoot } from './Portal';
+export { Portal } from './Portal';
 export type { PortalProps } from './Portal.types';
diff --git a/packages/plasma-new-hope/src/examples/plasma_b2c/components/Portal/Portal.stories.tsx b/packages/plasma-new-hope/src/examples/plasma_b2c/components/Portal/Portal.stories.tsx
@@ -6,8 +6,7 @@ import { styled } from '@linaria/react';
 import { Button } from '../Button/Button';
 import { WithTheme } from '../../../_helpers';
 import { Body } from '../../../typograpy/components/Body/Body';
-
-import { Portal } from './Portal';
+import { Portal } from '../../../../components/Portal';
 
 const meta: Meta<typeof Portal> = {
     title: 'plasma_b2c/Portal',

diff --git a/packages/plasma-new-hope/src/examples/plasma_b2c/components/Portal/Portal.ts b/packages/plasma-new-hope/src/examples/plasma_b2c/components/Portal/Portal.ts
diff --git a/packages/plasma-new-hope/src/examples/plasma_web/components/Portal/Portal.stories.tsx b/packages/plasma-new-hope/src/examples/plasma_web/components/Portal/Portal.stories.tsx
@@ -6,8 +6,7 @@ import { styled } from '@linaria/react';
 import { Button } from '../Button/Button';
 import { WithTheme } from '../../../_helpers';
 import { Body } from '../../../typograpy/components/Body/Body';
-
-import { Portal } from './Portal';
+import { Portal } from '../../../../components/Portal';
 
 const meta: Meta<typeof Portal> = {
     title: 'plasma_web/Portal',

diff --git a/packages/plasma-new-hope/src/examples/plasma_web/components/Portal/Portal.ts b/packages/plasma-new-hope/src/examples/plasma_web/components/Portal/Portal.ts
diff --git a/packages/plasma-web/api/plasma-web.api.md b/packages/plasma-web/api/plasma-web.api.md
@@ -185,6 +185,7 @@ import { PopupProps as PopupBaseProps } from '@salutejs/plasma-new-hope/styled-c
 import { PopupProvider as PopupBaseProvider } from '@salutejs/plasma-new-hope/styled-components';
 import { PopupInfo } from '@salutejs/plasma-new-hope/styled-components';
 import { PopupProps } from '@salutejs/plasma-hope';
+import { Portal } from '@salutejs/plasma-new-hope/styled-components';
 import { PortalProps } from '@salutejs/plasma-new-hope/styled-components';
 import { PreviewGallery } from '@salutejs/plasma-hope';
 import { PreviewGalleryItemProps } from '@salutejs/plasma-hope';
@@ -1674,8 +1675,7 @@ export { PopupInfo }
 
 export { PopupProps }
 
-// @public (undocumented)
-export const Portal: FunctionComponent<PropsType<Variants> & PortalProps & RefAttributes<HTMLDivElement>>;
+export { Portal }
 
 export { PortalProps }
 

diff --git a/packages/plasma-web/src/components/Portal/Portal.stories.tsx b/packages/plasma-web/src/components/Portal/Portal.stories.tsx
@@ -7,7 +7,7 @@ import styled from 'styled-components';
 import { Button } from '../Button/Button';
 import { BodyM } from '../Typography';
 
-import { Portal } from './Portal';
+import { Portal } from '.';
 
 const meta: Meta<typeof Portal> = {
     title: 'Controls/Portal',

diff --git a/packages/plasma-web/src/components/Portal/Portal.tsx b/packages/plasma-web/src/components/Portal/Portal.tsx
diff --git a/packages/plasma-web/src/components/Portal/index.ts b/packages/plasma-web/src/components/Portal/index.ts
@@ -1,3 +1,3 @@
-export { Portal } from './Portal';
+export { Portal } from '@salutejs/plasma-new-hope/styled-components';
 
 export type { PortalProps } from '@salutejs/plasma-new-hope/styled-components';
diff --git a/packages/sdds-dfa/api/sdds-dfa.api.md b/packages/sdds-dfa/api/sdds-dfa.api.md
@@ -130,6 +130,7 @@ import { PopupInfo } from '@salutejs/plasma-new-hope/styled-components';
 import { PopupPlacement } from '@salutejs/plasma-new-hope/styled-components';
 import { PopupProps } from '@salutejs/plasma-new-hope/styled-components';
 import { PopupProvider } from '@salutejs/plasma-new-hope/styled-components';
+import { Portal } from '@salutejs/plasma-new-hope/styled-components';
 import { PortalProps } from '@salutejs/plasma-new-hope/styled-components';
 import { ProgressProps } from '@salutejs/plasma-new-hope/styled-components';
 import { PropsType } from '@salutejs/plasma-new-hope/types/engines/types';
@@ -1278,8 +1279,7 @@ export { PopupProps }
 
 export { PopupProvider }
 
-// @public (undocumented)
-export const Portal: FunctionComponent<PropsType<Variants> & PortalProps & RefAttributes<HTMLDivElement>>;
+export { Portal }
 
 export { PortalProps }
 

diff --git a/packages/sdds-dfa/src/components/Portal/Portal.stories.tsx b/packages/sdds-dfa/src/components/Portal/Portal.stories.tsx
@@ -7,7 +7,7 @@ import styled from 'styled-components';
 import { Button } from '../Button/Button';
 import { BodyM } from '../Typography';
 
-import { Portal } from './Portal';
+import { Portal } from '.';
 
 const meta: Meta<typeof Portal> = {
     title: 'Controls/Portal',

diff --git a/packages/sdds-dfa/src/components/Portal/Portal.tsx b/packages/sdds-dfa/src/components/Portal/Portal.tsx
diff --git a/packages/sdds-dfa/src/components/Portal/index.ts b/packages/sdds-dfa/src/components/Portal/index.ts
@@ -1,3 +1,3 @@
-export { Portal } from './Portal';
+export { Portal } from '@salutejs/plasma-new-hope/styled-components';
 
 export type { PortalProps } from '@salutejs/plasma-new-hope/styled-components';
diff --git a/packages/sdds-serv/api/sdds-serv.api.md b/packages/sdds-serv/api/sdds-serv.api.md
@@ -116,6 +116,7 @@ import { PopupInfo } from '@salutejs/plasma-new-hope/styled-components';
 import { PopupPlacement } from '@salutejs/plasma-new-hope/styled-components';
 import { PopupProps } from '@salutejs/plasma-new-hope/styled-components';
 import { PopupProvider } from '@salutejs/plasma-new-hope/styled-components';
+import { Portal } from '@salutejs/plasma-new-hope/styled-components';
 import { PortalProps } from '@salutejs/plasma-new-hope/styled-components';
 import { ProgressProps } from '@salutejs/plasma-new-hope/styled-components';
 import { PropsType } from '@salutejs/plasma-new-hope/types/engines/types';
@@ -1140,8 +1141,7 @@ export { PopupProps }
 
 export { PopupProvider }
 
-// @public (undocumented)
-export const Portal: FunctionComponent<PropsType<Variants> & PortalProps & RefAttributes<HTMLDivElement>>;
+export { Portal }
 
 export { PortalProps }
 

diff --git a/packages/sdds-serv/src/components/Portal/Portal.stories.tsx b/packages/sdds-serv/src/components/Portal/Portal.stories.tsx
@@ -7,7 +7,7 @@ import styled from 'styled-components';
 import { Button } from '../Button/Button';
 import { BodyM } from '../Typography';
 
-import { Portal } from './Portal';
+import { Portal } from '.';
 
 const meta: Meta<typeof Portal> = {
     title: 'Controls/Portal',

diff --git a/packages/sdds-serv/src/components/Portal/Portal.tsx b/packages/sdds-serv/src/components/Portal/Portal.tsx
diff --git a/packages/sdds-serv/src/components/Portal/index.ts b/packages/sdds-serv/src/components/Portal/index.ts
@@ -1,3 +1,3 @@
-export { Portal } from './Portal';
+export { Portal } from '@salutejs/plasma-new-hope/styled-components';
 
 export type { PortalProps } from '@salutejs/plasma-new-hope/styled-components';