diff --git a/package.json b/package.json index f73d59280b..d5fac21b88 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/packages/vkui/package.json b/packages/vkui/package.json index 841897af75..6f5da28d2e 100644 --- a/packages/vkui/package.json +++ b/packages/vkui/package.json @@ -59,7 +59,6 @@ "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" @@ -67,6 +66,7 @@ "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" diff --git a/packages/vkui/src/components/AppRoot/AppRoot.tsx b/packages/vkui/src/components/AppRoot/AppRoot.tsx index 671b33b741..aeba4da267 100644 --- a/packages/vkui/src/components/AppRoot/AppRoot.tsx +++ b/packages/vkui/src/components/AppRoot/AppRoot.tsx @@ -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'; @@ -242,9 +241,7 @@ export const AppRoot = ({ layout, }} > - - {children} - + {children} ); diff --git a/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-android-chromium-dark-1-snap.png b/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-android-chromium-dark-1-snap.png index c65d1bb104..40e75ad522 100644 --- a/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-android-chromium-dark-1-snap.png +++ b/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-android-chromium-dark-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bfbf975639ec06eda6ed65eaa38115a3f6daff2d072f65cc469bc8751d530313 -size 23187 +oid sha256:247eb471a767b12b5dfa880035ebbcb8a245e7b73d57c22b4a47d029df3c2393 +size 23008 diff --git a/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-android-chromium-light-1-snap.png b/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-android-chromium-light-1-snap.png index 5f7bf9f387..6431b20957 100644 --- a/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-android-chromium-light-1-snap.png +++ b/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-android-chromium-light-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:561a9b06c14cd4dc002b6456440a768d99d01b7f97fa128519dea7f193c961e2 -size 23250 +oid sha256:3466996af52442e533e855e697ef3410dfa196afc2f13e81dad4e6f0b9bd1df8 +size 23088 diff --git a/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-ios-webkit-dark-1-snap.png b/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-ios-webkit-dark-1-snap.png index 310086c6a2..a33d98f669 100644 --- a/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-ios-webkit-dark-1-snap.png +++ b/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-ios-webkit-dark-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5669bae0b182a0f545c73d4de45b9274062c9d0a6672fdd90b45d18ee29f93a8 -size 22022 +oid sha256:fc536b52fe0d51051a4d43e917202ee2ce6f0067a34472835ad3420ee910947d +size 21842 diff --git a/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-ios-webkit-light-1-snap.png b/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-ios-webkit-light-1-snap.png index 923c7dba23..cc9679ea18 100644 --- a/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-ios-webkit-light-1-snap.png +++ b/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-ios-webkit-light-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b2f94da56628e2d0569238f2ea68ed55c69ed40bd7db0c2e8e5d7266b975196 -size 22130 +oid sha256:56b574986f06b4c8d3464b15c1387f8e840531cf0be423f30b4db4fff9e94267 +size 21946 diff --git a/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-vkcom-chromium-dark-1-snap.png b/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-vkcom-chromium-dark-1-snap.png index 5bda587aa2..2a3a1a7c8d 100644 --- a/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-vkcom-chromium-dark-1-snap.png +++ b/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-vkcom-chromium-dark-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a0ef89b67c6ba7715bf739e5e82ecf60975f217fde9c57342fc418868e04f48 -size 21552 +oid sha256:324cb4f7e1aa70c39d046d3d97538e4e9d183d2a881341145c9b8fafc5039b44 +size 21365 diff --git a/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-vkcom-chromium-light-1-snap.png b/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-vkcom-chromium-light-1-snap.png index 857904e54b..13aab357e1 100644 --- a/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-vkcom-chromium-light-1-snap.png +++ b/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-vkcom-chromium-light-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7d65d5162831fa9286405410674995a6257dc5b6acb21dd926bac8e71b91bfec -size 21705 +oid sha256:c0d4d615b0c6380c70aeb0df5c4bd03a15dc63080602378a19822c59e9c37299 +size 21512 diff --git a/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-vkcom-firefox-dark-1-snap.png b/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-vkcom-firefox-dark-1-snap.png index 078e8ec168..76e22c7b9c 100644 --- a/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-vkcom-firefox-dark-1-snap.png +++ b/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-vkcom-firefox-dark-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0cbff4fdaae05eb86cb80bfdd4ec686b74866faf033f11815e4786af9e302917 -size 26219 +oid sha256:add54e55e06ff9492b22a52988a063d95cb8f40f4243c6a0c657c232671269a3 +size 26116 diff --git a/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-vkcom-firefox-light-1-snap.png b/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-vkcom-firefox-light-1-snap.png index 2defb48635..6ec6077cfc 100644 --- a/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-vkcom-firefox-light-1-snap.png +++ b/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-vkcom-firefox-light-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5cc257080ac21c441fee5319cd8d1c9528899bf9827a80e16e31603d9a7bce3a -size 27084 +oid sha256:812166ea6fb5b0a76bea0b4b03450ad9dbae3e2efa9fed954868d6918e251775 +size 26994 diff --git a/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-vkcom-webkit-dark-1-snap.png b/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-vkcom-webkit-dark-1-snap.png index b117d75c95..18bf5ab9e5 100644 --- a/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-vkcom-webkit-dark-1-snap.png +++ b/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-vkcom-webkit-dark-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b7fcd0f89455560c7e931e45c41fc3054ece93b7710957157d76658d918325d9 -size 19996 +oid sha256:8563c66bf73cf441b119befbef7370751df64867840f5f30b0ede1508d24de75 +size 19789 diff --git a/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-vkcom-webkit-light-1-snap.png b/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-vkcom-webkit-light-1-snap.png index ec17028dde..99d40416a1 100644 --- a/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-vkcom-webkit-light-1-snap.png +++ b/packages/vkui/src/components/DateInput/__image_snapshots__/dateinput-vkcom-webkit-light-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:29c18fd738c4a39bcd4ba65231b0f790b55c1783b35d6abb8faae76c568b4b35 -size 20203 +oid sha256:aed20c305a720193b4bbd955db9088d7b95ef7a4f24bfd1d325264c79bc6999c +size 20008 diff --git a/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-android-chromium-dark-1-snap.png b/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-android-chromium-dark-1-snap.png index 02348061a2..5291589ab5 100644 --- a/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-android-chromium-dark-1-snap.png +++ b/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-android-chromium-dark-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e25e7a17c35cac3ca4c1ea1da325a4602078c23b74ad061cde917a403ebce7d -size 27229 +oid sha256:f44e3ec50ad5047ce1f024f443e44af915406404df86bd29c99c9f9b07d873d0 +size 27105 diff --git a/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-android-chromium-light-1-snap.png b/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-android-chromium-light-1-snap.png index 929acf004f..10ef22d562 100644 --- a/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-android-chromium-light-1-snap.png +++ b/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-android-chromium-light-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99f64df3412511c91439ced5d204d7c9faef1e7fc2fae4f4bc08db32256353eb -size 27177 +oid sha256:9971d3de953c8a4b4fa3a5d8ef414e53dd87370bd235a9ed440b87c5fca4609f +size 27052 diff --git a/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-ios-webkit-dark-1-snap.png b/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-ios-webkit-dark-1-snap.png index f8becfc206..083481d24d 100644 --- a/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-ios-webkit-dark-1-snap.png +++ b/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-ios-webkit-dark-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b984244c6471a4b06f8a6ee43c40f9d483f345bab9c427e9a8626a6db1e8285f -size 25946 +oid sha256:dc514c343dade9c65f6d17e610cad402e4cecfde4e99b73e8d7599341802c3f6 +size 25812 diff --git a/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-ios-webkit-light-1-snap.png b/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-ios-webkit-light-1-snap.png index 7754a20aa6..e51b559688 100644 --- a/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-ios-webkit-light-1-snap.png +++ b/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-ios-webkit-light-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d00c9021d5bec80abadbf63b6a5bcf7d9ec4ae030089765a8d171b083777381 -size 26004 +oid sha256:fc8176621bd62d2b83f17eb120ce8ce935c5bc6f1da38e2dc8e09e0ce2d4cf24 +size 25869 diff --git a/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-vkcom-chromium-dark-1-snap.png b/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-vkcom-chromium-dark-1-snap.png index d01d95d01a..4754a530ee 100644 --- a/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-vkcom-chromium-dark-1-snap.png +++ b/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-vkcom-chromium-dark-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:49fc78918dc5f52546e0206f07813766be2855f2429e16ef347f2a94bfcd3425 -size 25446 +oid sha256:46df26c1ca21adc01546c291f5501a8286395b83bdf6496fc9e7fa2f9881e425 +size 25280 diff --git a/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-vkcom-chromium-light-1-snap.png b/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-vkcom-chromium-light-1-snap.png index a660e85a15..29434bcb26 100644 --- a/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-vkcom-chromium-light-1-snap.png +++ b/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-vkcom-chromium-light-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e897f2ae384729abe8f7e052dce57ac292e3908db68af12b5be6b41eb0ee3004 -size 25562 +oid sha256:3c06f9ea613975da310f1a1f84fc31dd52cae484d15833ac24885febd3937d58 +size 25411 diff --git a/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-vkcom-firefox-dark-1-snap.png b/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-vkcom-firefox-dark-1-snap.png index e17b1851b3..a36420612d 100644 --- a/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-vkcom-firefox-dark-1-snap.png +++ b/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-vkcom-firefox-dark-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3bbee3555857c78022870342fe459fc01c663bdc6d95de4b16821c9c25ab158f -size 31387 +oid sha256:0e99fd53c96aefaf2e44f73b7f9238a3c922340226c2432a967da087df7feb57 +size 31277 diff --git a/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-vkcom-firefox-light-1-snap.png b/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-vkcom-firefox-light-1-snap.png index 2e54a53288..584e736882 100644 --- a/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-vkcom-firefox-light-1-snap.png +++ b/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-vkcom-firefox-light-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30abeb6c4ad77c3cfd047de63cb13bd93081809b9cf97e003912597e48105a71 -size 32316 +oid sha256:79e1bd65e58ed268879ac389e3874d6d3052bf8241130dcdafc08d26e42cba19 +size 32243 diff --git a/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-vkcom-webkit-dark-1-snap.png b/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-vkcom-webkit-dark-1-snap.png index 0ea3975883..8f788c6dcd 100644 --- a/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-vkcom-webkit-dark-1-snap.png +++ b/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-vkcom-webkit-dark-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a1c7941627a47ac49ef531f7a593850d0127497faabc9dcb15dff14c95a882e -size 23601 +oid sha256:20ff68a119defae2ebfc618cebc55efcd64231d1f955fcb0301eaca650c917ad +size 23455 diff --git a/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-vkcom-webkit-light-1-snap.png b/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-vkcom-webkit-light-1-snap.png index aa13f2dee5..446f6c7f02 100644 --- a/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-vkcom-webkit-light-1-snap.png +++ b/packages/vkui/src/components/DateRangeInput/__image_snapshots__/daterangeinput-vkcom-webkit-light-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:16695d9e262415ba706d5775fa461b0561bb7d57300c57fbffde6bf02679c0d4 -size 23819 +oid sha256:b7eca6cf336b9a2fa06d3d09ff12267a3f745580675ee994732007aa8c9c293e +size 23694 diff --git a/yarn.lock b/yarn.lock index 8c4199b59e..aecff34392 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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"