chore: Cleanup dependencies

packages/@react-aria/color/src/index.ts

@@ -18,7 +18,7 @@ export {useColorChannelField} from './useColorChannelField';
 export type {AriaColorAreaOptions, ColorAreaAria} from './useColorArea';
 export type {AriaColorSliderOptions, ColorSliderAria} from './useColorSlider';
 export type {AriaColorWheelOptions, ColorWheelAria} from './useColorWheel';
-export type {AriaColorFieldProps} from '@react-types/color';
+export type {AriaColorAreaProps, AriaColorFieldProps, AriaColorSliderProps} from '@react-types/color';
 export type {ColorFieldAria} from './useColorField';
 export type {AriaColorSwatchProps, ColorSwatchAria} from './useColorSwatch';
 export type {AriaColorChannelFieldProps, ColorChannelFieldAria} from './useColorChannelField';

packages/@react-spectrum/s2/package.json

@@ -134,13 +134,10 @@
     "@react-aria/i18n": "^3.12.5",
     "@react-aria/interactions": "^3.23.0",
     "@react-aria/live-announcer": "^3.4.1",
-    "@react-aria/tree": "3.0.0-beta.3",
     "@react-aria/utils": "^3.27.0",
     "@react-spectrum/utils": "^3.12.1",
     "@react-stately/layout": "^4.1.1",
     "@react-stately/utils": "^3.10.5",
-    "@react-stately/virtualizer": "^4.2.1",
-    "@react-types/color": "^3.0.2",
     "@react-types/dialog": "^3.5.15",
     "@react-types/grid": "^3.2.11",
     "@react-types/provider": "^3.8.6",

packages/@react-spectrum/s2/src/CardView.tsx

@@ -16,6 +16,7 @@ import {
   GridLayout,
   GridListItem,
   GridListProps,
+  Size,
   Virtualizer,
   WaterfallLayout
 } from 'react-aria-components';
@@ -25,7 +26,6 @@ import {DOMRef, DOMRefValue, forwardRefType, Key, LoadingState} from '@react-typ
 import {focusRing, style} from '../style' with {type: 'macro'};
 import {getAllowedOverrides, StylesPropWithHeight, UnsafeStyles} from './style-utils' with {type: 'macro'};
 import {ImageCoordinator} from './ImageCoordinator';
-import {Size} from '@react-stately/virtualizer';
 import {useActionBarContainer} from './ActionBar';
 import {useDOMRef} from '@react-spectrum/utils';
 import {useEffectEvent, useLayoutEffect, useLoadMore, useResizeObserver} from '@react-aria/utils';

packages/@react-spectrum/s2/src/ColorSwatch.tsx

@@ -13,10 +13,10 @@
 import {
   ColorSwatch as AriaColorSwatch,
   ColorSwatchProps as AriaColorSwatchProps,
+  Color,
   ContextValue,
   parseColor
 } from 'react-aria-components';
-import {Color} from '@react-types/color';
 import {createContext, forwardRef, JSX, ReactElement, useContext, useMemo} from 'react';
 import {DOMRef, DOMRefValue} from '@react-types/shared';
 import {getAllowedOverrides, StylesPropWithHeight, UnsafeStyles} from './style-utils' with {type: 'macro'};

packages/@react-spectrum/s2/src/ColorSwatchPicker.tsx

@@ -10,8 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {ColorSwatchPicker as AriaColorSwatchPicker, ColorSwatchPickerItem as AriaColorSwatchPickerItem, ContextValue, SlotProps} from 'react-aria-components';
-import {Color} from '@react-types/color';
+import {ColorSwatchPicker as AriaColorSwatchPicker, ColorSwatchPickerItem as AriaColorSwatchPickerItem, Color, ContextValue, SlotProps} from 'react-aria-components';
 import {ColorSwatchProps, InternalColorSwatchContext} from './ColorSwatch';
 import {createContext, forwardRef, ReactElement, ReactNode} from 'react';
 import {DOMRef, DOMRefValue, ValueBase} from '@react-types/shared';

packages/@react-spectrum/s2/src/TableView.tsx

