Skip to content

Commit

Permalink
remove flex/view additional wrappers
Browse files Browse the repository at this point in the history
  • Loading branch information
dsmmcken committed Apr 17, 2024
1 parent 3120fcf commit ef13e5d
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 28 deletions.
3 changes: 1 addition & 2 deletions plugins/ui/src/js/src/elements/SpectrumElementUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,15 @@ import {
ToggleButton,
} from '@adobe/react-spectrum';
import { ValueOf } from '@deephaven/utils';
import { Flex, View } from '@deephaven/components';
import {
ActionButton,
Button,
Flex,
Form,
RangeSlider,
Slider,
TabPanels,
TextField,
View,
} from './spectrum';
import { ELEMENT_KEY, ElementNode, isElementNode } from './ElementUtils';

Expand Down
11 changes: 0 additions & 11 deletions plugins/ui/src/js/src/elements/spectrum/Flex.tsx

This file was deleted.

11 changes: 0 additions & 11 deletions plugins/ui/src/js/src/elements/spectrum/View.tsx

This file was deleted.

2 changes: 0 additions & 2 deletions plugins/ui/src/js/src/elements/spectrum/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
*/
export { default as ActionButton } from './ActionButton';
export { default as Button } from './Button';
export { default as Flex } from './Flex';
export { default as View } from './View';
export { default as Form } from './Form';
export { default as RangeSlider } from './RangeSlider';
export { default as Slider } from './Slider';
Expand Down
2 changes: 1 addition & 1 deletion plugins/ui/src/js/src/layout/Column.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import React, { useEffect, useMemo } from 'react';
import { useLayoutManager } from '@deephaven/dashboard';
import type { RowOrColumn } from '@deephaven/golden-layout';
import { Flex } from '@deephaven/components';
import {
normalizeColumnChildren,
type ColumnElementProps,
} from './LayoutUtils';
import { ParentItemContext, useParentItem } from './ParentItemContext';
import { usePanelId } from './ReactPanelContext';
import { Flex } from '../elements/spectrum';

function LayoutColumn({
children,
Expand Down
2 changes: 1 addition & 1 deletion plugins/ui/src/js/src/layout/Row.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React, { useEffect, useMemo } from 'react';
import { useLayoutManager } from '@deephaven/dashboard';
import type { RowOrColumn } from '@deephaven/golden-layout';
import { Flex } from '@deephaven/components';
import { normalizeRowChildren, type RowElementProps } from './LayoutUtils';
import { ParentItemContext, useParentItem } from './ParentItemContext';
import { usePanelId } from './ReactPanelContext';
import { Flex } from '../elements/spectrum';

function LayoutRow({ children, height }: RowElementProps): JSX.Element | null {
const layoutManager = useLayoutManager();
Expand Down

0 comments on commit ef13e5d

Please sign in to comment.