chore: Audit subpath exports

packages/@adobe/react-spectrum/exports/ActionBar.ts

@@ -15,3 +15,4 @@ export {ActionBarContainer} from '../src/actionbar/ActionBarContainer';
 export type {SpectrumActionBarContainerProps} from '../src/actionbar/ActionBarContainer';
 export type {SpectrumActionBarProps} from '../src/actionbar/ActionBar';
 export {Item} from 'react-stately/Item';
+export type {ItemProps, Key} from '@react-types/shared';

packages/@adobe/react-spectrum/exports/ActionGroup.ts

@@ -13,3 +13,4 @@
 export {ActionGroup} from '../src/actiongroup/ActionGroup';
 export type {SpectrumActionGroupProps} from '../src/actiongroup/ActionGroup';
 export {Item} from 'react-stately/Item';
+export type {ItemProps, Key} from '@react-types/shared';

packages/@adobe/react-spectrum/exports/ActionMenu.ts

@@ -16,3 +16,4 @@ export {ActionMenu} from '../src/menu/ActionMenu';
 export type {SpectrumActionMenuProps} from '../src/menu/ActionMenu';
 export {Item} from 'react-stately/Item';
 export {Section} from 'react-stately/Section';
+export type {ItemProps, SectionProps, Key, Selection} from '@react-types/shared';

packages/@adobe/react-spectrum/exports/Breadcrumbs.ts

@@ -13,3 +13,4 @@
 export {Breadcrumbs} from '../src/breadcrumbs/Breadcrumbs';
 export type {SpectrumBreadcrumbsProps} from '../src/breadcrumbs/Breadcrumbs';
 export {Item} from 'react-stately/Item';
+export type {ItemProps, Key} from '@react-types/shared';

packages/@adobe/react-spectrum/exports/ComboBox.ts

@@ -16,3 +16,6 @@ export {ComboBox} from '../src/combobox/ComboBox';
 export type {SpectrumComboBoxProps} from '../src/combobox/ComboBox';
 export {Item} from 'react-stately/Item';
 export {Section} from 'react-stately/Section';
+export type {ItemProps, SectionProps, Key} from '@react-types/shared';
+export {useFilter} from 'react-aria/useFilter';
+export type {Filter} from 'react-aria/useFilter';

packages/@adobe/react-spectrum/exports/FileTrigger.ts

@@ -0,0 +1,2 @@
+export {FileTrigger} from 'react-aria-components/FileTrigger';
+export type {FileTriggerProps} from 'react-aria-components/FileTrigger';

packages/@adobe/react-spectrum/exports/ListBox.ts

@@ -16,3 +16,4 @@ export {ListBox} from '../src/listbox/ListBox';
 export {Item} from 'react-stately/Item';
 export {Section} from 'react-stately/Section';
 export type {SpectrumListBoxProps} from '../src/listbox/ListBoxBase';
+export type {ItemProps, SectionProps, Key, Selection} from '@react-types/shared';

packages/@adobe/react-spectrum/exports/ListView.ts

@@ -13,3 +13,4 @@
 export {ListView} from '../src/list/ListView';
 export type {SpectrumListViewProps} from '../src/list/ListView';
 export {Item} from 'react-stately/Item';
+export type {ItemProps, Key, Selection} from '@react-types/shared';

packages/@adobe/react-spectrum/exports/Menu.ts

@@ -20,3 +20,4 @@ export type {SpectrumMenuDialogTriggerProps} from '../src/menu/ContextualHelpTri
 export type {SpectrumSubmenuTriggerProps} from '../src/menu/SubmenuTrigger';
 export {Item} from 'react-stately/Item';
 export {Section} from 'react-stately/Section';
+export type {ItemProps, SectionProps, Key, Selection} from '@react-types/shared';

packages/@adobe/react-spectrum/exports/MenuTrigger.ts

@@ -16,3 +16,4 @@ export {MenuTrigger} from '../src/menu/MenuTrigger';
 export type {SpectrumMenuTriggerProps} from '../src/menu/MenuTrigger';
 export {Item} from 'react-stately/Item';
 export {Section} from 'react-stately/Section';
+export type {ItemProps, SectionProps, Key} from '@react-types/shared';

packages/@adobe/react-spectrum/exports/Picker.ts

