[material-ui] Skip tonalOffset from setting color channel (#44585)

mui · Nov 29, 2024 · 7c0b7e8 · 7c0b7e8
1 parent 28ac35c
commit 7c0b7e8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/packages/mui-material/src/styles/createTheme.test.js b/packages/mui-material/src/styles/createTheme.test.js
@@ -221,6 +221,22 @@ describe('createTheme', () => {
       expect(theme.colorSchemes.dark).to.not.equal(undefined);
     });
 
+    it('should be able to customize tonal offset', () => {
+      const theme = createTheme({
+        cssVariables: true,
+        palette: {
+          primary: {
+            main: green[500],
+          },
+          tonalOffset: {
+            light: 0.1,
+            dark: 0.9,
+          },
+        },
+      });
+      expect(theme.palette.primary.main).to.equal('#4caf50');
+    });
+
     describe('spacing', () => {
       it('should provide the default spacing', () => {
         const theme = createTheme({ cssVariables: true });

diff --git a/packages/mui-material/src/styles/createThemeWithVars.js b/packages/mui-material/src/styles/createThemeWithVars.js
@@ -40,7 +40,7 @@ function setColor(obj, key, defaultValue) {
 }
 
 function toRgb(color) {
-  if (!color || !color.startsWith('hsl')) {
+  if (typeof color !== 'string' || !color.startsWith('hsl')) {
     return color;
   }
   return hslToRgb(color);
@@ -421,7 +421,7 @@ export default function createThemeWithVars(options = {}, ...args) {
 
       // The default palettes (primary, secondary, error, info, success, and warning) errors are handled by the above `createTheme(...)`.
 
-      if (colors && typeof colors === 'object') {
+      if (color !== 'tonalOffset' && colors && typeof colors === 'object') {
         // Silent the error for custom palettes.
         if (colors.main) {
           setColor(palette[color], 'mainChannel', safeColorChannel(toRgb(colors.main)));