From 86eb91fe5b3a7f93a3e085e8f8233fe77b1b4770 Mon Sep 17 00:00:00 2001
From: Reid Barber <reid@reidbarber.com>
Date: Mon, 19 Aug 2024 13:25:59 -0500
Subject: [PATCH] Codemod: don't affect Items in unimplemented collection
 components (#6903)

---
 .../multi-collection.test.ts.snap             | 41 +++++++++++++++++++
 .../__tests__/multi-collection.test.ts        | 40 ++++++++++++++++++
 .../src/s1-to-s2/src/codemods/transforms.ts   |  2 +-
 3 files changed, 82 insertions(+), 1 deletion(-)

diff --git a/packages/dev/codemods/src/s1-to-s2/__tests__/__snapshots__/multi-collection.test.ts.snap b/packages/dev/codemods/src/s1-to-s2/__tests__/__snapshots__/multi-collection.test.ts.snap
index a3393c65cbf..27ba5c81e99 100644
--- a/packages/dev/codemods/src/s1-to-s2/__tests__/__snapshots__/multi-collection.test.ts.snap
+++ b/packages/dev/codemods/src/s1-to-s2/__tests__/__snapshots__/multi-collection.test.ts.snap
@@ -1,5 +1,46 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`Does not affect unimplemented collections 1`] = `
+"import {Accordion, Item, ActionBarContainer, ActionBar, ListView, ListBox} from '@adobe/react-spectrum';
+import {SearchAutocomplete} from '@react-spectrum/autocomplete';
+import {StepList} from '@react-spectrum/steplist';
+
+<div>
+  <SearchAutocomplete>
+    <Item key="one">One</Item>
+    <Item key="two">Two</Item>
+    <Item key="three">Three</Item>
+  </SearchAutocomplete>
+  <Accordion>
+    <Item title="One" key="one">One</Item>
+    <Item title="Two" key="two">Two</Item>
+    <Item title="Three" key="three">Three</Item>
+  </Accordion>
+  <ActionBarContainer height={300} maxWidth="size-6000">
+    <ListView>
+      <Item key="photoshop">Adobe Photoshop</Item>
+      <Item key="illustrator">Adobe Illustrator</Item>
+      <Item key="xd">Adobe XD</Item>
+    </ListView>
+    <ActionBar>
+      <Item key="one">One</Item>
+      <Item key="two">Two</Item>
+      <Item key="three">Three</Item>
+    </ActionBar>
+  </ActionBarContainer>
+  <StepList>
+    <Item key="one">One</Item>
+    <Item key="two">Two</Item>
+    <Item key="three">Three</Item>
+  </StepList>
+  <ListBox>
+    <Item key="one">One</Item>
+    <Item key="two">Two</Item>
+    <Item key="three">Three</Item>
+  </ListBox>
+</div>"
+`;
+
 exports[`Static - Renames Item to Breadcrumb and adds import 1`] = `
 "import {
   Breadcrumb,
diff --git a/packages/dev/codemods/src/s1-to-s2/__tests__/multi-collection.test.ts b/packages/dev/codemods/src/s1-to-s2/__tests__/multi-collection.test.ts
index 4efa2e62d12..ea8cceb8261 100644
--- a/packages/dev/codemods/src/s1-to-s2/__tests__/multi-collection.test.ts
+++ b/packages/dev/codemods/src/s1-to-s2/__tests__/multi-collection.test.ts
@@ -39,3 +39,43 @@ import {Breadcrumbs, Item, Menu, MenuTrigger, SubmenuTrigger, Button, Section, H
 </div>
 `);
 
+test('Does not affect unimplemented collections', `
+import {Accordion, Item, ActionBarContainer, ActionBar, ListView, ListBox} from '@adobe/react-spectrum';
+import {SearchAutocomplete} from '@react-spectrum/autocomplete';
+import {StepList} from '@react-spectrum/steplist';
+
+<div>
+  <SearchAutocomplete>
+    <Item key="one">One</Item>
+    <Item key="two">Two</Item>
+    <Item key="three">Three</Item>
+  </SearchAutocomplete>
+  <Accordion>
+    <Item title="One" key="one">One</Item>
+    <Item title="Two" key="two">Two</Item>
+    <Item title="Three" key="three">Three</Item>
+  </Accordion>
+  <ActionBarContainer height={300} maxWidth="size-6000">
+    <ListView>
+      <Item key="photoshop">Adobe Photoshop</Item>
+      <Item key="illustrator">Adobe Illustrator</Item>
+      <Item key="xd">Adobe XD</Item>
+    </ListView>
+    <ActionBar>
+      <Item key="one">One</Item>
+      <Item key="two">Two</Item>
+      <Item key="three">Three</Item>
+    </ActionBar>
+  </ActionBarContainer>
+  <StepList>
+    <Item key="one">One</Item>
+    <Item key="two">Two</Item>
+    <Item key="three">Three</Item>
+  </StepList>
+  <ListBox>
+    <Item key="one">One</Item>
+    <Item key="two">Two</Item>
+    <Item key="three">Three</Item>
+  </ListBox>
+</div>
+`);
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
index 1bbb5d3c284..65776883fb8 100644
--- a/packages/dev/codemods/src/s1-to-s2/src/codemods/transforms.ts
+++ b/packages/dev/codemods/src/s1-to-s2/src/codemods/transforms.ts
@@ -509,7 +509,7 @@ function updateComponentWithinCollection(
 function commentIfParentCollectionNotDetected(
   path: NodePath<t.JSXElement>
 ) {
-  const collectionItemParents = new Set(['Menu', 'ActionMenu', 'TagGroup', 'Breadcrumbs', 'Picker', 'ComboBox', 'ListBox', 'TabList', 'TabPanels', 'ActionGroup', 'ListBox', 'ListView', 'Collection']);
+  const collectionItemParents = new Set(['Menu', 'ActionMenu', 'TagGroup', 'Breadcrumbs', 'Picker', 'ComboBox', 'ListBox', 'TabList', 'TabPanels', 'ActionGroup', 'ListBox', 'ListView', 'Collection', 'SearchAutocomplete', 'Accordion', 'ActionBar', 'StepList']);
   if (
     t.isJSXElement(path.node)
   ) {