Addressed review comments (deephaven#1909)

bmingles · Apr 16, 2024 · 95a4744 · 95a4744
1 parent a65e539
commit 95a4744
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/packages/code-studio/src/styleguide/ListViews.tsx b/packages/code-studio/src/styleguide/ListViews.tsx
@@ -1,7 +1,13 @@
 import React, { useCallback, useState } from 'react';
-import { Grid, Item, ListView, ItemKey, Text } from '@deephaven/components';
+import {
+  Grid,
+  Icon,
+  Item,
+  ListView,
+  ItemKey,
+  Text,
+} from '@deephaven/components';
 import { vsAccount, vsPerson } from '@deephaven/icons';
-import { Icon } from '@adobe/react-spectrum';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { generateNormalizedItems, sampleSectionIdAndClasses } from './utils';
 

diff --git a/packages/components/src/spectrum/icons.ts b/packages/components/src/spectrum/icons.ts
@@ -0,0 +1,2 @@
+// eslint-disable-next-line import/prefer-default-export
+export { Icon } from '@adobe/react-spectrum';
diff --git a/packages/components/src/spectrum/index.ts b/packages/components/src/spectrum/index.ts
@@ -6,6 +6,7 @@ export * from './collections';
 export * from './content';
 export * from './dateAndTime';
 export * from './forms';
+export * from './icons';
 export * from './layout';
 export * from './navigation';
 export * from './overlays';

diff --git a/packages/components/src/spectrum/listView/ListView.tsx b/packages/components/src/spectrum/listView/ListView.tsx
@@ -1,6 +1,6 @@
 import { useMemo } from 'react';
+import cl from 'classnames';
 import {
-  Flex,
   ListView as SpectrumListView,
   SpectrumListViewProps,
 } from '@adobe/react-spectrum';
@@ -10,7 +10,7 @@ import {
   useContentRect,
   useOnScrollRef,
 } from '@deephaven/react-hooks';
-import cl from 'classnames';
+import { Flex } from '../layout';
 import {
   ItemElementOrPrimitive,
   ItemKey,
@@ -100,7 +100,7 @@ export function ListView({
 
   // Spectrum ListView crashes when it has zero height. Track the contentRect
   // of the parent container and only render the ListView when it has a non-zero
-  // height.
+  // height. See https://github.com/adobe/react-spectrum/issues/6213
   const { ref: contentRectRef, contentRect } = useContentRect(
     extractSpectrumHTMLElement
   );
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		// eslint-disable-next-line import/prefer-default-export
		export { Icon } from '@adobe/react-spectrum';