feat!: remove configure (i18n from uikit used instead) (#142)

gravity-ui · Feb 6, 2024 · 41475bf · 41475bf
1 parent 6b99075
commit 41475bf
Show file tree

Hide file tree

Showing 32 changed files with 57 additions and 119 deletions.
diff --git a/.storybook/decorators/withLang.tsx b/.storybook/decorators/withLang.tsx
@@ -1,14 +1,10 @@
 import React from 'react';
 
-import {configure as uiKitConfigure} from '@gravity-ui/uikit';
+import {configure} from '@gravity-ui/uikit';
 import type {Decorator} from '@storybook/react';
 
-import {configure} from '../../src';
-
 export const withLang: Decorator = (Story, context) => {
     const lang = context.globals.lang;
-
-    uiKitConfigure({lang});
     configure({lang});
 
     return <Story key={lang} {...context} />;

diff --git a/src/components/AdaptiveTabs/AdaptiveTabs.tsx b/src/components/AdaptiveTabs/AdaptiveTabs.tsx
@@ -9,7 +9,7 @@ import ResizeObserver from 'resize-observer-polyfill';
 import {block} from '../utils/cn';
 
 import {DEFAULT_BREAK_POINTS_CONFIG} from './constants';
-import i18n from './i18n';
+import {i18n} from './i18n';
 
 import './AdaptiveTabs.scss';
 

diff --git a/src/components/AdaptiveTabs/i18n/index.ts b/src/components/AdaptiveTabs/i18n/index.ts
@@ -1,7 +1,8 @@
-import {registerKeyset} from '../../utils/registerKeyset';
+import {addComponentKeysets} from '@gravity-ui/uikit/i18n';
+
+import {NAMESPACE} from '../../utils/cn';
 
 import en from './en.json';
 import ru from './ru.json';
 
-const COMPONENT = 'AdaptiveTabs';
-export default registerKeyset({en, ru}, COMPONENT);
+export const i18n = addComponentKeysets({en, ru}, `${NAMESPACE}adaptive-tabs`);
diff --git a/src/components/ChangelogDialog/ChangelogDialog.tsx b/src/components/ChangelogDialog/ChangelogDialog.tsx
@@ -8,7 +8,7 @@ import {block} from '../utils/cn';
 
 import {ErrorContainer} from './components/ErrorContainer/ErrorContainer';
 import {Item} from './components/Item/Item';
-import i18n from './i18n';
+import {i18n} from './i18n';
 import type {ChangelogItem} from './types';
 
 import './ChangelogDialog.scss';

diff --git a/src/components/ChangelogDialog/components/ErrorContainer/ErrorContainer.tsx b/src/components/ChangelogDialog/components/ErrorContainer/ErrorContainer.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 import {Alert} from '@gravity-ui/uikit';
 
-import i18n from '../../i18n';
+import {i18n} from '../../i18n';
 
 interface ErrorContainerProps {
     onRetryClick?: () => void;

diff --git a/src/components/ChangelogDialog/components/Item/Item.tsx b/src/components/ChangelogDialog/components/Item/Item.tsx
@@ -4,7 +4,7 @@ import {CirclePlay} from '@gravity-ui/icons';
 import {Button, Icon, Label} from '@gravity-ui/uikit';
 
 import {block} from '../../../utils/cn';
-import i18n from '../../i18n';
+import {i18n} from '../../i18n';
 import type {ChangelogItem} from '../../types';
 import {Picture} from '../Picture/Picture';
 

diff --git a/src/components/ChangelogDialog/i18n/index.ts b/src/components/ChangelogDialog/i18n/index.ts
@@ -1,8 +1,8 @@
-import {registerKeyset} from '../../utils/registerKeyset';
+import {addComponentKeysets} from '@gravity-ui/uikit/i18n';
+
+import {NAMESPACE} from '../../utils/cn';
 
 import en from './en.json';
 import ru from './ru.json';
 
-const COMPONENT = 'ChangelogDialog';
-
-export default registerKeyset({en, ru}, COMPONENT);
+export const i18n = addComponentKeysets({en, ru}, `${NAMESPACE}changelog-dialog`);
diff --git a/src/components/CookieConsent/components/ConsentNotification/ConsentNotification.tsx b/src/components/CookieConsent/components/ConsentNotification/ConsentNotification.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import {Alert, Button, Link, useMobile} from '@gravity-ui/uikit';
 
 import {block} from '../../../utils/cn';
-import i18n from '../../i18n';
+import {i18n} from '../../i18n';
 
 import {ConsentNotificationProps} from './types';
 

diff --git a/src/components/CookieConsent/components/ConsentPopup/ConsentPopup.tsx b/src/components/CookieConsent/components/ConsentPopup/ConsentPopup.tsx
@@ -6,7 +6,7 @@ import {Button, Icon, Link, Modal, Text, useDirection, useMobile} from '@gravity
 import {block} from '../../../utils/cn';
 import {ConsentType} from '../../ConsentManager';
 import type {Consents} from '../../ConsentManager';
-import i18n from '../../i18n';
+import {i18n} from '../../i18n';
 import {FoldableList} from '../FoldableList/FoldableList';
 
 import {

diff --git a/src/components/CookieConsent/components/SimpleConsent/SimpleConsent.tsx b/src/components/CookieConsent/components/SimpleConsent/SimpleConsent.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import {Button, Portal} from '@gravity-ui/uikit';
 
 import {block} from '../../../utils/cn';
-import i18n from '../../i18n';
+import {i18n} from '../../i18n';
 
 import {SimpleConsentProps} from './types';
 

diff --git a/src/components/CookieConsent/i18n/index.ts b/src/components/CookieConsent/i18n/index.ts
@@ -1,7 +1,8 @@
-import {registerKeyset} from '../../utils/registerKeyset';
+import {addComponentKeysets} from '@gravity-ui/uikit/i18n';
+
+import {NAMESPACE} from '../../utils/cn';
 
 import en from './en.json';
 import ru from './ru.json';
 
-const COMPONENT = 'CookieConsent';
-export default registerKeyset({en, ru}, COMPONENT);
+export const i18n = addComponentKeysets({en, ru}, `${NAMESPACE}cookie-consent`);
diff --git a/src/components/FormRow/FormRow.tsx b/src/components/FormRow/FormRow.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import {block} from '../utils/cn';
 
 import {FormRowFieldDescription} from './FormRowFieldDescription';
-import i18n from './i18n';
+import {i18n} from './i18n';
 import {FormRowProps} from './types';
 
 import './FormRow.scss';

diff --git a/src/components/FormRow/i18n/index.ts b/src/components/FormRow/i18n/index.ts
@@ -1,8 +1,8 @@
-import {registerKeyset} from '../../utils/registerKeyset';
+import {addComponentKeysets} from '@gravity-ui/uikit/i18n';
+
+import {NAMESPACE} from '../../utils/cn';
 
 import en from './en.json';
 import ru from './ru.json';
 
-const COMPONENT = 'FormRow';
-
-export default registerKeyset({en, ru}, COMPONENT);
+export const i18n = addComponentKeysets({en, ru}, `${NAMESPACE}form-row`);
diff --git a/src/components/ItemSelector/ItemSelector.tsx b/src/components/ItemSelector/ItemSelector.tsx
@@ -5,7 +5,7 @@ import {Button, Icon, List, ListProps} from '@gravity-ui/uikit';
 
 import {block} from '../utils/cn';
 
-import i18n from './i18n';
+import {i18n} from './i18n';
 
 import './ItemSelector.scss';
 

diff --git a/src/components/ItemSelector/i18n/index.ts b/src/components/ItemSelector/i18n/index.ts
@@ -1,7 +1,8 @@
-import {registerKeyset} from '../../utils/registerKeyset';
+import {addComponentKeysets} from '@gravity-ui/uikit/i18n';
+
+import {NAMESPACE} from '../../utils/cn';
 
 import en from './en.json';
 import ru from './ru.json';
 
-const COMPONENT = 'ItemSelector';
-export default registerKeyset({en, ru}, COMPONENT);
+export const i18n = addComponentKeysets({en, ru}, `${NAMESPACE}item-selector`);
diff --git a/src/components/Notifications/Notifications.tsx b/src/components/Notifications/Notifications.tsx
@@ -8,7 +8,7 @@ import {NotificationsErrorState} from './NotificationsErrorState';
 import {NotificationsList} from './NotificationsList';
 import {NotificationsLoadingState} from './NotificationsLoadingState';
 import {NotificationsProps} from './definitions';
-import i18n from './i18n';
+import {i18n} from './i18n';
 
 import './Notifications.scss';
 

diff --git a/src/components/Notifications/NotificationsEmptyState.tsx b/src/components/Notifications/NotificationsEmptyState.tsx
@@ -4,7 +4,7 @@ import {Icon} from '@gravity-ui/uikit';
 
 import {block} from '../utils/cn';
 
-import i18n from './i18n/index';
+import {i18n} from './i18n/index';
 
 import './Notifications.scss';
 

diff --git a/src/components/Notifications/NotificationsErrorState.tsx b/src/components/Notifications/NotificationsErrorState.tsx
@@ -4,7 +4,7 @@ import {Icon} from '@gravity-ui/uikit';
 
 import {block} from '../utils/cn';
 
-import i18n from './i18n/index';
+import {i18n} from './i18n/index';
 
 import './Notifications.scss';
 

diff --git a/src/components/Notifications/i18n/index.ts b/src/components/Notifications/i18n/index.ts
@@ -1,7 +1,8 @@
-import {registerKeyset} from '../../utils/registerKeyset';
+import {addComponentKeysets} from '@gravity-ui/uikit/i18n';
+
+import {NAMESPACE} from '../../utils/cn';
 
 import en from './en.json';
 import ru from './ru.json';
 
-const COMPONENT = 'Notifications';
-export default registerKeyset({en, ru}, COMPONENT);
+export const i18n = addComponentKeysets({en, ru}, `${NAMESPACE}notifications`);
diff --git a/src/components/PasswordInput/PasswordInput.tsx b/src/components/PasswordInput/PasswordInput.tsx
@@ -12,7 +12,7 @@ import {
 
 import {block} from '../utils/cn';
 
-import i18n from './i18n';
+import {i18n} from './i18n';
 import {getActionButtonSizeAndIconSize} from './utils';
 
 import './PasswordInput.scss';

diff --git a/src/components/PasswordInput/i18n/index.ts b/src/components/PasswordInput/i18n/index.ts
@@ -1,8 +1,8 @@
-import {registerKeyset} from '../../utils/registerKeyset';
+import {addComponentKeysets} from '@gravity-ui/uikit/i18n';
+
+import {NAMESPACE} from '../../utils/cn';
 
 import en from './en.json';
 import ru from './ru.json';
 
-const COMPONENT = 'PasswordInput';
-
-export default registerKeyset({en, ru}, COMPONENT);
+export const i18n = addComponentKeysets({en, ru}, `${NAMESPACE}password-input`);
diff --git a/src/components/SharePopover/ShareList/ShareList.tsx b/src/components/SharePopover/ShareList/ShareList.tsx
@@ -8,7 +8,7 @@ import {block} from '../../utils/cn';
 import {isOfType} from '../../utils/isOfType';
 import {ShareListItem} from '../ShareListItem/ShareListItem';
 import type {LayoutDirection, ShareOptions} from '../constants';
-import i18n from '../i18n';
+import {i18n} from '../i18n';
 import type {ShareOptionsData} from '../models';
 
 import './ShareList.scss';

diff --git a/src/components/SharePopover/ShareListItem/ShareListItem.tsx b/src/components/SharePopover/ShareListItem/ShareListItem.tsx
@@ -5,7 +5,7 @@ import type {IconData} from '@gravity-ui/uikit';
 
 import {block} from '../../utils/cn';
 import {LayoutDirection, ShareOptions} from '../constants';
-import i18n from '../i18n';
+import {i18n} from '../i18n';
 import * as icons from '../icons';
 import type {ShareOptionsData} from '../models';
 

diff --git a/src/components/SharePopover/i18n/index.ts b/src/components/SharePopover/i18n/index.ts
@@ -1,8 +1,8 @@
-import {registerKeyset} from '../../utils/registerKeyset';
+import {addComponentKeysets} from '@gravity-ui/uikit/i18n';
+
+import {NAMESPACE} from '../../utils/cn';
 
 import en from './en.json';
 import ru from './ru.json';
 
-const COMPONENT = 'SharePopover';
-
-export default registerKeyset({en, ru}, COMPONENT);
+export const i18n = addComponentKeysets({en, ru}, `${NAMESPACE}share-popover`);
diff --git a/src/components/StoreBadge/StoreBadge.tsx b/src/components/StoreBadge/StoreBadge.tsx
@@ -1,14 +1,12 @@
 import React from 'react';
 
-import {Icon, Link, LinkProps} from '@gravity-ui/uikit';
+import {Icon, Lang, Link, LinkProps} from '@gravity-ui/uikit';
 
-import {i18n} from '../../i18n';
 import {AppStoreEn} from '../../icons/stores/AppStoreEn';
 import {AppStoreRu} from '../../icons/stores/AppStoreRu';
 import {GooglePlayEn} from '../../icons/stores/GooglePlayEn';
 import {GooglePlayRu} from '../../icons/stores/GooglePlayRu';
 import {cn} from '../utils/cn';
-import {Lang} from '../utils/configure';
 
 const b = cn('store-badge');
 
@@ -20,6 +18,7 @@ export type StoreBadgePlatform = typeof androidPlatform | typeof iosPlatform;
 export interface StoreBadgeProps extends Omit<LinkProps, 'view' | 'onClick'> {
     /** store platform name */
     platform: StoreBadgePlatform;
+    lang?: `${Lang}`;
     onClick?: React.MouseEventHandler<HTMLElement>;
 }
 
@@ -42,9 +41,10 @@ export const StoreBadge = ({
     className,
     onClick,
     href,
+    lang = Lang.En,
     ...restLinkProps
 }: StoreBadgeProps) => {
-    const lang = i18n.lang as Lang;
+    // const lang = i18n.lang as Lang;
     const iconData = badgeData?.[platform][lang];
 
     if (!iconData) {

diff --git a/src/components/Stories/components/StoriesLayout/StoriesLayout.tsx b/src/components/Stories/components/StoriesLayout/StoriesLayout.tsx
@@ -6,7 +6,7 @@ import type {ButtonProps} from '@gravity-ui/uikit';
 
 import {MediaRenderer} from '..';
 import {block} from '../../../utils/cn';
-import i18n from '../../i18n';
+import {i18n} from '../../i18n';
 import type {StoriesItem} from '../../types';
 
 import './StoriesLayout.scss';

diff --git a/src/components/Stories/i18n/index.ts b/src/components/Stories/i18n/index.ts
@@ -1,8 +1,8 @@
-import {registerKeyset} from '../../utils/registerKeyset';
+import {addComponentKeysets} from '@gravity-ui/uikit/i18n';
+
+import {NAMESPACE} from '../../utils/cn';
 
 import en from './en.json';
 import ru from './ru.json';
 
-const COMPONENT = 'Stories';
-
-export default registerKeyset({en, ru}, COMPONENT);
+export const i18n = addComponentKeysets({en, ru}, `${NAMESPACE}stories`);
diff --git a/src/components/index.ts b/src/components/index.ts
@@ -17,5 +17,3 @@ export * from './SharePopover';
 export * from './StoreBadge';
 export * from './Stories';
 export * from './StoriesGroup';
-
-export {Lang, configure} from './utils/configure';
diff --git a/src/components/utils/configure.ts b/src/components/utils/configure.ts
diff --git a/src/components/utils/registerKeyset.ts b/src/components/utils/registerKeyset.ts
diff --git a/src/i18n.ts b/src/i18n.ts
diff --git a/test-utils/setup-tests.ts b/test-utils/setup-tests.ts
@@ -1,10 +1,5 @@
 import {configure} from '@testing-library/dom';
 
-import {Lang, configure as libConfigure} from '../src';
-
-libConfigure({
-    lang: Lang.En,
-});
 configure({testIdAttribute: 'data-qa'});
 
 global.ResizeObserver = class implements ResizeObserver {