feat(amount): add atom imports;

core-ds · Dec 23, 2024 · e840ca3 · e840ca3
1 parent de4a9dc
commit e840ca3
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 64 deletions.
diff --git a/.changeset/brown-coins-sing.md b/.changeset/brown-coins-sing.md
diff --git a/.changeset/flat-oranges-heal.md b/.changeset/flat-oranges-heal.md
@@ -0,0 +1,5 @@
+---
+'@alfalab/core-components-amount': minor
+---
+
+Добавлены атомарные импорты
diff --git a/packages/amount/src/docs/development.mdx b/packages/amount/src/docs/development.mdx
@@ -6,11 +6,11 @@ import styles from '!!raw-loader!../index.module.css';
 ## Подключение
 
 ```jsx
-// Атомарные импорты
-import { AmountComponent, Pure } from '@alfalab/core-components/amount';
-
 // Компаунд импорт
 import { Amount } from '@alfalab/core-components/amount';
+
+// Атомарные импорты
+import { AmountComponent, Pure } from '@alfalab/core-components/amount';
 ```
 
 ## Свойства

diff --git a/packages/amount/src/index.ts b/packages/amount/src/index.ts
@@ -1,8 +1,7 @@
-import { PureAmount } from './pure/component';
 import { Amount as DefaultAmount } from './component';
+import { PureAmount } from './pure';
 
 type AmountType = typeof DefaultAmount & { Pure: typeof PureAmount };
-
 export const Amount: AmountType = DefaultAmount as AmountType;
 Amount.Pure = PureAmount;
 

diff --git a/packages/modal/src/Component.responsive.tsx b/packages/modal/src/Component.responsive.tsx
@@ -38,11 +38,3 @@ export const ModalResponsive = Object.assign(ModalResponsiveComponent, {
 });
 
 ModalResponsiveComponent.displayName = 'ModalResponsiveComponent';
-
-export {
-    ModalResponsiveComponent as ModalComponentResponsive,
-    Header as HeaderResponsive,
-    Content as ContentResponsive,
-    Footer as FooterResponsive,
-    Controls as ControlsResponsive,
-};
diff --git a/packages/modal/src/desktop/Component.desktop.tsx b/packages/modal/src/desktop/Component.desktop.tsx
@@ -11,20 +11,9 @@ const ModalDesktopComponent = forwardRef<HTMLDivElement, ModalDesktopProps>((pro
     <Modal {...props} ref={ref} view='desktop' />
 ));
 
-const HeaderDesktop = Header as React.FC<Omit<HeaderProps, 'titleSize' | 'subtitle'>>;
-const ControlsDesktop = Controls as React.FC<Omit<ControlsProps, 'mobileLayout'>>;
-
 export const ModalDesktop = Object.assign(ModalDesktopComponent, {
     Content,
-    Header: HeaderDesktop,
+    Header: Header as React.FC<Omit<HeaderProps, 'titleSize' | 'subtitle'>>,
     Footer,
-    Controls: ControlsDesktop,
+    Controls: Controls as React.FC<Omit<ControlsProps, 'mobileLayout'>>,
 });
-
-export {
-    ModalDesktopComponent as ModalComponentDesktop,
-    Content as ContentDesktop,
-    HeaderDesktop,
-    Footer as FooterDesktop,
-    ControlsDesktop,
-};
diff --git a/packages/modal/src/desktop/index.ts b/packages/modal/src/desktop/index.ts
@@ -1,2 +1,2 @@
 export * from './Component.desktop';
-export { type ModalDesktopProps } from '../typings';
+export { ModalDesktopProps } from '../typings';
diff --git a/packages/modal/src/docs/description.mdx b/packages/modal/src/docs/description.mdx
@@ -4,8 +4,6 @@ Modal построен как Compound Components. Состоит из Header, C
 Чтобы во время скролла заголовок и кнопки оставались неподвижны, их нужно расположить в `header` и `footer`.
 Текст и изображения всегда располагаются в `content` части.
 
