From c6d70a31809903ffe11c6b63108dc100721e595e Mon Sep 17 00:00:00 2001 From: Roman Knel Date: Mon, 26 Aug 2024 09:02:20 +0300 Subject: [PATCH] fix(Button): fix btnTextHoverBg, btnTextActiveBg vars in Theme2022Dark (#3464) --- .../hover/firefox2022Dark/hover.png | 3 ++ .../pressed/firefox2022Dark/pressed.png | 3 ++ .../Button/__stories__/Button.stories.tsx | 35 +++++++++++++++++++ .../react-ui/internal/themes/Theme2022Dark.ts | 2 +- 4 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 packages/react-ui/.creevey/images/Button/Btn Text Bg Hover Active/hover/firefox2022Dark/hover.png create mode 100644 packages/react-ui/.creevey/images/Button/Btn Text Bg Hover Active/pressed/firefox2022Dark/pressed.png diff --git a/packages/react-ui/.creevey/images/Button/Btn Text Bg Hover Active/hover/firefox2022Dark/hover.png b/packages/react-ui/.creevey/images/Button/Btn Text Bg Hover Active/hover/firefox2022Dark/hover.png new file mode 100644 index 00000000000..db0779237d0 --- /dev/null +++ b/packages/react-ui/.creevey/images/Button/Btn Text Bg Hover Active/hover/firefox2022Dark/hover.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8dc05f9b5c4fdb59e983860f0c01440ee66903c4a34a6368732c21abbc2b2cff +size 940 diff --git a/packages/react-ui/.creevey/images/Button/Btn Text Bg Hover Active/pressed/firefox2022Dark/pressed.png b/packages/react-ui/.creevey/images/Button/Btn Text Bg Hover Active/pressed/firefox2022Dark/pressed.png new file mode 100644 index 00000000000..370dc17cb01 --- /dev/null +++ b/packages/react-ui/.creevey/images/Button/Btn Text Bg Hover Active/pressed/firefox2022Dark/pressed.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:70adc74e89550e8131203243a026e6f1caf4d837e26ac1e842674a66cb649da0 +size 983 diff --git a/packages/react-ui/components/Button/__stories__/Button.stories.tsx b/packages/react-ui/components/Button/__stories__/Button.stories.tsx index a6cc569a0fe..46caaad7973 100644 --- a/packages/react-ui/components/Button/__stories__/Button.stories.tsx +++ b/packages/react-ui/components/Button/__stories__/Button.stories.tsx @@ -15,6 +15,9 @@ import { Gapped } from '../../Gapped'; import { ComponentTable } from '../../../internal/ComponentTable'; import { ReactUIFeatureFlagsContext } from '../../../lib/featureFlagsContext'; import { Button, ButtonProps } from '../Button'; +import { THEME_2022_DARK } from '../../../lib/theming/themes/Theme2022Dark'; +import { ThemeFactory } from '../../../lib/theming/ThemeFactory'; +import { ThemeContext } from '../../../lib/theming/ThemeContext'; export default { title: 'Button', @@ -719,3 +722,35 @@ HoverTextColor.parameters = { }, }, }; + +export const BtnTextBgHoverActive: Story = () => { + const myTheme = ThemeFactory.create( + { + btnTextHoverBg: 'red', + btnTextActiveBg: 'green', + }, + THEME_2022_DARK, + ); + + return ( + + + + ); +}; + +BtnTextBgHoverActive.parameters = { + creevey: { + skip: { + 'hover does not work in chrome & only 22 dark theme needed': { + in: /^(?!\bfirefox2022Dark?\b)/, + }, + }, + tests: { + hover: buttonTests.hover, + pressed: buttonTests.pressed, + }, + }, +}; diff --git a/packages/react-ui/internal/themes/Theme2022Dark.ts b/packages/react-ui/internal/themes/Theme2022Dark.ts index a5e8d340c44..7b0443df48c 100644 --- a/packages/react-ui/internal/themes/Theme2022Dark.ts +++ b/packages/react-ui/internal/themes/Theme2022Dark.ts @@ -70,7 +70,7 @@ export class Theme2022Dark extends (class {} as typeof Theme2022Internal) { public static btnBacklessHoverBorderColor = 'rgba(255, 255, 255, 0.1)'; public static btnBacklessTextColor = 'rgba(255, 255, 255, 0.87)'; - public static btnTextBg = 'transparent !important'; + public static btnTextBg = 'transparent'; public static btnTextHoverBg = 'rgba(255, 255, 255, 0.1)'; public static btnTextActiveBg = 'rgba(255, 255, 255, 0.06)'; public static btnTextBorderColor = 'transparent';