Merge pull request #39 from pantkunalkp/button

fix:neutral 100
radiant-design · Dec 13, 2022 · 374b2e4 · 374b2e4
2 parents 924449e + 1692869
commit 374b2e4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git 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
@@ -31,10 +31,10 @@ interface ColorInversionProviderProps {
  variant?: VariantProp;
 }
 
-export const ColorInversionProvider = ({
+export function ColorInversionProvider({
  children,
  variant,
-}: ColorInversionProviderProps) => {
+}: ColorInversionProviderProps) {
  const theme = useSystemTheme(defaultTheme);
  return (
  <VariantOverride.Provider
@@ -43,6 +43,6 @@ export const ColorInversionProvider = ({
  {children}
  </VariantOverride.Provider>
  );
-};
+}
 
 export default VariantOverride;
diff --git 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
@@ -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`),