@planningcenter/tapestry-migration-cli 2.6.0-rc.1 → 2.6.1-qa-513.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@planningcenter/tapestry-migration-cli",
-  "version": "2.6.0-rc.1",
+  "version": "2.6.1-qa-513.0",
   "description": "CLI tool for Tapestry migrations",
   "type": "module",
   "main": "dist/index.js",
@@ -23,7 +23,7 @@
   "author": "Planning Center",
   "license": "MIT",
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.0.0"
   },
   "dependencies": {
     "commander": "^11.0.0",
@@ -51,5 +51,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3a70dfe425ce2ed9b17d5226ef57833173d15125"
+  "gitHead": "0287e937d381cc1c84235470ca5fd6bd2f390ecc"
 }

package/src/components/button/transforms/tooltipToWrapper.test.ts

@@ -30,7 +30,8 @@ export default function Test() {
       expect(result).toContain(
         'import { Button, Tooltip } from "@planningcenter/tapestry-react"'
       )
-      expect(result).toContain('<Tooltip {...{ title: "Save this item" }}>')
+      expect(result).toContain('<Tooltip {...{ title: "Save this item" }}')
+      expect(result).toContain("refAsInnerRef={false}")
       expect(result).toContain("<Button>Save</Button>")
       expect(result).toContain("</Tooltip>")
       expect(result).not.toContain("tooltip=")
@@ -47,7 +48,8 @@ export default function Test() {
 
       const result = applyTransform(input)
 
-      expect(result).toContain('<Tooltip {...{ title: "Save this item" }}>')
+      expect(result).toContain('<Tooltip {...{ title: "Save this item" }}')
+      expect(result).toContain("refAsInnerRef={false}")
       expect(result).toContain("<Button>Save</Button>")
       expect(result).not.toContain("tooltip=")
     })
@@ -63,9 +65,8 @@ export default function Test() {
 
       const result = applyTransform(input)
 
-      expect(result).toContain(
-        '<Tooltip {...{text: "Save", placement: "top"}}>'
-      )
+      expect(result).toContain('<Tooltip {...{text: "Save", placement: "top"}}')
+      expect(result).toContain("refAsInnerRef={false}")
       expect(result).toContain("<Button>Save</Button>")
       expect(result).not.toContain("tooltip=")
     })
