chore: update uikit version

consta-design-system · Nov 27, 2023 · 57db342 · 57db342
1 parent 7b9f33d
commit 57db342
Show file tree

Hide file tree

Showing 20 changed files with 73 additions and 28 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -24,7 +24,7 @@ jobs:
       # Устанавливаем Node.JS для сборки приложения
       - uses: actions/setup-node@v1
         with:
-          node-version: '16'
+          node-version: 18
 
       - name: Install yarn
         id: yarn-setup

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: 16
+          node-version: 18
 
       - name: Установка yarn
         id: yarn-setup

diff --git a/package.json b/package.json
@@ -48,8 +48,8 @@
     "Chrome >= 75"
   ],
   "peerDependencies": {
-    "@consta/icons": "^0.9.0",
-    "@consta/uikit": "^4.31.1"
+    "@consta/icons": "^0.11.0",
+    "@consta/uikit": "^5.0.0-beta.2"
   },
   "config": {
     "commitizen": {

diff --git a/src/components/ButtonMenu/__stand__/examples/ButtonMenuExampleForm/ButtonMenuExampleForm.tsx b/src/components/ButtonMenu/__stand__/examples/ButtonMenuExampleForm/ButtonMenuExampleForm.tsx
@@ -11,7 +11,7 @@ export const ButtonMenuExampleForm = () => (
   <Example>
     {buttonPropForm.map((buttonForm, index) => (
       <div key={index}>
-        <Text size="s" view="ghost">
+        <Text size="s" view="ghost" lineHeight="m">
           {`Форма кнопок ${buttonForm}`}
         </Text>
         <ButtonMenu

diff --git a/src/components/ButtonMenu/__stand__/examples/ButtonMenuExampleSize/ButtonMenuExampleSize.tsx b/src/components/ButtonMenu/__stand__/examples/ButtonMenuExampleSize/ButtonMenuExampleSize.tsx
@@ -11,7 +11,7 @@ export const ButtonMenuExampleSize = () => (
   <Example>
     {buttonPropSize.map((buttonSize, index) => (
       <div key={index}>
-        <Text size="s" view="ghost">
+        <Text size="s" view="ghost" lineHeight="m">
           {`Размер кнопок ${buttonSize}`}
         </Text>
         <ButtonMenu

diff --git a/src/components/ButtonMenu/__stand__/examples/ButtonMenuExampleView/ButtonMenuExampleView.tsx b/src/components/ButtonMenu/__stand__/examples/ButtonMenuExampleView/ButtonMenuExampleView.tsx
@@ -11,7 +11,7 @@ export const ButtonMenuExampleView = () => (
   <Example>
     {buttonPropView.map((buttonView, index) => (
       <div key={index}>
-        <Text size="s" view="ghost">
+        <Text size="s" view="ghost" lineHeight="m">
           {`Вид кнопок ${buttonView}`}
         </Text>
         <ButtonMenu

diff --git a/src/components/Layout/__stand__/examples/LayoutExampleBig/LayoutExampleBig.tsx b/src/components/Layout/__stand__/examples/LayoutExampleBig/LayoutExampleBig.tsx
@@ -87,7 +87,7 @@ const RowTopRight = () => {
             zIndex: 1,
           }}
           getItemLabel={(item: Language) => item.toUpperCase()}
-          onItemClick={({ item }) => setLanguage(item)}
+          onItemClick={setLanguage}
           size="m"
         />
         <Button

diff --git a/src/components/MegaMenu/MegaMenuBannerBar/MegaMenuBannerBarItem/MegaMenuBannerBarItem.tsx b/src/components/MegaMenu/MegaMenuBannerBar/MegaMenuBannerBarItem/MegaMenuBannerBarItem.tsx
@@ -55,6 +55,7 @@ const MegaMenuBannerBarItemRender = (
       )}
       <div className={cnMegaMenuBannerBarItem('Content')}>
         <Text
+          view="primary"
           weight="semibold"
           size="m"
           lineHeight="m"
@@ -65,6 +66,7 @@ const MegaMenuBannerBarItemRender = (
         {description && (
           <Text
             className={cnMegaMenuBannerBarItem('Description')}
+            view="primary"
             size="m"
             lineHeight="m"
           >

diff --git a/src/components/MegaMenu/MegaMenuGlobal/MegaMenuGlobal.tsx b/src/components/MegaMenu/MegaMenuGlobal/MegaMenuGlobal.tsx
@@ -3,10 +3,7 @@ import './MegaMenuGlobal.css';
 import { getGroups } from '@consta/uikit/__internal__/src/utils/getGroups';
 import { cnMixSpace } from '@consta/uikit/MixSpace';
 import { Text } from '@consta/uikit/Text';
-import {
-  getLastPoint,
-  useComponentBreakpoints,
-} from '@consta/uikit/useComponentBreakpoints';
+import { getLastPoint, useBreakpoints } from '@consta/uikit/useBreakpoints';
 import { useForkRef } from '@consta/uikit/useForkRef';
 import React, { forwardRef, useMemo, useRef } from 'react';
 
@@ -48,11 +45,14 @@ const MegaMenuGlobalRender = (
   const MegaMenuGlobalRef = useRef<HTMLDivElement>(null);
 
   const columns = getLastPoint(
-    useComponentBreakpoints(MegaMenuGlobalRef, {
-      1: 0,
-      2: 600,
-      3: 1000,
-      4: 1600,
+    useBreakpoints({
+      ref: MegaMenuGlobalRef,
+      map: {
+        1: 0,
+        2: 600,
+        3: 1000,
+        4: 1600,
+      },
     }),
   );
 
@@ -91,6 +91,7 @@ const MegaMenuGlobalRender = (
           className={cnMixSpace({ mB: 'xl' })}
           lineHeight="m"
           size="xl"
+          view="primary"
         >
           {title}
         </Text>

diff --git a/src/components/MegaMenu/MegaMenuGlobal/MegaMenuGlobalGroup/MegaMenuGlobalGroup.tsx b/src/components/MegaMenu/MegaMenuGlobal/MegaMenuGlobalGroup/MegaMenuGlobalGroup.tsx
@@ -61,6 +61,7 @@ const MegaMenuGlobalGroupRender = (
           size="m"
           lineHeight="m"
           weight="bold"
+          view="primary"
         >
           {title}
         </Text>

diff --git a/src/components/Menu/Menu.tsx b/src/components/Menu/Menu.tsx
@@ -7,7 +7,7 @@ import { ContextMenu } from '@consta/uikit/ContextMenu';
 import { animateTimeout } from '@consta/uikit/MixPopoverAnimate';
 import { useDebounce } from '@consta/uikit/useDebounce';
 import { useFlag } from '@consta/uikit/useFlag';
-import { useHideElementsInLine } from '@consta/uikit/useHideElementsInLine';
+import { useHideElementsInLine } from '@consta/uikit/useHideElementsInLineDepricated';
 import { useMutableRef } from '@consta/uikit/useMutableRef';
 import React, {
   forwardRef,
@@ -128,7 +128,7 @@ const MenuRender = (props: MenuProps, ref: React.Ref<HTMLDivElement>) => {
                 getItemLabel={getItemLabel}
                 getItemSubMenu={getItemSubMenu}
                 anchorRef={itemsRefs[index]}
-                onItemClick={({ e, item }) =>
+                onItemClick={(item, { e }) =>
                   getItemClick(item, getItemOnClick, onItemClick)(e)
                 }
                 direction="downStartLeft"
@@ -165,7 +165,7 @@ const MenuRender = (props: MenuProps, ref: React.Ref<HTMLDivElement>) => {
               getItemLabel={getItemLabel}
               getItemSubMenu={getItemSubMenu}
               anchorRef={moreButtonRef}
-              onItemClick={({ e, item }) =>
+              onItemClick={(item, { e }) =>
                 getItemClick(item, getItemOnClick, onItemClick)(e)
               }
               direction="downStartLeft"

diff --git a/src/components/NavbarCanary/NavbarRailItem/NavbarRailItem.tsx b/src/components/NavbarCanary/NavbarRailItem/NavbarRailItem.tsx
@@ -72,6 +72,8 @@ const Item = forwardRefWithAs<NavbarRailItemProps, 'div'>((props, ref) => {
           className={cnNavbarItem('Label', [cnMixSpace(textSpaceMap[size])])}
           align="center"
           size={size}
+          view="primary"
+          lineHeight="m"
         >
           {label}
         </Text>

diff --git a/src/components/Notifications/NotificationsActions/NotificationsActions.tsx b/src/components/Notifications/NotificationsActions/NotificationsActions.tsx
@@ -101,7 +101,7 @@ const NotificationsActionsRender = (
         isOpen={visibleMenu}
         items={items}
         getItemLabel={getItemLabel}
-        onItemClick={({ e, item }) =>
+        onItemClick={(item, { e }) =>
           getItemClick(item, getItemOnClick, onItemClick)(e)
         }
         getItemKey={getItemLabel}

diff --git a/src/components/Notifications/NotificationsItem/NotificationsItem.tsx b/src/components/Notifications/NotificationsItem/NotificationsItem.tsx
@@ -55,10 +55,17 @@ export const NotificationsItem = forwardRef(
               className={cnNotificationsItem('Title', {
                 cardWithActions: !!actions?.length,
               })}
+              view="primary"
+              size="m"
+              lineHeight="m"
             >
               {title}
             </Text>
-            {description && <Text size="s">{description}</Text>}
+            {description && (
+              <Text size="s" view="primary" lineHeight="m">
+                {description}
+              </Text>
+            )}
           </div>
           {(badges || date) && (
             <div className={cnNotificationsItem('Footer')}>
@@ -77,6 +84,7 @@ export const NotificationsItem = forwardRef(
                   className={cnNotificationsItem('Time')}
                   size="xs"
                   view="secondary"
+                  lineHeight="m"
                 >
                   {dateFormat(date)}
                 </Text>

diff --git a/src/components/Notifications/NotificationsList/NotificationsList.tsx b/src/components/Notifications/NotificationsList/NotificationsList.tsx
@@ -80,6 +80,8 @@ function NotificationsListRender(
             className={cnNotificationsList('HeaderItem')}
             size="xl"
             truncate
+            view="primary"
+            lineHeight="m"
           >
             {title}
           </Text>
@@ -124,6 +126,7 @@ function NotificationsListRender(
                   transform="uppercase"
                   weight="bold"
                   size="2xs"
+                  lineHeight="m"
                 >
                   {groupLabel}
                 </Text>

diff --git a/src/components/SelectMenu/SelectMenu.tsx b/src/components/SelectMenu/SelectMenu.tsx
@@ -79,7 +79,12 @@ const SelectMenuRender = (
         onClick={onClick}
         style={style}
       >
-        <Text className={cnSelectMenu('Label')} size="s">
+        <Text
+          className={cnSelectMenu('Label')}
+          size="s"
+          view="primary"
+          lineHeight="m"
+        >
           {label}
         </Text>
         <span className={cnSelectMenu('ArrowBox', { open })}>
@@ -96,7 +101,7 @@ const SelectMenuRender = (
           getItemAs={getItemAs}
           getItemAttributes={getItemHTMLAttributes}
           onClickOutside={setOpen.off}
-          onItemClick={({ e, item }) =>
+          onItemClick={(item, { e }) =>
             getItemClick(item, getItemOnClick, onItemClick)(e)
           }
           direction="rightStartDown"

diff --git a/src/components/Sidebar/Sidebar.tsx b/src/components/Sidebar/Sidebar.tsx
@@ -22,7 +22,7 @@ const cnSidebar = cn('Sidebar');
 
 export const Sidebar = (props: SidebarProps) => {
   const { children, title, onClose, className, ...otherProps } = props;
-  const { bigScreen } = useBreakpoints({ bigScreen: 520 });
+  const { bigScreen } = useBreakpoints({ map: { bigScreen: 520 } });
   return (
     <ConstaSidebar
       {...otherProps}
@@ -34,7 +34,13 @@ export const Sidebar = (props: SidebarProps) => {
         <div
           className={cnSidebar('Header', [cnMixSpace({ pV: 'l', pH: 'xl' })])}
         >
-          <Text className={cnSidebar('Title')} size="xl" truncate>
+          <Text
+            className={cnSidebar('Title')}
+            size="xl"
+            truncate
+            view="primary"
+            lineHeight="m"
+          >
             {title}
           </Text>
           {onClose && (

diff --git a/src/components/TileMenu/TileMenuItem/TileMenuItem.tsx b/src/components/TileMenu/TileMenuItem/TileMenuItem.tsx
@@ -56,11 +56,19 @@ export const TileMenuItem = forwardRefWithAs<TileMenuItemProps>(
             className={cnTileMenuItem('Title', [
               view === 'default' ? cnMixSpace({ pB: '2xs' }) : undefined,
             ])}
+            view="primary"
+            size="m"
+            lineHeight="m"
           >
             {title}
           </Text>
           {description && view === 'default' && (
-            <Text view="secondary" className={cnTileMenuItem('Description')}>
+            <Text
+              view="secondary"
+              className={cnTileMenuItem('Description')}
+              size="m"
+              lineHeight="m"
+            >
               {description}
             </Text>
           )}

diff --git a/src/components/VerticalMenu/VerticalMenuItem/VerticalMenuItem.tsx b/src/components/VerticalMenu/VerticalMenuItem/VerticalMenuItem.tsx
@@ -38,6 +38,9 @@ export const VerticalMenuItem: VerticalMenuItemComponent = (props) => {
       {...propsLink}
       className={cnVerticalMenuItem({ active }, [className])}
       onClick={onClick}
+      view="primary"
+      size="m"
+      lineHeight="m"
     >
       {label}
       {withSubMenu && (

diff --git a/src/components/VerticalMenu/VerticalMenuLevel/VerticalMenuLevel.tsx b/src/components/VerticalMenu/VerticalMenuLevel/VerticalMenuLevel.tsx
@@ -64,7 +64,13 @@ export const VerticalMenuLevel: VerticalMenuLevelComponent = forwardRef(
               size="s"
               onClick={removeLevel}
             />
-            <Text className={cnMixSpace({ mL: 's' })} truncate>
+            <Text
+              className={cnMixSpace({ mL: 's' })}
+              truncate
+              view="primary"
+              size="m"
+              lineHeight="m"
+            >
               {levelLabel}
             </Text>
           </div>