Skip to content

Commit

Permalink
feat(vkui): mv @vkontakte/icons to deps (#5718)
Browse files Browse the repository at this point in the history
* feat(vkui): mv @vkontakte/icons to deps
Переносим иконки в зависимости

* fix: delete IconSettingsProvider

* test: update screenshots
  • Loading branch information
SevereCloud authored Aug 31, 2023
1 parent 5520f4e commit ac89d8d
Show file tree
Hide file tree
Showing 24 changed files with 52 additions and 56 deletions.
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
"@typescript-eslint/eslint-plugin": "^5.61.0",
"@typescript-eslint/parser": "^5.61.0",
"@vkontakte/eslint-plugin": "^1.1.1",
"@vkontakte/icons": "2.41.0",
"@vkontakte/prettier-config": "^0.1.0",
"@vkontakte/stylelint-config": "^3.2.0",
"@vkontakte/vk-bridge": "^2.1.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/vkui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,14 @@
"generate:css-custom-medias": "node scripts/generateCSSCustomMedias.js"
},
"peerDependencies": {
"@vkontakte/icons": "^2.41.0",
"@vkontakte/vk-bridge": "^2.4.9",
"react": "^17.0.0 || ^18.1.0",
"react-dom": "^17.0.0 || ^18.1.0"
},
"dependencies": {
"@floating-ui/react-dom": "^2.0.1",
"@swc/helpers": "^0.5.1",
"@vkontakte/icons": "^2.62.0",
"@vkontakte/vkjs": "^1.1.0",
"dayjs": "^1.11.9",
"mitt": "^3.0.1"
Expand Down
5 changes: 1 addition & 4 deletions packages/vkui/src/components/AppRoot/AppRoot.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import * as React from 'react';
import { IconSettingsProvider } from '@vkontakte/icons';
import { classNames, noop } from '@vkontakte/vkjs';
import { useAdaptivity } from '../../hooks/useAdaptivity';
import { useAppearance } from '../../hooks/useAppearance';
Expand Down Expand Up @@ -242,9 +241,7 @@ export const AppRoot = ({
layout,
}}
>
<ScrollController elRef={rootRef}>
<IconSettingsProvider classPrefix="vkui">{children}</IconSettingsProvider>
</ScrollController>
<ScrollController elRef={rootRef}>{children}</ScrollController>
</AppRootContext.Provider>
);

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 10 additions & 10 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3781,19 +3781,19 @@
"@typescript-eslint/parser" "^5.50.0"
eslint-config-google "^0.9.1"

"@vkontakte/icons-sprite@^1.1.1":
version "1.1.1"
resolved "https://registry.yarnpkg.com/@vkontakte/icons-sprite/-/icons-sprite-1.1.1.tgz#04c7a6a1268be39f324de070d27b490f157d04dd"
integrity sha512-mZt34A0wK72+C0Jr0rtypuEFtfJO3qBFt9RQQC5lpBDTVGB+sMKmI8Vi+CYbq1kPO8Uv7GiPQxLv8+Ti7cT24g==
"@vkontakte/icons-sprite@2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@vkontakte/icons-sprite/-/icons-sprite-2.0.0.tgz#5153e4d16f6c1c433a58cd4e099d9326a070cecc"
integrity sha512-P/AMcwSfiRY0tEEMv6jIt5FgAo7lr4K8uCeOD/c8CCuLEZFoUfMW7D50IWaGKHyCTWgPIFgGFiOypj45pD5hVg==
dependencies:
"@swc/helpers" "^0.5.0"
"@swc/helpers" "^0.5.1"

"@vkontakte/icons@2.41.0":
version "2.41.0"
resolved "https://registry.yarnpkg.com/@vkontakte/icons/-/icons-2.41.0.tgz#66b25aaa33527466e143c361403b92ee8e5663ac"
integrity sha512-lOUZa9/srgk1MCR4nbfcimiLktL1YyKNisc7+vLgoY2+0XBpGqpUt0Nzxb901XI2GhNbb2W59s/+YjAHl8HrUg==
"@vkontakte/icons@^2.62.0":
version "2.62.0"
resolved "https://registry.yarnpkg.com/@vkontakte/icons/-/icons-2.62.0.tgz#dbe3403b9e0e0ead23bd04a99708f2fad3e41b33"
integrity sha512-AZzEoCgIjeuXRbRfpu2KhkCZrMDCeWLA6V5lfjdok0igArmLnjQEfIgWiwqkYtNQ1UbjRNgMvnjG9+4lZy0iiQ==
dependencies:
"@vkontakte/icons-sprite" "^1.1.1"
"@vkontakte/icons-sprite" "2.0.0"

"@vkontakte/prettier-config@^0.1.0":
version "0.1.0"
Expand Down

0 comments on commit ac89d8d

Please sign in to comment.