Updated spectrum imports to use dh components (#366)

deephaven · Apr 18, 2024 · bdc542d · bdc542d
1 parent 5ed66a7
commit bdc542d
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 42 deletions.
diff --git a/plugins/ui/src/js/src/elements/ElementUtils.test.tsx b/plugins/ui/src/js/src/elements/ElementUtils.test.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Text } from '@adobe/react-spectrum';
+import { Text } from '@deephaven/components';
 import type { dh } from '@deephaven/jsapi-types';
 import { TestUtils } from '@deephaven/utils';
 import {

diff --git a/plugins/ui/src/js/src/elements/ElementUtils.tsx b/plugins/ui/src/js/src/elements/ElementUtils.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Text } from '@adobe/react-spectrum';
+import { Text } from '@deephaven/components';
 import type { dh } from '@deephaven/jsapi-types';
 import { ITEM_ELEMENT_NAME } from './ElementConstants';
 import ObjectView from './ObjectView';
@@ -25,7 +25,7 @@ export type ObjectNode = {
  */
 export type ElementNode<
   K extends string = string,
-  P extends Record<string, unknown> = Record<string, unknown>,
+  P extends Record<string, unknown> = Record<string, unknown>
 > = {
   /**
    * The type of this element. Can be something like `deephaven.ui.components.Panel`, or
@@ -37,7 +37,7 @@ export type ElementNode<
 
 export type ElementNodeWithChildren<
   K extends string = string,
-  P extends Record<string, unknown> = Record<string, unknown>,
+  P extends Record<string, unknown> = Record<string, unknown>
 > = ElementNode<K, P> & {
   props: React.PropsWithChildren<P>;
 };

diff --git a/plugins/ui/src/js/src/elements/SpectrumElementUtils.ts b/plugins/ui/src/js/src/elements/SpectrumElementUtils.ts
@@ -1,11 +1,10 @@
+import { ButtonGroup, Checkbox, Icon } from '@adobe/react-spectrum';
+import { ValueOf } from '@deephaven/utils';
 import {
-  ButtonGroup,
-  Checkbox,
   Content,
   ContextualHelp,
   Grid,
   Heading,
-  Icon,
   Item,
   IllustratedMessage,
   NumberField,
@@ -14,9 +13,9 @@ import {
   TabList,
   Text,
   ToggleButton,
-} from '@adobe/react-spectrum';
-import { ValueOf } from '@deephaven/utils';
-import { Flex, View } from '@deephaven/components';
+  Flex,
+  View,
+} from '@deephaven/components';
 import {
   ActionButton,
   Button,

diff --git a/plugins/ui/src/js/src/elements/spectrum/ActionButton.tsx b/plugins/ui/src/js/src/elements/spectrum/ActionButton.tsx
@@ -1,17 +1,17 @@
 import React from 'react';
 import {
-  ActionButton as SpectrumActionButton,
-  SpectrumActionButtonProps,
-} from '@adobe/react-spectrum';
+  ActionButton as DHCActionButton,
+  ActionButtonProps as DHCActionButtonProps,
+} from '@deephaven/components';
 import { SerializedButtonEventProps, useButtonProps } from './useButtonProps';
 
 function ActionButton(
-  props: SpectrumActionButtonProps & SerializedButtonEventProps
+  props: DHCActionButtonProps & SerializedButtonEventProps
 ): JSX.Element {
   const buttonProps = useButtonProps(props);
 
   // eslint-disable-next-line react/jsx-props-no-spreading
-  return <SpectrumActionButton {...buttonProps} />;
+  return <DHCActionButton {...buttonProps} />;
 }
 
 export default ActionButton;
diff --git a/plugins/ui/src/js/src/elements/spectrum/Form.tsx b/plugins/ui/src/js/src/elements/spectrum/Form.tsx
@@ -1,8 +1,11 @@
 import React, { useCallback } from 'react';
-import { Form as SpectrumForm, SpectrumFormProps } from '@adobe/react-spectrum';
+import {
+  Form as DHCForm,
+  FormProps as DHCFormProps,
+} from '@deephaven/components';
 
 function Form(
-  props: SpectrumFormProps & {
+  props: DHCFormProps & {
     onSubmit?: (data: { [key: string]: FormDataEntryValue }) => void;
   }
 ): JSX.Element {
@@ -22,7 +25,7 @@ function Form(
 
   return (
     // eslint-disable-next-line react/jsx-props-no-spreading
-    <SpectrumForm onSubmit={onSubmit} {...otherProps} />
+    <DHCForm onSubmit={onSubmit} {...otherProps} />
   );
 }
 

diff --git a/plugins/ui/src/js/src/elements/spectrum/RangeSlider.tsx b/plugins/ui/src/js/src/elements/spectrum/RangeSlider.tsx
@@ -1,15 +1,15 @@
 import React, { useCallback, useState } from 'react';
 import {
-  RangeSlider as SpectrumRangeSlider,
-  SpectrumRangeSliderProps,
-} from '@adobe/react-spectrum';
+  RangeSlider as DHCRangeSlider,
+  RangeSliderProps as DHCRangeSliderProps,
+} from '@deephaven/components';
 import { useDebouncedCallback } from '@deephaven/react-hooks';
 
 const VALUE_CHANGE_DEBOUNCE = 250;
 
 const EMPTY_FUNCTION = () => undefined;
 
-function RangeSlider(props: SpectrumRangeSliderProps): JSX.Element {
+function RangeSlider(props: DHCRangeSliderProps): JSX.Element {
   const {
     defaultValue = { start: 0, end: 0 },
     value: propValue,
@@ -34,7 +34,7 @@ function RangeSlider(props: SpectrumRangeSliderProps): JSX.Element {
 
   return (
     // eslint-disable-next-line react/jsx-props-no-spreading
-    <SpectrumRangeSlider value={value} onChange={onChange} {...otherProps} />
+    <DHCRangeSlider value={value} onChange={onChange} {...otherProps} />
   );
 }
 

diff --git a/plugins/ui/src/js/src/elements/spectrum/Slider.tsx b/plugins/ui/src/js/src/elements/spectrum/Slider.tsx
@@ -1,15 +1,15 @@
 import React, { useCallback, useState } from 'react';
 import {
-  Slider as SpectrumSlider,
-  SpectrumSliderProps,
-} from '@adobe/react-spectrum';
+  Slider as DHCSlider,
+  SliderProps as DHCSliderProps,
+} from '@deephaven/components';
 import { useDebouncedCallback } from '@deephaven/react-hooks';
 
 const VALUE_CHANGE_DEBOUNCE = 250;
 
 const EMPTY_FUNCTION = () => undefined;
 
-function Slider(props: SpectrumSliderProps): JSX.Element {
+function Slider(props: DHCSliderProps): JSX.Element {
   const {
     defaultValue = 0,
     value: propValue,
@@ -34,7 +34,7 @@ function Slider(props: SpectrumSliderProps): JSX.Element {
 
   return (
     // eslint-disable-next-line react/jsx-props-no-spreading
-    <SpectrumSlider value={value} onChange={onChange} {...otherProps} />
+    <DHCSlider value={value} onChange={onChange} {...otherProps} />
   );
 }
 

diff --git a/plugins/ui/src/js/src/elements/spectrum/TabPanels.tsx b/plugins/ui/src/js/src/elements/spectrum/TabPanels.tsx
@@ -1,16 +1,14 @@
 import React from 'react';
 import {
-  TabPanels as SpectrumTabPanels,
-  SpectrumTabPanelsProps,
-} from '@adobe/react-spectrum';
+  TabPanels as DHCTabPanels,
+  TabPanelsProps as DHCTabPanelsProps,
+} from '@deephaven/components';
 
-function TabPanels(
-  props: SpectrumTabPanelsProps<React.ReactNode>
-): JSX.Element {
+function TabPanels(props: DHCTabPanelsProps<React.ReactNode>): JSX.Element {
   const { UNSAFE_style: unsafeStyle, ...otherProps } = props;
 
   return (
-    <SpectrumTabPanels
+    <DHCTabPanels
       // eslint-disable-next-line react/jsx-props-no-spreading
       {...otherProps}
       UNSAFE_style={{ display: 'flex', ...unsafeStyle }}

diff --git a/plugins/ui/src/js/src/elements/spectrum/TextField.tsx b/plugins/ui/src/js/src/elements/spectrum/TextField.tsx
@@ -1,15 +1,15 @@
 import React, { useCallback, useState } from 'react';
 import {
-  SpectrumTextFieldProps,
-  TextField as SpectrumTextField,
-} from '@adobe/react-spectrum';
+  TextField as DHCTextField,
+  TextFieldProps as DHCTextFieldProps,
+} from '@deephaven/components';
 import { useDebouncedCallback } from '@deephaven/react-hooks';
 
 const VALUE_CHANGE_DEBOUNCE = 250;
 
 const EMPTY_FUNCTION = () => undefined;
 
-function TextField(props: SpectrumTextFieldProps): JSX.Element {
+function TextField(props: DHCTextFieldProps): JSX.Element {
   const {
     defaultValue = '',
     value: propValue,
@@ -34,7 +34,7 @@ function TextField(props: SpectrumTextFieldProps): JSX.Element {
 
   return (
     // eslint-disable-next-line react/jsx-props-no-spreading
-    <SpectrumTextField value={value} onChange={onChange} {...otherProps} />
+    <DHCTextField value={value} onChange={onChange} {...otherProps} />
   );
 }
 

diff --git a/plugins/ui/src/js/src/elements/spectrum/mapSpectrumChildren.tsx b/plugins/ui/src/js/src/elements/spectrum/mapSpectrumChildren.tsx
@@ -1,5 +1,5 @@
-import { Text } from '@adobe/react-spectrum';
 import React from 'react';
+import { Text } from '@deephaven/components';
 
 /**
  * Map the children of an element to Spectrum children, automatically wrapping strings and numbers in `Text` elements.

diff --git a/plugins/ui/src/js/src/widget/WidgetUtils.test.tsx b/plugins/ui/src/js/src/widget/WidgetUtils.test.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Text } from '@adobe/react-spectrum';
+import { Text } from '@deephaven/components';
 import {
   FRAGMENT_ELEMENT_NAME,
   ITEM_ELEMENT_NAME,