fix dialog codemod close function (#7233)

adobe · Oct 23, 2024 · 68e3057 · 68e3057 · rspbot · Oct 23, 2024
1 parent cbac9c0
commit 68e3057
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/packages/dev/codemods/src/s1-to-s2/__tests__/__snapshots__/dialog.test.ts.snap b/packages/dev/codemods/src/s1-to-s2/__tests__/__snapshots__/dialog.test.ts.snap
@@ -50,7 +50,11 @@ exports[`Moves close function from DialogTrigger to Dialog 1`] = `
 
 <DialogTrigger>
   <Button>Test</Button>
-  <Dialog>{close => <>
+  <Dialog>{(
+      {
+        close
+      }
+    ) => <>
       <Heading>Test</Heading>
 
       <Content>Content</Content>
@@ -74,7 +78,11 @@ exports[`Removes onDismiss and leaves a comment 1`] = `
 <DialogTrigger>
   <Button>Test</Button>
   // onDismiss was removed from Dialog. Use onOpenChange on the DialogTrigger, or onDismiss on the DialogContainer instead
-  <Dialog>{close => <>
+  <Dialog>{(
+      {
+        close
+      }
+    ) => <>
       <Heading>Test</Heading>
 
       <Content>Content</Content>

diff --git a/packages/dev/codemods/src/s1-to-s2/src/codemods/transforms.ts b/packages/dev/codemods/src/s1-to-s2/src/codemods/transforms.ts
@@ -386,9 +386,23 @@ function moveRenderPropsToChild(
   ) {
     const dialogElement = renderFunction.expression.body;
 
+    const originalParam = renderFunction.expression.params[0];
+    if (!t.isIdentifier(originalParam)) {
+      addComment(path.node.children[renderFunctionIndex], ' TODO(S2-upgrade): Could not automatically move the render props. You\'ll need to update this manually.');
+      return;
+    }
+    const paramName = originalParam.name;
+    const objectPattern = t.objectPattern([
+      t.objectProperty(t.identifier(paramName),
+        t.identifier(paramName),
+        false,
+        true
+      )
+    ]);
+
     const newRenderFunction = t.jsxExpressionContainer(
       t.arrowFunctionExpression(
-        renderFunction.expression.params,
+        [objectPattern],
         t.jsxFragment(
           t.jsxOpeningFragment(),
           t.jsxClosingFragment(),