@@ -32,6 +32,7 @@ import {
   TableHeader as RACTableHeader,
   TableHeaderProps as RACTableHeaderProps,
   TableProps as RACTableProps,
+  Rect,
   ResizableTableContainer,
   RowRenderProps,
   TableBodyRenderProps,
@@ -59,7 +60,6 @@ import Nubbin from '../ui-icons/S2_MoveHorizontalTableWidget.svg';
 import {ProgressCircle} from './ProgressCircle';
 import {raw} from '../style/style-macro' with {type: 'macro'};
 import React, {createContext, forwardRef, ReactElement, ReactNode, useCallback, useContext, useMemo, useRef, useState} from 'react';
-import {Rect} from '@react-stately/virtualizer';
 import SortDownArrow from '../s2wf-icons/S2_Icon_SortDown_20_N.svg';
 import SortUpArrow from '../s2wf-icons/S2_Icon_SortUp_20_N.svg';
 import {useActionBarContainer} from './ActionBar';

packages/@react-stately/color/src/index.ts

@@ -25,5 +25,5 @@ export {useColorFieldState} from './useColorFieldState';
 export {useColorChannelFieldState} from './useColorChannelFieldState';
 export {useColorPickerState} from './useColorPickerState';
 
-export type {Color, ColorAreaProps, ColorFieldProps, ColorWheelProps} from '@react-types/color';
+export type {Color, ColorChannel, ColorFormat, ColorSpace, ColorAreaProps, ColorFieldProps, ColorWheelProps} from '@react-types/color';
 export type {ColorSliderStateOptions} from './useColorSliderState';

packages/react-aria-components/package.json

@@ -41,27 +41,19 @@
     "@internationalized/string": "^3.2.5",
     "@react-aria/autocomplete": "3.0.0-alpha.37",
     "@react-aria/collections": "3.0.0-alpha.7",
-    "@react-aria/color": "^3.0.3",
-    "@react-aria/disclosure": "^3.0.1",
     "@react-aria/dnd": "^3.8.1",
     "@react-aria/focus": "^3.19.1",
     "@react-aria/interactions": "^3.23.0",
     "@react-aria/live-announcer": "^3.4.1",
-    "@react-aria/menu": "^3.17.0",
     "@react-aria/toolbar": "3.0.0-beta.12",
     "@react-aria/utils": "^3.27.0",
     "@react-aria/virtualizer": "^4.1.1",
     "@react-stately/autocomplete": "3.0.0-alpha.0",
-    "@react-stately/color": "^3.8.2",
-    "@react-stately/disclosure": "^3.0.1",
     "@react-stately/layout": "^4.1.1",
-    "@react-stately/menu": "^3.9.1",
     "@react-stately/selection": "^3.19.0",
     "@react-stately/table": "^3.13.1",
-    "@react-stately/toast": "3.0.0-beta.7",
     "@react-stately/utils": "^3.10.5",
     "@react-stately/virtualizer": "^4.2.1",
-    "@react-types/color": "^3.0.2",
     "@react-types/form": "^3.7.9",
     "@react-types/grid": "^3.2.11",
     "@react-types/shared": "^3.27.0",

packages/react-aria-components/src/ColorArea.tsx

@@ -1,11 +1,10 @@
-import {AriaColorAreaProps} from '@react-types/color';
+import {AriaColorAreaProps, useColorArea} from 'react-aria';
 import {ColorAreaContext} from './RSPContexts';
-import {ColorAreaState, useColorAreaState} from '@react-stately/color';
+import {ColorAreaState, useColorAreaState} from 'react-stately';
 import {filterDOMProps} from '@react-aria/utils';
 import {InternalColorThumbContext} from './ColorThumb';
 import {Provider, RenderProps, SlotProps, useContextProps, useRenderProps} from './utils';
 import React, {createContext, ForwardedRef, forwardRef, useRef} from 'react';
-import {useColorArea} from '@react-aria/color';
 
 export interface ColorAreaRenderProps {
   /**

packages/react-aria-components/src/ColorField.tsx

@@ -10,10 +10,9 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaColorFieldProps, useColorChannelField, useColorField} from '@react-aria/color';
-import {ColorChannel, ColorSpace} from '@react-types/color';
+import {AriaColorFieldProps, useColorChannelField, useColorField, useLocale} from 'react-aria';
+import {ColorChannel, ColorFieldState, ColorSpace, useColorChannelFieldState, useColorFieldState} from 'react-stately';
 import {ColorFieldContext} from './RSPContexts';
-import {ColorFieldState, useColorChannelFieldState, useColorFieldState} from '@react-stately/color';
 import {FieldErrorContext} from './FieldError';
 import {filterDOMProps} from '@react-aria/utils';
 import {InputContext} from './Input';
@@ -22,7 +21,6 @@ import {LabelContext} from './Label';
 import {Provider, RACValidation, removeDataAttributes, RenderProps, SlotProps, useContextProps, useRenderProps, useSlot} from './utils';
 import React, {createContext, ForwardedRef, forwardRef, HTMLAttributes, InputHTMLAttributes, LabelHTMLAttributes, Ref, useRef} from 'react';
 import {TextContext} from './Text';
-import {useLocale} from 'react-aria';
 
 export interface ColorFieldRenderProps {
   /**

packages/react-aria-components/src/ColorPicker.tsx

@@ -10,9 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-import {Color} from '@react-types/color';
+import {Color, ColorPickerState, ColorPickerProps as StatelyColorPickerProps, useColorPickerState} from 'react-stately';
 import {ColorAreaContext, ColorFieldContext, ColorSliderContext, ColorWheelContext} from './RSPContexts';
-import {ColorPickerState, ColorPickerProps as StatelyColorPickerProps, useColorPickerState} from '@react-stately/color';
 import {ColorSwatchContext} from './ColorSwatch';
 import {ColorSwatchPickerContext} from './ColorSwatchPicker';
 import {mergeProps} from 'react-aria';

packages/react-aria-components/src/ColorSlider.tsx

@@ -1,14 +1,12 @@
-import {AriaColorSliderProps} from '@react-types/color';
+import {AriaColorSliderProps, Orientation, useColorSlider, useLocale} from 'react-aria';
 import {ColorSliderContext} from './RSPContexts';
-import {ColorSliderState, useColorSliderState} from '@react-stately/color';
+import {ColorSliderState, useColorSliderState} from 'react-stately';
 import {filterDOMProps} from '@react-aria/utils';
 import {InternalColorThumbContext} from './ColorThumb';
 import {LabelContext} from './Label';
-import {Orientation, useLocale} from 'react-aria';
 import {Provider, RenderProps, SlotProps, useContextProps, useRenderProps, useSlot} from './utils';
 import React, {createContext, ForwardedRef, forwardRef} from 'react';
 import {SliderOutputContext, SliderStateContext, SliderTrackContext} from './Slider';
-import {useColorSlider} from '@react-aria/color';
 
 export interface ColorSliderRenderProps {
   /**

packages/react-aria-components/src/ColorSwatch.tsx

@@ -1,5 +1,5 @@
-import {AriaColorSwatchProps, useColorSwatch} from '@react-aria/color';
-import {Color} from '@react-types/color';
+import {AriaColorSwatchProps, useColorSwatch} from 'react-aria';
+import {Color} from 'react-stately';
 import {ContextValue, SlotProps, StyleRenderProps, useContextProps, useRenderProps} from './utils';
 import React, {createContext, ForwardedRef, forwardRef} from 'react';
 

packages/react-aria-components/src/ColorSwatchPicker.tsx

@@ -1,5 +1,5 @@
 import {AriaLabelingProps, HoverEvents, ValueBase} from '@react-types/shared';
-import {Color, parseColor, useColorPickerState} from '@react-stately/color';
+import {Color, parseColor, useColorPickerState} from 'react-stately';
 import {ColorSwatchContext} from './ColorSwatch';
 import {composeRenderProps, ContextValue, RenderProps, StyleRenderProps, useContextProps} from './utils';
 import {filterDOMProps} from '@react-aria/utils';

packages/react-aria-components/src/ColorThumb.tsx

@@ -1,11 +1,9 @@
-import {Color} from '@react-types/color';
+import {Color} from 'react-stately';
 import {filterDOMProps} from '@react-aria/utils';
 import {HoverEvents, RefObject} from '@react-types/shared';
-import {mergeProps} from 'react-aria';
+import {mergeProps, useFocusRing, useHover} from 'react-aria';
 import React, {createContext, ForwardedRef, forwardRef, HTMLAttributes, InputHTMLAttributes, useContext} from 'react';
 import {RenderProps, useRenderProps} from './utils';
-import {useFocusRing} from '@react-aria/focus';
-import {useHover} from '@react-aria/interactions';
 
 interface ColorState {
   getDisplayColor(): Color,

packages/react-aria-components/src/ColorWheel.tsx

@@ -1,6 +1,6 @@
-import {AriaColorWheelOptions, useColorWheel} from '@react-aria/color';
+import {AriaColorWheelOptions, useColorWheel} from 'react-aria';
 import {ColorWheelContext} from './RSPContexts';
-import {ColorWheelState, useColorWheelState} from '@react-stately/color';
+import {ColorWheelState, useColorWheelState} from 'react-stately';
 import {ContextValue, Provider, RenderProps, SlotProps, StyleRenderProps, useContextProps, useRenderProps} from './utils';
 import {filterDOMProps} from '@react-aria/utils';
 import {InternalColorThumbContext} from './ColorThumb';

packages/react-aria-components/src/Disclosure.tsx

@@ -10,14 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaDisclosureProps, useDisclosure} from '@react-aria/disclosure';
+import {AriaDisclosureProps, useDisclosure, useFocusRing} from 'react-aria';
 import {ButtonContext} from './Button';
 import {ContextValue, DEFAULT_SLOT, Provider, RenderProps, SlotProps, useContextProps, useRenderProps} from './utils';
-import {DisclosureGroupState, DisclosureState, DisclosureGroupProps as StatelyDisclosureGroupProps, useDisclosureGroupState, useDisclosureState} from '@react-stately/disclosure';
+import {DisclosureGroupState, DisclosureState, DisclosureGroupProps as StatelyDisclosureGroupProps, useDisclosureGroupState, useDisclosureState} from 'react-stately';
 import {DOMProps, forwardRefType, Key} from '@react-types/shared';
 import {filterDOMProps, mergeProps, mergeRefs, useId} from '@react-aria/utils';
 import React, {createContext, DOMAttributes, ForwardedRef, forwardRef, ReactNode, useContext} from 'react';
-import {useFocusRing} from 'react-aria';
 
 export interface DisclosureGroupProps extends StatelyDisclosureGroupProps, RenderProps<DisclosureGroupRenderProps>, DOMProps {}
 

packages/react-aria-components/src/Menu.tsx

@@ -10,9 +10,9 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaMenuProps, FocusScope, mergeProps, useMenu, useMenuItem, useMenuSection, useMenuTrigger} from 'react-aria';
+import {AriaMenuProps, FocusScope, mergeProps, useHover, useMenu, useMenuItem, useMenuSection, useMenuTrigger, useSubmenuTrigger} from 'react-aria';
 import {BaseCollection, Collection, CollectionBuilder, createBranchComponent, createLeafComponent} from '@react-aria/collections';
-import {MenuTriggerProps as BaseMenuTriggerProps, Collection as ICollection, Node, TreeState, useMenuTriggerState, useTreeState} from 'react-stately';
+import {MenuTriggerProps as BaseMenuTriggerProps, Collection as ICollection, Node, RootMenuTriggerState, TreeState, useMenuTriggerState, useSubmenuTriggerState, useTreeState} from 'react-stately';
 import {CollectionProps, CollectionRendererContext, ItemRenderProps, SectionContext, SectionProps, usePersistedKeys} from './Collection';
 import {ContextValue, DEFAULT_SLOT, Provider, RenderProps, ScrollableProps, SlotProps, StyleRenderProps, useContextProps, useRenderProps, useSlot, useSlottedContext} from './utils';
 import {filterDOMProps, mergeRefs, useObjectRef, useResizeObserver} from '@react-aria/utils';
@@ -22,7 +22,7 @@ import {KeyboardContext} from './Keyboard';
 import {MultipleSelectionState, SelectionManager, useMultipleSelectionState} from '@react-stately/selection';
 import {OverlayTriggerStateContext} from './Dialog';
 import {PopoverContext} from './Popover';
-import {PressResponder, useHover} from '@react-aria/interactions';
+import {PressResponder} from '@react-aria/interactions';
 import React, {
   createContext,
   ForwardedRef,
@@ -36,11 +36,9 @@ import React, {
   useRef,
   useState
 } from 'react';
-import {RootMenuTriggerState, useSubmenuTriggerState} from '@react-stately/menu';
 import {SeparatorContext} from './Separator';
 import {TextContext} from './Text';
 import {UNSTABLE_InternalAutocompleteContext} from './Autocomplete';
-import {useSubmenuTrigger} from '@react-aria/menu';
 
 export const MenuContext = createContext<ContextValue<MenuProps<any>, HTMLDivElement>>(null);
 export const MenuStateContext = createContext<TreeState<any> | null>(null);

packages/react-aria-components/src/Toast.tsx

@@ -15,7 +15,7 @@ import {ButtonContext} from './Button';
 import {ContextValue, DEFAULT_SLOT, Provider, RenderProps, StyleRenderProps, useContextProps, useRenderProps} from './utils';
 import {createPortal} from 'react-dom';
 import {forwardRefType} from '@react-types/shared';
-import {QueuedToast, ToastQueue, ToastState, useToastQueue} from '@react-stately/toast';
+import {QueuedToast, ToastQueue, ToastState, useToastQueue} from 'react-stately';
 import React, {createContext, ForwardedRef, forwardRef, HTMLAttributes, JSX, ReactElement, useContext} from 'react';
 import {TextContext} from './Text';
 import {useObjectRef} from '@react-aria/utils';

packages/react-aria-components/src/index.ts

@@ -80,9 +80,7 @@ export {useDragAndDrop} from './useDragAndDrop';
 export {DropIndicator, DropIndicatorContext, DragAndDropContext} from './DragAndDrop';
 export {Virtualizer} from './Virtualizer';
 export {DIRECTORY_DRAG_TYPE, isDirectoryDropItem, isFileDropItem, isTextDropItem, SSRProvider, RouterProvider, I18nProvider, useLocale, useFilter, Pressable, Focusable} from 'react-aria';
-export {FormValidationContext} from 'react-stately';
-export {parseColor, getColorChannels} from '@react-stately/color';
-export {ToastQueue as UNSTABLE_ToastQueue} from '@react-stately/toast';
+export {FormValidationContext, parseColor, getColorChannels, ToastQueue as UNSTABLE_ToastQueue} from 'react-stately';
 export {ListLayout, GridLayout, WaterfallLayout} from '@react-stately/layout';
 export {Layout, LayoutInfo, Size, Rect, Point} from '@react-stately/virtualizer';
 
@@ -136,7 +134,6 @@ export type {TextAreaProps} from './TextArea';
 export type {TextFieldProps, TextFieldRenderProps} from './TextField';
 export type {TextProps} from './Text';
 export type {ToastRegionProps, ToastRegionRenderProps, ToastProps, ToastRenderProps} from './Toast';
-export type {ToastOptions} from '@react-stately/toast';
 export type {ToggleButtonProps, ToggleButtonRenderProps} from './ToggleButton';
 export type {ToggleButtonGroupProps, ToggleButtonGroupRenderProps} from './ToggleButtonGroup';
 export type {ToolbarProps, ToolbarRenderProps} from './Toolbar';
@@ -149,7 +146,6 @@ export type {VirtualizerProps} from './Virtualizer';
 
 export type {DateValue, DateRange, TimeValue} from 'react-aria';
 export type {DirectoryDropItem, DraggableCollectionEndEvent, DraggableCollectionMoveEvent, DraggableCollectionStartEvent, DragPreviewRenderer, DragTypes, DropItem, DropOperation, DroppableCollectionDropEvent, DroppableCollectionEnterEvent, DroppableCollectionExitEvent, DroppableCollectionInsertDropEvent, DroppableCollectionMoveEvent, DroppableCollectionOnItemDropEvent, DroppableCollectionReorderEvent, DroppableCollectionRootDropEvent, DropPosition, DropTarget, FileDropItem, ItemDropTarget, RootDropTarget, TextDropItem, PressEvent} from 'react-aria';
-export type {Key, Selection, SortDescriptor, SortDirection, SelectionMode} from 'react-stately';
+export type {Color, ColorSpace, ColorFormat, Key, Selection, SortDescriptor, SortDirection, SelectionMode, ToastOptions} from 'react-stately';
 export type {ValidationResult, RouterConfig} from '@react-types/shared';
-export type {Color, ColorSpace, ColorFormat} from '@react-types/color';
 export type {ListLayoutOptions, GridLayoutOptions, WaterfallLayoutOptions} from '@react-stately/layout';

packages/react-aria-components/stories/ColorArea.stories.tsx

@@ -12,7 +12,7 @@
 
 import {ColorArea, ColorThumb} from '../src';
 import {ColorSliderExample} from './ColorSlider.stories';
-import {parseColor} from '@react-stately/color';
+import {parseColor} from 'react-stately';
 import React, {useState} from 'react';
 
 export default {

packages/react-aria-components/stories/ColorPicker.stories.tsx

@@ -10,14 +10,12 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button, ColorSwatchPicker, ColorSwatchPickerItem, Dialog, DialogTrigger, Input, Label, Popover} from '../src';
+import {Button, ColorSpace, ColorSwatchPicker, ColorSwatchPickerItem, Dialog, DialogTrigger, getColorChannels, Input, Label, Popover} from '../src';
 import {ColorAreaExample} from './ColorArea.stories';
 import {ColorField} from '../src/ColorField';
 import {ColorPicker} from '../src/ColorPicker';
 import {ColorSliderExample} from './ColorSlider.stories';
-import {ColorSpace} from '@react-types/color';
 import {ColorSwatchExample} from './ColorSwatch.stories';
-import {getColorChannels} from '@react-stately/color';
 import React, {useState} from 'react';
 
 export default {