[theme] convertLength does not work for fromUnit !== 'px' (#22739)

mui · Sep 25, 2020 · 2587f77 · 2587f77
1 parent b5d7f6d
commit 2587f77
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/packages/material-ui/src/styles/cssUtils.js b/packages/material-ui/src/styles/cssUtils.js
@@ -33,7 +33,6 @@ export function convertLength(baseFontSize) {
         pxLength = toUnitless(length) * toUnitless(baseFontSize);
       } else if (fromUnit === 'rem') {
         pxLength = toUnitless(length) * toUnitless(baseFontSize);
-        return length;
       }
     }
 

diff --git a/packages/material-ui/src/styles/cssUtils.test.js b/packages/material-ui/src/styles/cssUtils.test.js
@@ -41,6 +41,7 @@ describe('cssUtils', () => {
     it('should work as expected', () => {
       const convert = convertLength('16px');
       expect(convert('32px', 'rem')).to.equal('2rem');
+      expect(convert('2rem', 'px')).to.equal('32px');
     });
   });