@@ -81,7 +82,8 @@ export default function Test() {
 
       const result = applyTransform(input)
 
-      expect(result).toContain('<Tooltip {...{title: "Help"}}>')
+      expect(result).toContain('<Tooltip {...{title: "Help"}}')
+      expect(result).toContain("refAsInnerRef={false}")
       expect(result).toContain(
         '<Button variant="primary" onClick={handler} disabled>Save</Button>'
       )
@@ -99,7 +101,8 @@ export default function Test() {
 
       const result = applyTransform(input)
 
-      expect(result).toContain('<Tooltip {...{title: "Icon button"}}>')
+      expect(result).toContain('<Tooltip {...{title: "Icon button"}}')
+      expect(result).toContain("refAsInnerRef={false}")
       expect(result).toContain("<Button />")
       expect(result).toContain("</Tooltip>")
       expect(result).not.toContain("tooltip=")
@@ -121,7 +124,8 @@ export default function Test() {
       expect(result).toContain(
         'import { Button, Link, Tooltip } from "@planningcenter/tapestry-react"'
       )
-      expect(result).toContain('<Tooltip {...{title: "Save"}}>')
+      expect(result).toContain('<Tooltip {...{title: "Save"}}')
+      expect(result).toContain("refAsInnerRef={false}")
     })
 
     it("should not add duplicate Tooltip import", () => {
@@ -197,8 +201,9 @@ export default function Test() {
       expect(result).toContain(
         'import { Button, Tooltip } from "@planningcenter/tapestry-react"'
       )
-      expect(result).toContain('<Tooltip {...{title: "Save the document"}}>')
-      expect(result).toContain('<Tooltip {...{title: "Cancel operation"}}>')
+      expect(result).toContain('<Tooltip {...{title: "Save the document"}}')
+      expect(result).toContain('<Tooltip {...{title: "Cancel operation"}}')
+      expect(result).toContain("refAsInnerRef={false}")
       expect(result).not.toContain("tooltip=")
     })
 
@@ -218,7 +223,8 @@ export default function Test() {
 
       const result = applyTransform(input)
 
-      expect(result).toContain('<Tooltip {...{title: "Has tooltip"}}>')
+      expect(result).toContain('<Tooltip {...{title: "Has tooltip"}}')
+      expect(result).toContain("refAsInnerRef={false}")
       expect(result).toContain("<Button>With Tooltip</Button>")
       expect(result).toContain("<Button>Without Tooltip</Button>")
       // Only one Tooltip wrapper should be created
@@ -282,7 +288,8 @@ export default function Test() {
       expect(result).toContain(
         'import { Button as TapestryButton, Tooltip } from "@planningcenter/tapestry-react"'
       )
-      expect(result).toContain('<Tooltip {...{title: "Save item"}}>')
+      expect(result).toContain('<Tooltip {...{title: "Save item"}}')
+      expect(result).toContain("refAsInnerRef={false}")
       expect(result).toContain("<TapestryButton>Save</TapestryButton>")
       expect(result).not.toContain("tooltip=")
     })
@@ -307,8 +314,9 @@ export default function Test({ items }) {
       const result = applyTransform(input)
 
       expect(result).toContain(
-        "<Tooltip key={item.id} {...`Save ${item.name}`}>"
+        "<Tooltip key={item.id} {...`Save ${item.name}`}"
       )
+      expect(result).toContain("refAsInnerRef={false}")
       expect(result).toContain("<Button onClick={() => save(item)}>")
       expect(result).not.toContain("tooltip=")
     })
@@ -324,7 +332,8 @@ export default function Test() {
 
       const result = applyTransform(input)
 
-      expect(result).toContain("<Tooltip>")
+      expect(result).toContain("<Tooltip")
+      expect(result).toContain("refAsInnerRef={false}")
       expect(result).toContain("<Button>Save</Button>")
       expect(result).toContain("</Tooltip>")
       expect(result).not.toContain("tooltip")
@@ -359,11 +368,12 @@ export default function Test() {
       expect(result).toContain(
         'import { Button, Link, Tooltip } from "@planningcenter/tapestry-react"'
       )
-      expect(result).toContain('<Tooltip {...{title: "Submit the form"}}>')
+      expect(result).toContain('<Tooltip {...{title: "Submit the form"}}')
+      expect(result).toContain("refAsInnerRef={false}")
       expect(result).toContain('type="submit" variant="primary"')
       expect(result).toContain("Submit")
       expect(result).toContain(
-        '<Tooltip {...{text: "Reset form", placement: "bottom"}}>'
+        '<Tooltip {...{text: "Reset form", placement: "bottom"}}'
       )
       expect(result).toContain('type="reset"')
       expect(result).toContain("Reset")
@@ -384,8 +394,9 @@ export default function Test() {
     const result = applyTransform(input)!
 
     expect(result.replace(/(\s*)?\n(\s*)?/gm, " ")).toContain(
-      '<Tooltip {...{ title: "Click me" }}>'
+      '<Tooltip {...{ title: "Click me" }}'
     )
+    expect(result).toContain("refAsInnerRef={false}")
     expect(result).toContain("<Button>Click</Button>")
     expect(result).not.toContain("tooltip=")
   })

package/src/components/button/transforms/tooltipToWrapper.ts

@@ -1,3 +1,4 @@
+import { addAttribute } from "../../shared/actions/addAttribute"
 import { createWrapper } from "../../shared/actions/createWrapper"
 import { getAttributeValueAsProps } from "../../shared/actions/getAttributeValueAsProps"
 import { removeAttribute } from "../../shared/actions/removeAttribute"
@@ -18,7 +19,7 @@ const transform = attributeTransformFactory({
 
     removeAttribute("tooltip", { element, j, source })
 
-    createWrapper({
+    const wrapperElement = createWrapper({
       conflictAlias: "TRTooltip",
       element,
       j,
@@ -28,6 +29,13 @@ const transform = attributeTransformFactory({
       wrapperProps,
     })
 
+    addAttribute({
+      element: wrapperElement,
+      j,
+      name: "refAsInnerRef",
+      value: false,
+    })
+
     return true
   },
 })