-Также есть атомарные импорты.
-
 ```jsx live mobileHeight={640}
 const Header = () => {
     const { setHasHeader } = React.useContext(ModalContext);

diff --git a/packages/modal/src/docs/development.mdx b/packages/modal/src/docs/development.mdx
@@ -1,24 +1,19 @@
 import { ArgsTabs, CssVars } from 'storybook/blocks';
-import { ModalDesktop, ModalMobile, Modal as ModalResponsive } from '..';
+import { ModalMobile } from '../mobile';
+import { ModalDesktop } from '../desktop';
+import { ModalResponsive } from '../Component.responsive';
 import vars from '!!raw-loader!../vars.css';
 
 ## Подключение
 
 ```jsx
-// Атомарные импорты
-import { ModalComponentDesktop, ContentDesktop, HeaderDesktop, FooterDesktop, ControlsDesktop } from '@alfalab/core-components/modal';
-import { ModalComponentMobile, ContentMobile, HeaderMobile, FooterMobile, ControlsMobile } from '@alfalab/core-components/modal';
-import { ModalComponentResponsive, ContentResponsive, HeaderResponsive, FooterResponsive, ControlsResponsive } from '@alfalab/core-components/modal';
+import { Modal } from '@alfalab/core-components/modal';
+import { ModalDesktop } from '@alfalab/core-components/modal/desktop';
+import { ModalMobile } from '@alfalab/core-components/modal/mobile';
 
-// Компаунд импорты
-import { Modal, ModalDesktop, ModalMobile } from '@alfalab/core-components/modal';
-
-// Контекст
 import { ModalContext } from '@alfalab/core-components/modal/shared';
 ```
 
-Импорт Modal - респонсивный компаунд
-
 ## Использование контекста
 
 Компонент модального окна предоставляет доступ к контексту, что позволяет гибко настраивать и расширять компонент, а также упрощает использование.
@@ -48,8 +43,8 @@ export type ModalContext = {
 
 ## Использование dataTestId
 
-В компоненте используются модификаторы для `dataTestId`.
-Для удобного поиска элементов можно воспользоваться функцией `getModalTestIds`.
+В компоненте используются модификаторы для `dataTestId`.  
+Для удобного поиска элементов можно воспользоваться функцией `getModalTestIds`.  
 Импорт из `@alfalab/core-components/modal/shared`.
 
 Функция возвращает объект:

diff --git a/packages/modal/src/index.ts b/packages/modal/src/index.ts
@@ -1,4 +1,2 @@
-export * from './desktop';
-export * from './mobile';
 export { ModalResponsive as Modal } from './Component.responsive';
-export { type ModalResponsiveProps as ModalProps } from './typings';
+export { ModalResponsiveProps as ModalProps } from './typings';
diff --git a/packages/modal/src/mobile/Component.mobile.tsx b/packages/modal/src/mobile/Component.mobile.tsx
@@ -11,19 +11,9 @@ const ModalMobileComponent = forwardRef<HTMLDivElement, ModalMobileProps>((props
     <Modal {...props} ref={ref} view='mobile' />
 ));
 
-const ControlsMobile = Controls as React.FC<Omit<ControlsProps, 'mobileLayout'>>;
-
 export const ModalMobile = Object.assign(ModalMobileComponent, {
     Content,
     Header,
     Footer,
-    Controls: ControlsMobile,
+    Controls: Controls as React.FC<Omit<ControlsProps, 'mobileLayout'>>,
 });
-
-export {
-    ModalMobileComponent as ModalComponentMobile,
-    Content as ContentMobile,
-    Header as HeaderMobile,
-    Footer as FooterMobile,
-    ControlsMobile,
-};
diff --git a/packages/modal/src/mobile/index.ts b/packages/modal/src/mobile/index.ts
@@ -1,2 +1,2 @@
 export * from './Component.mobile';
-export { type ModalMobileProps } from '../typings';
+export { ModalMobileProps } from '../typings';