non-exhaustively remove some of the uses of spectrum outside spectrum…

… folder
deephaven · Mar 28, 2024 · 4fd1571 · 4fd1571
1 parent 1d89e63
commit 4fd1571
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 15 deletions.
diff --git a/packages/code-studio/src/styleguide/Pickers.tsx b/packages/code-studio/src/styleguide/Pickers.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
-import { Item, Picker, Section } from '@deephaven/components';
+import { Item, Flex, Text, Picker, Section } from '@deephaven/components';
 import { vsPerson } from '@deephaven/icons';
-import { Flex, Icon, Text } from '@adobe/react-spectrum';
+import { Icon } from '@adobe/react-spectrum';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { sampleSectionIdAndClasses } from './utils';
 

diff --git a/packages/code-studio/src/styleguide/RandomAreaPlotAnimation.tsx b/packages/code-studio/src/styleguide/RandomAreaPlotAnimation.tsx
@@ -1,7 +1,9 @@
 /* eslint-disable react/jsx-props-no-spreading */
 import React from 'react';
-import { View } from '@adobe/react-spectrum';
-import { RandomAreaPlotAnimation as Animation } from '@deephaven/components';
+import {
+  View,
+  RandomAreaPlotAnimation as Animation,
+} from '@deephaven/components';
 import { sampleSectionIdAndClasses } from './utils';
 
 export function RandomAreaPlotAnimation(): JSX.Element {

diff --git a/packages/code-studio/src/styleguide/SpectrumComparison.tsx b/packages/code-studio/src/styleguide/SpectrumComparison.tsx
@@ -14,9 +14,7 @@ import {
   Radio,
   RadioGroup,
   SpectrumButtonProps,
-  Text,
   TextField,
-  View,
 } from '@adobe/react-spectrum';
 import {
   Button as BootstrapButtonOld,
@@ -25,6 +23,8 @@ import {
   RadioGroup as RadioGroupOld,
   RadioItem,
   Select,
+  View,
+  Text,
 } from '@deephaven/components';
 import { EMPTY_FUNCTION } from '@deephaven/utils';
 import { vsPlay } from '@deephaven/icons';

diff --git a/packages/code-studio/src/styleguide/SpectrumComponents.tsx b/packages/code-studio/src/styleguide/SpectrumComponents.tsx
@@ -11,7 +11,6 @@ import {
   Column,
   ComboBox,
   Form,
-  Heading,
   Grid,
   Icon,
   IllustratedMessage,
@@ -24,10 +23,8 @@ import {
   TableBody,
   TableHeader,
   TableView,
-  Text,
   TextField,
   ToggleButton,
-  // View,
   Well,
   DialogTrigger,
   Dialog,
@@ -39,7 +36,7 @@ import {
 } from '@adobe/react-spectrum';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { dhTruck, vsEmptyWindow } from '@deephaven/icons';
-import { View } from '@deephaven/components';
+import { Heading, View, Text } from '@deephaven/components';
 import { SPECTRUM_COMPONENT_SAMPLES_ID } from './constants';
 import { sampleSectionIdAndClassesSpectrum } from './utils';
 

diff --git a/packages/code-studio/src/styleguide/StyleGuide.tsx b/packages/code-studio/src/styleguide/StyleGuide.tsx
@@ -1,7 +1,12 @@
 /* eslint-disable react/jsx-props-no-spreading */
 import React from 'react';
-import { Flex } from '@adobe/react-spectrum';
-import { ContextMenuRoot, ThemePicker, useTheme } from '@deephaven/components';
+
+import {
+  ContextMenuRoot,
+  ThemePicker,
+  useTheme,
+  Flex,
+} from '@deephaven/components';
 
 import Buttons from './Buttons';
 import Charts from './Charts';

diff --git a/packages/components/src/TextWithTooltip.tsx b/packages/components/src/TextWithTooltip.tsx
@@ -1,5 +1,5 @@
 import { useMemo } from 'react';
-import { Text } from '@adobe/react-spectrum';
+import { Text } from './spectrum';
 import stylesCommon from './SpectrumComponent.module.scss';
 import { PopperOptions, Tooltip } from './popper';
 

diff --git a/packages/components/src/dialogs/ActionButtonDialogTrigger.tsx b/packages/components/src/dialogs/ActionButtonDialogTrigger.tsx
@@ -1,9 +1,10 @@
 import { ReactElement } from 'react';
-import { ActionButton, DialogTrigger, Icon, Text } from '@adobe/react-spectrum';
+import { ActionButton, DialogTrigger, Icon } from '@adobe/react-spectrum';
 import type { SpectrumDialogClose } from '@react-types/dialog';
 import type { StyleProps } from '@react-types/shared';
 import type { IconDefinition } from '@fortawesome/fontawesome-common-types';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { Text } from '../spectrum';
 import { Tooltip } from '../popper';
 
 export interface ActionButtonDialogTriggerProps extends StyleProps {

diff --git a/packages/components/src/dialogs/ConfirmationDialog.tsx b/packages/components/src/dialogs/ConfirmationDialog.tsx
@@ -7,10 +7,10 @@ import {
   Dialog,
   Divider,
   Form,
-  Heading,
 } from '@adobe/react-spectrum';
 import type { SpectrumLabelableProps } from '@react-types/shared';
 import { useFormWithDetachedSubmitButton } from '@deephaven/react-hooks';
+import { Heading } from '../spectrum';
 import styles from '../SpectrumComponent.module.scss';
 
 export interface ConfirmationDialogProps {