From 759bf5cdb4b03938d08b3e3ad96fc2ee7c1a5eb8 Mon Sep 17 00:00:00 2001
From: Brian Ingles <brianingles@deephaven.io>
Date: Mon, 1 Apr 2024 16:54:59 -0500
Subject: [PATCH] Moved / renamed Spectrum utils (#1909)

---
 packages/code-studio/src/styleguide/Pickers.tsx              | 3 ++-
 packages/components/src/index.ts                             | 1 -
 packages/components/src/spectrum/picker/Picker.tsx           | 5 +++--
 packages/components/src/spectrum/picker/index.ts             | 2 +-
 .../__snapshots__/themeUtils.test.ts.snap}                   | 0
 packages/components/src/spectrum/utils/index.ts              | 2 ++
 .../PickerUtils.test.tsx => utils/itemUtils.test.tsx}        | 4 ++--
 .../spectrum/{picker/PickerUtils.ts => utils/itemUtils.ts}   | 0
 .../src/spectrum/{utils.test.ts => utils/themeUtils.test.ts} | 2 +-
 .../src/spectrum/{utils.ts => utils/themeUtils.ts}           | 2 +-
 10 files changed, 12 insertions(+), 9 deletions(-)
 rename packages/components/src/spectrum/{__snapshots__/utils.test.ts.snap => utils/__snapshots__/themeUtils.test.ts.snap} (100%)
 create mode 100644 packages/components/src/spectrum/utils/index.ts
 rename packages/components/src/spectrum/{picker/PickerUtils.test.tsx => utils/itemUtils.test.tsx} (99%)
 rename packages/components/src/spectrum/{picker/PickerUtils.ts => utils/itemUtils.ts} (100%)
 rename packages/components/src/spectrum/{utils.test.ts => utils/themeUtils.test.ts} (77%)
 rename packages/components/src/spectrum/{utils.ts => utils/themeUtils.ts} (95%)

diff --git a/packages/code-studio/src/styleguide/Pickers.tsx b/packages/code-studio/src/styleguide/Pickers.tsx
index d4f504ae91..98ede5eed3 100644
--- a/packages/code-studio/src/styleguide/Pickers.tsx
+++ b/packages/code-studio/src/styleguide/Pickers.tsx
@@ -1,13 +1,14 @@
 import React, { useCallback, useState } from 'react';
 import {
   Flex,
+  Item,
   Picker,
   PickerItemKey,
   Section,
   Text,
 } from '@deephaven/components';
 import { vsPerson } from '@deephaven/icons';
-import { Icon, Item } from '@adobe/react-spectrum';
+import { Icon } from '@adobe/react-spectrum';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { sampleSectionIdAndClasses } from './utils';
 
diff --git a/packages/components/src/index.ts b/packages/components/src/index.ts
index caba816c20..35f9513f34 100644
--- a/packages/components/src/index.ts
+++ b/packages/components/src/index.ts
@@ -49,7 +49,6 @@ export * from './SelectValueList';
 export * from './shortcuts';
 export { default as SocketedButton } from './SocketedButton';
 export * from './spectrum';
-export * from './spectrum/utils';
 export * from './TableViewEmptyState';
 export * from './TextWithTooltip';
 export * from './theme';
diff --git a/packages/components/src/spectrum/picker/Picker.tsx b/packages/components/src/spectrum/picker/Picker.tsx
index 07dfb080dd..c22a130099 100644
--- a/packages/components/src/spectrum/picker/Picker.tsx
+++ b/packages/components/src/spectrum/picker/Picker.tsx
@@ -1,6 +1,6 @@
 import { Key, ReactNode, useCallback, useMemo } from 'react';
 import { DOMRef } from '@react-types/shared';
-import { Flex, Picker as SpectrumPicker, Text } from '@adobe/react-spectrum';
+import { Flex, Picker as SpectrumPicker } from '@adobe/react-spectrum';
 import {
   getPositionOfSelectedItem,
   findSpectrumPickerScrollArea,
@@ -24,9 +24,10 @@ import {
   TooltipOptions,
   PickerItemKey,
   getPickerItemKey,
-} from './PickerUtils';
+} from '../utils/itemUtils';
 import { PickerItemContent } from './PickerItemContent';
 import { Item, Section } from '../shared';
