Skip to content

Commit 4fd1571

Browse files
committed
non-exhaustively remove some of the uses of spectrum outside spectrum folder
1 parent 1d89e63 commit 4fd1571

8 files changed

Lines changed: 20 additions & 15 deletions

File tree

packages/code-studio/src/styleguide/Pickers.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
2-
import { Item, Picker, Section } from '@deephaven/components';
2+
import { Item, Flex, Text, Picker, Section } from '@deephaven/components';
33
import { vsPerson } from '@deephaven/icons';
4-
import { Flex, Icon, Text } from '@adobe/react-spectrum';
4+
import { Icon } from '@adobe/react-spectrum';
55
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
66
import { sampleSectionIdAndClasses } from './utils';
77

packages/code-studio/src/styleguide/RandomAreaPlotAnimation.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
/* eslint-disable react/jsx-props-no-spreading */
22
import React from 'react';
3-
import { View } from '@adobe/react-spectrum';
4-
import { RandomAreaPlotAnimation as Animation } from '@deephaven/components';
3+
import {
4+
View,
5+
RandomAreaPlotAnimation as Animation,
6+
} from '@deephaven/components';
57
import { sampleSectionIdAndClasses } from './utils';
68

79
export function RandomAreaPlotAnimation(): JSX.Element {

packages/code-studio/src/styleguide/SpectrumComparison.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ import {
1414
Radio,
1515
RadioGroup,
1616
SpectrumButtonProps,
17-
Text,
1817
TextField,
19-
View,
2018
} from '@adobe/react-spectrum';
2119
import {
2220
Button as BootstrapButtonOld,
@@ -25,6 +23,8 @@ import {
2523
RadioGroup as RadioGroupOld,
2624
RadioItem,
2725
Select,
26+
View,
27+
Text,
2828
} from '@deephaven/components';
2929
import { EMPTY_FUNCTION } from '@deephaven/utils';
3030
import { vsPlay } from '@deephaven/icons';

packages/code-studio/src/styleguide/SpectrumComponents.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import {
1111
Column,
1212
ComboBox,
1313
Form,
14-
Heading,
1514
Grid,
1615
Icon,
1716
IllustratedMessage,
@@ -24,10 +23,8 @@ import {
2423
TableBody,
2524
TableHeader,
2625
TableView,
27-
Text,
2826
TextField,
2927
ToggleButton,
30-
// View,
3128
Well,
3229
DialogTrigger,
3330
Dialog,
@@ -39,7 +36,7 @@ import {
3936
} from '@adobe/react-spectrum';
4037
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
4138
import { dhTruck, vsEmptyWindow } from '@deephaven/icons';
42-
import { View } from '@deephaven/components';
39+
import { Heading, View, Text } from '@deephaven/components';
4340
import { SPECTRUM_COMPONENT_SAMPLES_ID } from './constants';
4441
import { sampleSectionIdAndClassesSpectrum } from './utils';
4542

packages/code-studio/src/styleguide/StyleGuide.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
/* eslint-disable react/jsx-props-no-spreading */
22
import React from 'react';
3-
import { Flex } from '@adobe/react-spectrum';
4-
import { ContextMenuRoot, ThemePicker, useTheme } from '@deephaven/components';
3+
4+
import {
5+
ContextMenuRoot,
6+
ThemePicker,
7+
useTheme,
8+
Flex,
9+
} from '@deephaven/components';
510

611
import Buttons from './Buttons';
712
import Charts from './Charts';

packages/components/src/TextWithTooltip.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { useMemo } from 'react';
2-
import { Text } from '@adobe/react-spectrum';
2+
import { Text } from './spectrum';
33
import stylesCommon from './SpectrumComponent.module.scss';
44
import { PopperOptions, Tooltip } from './popper';
55

packages/components/src/dialogs/ActionButtonDialogTrigger.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import { ReactElement } from 'react';
2-
import { ActionButton, DialogTrigger, Icon, Text } from '@adobe/react-spectrum';
2+
import { ActionButton, DialogTrigger, Icon } from '@adobe/react-spectrum';
33
import type { SpectrumDialogClose } from '@react-types/dialog';
44
import type { StyleProps } from '@react-types/shared';
55
import type { IconDefinition } from '@fortawesome/fontawesome-common-types';
66
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
7+
import { Text } from '../spectrum';
78
import { Tooltip } from '../popper';
89

910
export interface ActionButtonDialogTriggerProps extends StyleProps {

packages/components/src/dialogs/ConfirmationDialog.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import {
77
Dialog,
88
Divider,
99
Form,
10-
Heading,
1110
} from '@adobe/react-spectrum';
1211
import type { SpectrumLabelableProps } from '@react-types/shared';
1312
import { useFormWithDetachedSubmitButton } from '@deephaven/react-hooks';
13+
import { Heading } from '../spectrum';
1414
import styles from '../SpectrumComponent.module.scss';
1515

1616
export interface ConfirmationDialogProps {

0 commit comments

Comments
 (0)