Revert "[@mantine/core] Change how primary color fallback is applied …

…in default `theme.variantColorResolver` to allow setting custom fallback values and `undefined` handling" This reverts commit 5550ce2.
mantinedev · Oct 26, 2023 · 80ff94d · 80ff94d
1 parent 16d39ff
commit 80ff94d
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/src/mantine-core/src/components/ActionIcon/ActionIcon.tsx b/src/mantine-core/src/components/ActionIcon/ActionIcon.tsx
@@ -80,7 +80,7 @@ const defaultProps: Partial<ActionIconProps> = {};
 const varsResolver = createVarsResolver<ActionIconFactory>(
   (theme, { size, radius, variant, gradient, color }) => {
     const colors = theme.variantColorResolver({
-      color,
+      color: color || theme.primaryColor,
       theme,
       gradient,
       variant: variant || 'filled',

diff --git a/src/mantine-core/src/components/Alert/Alert.tsx b/src/mantine-core/src/components/Alert/Alert.tsx
@@ -69,7 +69,7 @@ const defaultProps: Partial<AlertProps> = {};
 
 const varsResolver = createVarsResolver<AlertFactory>((theme, { radius, color, variant }) => {
   const colors = theme.variantColorResolver({
-    color,
+    color: color || theme.primaryColor,
     theme,
     variant: variant || 'light',
   });

diff --git a/src/mantine-core/src/components/Badge/Badge.tsx b/src/mantine-core/src/components/Badge/Badge.tsx
@@ -81,7 +81,7 @@ const defaultProps: Partial<BadgeProps> = {};
 const varsResolver = createVarsResolver<BadgeFactory>(
   (theme, { radius, color, gradient, variant, size }) => {
     const colors = theme.variantColorResolver({
-      color,
+      color: color || theme.primaryColor,
       theme,
       gradient,
       variant: variant || 'filled',

diff --git a/src/mantine-core/src/components/Button/Button.tsx b/src/mantine-core/src/components/Button/Button.tsx
@@ -102,7 +102,7 @@ const defaultProps: Partial<ButtonProps> = {};
 const varsResolver = createVarsResolver<ButtonFactory>(
   (theme, { radius, color, gradient, variant, size, justify }) => {
     const colors = theme.variantColorResolver({
-      color,
+      color: color || theme.primaryColor,
       theme,
       gradient,
       variant: variant || 'filled',

diff --git a/src/mantine-core/src/components/Chip/Chip.tsx b/src/mantine-core/src/components/Chip/Chip.tsx
@@ -98,7 +98,7 @@ const defaultProps: Partial<ChipProps> = {
 
 const varsResolver = createVarsResolver<ChipFactory>((theme, { size, radius, variant, color }) => {
   const colors = theme.variantColorResolver({
-    color,
+    color: color || theme.primaryColor,
     theme,
     variant: variant!,
   });

diff --git a/src/mantine-core/src/components/NavLink/NavLink.tsx b/src/mantine-core/src/components/NavLink/NavLink.tsx
@@ -93,7 +93,7 @@ const defaultProps: Partial<NavLinkProps> = {};
 const varsResolver = createVarsResolver<NavLinkFactory>(
   (theme, { variant, color, childrenOffset }) => {
     const colors = theme.variantColorResolver({
-      color,
+      color: color || theme.primaryColor,
       theme,
       variant: variant || 'light',
     });

diff --git a/src/mantine-core/src/components/ThemeIcon/ThemeIcon.tsx b/src/mantine-core/src/components/ThemeIcon/ThemeIcon.tsx
@@ -65,7 +65,7 @@ const defaultProps: Partial<ThemeIconProps> = {};
 const varsResolver = createVarsResolver<ThemeIconFactory>(
   (theme, { size, radius, variant, gradient, color }) => {
     const colors = theme.variantColorResolver({
-      color,
+      color: color || theme.primaryColor,
       theme,
       gradient,
       variant: variant || 'filled',

diff --git a/...ovider/color-functions/default-variant-colors-resolver/default-variant-colors-resolver.ts b/...ovider/color-functions/default-variant-colors-resolver/default-variant-colors-resolver.ts
@@ -29,7 +29,7 @@ export const defaultVariantColorsResolver: VariantColorsResolver = ({
   variant,
   gradient,
 }) => {
-  const parsed = parseThemeColor({ color: color || theme.primaryColor, theme });
+  const parsed = parseThemeColor({ color, theme });
 
   if (variant === 'filled') {
     if (parsed.isThemeColor) {