fix: Remove type imports from @react-types/shared (#610)

Resolves #609 **Before Merging:** - Have Version Bump to have access to exports introduced in #2084 - Once merged, remove comments and redundant imports
deephaven · Jul 9, 2024 · 66dc4bf · 66dc4bf
1 parent df6786a
commit 66dc4bf
Show file tree

Hide file tree

Showing 6 changed files with 225 additions and 316 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/plugins/ui/src/js/package.json b/plugins/ui/src/js/package.json
@@ -41,24 +41,23 @@
     "react-dom": "^17.0.2"
   },
   "dependencies": {
-    "@deephaven/chart": "^0.85.0",
-    "@deephaven/components": "^0.85.0",
-    "@deephaven/dashboard": "^0.85.0",
-    "@deephaven/dashboard-core-plugins": "^0.85.0",
-    "@deephaven/golden-layout": "^0.85.0",
+    "@deephaven/chart": "^0.85.1",
+    "@deephaven/components": "^0.85.1",
+    "@deephaven/dashboard": "^0.85.1",
+    "@deephaven/dashboard-core-plugins": "^0.85.1",
+    "@deephaven/golden-layout": "^0.85.1",
     "@deephaven/grid": "^0.85.0",
     "@deephaven/icons": "^0.85.0",
-    "@deephaven/iris-grid": "^0.85.0",
-    "@deephaven/jsapi-bootstrap": "^0.85.0",
-    "@deephaven/jsapi-components": "^0.85.0",
+    "@deephaven/iris-grid": "^0.85.1",
+    "@deephaven/jsapi-bootstrap": "^0.85.1",
+    "@deephaven/jsapi-components": "^0.85.1",
     "@deephaven/jsapi-types": "^1.0.0-dev0.35.0",
     "@deephaven/log": "^0.85.0",
-    "@deephaven/plugin": "^0.85.0",
+    "@deephaven/plugin": "^0.85.1",
     "@deephaven/react-hooks": "^0.85.0",
-    "@deephaven/redux": "^0.85.0",
+    "@deephaven/redux": "^0.85.1",
     "@deephaven/utils": "^0.85.0",
     "@fortawesome/react-fontawesome": "^0.2.0",
-    "@react-types/shared": "^3.22.0",
     "classnames": "^2.5.1",
     "json-rpc-2.0": "^1.6.0",
     "nanoid": "^5.0.7",

diff --git a/plugins/ui/src/js/src/elements/RadioGroup.tsx b/plugins/ui/src/js/src/elements/RadioGroup.tsx
@@ -1,9 +1,8 @@
 import {
   RadioGroup as DHRadioGroup,
   RadioGroupProps as DHRadioGroupProps,
+  Orientation,
 } from '@deephaven/components';
-// TODO: web-client-ui#2084 Re-export @react-types/shared types
-import { Orientation } from '@react-types/shared';
 import { SerializedFocusEventProps } from './model/SerializedPropTypes';
 import { useFocusEventCallback } from './hooks/useFocusEventCallback';
 

diff --git a/plugins/ui/src/js/src/elements/hooks/useListViewProps.ts b/plugins/ui/src/js/src/elements/hooks/useListViewProps.ts
@@ -1,7 +1,8 @@
 import { ReactElement } from 'react';
-// TODO: web-client-ui#2084 Re-export @react-types/shared types
-import type { SelectionMode } from '@react-types/shared';
-import { ListViewProps as DHListViewProps } from '@deephaven/components';
+import {
+  ListViewProps as DHListViewProps,
+  SelectionMode,
+} from '@deephaven/components';
 import { ListViewProps as DHListViewJSApiProps } from '@deephaven/jsapi-components';
 import ObjectView, { ObjectViewProps } from '../ObjectView';
 import {

diff --git a/plugins/ui/src/js/src/elements/hooks/usePressEventCallback.ts b/plugins/ui/src/js/src/elements/hooks/usePressEventCallback.ts
@@ -1,6 +1,5 @@
 import { useCallback } from 'react';
-// TODO: web-client-ui#2084 Re-export @react-types/shared types
-import { PressEvent } from '@react-types/shared';
+import { PressEvent } from '@deephaven/components';
 import { getTargetName } from '../utils';
 
 export function serializePressEvent(event: PressEvent): SerializedPressEvent {

diff --git a/plugins/ui/src/js/src/elements/hooks/useSelectionProps.ts b/plugins/ui/src/js/src/elements/hooks/useSelectionProps.ts
@@ -1,7 +1,9 @@
 import { useCallback } from 'react';
-// TODO: web-client-ui#2084 Re-export @react-types/shared types
-import type { SelectionMode } from '@react-types/shared';
-import type { ItemKey, ItemSelection } from '@deephaven/components';
+import type {
+  ItemKey,
+  ItemSelection,
+  SelectionMode,
+} from '@deephaven/components';
 
 export type SerializedSelection = 'all' | ItemKey[];