From 361dd2b9122dafd5450638ff399e8dc014876412 Mon Sep 17 00:00:00 2001 From: Daniil Suvorov Date: Tue, 19 May 2026 16:59:29 +0300 Subject: [PATCH] fix(Snackbar): mode dark use ColorSchemeProvider --- .../snackbar-mode-android-chromium-dark-1-snap.png | 4 ++-- .../snackbar-mode-android-chromium-light-1-snap.png | 4 ++-- .../Snackbar/subcomponents/Basic/Basic.module.css | 8 -------- .../Snackbar/subcomponents/Basic/Basic.tsx | 12 +++++++++--- .../snackbarbasic-android-chromium-dark-1-snap.png | 4 ++-- .../snackbarbasic-android-chromium-light-1-snap.png | 4 ++-- .../snackbarbasic-ios-webkit-dark-1-snap.png | 4 ++-- .../snackbarbasic-ios-webkit-light-1-snap.png | 4 ++-- .../snackbarbasic-vkcom-chromium-dark-1-snap.png | 4 ++-- .../snackbarbasic-vkcom-chromium-light-1-snap.png | 4 ++-- .../snackbarbasic-vkcom-firefox-dark-1-snap.png | 4 ++-- .../snackbarbasic-vkcom-firefox-light-1-snap.png | 4 ++-- .../snackbarbasic-vkcom-webkit-dark-1-snap.png | 4 ++-- .../snackbarbasic-vkcom-webkit-light-1-snap.png | 4 ++-- 14 files changed, 33 insertions(+), 35 deletions(-) diff --git a/packages/vkui/src/components/Snackbar/__image_snapshots__/snackbar-mode-android-chromium-dark-1-snap.png b/packages/vkui/src/components/Snackbar/__image_snapshots__/snackbar-mode-android-chromium-dark-1-snap.png index f84f1f8c8c2..7c41f8c6f77 100644 --- a/packages/vkui/src/components/Snackbar/__image_snapshots__/snackbar-mode-android-chromium-dark-1-snap.png +++ b/packages/vkui/src/components/Snackbar/__image_snapshots__/snackbar-mode-android-chromium-dark-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:291b95bfe937a0324bb650ebf0689033214a54c786bbfb5f1fad0774d3305b73 -size 6851 +oid sha256:18207e1482bbc2a06148df738cc10dddc8dc1afcce16e4262b0998f778564390 +size 7219 diff --git a/packages/vkui/src/components/Snackbar/__image_snapshots__/snackbar-mode-android-chromium-light-1-snap.png b/packages/vkui/src/components/Snackbar/__image_snapshots__/snackbar-mode-android-chromium-light-1-snap.png index 06541315586..d53d43d0420 100644 --- a/packages/vkui/src/components/Snackbar/__image_snapshots__/snackbar-mode-android-chromium-light-1-snap.png +++ b/packages/vkui/src/components/Snackbar/__image_snapshots__/snackbar-mode-android-chromium-light-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:832044a03b0699a52c95f6d0ffeea1ed0ef5fcc6768eda5b4213329cfb73370a -size 8133 +oid sha256:2994b2cfee5aca0079da7f9b6517d9194602717c6e5e2b5ffa5c62bd54afa579 +size 8683 diff --git a/packages/vkui/src/components/Snackbar/subcomponents/Basic/Basic.module.css b/packages/vkui/src/components/Snackbar/subcomponents/Basic/Basic.module.css index de4119490d5..8c9c3ac3019 100644 --- a/packages/vkui/src/components/Snackbar/subcomponents/Basic/Basic.module.css +++ b/packages/vkui/src/components/Snackbar/subcomponents/Basic/Basic.module.css @@ -42,10 +42,6 @@ } } -.modeDark { - background: var(--vkui--color_background_contrast_inverse); -} - .before { margin-inline-end: 12px; } @@ -76,10 +72,6 @@ color: var(--vkui--color_text_subhead); } -.modeDark .contentText { - color: var(--vkui--color_text_contrast); -} - /* layout */ .layoutHorizontal .action { position: relative; diff --git a/packages/vkui/src/components/Snackbar/subcomponents/Basic/Basic.tsx b/packages/vkui/src/components/Snackbar/subcomponents/Basic/Basic.tsx index a4f5b84da33..be5eb5a9241 100644 --- a/packages/vkui/src/components/Snackbar/subcomponents/Basic/Basic.tsx +++ b/packages/vkui/src/components/Snackbar/subcomponents/Basic/Basic.tsx @@ -1,9 +1,10 @@ 'use client'; -import type * as React from 'react'; +import * as React from 'react'; import { classNames } from '@vkontakte/vkjs'; import { useAdaptivity } from '../../../../hooks/useAdaptivity'; import type { HTMLAttributesWithRootRef } from '../../../../types'; +import { ColorSchemeProvider } from '../../../ColorSchemeProvider/ColorSchemeProvider'; import { RootComponent } from '../../../RootComponent/RootComponent'; import { Paragraph } from '../../../Typography/Paragraph/Paragraph'; import { Subhead } from '../../../Typography/Subhead/Subhead'; @@ -74,14 +75,13 @@ export function Basic({ const { density = 'none' } = useAdaptivity(); const layout = after || subtitle ? 'vertical' : 'none'; - return ( + const snackbar = ( {before &&
{before}
} @@ -96,4 +96,10 @@ export function Basic({ {after &&
{after}
}
); + + if (mode === 'dark') { + return {snackbar}; + } + + return snackbar; } diff --git a/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-android-chromium-dark-1-snap.png b/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-android-chromium-dark-1-snap.png index 8f913527ebb..18efeda78be 100644 --- a/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-android-chromium-dark-1-snap.png +++ b/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-android-chromium-dark-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08be8d01dbc4c9a3da7ffc61785506d237e6aec9a4c7453273011f818120ab87 -size 50117 +oid sha256:9fdbb12b3d9392bad08684cc1541f9cd524a64107b793f0f36fc05c125447507 +size 46668 diff --git a/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-android-chromium-light-1-snap.png b/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-android-chromium-light-1-snap.png index 255267a6cfd..e26e92db4e5 100644 --- a/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-android-chromium-light-1-snap.png +++ b/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-android-chromium-light-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a9158abdf5f5d0c6340071c42805aeea88409c36f0ecbab898d87ad6e1320ae0 -size 60493 +oid sha256:54ed90f775c7b6465dd364d05b96872088a25e94e39659f8855c0f97e49f541a +size 54633 diff --git a/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-ios-webkit-dark-1-snap.png b/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-ios-webkit-dark-1-snap.png index 1387ec47f1b..2c3d819655c 100644 --- a/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-ios-webkit-dark-1-snap.png +++ b/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-ios-webkit-dark-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c1f469659be6da23949fa9bf304b2105ae71d75cd9ee299e071ec3da10105dac -size 77383 +oid sha256:9c469c9ae98fe7ead19db8e51b0867be6bcee5f8670496d0ba9e4fd862ef19d6 +size 77417 diff --git a/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-ios-webkit-light-1-snap.png b/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-ios-webkit-light-1-snap.png index 166b3be7e2a..63cdb3ad2f0 100644 --- a/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-ios-webkit-light-1-snap.png +++ b/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-ios-webkit-light-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0346d2b5d1fef96ebfe60579dc479783049c80e54e8f27eeaef863c60987e0b5 -size 84796 +oid sha256:4abfdf46021b10b6b410aff4ac18e74f1705c538b6bf40e1d177eac253639f26 +size 84901 diff --git a/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-vkcom-chromium-dark-1-snap.png b/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-vkcom-chromium-dark-1-snap.png index 5c9bf1984b3..fbf5ae46c09 100644 --- a/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-vkcom-chromium-dark-1-snap.png +++ b/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-vkcom-chromium-dark-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c6986f7501b9bd9ab8a7ec21fca80146cd343910bcaa1c215f0af35c5a0a8e1b -size 55094 +oid sha256:3fa47b51bb7d037251d501b94853edc83ca00f86e38884684541ac693ea3341e +size 54353 diff --git a/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-vkcom-chromium-light-1-snap.png b/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-vkcom-chromium-light-1-snap.png index 1d982542442..573570232df 100644 --- a/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-vkcom-chromium-light-1-snap.png +++ b/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-vkcom-chromium-light-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d393adf482ef47463747c778702d5836eaeba8868e4a659ee6d8aa11fe71d307 -size 60825 +oid sha256:097a59dbdd998734377175042fc1a1d9c874d3a9dd923754260f56b05d000c15 +size 59767 diff --git a/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-vkcom-firefox-dark-1-snap.png b/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-vkcom-firefox-dark-1-snap.png index 677bb9be427..292690b6520 100644 --- a/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-vkcom-firefox-dark-1-snap.png +++ b/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-vkcom-firefox-dark-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:baa63858eec6fed5324c5a8665ce2c733b9dd543f18011757eac35dabbb88a08 -size 87520 +oid sha256:1357c34a4f2f40858c369efa1cfb68a50d0e83b878a6641eae655e289e056cb6 +size 87686 diff --git a/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-vkcom-firefox-light-1-snap.png b/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-vkcom-firefox-light-1-snap.png index 20ae3f50c8c..1704f3ec4df 100644 --- a/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-vkcom-firefox-light-1-snap.png +++ b/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-vkcom-firefox-light-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:95a51a0d61b104c02675cd58b2a1f8be93e3a8857a6c5222dc8848302aaf0d36 -size 94153 +oid sha256:51457f31bbdd6200d8a6cdfc078d6b4443997fa9540e51e78fdd37d877613b8c +size 94487 diff --git a/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-vkcom-webkit-dark-1-snap.png b/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-vkcom-webkit-dark-1-snap.png index 9cf3e732a7e..f9500f21ace 100644 --- a/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-vkcom-webkit-dark-1-snap.png +++ b/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-vkcom-webkit-dark-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7424091e1f1805f90e2a69be804308d6c3fbff1d1e36173f1fb8368e1b8b032d -size 86842 +oid sha256:b2c3d8f732cb6e057ab0d5d412ff2a9416455dc9b482ea796754335fcc7250ae +size 86897 diff --git a/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-vkcom-webkit-light-1-snap.png b/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-vkcom-webkit-light-1-snap.png index f34240d2b9a..b16378bfb64 100644 --- a/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-vkcom-webkit-light-1-snap.png +++ b/packages/vkui/src/components/Snackbar/subcomponents/Basic/__image_snapshots__/snackbarbasic-vkcom-webkit-light-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab68cb2e2ac7510b1d3b6d7abfa6fbfc743f763c52bff10ce9ca45c494ebc5bd -size 93151 +oid sha256:d3fe6381f264da83a366dc250437eac91c72f897a4a8c11e9a9b12a3e734dd36 +size 93466