[codemod] Skip sx spread transformation (#43291)

mui · Aug 14, 2024 · 8968394 · 8968394
1 parent 769e9a3
commit 8968394
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 0 deletions.
diff --git a/packages/mui-codemod/src/v6.0.0/sx-prop/sx-v6.js b/packages/mui-codemod/src/v6.0.0/sx-prop/sx-v6.js
@@ -340,6 +340,10 @@ export default function sxV6(file, api, options) {
           }
           if (data.node.argument.type === 'ConditionalExpression') {
             const isSxSpread =
+              (data.node.argument.test.type === 'CallExpression' &&
+                data.node.argument.test.callee.type === 'MemberExpression' &&
+                data.node.argument.test.callee.object.name === 'Array' &&
+                data.node.argument.test.callee.property.name === 'isArray') ||
               (data.node.argument.consequent.type === 'Identifier' &&
                 data.node.argument.consequent.name === 'sx') ||
               (data.node.argument.alternate.type === 'Identifier' &&

diff --git a/packages/mui-codemod/src/v6.0.0/sx-prop/sx-v6.test.js b/packages/mui-codemod/src/v6.0.0/sx-prop/sx-v6.test.js
@@ -177,5 +177,29 @@ describe('@mui/codemod', () => {
         expect(actual).to.equal(expected, 'The transformed version should be correct');
       });
     });
+
+    describe('inheritance sx-v6', () => {
+      it('should do nothing', () => {
+        const actual = transform(
+          { source: read('./test-cases/sx-inheritance.actual.js') },
+          { jscodeshift },
+          {},
+        );
+
+        const expected = read('./test-cases/sx-inheritance.expected.js');
+        expect(actual).to.equal(expected, 'The transformed version should be correct');
+      });
+
+      it('should be idempotent', () => {
+        const actual = transform(
+          { source: read('./test-cases/sx-inheritance.expected.js') },
+          { jscodeshift },
+          {},
+        );
+
+        const expected = read('./test-cases/sx-inheritance.expected.js');
+        expect(actual).to.equal(expected, 'The transformed version should be correct');
+      });
+    });
   });
 });
diff --git a/packages/mui-codemod/src/v6.0.0/sx-prop/test-cases/sx-inheritance.actual.js b/packages/mui-codemod/src/v6.0.0/sx-prop/test-cases/sx-inheritance.actual.js
@@ -0,0 +1,18 @@
+<Layout
+  {...layoutProps}
+  {...slotProps.layout}
+  slots={slots}
+  slotProps={slotProps}
+  sx={[
+    ...(Array.isArray(sx) ? sx : [sx]),
+    ...(Array.isArray(slotProps?.layout?.sx) ? slotProps.layout.sx : [slotProps.layout.sx]),
+  ]}
+  className={clsx(className, slotProps.layout.className)}
+  ref={ref}
+/>;
+
+<FormControl
+  disabled={disabled}
+  id={id}
+  sx={[...(Array.isArray(formControlSx) ? formControlSx : [formControlSx])]}
+/>;
diff --git a/packages/mui-codemod/src/v6.0.0/sx-prop/test-cases/sx-inheritance.expected.js b/packages/mui-codemod/src/v6.0.0/sx-prop/test-cases/sx-inheritance.expected.js
@@ -0,0 +1,18 @@
+<Layout
+  {...layoutProps}
+  {...slotProps.layout}
+  slots={slots}
+  slotProps={slotProps}
+  sx={[
+    ...(Array.isArray(sx) ? sx : [sx]),
+    ...(Array.isArray(slotProps?.layout?.sx) ? slotProps.layout.sx : [slotProps.layout.sx]),
+  ]}
+  className={clsx(className, slotProps.layout.className)}
+  ref={ref}
+/>;
+
+<FormControl
+  disabled={disabled}
+  id={id}
+  sx={[...(Array.isArray(formControlSx) ? formControlSx : [formControlSx])]}
+/>;