From cb1f70ceae5cfb08c4b9c2e7e0081d03578d46a3 Mon Sep 17 00:00:00 2001 From: Daniil Suvorov Date: Wed, 5 Feb 2025 16:37:46 +0300 Subject: [PATCH] feat(SubnavigationButton): add disabled styles --- packages/vkui/src/components/SubnavigationButton/Readme.md | 3 +++ .../SubnavigationButton.e2e-playground.tsx | 1 + .../SubnavigationButton/SubnavigationButton.module.css | 4 ++++ .../components/SubnavigationButton/SubnavigationButton.tsx | 1 + .../subnavigationbutton-android-chromium-dark-1-snap.png | 4 ++-- .../subnavigationbutton-android-chromium-light-1-snap.png | 4 ++-- .../subnavigationbutton-ios-webkit-dark-1-snap.png | 4 ++-- .../subnavigationbutton-ios-webkit-light-1-snap.png | 4 ++-- .../subnavigationbutton-vkcom-chromium-dark-1-snap.png | 4 ++-- .../subnavigationbutton-vkcom-chromium-light-1-snap.png | 4 ++-- .../subnavigationbutton-vkcom-firefox-dark-1-snap.png | 4 ++-- .../subnavigationbutton-vkcom-firefox-light-1-snap.png | 4 ++-- .../subnavigationbutton-vkcom-webkit-dark-1-snap.png | 4 ++-- .../subnavigationbutton-vkcom-webkit-light-1-snap.png | 4 ++-- 14 files changed, 29 insertions(+), 20 deletions(-) diff --git a/packages/vkui/src/components/SubnavigationButton/Readme.md b/packages/vkui/src/components/SubnavigationButton/Readme.md index 4a4a2ca24c..25b88a5f52 100644 --- a/packages/vkui/src/components/SubnavigationButton/Readme.md +++ b/packages/vkui/src/components/SubnavigationButton/Readme.md @@ -13,6 +13,7 @@ const SubnavigationButtonExample = () => { const [size, setSize] = useState('m'); const [chevron, setChevron] = useState(false); const [selected, setSelected] = useState(false); + const [disabled, setDisabled] = useState(false); const [addBefore, setAddBefore] = useState(false); const [addAfter, setAddAfter] = useState(false); @@ -34,6 +35,7 @@ const SubnavigationButtonExample = () => { after={buttonAfter} chevron={chevron} selected={selected} + disabled={disabled} onClick={noop} > {mode} button @@ -91,6 +93,7 @@ const SubnavigationButtonExample = () => { setSelected(e.target.checked)}>selected + setDisabled(e.target.checked)}>disabled setChevron(e.target.checked)}>chevron setAddBefore(e.target.checked)}>add before setAddAfter(e.target.checked)}>add after diff --git a/packages/vkui/src/components/SubnavigationButton/SubnavigationButton.e2e-playground.tsx b/packages/vkui/src/components/SubnavigationButton/SubnavigationButton.e2e-playground.tsx index ca1c691123..617bcbea58 100644 --- a/packages/vkui/src/components/SubnavigationButton/SubnavigationButton.e2e-playground.tsx +++ b/packages/vkui/src/components/SubnavigationButton/SubnavigationButton.e2e-playground.tsx @@ -51,6 +51,7 @@ export const SubnavigationButtonPlayground = (props: ComponentPlaygroundProps) = , ], children: ['Фильтры'], + disabled: [undefined, true], }, ]} > diff --git a/packages/vkui/src/components/SubnavigationButton/SubnavigationButton.module.css b/packages/vkui/src/components/SubnavigationButton/SubnavigationButton.module.css index d7d29cf57b..3ef6ed4960 100644 --- a/packages/vkui/src/components/SubnavigationButton/SubnavigationButton.module.css +++ b/packages/vkui/src/components/SubnavigationButton/SubnavigationButton.module.css @@ -4,6 +4,10 @@ border-radius: var(--vkui--size_border_radius--regular); } +.disabled { + opacity: var(--vkui--opacity_disable_accessibility); +} + .in { display: flex; align-items: center; diff --git a/packages/vkui/src/components/SubnavigationButton/SubnavigationButton.tsx b/packages/vkui/src/components/SubnavigationButton/SubnavigationButton.tsx index e982fbd22e..b7ac8b55bf 100644 --- a/packages/vkui/src/components/SubnavigationButton/SubnavigationButton.tsx +++ b/packages/vkui/src/components/SubnavigationButton/SubnavigationButton.tsx @@ -99,6 +99,7 @@ export const SubnavigationButton = ({ appearanceStyles[appearance], selected && styles.selected, sizeY !== 'regular' && sizeYClassNames[sizeY], + restProps.disabled && styles.disabled, )} > diff --git a/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-android-chromium-dark-1-snap.png b/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-android-chromium-dark-1-snap.png index 07983537a1..c6837d2ad6 100644 --- a/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-android-chromium-dark-1-snap.png +++ b/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-android-chromium-dark-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3c217700b786f145d0028503b73b9ad6b6fb8d263c4f8b92d56c4ad93387f4a -size 321121 +oid sha256:d06712ad654b0855d7390d8f0c8fecac2af7ba65d647fc101a823b918aff4786 +size 430518 diff --git a/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-android-chromium-light-1-snap.png b/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-android-chromium-light-1-snap.png index 7293fdbc32..762929f3bf 100644 --- a/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-android-chromium-light-1-snap.png +++ b/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-android-chromium-light-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:56cfd9e845269f01974c97d9327665405824c9ea5eaf1b9e591da7cc0ca53862 -size 307088 +oid sha256:2bba879fb074556dd971ac3cae1fce22cea9531a5731680891063475e11672b1 +size 417676 diff --git a/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-ios-webkit-dark-1-snap.png b/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-ios-webkit-dark-1-snap.png index b876ab1225..a4af514592 100644 --- a/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-ios-webkit-dark-1-snap.png +++ b/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-ios-webkit-dark-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fbbf20413cdedd8f8f8022f8926db05461cddbbb3686bdba11903c9422482cb4 -size 457446 +oid sha256:e3232378a485b72fafa95076ddefd0c30179cc384769e118a483bc9190a41ac1 +size 629139 diff --git a/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-ios-webkit-light-1-snap.png b/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-ios-webkit-light-1-snap.png index 5e48cee69c..3079432a21 100644 --- a/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-ios-webkit-light-1-snap.png +++ b/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-ios-webkit-light-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:171c949114350eb274f8fa425852beefed7ab03b4f0a69b0681c7142ebc1a2fe -size 467572 +oid sha256:c22e669d961138e27d1fe3ee90f6fbca8ac470fac6899814996438b75b922929 +size 640975 diff --git a/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-vkcom-chromium-dark-1-snap.png b/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-vkcom-chromium-dark-1-snap.png index 8f5546f2f3..ff3910bf4d 100644 --- a/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-vkcom-chromium-dark-1-snap.png +++ b/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-vkcom-chromium-dark-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b08bfecfdbd03bd5f8239a94d5c9c58a629156683ffe87cb75066070d00cc67 -size 234370 +oid sha256:572eaf8ef5cfa5c42cd6d740b5afd73dfc55cb0e6860133e44c26bdb05abad35 +size 331933 diff --git a/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-vkcom-chromium-light-1-snap.png b/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-vkcom-chromium-light-1-snap.png index b0a433b6d5..2abfed047a 100644 --- a/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-vkcom-chromium-light-1-snap.png +++ b/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-vkcom-chromium-light-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aeac48b536d41729731bb894a8023e61b91fc0e6165dde78e94cb44712ef4399 -size 228866 +oid sha256:3ffbb81a441df94d21d45a97351d7a2fc0d509b42c04228cf710d8bcf170ce37 +size 324455 diff --git a/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-vkcom-firefox-dark-1-snap.png b/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-vkcom-firefox-dark-1-snap.png index 21f9b2341a..529a3cbc3a 100644 --- a/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-vkcom-firefox-dark-1-snap.png +++ b/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-vkcom-firefox-dark-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:11875777e9a264c1c7b269053aa6bc0aef1a8b167a6120a178442fcac96db6f7 -size 327247 +oid sha256:d98421d7904e023817ebc75e92a47f5a371146feb0117d3cfc32c4a9caeb4d4d +size 479270 diff --git a/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-vkcom-firefox-light-1-snap.png b/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-vkcom-firefox-light-1-snap.png index d121b71a88..026324a32b 100644 --- a/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-vkcom-firefox-light-1-snap.png +++ b/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-vkcom-firefox-light-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:75d06311bdf2607adfd6e7af43dd99b459c7c6e5eb509bed553082d019c82083 -size 339241 +oid sha256:33d93c94b48b53c1f67d10dd90fb59c9be042546c883b3fb4f665a8b3efa5108 +size 492345 diff --git a/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-vkcom-webkit-dark-1-snap.png b/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-vkcom-webkit-dark-1-snap.png index 657df99526..0a3d726b05 100644 --- a/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-vkcom-webkit-dark-1-snap.png +++ b/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-vkcom-webkit-dark-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f99024ad7d51d7b65895ad96017845e602dfefa5cea3bc698dce0b7643279935 -size 343585 +oid sha256:6235594f7b7d97bee7d9ae577f76b26e41fb6ceef3408a24b1ece024f0da8393 +size 498724 diff --git a/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-vkcom-webkit-light-1-snap.png b/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-vkcom-webkit-light-1-snap.png index 0a8c8299be..e9450958f5 100644 --- a/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-vkcom-webkit-light-1-snap.png +++ b/packages/vkui/src/components/SubnavigationButton/__image_snapshots__/subnavigationbutton-vkcom-webkit-light-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd3d1e974f764c9b919d792163b5ab37b7a864ebbb2ef7b4ae236bc1a5a6d0bf -size 351394 +oid sha256:6096eb2230938d295fa3541b415a9f40e0a840aa1c7e83364baf44ceff888a8a +size 507015