[codemod] Cover edge case for theme-spacing mui#28400

gpvidal · Sep 20, 2021 · 1f2bb89 · 1f2bb89
1 parent 6976c2e
commit 1f2bb89
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/packages/mui-codemod/src/v5.0.0/theme-spacing.js b/packages/mui-codemod/src/v5.0.0/theme-spacing.js
@@ -5,7 +5,7 @@ export default function transformer(file) {
   return (
     file.source
       // `${theme.spacing(2)}px` -> theme.spacing(2)
-      .replace(/`\${((theme\.spacing|spacing)\([^{}]*\))}px`/gm, '$1')
+      .replace(/`(-?)\${(-?)(theme\.spacing|spacing)\(([^{}]*)\)}px`/gm, '$3($1$2$4)')
       // `${theme.spacing(2)}px ${theme.spacing(4)}px` -> `${theme.spacing(2)} ${theme.spacing(4)}`
       .replace(/(?<={(theme\.spacing|spacing)\(.*\)})px/gm, '')
       .replace(/((theme\.spacing|spacing)\(.*\))\s*\+\s*'px'/gm, '$1')

diff --git a/packages/mui-codemod/src/v5.0.0/theme-spacing.test/actual.js b/packages/mui-codemod/src/v5.0.0/theme-spacing.test/actual.js
@@ -8,4 +8,6 @@ spacing(gap) + 'px'
 `calc(100% - ${spacing(itemHorzPadding * 2)}px)`
 `calc(100% - ${theme.spacing(itemHorzPadding * 2)}px)`
 padding: `${theme.spacing(2) - 1}px 0`
-`calc(100% - ${theme.spacing(itemHorzPadding) * 0.3}px)`
+`calc(100% - ${theme.spacing(itemHorzPadding) * 0.3}px)`
+`${-theme.spacing(1)}px`
+`-${theme.spacing(1)}px`
diff --git a/packages/mui-codemod/src/v5.0.0/theme-spacing.test/expected.js b/packages/mui-codemod/src/v5.0.0/theme-spacing.test/expected.js
@@ -8,4 +8,6 @@ spacing(gap)
 `calc(100% - ${spacing(itemHorzPadding * 2)})`
 `calc(100% - ${theme.spacing(itemHorzPadding * 2)})`
 padding: `calc(${theme.spacing(2)} - 1px) 0`
-`calc(100% - calc(${theme.spacing(itemHorzPadding)} * 0.3))`
+`calc(100% - calc(${theme.spacing(itemHorzPadding)} * 0.3))`
+theme.spacing(-1)
+theme.spacing(-1)