+import { Text } from '../Text';
 
 export type PickerProps = {
   children:
diff --git a/packages/components/src/spectrum/picker/index.ts b/packages/components/src/spectrum/picker/index.ts
index f8fadc724f..b666d3021b 100644
--- a/packages/components/src/spectrum/picker/index.ts
+++ b/packages/components/src/spectrum/picker/index.ts
@@ -1,2 +1,2 @@
 export * from './Picker';
-export * from './PickerUtils';
+export * from './PickerItemContent';
diff --git a/packages/components/src/spectrum/__snapshots__/utils.test.ts.snap b/packages/components/src/spectrum/utils/__snapshots__/themeUtils.test.ts.snap
similarity index 100%
rename from packages/components/src/spectrum/__snapshots__/utils.test.ts.snap
rename to packages/components/src/spectrum/utils/__snapshots__/themeUtils.test.ts.snap
diff --git a/packages/components/src/spectrum/utils/index.ts b/packages/components/src/spectrum/utils/index.ts
new file mode 100644
index 0000000000..ab03442699
--- /dev/null
+++ b/packages/components/src/spectrum/utils/index.ts
@@ -0,0 +1,2 @@
+export * from './itemUtils';
+export * from './themeUtils';
diff --git a/packages/components/src/spectrum/picker/PickerUtils.test.tsx b/packages/components/src/spectrum/utils/itemUtils.test.tsx
similarity index 99%
rename from packages/components/src/spectrum/picker/PickerUtils.test.tsx
rename to packages/components/src/spectrum/utils/itemUtils.test.tsx
index b63f294d11..18eec1e7d2 100644
--- a/packages/components/src/spectrum/picker/PickerUtils.test.tsx
+++ b/packages/components/src/spectrum/utils/itemUtils.test.tsx
@@ -14,8 +14,8 @@ import {
   PickerItem,
   PickerItemOrSection,
   PickerSection,
-} from './PickerUtils';
-import type { PickerProps } from './Picker';
+} from './itemUtils';
+import type { PickerProps } from '../picker/Picker';
 import { Item, Section } from '../shared';
 import { Text } from '../Text';
 
diff --git a/packages/components/src/spectrum/picker/PickerUtils.ts b/packages/components/src/spectrum/utils/itemUtils.ts
similarity index 100%
rename from packages/components/src/spectrum/picker/PickerUtils.ts
rename to packages/components/src/spectrum/utils/itemUtils.ts
diff --git a/packages/components/src/spectrum/utils.test.ts b/packages/components/src/spectrum/utils/themeUtils.test.ts
similarity index 77%
rename from packages/components/src/spectrum/utils.test.ts
rename to packages/components/src/spectrum/utils/themeUtils.test.ts
index 1176a18f94..76fcde44e5 100644
--- a/packages/components/src/spectrum/utils.test.ts
+++ b/packages/components/src/spectrum/utils/themeUtils.test.ts
@@ -1,4 +1,4 @@
-import { themeDHDefault } from './utils';
+import { themeDHDefault } from './themeUtils';
 
 describe('themeDHDefault', () => {
   it('should merge Spectrum default with DH custom styles', () => {
diff --git a/packages/components/src/spectrum/utils.ts b/packages/components/src/spectrum/utils/themeUtils.ts
similarity index 95%
rename from packages/components/src/spectrum/utils.ts
rename to packages/components/src/spectrum/utils/themeUtils.ts
index 2ce048b5ff..be5d0d0cd1 100644
--- a/packages/components/src/spectrum/utils.ts
+++ b/packages/components/src/spectrum/utils/themeUtils.ts
@@ -1,5 +1,5 @@
 import { theme } from '@react-spectrum/theme-default';
-import { themeSpectrumClassesCommon } from '../theme/theme-spectrum';
+import { themeSpectrumClassesCommon } from '../../theme/theme-spectrum';
 
 const { global, light, dark, medium, large } = theme;