diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c53c3c5..2f2299d 100644 --- 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 index 779f4f3..fa0336c 100644 --- 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 index 5c48207..957627a 100644 --- 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 index fa69d91..e5b069b 100644 --- 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 = () => ( {buttonPropForm.map((buttonForm, index) => (
- + {`Форма кнопок ${buttonForm}`} ( {buttonPropSize.map((buttonSize, index) => (
- + {`Размер кнопок ${buttonSize}`} ( {buttonPropView.map((buttonView, index) => (
- + {`Вид кнопок ${buttonView}`} { zIndex: 1, }} getItemLabel={(item: Language) => item.toUpperCase()} - onItemClick={({ item }) => setLanguage(item)} + onItemClick={setLanguage} size="m" />
{(badges || date) && (
@@ -77,6 +84,7 @@ export const NotificationsItem = forwardRef( className={cnNotificationsItem('Time')} size="xs" view="secondary" + lineHeight="m" > {dateFormat(date)} diff --git a/src/components/Notifications/NotificationsList/NotificationsList.tsx b/src/components/Notifications/NotificationsList/NotificationsList.tsx index f1c217a..1aa2ee3 100644 --- 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} @@ -124,6 +126,7 @@ function NotificationsListRender( transform="uppercase" weight="bold" size="2xs" + lineHeight="m" > {groupLabel} diff --git a/src/components/SelectMenu/SelectMenu.tsx b/src/components/SelectMenu/SelectMenu.tsx index 2112533..2577836 100644 --- a/src/components/SelectMenu/SelectMenu.tsx +++ b/src/components/SelectMenu/SelectMenu.tsx @@ -79,7 +79,12 @@ const SelectMenuRender = ( onClick={onClick} style={style} > - + {label} @@ -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 index 3ae7182..254f0c0 100644 --- 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 ( {
- + {title} {onClose && ( diff --git a/src/components/TileMenu/TileMenuItem/TileMenuItem.tsx b/src/components/TileMenu/TileMenuItem/TileMenuItem.tsx index f38d03c..5262492 100644 --- a/src/components/TileMenu/TileMenuItem/TileMenuItem.tsx +++ b/src/components/TileMenu/TileMenuItem/TileMenuItem.tsx @@ -56,11 +56,19 @@ export const TileMenuItem = forwardRefWithAs( className={cnTileMenuItem('Title', [ view === 'default' ? cnMixSpace({ pB: '2xs' }) : undefined, ])} + view="primary" + size="m" + lineHeight="m" > {title} {description && view === 'default' && ( - + {description} )} diff --git a/src/components/VerticalMenu/VerticalMenuItem/VerticalMenuItem.tsx b/src/components/VerticalMenu/VerticalMenuItem/VerticalMenuItem.tsx index 107ea24..5aea2c0 100644 --- 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 index 5e78e3e..e56d997 100644 --- 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} /> - + {levelLabel}