From 1692869a96cc9bd9735240b7d883eaae8f8d59f7 Mon Sep 17 00:00:00 2001 From: Kunal Pant KP Date: Mon, 12 Dec 2022 13:57:09 +0530 Subject: [PATCH] fix:neutral 100 --- src/Button/Button.tsx | 9 +++++---- src/styles/ColorInversion.tsx | 6 +++--- src/styles/CssVarsProvider.tsx | 1 + src/styles/extendTheme.ts | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/Button/Button.tsx b/src/Button/Button.tsx index 0fd795e..a51110c 100644 --- a/src/Button/Button.tsx +++ b/src/Button/Button.tsx @@ -155,10 +155,11 @@ export const ButtonRoot = styled("button", { "&:hover": theme.variants[`${ownerState.variant!}Hover`]?.[ownerState.color!], }, - { - "&:active": - theme.variants[`${ownerState.variant!}Active`]?.[ownerState.color!], - }, + //don't remove this code + // { + // "&:active": + // theme.variants[`${ownerState.variant!}Active`]?.[ownerState.color!], + // }, { [`&.${buttonClasses.disabled}`]: theme.variants[`${ownerState.variant!}Disabled`]?.[ownerState.color!], diff --git a/src/styles/ColorInversion.tsx b/src/styles/ColorInversion.tsx index d6fc6c0..62d9058 100644 --- a/src/styles/ColorInversion.tsx +++ b/src/styles/ColorInversion.tsx @@ -31,10 +31,10 @@ interface ColorInversionProviderProps { variant?: VariantProp; } -export const ColorInversionProvider = ({ +export function ColorInversionProvider({ children, variant, -}: ColorInversionProviderProps) => { +}: ColorInversionProviderProps) { const theme = useSystemTheme(defaultTheme); return ( ); -}; +} export default VariantOverride; diff --git a/src/styles/CssVarsProvider.tsx b/src/styles/CssVarsProvider.tsx index 2151b54..fd4791f 100644 --- a/src/styles/CssVarsProvider.tsx +++ b/src/styles/CssVarsProvider.tsx @@ -8,6 +8,7 @@ const shouldSkipGeneratingVar = (keys: string[]) => !!keys[0].match( /^(typography|variants|breakpoints|colorInversion|colorInversionConfig)$/ ) || + (keys[0] === "palette" && !!keys[1]?.match(/^(mode)$/)) || (keys[0] === "focus" && keys[1] !== "thickness"); const { CssVarsProvider, useColorScheme, getInitColorSchemeScript } = diff --git a/src/styles/extendTheme.ts b/src/styles/extendTheme.ts index d3d75e6..d50c7b6 100644 --- a/src/styles/extendTheme.ts +++ b/src/styles/extendTheme.ts @@ -185,7 +185,7 @@ export default function extendTheme(themeOptions?: CssVarsThemeOptions): Theme { softDisabledBg: getCssVar(`palette-neutral-50`), solidColor: getCssVar(`palette-common-white`), - solidBg: getCssVar(`palette-neutral-100`), //600 + solidBg: getCssVar(`palette-neutral-600`), //600 solidHoverBg: getCssVar(`palette-neutral-700`), solidActiveBg: getCssVar(`palette-neutral-800`), solidDisabledColor: getCssVar(`palette-neutral-300`),