@@ -16,3 +16,4 @@ export {Picker} from '../src/picker/Picker';
 export type {SpectrumPickerProps} from '../src/picker/Picker';
 export {Item} from 'react-stately/Item';
 export {Section} from 'react-stately/Section';
+export type {ItemProps, SectionProps, Key, Selection} from '@react-types/shared';

packages/@adobe/react-spectrum/exports/Provider.ts

@@ -13,4 +13,7 @@
 /// <reference types="css-module-types" />
 
 export {Provider, useProvider} from '../src/provider/Provider';
+export {useLocale} from 'react-aria/I18nProvider';
 export type {ProviderContext, ProviderProps, ColorScheme, Scale, Theme, Breakpoints, CSSModule} from '../src/provider/types';
+export type {RouterConfig} from '@react-types/shared';
+export type {Locale} from 'react-aria/I18nProvider';

packages/@adobe/react-spectrum/exports/TableView.ts

@@ -24,7 +24,4 @@ export {
 
 export type {SpectrumTableProps} from '../src/table/TableView';
 export type {SpectrumColumnProps} from '../src/table/types';
-export type {TableHeaderProps} from 'react-stately/TableHeader';
-export type {TableBodyProps} from 'react-stately/TableBody';
-export type {RowProps} from 'react-stately/Row';
-export type {CellProps} from 'react-stately/Cell';
+export type {TableHeaderProps, TableBodyProps, RowProps, CellProps} from 'react-stately/useTableState';

packages/@adobe/react-spectrum/exports/Tabs.ts

@@ -15,3 +15,4 @@
 export {TabList, TabPanels, Tabs} from '../src/tabs/Tabs';
 export type {SpectrumTabsProps, SpectrumTabListProps, SpectrumTabPanelsProps} from '../src/tabs/Tabs';
 export {Item} from 'react-stately/Item';
+export type {ItemProps, Key} from '@react-types/shared';

packages/@adobe/react-spectrum/exports/TagGroup.ts

@@ -13,3 +13,4 @@
 export {TagGroup} from '../src/tag/TagGroup';
 export type {SpectrumTagGroupProps} from '../src/tag/TagGroup';
 export {Item} from 'react-stately/Item';
+export type {ItemProps, Key, Selection} from '@react-types/shared';

packages/@adobe/react-spectrum/exports/TreeView.ts

@@ -14,4 +14,4 @@
 
 export {TreeViewItem, TreeView, TreeViewItemContent} from '../src/tree/TreeView';
 export type {SpectrumTreeViewProps, SpectrumTreeViewItemProps, SpectrumTreeViewItemContentProps} from '../src/tree/TreeView';
-export {Collection} from 'react-aria/private/collections/CollectionBuilder';
+export {Collection} from 'react-aria/Collection';

packages/@adobe/react-spectrum/exports/VisuallyHidden.ts

@@ -0,0 +1,2 @@
+export {VisuallyHidden} from 'react-aria/VisuallyHidden';
+export type {VisuallyHiddenAria, VisuallyHiddenProps} from 'react-aria/VisuallyHidden';

packages/@adobe/react-spectrum/exports/index.ts

@@ -117,7 +117,7 @@ export {useNumberFormatter} from 'react-aria/useNumberFormatter';
 export {SSRProvider} from 'react-aria/SSRProvider';
 export {useDragAndDrop} from '../src/dnd/useDragAndDrop';
 export {DIRECTORY_DRAG_TYPE, isDirectoryDropItem, isFileDropItem, isTextDropItem} from 'react-aria/useDrop';
-export {Collection} from 'react-aria/private/collections/CollectionBuilder';
+export {Collection} from 'react-aria/Collection';
 export type {SpectrumActionBarContainerProps} from '../src/actionbar/ActionBarContainer';
 export type {SpectrumActionBarProps} from '../src/actionbar/ActionBar';
 export type {SpectrumActionGroupProps} from '../src/actiongroup/ActionGroup';
@@ -148,7 +148,7 @@ export type {DialogContainerValue} from '../src/dialog/useDialogContainer';
 export type {SpectrumAlertDialogProps} from '../src/dialog/AlertDialog';
 export type {SpectrumDialogContainerProps} from '../src/dialog/DialogContainer';
 export type {SpectrumDialogProps} from '../src/dialog/Dialog';
-export type {SpectrumDialogTriggerProps} from '../src/dialog/DialogTrigger';
+export type {SpectrumDialogTriggerProps, SpectrumDialogClose} from '../src/dialog/DialogTrigger';
 export type {SpectrumDateFieldProps} from '../src/datepicker/DateField';
 export type {SpectrumDatePickerProps} from '../src/datepicker/DatePicker';
 export type {SpectrumDateRangePickerProps} from '../src/datepicker/DateRangePicker';
@@ -192,13 +192,10 @@ export type {KeyboardProps} from '../src/text/Keyboard';
 export type {TextProps} from '../src/text/Text';
 export type {SpectrumTableProps} from '../src/table/TableView';
 export type {SpectrumColumnProps} from '../src/table/types';
-export type {TableHeaderProps} from 'react-stately/TableHeader';
-export type {TableBodyProps} from 'react-stately/TableBody';
-export type {RowProps} from 'react-stately/Row';
-export type {CellProps} from 'react-stately/Cell';
+export type {TableHeaderProps, TableBodyProps, RowProps, CellProps} from 'react-stately/useTableState';
 export type {SpectrumTabListProps, SpectrumTabPanelsProps, SpectrumTabsProps} from '../src/tabs/Tabs';
 export type {SpectrumTagGroupProps} from '../src/tag/TagGroup';
-export type {SpectrumTextFieldProps} from '../src/textfield/TextField';
+export type {SpectrumTextFieldProps, TextFieldRef} from '../src/textfield/TextField';
 export type {SpectrumTextAreaProps} from '../src/textfield/TextArea';
 export type {SpectrumToastContainerProps, SpectrumToastOptions} from '../src/toast/ToastContainer';
 export type {SpectrumTooltipProps} from '../src/tooltip/Tooltip';

packages/@adobe/react-spectrum/exports/useAsyncList.ts

@@ -0,0 +1,2 @@
+export {useAsyncList} from 'react-stately/useAsyncList';
+export type {AsyncListOptions, AsyncListData, AsyncListLoadFunction, AsyncListLoadOptions, AsyncListStateUpdate} from 'react-stately/useAsyncList';

packages/@adobe/react-spectrum/exports/useCollator.ts

@@ -0,0 +1 @@
+export {useCollator} from 'react-aria/useCollator';

packages/@adobe/react-spectrum/exports/useDateFormatter.ts

@@ -0,0 +1,3 @@
+export {useDateFormatter} from 'react-aria/useDateFormatter';
+export type {DateFormatter} from '@internationalized/date';
+export type {DateFormatterOptions} from 'react-aria/useDateFormatter';

packages/@adobe/react-spectrum/exports/useListData.ts

@@ -0,0 +1,2 @@
+export {useListData} from 'react-stately/useListData';
+export type {ListOptions, ListData} from 'react-stately/useListData';

packages/@adobe/react-spectrum/exports/useLocalizedStringFormatter.ts

@@ -0,0 +1 @@
+export {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';

packages/@adobe/react-spectrum/exports/useNumberFormatter.ts

@@ -0,0 +1 @@
+export {useNumberFormatter} from 'react-aria/useNumberFormatter';

packages/@adobe/react-spectrum/exports/useTreeData.ts

@@ -0,0 +1,2 @@
+export {useTreeData} from 'react-stately/useTreeData';
+export type {TreeOptions, TreeData} from 'react-stately/useTreeData';

packages/@adobe/react-spectrum/src/actionbar/ActionBar.tsx

@@ -17,7 +17,7 @@ import {announce} from 'react-aria/private/live-announcer/LiveAnnouncer';
 import {classNames} from '../utils/classNames';
 import CrossLarge from '@spectrum-icons/ui/CrossLarge';
 import {DOMProps, DOMRef, ItemElement, ItemRenderer, Key, StyleProps} from '@react-types/shared';
-import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
+import {filterDOMProps} from 'react-aria/filterDOMProps';
 import {FocusScope} from 'react-aria/FocusScope';
 import intlMessages from '../../intl/actionbar/*.json';
 import {OpenTransition} from '../overlays/OpenTransition';

packages/@adobe/react-spectrum/src/actionbar/ActionBarContainer.tsx

@@ -13,7 +13,7 @@
 import {classNames} from '../utils/classNames';
 
 import {DOMProps, DOMRef, StyleProps} from '@react-types/shared';
-import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
+import {filterDOMProps} from 'react-aria/filterDOMProps';
 import React, {ReactNode} from 'react';
 import styles from './actionbar.css';
 import {useDOMRef} from '../utils/useDOMRef';

packages/@adobe/react-spectrum/src/actiongroup/ActionGroup.tsx

@@ -18,7 +18,7 @@ import buttonStyles from '@adobe/spectrum-css-temp/components/button/vars.css';
 import ChevronDownMedium from '@spectrum-icons/ui/ChevronDownMedium';
 import {classNames} from '../utils/classNames';
 import {ClearSlots, SlotProvider, useSlotProps} from '../utils/Slots';
-import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
+import {filterDOMProps} from 'react-aria/filterDOMProps';
 import {FocusScope} from 'react-aria/FocusScope';
 import intlMessages from '../../intl/actiongroup/*.json';
 import {Item} from 'react-stately/Item';

packages/@adobe/react-spectrum/src/autocomplete/SearchAutocomplete.tsx

@@ -17,7 +17,7 @@ import {classNames} from '../utils/classNames';
 import {ClearButton} from '../button/ClearButton';
 import {dimensionValue} from '../utils/styleProps';
 import {Field} from '../label/Field';
-import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
+import {filterDOMProps} from 'react-aria/filterDOMProps';
 import {FocusRing} from 'react-aria/FocusRing';
 import intlMessages from '../../intl/autocomplete/*.json';
 import {ListBoxBase, useListBoxLayout} from '../listbox/ListBoxBase';

packages/@adobe/react-spectrum/src/avatar/Avatar.tsx

@@ -14,7 +14,7 @@ import {classNames} from '../utils/classNames';
 
 import {dimensionValue, useStyleProps} from '../utils/styleProps';
 import {DOMProps, DOMRef, StyleProps} from '@react-types/shared';
-import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
+import {filterDOMProps} from 'react-aria/filterDOMProps';
 import React, {forwardRef} from 'react';
 import styles from '@adobe/spectrum-css-temp/components/avatar/vars.css';
 import {useDOMRef} from '../utils/useDOMRef';

packages/@adobe/react-spectrum/src/badge/Badge.tsx

@@ -13,7 +13,7 @@
 import {AriaLabelingProps, DOMProps, DOMRef, StyleProps} from '@react-types/shared';
 import {classNames} from '../utils/classNames';
 import {ClearSlots, SlotProvider} from '../utils/Slots';
-import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
+import {filterDOMProps} from 'react-aria/filterDOMProps';
 import React, {forwardRef, ReactNode} from 'react';
 import styles from '@adobe/spectrum-css-temp/components/badge/vars.css';
 import {Text} from '../text/Text';

packages/@adobe/react-spectrum/src/buttongroup/ButtonGroup.tsx

@@ -12,7 +12,7 @@
 
 import {Alignment, DOMProps, DOMRef, Orientation, StyleProps} from '@react-types/shared';
 import {classNames} from '../utils/classNames';
-import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
+import {filterDOMProps} from 'react-aria/filterDOMProps';
 import {Provider, useProvider, useProviderProps} from '../provider/Provider';
 import React, {ReactNode, useCallback, useRef} from 'react';
 import {SlotProvider, useSlotProps} from '../utils/Slots';

packages/@adobe/react-spectrum/src/card/BaseLayout.tsx

@@ -14,12 +14,8 @@
 import {Direction, Key, KeyboardDelegate, Node} from '@react-types/shared';
 import {getChildNodes, getFirstItem} from 'react-stately/private/collections/getChildNodes';
 import {GridCollection} from 'react-stately/private/grid/GridCollection';
-import {InvalidationContext} from 'react-stately/private/virtualizer/types';
-import {Layout} from 'react-stately/private/virtualizer/Layout';
-import {LayoutInfo} from 'react-stately/private/virtualizer/LayoutInfo';
-import {Rect} from 'react-stately/private/virtualizer/Rect';
+import {InvalidationContext, Layout, LayoutInfo, Rect, Size} from 'react-stately/useVirtualizerState';
 import {Scale} from '../provider/types';
-import {Size} from 'react-stately/private/virtualizer/Size';
 
 export interface BaseLayoutOptions {
   collator?: Intl.Collator,

packages/@adobe/react-spectrum/src/card/CardBase.tsx

@@ -15,7 +15,7 @@ import {AriaCardProps, SpectrumCardProps} from './types';
 import {Checkbox} from '../checkbox/Checkbox';
 import {classNames} from '../utils/classNames';
 import {DOMRef, Node} from '@react-types/shared';
-import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
+import {filterDOMProps} from 'react-aria/filterDOMProps';
 import {FocusRing} from 'react-aria/FocusRing';
 import {getFocusableTreeWalker} from 'react-aria/private/focus/FocusScope';
 import {mergeProps} from 'react-aria/mergeProps';

packages/@adobe/react-spectrum/src/card/CardView.tsx

@@ -21,7 +21,7 @@ import {mergeProps} from 'react-aria/mergeProps';
 import {ProgressCircle} from '../progress/ProgressCircle';
 // @ts-ignore
 import React, {ReactElement, ReactNode, useCallback, useMemo, useRef} from 'react';
-import {ReusableView} from 'react-stately/private/virtualizer/ReusableView';
+import {ReusableView} from 'react-stately/useVirtualizerState';
 import {SpectrumCardViewProps} from './types';
 import styles from '@adobe/spectrum-css-temp/components/card/vars.css';
 import {useCollator} from 'react-aria/useCollator';

packages/@adobe/react-spectrum/src/card/GalleryLayout.tsx

@@ -12,9 +12,7 @@
  */
 
 import {BaseLayout, BaseLayoutOptions} from './BaseLayout';
-import {LayoutInfo} from 'react-stately/private/virtualizer/LayoutInfo';
-import {Rect} from 'react-stately/private/virtualizer/Rect';
-import {Size} from 'react-stately/private/virtualizer/Size';
+import {LayoutInfo, Rect, Size} from 'react-stately/useVirtualizerState';
 
 export interface GalleryLayoutOptions extends BaseLayoutOptions {
   // /**

packages/@adobe/react-spectrum/src/card/GridLayout.tsx

@@ -14,9 +14,7 @@
 import {BaseLayout, BaseLayoutOptions} from './BaseLayout';
 import {getChildNodes, getFirstItem} from 'react-stately/private/collections/getChildNodes';
 import {Key, Node, Orientation} from '@react-types/shared';
-import {LayoutInfo} from 'react-stately/private/virtualizer/LayoutInfo';
-import {Rect} from 'react-stately/private/virtualizer/Rect';
-import {Size} from 'react-stately/private/virtualizer/Size';
+import {LayoutInfo, Rect, Size} from 'react-stately/useVirtualizerState';
 
 export interface GridLayoutOptions extends BaseLayoutOptions {
   // /**

packages/@adobe/react-spectrum/src/card/WaterfallLayout.tsx

@@ -13,11 +13,8 @@
 
 import {BaseLayout, BaseLayoutOptions} from './BaseLayout';
 import {getChildNodes, getFirstItem} from 'react-stately/private/collections/getChildNodes';
-import {InvalidationContext} from 'react-stately/private/virtualizer/types';
+import {InvalidationContext, LayoutInfo, Rect, Size} from 'react-stately/useVirtualizerState';
 import {Key, KeyboardDelegate} from '@react-types/shared';
-import {LayoutInfo} from 'react-stately/private/virtualizer/LayoutInfo';
-import {Rect} from 'react-stately/private/virtualizer/Rect';
-import {Size} from 'react-stately/private/virtualizer/Size';
 
 export interface WaterfallLayoutOptions extends BaseLayoutOptions {
   /**

packages/@adobe/react-spectrum/src/card/types.ts

@@ -11,7 +11,7 @@
  */
 
 import {AriaLabelingProps, AsyncLoadable, Collection, CollectionBase, Direction, DOMProps, KeyboardDelegate, LoadingState, MultipleSelection, Node, Orientation, StyleProps} from '@react-types/shared';
-import {Layout} from 'react-stately/private/virtualizer/Layout';
+import {Layout} from 'react-stately/useVirtualizerState';
 import {ReactNode} from 'react';
 import {Scale} from '../provider/types';
 

packages/@adobe/react-spectrum/src/checkbox/Checkbox.tsx

@@ -22,7 +22,7 @@ import {FocusRing} from 'react-aria/FocusRing';
 import React, {forwardRef, useContext, useRef} from 'react';
 import styles from '@adobe/spectrum-css-temp/components/checkbox/vars.css';
 import {useCheckboxGroupItem} from 'react-aria/useCheckboxGroup';
-import {useContextProps} from 'react-aria-components/utils';
+import {useContextProps} from 'react-aria-components/slots';
 import {useFocusableRef} from '../utils/useDOMRef';
 import {useFormProps} from '../form/Form';
 import {useHover} from 'react-aria/useHover';

packages/@adobe/react-spectrum/src/color/ColorArea.tsx

@@ -21,7 +21,7 @@ import {mergeProps} from 'react-aria/mergeProps';
 import React, {ReactElement, useRef} from 'react';
 import styles from '@adobe/spectrum-css-temp/components/colorarea/vars.css';
 import {useColorAreaState} from 'react-stately/useColorAreaState';
-import {useContextProps} from 'react-aria-components/utils';
+import {useContextProps} from 'react-aria-components/slots';
 import {useFocusableRef} from '../utils/useDOMRef';
 import {useFocusRing} from 'react-aria/useFocusRing';
 import {useProviderProps} from '../provider/Provider';

packages/@adobe/react-spectrum/src/color/ColorField.tsx

@@ -21,7 +21,7 @@ import styles from './colorfield.css';
 import {TextFieldBase} from '../textfield/TextFieldBase';
 import {TextFieldRef} from '../textfield/TextField';
 import {useColorChannelFieldState, useColorFieldState} from 'react-stately/useColorFieldState';
-import {useContextProps} from 'react-aria-components/utils';
+import {useContextProps} from 'react-aria-components/slots';
 import {useFormProps} from '../form/Form';
 import {useLocale} from 'react-aria/I18nProvider';
 import {useProviderProps} from '../provider/Provider';

packages/@adobe/react-spectrum/src/color/ColorSlider.tsx

@@ -21,7 +21,7 @@ import React, {ReactNode, useRef, useState} from 'react';
 import {SlotProvider} from '../utils/Slots';
 import styles from '@adobe/spectrum-css-temp/components/colorslider/vars.css';
 import {useColorSliderState} from 'react-stately/useColorSliderState';
-import {useContextProps} from 'react-aria-components/utils';
+import {useContextProps} from 'react-aria-components/slots';
 import {useFocus} from 'react-aria/useFocus';
 import {useFocusableRef} from '../utils/useDOMRef';
 import {useFocusVisible} from 'react-aria/useFocusVisible';

packages/@adobe/react-spectrum/src/color/ColorSwatch.tsx

@@ -17,7 +17,7 @@ import {ColorSwatchContext} from 'react-aria-components/ColorSwatch';
 import {DOMRef, StyleProps} from '@react-types/shared';
 import React, {createContext, forwardRef, JSX, ReactElement, useContext} from 'react';
 import {style} from '@react-spectrum/style-macro-s1' with {type: 'macro'};
-import {useContextProps} from 'react-aria-components/utils';
+import {useContextProps} from 'react-aria-components/slots';
 import {useDOMRef} from '../utils/useDOMRef';
 import {useStyleProps} from '../utils/styleProps';
 

packages/@adobe/react-spectrum/src/color/ColorWheel.tsx

@@ -20,7 +20,7 @@ import {DimensionValue, FocusableRef, StyleProps} from '@react-types/shared';
 import React, {useCallback, useRef, useState} from 'react';
 import styles from '@adobe/spectrum-css-temp/components/colorwheel/vars.css';
 import {useColorWheelState} from 'react-stately/useColorWheelState';
-import {useContextProps} from 'react-aria-components/utils';
+import {useContextProps} from 'react-aria-components/slots';
 import {useFocusableRef} from '../utils/useDOMRef';
 import {useFocusRing} from 'react-aria/useFocusRing';
 import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect';

packages/@adobe/react-spectrum/src/contextualhelp/ContextualHelp.tsx

@@ -24,7 +24,7 @@ import InfoOutline from '@spectrum-icons/workflow/InfoOutline';
 import intlMessages from '../../intl/contextualhelp/*.json';
 import {mergeProps} from 'react-aria/mergeProps';
 import {OverlayTriggerProps} from 'react-stately/useOverlayTriggerState';
-import {Placement, PositionProps} from 'react-aria/private/overlays/useOverlayPosition';
+import {Placement, PositionProps} from 'react-aria/useOverlayPosition';
 import React, {ReactNode} from 'react';
 import {useLabels} from 'react-aria/private/utils/useLabels';
 import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';