From 39a4707196bb302a22ec508d4eaa9cab0a214b20 Mon Sep 17 00:00:00 2001 From: mufazalov Date: Tue, 12 Dec 2023 13:16:10 +0300 Subject: [PATCH] feat: update to uikit5 --- .storybook/decorators/withTheme.tsx | 16 -- .storybook/preview.js | 9 +- package-lock.json | 228 +++++++++++++----- package.json | 4 +- .../NavigationTree/EmptyView/EmptyView.scss | 2 +- .../NavigationTree/ErrorView/ErrorView.scss | 2 +- src/components/TreeView/TreeView.scss | 12 +- 7 files changed, 175 insertions(+), 98 deletions(-) delete mode 100644 .storybook/decorators/withTheme.tsx diff --git a/.storybook/decorators/withTheme.tsx b/.storybook/decorators/withTheme.tsx deleted file mode 100644 index b332829..0000000 --- a/.storybook/decorators/withTheme.tsx +++ /dev/null @@ -1,16 +0,0 @@ -import React from 'react'; -import {Story as StoryType, StoryContext} from '@storybook/react'; -import {useTheme} from '@gravity-ui/uikit'; - -export function withTheme(Story: StoryType, context: StoryContext) { - const themeValue = context.globals.theme; - const [theme, setTheme] = useTheme(); - - React.useEffect(() => { - if (theme !== themeValue) { - setTheme(themeValue); - } - }, [theme, themeValue, setTheme]); - - return ; -} diff --git a/.storybook/preview.js b/.storybook/preview.js index 80e6b56..5b0804e 100644 --- a/.storybook/preview.js +++ b/.storybook/preview.js @@ -1,11 +1,10 @@ -import '@gravity-ui/uikit/styles/styles.scss'; - import React from 'react'; import {ThemeProvider} from '@gravity-ui/uikit'; +import '@gravity-ui/uikit/styles/styles.scss'; + import {configure, Lang} from '../src/utils'; -import {withTheme} from './decorators/withTheme'; import {withLang} from './decorators/withLang'; configure({lang: Lang.Ru}); @@ -21,13 +20,13 @@ const withContextProvider = (Story, context) => { context.globals.background = theme; return ( - + ); }; -export const decorators = [withTheme, withLang, withContextProvider]; +export const decorators = [withLang, withContextProvider]; export const parameters = { jsx: {showFunctions: true}, diff --git a/package-lock.json b/package-lock.json index ce8ae5f..f3bbee5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1448,6 +1448,12 @@ "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", "dev": true }, + "@bem-react/classname": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@bem-react/classname/-/classname-1.6.0.tgz", + "integrity": "sha512-SFBwUHMcb7TFFK5ld88+JhecoEun3/kHZ6KvLDjj3w5hv/tfRV8mtGHA8N42uMctXLF4bPEcr96xwXXcRFuweg==", + "dev": true + }, "@cnakazawa/watch": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz", @@ -2196,6 +2202,12 @@ "resolved": "https://registry.npmjs.org/@gravity-ui/i18n/-/i18n-1.0.0.tgz", "integrity": "sha512-KNYNhQjA9XqLo0RVEwNRqdA7/Lx5LLrNDtqWCvOGzXTwKU0GFNlWJaoSvk7u97apag23nTxgmpk551FlRCfehA==" }, + "@gravity-ui/icons": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/@gravity-ui/icons/-/icons-2.8.1.tgz", + "integrity": "sha512-cldaFAN3W2OAzEZBiurD7RsqyqGhS7xoVS9TC4DrOG9bXy8dWUvNEeeOnKgpIvZgAGFlTmg01BK6jMH0IFFSPw==", + "dev": true + }, "@gravity-ui/prettier-config": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@gravity-ui/prettier-config/-/prettier-config-1.0.1.tgz", @@ -2222,42 +2234,40 @@ "dev": true }, "@gravity-ui/uikit": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@gravity-ui/uikit/-/uikit-4.3.0.tgz", - "integrity": "sha512-yWms7epVGi6rECdh18bJu53MixRzHfQjuwYfAYG0fGeif7rwRsemDNN418BCWUrNk9Q6Va9cTanQuptM8LbkAg==", - "dev": true, - "requires": { - "@gravity-ui/i18n": "^1.0.0", - "@popperjs/core": "2.11.6", - "bem-cn-lite": "4.0.0", - "focus-trap": "7.2.0", - "lodash": "4.17.21", - "react-copy-to-clipboard": "5.1.0", - "react-popper": "2.3.0", - "react-sortable-hoc": "2.0.0", + "version": "5.24.0", + "resolved": "https://registry.npmjs.org/@gravity-ui/uikit/-/uikit-5.24.0.tgz", + "integrity": "sha512-NpMzh46rj4h0viW8DO9jE6qyGLqVPDK86fBWUKfxOvOT92eRzwNltVpEpGPgWUrtZQQWs7Vxb3BD/WRAcem3dQ==", + "dev": true, + "requires": { + "@bem-react/classname": "^1.6.0", + "@gravity-ui/i18n": "^1.1.0", + "@gravity-ui/icons": "^2.5.0", + "@popperjs/core": "^2.11.8", + "blueimp-md5": "^2.19.0", + "focus-trap": "^7.5.2", + "lodash": "^4.17.21", + "react-beautiful-dnd": "^13.1.1", + "react-copy-to-clipboard": "^5.1.0", + "react-popper": "^2.3.0", "react-transition-group": "^4.4.5", - "react-virtualized-auto-sizer": "1.0.7", - "react-window": "1.8.8", - "resize-observer-polyfill": "1.5.1", - "tabbable": "6.0.1", - "tslib": "2.3.1", - "utility-types": "3.10.0" + "react-virtualized-auto-sizer": "^1.0.20", + "react-window": "^1.8.9", + "tabbable": "^6.2.0", + "tslib": "^2.6.1", + "utility-types": "^3.10.0" }, "dependencies": { - "@popperjs/core": { - "version": "2.11.6", - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz", - "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==", + "@gravity-ui/i18n": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@gravity-ui/i18n/-/i18n-1.1.0.tgz", + "integrity": "sha512-Ck+LNE1S2GGaMKMijIYWogiM/tYk0wHPlqLrhZmzp6P5keIu8YnPDeIlwAzq4eYVSrtTudLmshFB9QmYAeLryQ==", "dev": true }, - "bem-cn-lite": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/bem-cn-lite/-/bem-cn-lite-4.0.0.tgz", - "integrity": "sha512-ylyWbX63PqhJvm9xGcLAoiKYi87T5g4r5g6sx0dZHcvCtgYvnOWvVTZOQp+uB2DF8ZXsejnPkySvzKnsQhuOAg==", - "dev": true, - "requires": { - "bem-cn": "^3.0.1" - } + "@popperjs/core": { + "version": "2.11.8", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", + "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==", + "dev": true }, "react-popper": { "version": "2.3.0", @@ -2270,9 +2280,9 @@ } }, "tslib": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", - "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", "dev": true } } @@ -5098,6 +5108,16 @@ "@types/unist": "*" } }, + "@types/hoist-non-react-statics": { + "version": "3.3.5", + "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz", + "integrity": "sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==", + "dev": true, + "requires": { + "@types/react": "*", + "hoist-non-react-statics": "^3.3.0" + } + }, "@types/html-minifier-terser": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.2.tgz", @@ -5253,6 +5273,18 @@ "@types/react": "*" } }, + "@types/react-redux": { + "version": "7.1.32", + "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.32.tgz", + "integrity": "sha512-YJYV0M27cyHHJIacaRsZRx5OETzK8KWjEGnix7UH3ngItYo4It0MUBzU6WNwqnwhbrPw5wx9KXluuoTZ85Gg7A==", + "dev": true, + "requires": { + "@types/hoist-non-react-statics": "^3.3.0", + "@types/react": "*", + "hoist-non-react-statics": "^3.3.0", + "redux": "^4.0.0" + } + }, "@types/react-syntax-highlighter": { "version": "11.0.5", "resolved": "https://registry.npmjs.org/@types/react-syntax-highlighter/-/react-syntax-highlighter-11.0.5.tgz", @@ -6653,6 +6685,12 @@ "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", "dev": true }, + "blueimp-md5": { + "version": "2.19.0", + "resolved": "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.19.0.tgz", + "integrity": "sha512-DRQrD6gJyy8FbiE4s+bDoXS9hiW3Vbx5uCdwvcCf3zLHL+Iv7LtGHLpr+GZV8rHG8tK766FGYBwRbu8pELTt+w==", + "dev": true + }, "bn.js": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz", @@ -8239,6 +8277,15 @@ "randomfill": "^1.0.3" } }, + "css-box-model": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/css-box-model/-/css-box-model-1.2.1.tgz", + "integrity": "sha512-a7Vr4Q/kd/aw96bnJG332W9V9LkJO69JRcaCYDUqjp6/z0w6VcZjgAcTbgFxEPfBgdnAwlh3iwu+hLopa+flJw==", + "dev": true, + "requires": { + "tiny-invariant": "^1.0.6" + } + }, "css-functions-list": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.0.1.tgz", @@ -8630,9 +8677,9 @@ }, "dependencies": { "csstype": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz", - "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", + "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==", "dev": true } } @@ -10373,12 +10420,12 @@ } }, "focus-trap": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.2.0.tgz", - "integrity": "sha512-v4wY6HDDYvzkBy4735kW5BUEuw6Yz9ABqMYLuTNbzAFPcBOGiGHwwcNVMvUz4G0kgSYh13wa/7TG3XwTeT4O/A==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.5.4.tgz", + "integrity": "sha512-N7kHdlgsO/v+iD/dMoJKtsSqs5Dz/dXZVebRgJw23LDk+jMi/974zyiOYDziY2JPp8xivq9BmUGwIJMiuSBi7w==", "dev": true, "requires": { - "tabbable": "^6.0.1" + "tabbable": "^6.2.0" } }, "for-in": { @@ -15913,6 +15960,12 @@ "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==", "dev": true }, + "raf-schd": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/raf-schd/-/raf-schd-4.0.3.tgz", + "integrity": "sha512-tQkJl2GRWh83ui2DiPTJz9wEiMN20syf+5oKfB03yYP7ioZcJwsIK8FjrtLwH1m7C7e+Tt2yYBlrOpdT+dyeIQ==", + "dev": true + }, "ramda": { "version": "0.21.0", "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.21.0.tgz", @@ -15999,6 +16052,21 @@ "loose-envify": "^1.1.0" } }, + "react-beautiful-dnd": { + "version": "13.1.1", + "resolved": "https://registry.npmjs.org/react-beautiful-dnd/-/react-beautiful-dnd-13.1.1.tgz", + "integrity": "sha512-0Lvs4tq2VcrEjEgDXHjT98r+63drkKEgqyxdA7qD3mvKwga6a5SscbdLPO2IExotU1jW8L0Ksdl0Cj2AF67nPQ==", + "dev": true, + "requires": { + "@babel/runtime": "^7.9.2", + "css-box-model": "^1.2.0", + "memoize-one": "^5.1.1", + "raf-schd": "^4.0.2", + "react-redux": "^7.2.0", + "redux": "^4.0.4", + "use-memo-one": "^1.1.1" + } + }, "react-colorful": { "version": "5.5.1", "resolved": "https://registry.npmjs.org/react-colorful/-/react-colorful-5.5.1.tgz", @@ -16153,6 +16221,28 @@ "react-popper": "^2.2.4" } }, + "react-redux": { + "version": "7.2.9", + "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.9.tgz", + "integrity": "sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==", + "dev": true, + "requires": { + "@babel/runtime": "^7.15.4", + "@types/react-redux": "^7.1.20", + "hoist-non-react-statics": "^3.3.2", + "loose-envify": "^1.4.0", + "prop-types": "^15.7.2", + "react-is": "^17.0.2" + }, + "dependencies": { + "react-is": { + "version": "17.0.2", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", + "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", + "dev": true + } + } + }, "react-refresh": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz", @@ -16212,17 +16302,6 @@ "throttle-debounce": "^3.0.1" } }, - "react-sortable-hoc": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/react-sortable-hoc/-/react-sortable-hoc-2.0.0.tgz", - "integrity": "sha512-JZUw7hBsAHXK7PTyErJyI7SopSBFRcFHDjWW5SWjcugY0i6iH7f+eJkY8cJmGMlZ1C9xz1J3Vjz0plFpavVeRg==", - "dev": true, - "requires": { - "@babel/runtime": "^7.2.0", - "invariant": "^2.2.4", - "prop-types": "^15.5.7" - } - }, "react-syntax-highlighter": { "version": "13.5.3", "resolved": "https://registry.npmjs.org/react-syntax-highlighter/-/react-syntax-highlighter-13.5.3.tgz", @@ -16268,15 +16347,15 @@ } }, "react-virtualized-auto-sizer": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.7.tgz", - "integrity": "sha512-Mxi6lwOmjwIjC1X4gABXMJcKHsOo0xWl3E3ugOgufB8GJU+MqrtY35aBuvCYv/razQ1Vbp7h1gWJjGjoNN5pmA==", + "version": "1.0.20", + "resolved": "https://registry.npmjs.org/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.20.tgz", + "integrity": "sha512-OdIyHwj4S4wyhbKHOKM1wLSj/UDXm839Z3Cvfg2a9j+He6yDa6i5p0qQvEiCnyQlGO/HyfSnigQwuxvYalaAXA==", "dev": true }, "react-window": { - "version": "1.8.8", - "resolved": "https://registry.npmjs.org/react-window/-/react-window-1.8.8.tgz", - "integrity": "sha512-D4IiBeRtGXziZ1n0XklnFGu7h9gU684zepqyKzgPNzrsrk7xOCxni+TCckjg2Nr/DiaEEGVVmnhYSlT2rB47dQ==", + "version": "1.8.10", + "resolved": "https://registry.npmjs.org/react-window/-/react-window-1.8.10.tgz", + "integrity": "sha512-Y0Cx+dnU6NLa5/EvoHukUD0BklJ8qITCtVEPY1C/nL8wwoZ0b5aEw8Ff1dOVHw7fCzMt55XfJDd8S8W8LCaUCg==", "dev": true, "requires": { "@babel/runtime": "^7.0.0", @@ -16409,6 +16488,15 @@ "strip-indent": "^3.0.0" } }, + "redux": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz", + "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==", + "dev": true, + "requires": { + "@babel/runtime": "^7.9.2" + } + }, "refractor": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/refractor/-/refractor-3.6.0.tgz", @@ -16808,12 +16896,6 @@ "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", "dev": true }, - "resize-observer-polyfill": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz", - "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==", - "dev": true - }, "resolve": { "version": "2.0.0-next.4", "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz", @@ -18274,9 +18356,9 @@ "dev": true }, "tabbable": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.0.1.tgz", - "integrity": "sha512-SYJSIgeyXW7EuX1ytdneO5e8jip42oHWg9xl/o3oTYhmXusZVgiA+VlPvjIN+kHii9v90AmzTZEBcsEvuAY+TA==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.2.0.tgz", + "integrity": "sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==", "dev": true }, "table": { @@ -18519,6 +18601,12 @@ "setimmediate": "^1.0.4" } }, + "tiny-invariant": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz", + "integrity": "sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==", + "dev": true + }, "tmpl": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", @@ -19153,6 +19241,12 @@ "use-isomorphic-layout-effect": "^1.0.0" } }, + "use-memo-one": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/use-memo-one/-/use-memo-one-1.1.3.tgz", + "integrity": "sha512-g66/K7ZQGYrI6dy8GLpVcMsBp4s17xNkYJVSMvTEevGy3nDxHOfE6z8BVE22+5G5x7t3+bhzrlTDB7ObrEE0cQ==", + "dev": true + }, "util": { "version": "0.11.1", "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz", diff --git a/package.json b/package.json index 59b8cc9..5222e9a 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "@gravity-ui/prettier-config": "^1.0.1", "@gravity-ui/stylelint-config": "^1.0.1", "@gravity-ui/tsconfig": "^1.0.0", - "@gravity-ui/uikit": "^4.3.0", + "@gravity-ui/uikit": "^5.24.0", "@storybook/addon-essentials": "^6.4.19", "@storybook/preset-scss": "^1.0.3", "@storybook/react": "^6.4.19", @@ -74,7 +74,7 @@ "typescript": "^4.6.2" }, "peerDependencies": { - "@gravity-ui/uikit": "^4.0.0", + "@gravity-ui/uikit": "^5.0.0", "react": "^16.0.0 || ^17.0.0 || ^18.0.0", "react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0" } diff --git a/src/components/NavigationTree/EmptyView/EmptyView.scss b/src/components/NavigationTree/EmptyView/EmptyView.scss index 33960a1..06c1c64 100644 --- a/src/components/NavigationTree/EmptyView/EmptyView.scss +++ b/src/components/NavigationTree/EmptyView/EmptyView.scss @@ -1,4 +1,4 @@ .ydb-navigation-tree-view-empty { - color: var(--yc-color-text-secondary); + color: var(--g-color-text-secondary); font-style: italic; } diff --git a/src/components/NavigationTree/ErrorView/ErrorView.scss b/src/components/NavigationTree/ErrorView/ErrorView.scss index 4bddce1..b054aa6 100644 --- a/src/components/NavigationTree/ErrorView/ErrorView.scss +++ b/src/components/NavigationTree/ErrorView/ErrorView.scss @@ -1,3 +1,3 @@ .ydb-navigation-tree-view-error { - color: var(--yc-color-text-danger); + color: var(--g-color-text-danger); } diff --git a/src/components/TreeView/TreeView.scss b/src/components/TreeView/TreeView.scss index 5fdb4ee..3631681 100644 --- a/src/components/TreeView/TreeView.scss +++ b/src/components/TreeView/TreeView.scss @@ -23,11 +23,11 @@ $step-offset: 24px; height: 24px; padding-left: calc(#{$step-offset} * var(--ydb-tree-view-level)); padding-right: 3px; - border-bottom: 1px solid var(--yc-color-line-solid); + border-bottom: 1px solid var(--g-color-line-generic-solid); cursor: pointer; &:hover { - background-color: var(--yc-color-base-simple-hover); + background-color: var(--g-color-base-simple-hover); #{$root}__actions { display: flex; @@ -36,10 +36,10 @@ $step-offset: 24px; &_active { font-weight: bold; - background-color: var(--yc-color-base-selection); + background-color: var(--g-color-base-selection); &:hover { - background-color: var(--yc-color-base-selection-hover); + background-color: var(--g-color-base-selection-hover); } } } @@ -58,7 +58,7 @@ $step-offset: 24px; justify-content: center; width: 24px; height: 24px; - color: var(--yc-color-text-hint); + color: var(--g-color-text-hint); svg { display: block; @@ -87,7 +87,7 @@ $step-offset: 24px; @include arrow-background(rgba(0, 0, 0, 0.85)); - .yc-root_theme_dark & { + .g-root_theme_dark & { @include arrow-background(rgba(255, 255, 255, 0.85)); }