diff --git a/packages/@adobe/react-spectrum/exports/ActionBar.ts b/packages/@adobe/react-spectrum/exports/ActionBar.ts index fb7d553fe37..6099de6a3cf 100644 --- a/packages/@adobe/react-spectrum/exports/ActionBar.ts +++ b/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'; diff --git a/packages/@adobe/react-spectrum/exports/ActionGroup.ts b/packages/@adobe/react-spectrum/exports/ActionGroup.ts index 59f4ae6a62a..b8b7ef7fe5a 100644 --- a/packages/@adobe/react-spectrum/exports/ActionGroup.ts +++ b/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'; diff --git a/packages/@adobe/react-spectrum/exports/ActionMenu.ts b/packages/@adobe/react-spectrum/exports/ActionMenu.ts index 291d2c5b609..7015471b1de 100644 --- a/packages/@adobe/react-spectrum/exports/ActionMenu.ts +++ b/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'; diff --git a/packages/@adobe/react-spectrum/exports/Breadcrumbs.ts b/packages/@adobe/react-spectrum/exports/Breadcrumbs.ts index ccf4b0c308a..7bbda647fcb 100644 --- a/packages/@adobe/react-spectrum/exports/Breadcrumbs.ts +++ b/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'; diff --git a/packages/@adobe/react-spectrum/exports/ComboBox.ts b/packages/@adobe/react-spectrum/exports/ComboBox.ts index d2199d2c6ec..6cf39f1750b 100644 --- a/packages/@adobe/react-spectrum/exports/ComboBox.ts +++ b/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'; diff --git a/packages/@adobe/react-spectrum/exports/FileTrigger.ts b/packages/@adobe/react-spectrum/exports/FileTrigger.ts new file mode 100644 index 00000000000..159d86afd20 --- /dev/null +++ b/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'; diff --git a/packages/@adobe/react-spectrum/exports/ListBox.ts b/packages/@adobe/react-spectrum/exports/ListBox.ts index 71d0217dc3d..ee026d1d1f2 100644 --- a/packages/@adobe/react-spectrum/exports/ListBox.ts +++ b/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'; diff --git a/packages/@adobe/react-spectrum/exports/ListView.ts b/packages/@adobe/react-spectrum/exports/ListView.ts index b53d6a93c82..938cc272a66 100644 --- a/packages/@adobe/react-spectrum/exports/ListView.ts +++ b/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'; diff --git a/packages/@adobe/react-spectrum/exports/Menu.ts b/packages/@adobe/react-spectrum/exports/Menu.ts index eb38877fe9f..947f48be89c 100644 --- a/packages/@adobe/react-spectrum/exports/Menu.ts +++ b/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'; diff --git a/packages/@adobe/react-spectrum/exports/MenuTrigger.ts b/packages/@adobe/react-spectrum/exports/MenuTrigger.ts index ed48abf4202..25a561378fb 100644 --- a/packages/@adobe/react-spectrum/exports/MenuTrigger.ts +++ b/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'; diff --git a/packages/@adobe/react-spectrum/exports/Picker.ts b/packages/@adobe/react-spectrum/exports/Picker.ts index 78fef18c340..e014b969def 100644 --- a/packages/@adobe/react-spectrum/exports/Picker.ts +++ b/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'; diff --git a/packages/@adobe/react-spectrum/exports/Provider.ts b/packages/@adobe/react-spectrum/exports/Provider.ts index 693ea21f652..b4e6164c71e 100644 --- a/packages/@adobe/react-spectrum/exports/Provider.ts +++ b/packages/@adobe/react-spectrum/exports/Provider.ts @@ -13,4 +13,7 @@ /// 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'; diff --git a/packages/@adobe/react-spectrum/exports/TableView.ts b/packages/@adobe/react-spectrum/exports/TableView.ts index fa0eb6586ff..2989fb3f283 100644 --- a/packages/@adobe/react-spectrum/exports/TableView.ts +++ b/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'; diff --git a/packages/@adobe/react-spectrum/exports/Tabs.ts b/packages/@adobe/react-spectrum/exports/Tabs.ts index 4795ed68410..b25c3f84ede 100644 --- a/packages/@adobe/react-spectrum/exports/Tabs.ts +++ b/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'; diff --git a/packages/@adobe/react-spectrum/exports/TagGroup.ts b/packages/@adobe/react-spectrum/exports/TagGroup.ts index ea0005d214e..1b482e572c1 100644 --- a/packages/@adobe/react-spectrum/exports/TagGroup.ts +++ b/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'; diff --git a/packages/@adobe/react-spectrum/exports/TreeView.ts b/packages/@adobe/react-spectrum/exports/TreeView.ts index 288a8f40844..74520c649bb 100644 --- a/packages/@adobe/react-spectrum/exports/TreeView.ts +++ b/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'; diff --git a/packages/@adobe/react-spectrum/exports/VisuallyHidden.ts b/packages/@adobe/react-spectrum/exports/VisuallyHidden.ts new file mode 100644 index 00000000000..248791dbf1f --- /dev/null +++ b/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'; diff --git a/packages/@adobe/react-spectrum/exports/index.ts b/packages/@adobe/react-spectrum/exports/index.ts index 14e0a3848a0..cdd1ae83fbb 100644 --- a/packages/@adobe/react-spectrum/exports/index.ts +++ b/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'; diff --git a/packages/@adobe/react-spectrum/exports/useAsyncList.ts b/packages/@adobe/react-spectrum/exports/useAsyncList.ts new file mode 100644 index 00000000000..af9ed6e9c67 --- /dev/null +++ b/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'; diff --git a/packages/@adobe/react-spectrum/exports/useCollator.ts b/packages/@adobe/react-spectrum/exports/useCollator.ts new file mode 100644 index 00000000000..59a05d54e59 --- /dev/null +++ b/packages/@adobe/react-spectrum/exports/useCollator.ts @@ -0,0 +1 @@ +export {useCollator} from 'react-aria/useCollator'; diff --git a/packages/@adobe/react-spectrum/exports/useDateFormatter.ts b/packages/@adobe/react-spectrum/exports/useDateFormatter.ts new file mode 100644 index 00000000000..8e6a71654cf --- /dev/null +++ b/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'; diff --git a/packages/@adobe/react-spectrum/exports/useListData.ts b/packages/@adobe/react-spectrum/exports/useListData.ts new file mode 100644 index 00000000000..f4c7f4e4436 --- /dev/null +++ b/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'; diff --git a/packages/@adobe/react-spectrum/exports/useLocalizedStringFormatter.ts b/packages/@adobe/react-spectrum/exports/useLocalizedStringFormatter.ts new file mode 100644 index 00000000000..74fdf84a3f9 --- /dev/null +++ b/packages/@adobe/react-spectrum/exports/useLocalizedStringFormatter.ts @@ -0,0 +1 @@ +export {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter'; diff --git a/packages/@adobe/react-spectrum/exports/useNumberFormatter.ts b/packages/@adobe/react-spectrum/exports/useNumberFormatter.ts new file mode 100644 index 00000000000..ecad22ebaf9 --- /dev/null +++ b/packages/@adobe/react-spectrum/exports/useNumberFormatter.ts @@ -0,0 +1 @@ +export {useNumberFormatter} from 'react-aria/useNumberFormatter'; diff --git a/packages/@adobe/react-spectrum/exports/useTreeData.ts b/packages/@adobe/react-spectrum/exports/useTreeData.ts new file mode 100644 index 00000000000..3f975ae1438 --- /dev/null +++ b/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'; diff --git a/packages/@adobe/react-spectrum/src/actionbar/ActionBar.tsx b/packages/@adobe/react-spectrum/src/actionbar/ActionBar.tsx index 8908c4ec776..8122afe1342 100644 --- a/packages/@adobe/react-spectrum/src/actionbar/ActionBar.tsx +++ b/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'; diff --git a/packages/@adobe/react-spectrum/src/actionbar/ActionBarContainer.tsx b/packages/@adobe/react-spectrum/src/actionbar/ActionBarContainer.tsx index ef1f10ae635..8bd7c73eed5 100644 --- a/packages/@adobe/react-spectrum/src/actionbar/ActionBarContainer.tsx +++ b/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'; diff --git a/packages/@adobe/react-spectrum/src/actiongroup/ActionGroup.tsx b/packages/@adobe/react-spectrum/src/actiongroup/ActionGroup.tsx index c086d5b2c34..98eea137f4a 100644 --- a/packages/@adobe/react-spectrum/src/actiongroup/ActionGroup.tsx +++ b/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'; diff --git a/packages/@adobe/react-spectrum/src/autocomplete/SearchAutocomplete.tsx b/packages/@adobe/react-spectrum/src/autocomplete/SearchAutocomplete.tsx index c26a3f5b003..9025b7d12a8 100644 --- a/packages/@adobe/react-spectrum/src/autocomplete/SearchAutocomplete.tsx +++ b/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'; diff --git a/packages/@adobe/react-spectrum/src/avatar/Avatar.tsx b/packages/@adobe/react-spectrum/src/avatar/Avatar.tsx index 98a6bf0d0a7..c2cba796db6 100644 --- a/packages/@adobe/react-spectrum/src/avatar/Avatar.tsx +++ b/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'; diff --git a/packages/@adobe/react-spectrum/src/badge/Badge.tsx b/packages/@adobe/react-spectrum/src/badge/Badge.tsx index 414c3bbe489..437a2fb93de 100644 --- a/packages/@adobe/react-spectrum/src/badge/Badge.tsx +++ b/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'; diff --git a/packages/@adobe/react-spectrum/src/buttongroup/ButtonGroup.tsx b/packages/@adobe/react-spectrum/src/buttongroup/ButtonGroup.tsx index 6bb895bb5d7..88d44606335 100644 --- a/packages/@adobe/react-spectrum/src/buttongroup/ButtonGroup.tsx +++ b/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'; diff --git a/packages/@adobe/react-spectrum/src/card/BaseLayout.tsx b/packages/@adobe/react-spectrum/src/card/BaseLayout.tsx index bfdedb62d86..e12ebd496b1 100644 --- a/packages/@adobe/react-spectrum/src/card/BaseLayout.tsx +++ b/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, diff --git a/packages/@adobe/react-spectrum/src/card/CardBase.tsx b/packages/@adobe/react-spectrum/src/card/CardBase.tsx index 17b63fe05ef..0dbe3fe9868 100644 --- a/packages/@adobe/react-spectrum/src/card/CardBase.tsx +++ b/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'; diff --git a/packages/@adobe/react-spectrum/src/card/CardView.tsx b/packages/@adobe/react-spectrum/src/card/CardView.tsx index 89080bd2d2f..8b2e2a6d4e9 100644 --- a/packages/@adobe/react-spectrum/src/card/CardView.tsx +++ b/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'; diff --git a/packages/@adobe/react-spectrum/src/card/GalleryLayout.tsx b/packages/@adobe/react-spectrum/src/card/GalleryLayout.tsx index 46d3587a2dd..be9b7ee28f6 100644 --- a/packages/@adobe/react-spectrum/src/card/GalleryLayout.tsx +++ b/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 { // /** diff --git a/packages/@adobe/react-spectrum/src/card/GridLayout.tsx b/packages/@adobe/react-spectrum/src/card/GridLayout.tsx index ef590a1fb95..d138174e0db 100644 --- a/packages/@adobe/react-spectrum/src/card/GridLayout.tsx +++ b/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 { // /** diff --git a/packages/@adobe/react-spectrum/src/card/WaterfallLayout.tsx b/packages/@adobe/react-spectrum/src/card/WaterfallLayout.tsx index a13044525e2..c1187c6053c 100644 --- a/packages/@adobe/react-spectrum/src/card/WaterfallLayout.tsx +++ b/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 { /** diff --git a/packages/@adobe/react-spectrum/src/card/types.ts b/packages/@adobe/react-spectrum/src/card/types.ts index afb2284886c..7a0eb908476 100644 --- a/packages/@adobe/react-spectrum/src/card/types.ts +++ b/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'; diff --git a/packages/@adobe/react-spectrum/src/checkbox/Checkbox.tsx b/packages/@adobe/react-spectrum/src/checkbox/Checkbox.tsx index ce9b591bbaa..65d0d4e82fc 100644 --- a/packages/@adobe/react-spectrum/src/checkbox/Checkbox.tsx +++ b/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'; diff --git a/packages/@adobe/react-spectrum/src/color/ColorArea.tsx b/packages/@adobe/react-spectrum/src/color/ColorArea.tsx index 9536828f6af..785a2f1c8e0 100644 --- a/packages/@adobe/react-spectrum/src/color/ColorArea.tsx +++ b/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'; diff --git a/packages/@adobe/react-spectrum/src/color/ColorField.tsx b/packages/@adobe/react-spectrum/src/color/ColorField.tsx index 8edd678a291..01d979c3739 100644 --- a/packages/@adobe/react-spectrum/src/color/ColorField.tsx +++ b/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'; diff --git a/packages/@adobe/react-spectrum/src/color/ColorSlider.tsx b/packages/@adobe/react-spectrum/src/color/ColorSlider.tsx index 7e46abab451..229700bdd8c 100644 --- a/packages/@adobe/react-spectrum/src/color/ColorSlider.tsx +++ b/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'; diff --git a/packages/@adobe/react-spectrum/src/color/ColorSwatch.tsx b/packages/@adobe/react-spectrum/src/color/ColorSwatch.tsx index 75201876f72..39d6e1066f8 100644 --- a/packages/@adobe/react-spectrum/src/color/ColorSwatch.tsx +++ b/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'; diff --git a/packages/@adobe/react-spectrum/src/color/ColorWheel.tsx b/packages/@adobe/react-spectrum/src/color/ColorWheel.tsx index 58471e5e8c3..dc5c9235e17 100644 --- a/packages/@adobe/react-spectrum/src/color/ColorWheel.tsx +++ b/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'; diff --git a/packages/@adobe/react-spectrum/src/contextualhelp/ContextualHelp.tsx b/packages/@adobe/react-spectrum/src/contextualhelp/ContextualHelp.tsx index 5991deecc94..e8b43bdbb3e 100644 --- a/packages/@adobe/react-spectrum/src/contextualhelp/ContextualHelp.tsx +++ b/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'; diff --git a/packages/@adobe/react-spectrum/src/datepicker/Input.tsx b/packages/@adobe/react-spectrum/src/datepicker/Input.tsx index c4b31a703b2..5adafd18136 100644 --- a/packages/@adobe/react-spectrum/src/datepicker/Input.tsx +++ b/packages/@adobe/react-spectrum/src/datepicker/Input.tsx @@ -15,7 +15,7 @@ import Checkmark from '@spectrum-icons/ui/CheckmarkMedium'; import {classNames} from '../utils/classNames'; import datepickerStyles from './styles.css'; import {mergeProps} from 'react-aria/mergeProps'; -import {mergeRefs} from 'react-aria/private/utils/mergeRefs'; +import {mergeRefs} from 'react-aria/mergeRefs'; import React, {ReactElement, useCallback, useRef} from 'react'; import textfieldStyles from '@adobe/spectrum-css-temp/components/textfield/vars.css'; import {useEvent} from 'react-aria/private/utils/useEvent'; diff --git a/packages/@adobe/react-spectrum/src/dialog/AlertDialog.tsx b/packages/@adobe/react-spectrum/src/dialog/AlertDialog.tsx index 7250db2894a..35519a82f40 100644 --- a/packages/@adobe/react-spectrum/src/dialog/AlertDialog.tsx +++ b/packages/@adobe/react-spectrum/src/dialog/AlertDialog.tsx @@ -13,14 +13,14 @@ import AlertMedium from '@spectrum-icons/ui/AlertMedium'; import {Button, SpectrumButtonProps} from '../button/Button'; import {ButtonGroup} from '../buttongroup/ButtonGroup'; -import {chain} from 'react-aria/private/utils/chain'; +import {chain} from 'react-aria/chain'; import {classNames} from '../utils/classNames'; import {Content} from '../view/Content'; import {Dialog} from './Dialog'; import {DialogContext, DialogContextValue} from './context'; import {Divider} from '../divider/Divider'; import {DOMProps, DOMRef, StyleProps} from '@react-types/shared'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {Heading} from '../text/Heading'; import intlMessages from '../../intl/dialog/*.json'; // @ts-ignore diff --git a/packages/@adobe/react-spectrum/src/dialog/DialogTrigger.tsx b/packages/@adobe/react-spectrum/src/dialog/DialogTrigger.tsx index 85feb4aa0cc..dbdae604b68 100644 --- a/packages/@adobe/react-spectrum/src/dialog/DialogTrigger.tsx +++ b/packages/@adobe/react-spectrum/src/dialog/DialogTrigger.tsx @@ -14,7 +14,7 @@ import {DialogContext} from './context'; import {Modal} from '../overlays/Modal'; import {OverlayTriggerProps, OverlayTriggerState, useOverlayTriggerState} from 'react-stately/useOverlayTriggerState'; import {Popover} from '../overlays/Popover'; -import {PositionProps} from 'react-aria/private/overlays/useOverlayPosition'; +import {PositionProps} from 'react-aria/useOverlayPosition'; import {PressResponder} from 'react-aria/private/interactions/PressResponder'; import React, {Fragment, JSX, ReactElement, RefObject, useEffect, useRef} from 'react'; import {SpectrumDialogProps} from './Dialog'; diff --git a/packages/@adobe/react-spectrum/src/dnd/useDragAndDrop.ts b/packages/@adobe/react-spectrum/src/dnd/useDragAndDrop.ts index a401c0018b1..e986a0914d0 100644 --- a/packages/@adobe/react-spectrum/src/dnd/useDragAndDrop.ts +++ b/packages/@adobe/react-spectrum/src/dnd/useDragAndDrop.ts @@ -14,19 +14,16 @@ import { DraggableCollectionOptions, DraggableItemProps, DraggableItemResult, + DragPreview, useDraggableCollection, useDraggableItem } from 'react-aria/useDraggableCollection'; - import {DraggableCollectionProps, DragItem, DroppableCollectionProps, Key, RefObject} from '@react-types/shared'; - import { DraggableCollectionState, DraggableCollectionStateOptions, useDraggableCollectionState } from 'react-stately/useDraggableCollectionState'; - -import {DragPreview} from 'react-aria/DragPreview'; import { DropIndicatorAria, DropIndicatorProps, @@ -38,15 +35,12 @@ import { useDroppableCollection, useDroppableItem } from 'react-aria/useDroppableCollection'; - import { DroppableCollectionState, DroppableCollectionStateOptions, useDroppableCollectionState } from 'react-stately/useDroppableCollectionState'; - import {isVirtualDragging} from 'react-aria/private/dnd/DragManager'; - import {JSX, useMemo} from 'react'; interface DraggableCollectionStateOpts extends Omit, 'getItems'> {} diff --git a/packages/@adobe/react-spectrum/src/dropzone/DropZone.tsx b/packages/@adobe/react-spectrum/src/dropzone/DropZone.tsx index 6e809b4104c..f218a6683c6 100644 --- a/packages/@adobe/react-spectrum/src/dropzone/DropZone.tsx +++ b/packages/@adobe/react-spectrum/src/dropzone/DropZone.tsx @@ -16,7 +16,7 @@ import {DropZoneProps, DropZone as RACDropZone} from 'react-aria-components/Drop import {HeadingContext} from 'react-aria-components/Heading'; import intlMessages from '../../intl/dropzone/*.json'; import {mergeProps} from 'react-aria/mergeProps'; -import {Provider} from 'react-aria-components/utils'; +import {Provider} from 'react-aria-components/slots'; import React, {ReactNode} from 'react'; // @ts-ignore import {SlotProvider} from '../utils/Slots'; diff --git a/packages/@adobe/react-spectrum/src/form/Form.tsx b/packages/@adobe/react-spectrum/src/form/Form.tsx index 2f5d57282c2..9f3262cf1d4 100644 --- a/packages/@adobe/react-spectrum/src/form/Form.tsx +++ b/packages/@adobe/react-spectrum/src/form/Form.tsx @@ -12,7 +12,7 @@ import {Alignment, DOMProps, DOMRef, FormProps, LabelPosition, SpectrumLabelableProps, StyleProps, ValidationState} from '@react-types/shared'; import {classNames} from '../utils/classNames'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {FormValidationContext} from 'react-stately/private/form/useFormValidationState'; import {Provider, useProviderProps} from '../provider/Provider'; import React, {ReactElement, useContext} from 'react'; diff --git a/packages/@adobe/react-spectrum/src/icon/Icon.tsx b/packages/@adobe/react-spectrum/src/icon/Icon.tsx index 66aa5d6b890..88aa5bbf9dd 100644 --- a/packages/@adobe/react-spectrum/src/icon/Icon.tsx +++ b/packages/@adobe/react-spectrum/src/icon/Icon.tsx @@ -13,7 +13,7 @@ import {AriaLabelingProps, DOMProps, IconColorValue, StyleProps} from '@react-types/shared'; import {baseStyleProps, StyleHandlers, useStyleProps} from '../utils/styleProps'; import {classNames} from '../utils/classNames'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {ProviderContext} from '../provider/types'; import React, {JSX, ReactElement} from 'react'; import styles from '@adobe/spectrum-css-temp/components/icon/vars.css'; diff --git a/packages/@adobe/react-spectrum/src/icon/Illustration.tsx b/packages/@adobe/react-spectrum/src/icon/Illustration.tsx index 1a4f27f3f71..63cef71430d 100644 --- a/packages/@adobe/react-spectrum/src/icon/Illustration.tsx +++ b/packages/@adobe/react-spectrum/src/icon/Illustration.tsx @@ -11,7 +11,7 @@ */ import {AriaLabelingProps, DOMProps, StyleProps} from '@react-types/shared'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import React, {JSX, ReactElement} from 'react'; import {useSlotProps} from '../utils/Slots'; import {useStyleProps} from '../utils/styleProps'; diff --git a/packages/@adobe/react-spectrum/src/icon/UIIcon.tsx b/packages/@adobe/react-spectrum/src/icon/UIIcon.tsx index e8c41618189..ef6d758241b 100644 --- a/packages/@adobe/react-spectrum/src/icon/UIIcon.tsx +++ b/packages/@adobe/react-spectrum/src/icon/UIIcon.tsx @@ -12,7 +12,7 @@ import {AriaLabelingProps, DOMProps, 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 {ProviderContext} from '../provider/types'; import React, {JSX, ReactElement} from 'react'; import styles from '@adobe/spectrum-css-temp/components/icon/vars.css'; diff --git a/packages/@adobe/react-spectrum/src/illustratedmessage/IllustratedMessage.tsx b/packages/@adobe/react-spectrum/src/illustratedmessage/IllustratedMessage.tsx index 52dc2d5bafb..a29861f06e3 100644 --- a/packages/@adobe/react-spectrum/src/illustratedmessage/IllustratedMessage.tsx +++ b/packages/@adobe/react-spectrum/src/illustratedmessage/IllustratedMessage.tsx @@ -14,7 +14,7 @@ import {classNames} from '../utils/classNames'; import {ClearSlots, SlotProvider, useSlotProps} from '../utils/Slots'; import {DOMProps, DOMRef, StyleProps} from '@react-types/shared'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {Flex} from '../layout/Flex'; import React, {forwardRef, ReactNode} from 'react'; import styles from '@adobe/spectrum-css-temp/components/illustratedmessage/vars.css'; diff --git a/packages/@adobe/react-spectrum/src/image/Image.tsx b/packages/@adobe/react-spectrum/src/image/Image.tsx index 48b0fe2ff41..841622e1f43 100644 --- a/packages/@adobe/react-spectrum/src/image/Image.tsx +++ b/packages/@adobe/react-spectrum/src/image/Image.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, {ReactEventHandler} from 'react'; import styles from '@adobe/spectrum-css-temp/components/image/vars.css'; import {useDOMRef} from '../utils/useDOMRef'; diff --git a/packages/@adobe/react-spectrum/src/inlinealert/InlineAlert.tsx b/packages/@adobe/react-spectrum/src/inlinealert/InlineAlert.tsx index 3e1ce1d784a..868e94cdf99 100644 --- a/packages/@adobe/react-spectrum/src/inlinealert/InlineAlert.tsx +++ b/packages/@adobe/react-spectrum/src/inlinealert/InlineAlert.tsx @@ -13,7 +13,7 @@ import AlertMedium from '@spectrum-icons/ui/AlertMedium'; 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 {FocusRing} from 'react-aria/FocusRing'; import {Grid} from '../layout/Grid'; import InfoMedium from '@spectrum-icons/ui/InfoMedium'; diff --git a/packages/@adobe/react-spectrum/src/label/Label.tsx b/packages/@adobe/react-spectrum/src/label/Label.tsx index fa6fee7ce90..2cdc67a331e 100644 --- a/packages/@adobe/react-spectrum/src/label/Label.tsx +++ b/packages/@adobe/react-spectrum/src/label/Label.tsx @@ -13,7 +13,7 @@ import {Alignment, DOMProps, DOMRef, LabelPosition, NecessityIndicator, StyleProps} from '@react-types/shared'; import Asterisk from '@spectrum-icons/ui/Asterisk'; import {classNames} from '../utils/classNames'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import intlMessages from '../../intl/label/*.json'; import React, {ElementType, HTMLAttributes, ReactNode} from 'react'; // @ts-ignore diff --git a/packages/@adobe/react-spectrum/src/labeledvalue/LabeledValue.tsx b/packages/@adobe/react-spectrum/src/labeledvalue/LabeledValue.tsx index 24752e8c6e8..f13e89961cf 100644 --- a/packages/@adobe/react-spectrum/src/labeledvalue/LabeledValue.tsx +++ b/packages/@adobe/react-spectrum/src/labeledvalue/LabeledValue.tsx @@ -14,7 +14,7 @@ import {CalendarDate, CalendarDateTime, getLocalTimeZone, Time, toCalendarDateTi import {classNames} from '../utils/classNames'; import type {DOMProps, DOMRef, RangeValue, SpectrumLabelableProps, StyleProps} from '@react-types/shared'; import {Field} from '../label/Field'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import labelStyles from '@adobe/spectrum-css-temp/components/fieldlabel/vars.css'; import React, {ReactElement, ReactNode, useEffect} from 'react'; import {useDateFormatter} from 'react-aria/useDateFormatter'; diff --git a/packages/@adobe/react-spectrum/src/layout/Flex.tsx b/packages/@adobe/react-spectrum/src/layout/Flex.tsx index ab83ae29844..15c0e0589ed 100644 --- a/packages/@adobe/react-spectrum/src/layout/Flex.tsx +++ b/packages/@adobe/react-spectrum/src/layout/Flex.tsx @@ -13,7 +13,7 @@ import {classNames} from '../utils/classNames'; import {DOMProps, DOMRef, FlexStyleProps} from '@react-types/shared'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {passthroughStyle, responsiveDimensionValue, StyleHandlers, useStyleProps} from '../utils/styleProps'; import React, {forwardRef, ReactNode} from 'react'; import styles from './flex-gap.css'; diff --git a/packages/@adobe/react-spectrum/src/layout/Grid.tsx b/packages/@adobe/react-spectrum/src/layout/Grid.tsx index ff608cc9a44..6bc24c399c2 100644 --- a/packages/@adobe/react-spectrum/src/layout/Grid.tsx +++ b/packages/@adobe/react-spectrum/src/layout/Grid.tsx @@ -19,7 +19,7 @@ import { } from '../utils/styleProps'; import {DimensionValue, DOMProps, DOMRef, GridStyleProps} from '@react-types/shared'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import React, {forwardRef, ReactNode} from 'react'; import {useDOMRef} from '../utils/useDOMRef'; diff --git a/packages/@adobe/react-spectrum/src/link/Link.tsx b/packages/@adobe/react-spectrum/src/link/Link.tsx index 90bf6842c51..444f12ef917 100644 --- a/packages/@adobe/react-spectrum/src/link/Link.tsx +++ b/packages/@adobe/react-spectrum/src/link/Link.tsx @@ -16,7 +16,7 @@ import {classNames} from '../utils/classNames'; import {FocusRing} from 'react-aria/FocusRing'; import {getWrappedElement} from '../utils/getWrappedElement'; import {mergeProps} from 'react-aria/mergeProps'; -import {mergeRefs} from 'react-aria/private/utils/mergeRefs'; +import {mergeRefs} from 'react-aria/mergeRefs'; import React, {ForwardedRef, JSX, MutableRefObject, ReactNode, useRef} from 'react'; import {StyleProps} from '@react-types/shared'; import styles from '@adobe/spectrum-css-temp/components/link/vars.css'; diff --git a/packages/@adobe/react-spectrum/src/list/ListView.tsx b/packages/@adobe/react-spectrum/src/list/ListView.tsx index b69fa2e765f..a482d75ae79 100644 --- a/packages/@adobe/react-spectrum/src/list/ListView.tsx +++ b/packages/@adobe/react-spectrum/src/list/ListView.tsx @@ -18,7 +18,7 @@ import type {DragAndDropHooks} from '../dnd/useDragAndDrop'; import type {DraggableCollectionState} from 'react-stately/useDraggableCollectionState'; import type {DroppableCollectionResult} from 'react-aria/useDroppableCollection'; import type {DroppableCollectionState} from 'react-stately/useDroppableCollectionState'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {FocusRing} from 'react-aria/FocusRing'; import {FocusScope} from 'react-aria/FocusScope'; import InsertionIndicator from './InsertionIndicator'; diff --git a/packages/@adobe/react-spectrum/src/list/ListViewLayout.ts b/packages/@adobe/react-spectrum/src/list/ListViewLayout.ts index a03167e87d8..7593475b130 100644 --- a/packages/@adobe/react-spectrum/src/list/ListViewLayout.ts +++ b/packages/@adobe/react-spectrum/src/list/ListViewLayout.ts @@ -9,12 +9,8 @@ * OF ANY KIND, either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -import {InvalidationContext} from 'react-stately/private/virtualizer/types'; - -import {LayoutInfo} from 'react-stately/private/virtualizer/LayoutInfo'; -import {LayoutNode, ListLayout, ListLayoutOptions} from 'react-stately/private/layout/ListLayout'; +import {InvalidationContext, LayoutInfo, LayoutNode, ListLayout, ListLayoutOptions, Rect} from 'react-stately/useVirtualizerState'; import {Node} from '@react-types/shared'; -import {Rect} from 'react-stately/private/virtualizer/Rect'; interface ListViewLayoutProps extends ListLayoutOptions { isLoading?: boolean diff --git a/packages/@adobe/react-spectrum/src/listbox/ListBoxBase.tsx b/packages/@adobe/react-spectrum/src/listbox/ListBoxBase.tsx index 358976e5a1b..2bdd89b1511 100644 --- a/packages/@adobe/react-spectrum/src/listbox/ListBoxBase.tsx +++ b/packages/@adobe/react-spectrum/src/listbox/ListBoxBase.tsx @@ -24,7 +24,7 @@ import {ListState} from 'react-stately/useListState'; import {mergeProps} from 'react-aria/mergeProps'; import {ProgressCircle} from '../progress/ProgressCircle'; import React, {ForwardedRef, HTMLAttributes, ReactElement, ReactNode, useCallback, useContext, useMemo} from 'react'; -import {ReusableView} from 'react-stately/private/virtualizer/ReusableView'; +import {ReusableView} from 'react-stately/useVirtualizerState'; import styles from '@adobe/spectrum-css-temp/components/menu/vars.css'; import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter'; import {useObjectRef} from 'react-aria/useObjectRef'; diff --git a/packages/@adobe/react-spectrum/src/listbox/ListBoxLayout.ts b/packages/@adobe/react-spectrum/src/listbox/ListBoxLayout.ts index 3a4547dd3da..eb70d83b0a6 100644 --- a/packages/@adobe/react-spectrum/src/listbox/ListBoxLayout.ts +++ b/packages/@adobe/react-spectrum/src/listbox/ListBoxLayout.ts @@ -1,8 +1,5 @@ -import {InvalidationContext} from 'react-stately/private/virtualizer/types'; -import {LayoutInfo} from 'react-stately/private/virtualizer/LayoutInfo'; -import {LayoutNode, ListLayout, ListLayoutOptions} from 'react-stately/private/layout/ListLayout'; +import {InvalidationContext, LayoutInfo, LayoutNode, ListLayout, ListLayoutOptions, Rect} from 'react-stately/useVirtualizerState'; import {Node} from '@react-types/shared'; -import {Rect} from 'react-stately/private/virtualizer/Rect'; interface ListBoxLayoutProps extends ListLayoutOptions { isLoading?: boolean diff --git a/packages/@adobe/react-spectrum/src/listbox/ListBoxSection.tsx b/packages/@adobe/react-spectrum/src/listbox/ListBoxSection.tsx index 701d44cbb91..f6db3e406a8 100644 --- a/packages/@adobe/react-spectrum/src/listbox/ListBoxSection.tsx +++ b/packages/@adobe/react-spectrum/src/listbox/ListBoxSection.tsx @@ -12,7 +12,7 @@ import {classNames} from '../utils/classNames'; -import {LayoutInfo} from 'react-stately/private/virtualizer/LayoutInfo'; +import {LayoutInfo} from 'react-stately/useVirtualizerState'; import {layoutInfoToStyle} from 'react-aria/private/virtualizer/VirtualizerItem'; import {ListBoxContext} from './ListBoxContext'; import {Node} from '@react-types/shared'; diff --git a/packages/@adobe/react-spectrum/src/menu/ActionMenu.tsx b/packages/@adobe/react-spectrum/src/menu/ActionMenu.tsx index 7a42c8b9a8b..84d8508efb0 100644 --- a/packages/@adobe/react-spectrum/src/menu/ActionMenu.tsx +++ b/packages/@adobe/react-spectrum/src/menu/ActionMenu.tsx @@ -12,7 +12,7 @@ import {ActionButton} from '../button/ActionButton'; import {AriaLabelingProps, CollectionBase, DOMProps, FocusableRef, Key, StyleProps} from '@react-types/shared'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; // @ts-ignore import intlMessages from '../../intl/menu/*.json'; import {Menu} from './Menu'; diff --git a/packages/@adobe/react-spectrum/src/menu/MenuItem.tsx b/packages/@adobe/react-spectrum/src/menu/MenuItem.tsx index fcbf6b385e4..19bf9dc5a5e 100644 --- a/packages/@adobe/react-spectrum/src/menu/MenuItem.tsx +++ b/packages/@adobe/react-spectrum/src/menu/MenuItem.tsx @@ -21,7 +21,7 @@ import {Grid} from '../layout/Grid'; import InfoOutline from '@spectrum-icons/workflow/InfoOutline'; // @ts-ignore import intlMessages from '../../intl/menu/*.json'; -import {mergeRefs} from 'react-aria/private/utils/mergeRefs'; +import {mergeRefs} from 'react-aria/mergeRefs'; import React, {JSX, useMemo, useRef} from 'react'; import styles from '@adobe/spectrum-css-temp/components/menu/vars.css'; import {Text} from '../text/Text'; diff --git a/packages/@adobe/react-spectrum/src/menu/MenuTrigger.tsx b/packages/@adobe/react-spectrum/src/menu/MenuTrigger.tsx index 3fbc3825685..e6827f1b8ea 100644 --- a/packages/@adobe/react-spectrum/src/menu/MenuTrigger.tsx +++ b/packages/@adobe/react-spectrum/src/menu/MenuTrigger.tsx @@ -14,7 +14,7 @@ import {Alignment, DOMRef} from '@react-types/shared'; import {classNames} from '../utils/classNames'; import {MenuContext} from './context'; import {MenuTriggerProps, useMenuTriggerState} from 'react-stately/useMenuTriggerState'; -import {Placement} from 'react-aria/private/overlays/useOverlayPosition'; +import {Placement} from 'react-aria/useOverlayPosition'; import {Popover} from '../overlays/Popover'; import {PressResponder} from 'react-aria/private/interactions/PressResponder'; import React, {forwardRef, Fragment, ReactElement, useRef} from 'react'; @@ -22,7 +22,7 @@ import {SlotProvider} from '../utils/Slots'; import styles from '@adobe/spectrum-css-temp/components/menu/vars.css'; import {Tray} from '../overlays/Tray'; import {unwrapDOMRef, useDOMRef} from '../utils/useDOMRef'; -import {useInteractOutside} from 'react-aria/private/interactions/useInteractOutside'; +import {useInteractOutside} from 'react-aria/useInteractOutside'; import {useIsMobileDevice} from '../utils/useIsMobileDevice'; import {useMenuTrigger} from 'react-aria/useMenu'; diff --git a/packages/@adobe/react-spectrum/src/provider/Provider.tsx b/packages/@adobe/react-spectrum/src/provider/Provider.tsx index 7256fc93893..cb5d39898ce 100644 --- a/packages/@adobe/react-spectrum/src/provider/Provider.tsx +++ b/packages/@adobe/react-spectrum/src/provider/Provider.tsx @@ -15,7 +15,7 @@ import {BreakpointProvider, useMatchedBreakpoints} from '../utils/BreakpointProv import clsx from 'clsx'; import {Context} from './context'; import {DOMRef} from '@react-types/shared'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {I18nProvider, useLocale} from 'react-aria/I18nProvider'; import {ModalProvider, useModalProvider} from 'react-aria/private/overlays/useModal'; import {ProviderContext, ProviderProps} from './types'; diff --git a/packages/@adobe/react-spectrum/src/statuslight/StatusLight.tsx b/packages/@adobe/react-spectrum/src/statuslight/StatusLight.tsx index 2caea57dfdb..52679394756 100644 --- a/packages/@adobe/react-spectrum/src/statuslight/StatusLight.tsx +++ b/packages/@adobe/react-spectrum/src/statuslight/StatusLight.tsx @@ -12,7 +12,7 @@ import {AriaLabelingProps, DOMProps, DOMRef, 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 React, {forwardRef, ReactNode} from 'react'; import styles from '@adobe/spectrum-css-temp/components/statuslight/vars.css'; import {useDOMRef} from '../utils/useDOMRef'; diff --git a/packages/@adobe/react-spectrum/src/table/Resizer.tsx b/packages/@adobe/react-spectrum/src/table/Resizer.tsx index 1ee3830dfcf..800e3e5feb5 100644 --- a/packages/@adobe/react-spectrum/src/table/Resizer.tsx +++ b/packages/@adobe/react-spectrum/src/table/Resizer.tsx @@ -1,6 +1,6 @@ import {classNames} from '../utils/classNames'; -import {ColumnSize} from 'react-stately/Column'; +import {ColumnSize, TableColumnResizeState} from 'react-stately/useTableState'; import eCursor from 'bundle-text:./cursors/Cur_MoveToRight_9_9.svg'; import ewCursor from 'bundle-text:./cursors/Cur_MoveHorizontal_9_9.svg'; import {FocusRing} from 'react-aria/FocusRing'; @@ -13,7 +13,6 @@ import {mergeProps} from 'react-aria/mergeProps'; import React, {createContext, ForwardedRef, useContext, useEffect, useState} from 'react'; import ReactDOM from 'react-dom'; import styles from '@adobe/spectrum-css-temp/components/table/vars.css'; -import {TableColumnResizeState} from 'react-stately/useTableState'; import {useLocale} from 'react-aria/I18nProvider'; import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter'; import {useObjectRef} from 'react-aria/useObjectRef'; diff --git a/packages/@adobe/react-spectrum/src/table/TableView.tsx b/packages/@adobe/react-spectrum/src/table/TableView.tsx index e0cd79b7815..5817f0462a7 100644 --- a/packages/@adobe/react-spectrum/src/table/TableView.tsx +++ b/packages/@adobe/react-spectrum/src/table/TableView.tsx @@ -11,17 +11,12 @@ */ import type {AriaLabelingProps, DisabledBehavior, DOMProps, DOMRef, Key, SpectrumSelectionProps, StyleProps} from '@react-types/shared'; -import {Cell} from 'react-stately/Cell'; -import {Column, ColumnSize} from 'react-stately/Column'; +import {Cell, Column, ColumnSize, Row, TableBody, TableHeader, TableProps} from 'react-stately/useTableState'; import type {DragAndDropHooks} from '../dnd/useDragAndDrop'; import React, {JSX, ReactElement} from 'react'; -import {Row} from 'react-stately/Row'; import {Section} from 'react-stately/Section'; import {SpectrumColumnProps} from './types'; -import {TableBody} from 'react-stately/TableBody'; -import {TableHeader} from 'react-stately/TableHeader'; import {tableNestedRows} from 'react-stately/private/flags/flags'; -import {TableProps} from 'react-stately/useTableState'; import {TableViewWithoutExpanding} from './TableViewWithoutExpanding'; import {TreeGridTableView} from './TreeGridTableView'; diff --git a/packages/@adobe/react-spectrum/src/table/TableViewBase.tsx b/packages/@adobe/react-spectrum/src/table/TableViewBase.tsx index e36b31675f0..88d167a36cb 100644 --- a/packages/@adobe/react-spectrum/src/table/TableViewBase.tsx +++ b/packages/@adobe/react-spectrum/src/table/TableViewBase.tsx @@ -16,7 +16,7 @@ import ChevronDownMedium from '@spectrum-icons/ui/ChevronDownMedium'; import ChevronLeftMedium from '@spectrum-icons/ui/ChevronLeftMedium'; import ChevronRightMedium from '@spectrum-icons/ui/ChevronRightMedium'; import {classNames} from '../utils/classNames'; -import {ColumnSize} from 'react-stately/Column'; +import {ColumnSize} from 'react-stately/useTableState'; import {DOMRef, DropTarget, FocusableElement, FocusableRef, Key, RefObject} from '@react-types/shared'; import type {DragAndDropHooks} from '../dnd/useDragAndDrop'; import type {DraggableCollectionState} from 'react-stately/useDraggableCollectionState'; @@ -33,7 +33,7 @@ import {InsertionIndicator} from './InsertionIndicator'; import intlMessages from '../../intl/table/*.json'; import {isAndroid} from 'react-aria/private/utils/platform'; import {Item} from 'react-stately/Item'; -import {LayoutInfo} from 'react-stately/private/virtualizer/LayoutInfo'; +import {LayoutInfo, Rect, ReusableView} from 'react-stately/useVirtualizerState'; import {layoutInfoToStyle, VirtualizerItem} from 'react-aria/private/virtualizer/VirtualizerItem'; import ListGripper from '@spectrum-icons/ui/ListGripper'; import {ListKeyboardDelegate} from 'react-aria/ListKeyboardDelegate'; @@ -44,9 +44,7 @@ import {Nubbin} from './Nubbin'; // @ts-ignore import {ProgressCircle} from '../progress/ProgressCircle'; import React, {DOMAttributes, HTMLAttributes, ReactElement, ReactNode, useCallback, useContext, useEffect, useMemo, useRef, useState} from 'react'; -import {Rect} from 'react-stately/private/virtualizer/Rect'; import {Resizer, ResizeStateContext} from './Resizer'; -import {ReusableView} from 'react-stately/private/virtualizer/ReusableView'; import {RootDropIndicator} from './RootDropIndicator'; import {scrollIntoView, scrollIntoViewport} from 'react-aria/private/utils/scrollIntoView'; import {ScrollView} from 'react-aria/private/virtualizer/ScrollView'; @@ -81,9 +79,7 @@ import { useTableSelectAllCheckbox, useTableSelectionCheckbox } from 'react-aria/useTable'; - -import {useVirtualizerState} from 'react-stately/private/virtualizer/useVirtualizerState'; - +import {useVirtualizerState} from 'react-stately/useVirtualizerState'; import {useVisuallyHidden, VisuallyHidden} from 'react-aria/VisuallyHidden'; const DEFAULT_HEADER_HEIGHT = { diff --git a/packages/@adobe/react-spectrum/src/table/TableViewLayout.ts b/packages/@adobe/react-spectrum/src/table/TableViewLayout.ts index 9d7c94a33a2..b5db8ade4d9 100644 --- a/packages/@adobe/react-spectrum/src/table/TableViewLayout.ts +++ b/packages/@adobe/react-spectrum/src/table/TableViewLayout.ts @@ -11,11 +11,8 @@ */ import {DropTarget} from '@react-types/shared'; import {GridNode} from 'react-stately/private/grid/GridCollection'; -import {LayoutInfo} from 'react-stately/private/virtualizer/LayoutInfo'; -import {LayoutNode} from 'react-stately/private/layout/ListLayout'; -import {Rect} from 'react-stately/private/virtualizer/Rect'; +import {LayoutInfo, LayoutNode, Rect, TableLayout} from 'react-stately/useVirtualizerState'; import {TableCollection} from 'react-stately/private/table/TableCollection'; -import {TableLayout} from 'react-stately/private/layout/TableLayout'; export class TableViewLayout extends TableLayout { private isLoading: boolean = false; diff --git a/packages/@adobe/react-spectrum/src/table/types.ts b/packages/@adobe/react-spectrum/src/table/types.ts index fed730e45e0..2484a1f1981 100644 --- a/packages/@adobe/react-spectrum/src/table/types.ts +++ b/packages/@adobe/react-spectrum/src/table/types.ts @@ -11,7 +11,7 @@ * governing permissions and limitations under the License. */ -import {ColumnProps} from 'react-stately/Column'; +import {ColumnProps} from 'react-stately/useTableState'; export interface SpectrumColumnProps extends ColumnProps { /** diff --git a/packages/@adobe/react-spectrum/src/tabs/Tabs.tsx b/packages/@adobe/react-spectrum/src/tabs/Tabs.tsx index 92876911e81..3c282442280 100644 --- a/packages/@adobe/react-spectrum/src/tabs/Tabs.tsx +++ b/packages/@adobe/react-spectrum/src/tabs/Tabs.tsx @@ -13,7 +13,7 @@ import {AriaLabelingProps, CollectionChildren, DOMProps, DOMRef, DOMRefValue, Key, Node, Orientation, RefObject, SingleSelection, StyleProps} from '@react-types/shared'; import {AriaTabPanelProps, useTab, useTabList, useTabPanel} from 'react-aria/useTabList'; import {classNames} from '../utils/classNames'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {FocusRing} from 'react-aria/FocusRing'; import {Item} from 'react-stately/Item'; import {ListCollection} from 'react-stately/private/list/ListCollection'; diff --git a/packages/@adobe/react-spectrum/src/text/Heading.tsx b/packages/@adobe/react-spectrum/src/text/Heading.tsx index 89e02a062e3..f935ceab5a8 100644 --- a/packages/@adobe/react-spectrum/src/text/Heading.tsx +++ b/packages/@adobe/react-spectrum/src/text/Heading.tsx @@ -11,10 +11,10 @@ */ import {DOMProps, DOMRef, StyleProps} from '@react-types/shared'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {HeadingContext} from 'react-aria-components/Heading'; import React, {ElementType, forwardRef, ReactNode} from 'react'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; import {useDOMRef} from '../utils/useDOMRef'; import {useSlotProps} from '../utils/Slots'; import {useStyleProps} from '../utils/styleProps'; diff --git a/packages/@adobe/react-spectrum/src/text/Keyboard.tsx b/packages/@adobe/react-spectrum/src/text/Keyboard.tsx index 8a6f72e099d..fbcb0fc7718 100644 --- a/packages/@adobe/react-spectrum/src/text/Keyboard.tsx +++ b/packages/@adobe/react-spectrum/src/text/Keyboard.tsx @@ -11,7 +11,7 @@ */ 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, ReactNode} from 'react'; import {useDOMRef} from '../utils/useDOMRef'; import {useSlotProps} from '../utils/Slots'; diff --git a/packages/@adobe/react-spectrum/src/text/Text.tsx b/packages/@adobe/react-spectrum/src/text/Text.tsx index 975c4b9e77c..32e5e8b1d76 100644 --- a/packages/@adobe/react-spectrum/src/text/Text.tsx +++ b/packages/@adobe/react-spectrum/src/text/Text.tsx @@ -11,7 +11,7 @@ */ 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, ReactNode} from 'react'; import {useDOMRef} from '../utils/useDOMRef'; import {useSlotProps} from '../utils/Slots'; diff --git a/packages/@adobe/react-spectrum/src/textfield/TextArea.tsx b/packages/@adobe/react-spectrum/src/textfield/TextArea.tsx index 8289091bfe1..c1726fe1a74 100644 --- a/packages/@adobe/react-spectrum/src/textfield/TextArea.tsx +++ b/packages/@adobe/react-spectrum/src/textfield/TextArea.tsx @@ -12,12 +12,12 @@ import {AriaTextFieldProps, useTextField} from 'react-aria/useTextField'; -import {chain} from 'react-aria/private/utils/chain'; +import {chain} from 'react-aria/chain'; import React, {ReactElement, Ref, useCallback, useEffect, useRef} from 'react'; import {SpectrumFieldValidation, SpectrumLabelableProps, SpectrumTextInputBase, StyleProps} from '@react-types/shared'; import {TextFieldBase} from './TextFieldBase'; import {TextFieldRef} from './TextField'; -import {useControlledState} from 'react-stately/private/utils/useControlledState'; +import {useControlledState} from 'react-stately/useControlledState'; import {useFormProps} from '../form/Form'; import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect'; import {useProviderProps} from '../provider/Provider'; diff --git a/packages/@adobe/react-spectrum/src/toast/Toast.tsx b/packages/@adobe/react-spectrum/src/toast/Toast.tsx index a21486d90e9..24484665ccf 100644 --- a/packages/@adobe/react-spectrum/src/toast/Toast.tsx +++ b/packages/@adobe/react-spectrum/src/toast/Toast.tsx @@ -16,7 +16,7 @@ import {classNames} from '../utils/classNames'; import {ClearButton} from '../button/ClearButton'; import CrossMedium from '@spectrum-icons/ui/CrossMedium'; import {DOMProps, DOMRef} from '@react-types/shared'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import InfoMedium from '@spectrum-icons/ui/InfoMedium'; import intlMessages from '../../intl/toast/*.json'; import {mergeProps} from 'react-aria/mergeProps'; diff --git a/packages/@adobe/react-spectrum/src/toast/ToastContainer.tsx b/packages/@adobe/react-spectrum/src/toast/ToastContainer.tsx index e003fc9be5b..7bf30f2c858 100644 --- a/packages/@adobe/react-spectrum/src/toast/ToastContainer.tsx +++ b/packages/@adobe/react-spectrum/src/toast/ToastContainer.tsx @@ -13,7 +13,7 @@ import {AriaToastRegionProps} from 'react-aria/useToast'; import {classNames} from '../utils/classNames'; import {DOMProps} from '@react-types/shared'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {flushSync} from 'react-dom'; import React, {ReactElement, useEffect, useMemo, useRef} from 'react'; import {SpectrumToastValue, Toast} from './Toast'; diff --git a/packages/@adobe/react-spectrum/src/tooltip/TooltipTrigger.tsx b/packages/@adobe/react-spectrum/src/tooltip/TooltipTrigger.tsx index 4dd9157c3a7..9dc8344ad54 100644 --- a/packages/@adobe/react-spectrum/src/tooltip/TooltipTrigger.tsx +++ b/packages/@adobe/react-spectrum/src/tooltip/TooltipTrigger.tsx @@ -12,7 +12,7 @@ import {FocusableProvider} from 'react-aria/private/interactions/useFocusable'; import {Overlay} from '../overlays/Overlay'; -import {Placement, PositionProps, useOverlayPosition} from 'react-aria/private/overlays/useOverlayPosition'; +import {Placement, PositionProps, useOverlayPosition} from 'react-aria/useOverlayPosition'; import React, {JSX, ReactElement, useRef, useState} from 'react'; import {TooltipContext} from './context'; import {TooltipTriggerProps, useTooltipTriggerState} from 'react-stately/useTooltipTriggerState'; diff --git a/packages/@adobe/react-spectrum/src/tooltip/context.ts b/packages/@adobe/react-spectrum/src/tooltip/context.ts index 2baf58e2bb1..772e9d893ed 100644 --- a/packages/@adobe/react-spectrum/src/tooltip/context.ts +++ b/packages/@adobe/react-spectrum/src/tooltip/context.ts @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {PlacementAxis} from 'react-aria/private/overlays/useOverlayPosition'; +import {PlacementAxis} from 'react-aria/useOverlayPosition'; import React, {HTMLAttributes} from 'react'; import {RefObject, StyleProps} from '@react-types/shared'; import {TooltipTriggerState} from 'react-stately/useTooltipTriggerState'; diff --git a/packages/@adobe/react-spectrum/src/tree/TreeView.tsx b/packages/@adobe/react-spectrum/src/tree/TreeView.tsx index 9b2834a7546..035e89e2147 100644 --- a/packages/@adobe/react-spectrum/src/tree/TreeView.tsx +++ b/packages/@adobe/react-spectrum/src/tree/TreeView.tsx @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {AriaTreeProps} from 'react-aria/private/tree/useTree'; +import {AriaTreeProps} from 'react-aria/useTree'; import {ButtonContext} from 'react-aria-components/Button'; @@ -34,7 +34,7 @@ import { TreeRenderProps } from 'react-aria-components/Tree'; import {useButton} from 'react-aria/useButton'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; import {useDOMRef} from '../utils/useDOMRef'; import {useLocale} from 'react-aria/I18nProvider'; import {useStyleProps} from '../utils/styleProps'; diff --git a/packages/@adobe/react-spectrum/src/view/Content.tsx b/packages/@adobe/react-spectrum/src/view/Content.tsx index ad71e42cabd..0acbc60229b 100644 --- a/packages/@adobe/react-spectrum/src/view/Content.tsx +++ b/packages/@adobe/react-spectrum/src/view/Content.tsx @@ -13,7 +13,7 @@ import {ClearSlots, useSlotProps} from '../utils/Slots'; 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, ReactNode} from 'react'; import {useDOMRef} from '../utils/useDOMRef'; import {useStyleProps} from '../utils/styleProps'; diff --git a/packages/@adobe/react-spectrum/src/view/Footer.tsx b/packages/@adobe/react-spectrum/src/view/Footer.tsx index ebd2e28a348..f056db093b8 100644 --- a/packages/@adobe/react-spectrum/src/view/Footer.tsx +++ b/packages/@adobe/react-spectrum/src/view/Footer.tsx @@ -13,7 +13,7 @@ import {ClearSlots, useSlotProps} from '../utils/Slots'; 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, ReactNode} from 'react'; import {useDOMRef} from '../utils/useDOMRef'; import {useStyleProps} from '../utils/styleProps'; diff --git a/packages/@adobe/react-spectrum/src/view/Header.tsx b/packages/@adobe/react-spectrum/src/view/Header.tsx index 0a3046d5c6d..a83ae8fbe7f 100644 --- a/packages/@adobe/react-spectrum/src/view/Header.tsx +++ b/packages/@adobe/react-spectrum/src/view/Header.tsx @@ -13,7 +13,7 @@ import {ClearSlots, useSlotProps} from '../utils/Slots'; 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, ReactNode} from 'react'; import {useDOMRef} from '../utils/useDOMRef'; import {useStyleProps} from '../utils/styleProps'; diff --git a/packages/@adobe/react-spectrum/src/view/View.tsx b/packages/@adobe/react-spectrum/src/view/View.tsx index e6c6d054cd9..ec9363a034a 100644 --- a/packages/@adobe/react-spectrum/src/view/View.tsx +++ b/packages/@adobe/react-spectrum/src/view/View.tsx @@ -13,7 +13,7 @@ import {ClearSlots, useSlotProps} from '../utils/Slots'; import {ColorVersion, DOMProps, DOMRef, ViewStyleProps} from '@react-types/shared'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import React, {forwardRef, JSXElementConstructor, ReactElement, ReactNode} from 'react'; import {useDOMRef} from '../utils/useDOMRef'; import {useStyleProps, viewStyleProps} from '../utils/styleProps'; diff --git a/packages/@adobe/react-spectrum/src/well/Well.tsx b/packages/@adobe/react-spectrum/src/well/Well.tsx index 437417270eb..0ed64c4fabe 100644 --- a/packages/@adobe/react-spectrum/src/well/Well.tsx +++ b/packages/@adobe/react-spectrum/src/well/Well.tsx @@ -12,7 +12,7 @@ import {AriaLabelingProps, DOMProps, DOMRef, 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 React, {forwardRef, ReactNode} from 'react'; import styles from '@adobe/spectrum-css-temp/components/well/vars.css'; import {useDOMRef} from '../utils/useDOMRef'; diff --git a/packages/@adobe/react-spectrum/stories/card/GalleryCardView.stories.tsx b/packages/@adobe/react-spectrum/stories/card/GalleryCardView.stories.tsx index fa4e6cddd7f..4dfd5f4ca4f 100644 --- a/packages/@adobe/react-spectrum/stories/card/GalleryCardView.stories.tsx +++ b/packages/@adobe/react-spectrum/stories/card/GalleryCardView.stories.tsx @@ -34,7 +34,7 @@ import {GalleryLayout} from '../../src/card/GalleryLayout'; import {GalleryLayoutOptions} from '../../src/card/GalleryLayout'; import {Meta, StoryObj} from '@storybook/react'; import React, {JSX, useMemo} from 'react'; -import {Size} from 'react-stately/private/virtualizer/Size'; +import {Size} from 'react-stately/useVirtualizerState'; import {SpectrumCardViewProps} from '../../src/card/types'; import {useCollator} from 'react-aria/useCollator'; diff --git a/packages/@adobe/react-spectrum/stories/card/GridCardView.stories.tsx b/packages/@adobe/react-spectrum/stories/card/GridCardView.stories.tsx index ee5983e8535..8d5cd18be25 100644 --- a/packages/@adobe/react-spectrum/stories/card/GridCardView.stories.tsx +++ b/packages/@adobe/react-spectrum/stories/card/GridCardView.stories.tsx @@ -27,7 +27,7 @@ import {JSX, Meta, StoryObj} from '@storybook/react'; import {Key} from '@react-types/shared'; import {Link} from '../../src/link/Link'; import React, {useMemo, useState} from 'react'; -import {Size} from 'react-stately/private/virtualizer/Size'; +import {Size} from 'react-stately/useVirtualizerState'; import {SpectrumCardViewProps} from '../../src/card/types'; import {Text} from '../../src/text/Text'; import {TextField} from '../../src/textfield/TextField'; diff --git a/packages/@adobe/react-spectrum/stories/card/WaterfallCardView.stories.tsx b/packages/@adobe/react-spectrum/stories/card/WaterfallCardView.stories.tsx index 1b37351c1f3..0d5679bf8c3 100644 --- a/packages/@adobe/react-spectrum/stories/card/WaterfallCardView.stories.tsx +++ b/packages/@adobe/react-spectrum/stories/card/WaterfallCardView.stories.tsx @@ -32,7 +32,7 @@ import { import {CardView} from '../../src/card/CardView'; import {Meta, StoryObj} from '@storybook/react'; import React, {useMemo} from 'react'; -import {Size} from 'react-stately/private/virtualizer/Size'; +import {Size} from 'react-stately/useVirtualizerState'; import {SpectrumCardViewProps} from '../../src/card/types'; import {useCollator} from 'react-aria/useCollator'; import {WaterfallLayout} from '../../src/card/WaterfallLayout'; diff --git a/packages/@adobe/react-spectrum/stories/combobox/ComboBox.stories.tsx b/packages/@adobe/react-spectrum/stories/combobox/ComboBox.stories.tsx index 7a8265c9437..00802be79cd 100644 --- a/packages/@adobe/react-spectrum/stories/combobox/ComboBox.stories.tsx +++ b/packages/@adobe/react-spectrum/stories/combobox/ComboBox.stories.tsx @@ -18,7 +18,7 @@ import {Avatar} from '../../src/avatar/Avatar'; import Bell from '@spectrum-icons/workflow/Bell'; import {Button} from '../../src/button/Button'; import {ButtonGroup} from '../../src/buttongroup/ButtonGroup'; -import {chain} from 'react-aria/private/utils/chain'; +import {chain} from 'react-aria/chain'; import {ComboBox} from '../../src/combobox/ComboBox'; import {Content} from '../../src/view/Content'; import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp'; diff --git a/packages/@adobe/react-spectrum/stories/datepicker/DatePicker.stories.tsx b/packages/@adobe/react-spectrum/stories/datepicker/DatePicker.stories.tsx index 0e74be8e22f..1d8d420f8a7 100644 --- a/packages/@adobe/react-spectrum/stories/datepicker/DatePicker.stories.tsx +++ b/packages/@adobe/react-spectrum/stories/datepicker/DatePicker.stories.tsx @@ -13,7 +13,7 @@ import {action} from 'storybook/actions'; import {ActionButton} from '../../src/button/ActionButton'; import {CalendarDate, CalendarDateTime, getLocalTimeZone, parseAbsolute, parseAbsoluteToLocal, parseDate, parseDateTime, parseZonedDateTime, today, toZoned} from '@internationalized/date'; -import {chain} from 'react-aria/private/utils/chain'; +import {chain} from 'react-aria/chain'; import {Content} from '../../src/view/Content'; import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp'; import {Custom454Calendar} from '/packages/@internationalized/date/tests/customCalendarImpl'; diff --git a/packages/@adobe/react-spectrum/stories/datepicker/DateRangePicker.stories.tsx b/packages/@adobe/react-spectrum/stories/datepicker/DateRangePicker.stories.tsx index 455eeeee577..42cb14bfdea 100644 --- a/packages/@adobe/react-spectrum/stories/datepicker/DateRangePicker.stories.tsx +++ b/packages/@adobe/react-spectrum/stories/datepicker/DateRangePicker.stories.tsx @@ -13,7 +13,7 @@ import {action} from 'storybook/actions'; import {ActionButton} from '../../src/button/ActionButton'; import {CalendarDate, getLocalTimeZone, isWeekend, parseDate, today, toZoned} from '@internationalized/date'; -import {chain} from 'react-aria/private/utils/chain'; +import {chain} from 'react-aria/chain'; import {Custom454Calendar} from '/packages/@internationalized/date/tests/customCalendarImpl'; import {DateRange} from '@adobe/react-spectrum/DateRangePicker'; import {DateRangePicker} from '../../src/datepicker/DateRangePicker'; diff --git a/packages/@adobe/react-spectrum/stories/dialog/DialogTrigger.stories.tsx b/packages/@adobe/react-spectrum/stories/dialog/DialogTrigger.stories.tsx index 6cc270b43f1..004ef717e46 100644 --- a/packages/@adobe/react-spectrum/stories/dialog/DialogTrigger.stories.tsx +++ b/packages/@adobe/react-spectrum/stories/dialog/DialogTrigger.stories.tsx @@ -16,7 +16,7 @@ import {AlertDialog} from '../../src/dialog/AlertDialog'; import AlertMedium from '@spectrum-icons/ui/AlertMedium'; import {Button} from '../../src/button/Button'; import {ButtonGroup} from '../../src/buttongroup/ButtonGroup'; -import {chain} from 'react-aria/private/utils/chain'; +import {chain} from 'react-aria/chain'; import {Checkbox} from '../../src/checkbox/Checkbox'; import {Content} from '../../src/view/Content'; import {Dialog} from '../../src/dialog/Dialog'; diff --git a/packages/@adobe/react-spectrum/stories/form/Form.stories.tsx b/packages/@adobe/react-spectrum/stories/form/Form.stories.tsx index 29f9790ce4a..d1305de7381 100644 --- a/packages/@adobe/react-spectrum/stories/form/Form.stories.tsx +++ b/packages/@adobe/react-spectrum/stories/form/Form.stories.tsx @@ -14,7 +14,7 @@ import {action} from 'storybook/actions'; import {Button} from '../../src/button/Button'; import {ButtonGroup} from '../../src/buttongroup/ButtonGroup'; import {CalendarDate, parseDate, parseDateTime, parseTime} from '@internationalized/date'; -import {chain} from 'react-aria/private/utils/chain'; +import {chain} from 'react-aria/chain'; import {Checkbox} from '../../src/checkbox/Checkbox'; import {CheckboxGroup} from '../../src/checkbox/CheckboxGroup'; import {ColorField} from '../../src/color/ColorField'; diff --git a/packages/@adobe/react-spectrum/stories/list/ListViewDnDExamples.tsx b/packages/@adobe/react-spectrum/stories/list/ListViewDnDExamples.tsx index 7172309bc57..5bb0c8e9c29 100644 --- a/packages/@adobe/react-spectrum/stories/list/ListViewDnDExamples.tsx +++ b/packages/@adobe/react-spectrum/stories/list/ListViewDnDExamples.tsx @@ -1,6 +1,6 @@ import {action} from 'storybook/actions'; import {ActionMenu} from '../../src/menu/ActionMenu'; -import {chain} from 'react-aria/private/utils/chain'; +import {chain} from 'react-aria/chain'; import Delete from '@spectrum-icons/workflow/Delete'; import {DragAndDropOptions, useDragAndDrop} from '../../src/dnd/useDragAndDrop'; import Edit from '@spectrum-icons/workflow/Edit'; diff --git a/packages/@adobe/react-spectrum/stories/list/ListViewSelection.stories.tsx b/packages/@adobe/react-spectrum/stories/list/ListViewSelection.stories.tsx index 070905fae4d..0a24b6bd040 100644 --- a/packages/@adobe/react-spectrum/stories/list/ListViewSelection.stories.tsx +++ b/packages/@adobe/react-spectrum/stories/list/ListViewSelection.stories.tsx @@ -2,7 +2,7 @@ import {action} from 'storybook/actions'; import {ActionMenu} from '../../src/menu/ActionMenu'; import Add from '@spectrum-icons/workflow/Add'; import {Breadcrumbs} from '../../src/breadcrumbs/Breadcrumbs'; -import {chain} from 'react-aria/private/utils/chain'; +import {chain} from 'react-aria/chain'; import Delete from '@spectrum-icons/workflow/Delete'; import Folder from '@spectrum-icons/illustrations/Folder'; import {Item} from 'react-stately/Item'; diff --git a/packages/@adobe/react-spectrum/stories/numberfield/NumberField.stories.tsx b/packages/@adobe/react-spectrum/stories/numberfield/NumberField.stories.tsx index 0cfd1474ce8..36696e198c2 100644 --- a/packages/@adobe/react-spectrum/stories/numberfield/NumberField.stories.tsx +++ b/packages/@adobe/react-spectrum/stories/numberfield/NumberField.stories.tsx @@ -12,7 +12,7 @@ import {action} from 'storybook/actions'; import {Button} from '../../src/button/Button'; -import {chain} from 'react-aria/private/utils/chain'; +import {chain} from 'react-aria/chain'; import {Content} from '../../src/view/Content'; import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp'; import {Flex} from '../../src/layout/Flex'; diff --git a/packages/@adobe/react-spectrum/stories/switch/Switch.stories.tsx b/packages/@adobe/react-spectrum/stories/switch/Switch.stories.tsx index 35d00454246..b596a2f4a2a 100644 --- a/packages/@adobe/react-spectrum/stories/switch/Switch.stories.tsx +++ b/packages/@adobe/react-spectrum/stories/switch/Switch.stories.tsx @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {chain} from 'react-aria/private/utils/chain'; +import {chain} from 'react-aria/chain'; import {Flex} from '../../src/layout/Flex'; import {Meta, StoryObj} from '@storybook/react'; import React, {useState} from 'react'; diff --git a/packages/@adobe/react-spectrum/stories/table/ControllingResize.tsx b/packages/@adobe/react-spectrum/stories/table/ControllingResize.tsx index 42fee25ae1a..e23077637c5 100644 --- a/packages/@adobe/react-spectrum/stories/table/ControllingResize.tsx +++ b/packages/@adobe/react-spectrum/stories/table/ControllingResize.tsx @@ -13,7 +13,7 @@ import {Button} from '../../src/button/Button'; import {Cell, Column, Row, TableBody, TableHeader, TableView} from '../../src/table/TableView'; -import {ColumnSize} from 'react-stately/Column'; +import {ColumnSize} from 'react-stately/useTableState'; import {Key} from '@react-types/shared'; import React, {JSX, useCallback, useMemo, useState} from 'react'; import {SpectrumColumnProps} from '../../src/table/types'; diff --git a/packages/@adobe/react-spectrum/stories/table/TableDnDExamples.tsx b/packages/@adobe/react-spectrum/stories/table/TableDnDExamples.tsx index 0ac652d5507..2f300bff113 100644 --- a/packages/@adobe/react-spectrum/stories/table/TableDnDExamples.tsx +++ b/packages/@adobe/react-spectrum/stories/table/TableDnDExamples.tsx @@ -1,7 +1,7 @@ import {action} from 'storybook/actions'; import {Cell, Column, Row, SpectrumTableProps, TableBody, TableHeader, TableView} from '../../src/table/TableView'; -import {chain} from 'react-aria/private/utils/chain'; +import {chain} from 'react-aria/chain'; import {DragEndEvent, DragStartEvent, DropEvent, ItemDropTarget, Key} from '@react-types/shared'; import {Flex} from '../../src/layout/Flex'; import React, {JSX} from 'react'; diff --git a/packages/@adobe/react-spectrum/stories/table/TreeGridTable.stories.tsx b/packages/@adobe/react-spectrum/stories/table/TreeGridTable.stories.tsx index 7269d036938..a585ab8b8e0 100644 --- a/packages/@adobe/react-spectrum/stories/table/TreeGridTable.stories.tsx +++ b/packages/@adobe/react-spectrum/stories/table/TreeGridTable.stories.tsx @@ -13,7 +13,7 @@ import {action} from 'storybook/actions'; import {ActionButton} from '../../src/button/ActionButton'; import {Cell, Column, Row, SpectrumTableProps, TableBody, TableHeader, TableView} from '../../src/table/TableView'; -import {chain} from 'react-aria/private/utils/chain'; +import {chain} from 'react-aria/chain'; import defaultConfig, {columns, EmptyStateTable, TableStory} from './Table.stories'; import {enableTableNestedRows} from 'react-stately/private/flags/flags'; import {Flex} from '../../src/layout/Flex'; diff --git a/packages/@adobe/react-spectrum/stories/tree/TreeView.stories.tsx b/packages/@adobe/react-spectrum/stories/tree/TreeView.stories.tsx index 10087eb28d2..260a09fad4a 100644 --- a/packages/@adobe/react-spectrum/stories/tree/TreeView.stories.tsx +++ b/packages/@adobe/react-spectrum/stories/tree/TreeView.stories.tsx @@ -12,7 +12,7 @@ import {action} from 'storybook/actions'; import {ActionGroup} from '../../src/actiongroup/ActionGroup'; -import {Collection} from 'react-aria/private/collections/CollectionBuilder'; +import {Collection} from 'react-aria/Collection'; import {Content} from '../../src/view/Content'; import Delete from '@spectrum-icons/workflow/Delete'; import Edit from '@spectrum-icons/workflow/Edit'; diff --git a/packages/@adobe/react-spectrum/test/color/ColorField.test.js b/packages/@adobe/react-spectrum/test/color/ColorField.test.js index 1336b64f98e..f982485af8e 100644 --- a/packages/@adobe/react-spectrum/test/color/ColorField.test.js +++ b/packages/@adobe/react-spectrum/test/color/ColorField.test.js @@ -12,7 +12,7 @@ import {act, fireEvent, pointerMap, render} from '@react-spectrum/test-utils-internal'; import {Button} from '../../src/button/Button'; -import {chain} from 'react-aria/private/utils/chain'; +import {chain} from 'react-aria/chain'; import {ColorField} from '../../src/color/ColorField'; import {Form} from '../../src/form/Form'; import {parseColor} from 'react-stately/Color'; diff --git a/packages/@adobe/react-spectrum/test/combobox/ComboBox.test.js b/packages/@adobe/react-spectrum/test/combobox/ComboBox.test.js index a99d2027b73..651b7d5e05b 100644 --- a/packages/@adobe/react-spectrum/test/combobox/ComboBox.test.js +++ b/packages/@adobe/react-spectrum/test/combobox/ComboBox.test.js @@ -14,7 +14,7 @@ jest.mock('react-aria/src/live-announcer/LiveAnnouncer'); import {act, fireEvent, pointerMap, render, simulateDesktop, simulateMobile, waitFor, within} from '@react-spectrum/test-utils-internal'; import {announce} from 'react-aria/private/live-announcer/LiveAnnouncer'; import {Button} from '../../src/button/Button'; -import {chain} from 'react-aria/private/utils/chain'; +import {chain} from 'react-aria/chain'; import {ComboBox} from '../../src/combobox/ComboBox'; import {Form} from '../../src/form/Form'; import {Item} from 'react-stately/Item'; diff --git a/packages/@adobe/react-spectrum/test/numberfield/NumberField.test.js b/packages/@adobe/react-spectrum/test/numberfield/NumberField.test.js index bf2f2396e80..e378c069ad7 100644 --- a/packages/@adobe/react-spectrum/test/numberfield/NumberField.test.js +++ b/packages/@adobe/react-spectrum/test/numberfield/NumberField.test.js @@ -14,7 +14,7 @@ jest.mock('react-aria/src/live-announcer/LiveAnnouncer'); import {act, fireEvent, pointerMap, render, screen, within} from '@react-spectrum/test-utils-internal'; import {announce} from 'react-aria/private/live-announcer/LiveAnnouncer'; import {Button} from '../../src/button/Button'; -import {chain} from 'react-aria/private/utils/chain'; +import {chain} from 'react-aria/chain'; import {Form} from '../../src/form/Form'; import messages from 'react-aria/intl/numberfield/*.json'; import {NumberField} from '../../src/numberfield/NumberField'; diff --git a/packages/@adobe/react-spectrum/test/table/TableSizing.test.tsx b/packages/@adobe/react-spectrum/test/table/TableSizing.test.tsx index a2a7524af66..fda202ae608 100644 --- a/packages/@adobe/react-spectrum/test/table/TableSizing.test.tsx +++ b/packages/@adobe/react-spectrum/test/table/TableSizing.test.tsx @@ -15,7 +15,7 @@ import {act, render as renderComponent, within} from '@testing-library/react'; import {ActionButton} from '../../src/button/ActionButton'; import Add from '@spectrum-icons/workflow/Add'; import {Cell, Column, Row, TableBody, TableHeader, TableView} from '../../src/table/TableView'; -import {ColumnSize} from 'react-stately/Column'; +import {ColumnSize} from 'react-stately/useTableState'; import {ControllingResize} from '../../stories/table/ControllingResize'; import {fireEvent, installPointerEvent, pointerMap, simulateDesktop, triggerTouch} from '@react-spectrum/test-utils-internal'; import {HidingColumns} from '../../stories/table/HidingColumns'; diff --git a/packages/@adobe/react-spectrum/test/tag/TagGroup.test.js b/packages/@adobe/react-spectrum/test/tag/TagGroup.test.js index 9e1a1ce8a85..2085ac2370a 100644 --- a/packages/@adobe/react-spectrum/test/tag/TagGroup.test.js +++ b/packages/@adobe/react-spectrum/test/tag/TagGroup.test.js @@ -12,7 +12,7 @@ import {act, fireEvent, mockClickDefault, mockImplementation, pointerMap, render, within} from '@react-spectrum/test-utils-internal'; import {Button} from '../../src/button/Button'; -import {chain} from 'react-aria/private/utils/chain'; +import {chain} from 'react-aria/chain'; import {Item} from 'react-stately/Item'; import {Link} from '../../src/link/Link'; import {Provider} from '../../src/provider/Provider'; diff --git a/packages/@adobe/react-spectrum/test/tree/TreeView.test.tsx b/packages/@adobe/react-spectrum/test/tree/TreeView.test.tsx index a5b607f1ecf..1bc3e78eb21 100644 --- a/packages/@adobe/react-spectrum/test/tree/TreeView.test.tsx +++ b/packages/@adobe/react-spectrum/test/tree/TreeView.test.tsx @@ -12,7 +12,7 @@ import {act, fireEvent, mockClickDefault, pointerMap, render as renderComponent, within} from '@react-spectrum/test-utils-internal'; import {ActionGroup} from '../../src/actiongroup/ActionGroup'; -import {Collection} from 'react-aria/private/collections/CollectionBuilder'; +import {Collection} from 'react-aria/Collection'; import {Content} from '../../src/view/Content'; import Delete from '@spectrum-icons/workflow/Delete'; import Edit from '@spectrum-icons/workflow/Edit'; diff --git a/packages/@react-aria/autocomplete/src/index.ts b/packages/@react-aria/autocomplete/src/index.ts index 98b21c05485..d04b6209049 100644 --- a/packages/@react-aria/autocomplete/src/index.ts +++ b/packages/@react-aria/autocomplete/src/index.ts @@ -11,6 +11,6 @@ */ export {useSearchAutocomplete} from 'react-aria/private/autocomplete/useSearchAutocomplete'; -export {useAutocomplete} from 'react-aria/private/autocomplete/useAutocomplete'; +export {useAutocomplete} from 'react-aria/useAutocomplete'; export type {SearchAutocompleteProps, AriaSearchAutocompleteProps, AriaSearchAutocompleteOptions, SearchAutocompleteAria} from 'react-aria/private/autocomplete/useSearchAutocomplete'; -export type {AriaAutocompleteProps, AriaAutocompleteOptions, AutocompleteAria, CollectionOptions, InputProps} from 'react-aria/private/autocomplete/useAutocomplete'; +export type {AriaAutocompleteProps, AriaAutocompleteOptions, AutocompleteAria, CollectionOptions, InputProps} from 'react-aria/useAutocomplete'; diff --git a/packages/@react-aria/collections/src/index.ts b/packages/@react-aria/collections/src/index.ts index 47acc6da0c7..73e80654ef7 100644 --- a/packages/@react-aria/collections/src/index.ts +++ b/packages/@react-aria/collections/src/index.ts @@ -10,10 +10,11 @@ * governing permissions and limitations under the License. */ -export {CollectionBuilder, Collection, createLeafComponent, createBranchComponent} from 'react-aria/private/collections/CollectionBuilder'; - +export {CollectionBuilder, createLeafComponent, createBranchComponent} from 'react-aria/CollectionBuilder'; +export {Collection} from 'react-aria/Collection'; export {createHideableComponent, useIsHidden} from 'react-aria/private/collections/Hidden'; export {useCachedChildren} from 'react-aria/private/collections/useCachedChildren'; export {BaseCollection, CollectionNode, ItemNode, SectionNode, FilterableNode, LoaderNode, HeaderNode} from 'react-aria/private/collections/BaseCollection'; -export type {CollectionBuilderProps, CollectionProps} from 'react-aria/private/collections/CollectionBuilder'; +export type {CollectionProps} from 'react-aria/Collection'; +export type {CollectionBuilderProps} from 'react-aria/CollectionBuilder'; export type {CachedChildrenOptions} from 'react-aria/private/collections/useCachedChildren'; diff --git a/packages/@react-aria/dnd/src/index.ts b/packages/@react-aria/dnd/src/index.ts index 5a3ede048e2..1d3718a6163 100644 --- a/packages/@react-aria/dnd/src/index.ts +++ b/packages/@react-aria/dnd/src/index.ts @@ -10,18 +10,16 @@ * governing permissions and limitations under the License. */ -export {useDrag} from 'react-aria/useDrag'; +export {useDrag, DragPreview} from 'react-aria/useDrag'; export {useDrop, DIRECTORY_DRAG_TYPE, isDirectoryDropItem, isFileDropItem, isTextDropItem} from 'react-aria/useDrop'; export {useDroppableCollection, useDroppableItem, useDropIndicator} from 'react-aria/useDroppableCollection'; export {useDraggableItem, useDraggableCollection} from 'react-aria/useDraggableCollection'; export {useClipboard} from 'react-aria/useClipboard'; -export {DragPreview} from 'react-aria/DragPreview'; export {ListDropTargetDelegate} from 'react-aria/ListDropTargetDelegate'; export {isVirtualDragging} from 'react-aria/private/dnd/DragManager'; export type {DroppableCollectionOptions, DroppableCollectionResult, DroppableItemOptions, DroppableItemResult, DropIndicatorProps, DropIndicatorAria} from 'react-aria/useDroppableCollection'; export type {DraggableItemProps, DraggableItemResult, DraggableCollectionOptions} from 'react-aria/useDraggableCollection'; -export type {DragPreviewProps} from 'react-aria/DragPreview'; -export type {DragOptions, DragResult} from 'react-aria/useDrag'; +export type {DragOptions, DragResult, DragPreviewProps} from 'react-aria/useDrag'; export type {DropOptions, DropResult} from 'react-aria/useDrop'; export type {ClipboardProps, ClipboardResult} from 'react-aria/useClipboard'; export type {DirectoryDropItem, DragEndEvent, DraggableCollectionEndEvent, DraggableCollectionMoveEvent, DraggableCollectionStartEvent, DragItem, DragMoveEvent, DragPreviewRenderer, DragStartEvent, DragTypes, DropEnterEvent, DropEvent, DropExitEvent, DropItem, DropMoveEvent, DropOperation, DroppableCollectionDropEvent, DroppableCollectionEnterEvent, DroppableCollectionExitEvent, DroppableCollectionInsertDropEvent, DroppableCollectionMoveEvent, DroppableCollectionOnItemDropEvent, DroppableCollectionReorderEvent, DroppableCollectionRootDropEvent, DropPosition, DropTarget, DropTargetDelegate, FileDropItem, ItemDropTarget, RootDropTarget, TextDropItem} from '@react-types/shared'; diff --git a/packages/@react-aria/focus/src/index.ts b/packages/@react-aria/focus/src/index.ts index 1aeb12bc844..724090dab51 100644 --- a/packages/@react-aria/focus/src/index.ts +++ b/packages/@react-aria/focus/src/index.ts @@ -20,6 +20,9 @@ export type {FocusScopeProps, FocusManager, FocusManagerOptions} from 'react-ari export type {FocusRingProps} from 'react-aria/FocusRing'; export type {AriaFocusRingProps, FocusRingAria} from 'react-aria/useFocusRing'; export {isFocusable} from 'react-aria/private/utils/isFocusable'; -export {Focusable, useFocusable, FocusableProvider} from 'react-aria/private/interactions/useFocusable'; +export {FocusableProvider} from 'react-aria/private/interactions/useFocusable'; +export {useFocusable} from 'react-aria/useFocusable'; +export {Focusable} from 'react-aria/Focusable'; export {focusSafely} from 'react-aria/private/interactions/focusSafely'; -export type {FocusableAria, FocusableOptions, FocusableProviderProps} from 'react-aria/private/interactions/useFocusable'; +export type {FocusableProviderProps} from 'react-aria/private/interactions/useFocusable'; +export type {FocusableAria, FocusableOptions} from 'react-aria/useFocusable'; diff --git a/packages/@react-aria/i18n/src/index.ts b/packages/@react-aria/i18n/src/index.ts index 1082d399999..c3a52596a72 100644 --- a/packages/@react-aria/i18n/src/index.ts +++ b/packages/@react-aria/i18n/src/index.ts @@ -10,17 +10,15 @@ * governing permissions and limitations under the License. */ -export {I18nProvider, useLocale} from 'react-aria/I18nProvider'; +export {I18nProvider, useLocale, isRTL} from 'react-aria/I18nProvider'; export {useMessageFormatter} from './useMessageFormatter'; -export {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter'; -export {useLocalizedStringDictionary} from 'react-aria/private/i18n/useLocalizedStringFormatter'; +export {useLocalizedStringFormatter, useLocalizedStringDictionary} from 'react-aria/useLocalizedStringFormatter'; export {useListFormatter} from 'react-aria/useListFormatter'; export {useDateFormatter} from 'react-aria/useDateFormatter'; export {useNumberFormatter} from 'react-aria/useNumberFormatter'; export {useCollator} from 'react-aria/useCollator'; export {useFilter} from 'react-aria/useFilter'; -export {isRTL} from 'react-aria/private/i18n/utils'; export type {FormatMessage} from './useMessageFormatter'; export type {I18nProviderProps, Locale} from 'react-aria/I18nProvider'; export type {DateFormatterOptions} from 'react-aria/useDateFormatter'; diff --git a/packages/@react-aria/interactions/src/index.ts b/packages/@react-aria/interactions/src/index.ts index b2ee77083db..2271e1aaa67 100644 --- a/packages/@react-aria/interactions/src/index.ts +++ b/packages/@react-aria/interactions/src/index.ts @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -export {Pressable} from 'react-aria/private/interactions/Pressable'; +export {Pressable} from 'react-aria/Pressable'; export {PressResponder, ClearPressResponder} from 'react-aria/private/interactions/PressResponder'; export {useFocus} from 'react-aria/useFocus'; @@ -18,24 +18,27 @@ export {isFocusVisible, getInteractionModality, setInteractionModality, getPoint export {useFocusVisible} from 'react-aria/useFocusVisible'; export {useFocusWithin} from 'react-aria/useFocusWithin'; export {useHover} from 'react-aria/useHover'; -export {useInteractOutside} from 'react-aria/private/interactions/useInteractOutside'; +export {useInteractOutside} from 'react-aria/useInteractOutside'; export {useKeyboard} from 'react-aria/useKeyboard'; export {useMove} from 'react-aria/useMove'; export {usePress} from 'react-aria/usePress'; export {useScrollWheel} from 'react-aria/private/interactions/useScrollWheel'; export {useLongPress} from 'react-aria/useLongPress'; -export {useFocusable, FocusableProvider, Focusable, FocusableContext} from 'react-aria/private/interactions/useFocusable'; +export {FocusableProvider, FocusableContext} from 'react-aria/private/interactions/useFocusable'; +export {useFocusable} from 'react-aria/useFocusable'; +export {Focusable} from 'react-aria/Focusable'; export {focusSafely} from 'react-aria/private/interactions/focusSafely'; export type {FocusProps, FocusResult} from 'react-aria/useFocus'; export type {FocusVisibleHandler, Modality} from 'react-aria/private/interactions/useFocusVisible'; export type {FocusVisibleProps, FocusVisibleResult} from 'react-aria/useFocusVisible'; export type {FocusWithinProps, FocusWithinResult} from 'react-aria/useFocusWithin'; export type {HoverProps, HoverResult} from 'react-aria/useHover'; -export type {InteractOutsideProps} from 'react-aria/private/interactions/useInteractOutside'; +export type {InteractOutsideProps} from 'react-aria/useInteractOutside'; export type {KeyboardProps, KeyboardResult} from 'react-aria/useKeyboard'; export type {PressProps, PressHookProps, PressResult} from 'react-aria/usePress'; export type {MoveResult} from 'react-aria/useMove'; export type {LongPressProps, LongPressResult} from 'react-aria/useLongPress'; export type {ScrollWheelProps} from 'react-aria/private/interactions/useScrollWheel'; -export type {FocusableAria, FocusableOptions, FocusableProviderProps} from 'react-aria/private/interactions/useFocusable'; +export type {FocusableProviderProps} from 'react-aria/private/interactions/useFocusable'; +export type {FocusableAria, FocusableOptions} from 'react-aria/useFocusable'; export type {PressEvent, PressEvents, LongPressEvent, MoveStartEvent, MoveMoveEvent, MoveEndEvent, MoveEvent, MoveEvents, HoverEvent, HoverEvents, FocusEvents, KeyboardEvents} from '@react-types/shared'; diff --git a/packages/@react-aria/overlays/src/index.ts b/packages/@react-aria/overlays/src/index.ts index 77b7960df90..8911edf81d2 100644 --- a/packages/@react-aria/overlays/src/index.ts +++ b/packages/@react-aria/overlays/src/index.ts @@ -9,11 +9,10 @@ * OF ANY KIND, either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -export {useOverlayPosition} from 'react-aria/private/overlays/useOverlayPosition'; - -export {useOverlay} from 'react-aria/private/overlays/useOverlay'; +export {useOverlayPosition} from 'react-aria/useOverlayPosition'; +export {useOverlay} from 'react-aria/useOverlay'; export {useOverlayTrigger} from 'react-aria/useOverlayTrigger'; -export {usePreventScroll} from 'react-aria/private/overlays/usePreventScroll'; +export {usePreventScroll} from 'react-aria/usePreventScroll'; export {ModalProvider, useModalProvider, OverlayProvider, OverlayContainer, useModal} from 'react-aria/private/overlays/useModal'; export {DismissButton, Overlay} from 'react-aria/Overlay'; export {ariaHideOutside} from 'react-aria/private/overlays/ariaHideOutside'; @@ -21,8 +20,8 @@ export {usePopover} from 'react-aria/usePopover'; export {useModalOverlay} from 'react-aria/useModalOverlay'; export {useOverlayFocusContain} from 'react-aria/private/overlays/Overlay'; export {UNSAFE_PortalProvider, useUNSAFE_PortalContext} from 'react-aria/PortalProvider'; -export type {AriaPositionProps, PositionAria, Placement, PlacementAxis, PositionProps, Axis, SizeAxis} from 'react-aria/private/overlays/useOverlayPosition'; -export type {AriaOverlayProps, OverlayAria} from 'react-aria/private/overlays/useOverlay'; +export type {AriaPositionProps, PositionAria, Placement, PlacementAxis, PositionProps, Axis, SizeAxis} from 'react-aria/useOverlayPosition'; +export type {AriaOverlayProps, OverlayAria} from 'react-aria/useOverlay'; export type {OverlayTriggerAria, OverlayTriggerProps} from 'react-aria/useOverlayTrigger'; export type {AriaModalOptions, ModalAria, ModalProviderAria, ModalProviderProps, OverlayContainerProps} from 'react-aria/private/overlays/useModal'; export type {DismissButtonProps, OverlayProps} from 'react-aria/Overlay'; diff --git a/packages/@react-aria/toolbar/src/index.ts b/packages/@react-aria/toolbar/src/index.ts index b5dadb2771b..737376fbd25 100644 --- a/packages/@react-aria/toolbar/src/index.ts +++ b/packages/@react-aria/toolbar/src/index.ts @@ -10,6 +10,6 @@ * governing permissions and limitations under the License. */ -export {useToolbar} from 'react-aria/private/toolbar/useToolbar'; +export {useToolbar} from 'react-aria/useToolbar'; -export type {AriaToolbarProps, ToolbarAria} from 'react-aria/private/toolbar/useToolbar'; +export type {AriaToolbarProps, ToolbarAria} from 'react-aria/useToolbar'; diff --git a/packages/@react-aria/tree/src/index.ts b/packages/@react-aria/tree/src/index.ts index a331b47e6df..ed846fc1691 100644 --- a/packages/@react-aria/tree/src/index.ts +++ b/packages/@react-aria/tree/src/index.ts @@ -10,8 +10,8 @@ * governing permissions and limitations under the License. */ -export {useTree} from 'react-aria/private/tree/useTree'; +export {useTree} from 'react-aria/useTree'; -export {useTreeItem} from 'react-aria/private/tree/useTreeItem'; -export type {AriaTreeOptions, AriaTreeProps, TreeAria, TreeProps} from 'react-aria/private/tree/useTree'; -export type {AriaTreeItemOptions, TreeItemAria} from 'react-aria/private/tree/useTreeItem'; +export {useTreeItem} from 'react-aria/useTree'; +export type {AriaTreeOptions, AriaTreeProps, TreeAria, TreeProps} from 'react-aria/useTree'; +export type {AriaTreeItemOptions, TreeItemAria} from 'react-aria/useTree'; diff --git a/packages/@react-aria/utils/src/index.ts b/packages/@react-aria/utils/src/index.ts index 86909adb805..e145865cc33 100644 --- a/packages/@react-aria/utils/src/index.ts +++ b/packages/@react-aria/utils/src/index.ts @@ -15,13 +15,13 @@ export {isMac, isIPhone, isIPad, isIOS, isAppleDevice, isWebKit, isChrome, isAnd export {openLink, getSyntheticLinkProps, useSyntheticLinkProps, RouterProvider, shouldClientNavigate, useRouter, useLinkProps, handleLinkClick} from 'react-aria/private/utils/openLink'; export {useId} from 'react-aria/useId'; export {mergeIds, useSlotId} from 'react-aria/private/utils/useId'; -export {chain} from 'react-aria/private/utils/chain'; +export {chain} from 'react-aria/chain'; export {createShadowTreeWalker, ShadowTreeWalker} from 'react-aria/private/utils/shadowdom/ShadowTreeWalker'; export {getActiveElement, getEventTarget, nodeContains, isFocusWithin} from 'react-aria/private/utils/shadowdom/DOMFunctions'; export {getOwnerDocument, getOwnerWindow, isShadowRoot} from 'react-aria/private/utils/domHelpers'; export {mergeProps} from 'react-aria/mergeProps'; -export {mergeRefs} from 'react-aria/private/utils/mergeRefs'; -export {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +export {mergeRefs} from 'react-aria/mergeRefs'; +export {filterDOMProps} from 'react-aria/filterDOMProps'; export {focusWithoutScrolling} from 'react-aria/private/utils/focusWithoutScrolling'; export {getOffset} from 'react-aria/private/utils/getOffset'; export {runAfterTransition} from 'react-aria/private/utils/runAfterTransition'; diff --git a/packages/@react-spectrum/s2/chromatic/Tabs.stories.tsx b/packages/@react-spectrum/s2/chromatic/Tabs.stories.tsx index ae27ad04dc3..076257c2c57 100644 --- a/packages/@react-spectrum/s2/chromatic/Tabs.stories.tsx +++ b/packages/@react-spectrum/s2/chromatic/Tabs.stories.tsx @@ -12,7 +12,7 @@ import Bell from '../s2wf-icons/S2_Icon_Bell_20_N.svg'; import {Button} from '../src/Button'; -import {Collection} from 'react-aria/private/collections/CollectionBuilder'; +import {Collection} from 'react-aria/Collection'; import Edit from '../s2wf-icons/S2_Icon_Edit_20_N.svg'; import Heart from '../s2wf-icons/S2_Icon_Heart_20_N.svg'; import type {Meta, StoryObj} from '@storybook/react'; diff --git a/packages/@react-spectrum/s2/chromatic/TreeView.stories.tsx b/packages/@react-spectrum/s2/chromatic/TreeView.stories.tsx index 69f67912c67..e0077338fcb 100644 --- a/packages/@react-spectrum/s2/chromatic/TreeView.stories.tsx +++ b/packages/@react-spectrum/s2/chromatic/TreeView.stories.tsx @@ -12,7 +12,7 @@ import {ActionMenu} from '../src/ActionMenu'; -import {Collection} from 'react-aria/private/collections/CollectionBuilder'; +import {Collection} from 'react-aria/Collection'; import {Content, Heading, Text} from '../src/Content'; import Delete from '../s2wf-icons/S2_Icon_Delete_20_N.svg'; import Edit from '../s2wf-icons/S2_Icon_Edit_20_N.svg'; diff --git a/packages/@react-spectrum/s2/exports/Autocomplete.ts b/packages/@react-spectrum/s2/exports/Autocomplete.ts new file mode 100644 index 00000000000..5fa8510259b --- /dev/null +++ b/packages/@react-spectrum/s2/exports/Autocomplete.ts @@ -0,0 +1,2 @@ +export {Autocomplete} from 'react-aria-components/Autocomplete'; +export type {AutocompleteProps} from 'react-aria-components/Autocomplete'; diff --git a/packages/@react-spectrum/s2/exports/CardView.ts b/packages/@react-spectrum/s2/exports/CardView.ts index e951a795252..d4c2ff777f2 100644 --- a/packages/@react-spectrum/s2/exports/CardView.ts +++ b/packages/@react-spectrum/s2/exports/CardView.ts @@ -1,3 +1,4 @@ export {CardView, CardViewContext} from '../src/CardView'; +export {Collection} from 'react-aria/Collection'; export type {CardViewProps} from '../src/CardView'; export type {Selection, Key, SelectionMode} from '@react-types/shared'; diff --git a/packages/@react-spectrum/s2/exports/FileTrigger.ts b/packages/@react-spectrum/s2/exports/FileTrigger.ts new file mode 100644 index 00000000000..159d86afd20 --- /dev/null +++ b/packages/@react-spectrum/s2/exports/FileTrigger.ts @@ -0,0 +1,2 @@ +export {FileTrigger} from 'react-aria-components/FileTrigger'; +export type {FileTriggerProps} from 'react-aria-components/FileTrigger'; diff --git a/packages/@react-spectrum/s2/exports/ListView.ts b/packages/@react-spectrum/s2/exports/ListView.ts index 0bab7ac7811..9659015e22e 100644 --- a/packages/@react-spectrum/s2/exports/ListView.ts +++ b/packages/@react-spectrum/s2/exports/ListView.ts @@ -1,3 +1,4 @@ export {ListView, ListViewContext, ListViewItem} from '../src/ListView'; +export {Collection} from 'react-aria/Collection'; export type {ListViewProps, ListViewItemProps} from '../src/ListView'; export type {Selection, Key, SelectionMode} from '@react-types/shared'; diff --git a/packages/@react-spectrum/s2/exports/Menu.ts b/packages/@react-spectrum/s2/exports/Menu.ts index 472b5098805..8350e036683 100644 --- a/packages/@react-spectrum/s2/exports/Menu.ts +++ b/packages/@react-spectrum/s2/exports/Menu.ts @@ -1,3 +1,4 @@ export {MenuItem, MenuTrigger, Menu, MenuSection, SubmenuTrigger, UnavailableMenuItemTrigger, MenuContext} from '../src/Menu'; +export {Collection} from 'react-aria/Collection'; export type {MenuTriggerProps, MenuProps, MenuItemProps, MenuSectionProps, SubmenuTriggerProps, UnavailableMenuItemTriggerProps} from '../src/Menu'; export type {Selection, Key, SelectionMode} from '@react-types/shared'; diff --git a/packages/@react-spectrum/s2/exports/Picker.ts b/packages/@react-spectrum/s2/exports/Picker.ts index 9778723ffaa..f4d79b32bb9 100644 --- a/packages/@react-spectrum/s2/exports/Picker.ts +++ b/packages/@react-spectrum/s2/exports/Picker.ts @@ -1,3 +1,4 @@ export {Picker, PickerItem, PickerSection, PickerContext} from '../src/Picker'; +export {Collection} from 'react-aria/Collection'; export type {PickerProps, PickerItemProps, PickerSectionProps} from '../src/Picker'; export type {Key} from '@react-types/shared'; diff --git a/packages/@react-spectrum/s2/exports/Provider.ts b/packages/@react-spectrum/s2/exports/Provider.ts index 7feeeb7bf3e..34980a8b0dc 100644 --- a/packages/@react-spectrum/s2/exports/Provider.ts +++ b/packages/@react-spectrum/s2/exports/Provider.ts @@ -1,2 +1,4 @@ export {Provider, ColorSchemeContext} from '../src/Provider'; export type {ProviderProps} from '../src/Provider'; +export type {RouterConfig} from '@react-types/shared'; +export {useLocale} from 'react-aria/I18nProvider'; diff --git a/packages/@react-spectrum/s2/exports/TableView.ts b/packages/@react-spectrum/s2/exports/TableView.ts index 41e58236651..73ee751e580 100644 --- a/packages/@react-spectrum/s2/exports/TableView.ts +++ b/packages/@react-spectrum/s2/exports/TableView.ts @@ -1,3 +1,4 @@ export {TableView, TableHeader, TableBody, Row, Cell, Column, TableContext, EditableCell} from '../src/TableView'; +export {Collection} from 'react-aria/Collection'; export type {TableViewProps, TableHeaderProps, TableBodyProps, RowProps, CellProps, ColumnProps} from '../src/TableView'; -export type {Selection, Key, SelectionMode} from '@react-types/shared'; +export type {Selection, Key, SelectionMode, SortDescriptor, SortDirection} from '@react-types/shared'; diff --git a/packages/@react-spectrum/s2/exports/TagGroup.ts b/packages/@react-spectrum/s2/exports/TagGroup.ts index 6800265381d..6770239dcd8 100644 --- a/packages/@react-spectrum/s2/exports/TagGroup.ts +++ b/packages/@react-spectrum/s2/exports/TagGroup.ts @@ -1,3 +1,4 @@ export {TagGroup, Tag, TagGroupContext} from '../src/TagGroup'; +export {Collection} from 'react-aria/Collection'; export type {TagGroupProps, TagProps} from '../src/TagGroup'; export type {Selection, Key, SelectionMode} from '@react-types/shared'; diff --git a/packages/@react-spectrum/s2/exports/TreeView.ts b/packages/@react-spectrum/s2/exports/TreeView.ts index 316eda5c413..ffcc43ae504 100644 --- a/packages/@react-spectrum/s2/exports/TreeView.ts +++ b/packages/@react-spectrum/s2/exports/TreeView.ts @@ -1,4 +1,4 @@ export {TreeView, TreeViewItem, TreeViewItemContent, TreeViewLoadMoreItem} from '../src/TreeView'; - +export {Collection} from 'react-aria/Collection'; export type {TreeViewProps, TreeViewItemProps, TreeViewItemContentProps, TreeViewLoadMoreItemProps} from '../src/TreeView'; export type {Selection, Key, SelectionMode} from '@react-types/shared'; diff --git a/packages/@react-spectrum/s2/exports/index.ts b/packages/@react-spectrum/s2/exports/index.ts index a52502c85e6..12f88fb6585 100644 --- a/packages/@react-spectrum/s2/exports/index.ts +++ b/packages/@react-spectrum/s2/exports/index.ts @@ -93,7 +93,7 @@ export {pressScale} from '../src/pressScale'; export {mergeStyles} from '../style/runtime'; export {Autocomplete} from 'react-aria-components/Autocomplete'; -export {Collection} from 'react-aria/private/collections/CollectionBuilder'; +export {Collection} from 'react-aria/Collection'; export {FileTrigger} from 'react-aria-components/FileTrigger'; export {parseColor, getColorChannels} from 'react-stately/Color'; export {useLocale} from 'react-aria/I18nProvider'; @@ -179,11 +179,11 @@ export type {DateValue, DateRange} from 'react-aria-components/RangeCalendar'; export type {TimeValue} from 'react-aria-components/TimeField'; export type {FileTriggerProps} from 'react-aria-components/FileTrigger'; export type {TooltipTriggerComponentProps as TooltipTriggerProps} from 'react-aria-components/Tooltip'; -export type {SortDescriptor, Key, Selection, RouterConfig, PressEvent} from '@react-types/shared'; +export type {SortDescriptor, SortDirection, Key, Selection, RouterConfig, PressEvent} from '@react-types/shared'; export type {ColorSpace, ColorChannel, Color, ColorFormat, ColorAxes, ColorChannelRange} from 'react-stately/Color'; -export type {ListData} from 'react-stately/useListData'; -export type {TreeData} from 'react-stately/useTreeData'; -export type {AsyncListData} from 'react-stately/useAsyncList'; +export type {ListOptions, ListData} from 'react-stately/useListData'; +export type {TreeOptions, TreeData} from 'react-stately/useTreeData'; +export type {AsyncListOptions, AsyncListData, AsyncListLoadFunction, AsyncListLoadOptions, AsyncListStateUpdate} from 'react-stately/useAsyncList'; export type { StylesProp, diff --git a/packages/@react-spectrum/s2/exports/mergeStyles.ts b/packages/@react-spectrum/s2/exports/mergeStyles.ts new file mode 100644 index 00000000000..14ea1ced10d --- /dev/null +++ b/packages/@react-spectrum/s2/exports/mergeStyles.ts @@ -0,0 +1 @@ +export {mergeStyles} from '../style/runtime'; diff --git a/packages/@react-spectrum/s2/exports/useAsyncList.ts b/packages/@react-spectrum/s2/exports/useAsyncList.ts new file mode 100644 index 00000000000..af9ed6e9c67 --- /dev/null +++ b/packages/@react-spectrum/s2/exports/useAsyncList.ts @@ -0,0 +1,2 @@ +export {useAsyncList} from 'react-stately/useAsyncList'; +export type {AsyncListOptions, AsyncListData, AsyncListLoadFunction, AsyncListLoadOptions, AsyncListStateUpdate} from 'react-stately/useAsyncList'; diff --git a/packages/@react-spectrum/s2/exports/useListData.ts b/packages/@react-spectrum/s2/exports/useListData.ts new file mode 100644 index 00000000000..f4c7f4e4436 --- /dev/null +++ b/packages/@react-spectrum/s2/exports/useListData.ts @@ -0,0 +1,2 @@ +export {useListData} from 'react-stately/useListData'; +export type {ListOptions, ListData} from 'react-stately/useListData'; diff --git a/packages/@react-spectrum/s2/exports/useTreeData.ts b/packages/@react-spectrum/s2/exports/useTreeData.ts new file mode 100644 index 00000000000..3f975ae1438 --- /dev/null +++ b/packages/@react-spectrum/s2/exports/useTreeData.ts @@ -0,0 +1,2 @@ +export {useTreeData} from 'react-stately/useTreeData'; +export type {TreeOptions, TreeData} from 'react-stately/useTreeData'; diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/3D.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/3D.tsx index 0fc5394449f..960975b6e08 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/3D.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/3D.tsx @@ -15,7 +15,7 @@ import _3D_M from 'illustration:./S2_fill_3D_generic1_96.svg'; import _3D_S from 'illustration:./S2_fill_3D_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function _3D(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/3Dasset.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/3Dasset.tsx index cf6e8107e42..25eab68c6d0 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/3Dasset.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/3Dasset.tsx @@ -15,7 +15,7 @@ import _3Dasset_M from 'illustration:./S2_fill_3Dasset_generic1_96.svg'; import _3Dasset_S from 'illustration:./S2_fill_3Dasset_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function _3Dasset(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/AIGenerate.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/AIGenerate.tsx index 64e6f789691..48986a71efc 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/AIGenerate.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/AIGenerate.tsx @@ -15,7 +15,7 @@ import AIGenerate_M from 'illustration:./S2_fill_AIGenerate_generic1_96.svg'; import AIGenerate_S from 'illustration:./S2_fill_AIGenerate_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function AIGenerate(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/AIGenerateImage.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/AIGenerateImage.tsx index e5d85f6cc6a..9efaf9a7bb4 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/AIGenerateImage.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/AIGenerateImage.tsx @@ -15,7 +15,7 @@ import AIGenerateImage_M from 'illustration:./S2_fill_AIGenerateImage_generic1_9 import AIGenerateImage_S from 'illustration:./S2_fill_AIGenerateImage_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function AIGenerateImage(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/AIchat.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/AIchat.tsx index 81bd751367b..ce6a1ca911c 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/AIchat.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/AIchat.tsx @@ -15,7 +15,7 @@ import AIchat_M from 'illustration:./S2_fill_AIchat_generic1_96.svg'; import AIchat_S from 'illustration:./S2_fill_AIchat_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function AIchat(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Accessibility.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Accessibility.tsx index 371b11531fa..807bd921f84 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Accessibility.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Accessibility.tsx @@ -15,7 +15,7 @@ import Accessibility_M from 'illustration:./S2_fill_accessibility_generic1_96.sv import Accessibility_S from 'illustration:./S2_fill_accessibility_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Accessibility(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Animation.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Animation.tsx index 5b67ee0009e..6b4197a36f0 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Animation.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Animation.tsx @@ -15,7 +15,7 @@ import Animation_M from 'illustration:./S2_fill_animation_generic1_96.svg'; import Animation_S from 'illustration:./S2_fill_animation_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Animation(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Apps.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Apps.tsx index 3cf4ba36a41..0e2fc641ef3 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Apps.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Apps.tsx @@ -15,7 +15,7 @@ import Apps_M from 'illustration:./S2_fill_apps_generic1_96.svg'; import Apps_S from 'illustration:./S2_fill_apps_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Apps(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Artboard.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Artboard.tsx index 3f6864b0d1a..638761c70cd 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Artboard.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Artboard.tsx @@ -15,7 +15,7 @@ import Artboard_M from 'illustration:./S2_fill_artboard_generic1_96.svg'; import Artboard_S from 'illustration:./S2_fill_artboard_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Artboard(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Assets.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Assets.tsx index ceafead4207..8c3f68c0431 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Assets.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Assets.tsx @@ -15,7 +15,7 @@ import Assets_M from 'illustration:./S2_fill_assets_generic1_96.svg'; import Assets_S from 'illustration:./S2_fill_assets_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Assets(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/AudioWave.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/AudioWave.tsx index 86330877fec..0ee0214e80e 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/AudioWave.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/AudioWave.tsx @@ -15,7 +15,7 @@ import AudioWave_M from 'illustration:./S2_fill_audioWave_generic1_96.svg'; import AudioWave_S from 'illustration:./S2_fill_audioWave_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function AudioWave(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/BadgeVerified.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/BadgeVerified.tsx index 93b70f2897f..78251257f5c 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/BadgeVerified.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/BadgeVerified.tsx @@ -15,7 +15,7 @@ import BadgeVerified_M from 'illustration:./S2_fill_badgeVerified_generic1_96.sv import BadgeVerified_S from 'illustration:./S2_fill_badgeVerified_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function BadgeVerified(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Bell.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Bell.tsx index a52983dd207..a7706aacf77 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Bell.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Bell.tsx @@ -15,7 +15,7 @@ import Bell_M from 'illustration:./S2_fill_bell_generic1_96.svg'; import Bell_S from 'illustration:./S2_fill_bell_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Bell(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Bolt.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Bolt.tsx index 2832b767219..ec1b0d6315a 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Bolt.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Bolt.tsx @@ -15,7 +15,7 @@ import Bolt_M from 'illustration:./S2_fill_bolt_generic1_96.svg'; import Bolt_S from 'illustration:./S2_fill_bolt_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Bolt(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Brand.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Brand.tsx index f2dbdf41c14..c38d8fdf55e 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Brand.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Brand.tsx @@ -15,7 +15,7 @@ import Brand_M from 'illustration:./S2_fill_brand_generic1_96.svg'; import Brand_S from 'illustration:./S2_fill_brand_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Brand(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Briefcase.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Briefcase.tsx index 62048772b4d..c3dcd37054f 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Briefcase.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Briefcase.tsx @@ -15,7 +15,7 @@ import Briefcase_M from 'illustration:./S2_fill_briefcase_generic1_96.svg'; import Briefcase_S from 'illustration:./S2_fill_briefcase_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Briefcase(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/BrightnessContrast.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/BrightnessContrast.tsx index 017132c4c7d..71e8bcbe0c0 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/BrightnessContrast.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/BrightnessContrast.tsx @@ -15,7 +15,7 @@ import BrightnessContrast_M from 'illustration:./S2_fill_brightnessContrast_gene import BrightnessContrast_S from 'illustration:./S2_fill_brightnessContrast_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function BrightnessContrast(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Browser.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Browser.tsx index 3b2d6f1b3ab..59e0ca02467 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Browser.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Browser.tsx @@ -15,7 +15,7 @@ import Browser_M from 'illustration:./S2_fill_browser_generic1_96.svg'; import Browser_S from 'illustration:./S2_fill_browser_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Browser(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Brush.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Brush.tsx index a1749a3af0e..28424900f8b 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Brush.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Brush.tsx @@ -15,7 +15,7 @@ import Brush_M from 'illustration:./S2_fill_brush_generic1_96.svg'; import Brush_S from 'illustration:./S2_fill_brush_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Brush(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/BuildTable.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/BuildTable.tsx index 28d0f708678..745d477b1dc 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/BuildTable.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/BuildTable.tsx @@ -15,7 +15,7 @@ import BuildTable_M from 'illustration:./S2_fill_buildTable_generic1_96.svg'; import BuildTable_S from 'illustration:./S2_fill_buildTable_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function BuildTable(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Buildings.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Buildings.tsx index f8767525222..447994841f1 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Buildings.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Buildings.tsx @@ -15,7 +15,7 @@ import Buildings_M from 'illustration:./S2_fill_buildings_generic1_96.svg'; import Buildings_S from 'illustration:./S2_fill_buildings_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Buildings(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Calendar.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Calendar.tsx index 74575ec9cdd..75469cb6b23 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Calendar.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Calendar.tsx @@ -15,7 +15,7 @@ import Calendar_M from 'illustration:./S2_fill_calendar_generic1_96.svg'; import Calendar_S from 'illustration:./S2_fill_calendar_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Calendar(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Camera.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Camera.tsx index 46ccee90f5d..7deb0b37991 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Camera.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Camera.tsx @@ -15,7 +15,7 @@ import Camera_M from 'illustration:./S2_fill_camera_generic1_96.svg'; import Camera_S from 'illustration:./S2_fill_camera_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Camera(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/CardTapPayment.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/CardTapPayment.tsx index be5da7ea7e3..2a65c26698f 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/CardTapPayment.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/CardTapPayment.tsx @@ -15,7 +15,7 @@ import CardTapPayment_M from 'illustration:./S2_fill_cardTapPayment_generic1_96. import CardTapPayment_S from 'illustration:./S2_fill_cardTapPayment_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function CardTapPayment(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Channel.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Channel.tsx index c688138e75e..6026a0abd7b 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Channel.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Channel.tsx @@ -15,7 +15,7 @@ import Channel_M from 'illustration:./S2_fill_channel_generic1_96.svg'; import Channel_S from 'illustration:./S2_fill_channel_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Channel(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ChartAreaStack.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ChartAreaStack.tsx index 00ef75f37dd..c89cc9906d5 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ChartAreaStack.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ChartAreaStack.tsx @@ -15,7 +15,7 @@ import ChartAreaStack_M from 'illustration:./S2_fill_chartAreaStack_generic1_96. import ChartAreaStack_S from 'illustration:./S2_fill_chartAreaStack_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function ChartAreaStack(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Chatbubble.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Chatbubble.tsx index 7e1d0d6039e..ec76fe130dd 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Chatbubble.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Chatbubble.tsx @@ -15,7 +15,7 @@ import Chatbubble_M from 'illustration:./S2_fill_chatbubble_generic1_96.svg'; import Chatbubble_S from 'illustration:./S2_fill_chatbubble_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Chatbubble(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Checkmark.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Checkmark.tsx index 33adc5ee279..08dbf53f9c8 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Checkmark.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Checkmark.tsx @@ -15,7 +15,7 @@ import Checkmark_M from 'illustration:./S2_fill_checkmark_generic1_96.svg'; import Checkmark_S from 'illustration:./S2_fill_checkmark_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Checkmark(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Clipboard.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Clipboard.tsx index 533bda454b1..9a6b274eae9 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Clipboard.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Clipboard.tsx @@ -15,7 +15,7 @@ import Clipboard_M from 'illustration:./S2_fill_clipboard_generic1_96.svg'; import Clipboard_S from 'illustration:./S2_fill_clipboard_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Clipboard(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Clock.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Clock.tsx index b9529586fe5..f82f5c626ea 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Clock.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Clock.tsx @@ -15,7 +15,7 @@ import Clock_M from 'illustration:./S2_fill_clock_generic1_96.svg'; import Clock_S from 'illustration:./S2_fill_clock_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Clock(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Cloud.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Cloud.tsx index e879d90f7ae..162b06a1724 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Cloud.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Cloud.tsx @@ -15,7 +15,7 @@ import Cloud_M from 'illustration:./S2_fill_cloud_generic1_96.svg'; import Cloud_S from 'illustration:./S2_fill_cloud_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Cloud(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/CloudUpload.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/CloudUpload.tsx index 296c7c45e63..0028587eaf6 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/CloudUpload.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/CloudUpload.tsx @@ -15,7 +15,7 @@ import CloudUpload_M from 'illustration:./S2_fill_cloudUpload_generic1_96.svg'; import CloudUpload_S from 'illustration:./S2_fill_cloudUpload_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function CloudUpload(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/CodeBrackets.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/CodeBrackets.tsx index 489b3fe76a9..0c8a7761271 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/CodeBrackets.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/CodeBrackets.tsx @@ -15,7 +15,7 @@ import CodeBrackets_M from 'illustration:./S2_fill_CodeBrackets_generic1_96.svg' import CodeBrackets_S from 'illustration:./S2_fill_CodeBrackets_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function CodeBrackets(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Color.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Color.tsx index 19de504a078..4a31fb8cd3a 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Color.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Color.tsx @@ -15,7 +15,7 @@ import Color_M from 'illustration:./S2_fill_color_generic1_96.svg'; import Color_S from 'illustration:./S2_fill_color_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Color(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/CommentText.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/CommentText.tsx index 678f1d68282..e4a07a70aac 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/CommentText.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/CommentText.tsx @@ -15,7 +15,7 @@ import CommentText_M from 'illustration:./S2_fill_commentText_generic1_96.svg'; import CommentText_S from 'illustration:./S2_fill_commentText_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function CommentText(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Confetti.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Confetti.tsx index facbe907559..e13fb5d2e41 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Confetti.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Confetti.tsx @@ -15,7 +15,7 @@ import Confetti_M from 'illustration:./S2_fill_confetti_generic1_96.svg'; import Confetti_S from 'illustration:./S2_fill_confetti_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Confetti(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Conversationbubbles.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Conversationbubbles.tsx index 2d82e51eba6..94e6528ecdd 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Conversationbubbles.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Conversationbubbles.tsx @@ -15,7 +15,7 @@ import Conversationbubbles_M from 'illustration:./S2_fill_conversationbubbles_ge import Conversationbubbles_S from 'illustration:./S2_fill_conversationbubbles_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Conversationbubbles(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Crop.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Crop.tsx index 6fea5022f53..3ffeaaddec9 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Crop.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Crop.tsx @@ -15,7 +15,7 @@ import Crop_M from 'illustration:./S2_fill_crop_generic1_96.svg'; import Crop_S from 'illustration:./S2_fill_crop_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Crop(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Cursor.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Cursor.tsx index 3acec293d0d..f7af286d25e 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Cursor.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Cursor.tsx @@ -15,7 +15,7 @@ import Cursor_M from 'illustration:./S2_fill_cursor_generic1_96.svg'; import Cursor_S from 'illustration:./S2_fill_cursor_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Cursor(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Cut.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Cut.tsx index 50641df3861..bb55cba364a 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Cut.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Cut.tsx @@ -15,7 +15,7 @@ import Cut_M from 'illustration:./S2_fill_cut_generic1_96.svg'; import Cut_S from 'illustration:./S2_fill_cut_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Cut(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Data.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Data.tsx index 2657c1b5d00..94cb8e775ea 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Data.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Data.tsx @@ -15,7 +15,7 @@ import Data_M from 'illustration:./S2_fill_data_generic1_96.svg'; import Data_S from 'illustration:./S2_fill_data_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Data(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/DataAnalytics.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/DataAnalytics.tsx index 091642d1581..2c617cfd6ac 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/DataAnalytics.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/DataAnalytics.tsx @@ -15,7 +15,7 @@ import DataAnalytics_M from 'illustration:./S2_fill_dataAnalytics_generic1_96.sv import DataAnalytics_S from 'illustration:./S2_fill_dataAnalytics_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function DataAnalytics(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Desktop.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Desktop.tsx index b81091d3bfc..e24dd1184fd 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Desktop.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Desktop.tsx @@ -15,7 +15,7 @@ import Desktop_M from 'illustration:./S2_fill_desktop_generic1_96.svg'; import Desktop_S from 'illustration:./S2_fill_desktop_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Desktop(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Diamond.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Diamond.tsx index 2e20bad845d..d3425cbc616 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Diamond.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Diamond.tsx @@ -15,7 +15,7 @@ import Diamond_M from 'illustration:./S2_fill_diamond_generic1_96.svg'; import Diamond_S from 'illustration:./S2_fill_diamond_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Diamond(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Document.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Document.tsx index 6639472b872..96ae0f94e85 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Document.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Document.tsx @@ -15,7 +15,7 @@ import Document_M from 'illustration:./S2_fill_document_generic1_96.svg'; import Document_S from 'illustration:./S2_fill_document_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Document(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Download.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Download.tsx index dace1a56da8..f95b5d5c846 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Download.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Download.tsx @@ -15,7 +15,7 @@ import Download_M from 'illustration:./S2_fill_download_generic1_96.svg'; import Download_S from 'illustration:./S2_fill_download_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Download(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/DropToUpload.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/DropToUpload.tsx index 3fb520f227b..aac0d666dd5 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/DropToUpload.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/DropToUpload.tsx @@ -15,7 +15,7 @@ import DropToUpload_M from 'illustration:./S2_fill_dropToUpload_generic1_96.svg' import DropToUpload_S from 'illustration:./S2_fill_dropToUpload_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function DropToUpload(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Education.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Education.tsx index f33ca357eac..0fb0b5038c1 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Education.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Education.tsx @@ -15,7 +15,7 @@ import Education_M from 'illustration:./S2_fill_education_generic1_96.svg'; import Education_S from 'illustration:./S2_fill_education_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Education(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Effects.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Effects.tsx index 4a315f3bbeb..1e68bc48cc3 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Effects.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Effects.tsx @@ -15,7 +15,7 @@ import Effects_M from 'illustration:./S2_fill_effects_generic1_96.svg'; import Effects_S from 'illustration:./S2_fill_effects_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Effects(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Emoji.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Emoji.tsx index 527eb68ac6f..337848e99bc 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Emoji.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Emoji.tsx @@ -15,7 +15,7 @@ import Emoji_M from 'illustration:./S2_fill_emoji_generic1_96.svg'; import Emoji_S from 'illustration:./S2_fill_emoji_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Emoji(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/EmptyStateExport.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/EmptyStateExport.tsx index c751aee4fab..993c5997939 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/EmptyStateExport.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/EmptyStateExport.tsx @@ -15,7 +15,7 @@ import EmptyStateExport_M from 'illustration:./S2_fill_EmptyStateExport_generic1 import EmptyStateExport_S from 'illustration:./S2_fill_EmptyStateExport_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function EmptyStateExport(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Explosion.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Explosion.tsx index 4a3b4bd7f98..28b82177ff1 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Explosion.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Explosion.tsx @@ -15,7 +15,7 @@ import Explosion_M from 'illustration:./S2_fill_explosion_generic1_96.svg'; import Explosion_S from 'illustration:./S2_fill_explosion_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Explosion(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ExportTo.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ExportTo.tsx index 74ad1295986..7b6ae500529 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ExportTo.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ExportTo.tsx @@ -15,7 +15,7 @@ import ExportTo_M from 'illustration:./S2_fill_exportTo_generic1_96.svg'; import ExportTo_S from 'illustration:./S2_fill_exportTo_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function ExportTo(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Exposure.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Exposure.tsx index f2f763a312c..b2aff9bd381 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Exposure.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Exposure.tsx @@ -15,7 +15,7 @@ import Exposure_M from 'illustration:./S2_fill_exposure_generic1_96.svg'; import Exposure_S from 'illustration:./S2_fill_exposure_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Exposure(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileImage.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileImage.tsx index fc89600b6e3..c43d8a243db 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileImage.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileImage.tsx @@ -15,7 +15,7 @@ import FileImage_M from 'illustration:./S2_fill_fileImage_generic1_96.svg'; import FileImage_S from 'illustration:./S2_fill_fileImage_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function FileImage(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileShared.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileShared.tsx index 8c8ed641f53..101aef0c682 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileShared.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileShared.tsx @@ -15,7 +15,7 @@ import FileShared_M from 'illustration:./S2_fill_fileShared_generic1_96.svg'; import FileShared_S from 'illustration:./S2_fill_fileShared_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function FileShared(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileText.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileText.tsx index 2509b6c75fa..94cfc126c57 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileText.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileText.tsx @@ -15,7 +15,7 @@ import FileText_M from 'illustration:./S2_fill_fileText_generic1_96.svg'; import FileText_S from 'illustration:./S2_fill_fileText_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function FileText(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileVideo.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileVideo.tsx index 07137d42118..94a7ff8e9e0 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileVideo.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileVideo.tsx @@ -15,7 +15,7 @@ import FileVideo_M from 'illustration:./S2_fill_fileVideo_generic1_96.svg'; import FileVideo_S from 'illustration:./S2_fill_fileVideo_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function FileVideo(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileZip.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileZip.tsx index 131b6e067aa..76a19b96ef8 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileZip.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileZip.tsx @@ -15,7 +15,7 @@ import FileZip_M from 'illustration:./S2_fill_fileZip_generic1_96.svg'; import FileZip_S from 'illustration:./S2_fill_fileZip_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function FileZip(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Filmstrip.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Filmstrip.tsx index 7b08002e35c..059b26b960f 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Filmstrip.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Filmstrip.tsx @@ -15,7 +15,7 @@ import Filmstrip_M from 'illustration:./S2_fill_filmstrip_generic1_96.svg'; import Filmstrip_S from 'illustration:./S2_fill_filmstrip_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Filmstrip(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Filter.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Filter.tsx index b5ee37f6160..dfcbc49ffc8 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Filter.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Filter.tsx @@ -15,7 +15,7 @@ import Filter_M from 'illustration:./S2_fill_filter_generic1_96.svg'; import Filter_S from 'illustration:./S2_fill_filter_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Filter(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Filters.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Filters.tsx index 44450ca149f..568bf22dea5 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Filters.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Filters.tsx @@ -15,7 +15,7 @@ import Filters_M from 'illustration:./S2_fill_filters_generic1_96.svg'; import Filters_S from 'illustration:./S2_fill_filters_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Filters(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Fireworks.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Fireworks.tsx index a5d2f259e9f..436b7f49832 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Fireworks.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Fireworks.tsx @@ -15,7 +15,7 @@ import Fireworks_M from 'illustration:./S2_fill_fireworks_generic1_96.svg'; import Fireworks_S from 'illustration:./S2_fill_fireworks_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Fireworks(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Flag.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Flag.tsx index 4104dc50883..0186cf69ac5 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Flag.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Flag.tsx @@ -15,7 +15,7 @@ import Flag_M from 'illustration:./S2_fill_flag_generic1_96.svg'; import Flag_S from 'illustration:./S2_fill_flag_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Flag(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FlagCheckmark.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FlagCheckmark.tsx index b3df935fb50..87c17463b93 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FlagCheckmark.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FlagCheckmark.tsx @@ -15,7 +15,7 @@ import FlagCheckmark_M from 'illustration:./S2_fill_flagCheckmark_generic1_96.sv import FlagCheckmark_S from 'illustration:./S2_fill_flagCheckmark_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function FlagCheckmark(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FlagCross.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FlagCross.tsx index a70f2ae1bd6..13c0daf17fe 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FlagCross.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FlagCross.tsx @@ -15,7 +15,7 @@ import FlagCross_M from 'illustration:./S2_fill_flagCross_generic1_96.svg'; import FlagCross_S from 'illustration:./S2_fill_flagCross_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function FlagCross(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FolderClose.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FolderClose.tsx index 596f0ff1086..914538037ab 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FolderClose.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FolderClose.tsx @@ -15,7 +15,7 @@ import FolderClose_M from 'illustration:./S2_fill_folderClose_generic1_96.svg'; import FolderClose_S from 'illustration:./S2_fill_folderClose_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function FolderClose(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FolderOpen.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FolderOpen.tsx index 1bd36d13a7c..597a5ce7318 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FolderOpen.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FolderOpen.tsx @@ -15,7 +15,7 @@ import FolderOpen_M from 'illustration:./S2_fill_folderOpen_generic1_96.svg'; import FolderOpen_S from 'illustration:./S2_fill_folderOpen_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function FolderOpen(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FolderShared.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FolderShared.tsx index 1accce1f217..410ce84bdad 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FolderShared.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FolderShared.tsx @@ -15,7 +15,7 @@ import FolderShared_M from 'illustration:./S2_fill_folderShared_generic1_96.svg' import FolderShared_S from 'illustration:./S2_fill_folderShared_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function FolderShared(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/GearSetting.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/GearSetting.tsx index 2a98cbe9575..47c3a5f2846 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/GearSetting.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/GearSetting.tsx @@ -15,7 +15,7 @@ import GearSetting_M from 'illustration:./S2_fill_gearSetting_generic1_96.svg'; import GearSetting_S from 'illustration:./S2_fill_gearSetting_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function GearSetting(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Gift.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Gift.tsx index 0317f477d63..4305d64bde1 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Gift.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Gift.tsx @@ -15,7 +15,7 @@ import Gift_M from 'illustration:./S2_fill_gift_generic1_96.svg'; import Gift_S from 'illustration:./S2_fill_gift_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Gift(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Globe.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Globe.tsx index 66387a707da..870623f6c67 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Globe.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Globe.tsx @@ -15,7 +15,7 @@ import Globe_M from 'illustration:./S2_fill_globe_generic1_96.svg'; import Globe_S from 'illustration:./S2_fill_globe_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Globe(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/GlobeGrid.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/GlobeGrid.tsx index 478403793c7..e948df95aae 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/GlobeGrid.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/GlobeGrid.tsx @@ -15,7 +15,7 @@ import GlobeGrid_M from 'illustration:./S2_fill_globeGrid_generic1_96.svg'; import GlobeGrid_S from 'illustration:./S2_fill_globeGrid_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function GlobeGrid(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/GraphBarChart.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/GraphBarChart.tsx index fb4a36e6ac9..bd348b6b65f 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/GraphBarChart.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/GraphBarChart.tsx @@ -15,7 +15,7 @@ import GraphBarChart_M from 'illustration:./S2_fill_graphBarChart_generic1_96.sv import GraphBarChart_S from 'illustration:./S2_fill_graphBarChart_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function GraphBarChart(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Hand.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Hand.tsx index 895835a495c..62608ca8895 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Hand.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Hand.tsx @@ -15,7 +15,7 @@ import Hand_M from 'illustration:./S2_fill_hand_generic1_96.svg'; import Hand_S from 'illustration:./S2_fill_hand_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Hand(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Handshake.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Handshake.tsx index 7cbeaa5cc33..7372406ee51 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Handshake.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Handshake.tsx @@ -15,7 +15,7 @@ import Handshake_M from 'illustration:./S2_fill_handshake_generic1_96.svg'; import Handshake_S from 'illustration:./S2_fill_handshake_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Handshake(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Heart.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Heart.tsx index 03c976dcd06..1ff32611f9c 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Heart.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Heart.tsx @@ -15,7 +15,7 @@ import Heart_M from 'illustration:./S2_fill_heart_generic1_96.svg'; import Heart_S from 'illustration:./S2_fill_heart_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Heart(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/HelpCircle.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/HelpCircle.tsx index 6577ed325c2..338c3b0cdd6 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/HelpCircle.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/HelpCircle.tsx @@ -15,7 +15,7 @@ import HelpCircle_M from 'illustration:./S2_fill_helpCircle_generic1_96.svg'; import HelpCircle_S from 'illustration:./S2_fill_helpCircle_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function HelpCircle(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Home.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Home.tsx index e21952842af..e4302e3060d 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Home.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Home.tsx @@ -15,7 +15,7 @@ import Home_M from 'illustration:./S2_fill_home_generic1_96.svg'; import Home_S from 'illustration:./S2_fill_home_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Home(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Illustration.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Illustration.tsx index f6ba6a1d6f4..bb4fe970667 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Illustration.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Illustration.tsx @@ -15,7 +15,7 @@ import Illustration_M from 'illustration:./S2_fill_illustration_generic1_96.svg' import Illustration_S from 'illustration:./S2_fill_illustration_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Illustration(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Image.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Image.tsx index dcf71ddac6d..4a8cbcdf6dd 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Image.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Image.tsx @@ -15,7 +15,7 @@ import Image_M from 'illustration:./S2_fill_image_generic1_96.svg'; import Image_S from 'illustration:./S2_fill_image_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Image(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ImageStack.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ImageStack.tsx index 7c2fdfcb981..3dcdcc1804c 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ImageStack.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ImageStack.tsx @@ -15,7 +15,7 @@ import ImageStack_M from 'illustration:./S2_fill_imageStack_generic1_96.svg'; import ImageStack_S from 'illustration:./S2_fill_imageStack_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function ImageStack(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/InfiniteLooping.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/InfiniteLooping.tsx index 333b57f85df..25ac3dbb148 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/InfiniteLooping.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/InfiniteLooping.tsx @@ -15,7 +15,7 @@ import InfiniteLooping_M from 'illustration:./S2_fill_infiniteLooping_generic1_9 import InfiniteLooping_S from 'illustration:./S2_fill_infiniteLooping_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function InfiniteLooping(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Information.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Information.tsx index 80b772e7b56..9759f35402a 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Information.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Information.tsx @@ -15,7 +15,7 @@ import Information_M from 'illustration:./S2_fill_information_generic1_96.svg'; import Information_S from 'illustration:./S2_fill_information_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Information(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Interaction.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Interaction.tsx index 25e194f6598..c4de3eaae8b 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Interaction.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Interaction.tsx @@ -15,7 +15,7 @@ import Interaction_M from 'illustration:./S2_fill_interaction_generic1_96.svg'; import Interaction_S from 'illustration:./S2_fill_interaction_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Interaction(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Laptop.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Laptop.tsx index 54d77dda9a0..8d0cb99e5cc 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Laptop.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Laptop.tsx @@ -15,7 +15,7 @@ import Laptop_M from 'illustration:./S2_fill_laptop_generic1_96.svg'; import Laptop_S from 'illustration:./S2_fill_laptop_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Laptop(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Layers.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Layers.tsx index 8877e50930b..3a4aed5de0f 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Layers.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Layers.tsx @@ -15,7 +15,7 @@ import Layers_M from 'illustration:./S2_fill_layers_generic1_96.svg'; import Layers_S from 'illustration:./S2_fill_layers_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Layers(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Libraries.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Libraries.tsx index 2b8215f97e6..a8bb991d10e 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Libraries.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Libraries.tsx @@ -15,7 +15,7 @@ import Libraries_M from 'illustration:./S2_fill_libraries_generic1_96.svg'; import Libraries_S from 'illustration:./S2_fill_libraries_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Libraries(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Lightbulb.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Lightbulb.tsx index ef0bd68e958..1ba6ab56bc8 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Lightbulb.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Lightbulb.tsx @@ -15,7 +15,7 @@ import Lightbulb_M from 'illustration:./S2_fill_lightbulb_generic1_96.svg'; import Lightbulb_S from 'illustration:./S2_fill_lightbulb_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Lightbulb(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/LightbulbRays.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/LightbulbRays.tsx index dc1e002f9cc..9d1aee22e8f 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/LightbulbRays.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/LightbulbRays.tsx @@ -15,7 +15,7 @@ import LightbulbRays_M from 'illustration:./S2_fill_lightbulbRays_generic1_96.sv import LightbulbRays_S from 'illustration:./S2_fill_lightbulbRays_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function LightbulbRays(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Lighten.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Lighten.tsx index 16199580b13..80f526b1883 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Lighten.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Lighten.tsx @@ -15,7 +15,7 @@ import Lighten_M from 'illustration:./S2_fill_lighten_generic1_96.svg'; import Lighten_S from 'illustration:./S2_fill_lighten_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Lighten(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Link.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Link.tsx index 8a9d8ffc189..23180101c51 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Link.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Link.tsx @@ -15,7 +15,7 @@ import Link_M from 'illustration:./S2_fill_link_generic1_96.svg'; import Link_S from 'illustration:./S2_fill_link_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Link(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Location.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Location.tsx index 55013c60098..662238bd6b4 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Location.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Location.tsx @@ -15,7 +15,7 @@ import Location_M from 'illustration:./S2_fill_location_generic1_96.svg'; import Location_S from 'illustration:./S2_fill_location_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Location(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/LockClose.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/LockClose.tsx index eb9b02d5ef7..b78c8a34343 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/LockClose.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/LockClose.tsx @@ -15,7 +15,7 @@ import LockClose_M from 'illustration:./S2_fill_lockClose_generic1_96.svg'; import LockClose_S from 'illustration:./S2_fill_lockClose_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function LockClose(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/LockOpen.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/LockOpen.tsx index 02879d4e7b7..a170d8f1a83 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/LockOpen.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/LockOpen.tsx @@ -15,7 +15,7 @@ import LockOpen_M from 'illustration:./S2_fill_lockOpen_generic1_96.svg'; import LockOpen_S from 'illustration:./S2_fill_lockOpen_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function LockOpen(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Logo.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Logo.tsx index 2c418eef85b..aabf7ee9619 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Logo.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Logo.tsx @@ -15,7 +15,7 @@ import Logo_M from 'illustration:./S2_fill_logo_generic1_96.svg'; import Logo_S from 'illustration:./S2_fill_logo_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Logo(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MagicWand.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MagicWand.tsx index 71edd138d4c..f4f3a41bb51 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MagicWand.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MagicWand.tsx @@ -15,7 +15,7 @@ import MagicWand_M from 'illustration:./S2_fill_magicWand_generic1_96.svg'; import MagicWand_S from 'illustration:./S2_fill_magicWand_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function MagicWand(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MailClose.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MailClose.tsx index e9580af523d..31f749cd5fa 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MailClose.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MailClose.tsx @@ -15,7 +15,7 @@ import MailClose_M from 'illustration:./S2_fill_mailClose_generic1_96.svg'; import MailClose_S from 'illustration:./S2_fill_mailClose_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function MailClose(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MailOpen.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MailOpen.tsx index dc7a820e854..ec349c6764d 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MailOpen.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MailOpen.tsx @@ -15,7 +15,7 @@ import MailOpen_M from 'illustration:./S2_fill_mailOpen_generic1_96.svg'; import MailOpen_S from 'illustration:./S2_fill_mailOpen_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function MailOpen(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Market.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Market.tsx index 01d6c5297d6..4078e2f6675 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Market.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Market.tsx @@ -15,7 +15,7 @@ import Market_M from 'illustration:./S2_fill_market_generic1_96.svg'; import Market_S from 'illustration:./S2_fill_market_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Market(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MegaphonePromote.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MegaphonePromote.tsx index 76df6ffb9d9..27e31ca651d 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MegaphonePromote.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MegaphonePromote.tsx @@ -15,7 +15,7 @@ import MegaphonePromote_M from 'illustration:./S2_fill_megaphonePromote_generic1 import MegaphonePromote_S from 'illustration:./S2_fill_megaphonePromote_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function MegaphonePromote(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MegaphonePromote2.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MegaphonePromote2.tsx index 04b23a577c8..60430a44357 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MegaphonePromote2.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MegaphonePromote2.tsx @@ -15,7 +15,7 @@ import MegaphonePromote2_M from 'illustration:./S2_fill_megaphonePromote2_generi import MegaphonePromote2_S from 'illustration:./S2_fill_megaphonePromote2_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function MegaphonePromote2(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Mention.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Mention.tsx index 0c1b94cda70..e4f9e907b69 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Mention.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Mention.tsx @@ -15,7 +15,7 @@ import Mention_M from 'illustration:./S2_fill_mention_generic1_96.svg'; import Mention_S from 'illustration:./S2_fill_mention_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Mention(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Microphone.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Microphone.tsx index 1c4d00b0db8..48fed10d556 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Microphone.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Microphone.tsx @@ -15,7 +15,7 @@ import Microphone_M from 'illustration:./S2_fill_microphone_generic1_96.svg'; import Microphone_S from 'illustration:./S2_fill_microphone_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Microphone(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Minimize.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Minimize.tsx index 04123c4a9b7..3bfde0eefc8 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Minimize.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Minimize.tsx @@ -15,7 +15,7 @@ import Minimize_M from 'illustration:./S2_fill_minimize_generic1_96.svg'; import Minimize_S from 'illustration:./S2_fill_minimize_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Minimize(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MovieCamera.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MovieCamera.tsx index 443b7dea5e9..619e31ae313 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MovieCamera.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MovieCamera.tsx @@ -15,7 +15,7 @@ import MovieCamera_M from 'illustration:./S2_fill_movieCamera_generic1_96.svg'; import MovieCamera_S from 'illustration:./S2_fill_movieCamera_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function MovieCamera(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MusicNote.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MusicNote.tsx index f32a3697024..eb32f96b770 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MusicNote.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MusicNote.tsx @@ -15,7 +15,7 @@ import MusicNote_M from 'illustration:./S2_fill_musicNote_generic1_96.svg'; import MusicNote_S from 'illustration:./S2_fill_musicNote_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function MusicNote(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/NoElements.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/NoElements.tsx index 0a7ef847aac..aa02562e41c 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/NoElements.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/NoElements.tsx @@ -15,7 +15,7 @@ import NoElements_M from 'illustration:./S2_fill_noElements_generic1_96.svg'; import NoElements_S from 'illustration:./S2_fill_noElements_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function NoElements(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Paperairplane.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Paperairplane.tsx index fdd07fee7e6..3791b81c73a 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Paperairplane.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Paperairplane.tsx @@ -15,7 +15,7 @@ import Paperairplane_M from 'illustration:./S2_fill_paperairplane_generic1_96.sv import Paperairplane_S from 'illustration:./S2_fill_paperairplane_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Paperairplane(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Paperclip.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Paperclip.tsx index 6bcaa2174c0..18a40209d4f 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Paperclip.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Paperclip.tsx @@ -15,7 +15,7 @@ import Paperclip_M from 'illustration:./S2_fill_paperclip_generic1_96.svg'; import Paperclip_S from 'illustration:./S2_fill_paperclip_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Paperclip(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Pause.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Pause.tsx index c9f6fdcbb6e..f12c1acb425 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Pause.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Pause.tsx @@ -15,7 +15,7 @@ import Pause_M from 'illustration:./S2_fill_pause_generic1_96.svg'; import Pause_S from 'illustration:./S2_fill_pause_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Pause(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Pencil.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Pencil.tsx index 281f6d72047..32bf54c0226 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Pencil.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Pencil.tsx @@ -15,7 +15,7 @@ import Pencil_M from 'illustration:./S2_fill_pencil_generic1_96.svg'; import Pencil_S from 'illustration:./S2_fill_pencil_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Pencil(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Phone.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Phone.tsx index 6f00bb4c27c..f8c02905524 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Phone.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Phone.tsx @@ -15,7 +15,7 @@ import Phone_M from 'illustration:./S2_fill_phone_generic1_96.svg'; import Phone_S from 'illustration:./S2_fill_phone_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Phone(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/PieChart.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/PieChart.tsx index 3d5d9757f97..03bae85b079 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/PieChart.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/PieChart.tsx @@ -15,7 +15,7 @@ import PieChart_M from 'illustration:./S2_fill_pieChart_generic1_96.svg'; import PieChart_S from 'illustration:./S2_fill_pieChart_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function PieChart(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/PiggyBank.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/PiggyBank.tsx index f50cdd0c79b..d6067c5e87a 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/PiggyBank.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/PiggyBank.tsx @@ -15,7 +15,7 @@ import PiggyBank_M from 'illustration:./S2_fill_piggyBank_generic1_96.svg'; import PiggyBank_S from 'illustration:./S2_fill_piggyBank_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function PiggyBank(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Pin.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Pin.tsx index fd3688b767c..8e7b0fcedd6 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Pin.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Pin.tsx @@ -15,7 +15,7 @@ import Pin_M from 'illustration:./S2_fill_pin_generic1_96.svg'; import Pin_S from 'illustration:./S2_fill_pin_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Pin(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Play.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Play.tsx index bc93c1231c1..8339b8bee0b 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Play.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Play.tsx @@ -15,7 +15,7 @@ import Play_M from 'illustration:./S2_fill_play_generic1_96.svg'; import Play_S from 'illustration:./S2_fill_play_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Play(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/PlayTriangle.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/PlayTriangle.tsx index 80ef01dcec9..698f835d562 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/PlayTriangle.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/PlayTriangle.tsx @@ -15,7 +15,7 @@ import PlayTriangle_M from 'illustration:./S2_fill_playTriangle_generic1_96.svg' import PlayTriangle_S from 'illustration:./S2_fill_playTriangle_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function PlayTriangle(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Plugin.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Plugin.tsx index f14ed94f5f6..8d576849042 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Plugin.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Plugin.tsx @@ -15,7 +15,7 @@ import Plugin_M from 'illustration:./S2_fill_plugin_generic1_96.svg'; import Plugin_S from 'illustration:./S2_fill_plugin_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Plugin(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Prompt.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Prompt.tsx index b638065b86f..fb7c48bdd95 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Prompt.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Prompt.tsx @@ -15,7 +15,7 @@ import Prompt_M from 'illustration:./S2_fill_prompt_generic1_96.svg'; import Prompt_S from 'illustration:./S2_fill_prompt_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Prompt(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Properties.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Properties.tsx index a8ab5bbc8aa..104f6ea7340 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Properties.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Properties.tsx @@ -15,7 +15,7 @@ import Properties_M from 'illustration:./S2_fill_properties_generic1_96.svg'; import Properties_S from 'illustration:./S2_fill_properties_generic1_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Properties(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Redo.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Redo.tsx index 791e4d9d87b..ceeda0f8dae 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Redo.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Redo.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Redo_L from 'illustration:./S2_fill_redo_generic1_160.svg'; import Redo_M from 'illustration:./S2_fill_redo_generic1_96.svg'; import Redo_S from 'illustration:./S2_fill_redo_generic1_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Redo(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Remix.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Remix.tsx index 99a8ed34b9b..02e30ae60d0 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Remix.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Remix.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Remix_L from 'illustration:./S2_fill_remix_generic1_160.svg'; import Remix_M from 'illustration:./S2_fill_remix_generic1_96.svg'; import Remix_S from 'illustration:./S2_fill_remix_generic1_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Remix(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Replace.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Replace.tsx index f450458d518..4e8cc51c2a1 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Replace.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Replace.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Replace_L from 'illustration:./S2_fill_replace_generic1_160.svg'; import Replace_M from 'illustration:./S2_fill_replace_generic1_96.svg'; import Replace_S from 'illustration:./S2_fill_replace_generic1_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Replace(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Revert.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Revert.tsx index 66697c7443a..2263f388afb 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Revert.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Revert.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Revert_L from 'illustration:./S2_fill_revert_generic1_160.svg'; import Revert_M from 'illustration:./S2_fill_revert_generic1_96.svg'; import Revert_S from 'illustration:./S2_fill_revert_generic1_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Revert(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Ribbon.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Ribbon.tsx index a9d97e6bdf0..4002932e430 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Ribbon.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Ribbon.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Ribbon_L from 'illustration:./S2_fill_ribbon_generic1_160.svg'; import Ribbon_M from 'illustration:./S2_fill_ribbon_generic1_96.svg'; import Ribbon_S from 'illustration:./S2_fill_ribbon_generic1_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Ribbon(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Rocket.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Rocket.tsx index 75ab3566299..083326280f2 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Rocket.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Rocket.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Rocket_L from 'illustration:./S2_fill_rocket_generic1_160.svg'; import Rocket_M from 'illustration:./S2_fill_rocket_generic1_96.svg'; import Rocket_S from 'illustration:./S2_fill_rocket_generic1_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Rocket(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/RotateCCW.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/RotateCCW.tsx index a0a7b0a2b8c..ffdcb4ecb07 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/RotateCCW.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/RotateCCW.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import RotateCCW_L from 'illustration:./S2_fill_rotateCCW_generic1_160.svg'; import RotateCCW_M from 'illustration:./S2_fill_rotateCCW_generic1_96.svg'; import RotateCCW_S from 'illustration:./S2_fill_rotateCCW_generic1_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function RotateCCW(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/RotateCW.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/RotateCW.tsx index b9e2fdbd80e..a42c04834c6 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/RotateCW.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/RotateCW.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import RotateCW_L from 'illustration:./S2_fill_rotateCW_generic1_160.svg'; import RotateCW_M from 'illustration:./S2_fill_rotateCW_generic1_96.svg'; import RotateCW_S from 'illustration:./S2_fill_rotateCW_generic1_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function RotateCW(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Ruler.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Ruler.tsx index 223baa9077d..8cbcaf05585 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Ruler.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Ruler.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Ruler_L from 'illustration:./S2_fill_ruler_generic1_160.svg'; import Ruler_M from 'illustration:./S2_fill_ruler_generic1_96.svg'; import Ruler_S from 'illustration:./S2_fill_ruler_generic1_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Ruler(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Search.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Search.tsx index 51a916e386e..0cc440cb591 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Search.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Search.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Search_L from 'illustration:./S2_fill_search_generic1_160.svg'; import Search_M from 'illustration:./S2_fill_search_generic1_96.svg'; import Search_S from 'illustration:./S2_fill_search_generic1_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Search(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Segmentation.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Segmentation.tsx index b7b62ceca1f..c279eb923d6 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Segmentation.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Segmentation.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Segmentation_L from 'illustration:./S2_fill_segmentation_generic1_160.svg'; import Segmentation_M from 'illustration:./S2_fill_segmentation_generic1_96.svg'; import Segmentation_S from 'illustration:./S2_fill_segmentation_generic1_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Segmentation(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Server.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Server.tsx index 66051a40c8d..f9a2e66433c 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Server.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Server.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Server_L from 'illustration:./S2_fill_server_generic1_160.svg'; import Server_M from 'illustration:./S2_fill_server_generic1_96.svg'; import Server_S from 'illustration:./S2_fill_server_generic1_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Server(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Shapes.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Shapes.tsx index 97aaf62bf54..3e7ee9523b2 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Shapes.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Shapes.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Shapes_L from 'illustration:./S2_fill_shapes_generic1_160.svg'; import Shapes_M from 'illustration:./S2_fill_shapes_generic1_96.svg'; import Shapes_S from 'illustration:./S2_fill_shapes_generic1_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Shapes(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ShoppingBag.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ShoppingBag.tsx index ce87f2c9cf4..50b991ea590 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ShoppingBag.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ShoppingBag.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import ShoppingBag_L from 'illustration:./S2_fill_shoppingBag_generic1_160.svg'; import ShoppingBag_M from 'illustration:./S2_fill_shoppingBag_generic1_96.svg'; import ShoppingBag_S from 'illustration:./S2_fill_shoppingBag_generic1_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function ShoppingBag(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ShoppingCart.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ShoppingCart.tsx index e722b4e830b..3b780736610 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ShoppingCart.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ShoppingCart.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import ShoppingCart_L from 'illustration:./S2_fill_shoppingCart_generic1_160.svg'; import ShoppingCart_M from 'illustration:./S2_fill_shoppingCart_generic1_96.svg'; import ShoppingCart_S from 'illustration:./S2_fill_shoppingCart_generic1_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function ShoppingCart(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Sparkles.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Sparkles.tsx index 0f89a1647fa..d399c38780f 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Sparkles.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Sparkles.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Sparkles_L from 'illustration:./S2_fill_sparkles_generic1_160.svg'; import Sparkles_M from 'illustration:./S2_fill_sparkles_generic1_96.svg'; import Sparkles_S from 'illustration:./S2_fill_sparkles_generic1_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Sparkles(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/SpeedFast.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/SpeedFast.tsx index a3d726fb61a..47df89491cb 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/SpeedFast.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/SpeedFast.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import SpeedFast_L from 'illustration:./S2_fill_speedFast_generic1_160.svg'; import SpeedFast_M from 'illustration:./S2_fill_speedFast_generic1_96.svg'; import SpeedFast_S from 'illustration:./S2_fill_speedFast_generic1_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function SpeedFast(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/StampClone.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/StampClone.tsx index 7caab5e2f6a..91006d7c286 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/StampClone.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/StampClone.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import StampClone_L from 'illustration:./S2_fill_stampClone_generic1_160.svg'; import StampClone_M from 'illustration:./S2_fill_stampClone_generic1_96.svg'; import StampClone_S from 'illustration:./S2_fill_stampClone_generic1_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function StampClone(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Star.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Star.tsx index 7f0b587f6d2..c5c85004b6b 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Star.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Star.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Star_L from 'illustration:./S2_fill_star_generic1_160.svg'; import Star_M from 'illustration:./S2_fill_star_generic1_96.svg'; import Star_S from 'illustration:./S2_fill_star_generic1_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Star(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/StepForward.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/StepForward.tsx index 7126c78edef..6aa7a1e6e2a 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/StepForward.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/StepForward.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import StepForward_L from 'illustration:./S2_fill_stepForward_generic1_160.svg'; import StepForward_M from 'illustration:./S2_fill_stepForward_generic1_96.svg'; import StepForward_S from 'illustration:./S2_fill_stepForward_generic1_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function StepForward(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Switch.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Switch.tsx index 4cfb2abe0d3..ff798cd3e7b 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Switch.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Switch.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Switch_L from 'illustration:./S2_fill_switch_generic1_160.svg'; import Switch_M from 'illustration:./S2_fill_switch_generic1_96.svg'; import Switch_S from 'illustration:./S2_fill_switch_generic1_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Switch(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Tablet.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Tablet.tsx index daa8940e064..1a06fbfe565 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Tablet.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Tablet.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Tablet_L from 'illustration:./S2_fill_tablet_generic1_160.svg'; import Tablet_M from 'illustration:./S2_fill_tablet_generic1_96.svg'; import Tablet_S from 'illustration:./S2_fill_tablet_generic1_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Tablet(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Tag.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Tag.tsx index ea97206e35f..d8d4127c1b0 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Tag.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Tag.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Tag_L from 'illustration:./S2_fill_tag_generic1_160.svg'; import Tag_M from 'illustration:./S2_fill_tag_generic1_96.svg'; import Tag_S from 'illustration:./S2_fill_tag_generic1_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Tag(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Targeted.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Targeted.tsx index 2016372978e..4b71d2b2f85 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Targeted.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Targeted.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Targeted_L from 'illustration:./S2_fill_targeted_generic1_160.svg'; import Targeted_M from 'illustration:./S2_fill_targeted_generic1_96.svg'; import Targeted_S from 'illustration:./S2_fill_targeted_generic1_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Targeted(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Text.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Text.tsx index b6ed8f433b0..c1f9e4e99f2 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Text.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Text.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Text_L from 'illustration:./S2_fill_text_generic1_160.svg'; import Text_M from 'illustration:./S2_fill_text_generic1_96.svg'; import Text_S from 'illustration:./S2_fill_text_generic1_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Text(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ThreeArrowsCircle.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ThreeArrowsCircle.tsx index 39dc8264371..679bf6eb9f0 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ThreeArrowsCircle.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ThreeArrowsCircle.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import ThreeArrowsCircle_L from 'illustration:./S2_fill_threeArrowsCircle_generic1_160.svg'; import ThreeArrowsCircle_M from 'illustration:./S2_fill_threeArrowsCircle_generic1_96.svg'; import ThreeArrowsCircle_S from 'illustration:./S2_fill_threeArrowsCircle_generic1_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function ThreeArrowsCircle(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ThumbsUp.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ThumbsUp.tsx index 6946c4e3e8b..4fb3958faae 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ThumbsUp.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ThumbsUp.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import ThumbsUp_L from 'illustration:./S2_fill_thumbsUp_generic1_160.svg'; import ThumbsUp_M from 'illustration:./S2_fill_thumbsUp_generic1_96.svg'; import ThumbsUp_S from 'illustration:./S2_fill_thumbsUp_generic1_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function ThumbsUp(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Transform.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Transform.tsx index ccfc9630a98..1861ecc08c8 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Transform.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Transform.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Transform_L from 'illustration:./S2_fill_transform_generic1_160.svg'; import Transform_M from 'illustration:./S2_fill_transform_generic1_96.svg'; import Transform_S from 'illustration:./S2_fill_transform_generic1_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Transform(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Translate.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Translate.tsx index 439b3853c93..4547f07a484 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Translate.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Translate.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Translate_L from 'illustration:./S2_fill_translate_generic1_160.svg'; import Translate_M from 'illustration:./S2_fill_translate_generic1_96.svg'; import Translate_S from 'illustration:./S2_fill_translate_generic1_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Translate(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Trash.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Trash.tsx index de3b9a4a188..4ce574de215 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Trash.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Trash.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Trash_L from 'illustration:./S2_fill_trash_generic1_160.svg'; import Trash_M from 'illustration:./S2_fill_trash_generic1_96.svg'; import Trash_S from 'illustration:./S2_fill_trash_generic1_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Trash(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Trophy.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Trophy.tsx index 3ba09471d0a..ce2c8bb8944 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Trophy.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Trophy.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Trophy_L from 'illustration:./S2_fill_trophy_generic1_160.svg'; import Trophy_M from 'illustration:./S2_fill_trophy_generic1_96.svg'; import Trophy_S from 'illustration:./S2_fill_trophy_generic1_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Trophy(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Update.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Update.tsx index f8f2c954d5f..fcea1768443 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Update.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Update.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Update_L from 'illustration:./S2_fill_update_generic1_160.svg'; import Update_M from 'illustration:./S2_fill_update_generic1_96.svg'; import Update_S from 'illustration:./S2_fill_update_generic1_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Update(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Upload.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Upload.tsx index 202b8d49b81..c2f986ddb5b 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Upload.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Upload.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Upload_L from 'illustration:./S2_fill_upload_generic1_160.svg'; import Upload_M from 'illustration:./S2_fill_upload_generic1_96.svg'; import Upload_S from 'illustration:./S2_fill_upload_generic1_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Upload(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/User.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/User.tsx index 27b0c4e8631..489ae47eb06 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/User.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/User.tsx @@ -12,7 +12,7 @@ 'use client'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; import User_L from 'illustration:./S2_fill_user_generic1_160.svg'; import User_M from 'illustration:./S2_fill_user_generic1_96.svg'; import User_S from 'illustration:./S2_fill_user_generic1_48.svg'; diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/UserAvatar.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/UserAvatar.tsx index 5619065a9d1..e99f866bae4 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/UserAvatar.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/UserAvatar.tsx @@ -12,7 +12,7 @@ 'use client'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; import UserAvatar_L from 'illustration:./S2_fill_userAvatar_generic1_160.svg'; import UserAvatar_M from 'illustration:./S2_fill_userAvatar_generic1_96.svg'; import UserAvatar_S from 'illustration:./S2_fill_userAvatar_generic1_48.svg'; diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/UserGroup.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/UserGroup.tsx index 3d194321897..f500673afe6 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/UserGroup.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/UserGroup.tsx @@ -12,7 +12,7 @@ 'use client'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; import UserGroup_L from 'illustration:./S2_fill_userGroup_generic1_160.svg'; import UserGroup_M from 'illustration:./S2_fill_userGroup_generic1_96.svg'; import UserGroup_S from 'illustration:./S2_fill_userGroup_generic1_48.svg'; diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/VectorDraw.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/VectorDraw.tsx index 7bdbfd84e03..40d818dc7b7 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/VectorDraw.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/VectorDraw.tsx @@ -12,7 +12,7 @@ 'use client'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; import VectorDraw_L from 'illustration:./S2_fill_vectorDraw_generic1_160.svg'; import VectorDraw_M from 'illustration:./S2_fill_vectorDraw_generic1_96.svg'; import VectorDraw_S from 'illustration:./S2_fill_vectorDraw_generic1_48.svg'; diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Video.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Video.tsx index 7e581a800f4..a125d00604f 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Video.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Video.tsx @@ -12,7 +12,7 @@ 'use client'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; import Video_L from 'illustration:./S2_fill_video_generic1_160.svg'; import Video_M from 'illustration:./S2_fill_video_generic1_96.svg'; import Video_S from 'illustration:./S2_fill_video_generic1_48.svg'; diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Volume.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Volume.tsx index de577df977f..5aeefb3943e 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Volume.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Volume.tsx @@ -12,7 +12,7 @@ 'use client'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; import Volume_L from 'illustration:./S2_fill_volume_generic1_160.svg'; import Volume_M from 'illustration:./S2_fill_volume_generic1_96.svg'; import Volume_S from 'illustration:./S2_fill_volume_generic1_48.svg'; diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/VolumeOne.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/VolumeOne.tsx index 2cd88572910..c18fadc7161 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/VolumeOne.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/VolumeOne.tsx @@ -12,7 +12,7 @@ 'use client'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; import VolumeOne_L from 'illustration:./S2_fill_volumeOne_generic1_160.svg'; import VolumeOne_M from 'illustration:./S2_fill_volumeOne_generic1_96.svg'; import VolumeOne_S from 'illustration:./S2_fill_volumeOne_generic1_48.svg'; diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Wallet.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Wallet.tsx index 0557af4e86b..9c6829aebdc 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Wallet.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Wallet.tsx @@ -12,7 +12,7 @@ 'use client'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; import Wallet_L from 'illustration:./S2_fill_wallet_generic1_160.svg'; import Wallet_M from 'illustration:./S2_fill_wallet_generic1_96.svg'; import Wallet_S from 'illustration:./S2_fill_wallet_generic1_48.svg'; diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/3D.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/3D.tsx index c00563e1700..1016cedca28 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/3D.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/3D.tsx @@ -15,7 +15,7 @@ import _3D_M from 'illustration:./S2_fill_3D_generic2_96.svg'; import _3D_S from 'illustration:./S2_fill_3D_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function _3D(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/3Dasset.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/3Dasset.tsx index b88ab9d74ed..54ec0beec80 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/3Dasset.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/3Dasset.tsx @@ -15,7 +15,7 @@ import _3Dasset_M from 'illustration:./S2_fill_3Dasset_generic2_96.svg'; import _3Dasset_S from 'illustration:./S2_fill_3Dasset_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function _3Dasset(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/AIGenerate.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/AIGenerate.tsx index 1d541254256..adb40516310 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/AIGenerate.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/AIGenerate.tsx @@ -15,7 +15,7 @@ import AIGenerate_M from 'illustration:./S2_fill_AIGenerate_generic2_96.svg'; import AIGenerate_S from 'illustration:./S2_fill_AIGenerate_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function AIGenerate(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/AIGenerateImage.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/AIGenerateImage.tsx index a16d8a42423..e96a708f8ff 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/AIGenerateImage.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/AIGenerateImage.tsx @@ -15,7 +15,7 @@ import AIGenerateImage_M from 'illustration:./S2_fill_AIGenerateImage_generic2_9 import AIGenerateImage_S from 'illustration:./S2_fill_AIGenerateImage_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function AIGenerateImage(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/AIchat.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/AIchat.tsx index 9ccf410d793..563866fe1b2 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/AIchat.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/AIchat.tsx @@ -15,7 +15,7 @@ import AIchat_M from 'illustration:./S2_fill_AIchat_generic2_96.svg'; import AIchat_S from 'illustration:./S2_fill_AIchat_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function AIchat(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Accessibility.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Accessibility.tsx index 18e67d5af4e..a8f798b493b 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Accessibility.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Accessibility.tsx @@ -15,7 +15,7 @@ import Accessibility_M from 'illustration:./S2_fill_accessibility_generic2_96.sv import Accessibility_S from 'illustration:./S2_fill_accessibility_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Accessibility(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Animation.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Animation.tsx index dc87a7fe82e..0df1a1f2494 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Animation.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Animation.tsx @@ -15,7 +15,7 @@ import Animation_M from 'illustration:./S2_fill_animation_generic2_96.svg'; import Animation_S from 'illustration:./S2_fill_animation_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Animation(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Apps.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Apps.tsx index 2c5633192c7..9fd981e1f31 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Apps.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Apps.tsx @@ -15,7 +15,7 @@ import Apps_M from 'illustration:./S2_fill_apps_generic2_96.svg'; import Apps_S from 'illustration:./S2_fill_apps_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Apps(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Artboard.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Artboard.tsx index b0575b5bc50..9a51e67ba94 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Artboard.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Artboard.tsx @@ -15,7 +15,7 @@ import Artboard_M from 'illustration:./S2_fill_artboard_generic2_96.svg'; import Artboard_S from 'illustration:./S2_fill_artboard_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Artboard(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Assets.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Assets.tsx index d9a3266a42e..c34293212b5 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Assets.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Assets.tsx @@ -15,7 +15,7 @@ import Assets_M from 'illustration:./S2_fill_assets_generic2_96.svg'; import Assets_S from 'illustration:./S2_fill_assets_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Assets(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/AudioWave.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/AudioWave.tsx index d70221d1984..49919bd6b6e 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/AudioWave.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/AudioWave.tsx @@ -15,7 +15,7 @@ import AudioWave_M from 'illustration:./S2_fill_audioWave_generic2_96.svg'; import AudioWave_S from 'illustration:./S2_fill_audioWave_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function AudioWave(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/BadgeVerified.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/BadgeVerified.tsx index 7296a273499..54c535b2ec7 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/BadgeVerified.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/BadgeVerified.tsx @@ -15,7 +15,7 @@ import BadgeVerified_M from 'illustration:./S2_fill_badgeVerified_generic2_96.sv import BadgeVerified_S from 'illustration:./S2_fill_badgeVerified_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function BadgeVerified(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Bell.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Bell.tsx index 8d4d80a7be4..fb257ac49b8 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Bell.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Bell.tsx @@ -15,7 +15,7 @@ import Bell_M from 'illustration:./S2_fill_bell_generic2_96.svg'; import Bell_S from 'illustration:./S2_fill_bell_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Bell(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Bolt.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Bolt.tsx index 8d747ce407c..c5726badd97 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Bolt.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Bolt.tsx @@ -15,7 +15,7 @@ import Bolt_M from 'illustration:./S2_fill_bolt_generic2_96.svg'; import Bolt_S from 'illustration:./S2_fill_bolt_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Bolt(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Brand.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Brand.tsx index efa8be1f3c1..601d57b602f 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Brand.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Brand.tsx @@ -15,7 +15,7 @@ import Brand_M from 'illustration:./S2_fill_brand_generic2_96.svg'; import Brand_S from 'illustration:./S2_fill_brand_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Brand(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Briefcase.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Briefcase.tsx index c82643ff18a..26abcbf8e6e 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Briefcase.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Briefcase.tsx @@ -15,7 +15,7 @@ import Briefcase_M from 'illustration:./S2_fill_briefcase_generic2_96.svg'; import Briefcase_S from 'illustration:./S2_fill_briefcase_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Briefcase(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/BrightnessContrast.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/BrightnessContrast.tsx index 52cc2a908b2..2f9b0a037cc 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/BrightnessContrast.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/BrightnessContrast.tsx @@ -15,7 +15,7 @@ import BrightnessContrast_M from 'illustration:./S2_fill_brightnessContrast_gene import BrightnessContrast_S from 'illustration:./S2_fill_brightnessContrast_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function BrightnessContrast(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Browser.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Browser.tsx index 4cb0b1a3069..d71deb2fad2 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Browser.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Browser.tsx @@ -15,7 +15,7 @@ import Browser_M from 'illustration:./S2_fill_browser_generic2_96.svg'; import Browser_S from 'illustration:./S2_fill_browser_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Browser(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Brush.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Brush.tsx index 597786e3417..d06f2038eb7 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Brush.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Brush.tsx @@ -15,7 +15,7 @@ import Brush_M from 'illustration:./S2_fill_brush_generic2_96.svg'; import Brush_S from 'illustration:./S2_fill_brush_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Brush(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/BuildTable.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/BuildTable.tsx index 81d4c50b535..f341c47353f 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/BuildTable.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/BuildTable.tsx @@ -15,7 +15,7 @@ import BuildTable_M from 'illustration:./S2_fill_buildTable_generic2_96.svg'; import BuildTable_S from 'illustration:./S2_fill_buildTable_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function BuildTable(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Buildings.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Buildings.tsx index 0bc1365d137..c5aeac6a121 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Buildings.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Buildings.tsx @@ -15,7 +15,7 @@ import Buildings_M from 'illustration:./S2_fill_buildings_generic2_96.svg'; import Buildings_S from 'illustration:./S2_fill_buildings_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Buildings(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Calendar.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Calendar.tsx index 42189654747..feb5ce5af5b 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Calendar.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Calendar.tsx @@ -15,7 +15,7 @@ import Calendar_M from 'illustration:./S2_fill_calendar_generic2_96.svg'; import Calendar_S from 'illustration:./S2_fill_calendar_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Calendar(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Camera.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Camera.tsx index d4a05b8231a..13a987f329e 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Camera.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Camera.tsx @@ -15,7 +15,7 @@ import Camera_M from 'illustration:./S2_fill_camera_generic2_96.svg'; import Camera_S from 'illustration:./S2_fill_camera_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Camera(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/CardTapPayment.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/CardTapPayment.tsx index 94b05443ec8..810b0beae0a 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/CardTapPayment.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/CardTapPayment.tsx @@ -15,7 +15,7 @@ import CardTapPayment_M from 'illustration:./S2_fill_cardTapPayment_generic2_96. import CardTapPayment_S from 'illustration:./S2_fill_cardTapPayment_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function CardTapPayment(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Channel.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Channel.tsx index 13a4c13b4f0..15ae0c5051e 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Channel.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Channel.tsx @@ -15,7 +15,7 @@ import Channel_M from 'illustration:./S2_fill_channel_generic2_96.svg'; import Channel_S from 'illustration:./S2_fill_channel_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Channel(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ChartAreaStack.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ChartAreaStack.tsx index a4d5c6feb03..38ad715b164 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ChartAreaStack.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ChartAreaStack.tsx @@ -15,7 +15,7 @@ import ChartAreaStack_M from 'illustration:./S2_fill_chartAreaStack_generic2_96. import ChartAreaStack_S from 'illustration:./S2_fill_chartAreaStack_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function ChartAreaStack(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Chatbubble.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Chatbubble.tsx index cec5c56bd39..88e7527188a 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Chatbubble.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Chatbubble.tsx @@ -15,7 +15,7 @@ import Chatbubble_M from 'illustration:./S2_fill_chatbubble_generic2_96.svg'; import Chatbubble_S from 'illustration:./S2_fill_chatbubble_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Chatbubble(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Checkmark.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Checkmark.tsx index bb249eacdb6..18ceb373da7 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Checkmark.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Checkmark.tsx @@ -15,7 +15,7 @@ import Checkmark_M from 'illustration:./S2_fill_checkmark_generic2_96.svg'; import Checkmark_S from 'illustration:./S2_fill_checkmark_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Checkmark(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Clipboard.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Clipboard.tsx index bd33ae096e4..73926018756 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Clipboard.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Clipboard.tsx @@ -15,7 +15,7 @@ import Clipboard_M from 'illustration:./S2_fill_clipboard_generic2_96.svg'; import Clipboard_S from 'illustration:./S2_fill_clipboard_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Clipboard(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Clock.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Clock.tsx index b48d9ae3511..8e45f78ae5b 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Clock.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Clock.tsx @@ -15,7 +15,7 @@ import Clock_M from 'illustration:./S2_fill_clock_generic2_96.svg'; import Clock_S from 'illustration:./S2_fill_clock_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Clock(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Cloud.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Cloud.tsx index 31ac5242f5c..94b0712a651 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Cloud.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Cloud.tsx @@ -15,7 +15,7 @@ import Cloud_M from 'illustration:./S2_fill_cloud_generic2_96.svg'; import Cloud_S from 'illustration:./S2_fill_cloud_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Cloud(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/CloudUpload.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/CloudUpload.tsx index 3cd96e2c4b6..753eb01ca42 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/CloudUpload.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/CloudUpload.tsx @@ -15,7 +15,7 @@ import CloudUpload_M from 'illustration:./S2_fill_cloudUpload_generic2_96.svg'; import CloudUpload_S from 'illustration:./S2_fill_cloudUpload_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function CloudUpload(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/CodeBrackets.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/CodeBrackets.tsx index de188f2fc92..66600219fb7 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/CodeBrackets.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/CodeBrackets.tsx @@ -15,7 +15,7 @@ import CodeBrackets_M from 'illustration:./S2_fill_CodeBrackets_generic2_96.svg' import CodeBrackets_S from 'illustration:./S2_fill_CodeBrackets_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function CodeBrackets(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Color.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Color.tsx index fad39cfbc49..33d26b3753e 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Color.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Color.tsx @@ -15,7 +15,7 @@ import Color_M from 'illustration:./S2_fill_color_generic2_96.svg'; import Color_S from 'illustration:./S2_fill_color_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Color(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/CommentText.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/CommentText.tsx index 9cec59bf5d2..77f26bffb7a 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/CommentText.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/CommentText.tsx @@ -15,7 +15,7 @@ import CommentText_M from 'illustration:./S2_fill_commentText_generic2_96.svg'; import CommentText_S from 'illustration:./S2_fill_commentText_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function CommentText(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Confetti.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Confetti.tsx index 2a205ef30f5..cd182a2b92d 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Confetti.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Confetti.tsx @@ -15,7 +15,7 @@ import Confetti_M from 'illustration:./S2_fill_confetti_generic2_96.svg'; import Confetti_S from 'illustration:./S2_fill_confetti_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Confetti(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Conversationbubbles.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Conversationbubbles.tsx index d05b5652a5a..93bbc33df12 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Conversationbubbles.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Conversationbubbles.tsx @@ -15,7 +15,7 @@ import Conversationbubbles_M from 'illustration:./S2_fill_conversationbubbles_ge import Conversationbubbles_S from 'illustration:./S2_fill_conversationbubbles_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Conversationbubbles(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Crop.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Crop.tsx index 0683a84aa7c..c99cb4d7a93 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Crop.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Crop.tsx @@ -15,7 +15,7 @@ import Crop_M from 'illustration:./S2_fill_crop_generic2_96.svg'; import Crop_S from 'illustration:./S2_fill_crop_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Crop(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Cursor.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Cursor.tsx index c9fed46d99e..e77c9dd9415 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Cursor.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Cursor.tsx @@ -15,7 +15,7 @@ import Cursor_M from 'illustration:./S2_fill_cursor_generic2_96.svg'; import Cursor_S from 'illustration:./S2_fill_cursor_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Cursor(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Cut.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Cut.tsx index e2f09a33de6..9ab299c8b61 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Cut.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Cut.tsx @@ -15,7 +15,7 @@ import Cut_M from 'illustration:./S2_fill_cut_generic2_96.svg'; import Cut_S from 'illustration:./S2_fill_cut_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Cut(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Data.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Data.tsx index a6d4a22f625..f5a589d5a56 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Data.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Data.tsx @@ -15,7 +15,7 @@ import Data_M from 'illustration:./S2_fill_data_generic2_96.svg'; import Data_S from 'illustration:./S2_fill_data_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Data(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/DataAnalytics.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/DataAnalytics.tsx index b0b0db07977..d8dd51c1b36 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/DataAnalytics.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/DataAnalytics.tsx @@ -15,7 +15,7 @@ import DataAnalytics_M from 'illustration:./S2_fill_dataAnalytics_generic2_96.sv import DataAnalytics_S from 'illustration:./S2_fill_dataAnalytics_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function DataAnalytics(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Desktop.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Desktop.tsx index dcb3a6ae16a..6803f616e6e 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Desktop.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Desktop.tsx @@ -15,7 +15,7 @@ import Desktop_M from 'illustration:./S2_fill_desktop_generic2_96.svg'; import Desktop_S from 'illustration:./S2_fill_desktop_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Desktop(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Diamond.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Diamond.tsx index 3cb7500b1e5..cd74971ba7b 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Diamond.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Diamond.tsx @@ -15,7 +15,7 @@ import Diamond_M from 'illustration:./S2_fill_diamond_generic2_96.svg'; import Diamond_S from 'illustration:./S2_fill_diamond_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Diamond(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Document.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Document.tsx index 388c719ed10..4780d3c2c25 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Document.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Document.tsx @@ -15,7 +15,7 @@ import Document_M from 'illustration:./S2_fill_document_generic2_96.svg'; import Document_S from 'illustration:./S2_fill_document_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Document(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Download.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Download.tsx index 552fbe26ae1..1bcf4db34db 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Download.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Download.tsx @@ -15,7 +15,7 @@ import Download_M from 'illustration:./S2_fill_download_generic2_96.svg'; import Download_S from 'illustration:./S2_fill_download_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Download(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/DropToUpload.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/DropToUpload.tsx index 151b40449ca..91931cf4d77 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/DropToUpload.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/DropToUpload.tsx @@ -15,7 +15,7 @@ import DropToUpload_M from 'illustration:./S2_fill_dropToUpload_generic2_96.svg' import DropToUpload_S from 'illustration:./S2_fill_dropToUpload_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function DropToUpload(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Education.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Education.tsx index b3d28ac19f4..05d9468ba26 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Education.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Education.tsx @@ -15,7 +15,7 @@ import Education_M from 'illustration:./S2_fill_education_generic2_96.svg'; import Education_S from 'illustration:./S2_fill_education_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Education(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Effects.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Effects.tsx index 11d18732b2c..382ea88094d 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Effects.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Effects.tsx @@ -15,7 +15,7 @@ import Effects_M from 'illustration:./S2_fill_effects_generic2_96.svg'; import Effects_S from 'illustration:./S2_fill_effects_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Effects(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Emoji.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Emoji.tsx index 8b4fcba7f5c..1f16904d9cc 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Emoji.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Emoji.tsx @@ -15,7 +15,7 @@ import Emoji_M from 'illustration:./S2_fill_emoji_generic2_96.svg'; import Emoji_S from 'illustration:./S2_fill_emoji_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Emoji(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/EmptyStateExport.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/EmptyStateExport.tsx index 5e4ec81ecf1..7a2efe8d31a 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/EmptyStateExport.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/EmptyStateExport.tsx @@ -15,7 +15,7 @@ import EmptyStateExport_M from 'illustration:./S2_fill_EmptyStateExport_generic2 import EmptyStateExport_S from 'illustration:./S2_fill_EmptyStateExport_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function EmptyStateExport(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Explosion.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Explosion.tsx index 42f763f0cdd..8cf5e233b31 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Explosion.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Explosion.tsx @@ -15,7 +15,7 @@ import Explosion_M from 'illustration:./S2_fill_explosion_generic2_96.svg'; import Explosion_S from 'illustration:./S2_fill_explosion_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Explosion(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ExportTo.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ExportTo.tsx index 9f6a3050758..69f8696ec61 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ExportTo.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ExportTo.tsx @@ -15,7 +15,7 @@ import ExportTo_M from 'illustration:./S2_fill_exportTo_generic2_96.svg'; import ExportTo_S from 'illustration:./S2_fill_exportTo_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function ExportTo(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Exposure.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Exposure.tsx index a1e8de1fcc7..c152baa9acf 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Exposure.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Exposure.tsx @@ -15,7 +15,7 @@ import Exposure_M from 'illustration:./S2_fill_exposure_generic2_96.svg'; import Exposure_S from 'illustration:./S2_fill_exposure_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Exposure(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileImage.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileImage.tsx index 72ff599c59f..246e27bb982 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileImage.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileImage.tsx @@ -15,7 +15,7 @@ import FileImage_M from 'illustration:./S2_fill_fileImage_generic2_96.svg'; import FileImage_S from 'illustration:./S2_fill_fileImage_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function FileImage(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileShared.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileShared.tsx index aa470cca75e..71de084dbcc 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileShared.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileShared.tsx @@ -15,7 +15,7 @@ import FileShared_M from 'illustration:./S2_fill_fileShared_generic2_96.svg'; import FileShared_S from 'illustration:./S2_fill_fileShared_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function FileShared(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileText.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileText.tsx index e8e7c358e23..50f4430ad89 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileText.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileText.tsx @@ -15,7 +15,7 @@ import FileText_M from 'illustration:./S2_fill_fileText_generic2_96.svg'; import FileText_S from 'illustration:./S2_fill_fileText_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function FileText(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileVideo.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileVideo.tsx index ef6418d78de..e3d59f08e60 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileVideo.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileVideo.tsx @@ -15,7 +15,7 @@ import FileVideo_M from 'illustration:./S2_fill_fileVideo_generic2_96.svg'; import FileVideo_S from 'illustration:./S2_fill_fileVideo_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function FileVideo(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileZip.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileZip.tsx index ad4471e56dc..3b62f7489d0 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileZip.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileZip.tsx @@ -15,7 +15,7 @@ import FileZip_M from 'illustration:./S2_fill_fileZip_generic2_96.svg'; import FileZip_S from 'illustration:./S2_fill_fileZip_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function FileZip(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Filmstrip.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Filmstrip.tsx index 08f82bcb767..5da488311f8 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Filmstrip.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Filmstrip.tsx @@ -15,7 +15,7 @@ import Filmstrip_M from 'illustration:./S2_fill_filmstrip_generic2_96.svg'; import Filmstrip_S from 'illustration:./S2_fill_filmstrip_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Filmstrip(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Filter.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Filter.tsx index f9ff94968c8..30916e7652a 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Filter.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Filter.tsx @@ -15,7 +15,7 @@ import Filter_M from 'illustration:./S2_fill_filter_generic2_96.svg'; import Filter_S from 'illustration:./S2_fill_filter_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Filter(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Filters.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Filters.tsx index fbc457e9dd4..0453a8694d7 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Filters.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Filters.tsx @@ -15,7 +15,7 @@ import Filters_M from 'illustration:./S2_fill_filters_generic2_96.svg'; import Filters_S from 'illustration:./S2_fill_filters_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Filters(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Fireworks.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Fireworks.tsx index 8ddd298df84..da16d399215 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Fireworks.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Fireworks.tsx @@ -15,7 +15,7 @@ import Fireworks_M from 'illustration:./S2_fill_fireworks_generic2_96.svg'; import Fireworks_S from 'illustration:./S2_fill_fireworks_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Fireworks(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Flag.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Flag.tsx index 6b9fc869807..6737046a51a 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Flag.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Flag.tsx @@ -15,7 +15,7 @@ import Flag_M from 'illustration:./S2_fill_flag_generic2_96.svg'; import Flag_S from 'illustration:./S2_fill_flag_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Flag(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FlagCheckmark.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FlagCheckmark.tsx index 485dcb5a3ff..2779dd7ef51 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FlagCheckmark.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FlagCheckmark.tsx @@ -15,7 +15,7 @@ import FlagCheckmark_M from 'illustration:./S2_fill_flagCheckmark_generic2_96.sv import FlagCheckmark_S from 'illustration:./S2_fill_flagCheckmark_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function FlagCheckmark(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FlagCross.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FlagCross.tsx index ca0bab48b0e..500e9c83673 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FlagCross.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FlagCross.tsx @@ -15,7 +15,7 @@ import FlagCross_M from 'illustration:./S2_fill_flagCross_generic2_96.svg'; import FlagCross_S from 'illustration:./S2_fill_flagCross_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function FlagCross(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FolderClose.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FolderClose.tsx index 3d080496b6c..9b8b4f6ecb7 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FolderClose.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FolderClose.tsx @@ -15,7 +15,7 @@ import FolderClose_M from 'illustration:./S2_fill_folderClose_generic2_96.svg'; import FolderClose_S from 'illustration:./S2_fill_folderClose_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function FolderClose(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FolderOpen.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FolderOpen.tsx index db43efd843d..061941d9550 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FolderOpen.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FolderOpen.tsx @@ -15,7 +15,7 @@ import FolderOpen_M from 'illustration:./S2_fill_folderOpen_generic2_96.svg'; import FolderOpen_S from 'illustration:./S2_fill_folderOpen_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function FolderOpen(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FolderShared.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FolderShared.tsx index 545531f4733..c063cfb63e8 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FolderShared.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FolderShared.tsx @@ -15,7 +15,7 @@ import FolderShared_M from 'illustration:./S2_fill_folderShared_generic2_96.svg' import FolderShared_S from 'illustration:./S2_fill_folderShared_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function FolderShared(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/GearSetting.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/GearSetting.tsx index e372761ac2f..acdfc0ea99d 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/GearSetting.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/GearSetting.tsx @@ -15,7 +15,7 @@ import GearSetting_M from 'illustration:./S2_fill_gearSetting_generic2_96.svg'; import GearSetting_S from 'illustration:./S2_fill_gearSetting_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function GearSetting(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Gift.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Gift.tsx index 05784366b56..bd83694b6dc 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Gift.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Gift.tsx @@ -15,7 +15,7 @@ import Gift_M from 'illustration:./S2_fill_gift_generic2_96.svg'; import Gift_S from 'illustration:./S2_fill_gift_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Gift(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Globe.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Globe.tsx index 508b9e40749..1a367ab3f5e 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Globe.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Globe.tsx @@ -15,7 +15,7 @@ import Globe_M from 'illustration:./S2_fill_globe_generic2_96.svg'; import Globe_S from 'illustration:./S2_fill_globe_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Globe(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/GlobeGrid.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/GlobeGrid.tsx index 9ba8ef9bf63..29ca482cc4f 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/GlobeGrid.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/GlobeGrid.tsx @@ -15,7 +15,7 @@ import GlobeGrid_M from 'illustration:./S2_fill_globeGrid_generic2_96.svg'; import GlobeGrid_S from 'illustration:./S2_fill_globeGrid_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function GlobeGrid(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/GraphBarChart.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/GraphBarChart.tsx index 3df40e58ca1..b9e4017dcd9 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/GraphBarChart.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/GraphBarChart.tsx @@ -15,7 +15,7 @@ import GraphBarChart_M from 'illustration:./S2_fill_graphBarChart_generic2_96.sv import GraphBarChart_S from 'illustration:./S2_fill_graphBarChart_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function GraphBarChart(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Hand.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Hand.tsx index 1febc54125a..9aacb7f6690 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Hand.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Hand.tsx @@ -15,7 +15,7 @@ import Hand_M from 'illustration:./S2_fill_hand_generic2_96.svg'; import Hand_S from 'illustration:./S2_fill_hand_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Hand(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Handshake.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Handshake.tsx index a9fe494bd82..fa399cb6979 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Handshake.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Handshake.tsx @@ -15,7 +15,7 @@ import Handshake_M from 'illustration:./S2_fill_handshake_generic2_96.svg'; import Handshake_S from 'illustration:./S2_fill_handshake_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Handshake(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Heart.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Heart.tsx index a6a77ef61e1..8b0b137e776 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Heart.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Heart.tsx @@ -15,7 +15,7 @@ import Heart_M from 'illustration:./S2_fill_heart_generic2_96.svg'; import Heart_S from 'illustration:./S2_fill_heart_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Heart(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/HelpCircle.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/HelpCircle.tsx index 358185b9e7b..6513312c08c 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/HelpCircle.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/HelpCircle.tsx @@ -15,7 +15,7 @@ import HelpCircle_M from 'illustration:./S2_fill_helpCircle_generic2_96.svg'; import HelpCircle_S from 'illustration:./S2_fill_helpCircle_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function HelpCircle(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Home.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Home.tsx index 79fa1280da5..05e670c79fc 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Home.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Home.tsx @@ -15,7 +15,7 @@ import Home_M from 'illustration:./S2_fill_home_generic2_96.svg'; import Home_S from 'illustration:./S2_fill_home_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Home(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Illustration.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Illustration.tsx index d202b6f98c0..afa30705da9 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Illustration.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Illustration.tsx @@ -15,7 +15,7 @@ import Illustration_M from 'illustration:./S2_fill_illustration_generic2_96.svg' import Illustration_S from 'illustration:./S2_fill_illustration_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Illustration(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Image.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Image.tsx index d0782e7c71c..50a6d8ebb51 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Image.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Image.tsx @@ -15,7 +15,7 @@ import Image_M from 'illustration:./S2_fill_image_generic2_96.svg'; import Image_S from 'illustration:./S2_fill_image_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Image(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ImageStack.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ImageStack.tsx index fd13910b881..d2b1bd86a35 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ImageStack.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ImageStack.tsx @@ -15,7 +15,7 @@ import ImageStack_M from 'illustration:./S2_fill_imageStack_generic2_96.svg'; import ImageStack_S from 'illustration:./S2_fill_imageStack_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function ImageStack(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/InfiniteLooping.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/InfiniteLooping.tsx index fd9a39d79bf..d0ee2b69b93 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/InfiniteLooping.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/InfiniteLooping.tsx @@ -15,7 +15,7 @@ import InfiniteLooping_M from 'illustration:./S2_fill_infiniteLooping_generic2_9 import InfiniteLooping_S from 'illustration:./S2_fill_infiniteLooping_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function InfiniteLooping(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Information.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Information.tsx index 6992a37956f..c90c2160678 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Information.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Information.tsx @@ -15,7 +15,7 @@ import Information_M from 'illustration:./S2_fill_information_generic2_96.svg'; import Information_S from 'illustration:./S2_fill_information_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Information(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Interaction.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Interaction.tsx index d197f08d701..0d9317a7191 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Interaction.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Interaction.tsx @@ -15,7 +15,7 @@ import Interaction_M from 'illustration:./S2_fill_interaction_generic2_96.svg'; import Interaction_S from 'illustration:./S2_fill_interaction_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Interaction(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Laptop.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Laptop.tsx index ff19bb7a6df..186383cc586 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Laptop.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Laptop.tsx @@ -15,7 +15,7 @@ import Laptop_M from 'illustration:./S2_fill_laptop_generic2_96.svg'; import Laptop_S from 'illustration:./S2_fill_laptop_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Laptop(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Layers.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Layers.tsx index a29c22266fa..fa8520f5ced 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Layers.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Layers.tsx @@ -15,7 +15,7 @@ import Layers_M from 'illustration:./S2_fill_layers_generic2_96.svg'; import Layers_S from 'illustration:./S2_fill_layers_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Layers(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Libraries.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Libraries.tsx index a9a4077bc32..f0144f96482 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Libraries.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Libraries.tsx @@ -15,7 +15,7 @@ import Libraries_M from 'illustration:./S2_fill_libraries_generic2_96.svg'; import Libraries_S from 'illustration:./S2_fill_libraries_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Libraries(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Lightbulb.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Lightbulb.tsx index 52f89d041a2..db12af2ef48 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Lightbulb.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Lightbulb.tsx @@ -15,7 +15,7 @@ import Lightbulb_M from 'illustration:./S2_fill_lightbulb_generic2_96.svg'; import Lightbulb_S from 'illustration:./S2_fill_lightbulb_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Lightbulb(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/LightbulbRays.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/LightbulbRays.tsx index 44b410635d0..ac741e018c1 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/LightbulbRays.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/LightbulbRays.tsx @@ -15,7 +15,7 @@ import LightbulbRays_M from 'illustration:./S2_fill_lightbulbRays_generic2_96.sv import LightbulbRays_S from 'illustration:./S2_fill_lightbulbRays_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function LightbulbRays(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Lighten.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Lighten.tsx index c1159fb5d40..2971528535d 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Lighten.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Lighten.tsx @@ -15,7 +15,7 @@ import Lighten_M from 'illustration:./S2_fill_lighten_generic2_96.svg'; import Lighten_S from 'illustration:./S2_fill_lighten_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Lighten(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Link.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Link.tsx index 54a695aec4a..0de72b9c736 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Link.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Link.tsx @@ -15,7 +15,7 @@ import Link_M from 'illustration:./S2_fill_link_generic2_96.svg'; import Link_S from 'illustration:./S2_fill_link_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Link(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Location.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Location.tsx index 4685bc2c3c1..37a2ee6800a 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Location.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Location.tsx @@ -15,7 +15,7 @@ import Location_M from 'illustration:./S2_fill_location_generic2_96.svg'; import Location_S from 'illustration:./S2_fill_location_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Location(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/LockClose.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/LockClose.tsx index 9b9f54681d2..bfebf7c828e 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/LockClose.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/LockClose.tsx @@ -15,7 +15,7 @@ import LockClose_M from 'illustration:./S2_fill_lockClose_generic2_96.svg'; import LockClose_S from 'illustration:./S2_fill_lockClose_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function LockClose(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/LockOpen.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/LockOpen.tsx index baf4cea77ba..60272ee100d 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/LockOpen.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/LockOpen.tsx @@ -15,7 +15,7 @@ import LockOpen_M from 'illustration:./S2_fill_lockOpen_generic2_96.svg'; import LockOpen_S from 'illustration:./S2_fill_lockOpen_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function LockOpen(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Logo.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Logo.tsx index ec1590621b9..037dcb58c3e 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Logo.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Logo.tsx @@ -15,7 +15,7 @@ import Logo_M from 'illustration:./S2_fill_logo_generic2_96.svg'; import Logo_S from 'illustration:./S2_fill_logo_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Logo(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MagicWand.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MagicWand.tsx index 81f5c7b5e62..7cca7d2ab24 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MagicWand.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MagicWand.tsx @@ -15,7 +15,7 @@ import MagicWand_M from 'illustration:./S2_fill_magicWand_generic2_96.svg'; import MagicWand_S from 'illustration:./S2_fill_magicWand_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function MagicWand(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MailClose.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MailClose.tsx index a796cac43b4..264d297a613 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MailClose.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MailClose.tsx @@ -15,7 +15,7 @@ import MailClose_M from 'illustration:./S2_fill_mailClose_generic2_96.svg'; import MailClose_S from 'illustration:./S2_fill_mailClose_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function MailClose(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MailOpen.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MailOpen.tsx index c24fc3730af..d19176b9c89 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MailOpen.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MailOpen.tsx @@ -15,7 +15,7 @@ import MailOpen_M from 'illustration:./S2_fill_mailOpen_generic2_96.svg'; import MailOpen_S from 'illustration:./S2_fill_mailOpen_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function MailOpen(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Market.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Market.tsx index 99a5d921524..f3a00bd533a 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Market.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Market.tsx @@ -15,7 +15,7 @@ import Market_M from 'illustration:./S2_fill_market_generic2_96.svg'; import Market_S from 'illustration:./S2_fill_market_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Market(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MegaphonePromote.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MegaphonePromote.tsx index a74e63efb39..c1f613d02f0 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MegaphonePromote.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MegaphonePromote.tsx @@ -15,7 +15,7 @@ import MegaphonePromote_M from 'illustration:./S2_fill_megaphonePromote_generic2 import MegaphonePromote_S from 'illustration:./S2_fill_megaphonePromote_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function MegaphonePromote(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MegaphonePromote2.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MegaphonePromote2.tsx index b05e95604e3..6694fa4b159 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MegaphonePromote2.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MegaphonePromote2.tsx @@ -15,7 +15,7 @@ import MegaphonePromote2_M from 'illustration:./S2_fill_megaphonePromote2_generi import MegaphonePromote2_S from 'illustration:./S2_fill_megaphonePromote2_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function MegaphonePromote2(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Mention.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Mention.tsx index 51163e5a3eb..21805a5bcae 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Mention.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Mention.tsx @@ -15,7 +15,7 @@ import Mention_M from 'illustration:./S2_fill_mention_generic2_96.svg'; import Mention_S from 'illustration:./S2_fill_mention_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Mention(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Microphone.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Microphone.tsx index d0a05324f7a..c61ebb2a74d 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Microphone.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Microphone.tsx @@ -15,7 +15,7 @@ import Microphone_M from 'illustration:./S2_fill_microphone_generic2_96.svg'; import Microphone_S from 'illustration:./S2_fill_microphone_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Microphone(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Minimize.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Minimize.tsx index 228beb036fe..434115cb5d3 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Minimize.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Minimize.tsx @@ -15,7 +15,7 @@ import Minimize_M from 'illustration:./S2_fill_minimize_generic2_96.svg'; import Minimize_S from 'illustration:./S2_fill_minimize_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Minimize(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MovieCamera.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MovieCamera.tsx index 12d7a7736d0..d504d49ba39 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MovieCamera.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MovieCamera.tsx @@ -15,7 +15,7 @@ import MovieCamera_M from 'illustration:./S2_fill_movieCamera_generic2_96.svg'; import MovieCamera_S from 'illustration:./S2_fill_movieCamera_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function MovieCamera(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MusicNote.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MusicNote.tsx index 6286ef24e92..cdbd32ceabf 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MusicNote.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MusicNote.tsx @@ -15,7 +15,7 @@ import MusicNote_M from 'illustration:./S2_fill_musicNote_generic2_96.svg'; import MusicNote_S from 'illustration:./S2_fill_musicNote_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function MusicNote(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/NoElements.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/NoElements.tsx index ed194a51804..38b54e4f8f4 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/NoElements.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/NoElements.tsx @@ -15,7 +15,7 @@ import NoElements_M from 'illustration:./S2_fill_noElements_generic2_96.svg'; import NoElements_S from 'illustration:./S2_fill_noElements_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function NoElements(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Paperairplane.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Paperairplane.tsx index df1dd3e8c18..cd4aee97912 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Paperairplane.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Paperairplane.tsx @@ -15,7 +15,7 @@ import Paperairplane_M from 'illustration:./S2_fill_paperairplane_generic2_96.sv import Paperairplane_S from 'illustration:./S2_fill_paperairplane_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Paperairplane(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Paperclip.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Paperclip.tsx index 371a3b122d0..16fb4ec528a 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Paperclip.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Paperclip.tsx @@ -15,7 +15,7 @@ import Paperclip_M from 'illustration:./S2_fill_paperclip_generic2_96.svg'; import Paperclip_S from 'illustration:./S2_fill_paperclip_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Paperclip(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Pause.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Pause.tsx index 6d67e13f385..64499c28904 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Pause.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Pause.tsx @@ -15,7 +15,7 @@ import Pause_M from 'illustration:./S2_fill_pause_generic2_96.svg'; import Pause_S from 'illustration:./S2_fill_pause_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Pause(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Pencil.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Pencil.tsx index bf2f91379ff..d9233b41668 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Pencil.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Pencil.tsx @@ -15,7 +15,7 @@ import Pencil_M from 'illustration:./S2_fill_pencil_generic2_96.svg'; import Pencil_S from 'illustration:./S2_fill_pencil_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Pencil(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Phone.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Phone.tsx index b6309668f7a..c29f848d3f9 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Phone.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Phone.tsx @@ -15,7 +15,7 @@ import Phone_M from 'illustration:./S2_fill_phone_generic2_96.svg'; import Phone_S from 'illustration:./S2_fill_phone_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Phone(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/PieChart.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/PieChart.tsx index 8f9e935dffb..77e69140add 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/PieChart.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/PieChart.tsx @@ -15,7 +15,7 @@ import PieChart_M from 'illustration:./S2_fill_pieChart_generic2_96.svg'; import PieChart_S from 'illustration:./S2_fill_pieChart_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function PieChart(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/PiggyBank.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/PiggyBank.tsx index cc0f7425a21..69e730d53db 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/PiggyBank.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/PiggyBank.tsx @@ -15,7 +15,7 @@ import PiggyBank_M from 'illustration:./S2_fill_piggyBank_generic2_96.svg'; import PiggyBank_S from 'illustration:./S2_fill_piggyBank_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function PiggyBank(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Pin.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Pin.tsx index 6162cf2fea2..32982303135 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Pin.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Pin.tsx @@ -15,7 +15,7 @@ import Pin_M from 'illustration:./S2_fill_pin_generic2_96.svg'; import Pin_S from 'illustration:./S2_fill_pin_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Pin(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Play.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Play.tsx index a4698f2bb3d..8f3e9c74131 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Play.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Play.tsx @@ -15,7 +15,7 @@ import Play_M from 'illustration:./S2_fill_play_generic2_96.svg'; import Play_S from 'illustration:./S2_fill_play_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Play(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/PlayTriangle.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/PlayTriangle.tsx index 7110cdf69fc..b41449c7674 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/PlayTriangle.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/PlayTriangle.tsx @@ -15,7 +15,7 @@ import PlayTriangle_M from 'illustration:./S2_fill_playTriangle_generic2_96.svg' import PlayTriangle_S from 'illustration:./S2_fill_playTriangle_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function PlayTriangle(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Plugin.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Plugin.tsx index 65609934f32..484257de8f9 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Plugin.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Plugin.tsx @@ -15,7 +15,7 @@ import Plugin_M from 'illustration:./S2_fill_plugin_generic2_96.svg'; import Plugin_S from 'illustration:./S2_fill_plugin_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Plugin(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Prompt.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Prompt.tsx index 34f1c2f5f4a..da096ce3bf6 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Prompt.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Prompt.tsx @@ -15,7 +15,7 @@ import Prompt_M from 'illustration:./S2_fill_prompt_generic2_96.svg'; import Prompt_S from 'illustration:./S2_fill_prompt_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Prompt(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Properties.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Properties.tsx index c54600302cb..171e4cf6eaf 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Properties.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Properties.tsx @@ -15,7 +15,7 @@ import Properties_M from 'illustration:./S2_fill_properties_generic2_96.svg'; import Properties_S from 'illustration:./S2_fill_properties_generic2_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Properties(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Redo.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Redo.tsx index 88d2b1a5d4e..b7cab6ddb76 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Redo.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Redo.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Redo_L from 'illustration:./S2_fill_redo_generic2_160.svg'; import Redo_M from 'illustration:./S2_fill_redo_generic2_96.svg'; import Redo_S from 'illustration:./S2_fill_redo_generic2_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Redo(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Remix.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Remix.tsx index 015fe0dce72..f64fd8b1e57 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Remix.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Remix.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Remix_L from 'illustration:./S2_fill_remix_generic2_160.svg'; import Remix_M from 'illustration:./S2_fill_remix_generic2_96.svg'; import Remix_S from 'illustration:./S2_fill_remix_generic2_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Remix(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Replace.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Replace.tsx index 2334e498103..be419348a03 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Replace.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Replace.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Replace_L from 'illustration:./S2_fill_replace_generic2_160.svg'; import Replace_M from 'illustration:./S2_fill_replace_generic2_96.svg'; import Replace_S from 'illustration:./S2_fill_replace_generic2_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Replace(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Revert.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Revert.tsx index faaed9d3709..8b3814fecf0 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Revert.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Revert.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Revert_L from 'illustration:./S2_fill_revert_generic2_160.svg'; import Revert_M from 'illustration:./S2_fill_revert_generic2_96.svg'; import Revert_S from 'illustration:./S2_fill_revert_generic2_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Revert(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Ribbon.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Ribbon.tsx index 075d02aabf7..5a771b73ce4 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Ribbon.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Ribbon.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Ribbon_L from 'illustration:./S2_fill_ribbon_generic2_160.svg'; import Ribbon_M from 'illustration:./S2_fill_ribbon_generic2_96.svg'; import Ribbon_S from 'illustration:./S2_fill_ribbon_generic2_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Ribbon(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Rocket.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Rocket.tsx index 81413afe688..18353d28fb9 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Rocket.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Rocket.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Rocket_L from 'illustration:./S2_fill_rocket_generic2_160.svg'; import Rocket_M from 'illustration:./S2_fill_rocket_generic2_96.svg'; import Rocket_S from 'illustration:./S2_fill_rocket_generic2_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Rocket(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/RotateCCW.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/RotateCCW.tsx index 5afd15fe699..b4ead913e70 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/RotateCCW.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/RotateCCW.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import RotateCCW_L from 'illustration:./S2_fill_rotateCCW_generic2_160.svg'; import RotateCCW_M from 'illustration:./S2_fill_rotateCCW_generic2_96.svg'; import RotateCCW_S from 'illustration:./S2_fill_rotateCCW_generic2_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function RotateCCW(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/RotateCW.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/RotateCW.tsx index 6aa4f703f42..3bd7ff45d82 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/RotateCW.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/RotateCW.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import RotateCW_L from 'illustration:./S2_fill_rotateCW_generic2_160.svg'; import RotateCW_M from 'illustration:./S2_fill_rotateCW_generic2_96.svg'; import RotateCW_S from 'illustration:./S2_fill_rotateCW_generic2_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function RotateCW(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Ruler.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Ruler.tsx index 59c8b4c335c..e51e9d562c9 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Ruler.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Ruler.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Ruler_L from 'illustration:./S2_fill_ruler_generic2_160.svg'; import Ruler_M from 'illustration:./S2_fill_ruler_generic2_96.svg'; import Ruler_S from 'illustration:./S2_fill_ruler_generic2_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Ruler(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Search.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Search.tsx index d814b41543b..93d711cfbd7 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Search.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Search.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Search_L from 'illustration:./S2_fill_search_generic2_160.svg'; import Search_M from 'illustration:./S2_fill_search_generic2_96.svg'; import Search_S from 'illustration:./S2_fill_search_generic2_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Search(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Segmentation.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Segmentation.tsx index a9e526d69fc..e91eabbd0d8 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Segmentation.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Segmentation.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Segmentation_L from 'illustration:./S2_fill_segmentation_generic2_160.svg'; import Segmentation_M from 'illustration:./S2_fill_segmentation_generic2_96.svg'; import Segmentation_S from 'illustration:./S2_fill_segmentation_generic2_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Segmentation(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Server.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Server.tsx index a27a51d0de2..040d79728b8 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Server.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Server.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Server_L from 'illustration:./S2_fill_server_generic2_160.svg'; import Server_M from 'illustration:./S2_fill_server_generic2_96.svg'; import Server_S from 'illustration:./S2_fill_server_generic2_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Server(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Shapes.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Shapes.tsx index 7560e37c604..864869d3812 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Shapes.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Shapes.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Shapes_L from 'illustration:./S2_fill_shapes_generic2_160.svg'; import Shapes_M from 'illustration:./S2_fill_shapes_generic2_96.svg'; import Shapes_S from 'illustration:./S2_fill_shapes_generic2_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Shapes(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ShoppingBag.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ShoppingBag.tsx index aff20bd4895..2dc6113dfe7 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ShoppingBag.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ShoppingBag.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import ShoppingBag_L from 'illustration:./S2_fill_shoppingBag_generic2_160.svg'; import ShoppingBag_M from 'illustration:./S2_fill_shoppingBag_generic2_96.svg'; import ShoppingBag_S from 'illustration:./S2_fill_shoppingBag_generic2_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function ShoppingBag(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ShoppingCart.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ShoppingCart.tsx index 8f62864df88..3cd96747d90 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ShoppingCart.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ShoppingCart.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import ShoppingCart_L from 'illustration:./S2_fill_shoppingCart_generic2_160.svg'; import ShoppingCart_M from 'illustration:./S2_fill_shoppingCart_generic2_96.svg'; import ShoppingCart_S from 'illustration:./S2_fill_shoppingCart_generic2_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function ShoppingCart(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Sparkles.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Sparkles.tsx index 5f370e20b2b..0436c83227d 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Sparkles.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Sparkles.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Sparkles_L from 'illustration:./S2_fill_sparkles_generic2_160.svg'; import Sparkles_M from 'illustration:./S2_fill_sparkles_generic2_96.svg'; import Sparkles_S from 'illustration:./S2_fill_sparkles_generic2_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Sparkles(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/SpeedFast.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/SpeedFast.tsx index 2244277b9a3..0b3bf63c078 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/SpeedFast.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/SpeedFast.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import SpeedFast_L from 'illustration:./S2_fill_speedFast_generic2_160.svg'; import SpeedFast_M from 'illustration:./S2_fill_speedFast_generic2_96.svg'; import SpeedFast_S from 'illustration:./S2_fill_speedFast_generic2_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function SpeedFast(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/StampClone.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/StampClone.tsx index aceb20fced1..9d751cc8f60 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/StampClone.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/StampClone.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import StampClone_L from 'illustration:./S2_fill_stampClone_generic2_160.svg'; import StampClone_M from 'illustration:./S2_fill_stampClone_generic2_96.svg'; import StampClone_S from 'illustration:./S2_fill_stampClone_generic2_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function StampClone(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Star.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Star.tsx index a62f15e7685..51c5c7ca21f 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Star.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Star.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Star_L from 'illustration:./S2_fill_star_generic2_160.svg'; import Star_M from 'illustration:./S2_fill_star_generic2_96.svg'; import Star_S from 'illustration:./S2_fill_star_generic2_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Star(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/StepForward.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/StepForward.tsx index c66507b94d8..d18df301b0b 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/StepForward.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/StepForward.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import StepForward_L from 'illustration:./S2_fill_stepForward_generic2_160.svg'; import StepForward_M from 'illustration:./S2_fill_stepForward_generic2_96.svg'; import StepForward_S from 'illustration:./S2_fill_stepForward_generic2_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function StepForward(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Switch.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Switch.tsx index 3b177abb992..3576debd45e 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Switch.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Switch.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Switch_L from 'illustration:./S2_fill_switch_generic2_160.svg'; import Switch_M from 'illustration:./S2_fill_switch_generic2_96.svg'; import Switch_S from 'illustration:./S2_fill_switch_generic2_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Switch(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Tablet.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Tablet.tsx index 49c1212feaf..e9f962cb536 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Tablet.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Tablet.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Tablet_L from 'illustration:./S2_fill_tablet_generic2_160.svg'; import Tablet_M from 'illustration:./S2_fill_tablet_generic2_96.svg'; import Tablet_S from 'illustration:./S2_fill_tablet_generic2_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Tablet(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Tag.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Tag.tsx index 77080c298cd..ced4b92cb11 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Tag.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Tag.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Tag_L from 'illustration:./S2_fill_tag_generic2_160.svg'; import Tag_M from 'illustration:./S2_fill_tag_generic2_96.svg'; import Tag_S from 'illustration:./S2_fill_tag_generic2_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Tag(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Targeted.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Targeted.tsx index 53339f9e029..9d10b72e973 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Targeted.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Targeted.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Targeted_L from 'illustration:./S2_fill_targeted_generic2_160.svg'; import Targeted_M from 'illustration:./S2_fill_targeted_generic2_96.svg'; import Targeted_S from 'illustration:./S2_fill_targeted_generic2_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Targeted(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Text.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Text.tsx index 78b38cd53fe..61cb7c8ce0e 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Text.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Text.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Text_L from 'illustration:./S2_fill_text_generic2_160.svg'; import Text_M from 'illustration:./S2_fill_text_generic2_96.svg'; import Text_S from 'illustration:./S2_fill_text_generic2_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Text(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ThreeArrowsCircle.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ThreeArrowsCircle.tsx index c1c92b31f61..d15fe2ffb5e 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ThreeArrowsCircle.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ThreeArrowsCircle.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import ThreeArrowsCircle_L from 'illustration:./S2_fill_threeArrowsCircle_generic2_160.svg'; import ThreeArrowsCircle_M from 'illustration:./S2_fill_threeArrowsCircle_generic2_96.svg'; import ThreeArrowsCircle_S from 'illustration:./S2_fill_threeArrowsCircle_generic2_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function ThreeArrowsCircle(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ThumbsUp.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ThumbsUp.tsx index 34bb680a0cb..d2a255ce335 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ThumbsUp.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ThumbsUp.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import ThumbsUp_L from 'illustration:./S2_fill_thumbsUp_generic2_160.svg'; import ThumbsUp_M from 'illustration:./S2_fill_thumbsUp_generic2_96.svg'; import ThumbsUp_S from 'illustration:./S2_fill_thumbsUp_generic2_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function ThumbsUp(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Transform.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Transform.tsx index eda7d92283d..ca410b70595 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Transform.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Transform.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Transform_L from 'illustration:./S2_fill_transform_generic2_160.svg'; import Transform_M from 'illustration:./S2_fill_transform_generic2_96.svg'; import Transform_S from 'illustration:./S2_fill_transform_generic2_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Transform(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Translate.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Translate.tsx index 939b5a5d6a9..bf9cdccd0e8 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Translate.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Translate.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Translate_L from 'illustration:./S2_fill_translate_generic2_160.svg'; import Translate_M from 'illustration:./S2_fill_translate_generic2_96.svg'; import Translate_S from 'illustration:./S2_fill_translate_generic2_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Translate(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Trash.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Trash.tsx index a686e79b114..14c06926e65 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Trash.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Trash.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Trash_L from 'illustration:./S2_fill_trash_generic2_160.svg'; import Trash_M from 'illustration:./S2_fill_trash_generic2_96.svg'; import Trash_S from 'illustration:./S2_fill_trash_generic2_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Trash(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Trophy.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Trophy.tsx index 7671e2099d0..38b042f1295 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Trophy.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Trophy.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Trophy_L from 'illustration:./S2_fill_trophy_generic2_160.svg'; import Trophy_M from 'illustration:./S2_fill_trophy_generic2_96.svg'; import Trophy_S from 'illustration:./S2_fill_trophy_generic2_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Trophy(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Update.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Update.tsx index 710a5da0804..a761c8d0f92 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Update.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Update.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Update_L from 'illustration:./S2_fill_update_generic2_160.svg'; import Update_M from 'illustration:./S2_fill_update_generic2_96.svg'; import Update_S from 'illustration:./S2_fill_update_generic2_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Update(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Upload.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Upload.tsx index 070419f20ba..f40698b6d3a 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Upload.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Upload.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon'; import Upload_L from 'illustration:./S2_fill_upload_generic2_160.svg'; import Upload_M from 'illustration:./S2_fill_upload_generic2_96.svg'; import Upload_S from 'illustration:./S2_fill_upload_generic2_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Upload(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/User.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/User.tsx index 8b7f5e0847c..74f6e9e2db2 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/User.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/User.tsx @@ -12,7 +12,7 @@ 'use client'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; import User_L from 'illustration:./S2_fill_user_generic2_160.svg'; import User_M from 'illustration:./S2_fill_user_generic2_96.svg'; import User_S from 'illustration:./S2_fill_user_generic2_48.svg'; diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/UserAvatar.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/UserAvatar.tsx index a5070281fab..a739548a719 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/UserAvatar.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/UserAvatar.tsx @@ -12,7 +12,7 @@ 'use client'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; import UserAvatar_L from 'illustration:./S2_fill_userAvatar_generic2_160.svg'; import UserAvatar_M from 'illustration:./S2_fill_userAvatar_generic2_96.svg'; import UserAvatar_S from 'illustration:./S2_fill_userAvatar_generic2_48.svg'; diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/UserGroup.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/UserGroup.tsx index 5046a361905..b0ea6ff6186 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/UserGroup.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/UserGroup.tsx @@ -12,7 +12,7 @@ 'use client'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; import UserGroup_L from 'illustration:./S2_fill_userGroup_generic2_160.svg'; import UserGroup_M from 'illustration:./S2_fill_userGroup_generic2_96.svg'; import UserGroup_S from 'illustration:./S2_fill_userGroup_generic2_48.svg'; diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/VectorDraw.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/VectorDraw.tsx index 020e5bf59d1..6ec53e8c6c0 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/VectorDraw.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/VectorDraw.tsx @@ -12,7 +12,7 @@ 'use client'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; import VectorDraw_L from 'illustration:./S2_fill_vectorDraw_generic2_160.svg'; import VectorDraw_M from 'illustration:./S2_fill_vectorDraw_generic2_96.svg'; import VectorDraw_S from 'illustration:./S2_fill_vectorDraw_generic2_48.svg'; diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Video.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Video.tsx index 18ccd96b428..8ed8e015cb3 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Video.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Video.tsx @@ -12,7 +12,7 @@ 'use client'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; import Video_L from 'illustration:./S2_fill_video_generic2_160.svg'; import Video_M from 'illustration:./S2_fill_video_generic2_96.svg'; import Video_S from 'illustration:./S2_fill_video_generic2_48.svg'; diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Volume.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Volume.tsx index 59acb903da4..068ed59be5b 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Volume.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Volume.tsx @@ -12,7 +12,7 @@ 'use client'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; import Volume_L from 'illustration:./S2_fill_volume_generic2_160.svg'; import Volume_M from 'illustration:./S2_fill_volume_generic2_96.svg'; import Volume_S from 'illustration:./S2_fill_volume_generic2_48.svg'; diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/VolumeOne.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/VolumeOne.tsx index bc4619127fd..64b5fb5c128 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/VolumeOne.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/VolumeOne.tsx @@ -12,7 +12,7 @@ 'use client'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; import VolumeOne_L from 'illustration:./S2_fill_volumeOne_generic2_160.svg'; import VolumeOne_M from 'illustration:./S2_fill_volumeOne_generic2_96.svg'; import VolumeOne_S from 'illustration:./S2_fill_volumeOne_generic2_48.svg'; diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Wallet.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Wallet.tsx index a4bed52c2bb..376724c6cee 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Wallet.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Wallet.tsx @@ -12,7 +12,7 @@ 'use client'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; import Wallet_L from 'illustration:./S2_fill_wallet_generic2_160.svg'; import Wallet_M from 'illustration:./S2_fill_wallet_generic2_96.svg'; import Wallet_S from 'illustration:./S2_fill_wallet_generic2_48.svg'; diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/3D.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/3D.tsx index 6bdabc064a3..ef7f202a7a8 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/3D.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/3D.tsx @@ -15,7 +15,7 @@ import _3D_M from 'illustration:./S2_lin_3D_96.svg'; import _3D_S from 'illustration:./S2_lin_3D_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function _3D(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/3Dasset.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/3Dasset.tsx index 53cec728ca8..d4a48916861 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/3Dasset.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/3Dasset.tsx @@ -15,7 +15,7 @@ import _3Dasset_M from 'illustration:./S2_lin_3Dasset_96.svg'; import _3Dasset_S from 'illustration:./S2_lin_3Dasset_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function _3Dasset(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/AIChat.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/AIChat.tsx index 481d863e62a..6be2afb4552 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/AIChat.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/AIChat.tsx @@ -15,7 +15,7 @@ import AIChat_M from 'illustration:./S2_lin_AIChat_96.svg'; import AIChat_S from 'illustration:./S2_lin_AIChat_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function AIChat(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/AIGenerate.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/AIGenerate.tsx index ab8b2ed26ca..e88b0f97012 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/AIGenerate.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/AIGenerate.tsx @@ -15,7 +15,7 @@ import AIGenerate_M from 'illustration:./S2_lin_AIGenerate_96.svg'; import AIGenerate_S from 'illustration:./S2_lin_AIGenerate_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function AIGenerate(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/AIGenerateImage.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/AIGenerateImage.tsx index 3be62333307..604924f1664 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/AIGenerateImage.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/AIGenerateImage.tsx @@ -15,7 +15,7 @@ import AIGenerateImage_M from 'illustration:./S2_lin_AIGenerateImage_96.svg'; import AIGenerateImage_S from 'illustration:./S2_lin_AIGenerateImage_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function AIGenerateImage(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Accessibility.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Accessibility.tsx index 7392902b8b6..a106a3cc4e1 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Accessibility.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Accessibility.tsx @@ -15,7 +15,7 @@ import Accessibility_M from 'illustration:./S2_lin_accessibility_96.svg'; import Accessibility_S from 'illustration:./S2_lin_accessibility_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Accessibility(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Addproject.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Addproject.tsx index aa1d0e72ee9..20d8c9e6aec 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Addproject.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Addproject.tsx @@ -15,7 +15,7 @@ import Addproject_M from 'illustration:./S2_lin_addproject_96.svg'; import Addproject_S from 'illustration:./S2_lin_addproject_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Addproject(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/AlertNotice.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/AlertNotice.tsx index 6d38169eb12..389a05c4201 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/AlertNotice.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/AlertNotice.tsx @@ -15,7 +15,7 @@ import AlertNotice_M from 'illustration:./S2_lin_alertNotice_96.svg'; import AlertNotice_S from 'illustration:./S2_lin_alertNotice_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function AlertNotice(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Animation.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Animation.tsx index 96f4a168598..f54a6dd6bd7 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Animation.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Animation.tsx @@ -15,7 +15,7 @@ import Animation_M from 'illustration:./S2_lin_animation_96.svg'; import Animation_S from 'illustration:./S2_lin_animation_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Animation(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Apps.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Apps.tsx index f87519cc3be..f795247aa52 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Apps.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Apps.tsx @@ -15,7 +15,7 @@ import Apps_M from 'illustration:./S2_lin_apps_96.svg'; import Apps_S from 'illustration:./S2_lin_apps_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Apps(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ArrowDown.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ArrowDown.tsx index e1f6fc281fa..09ce398bd24 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ArrowDown.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ArrowDown.tsx @@ -15,7 +15,7 @@ import ArrowDown_M from 'illustration:./S2_lin_arrowDown_96.svg'; import ArrowDown_S from 'illustration:./S2_lin_arrowDown_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function ArrowDown(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ArrowLeft.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ArrowLeft.tsx index 8b6b60e987e..c904b8f4e43 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ArrowLeft.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ArrowLeft.tsx @@ -15,7 +15,7 @@ import ArrowLeft_M from 'illustration:./S2_lin_arrowLeft_96.svg'; import ArrowLeft_S from 'illustration:./S2_lin_arrowLeft_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function ArrowLeft(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ArrowRight.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ArrowRight.tsx index 82cd0bbb694..4ee550aa667 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ArrowRight.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ArrowRight.tsx @@ -15,7 +15,7 @@ import ArrowRight_M from 'illustration:./S2_lin_arrowRight_96.svg'; import ArrowRight_S from 'illustration:./S2_lin_arrowRight_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function ArrowRight(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ArrowUp.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ArrowUp.tsx index c01f71823fc..5e7b510aa1e 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ArrowUp.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ArrowUp.tsx @@ -15,7 +15,7 @@ import ArrowUp_M from 'illustration:./S2_lin_arrowUp_96.svg'; import ArrowUp_S from 'illustration:./S2_lin_arrowUp_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function ArrowUp(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Artboard.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Artboard.tsx index 8f45728c84f..8d743035f9b 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Artboard.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Artboard.tsx @@ -15,7 +15,7 @@ import Artboard_M from 'illustration:./S2_lin_artboard_96.svg'; import Artboard_S from 'illustration:./S2_lin_artboard_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Artboard(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Assets.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Assets.tsx index b6a4eef3ce0..4336bc00d7b 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Assets.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Assets.tsx @@ -15,7 +15,7 @@ import Assets_M from 'illustration:./S2_lin_assets_96.svg'; import Assets_S from 'illustration:./S2_lin_assets_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Assets(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/AudioWave.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/AudioWave.tsx index d7a82cc4b14..94e4e32b81d 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/AudioWave.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/AudioWave.tsx @@ -15,7 +15,7 @@ import AudioWave_M from 'illustration:./S2_lin_audioWave_96.svg'; import AudioWave_S from 'illustration:./S2_lin_audioWave_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function AudioWave(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/BadgeVerified.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/BadgeVerified.tsx index bfcf5f5f203..4e92f2a9421 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/BadgeVerified.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/BadgeVerified.tsx @@ -15,7 +15,7 @@ import BadgeVerified_M from 'illustration:./S2_lin_badgeVerified_96.svg'; import BadgeVerified_S from 'illustration:./S2_lin_badgeVerified_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function BadgeVerified(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Bell.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Bell.tsx index 27ec08e6d2d..9ce690eb6bc 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Bell.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Bell.tsx @@ -15,7 +15,7 @@ import Bell_M from 'illustration:./S2_lin_bell_96.svg'; import Bell_S from 'illustration:./S2_lin_bell_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Bell(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Bolt.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Bolt.tsx index 4c8db3438f1..0128f85c9b2 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Bolt.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Bolt.tsx @@ -15,7 +15,7 @@ import Bolt_M from 'illustration:./S2_lin_bolt_96.svg'; import Bolt_S from 'illustration:./S2_lin_bolt_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Bolt(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Brand.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Brand.tsx index 67ef1d409ff..12720bcfd58 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Brand.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Brand.tsx @@ -15,7 +15,7 @@ import Brand_M from 'illustration:./S2_lin_brand_96.svg'; import Brand_S from 'illustration:./S2_lin_brand_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Brand(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Briefcase.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Briefcase.tsx index ae33de5f8ed..284a7065788 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Briefcase.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Briefcase.tsx @@ -15,7 +15,7 @@ import Briefcase_M from 'illustration:./S2_lin_briefcase_96.svg'; import Briefcase_S from 'illustration:./S2_lin_briefcase_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Briefcase(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/BrightnessContrast.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/BrightnessContrast.tsx index 09643f9ef92..c244e3b6a79 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/BrightnessContrast.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/BrightnessContrast.tsx @@ -15,7 +15,7 @@ import BrightnessContrast_M from 'illustration:./S2_lin_brightnessContrast_96.sv import BrightnessContrast_S from 'illustration:./S2_lin_brightnessContrast_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function BrightnessContrast(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Browser.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Browser.tsx index 1d90c77ac70..f2484fb169b 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Browser.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Browser.tsx @@ -15,7 +15,7 @@ import Browser_M from 'illustration:./S2_lin_browser_96.svg'; import Browser_S from 'illustration:./S2_lin_browser_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Browser(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/BrowserError.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/BrowserError.tsx index 72c05d35325..17ff85626f1 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/BrowserError.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/BrowserError.tsx @@ -15,7 +15,7 @@ import BrowserError_M from 'illustration:./S2_lin_browserError_96.svg'; import BrowserError_S from 'illustration:./S2_lin_browserError_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function BrowserError(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/BrowserNotCompatible.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/BrowserNotCompatible.tsx index c131872d7ce..97e81beba09 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/BrowserNotCompatible.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/BrowserNotCompatible.tsx @@ -15,7 +15,7 @@ import BrowserNotCompatible_M from 'illustration:./S2_lin_browserNotCompatible_9 import BrowserNotCompatible_S from 'illustration:./S2_lin_browserNotCompatible_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function BrowserNotCompatible(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Brush.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Brush.tsx index a1416af3a9c..9809d75cc77 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Brush.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Brush.tsx @@ -15,7 +15,7 @@ import Brush_M from 'illustration:./S2_lin_brush_96.svg'; import Brush_S from 'illustration:./S2_lin_brush_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Brush(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Bug.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Bug.tsx index 2248ba5584a..646664bf043 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Bug.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Bug.tsx @@ -15,7 +15,7 @@ import Bug_M from 'illustration:./S2_lin_bug_96.svg'; import Bug_S from 'illustration:./S2_lin_bug_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Bug(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/BuildTable.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/BuildTable.tsx index 24322f8d04e..813c91f5a5b 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/BuildTable.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/BuildTable.tsx @@ -15,7 +15,7 @@ import BuildTable_M from 'illustration:./S2_lin_buildTable_96.svg'; import BuildTable_S from 'illustration:./S2_lin_buildTable_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function BuildTable(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Buildings.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Buildings.tsx index e9a661ea478..3da699b0ac5 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Buildings.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Buildings.tsx @@ -15,7 +15,7 @@ import Buildings_M from 'illustration:./S2_lin_buildings_96.svg'; import Buildings_S from 'illustration:./S2_lin_buildings_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Buildings(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Calendar.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Calendar.tsx index c54cc94303e..01aa5913397 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Calendar.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Calendar.tsx @@ -15,7 +15,7 @@ import Calendar_M from 'illustration:./S2_lin_calendar_96.svg'; import Calendar_S from 'illustration:./S2_lin_calendar_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Calendar(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Camera.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Camera.tsx index 6665d1c2778..2502bd2a984 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Camera.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Camera.tsx @@ -15,7 +15,7 @@ import Camera_M from 'illustration:./S2_lin_camera_96.svg'; import Camera_S from 'illustration:./S2_lin_camera_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Camera(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/CardTapPayment.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/CardTapPayment.tsx index 53fa4d07d48..13271ecf241 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/CardTapPayment.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/CardTapPayment.tsx @@ -15,7 +15,7 @@ import CardTapPayment_M from 'illustration:./S2_lin_cardTapPayment_96.svg'; import CardTapPayment_S from 'illustration:./S2_lin_cardTapPayment_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function CardTapPayment(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Channel.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Channel.tsx index c9d072b6113..b377f19ed71 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Channel.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Channel.tsx @@ -15,7 +15,7 @@ import Channel_M from 'illustration:./S2_lin_channel_96.svg'; import Channel_S from 'illustration:./S2_lin_channel_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Channel(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ChartAreaStack.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ChartAreaStack.tsx index 91c3d5ab8d5..21f1cfa4f7f 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ChartAreaStack.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ChartAreaStack.tsx @@ -15,7 +15,7 @@ import ChartAreaStack_M from 'illustration:./S2_lin_chartAreaStack_96.svg'; import ChartAreaStack_S from 'illustration:./S2_lin_chartAreaStack_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function ChartAreaStack(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Chatbubble.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Chatbubble.tsx index cc091f60edf..6cfd743b3c0 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Chatbubble.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Chatbubble.tsx @@ -15,7 +15,7 @@ import Chatbubble_M from 'illustration:./S2_lin_chatbubble_96.svg'; import Chatbubble_S from 'illustration:./S2_lin_chatbubble_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Chatbubble(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Check.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Check.tsx index 6c5cc08c4de..bbe13a9d4a5 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Check.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Check.tsx @@ -15,7 +15,7 @@ import Check_M from 'illustration:./S2_lin_check_96.svg'; import Check_S from 'illustration:./S2_lin_check_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Check(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Clipboard.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Clipboard.tsx index a0ffce39447..aefd7af6b86 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Clipboard.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Clipboard.tsx @@ -15,7 +15,7 @@ import Clipboard_M from 'illustration:./S2_lin_clipboard_96.svg'; import Clipboard_S from 'illustration:./S2_lin_clipboard_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Clipboard(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Clock.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Clock.tsx index 831105e3e77..ad11a4728fe 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Clock.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Clock.tsx @@ -15,7 +15,7 @@ import Clock_M from 'illustration:./S2_lin_clock_96.svg'; import Clock_S from 'illustration:./S2_lin_clock_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Clock(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Close.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Close.tsx index c742ef58256..51019984dca 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Close.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Close.tsx @@ -15,7 +15,7 @@ import Close_M from 'illustration:./S2_lin_close_96.svg'; import Close_S from 'illustration:./S2_lin_close_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Close(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Cloud.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Cloud.tsx index 8cc45ebbe36..0f9d27bddac 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Cloud.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Cloud.tsx @@ -15,7 +15,7 @@ import Cloud_M from 'illustration:./S2_lin_cloud_96.svg'; import Cloud_S from 'illustration:./S2_lin_cloud_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Cloud(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/CloudStateDisconnected.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/CloudStateDisconnected.tsx index e9766111cb1..010e9f094d4 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/CloudStateDisconnected.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/CloudStateDisconnected.tsx @@ -15,7 +15,7 @@ import CloudStateDisconnected_M from 'illustration:./S2_lin_cloudStateDisconnect import CloudStateDisconnected_S from 'illustration:./S2_lin_cloudStateDisconnected_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function CloudStateDisconnected(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/CloudStateError.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/CloudStateError.tsx index 113aeafcb12..005ce275bb7 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/CloudStateError.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/CloudStateError.tsx @@ -15,7 +15,7 @@ import CloudStateError_M from 'illustration:./S2_lin_cloudStateError_96.svg'; import CloudStateError_S from 'illustration:./S2_lin_cloudStateError_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function CloudStateError(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/CloudUpload.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/CloudUpload.tsx index 7aceeb85108..5a4a03369a9 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/CloudUpload.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/CloudUpload.tsx @@ -15,7 +15,7 @@ import CloudUpload_M from 'illustration:./S2_lin_cloudUpload_96.svg'; import CloudUpload_S from 'illustration:./S2_lin_cloudUpload_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function CloudUpload(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/CodeBrackets.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/CodeBrackets.tsx index 94fb047ac23..81dd58107c2 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/CodeBrackets.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/CodeBrackets.tsx @@ -15,7 +15,7 @@ import CodeBrackets_M from 'illustration:./S2_lin_codeBrackets_96.svg'; import CodeBrackets_S from 'illustration:./S2_lin_codeBrackets_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function CodeBrackets(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Color.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Color.tsx index ffb36735c84..e938d160856 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Color.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Color.tsx @@ -15,7 +15,7 @@ import Color_M from 'illustration:./S2_lin_color_96.svg'; import Color_S from 'illustration:./S2_lin_color_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Color(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/CommentText.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/CommentText.tsx index 81a385cfee5..cbd22efb8e7 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/CommentText.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/CommentText.tsx @@ -15,7 +15,7 @@ import CommentText_M from 'illustration:./S2_lin_commentText_96.svg'; import CommentText_S from 'illustration:./S2_lin_commentText_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function CommentText(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ConfettiCelebration.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ConfettiCelebration.tsx index ec0e180df6b..a5530ce76dc 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ConfettiCelebration.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ConfettiCelebration.tsx @@ -15,7 +15,7 @@ import ConfettiCelebration_M from 'illustration:./S2_lin_confettiCelebration_96. import ConfettiCelebration_S from 'illustration:./S2_lin_confettiCelebration_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function ConfettiCelebration(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Conversationbubbles.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Conversationbubbles.tsx index 81691538779..6832e5bde6b 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Conversationbubbles.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Conversationbubbles.tsx @@ -15,7 +15,7 @@ import Conversationbubbles_M from 'illustration:./S2_lin_conversationbubbles_96. import Conversationbubbles_S from 'illustration:./S2_lin_conversationbubbles_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Conversationbubbles(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Crop.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Crop.tsx index d1319a76a35..fa23c658539 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Crop.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Crop.tsx @@ -15,7 +15,7 @@ import Crop_M from 'illustration:./S2_lin_crop_96.svg'; import Crop_S from 'illustration:./S2_lin_crop_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Crop(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Cursor.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Cursor.tsx index 9126322ebd2..1be61c2e200 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Cursor.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Cursor.tsx @@ -15,7 +15,7 @@ import Cursor_M from 'illustration:./S2_lin_cursor_96.svg'; import Cursor_S from 'illustration:./S2_lin_cursor_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Cursor(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Cut.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Cut.tsx index a41b564e181..84294c46df2 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Cut.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Cut.tsx @@ -15,7 +15,7 @@ import Cut_M from 'illustration:./S2_lin_cut_96.svg'; import Cut_S from 'illustration:./S2_lin_cut_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Cut(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Data.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Data.tsx index b1b78dc2521..92e9ad26e12 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Data.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Data.tsx @@ -15,7 +15,7 @@ import Data_M from 'illustration:./S2_lin_data_96.svg'; import Data_S from 'illustration:./S2_lin_data_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Data(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/DataAnalytics.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/DataAnalytics.tsx index 8ab3fd14e3d..aced7c2aa9f 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/DataAnalytics.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/DataAnalytics.tsx @@ -15,7 +15,7 @@ import DataAnalytics_M from 'illustration:./S2_lin_dataAnalytics_96.svg'; import DataAnalytics_S from 'illustration:./S2_lin_dataAnalytics_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function DataAnalytics(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Desktop.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Desktop.tsx index 8996ee1a452..b46c8649068 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Desktop.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Desktop.tsx @@ -15,7 +15,7 @@ import Desktop_M from 'illustration:./S2_lin_desktop_96.svg'; import Desktop_S from 'illustration:./S2_lin_desktop_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Desktop(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Diamond.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Diamond.tsx index ba66a7a54af..677f6e1d9a0 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Diamond.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Diamond.tsx @@ -15,7 +15,7 @@ import Diamond_M from 'illustration:./S2_lin_diamond_96.svg'; import Diamond_S from 'illustration:./S2_lin_diamond_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Diamond(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Document.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Document.tsx index 512edee63dc..1015e96b984 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Document.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Document.tsx @@ -15,7 +15,7 @@ import Document_M from 'illustration:./S2_lin_document_96.svg'; import Document_S from 'illustration:./S2_lin_document_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Document(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Download.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Download.tsx index 569501f9abd..6d07b9a20d2 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Download.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Download.tsx @@ -15,7 +15,7 @@ import Download_M from 'illustration:./S2_lin_download_96.svg'; import Download_S from 'illustration:./S2_lin_download_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Download(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/DropToUpload.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/DropToUpload.tsx index b1933868bae..be0a258bce9 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/DropToUpload.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/DropToUpload.tsx @@ -15,7 +15,7 @@ import DropToUpload_M from 'illustration:./S2_lin_dropToUpload_96.svg'; import DropToUpload_S from 'illustration:./S2_lin_dropToUpload_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function DropToUpload(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Education.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Education.tsx index a0f2753fda7..a0e59917d93 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Education.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Education.tsx @@ -15,7 +15,7 @@ import Education_M from 'illustration:./S2_lin_education_96.svg'; import Education_S from 'illustration:./S2_lin_education_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Education(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Effects.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Effects.tsx index 93cd51dd0e2..063324307b3 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Effects.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Effects.tsx @@ -15,7 +15,7 @@ import Effects_M from 'illustration:./S2_lin_effects_96.svg'; import Effects_S from 'illustration:./S2_lin_effects_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Effects(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Emoji160.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Emoji160.tsx index 129107f405f..941caa0408d 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Emoji160.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Emoji160.tsx @@ -15,7 +15,7 @@ import Emoji160_M from 'illustration:./S2_lin_emoji_160_96.svg'; import Emoji160_S from 'illustration:./S2_lin_emoji_160_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Emoji160(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/EmptyStateExport.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/EmptyStateExport.tsx index fd18dbe7b81..b0daae916cc 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/EmptyStateExport.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/EmptyStateExport.tsx @@ -15,7 +15,7 @@ import EmptyStateExport_M from 'illustration:./S2_lin_emptyStateExport_96.svg'; import EmptyStateExport_S from 'illustration:./S2_lin_emptyStateExport_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function EmptyStateExport(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Error.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Error.tsx index a78e42a35e9..2baa8a0378a 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Error.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Error.tsx @@ -15,7 +15,7 @@ import Error_M from 'illustration:./S2_lin_error_96.svg'; import Error_S from 'illustration:./S2_lin_error_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Error(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Explosion.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Explosion.tsx index b91361073c7..71772dcc32b 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Explosion.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Explosion.tsx @@ -15,7 +15,7 @@ import Explosion_M from 'illustration:./S2_lin_explosion_96.svg'; import Explosion_S from 'illustration:./S2_lin_explosion_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Explosion(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ExportTo.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ExportTo.tsx index a02d83fbc76..c723e2a0372 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ExportTo.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ExportTo.tsx @@ -15,7 +15,7 @@ import ExportTo_M from 'illustration:./S2_lin_exportTo_96.svg'; import ExportTo_S from 'illustration:./S2_lin_exportTo_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function ExportTo(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Exposure.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Exposure.tsx index dacd5eabeb2..8475e9835b9 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Exposure.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Exposure.tsx @@ -15,7 +15,7 @@ import Exposure_M from 'illustration:./S2_lin_exposure_96.svg'; import Exposure_S from 'illustration:./S2_lin_exposure_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Exposure(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileAlert.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileAlert.tsx index e391276126f..99b638f7905 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileAlert.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileAlert.tsx @@ -15,7 +15,7 @@ import FileAlert_M from 'illustration:./S2_lin_fileAlert_96.svg'; import FileAlert_S from 'illustration:./S2_lin_fileAlert_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function FileAlert(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileImage.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileImage.tsx index 6f27b6d98d5..aef97a38ed0 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileImage.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileImage.tsx @@ -15,7 +15,7 @@ import FileImage_M from 'illustration:./S2_lin_fileImage_96.svg'; import FileImage_S from 'illustration:./S2_lin_fileImage_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function FileImage(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileText.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileText.tsx index 1adbcd48d20..6733ace6079 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileText.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileText.tsx @@ -15,7 +15,7 @@ import FileText_M from 'illustration:./S2_lin_fileText_96.svg'; import FileText_S from 'illustration:./S2_lin_fileText_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function FileText(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileVideo.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileVideo.tsx index 173982851dc..fc7e0bd71c5 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileVideo.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileVideo.tsx @@ -15,7 +15,7 @@ import FileVideo_M from 'illustration:./S2_lin_fileVideo_96.svg'; import FileVideo_S from 'illustration:./S2_lin_fileVideo_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function FileVideo(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileZip.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileZip.tsx index 61f2eb0eb23..5a3f74ac64b 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileZip.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileZip.tsx @@ -15,7 +15,7 @@ import FileZip_M from 'illustration:./S2_lin_fileZip_96.svg'; import FileZip_S from 'illustration:./S2_lin_fileZip_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function FileZip(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Filmstrip.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Filmstrip.tsx index e6eacd04ac6..c3642015623 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Filmstrip.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Filmstrip.tsx @@ -15,7 +15,7 @@ import Filmstrip_M from 'illustration:./S2_lin_filmstrip_96.svg'; import Filmstrip_S from 'illustration:./S2_lin_filmstrip_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Filmstrip(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Filter.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Filter.tsx index ee958c715a0..20265917673 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Filter.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Filter.tsx @@ -15,7 +15,7 @@ import Filter_M from 'illustration:./S2_lin_filter_96.svg'; import Filter_S from 'illustration:./S2_lin_filter_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Filter(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Filters.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Filters.tsx index a7fe208f48d..85d7632ea6c 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Filters.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Filters.tsx @@ -15,7 +15,7 @@ import Filters_M from 'illustration:./S2_lin_filters_96.svg'; import Filters_S from 'illustration:./S2_lin_filters_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Filters(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Fireworks.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Fireworks.tsx index 51ff865be61..5e1b2278bf9 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Fireworks.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Fireworks.tsx @@ -15,7 +15,7 @@ import Fireworks_M from 'illustration:./S2_lin_fireworks_96.svg'; import Fireworks_S from 'illustration:./S2_lin_fireworks_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Fireworks(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Flag.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Flag.tsx index 0cef37420ac..6b9e70c8d71 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Flag.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Flag.tsx @@ -15,7 +15,7 @@ import Flag_M from 'illustration:./S2_lin_flag_96.svg'; import Flag_S from 'illustration:./S2_lin_flag_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Flag(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FlagCheckmark.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FlagCheckmark.tsx index 610e09d684f..a8628ce3fe8 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FlagCheckmark.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FlagCheckmark.tsx @@ -15,7 +15,7 @@ import FlagCheckmark_M from 'illustration:./S2_lin_flagCheckmark_96.svg'; import FlagCheckmark_S from 'illustration:./S2_lin_flagCheckmark_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function FlagCheckmark(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FlagCross.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FlagCross.tsx index f36fc0a0a12..28405fca614 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FlagCross.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FlagCross.tsx @@ -15,7 +15,7 @@ import FlagCross_M from 'illustration:./S2_lin_flagCross_96.svg'; import FlagCross_S from 'illustration:./S2_lin_flagCross_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function FlagCross(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FolderClose.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FolderClose.tsx index 3fb54c938a8..d671e876663 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FolderClose.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FolderClose.tsx @@ -15,7 +15,7 @@ import FolderClose_M from 'illustration:./S2_lin_folderClose_96.svg'; import FolderClose_S from 'illustration:./S2_lin_folderClose_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function FolderClose(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FolderOpen.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FolderOpen.tsx index a5e75b5d20b..4ca2a865567 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FolderOpen.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FolderOpen.tsx @@ -15,7 +15,7 @@ import FolderOpen_M from 'illustration:./S2_lin_folderOpen_96.svg'; import FolderOpen_S from 'illustration:./S2_lin_folderOpen_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function FolderOpen(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FolderShared.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FolderShared.tsx index 156bce3bf06..4dfc9002085 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FolderShared.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FolderShared.tsx @@ -15,7 +15,7 @@ import FolderShared_M from 'illustration:./S2_lin_folderShared_96.svg'; import FolderShared_S from 'illustration:./S2_lin_folderShared_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function FolderShared(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/GearSetting.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/GearSetting.tsx index 48948512e6d..ecb71e5f4b3 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/GearSetting.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/GearSetting.tsx @@ -15,7 +15,7 @@ import GearSetting_M from 'illustration:./S2_lin_gearSetting_96.svg'; import GearSetting_S from 'illustration:./S2_lin_gearSetting_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function GearSetting(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Gift.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Gift.tsx index bf97ac1aa76..9b532f8b57a 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Gift.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Gift.tsx @@ -15,7 +15,7 @@ import Gift_M from 'illustration:./S2_lin_gift_96.svg'; import Gift_S from 'illustration:./S2_lin_gift_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Gift(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Globe.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Globe.tsx index 2d1c296f31b..457704f7316 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Globe.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Globe.tsx @@ -15,7 +15,7 @@ import Globe_M from 'illustration:./S2_lin_globe_96.svg'; import Globe_S from 'illustration:./S2_lin_globe_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Globe(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/GlobeGrid.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/GlobeGrid.tsx index 2d4b60253ea..d233935d298 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/GlobeGrid.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/GlobeGrid.tsx @@ -15,7 +15,7 @@ import GlobeGrid_M from 'illustration:./S2_lin_globeGrid_96.svg'; import GlobeGrid_S from 'illustration:./S2_lin_globeGrid_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function GlobeGrid(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/GraphBarChart.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/GraphBarChart.tsx index 5483fffb03c..f44df5f36b5 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/GraphBarChart.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/GraphBarChart.tsx @@ -15,7 +15,7 @@ import GraphBarChart_M from 'illustration:./S2_lin_graphBarChart_96.svg'; import GraphBarChart_S from 'illustration:./S2_lin_graphBarChart_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function GraphBarChart(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Hand.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Hand.tsx index d626a7c6766..5bd31b1f829 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Hand.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Hand.tsx @@ -15,7 +15,7 @@ import Hand_M from 'illustration:./S2_lin_hand_96.svg'; import Hand_S from 'illustration:./S2_lin_hand_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Hand(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Handshake.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Handshake.tsx index 9acf00becc6..f989708203e 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Handshake.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Handshake.tsx @@ -15,7 +15,7 @@ import Handshake_M from 'illustration:./S2_lin_handshake_96.svg'; import Handshake_S from 'illustration:./S2_lin_handshake_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Handshake(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Heart.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Heart.tsx index c1df176027f..6a278417dc1 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Heart.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Heart.tsx @@ -15,7 +15,7 @@ import Heart_M from 'illustration:./S2_lin_heart_96.svg'; import Heart_S from 'illustration:./S2_lin_heart_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Heart(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/HelpCircle.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/HelpCircle.tsx index 5879e30bc4d..0b2ddaae5ba 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/HelpCircle.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/HelpCircle.tsx @@ -15,7 +15,7 @@ import HelpCircle_M from 'illustration:./S2_lin_helpCircle_96.svg'; import HelpCircle_S from 'illustration:./S2_lin_helpCircle_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function HelpCircle(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Home.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Home.tsx index bc55ad6569f..d033dbc2afc 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Home.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Home.tsx @@ -15,7 +15,7 @@ import Home_M from 'illustration:./S2_lin_home_96.svg'; import Home_S from 'illustration:./S2_lin_home_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Home(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Illustration.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Illustration.tsx index d0f45fbd039..925a141db5c 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Illustration.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Illustration.tsx @@ -15,7 +15,7 @@ import Illustration_M from 'illustration:./S2_lin_illustration_96.svg'; import Illustration_S from 'illustration:./S2_lin_illustration_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Illustration(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Image.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Image.tsx index b2c846f7199..dee749fb422 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Image.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Image.tsx @@ -15,7 +15,7 @@ import Image_M from 'illustration:./S2_lin_image_96.svg'; import Image_S from 'illustration:./S2_lin_image_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Image(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ImageStack.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ImageStack.tsx index 9aa10bde25d..18dde59a5cd 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ImageStack.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ImageStack.tsx @@ -15,7 +15,7 @@ import ImageStack_M from 'illustration:./S2_lin_imageStack_96.svg'; import ImageStack_S from 'illustration:./S2_lin_imageStack_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function ImageStack(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/InfiniteLooping.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/InfiniteLooping.tsx index 627986cf9df..aa79583d410 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/InfiniteLooping.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/InfiniteLooping.tsx @@ -15,7 +15,7 @@ import InfiniteLooping_M from 'illustration:./S2_lin_infiniteLooping_96.svg'; import InfiniteLooping_S from 'illustration:./S2_lin_infiniteLooping_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function InfiniteLooping(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Information.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Information.tsx index 6b87e156d9f..3e4b5af6068 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Information.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Information.tsx @@ -15,7 +15,7 @@ import Information_M from 'illustration:./S2_lin_information_96.svg'; import Information_S from 'illustration:./S2_lin_information_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Information(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Interaction.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Interaction.tsx index cc43f49a531..4e49f714711 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Interaction.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Interaction.tsx @@ -15,7 +15,7 @@ import Interaction_M from 'illustration:./S2_lin_interaction_96.svg'; import Interaction_S from 'illustration:./S2_lin_interaction_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Interaction(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Laptop.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Laptop.tsx index e10e971183c..03d6be032ec 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Laptop.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Laptop.tsx @@ -15,7 +15,7 @@ import Laptop_M from 'illustration:./S2_lin_laptop_96.svg'; import Laptop_S from 'illustration:./S2_lin_laptop_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Laptop(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Layers.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Layers.tsx index 22b320977a9..5c3c1280061 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Layers.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Layers.tsx @@ -15,7 +15,7 @@ import Layers_M from 'illustration:./S2_lin_layers_96.svg'; import Layers_S from 'illustration:./S2_lin_layers_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Layers(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Libraries.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Libraries.tsx index 9c4e1979e72..da0353359d2 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Libraries.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Libraries.tsx @@ -15,7 +15,7 @@ import Libraries_M from 'illustration:./S2_lin_libraries_96.svg'; import Libraries_S from 'illustration:./S2_lin_libraries_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Libraries(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Lightbulb.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Lightbulb.tsx index c5b150f8109..4eb457cdc79 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Lightbulb.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Lightbulb.tsx @@ -15,7 +15,7 @@ import Lightbulb_M from 'illustration:./S2_lin_lightbulb_96.svg'; import Lightbulb_S from 'illustration:./S2_lin_lightbulb_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Lightbulb(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/LightbulbRays.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/LightbulbRays.tsx index e6f83a43c92..a5f5a18b438 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/LightbulbRays.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/LightbulbRays.tsx @@ -15,7 +15,7 @@ import LightbulbRays_M from 'illustration:./S2_lin_lightbulbRays_96.svg'; import LightbulbRays_S from 'illustration:./S2_lin_lightbulbRays_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function LightbulbRays(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Lighten.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Lighten.tsx index 46ca267af85..7df813bfebe 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Lighten.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Lighten.tsx @@ -15,7 +15,7 @@ import Lighten_M from 'illustration:./S2_lin_lighten_96.svg'; import Lighten_S from 'illustration:./S2_lin_lighten_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Lighten(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Link.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Link.tsx index 3324f20f2fb..0a310a86d8a 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Link.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Link.tsx @@ -15,7 +15,7 @@ import Link_M from 'illustration:./S2_lin_link_96.svg'; import Link_S from 'illustration:./S2_lin_link_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Link(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Location.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Location.tsx index d2c17dee784..46a3fa5a60f 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Location.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Location.tsx @@ -15,7 +15,7 @@ import Location_M from 'illustration:./S2_lin_location_96.svg'; import Location_S from 'illustration:./S2_lin_location_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Location(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/LockClose.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/LockClose.tsx index a2800a8f2ac..6ab00849881 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/LockClose.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/LockClose.tsx @@ -15,7 +15,7 @@ import LockClose_M from 'illustration:./S2_lin_lockClose_96.svg'; import LockClose_S from 'illustration:./S2_lin_lockClose_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function LockClose(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/LockOpen.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/LockOpen.tsx index 78c8aa4d60b..b7dbb5625fa 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/LockOpen.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/LockOpen.tsx @@ -15,7 +15,7 @@ import LockOpen_M from 'illustration:./S2_lin_lockOpen_96.svg'; import LockOpen_S from 'illustration:./S2_lin_lockOpen_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function LockOpen(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Logo.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Logo.tsx index 5c1cb6c497f..370248a0000 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Logo.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Logo.tsx @@ -15,7 +15,7 @@ import Logo_M from 'illustration:./S2_lin_logo_96.svg'; import Logo_S from 'illustration:./S2_lin_logo_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Logo(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/MagicWand.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/MagicWand.tsx index b88c185d10f..d5b5f9d2570 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/MagicWand.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/MagicWand.tsx @@ -15,7 +15,7 @@ import MagicWand_M from 'illustration:./S2_lin_magicWand_96.svg'; import MagicWand_S from 'illustration:./S2_lin_magicWand_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function MagicWand(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/MailClose.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/MailClose.tsx index 4b8ddc9743a..c1f2a0d415a 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/MailClose.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/MailClose.tsx @@ -15,7 +15,7 @@ import MailClose_M from 'illustration:./S2_lin_mailClose_96.svg'; import MailClose_S from 'illustration:./S2_lin_mailClose_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function MailClose(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/MailOpen.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/MailOpen.tsx index 08049b727f0..e719220a4dd 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/MailOpen.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/MailOpen.tsx @@ -15,7 +15,7 @@ import MailOpen_M from 'illustration:./S2_lin_mailOpen_96.svg'; import MailOpen_S from 'illustration:./S2_lin_mailOpen_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function MailOpen(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Market.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Market.tsx index 30ab431a61c..8448e5919c9 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Market.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Market.tsx @@ -15,7 +15,7 @@ import Market_M from 'illustration:./S2_lin_market_96.svg'; import Market_S from 'illustration:./S2_lin_market_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Market(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/MegaphonePromote.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/MegaphonePromote.tsx index 1e8d45b62cd..ae9bd3947d7 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/MegaphonePromote.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/MegaphonePromote.tsx @@ -15,7 +15,7 @@ import MegaphonePromote_M from 'illustration:./S2_lin_megaphonePromote_96.svg'; import MegaphonePromote_S from 'illustration:./S2_lin_megaphonePromote_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function MegaphonePromote(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/MegaphonePromoteExpressive.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/MegaphonePromoteExpressive.tsx index e91a12b2613..48608d1e460 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/MegaphonePromoteExpressive.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/MegaphonePromoteExpressive.tsx @@ -15,7 +15,7 @@ import MegaphonePromoteExpressive_M from 'illustration:./S2_lin_megaphonePromote import MegaphonePromoteExpressive_S from 'illustration:./S2_lin_megaphonePromote_Expressive_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function MegaphonePromoteExpressive(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Mention.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Mention.tsx index 815fa97dc01..baa354f3e98 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Mention.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Mention.tsx @@ -15,7 +15,7 @@ import Mention_M from 'illustration:./S2_lin_mention_96.svg'; import Mention_S from 'illustration:./S2_lin_mention_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Mention(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Microphone.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Microphone.tsx index 198b5c3dddd..e5d7ebdd94a 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Microphone.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Microphone.tsx @@ -15,7 +15,7 @@ import Microphone_M from 'illustration:./S2_lin_microphone_96.svg'; import Microphone_S from 'illustration:./S2_lin_microphone_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Microphone(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/MicrophoneOff.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/MicrophoneOff.tsx index c49c64c1715..f3bcd4edf60 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/MicrophoneOff.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/MicrophoneOff.tsx @@ -15,7 +15,7 @@ import MicrophoneOff_M from 'illustration:./S2_lin_microphoneOff_96.svg'; import MicrophoneOff_S from 'illustration:./S2_lin_microphoneOff_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function MicrophoneOff(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Minimize.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Minimize.tsx index 1d6da0a07a1..37c6e34cd01 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Minimize.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Minimize.tsx @@ -15,7 +15,7 @@ import Minimize_M from 'illustration:./S2_lin_minimize_96.svg'; import Minimize_S from 'illustration:./S2_lin_minimize_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Minimize(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/MovieCamera.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/MovieCamera.tsx index 25fb29fce69..041eb4e3ee6 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/MovieCamera.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/MovieCamera.tsx @@ -15,7 +15,7 @@ import MovieCamera_M from 'illustration:./S2_lin_movieCamera_96.svg'; import MovieCamera_S from 'illustration:./S2_lin_movieCamera_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function MovieCamera(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/MusicNote.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/MusicNote.tsx index 8f15e21ee6c..ad7ce4f7cb1 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/MusicNote.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/MusicNote.tsx @@ -15,7 +15,7 @@ import MusicNote_M from 'illustration:./S2_lin_musicNote_96.svg'; import MusicNote_S from 'illustration:./S2_lin_musicNote_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function MusicNote(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoBrands.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoBrands.tsx index 600cb99a03a..c0ed4c6c161 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoBrands.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoBrands.tsx @@ -15,7 +15,7 @@ import NoBrands_M from 'illustration:./S2_lin_noBrands_96.svg'; import NoBrands_S from 'illustration:./S2_lin_noBrands_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function NoBrands(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoComment.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoComment.tsx index ff2706589fe..fa85cd9ea92 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoComment.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoComment.tsx @@ -15,7 +15,7 @@ import NoComment_M from 'illustration:./S2_lin_noComment_96.svg'; import NoComment_S from 'illustration:./S2_lin_noComment_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function NoComment(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoComments.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoComments.tsx index da8260697a2..120363cce31 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoComments.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoComments.tsx @@ -15,7 +15,7 @@ import NoComments_M from 'illustration:./S2_lin_noComments_96.svg'; import NoComments_S from 'illustration:./S2_lin_noComments_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function NoComments(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoElements.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoElements.tsx index 9b815e718c7..897b9f0e65a 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoElements.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoElements.tsx @@ -15,7 +15,7 @@ import NoElements_M from 'illustration:./S2_lin_noElements_96.svg'; import NoElements_S from 'illustration:./S2_lin_noElements_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function NoElements(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoFile.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoFile.tsx index a354e324b43..fed875fb77b 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoFile.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoFile.tsx @@ -15,7 +15,7 @@ import NoFile_M from 'illustration:./S2_lin_noFile_96.svg'; import NoFile_S from 'illustration:./S2_lin_noFile_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function NoFile(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoFilter.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoFilter.tsx index 5da2292e8a7..b8f17019feb 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoFilter.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoFilter.tsx @@ -15,7 +15,7 @@ import NoFilter_M from 'illustration:./S2_lin_noFilter_96.svg'; import NoFilter_S from 'illustration:./S2_lin_noFilter_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function NoFilter(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoImage.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoImage.tsx index 39a73962910..6575e341f71 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoImage.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoImage.tsx @@ -15,7 +15,7 @@ import NoImage_M from 'illustration:./S2_lin_noImage_96.svg'; import NoImage_S from 'illustration:./S2_lin_noImage_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function NoImage(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoInternetConnection.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoInternetConnection.tsx index 3de50c2f0e8..7fcb7c31bae 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoInternetConnection.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoInternetConnection.tsx @@ -15,7 +15,7 @@ import NoInternetConnection_M from 'illustration:./S2_lin_noInternetConnection_9 import NoInternetConnection_S from 'illustration:./S2_lin_noInternetConnection_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function NoInternetConnection(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoLibraries.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoLibraries.tsx index 8f9fc89f381..19c9737a1e1 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoLibraries.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoLibraries.tsx @@ -15,7 +15,7 @@ import NoLibraries_M from 'illustration:./S2_lin_noLibraries_96.svg'; import NoLibraries_S from 'illustration:./S2_lin_noLibraries_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function NoLibraries(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoLibrariesBrands.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoLibrariesBrands.tsx index 50fdc367d6c..cb5eef30c1c 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoLibrariesBrands.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoLibrariesBrands.tsx @@ -15,7 +15,7 @@ import NoLibrariesBrands_M from 'illustration:./S2_lin_noLibrariesBrands_96.svg' import NoLibrariesBrands_S from 'illustration:./S2_lin_noLibrariesBrands_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function NoLibrariesBrands(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoReviewLinks.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoReviewLinks.tsx index 7d50a240995..9e812f0c9ac 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoReviewLinks.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoReviewLinks.tsx @@ -15,7 +15,7 @@ import NoReviewLinks_M from 'illustration:./S2_lin_noReviewLinks_96.svg'; import NoReviewLinks_S from 'illustration:./S2_lin_noReviewLinks_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function NoReviewLinks(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoSearchResults.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoSearchResults.tsx index 2c5e0bb6478..2110d951836 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoSearchResults.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoSearchResults.tsx @@ -15,7 +15,7 @@ import NoSearchResults_M from 'illustration:./S2_lin_noSearchResults_96.svg'; import NoSearchResults_S from 'illustration:./S2_lin_noSearchResults_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function NoSearchResults(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoSharedFile.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoSharedFile.tsx index 3054d141147..a45dfd8fa18 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoSharedFile.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoSharedFile.tsx @@ -15,7 +15,7 @@ import NoSharedFile_M from 'illustration:./S2_lin_noSharedFile_96.svg'; import NoSharedFile_S from 'illustration:./S2_lin_noSharedFile_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function NoSharedFile(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Paperairplane.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Paperairplane.tsx index fd6c17f6eb5..0ac7c287be5 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Paperairplane.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Paperairplane.tsx @@ -15,7 +15,7 @@ import Paperairplane_M from 'illustration:./S2_lin_paperairplane_96.svg'; import Paperairplane_S from 'illustration:./S2_lin_paperairplane_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Paperairplane(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Paperclip.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Paperclip.tsx index 1770b811e92..acf97450b36 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Paperclip.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Paperclip.tsx @@ -15,7 +15,7 @@ import Paperclip_M from 'illustration:./S2_lin_paperclip_96.svg'; import Paperclip_S from 'illustration:./S2_lin_paperclip_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Paperclip(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Pause.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Pause.tsx index 96bfda31205..42db2ab6712 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Pause.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Pause.tsx @@ -15,7 +15,7 @@ import Pause_M from 'illustration:./S2_lin_pause_96.svg'; import Pause_S from 'illustration:./S2_lin_pause_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Pause(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Pencil.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Pencil.tsx index 7d01ea1d7d6..e42ae08bb44 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Pencil.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Pencil.tsx @@ -15,7 +15,7 @@ import Pencil_M from 'illustration:./S2_lin_pencil_96.svg'; import Pencil_S from 'illustration:./S2_lin_pencil_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Pencil(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Phone.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Phone.tsx index b329b72fc5a..d7f62017d6e 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Phone.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Phone.tsx @@ -15,7 +15,7 @@ import Phone_M from 'illustration:./S2_lin_phone_96.svg'; import Phone_S from 'illustration:./S2_lin_phone_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Phone(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/PieChart.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/PieChart.tsx index cb3a630ac06..8c57b529ff4 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/PieChart.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/PieChart.tsx @@ -15,7 +15,7 @@ import PieChart_M from 'illustration:./S2_lin_pieChart_96.svg'; import PieChart_S from 'illustration:./S2_lin_pieChart_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function PieChart(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/PiggyBank.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/PiggyBank.tsx index 94778b59394..889f46d64a3 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/PiggyBank.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/PiggyBank.tsx @@ -15,7 +15,7 @@ import PiggyBank_M from 'illustration:./S2_lin_piggyBank_96.svg'; import PiggyBank_S from 'illustration:./S2_lin_piggyBank_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function PiggyBank(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Pin.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Pin.tsx index 709a0b18d32..998df37a2cf 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Pin.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Pin.tsx @@ -15,7 +15,7 @@ import Pin_M from 'illustration:./S2_lin_pin_96.svg'; import Pin_S from 'illustration:./S2_lin_pin_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Pin(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Play.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Play.tsx index 83e6b37c357..f654cb68d12 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Play.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Play.tsx @@ -15,7 +15,7 @@ import Play_M from 'illustration:./S2_lin_play_96.svg'; import Play_S from 'illustration:./S2_lin_play_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Play(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/PlayTriangle.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/PlayTriangle.tsx index e42a3bf9904..b54519f7f67 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/PlayTriangle.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/PlayTriangle.tsx @@ -15,7 +15,7 @@ import PlayTriangle_M from 'illustration:./S2_lin_playTriangle_96.svg'; import PlayTriangle_S from 'illustration:./S2_lin_playTriangle_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function PlayTriangle(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Plugin.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Plugin.tsx index 7916c7739a2..b017385aa9b 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Plugin.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Plugin.tsx @@ -15,7 +15,7 @@ import Plugin_M from 'illustration:./S2_lin_plugin_96.svg'; import Plugin_S from 'illustration:./S2_lin_plugin_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Plugin(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Prompt.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Prompt.tsx index 537a852497b..d41843895cb 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Prompt.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Prompt.tsx @@ -15,7 +15,7 @@ import Prompt_M from 'illustration:./S2_lin_prompt_96.svg'; import Prompt_S from 'illustration:./S2_lin_prompt_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Prompt(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Properties.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Properties.tsx index d84c800d731..fc4257eb8f0 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Properties.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Properties.tsx @@ -15,7 +15,7 @@ import Properties_M from 'illustration:./S2_lin_properties_96.svg'; import Properties_S from 'illustration:./S2_lin_properties_48.svg'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Properties(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Redo.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Redo.tsx index 9c7bd571207..e4489a36177 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Redo.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Redo.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon'; import Redo_L from 'illustration:./S2_lin_redo_160.svg'; import Redo_M from 'illustration:./S2_lin_redo_96.svg'; import Redo_S from 'illustration:./S2_lin_redo_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Redo(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Remix.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Remix.tsx index a05e3b09392..02c6ec3ebfe 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Remix.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Remix.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon'; import Remix_L from 'illustration:./S2_lin_remix_160.svg'; import Remix_M from 'illustration:./S2_lin_remix_96.svg'; import Remix_S from 'illustration:./S2_lin_remix_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Remix(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Replace.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Replace.tsx index e6998cc9c34..31d48ff8119 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Replace.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Replace.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon'; import Replace_L from 'illustration:./S2_lin_replace_160.svg'; import Replace_M from 'illustration:./S2_lin_replace_96.svg'; import Replace_S from 'illustration:./S2_lin_replace_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Replace(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ReportAbuse.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ReportAbuse.tsx index 72a574e0d50..339d90c74e4 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ReportAbuse.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ReportAbuse.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon'; import ReportAbuse_L from 'illustration:./S2_lin_reportAbuse_160.svg'; import ReportAbuse_M from 'illustration:./S2_lin_reportAbuse_96.svg'; import ReportAbuse_S from 'illustration:./S2_lin_reportAbuse_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function ReportAbuse(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Revert.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Revert.tsx index 3df8dfb3ac3..6e0880fe2cb 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Revert.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Revert.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon'; import Revert_L from 'illustration:./S2_lin_revert_160.svg'; import Revert_M from 'illustration:./S2_lin_revert_96.svg'; import Revert_S from 'illustration:./S2_lin_revert_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Revert(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Ribbon.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Ribbon.tsx index 4ed3d162881..12f9aca92cb 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Ribbon.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Ribbon.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon'; import Ribbon_L from 'illustration:./S2_lin_ribbon_160.svg'; import Ribbon_M from 'illustration:./S2_lin_ribbon_96.svg'; import Ribbon_S from 'illustration:./S2_lin_ribbon_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Ribbon(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Rocket.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Rocket.tsx index e8c49bdab1d..1a36de967f7 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Rocket.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Rocket.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon'; import Rocket_L from 'illustration:./S2_lin_rocket_160.svg'; import Rocket_M from 'illustration:./S2_lin_rocket_96.svg'; import Rocket_S from 'illustration:./S2_lin_rocket_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Rocket(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/RotateCCW.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/RotateCCW.tsx index be44cd7eb66..e9043ff7748 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/RotateCCW.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/RotateCCW.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon'; import RotateCCW_L from 'illustration:./S2_lin_rotateCCW_160.svg'; import RotateCCW_M from 'illustration:./S2_lin_rotateCCW_96.svg'; import RotateCCW_S from 'illustration:./S2_lin_rotateCCW_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function RotateCCW(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/RotateCW.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/RotateCW.tsx index b836393c34b..31c4ea73c30 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/RotateCW.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/RotateCW.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon'; import RotateCW_L from 'illustration:./S2_lin_rotateCW_160.svg'; import RotateCW_M from 'illustration:./S2_lin_rotateCW_96.svg'; import RotateCW_S from 'illustration:./S2_lin_rotateCW_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function RotateCW(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Ruler.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Ruler.tsx index 2684dfab48a..ec1a4ecd6aa 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Ruler.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Ruler.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon'; import Ruler_L from 'illustration:./S2_lin_ruler_160.svg'; import Ruler_M from 'illustration:./S2_lin_ruler_96.svg'; import Ruler_S from 'illustration:./S2_lin_ruler_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Ruler(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Search.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Search.tsx index 261e60bc093..7f3cb65cbf5 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Search.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Search.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon'; import Search_L from 'illustration:./S2_lin_search_160.svg'; import Search_M from 'illustration:./S2_lin_search_96.svg'; import Search_S from 'illustration:./S2_lin_search_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Search(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Segmentation.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Segmentation.tsx index f4cf5999d50..a94a76ab398 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Segmentation.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Segmentation.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon'; import Segmentation_L from 'illustration:./S2_lin_segmentation_160.svg'; import Segmentation_M from 'illustration:./S2_lin_segmentation_96.svg'; import Segmentation_S from 'illustration:./S2_lin_segmentation_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Segmentation(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Server.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Server.tsx index e91061c974c..67cfeba8ffc 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Server.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Server.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon'; import Server_L from 'illustration:./S2_lin_server_160.svg'; import Server_M from 'illustration:./S2_lin_server_96.svg'; import Server_S from 'illustration:./S2_lin_server_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Server(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Shapes.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Shapes.tsx index b2ab4199499..0275a48a5ea 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Shapes.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Shapes.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon'; import Shapes_L from 'illustration:./S2_lin_shapes_160.svg'; import Shapes_M from 'illustration:./S2_lin_shapes_96.svg'; import Shapes_S from 'illustration:./S2_lin_shapes_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Shapes(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ShoppingBag.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ShoppingBag.tsx index 452ae0caacf..a34d873f107 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ShoppingBag.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ShoppingBag.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon'; import ShoppingBag_L from 'illustration:./S2_lin_shoppingBag_160.svg'; import ShoppingBag_M from 'illustration:./S2_lin_shoppingBag_96.svg'; import ShoppingBag_S from 'illustration:./S2_lin_shoppingBag_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function ShoppingBag(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ShoppingCart.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ShoppingCart.tsx index 12cbabc73f2..87232b47ed0 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ShoppingCart.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ShoppingCart.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon'; import ShoppingCart_L from 'illustration:./S2_lin_shoppingCart_160.svg'; import ShoppingCart_M from 'illustration:./S2_lin_shoppingCart_96.svg'; import ShoppingCart_S from 'illustration:./S2_lin_shoppingCart_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function ShoppingCart(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/SocialPost.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/SocialPost.tsx index 6786057a494..6602043a68a 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/SocialPost.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/SocialPost.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon'; import SocialPost_L from 'illustration:./S2_lin_socialPost_160.svg'; import SocialPost_M from 'illustration:./S2_lin_socialPost_96.svg'; import SocialPost_S from 'illustration:./S2_lin_socialPost_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function SocialPost(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Sparkles.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Sparkles.tsx index 2f55e44e137..dd189e2eb8e 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Sparkles.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Sparkles.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon'; import Sparkles_L from 'illustration:./S2_lin_sparkles_160.svg'; import Sparkles_M from 'illustration:./S2_lin_sparkles_96.svg'; import Sparkles_S from 'illustration:./S2_lin_sparkles_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Sparkles(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/SpeedFast.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/SpeedFast.tsx index 45f7d71428f..37918ec3a78 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/SpeedFast.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/SpeedFast.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon'; import SpeedFast_L from 'illustration:./S2_lin_speedFast_160.svg'; import SpeedFast_M from 'illustration:./S2_lin_speedFast_96.svg'; import SpeedFast_S from 'illustration:./S2_lin_speedFast_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function SpeedFast(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/StampClone.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/StampClone.tsx index 72ef68cebc0..b34dec9b3eb 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/StampClone.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/StampClone.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon'; import StampClone_L from 'illustration:./S2_lin_stampClone_160.svg'; import StampClone_M from 'illustration:./S2_lin_stampClone_96.svg'; import StampClone_S from 'illustration:./S2_lin_stampClone_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function StampClone(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Star.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Star.tsx index 8831726f73f..bfae761de73 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Star.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Star.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon'; import Star_L from 'illustration:./S2_lin_star_160.svg'; import Star_M from 'illustration:./S2_lin_star_96.svg'; import Star_S from 'illustration:./S2_lin_star_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Star(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/StepForward.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/StepForward.tsx index 629f6677a34..5f53bf2f1a3 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/StepForward.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/StepForward.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon'; import StepForward_L from 'illustration:./S2_lin_stepForward_160.svg'; import StepForward_M from 'illustration:./S2_lin_stepForward_96.svg'; import StepForward_S from 'illustration:./S2_lin_stepForward_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function StepForward(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Stopwatch.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Stopwatch.tsx index f9a48007dba..5e2c59303cd 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Stopwatch.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Stopwatch.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon'; import Stopwatch_L from 'illustration:./S2_lin_stopwatch_160.svg'; import Stopwatch_M from 'illustration:./S2_lin_stopwatch_96.svg'; import Stopwatch_S from 'illustration:./S2_lin_stopwatch_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Stopwatch(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Switch.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Switch.tsx index acd6a2ec4cb..29264587a00 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Switch.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Switch.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon'; import Switch_L from 'illustration:./S2_lin_switch_160.svg'; import Switch_M from 'illustration:./S2_lin_switch_96.svg'; import Switch_S from 'illustration:./S2_lin_switch_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Switch(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Tablet.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Tablet.tsx index 3dbbb6a17f1..4151fb2ff94 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Tablet.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Tablet.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon'; import Tablet_L from 'illustration:./S2_lin_tablet_160.svg'; import Tablet_M from 'illustration:./S2_lin_tablet_96.svg'; import Tablet_S from 'illustration:./S2_lin_tablet_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Tablet(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Tag.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Tag.tsx index 503998e8ba2..593677be9ee 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Tag.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Tag.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon'; import Tag_L from 'illustration:./S2_lin_tag_160.svg'; import Tag_M from 'illustration:./S2_lin_tag_96.svg'; import Tag_S from 'illustration:./S2_lin_tag_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Tag(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Targeted.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Targeted.tsx index cb60e8ffe6b..a3d336485bd 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Targeted.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Targeted.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon'; import Targeted_L from 'illustration:./S2_lin_targeted_160.svg'; import Targeted_M from 'illustration:./S2_lin_targeted_96.svg'; import Targeted_S from 'illustration:./S2_lin_targeted_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Targeted(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Text.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Text.tsx index a10152b64ce..2586aab86f0 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Text.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Text.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon'; import Text_L from 'illustration:./S2_lin_text_160.svg'; import Text_M from 'illustration:./S2_lin_text_96.svg'; import Text_S from 'illustration:./S2_lin_text_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Text(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ThreeArrowsCircle.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ThreeArrowsCircle.tsx index 9682c0bd60e..5ca75ea6c4a 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ThreeArrowsCircle.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ThreeArrowsCircle.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon'; import ThreeArrowsCircle_L from 'illustration:./S2_lin_threeArrowsCircle_160.svg'; import ThreeArrowsCircle_M from 'illustration:./S2_lin_threeArrowsCircle_96.svg'; import ThreeArrowsCircle_S from 'illustration:./S2_lin_threeArrowsCircle_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function ThreeArrowsCircle(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ThumbsDown.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ThumbsDown.tsx index d1b10ccf65e..c6cc8554a64 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ThumbsDown.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ThumbsDown.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon'; import ThumbsDown_L from 'illustration:./S2_lin_thumbsDown_160.svg'; import ThumbsDown_M from 'illustration:./S2_lin_thumbsDown_96.svg'; import ThumbsDown_S from 'illustration:./S2_lin_thumbsDown_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function ThumbsDown(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ThumbsUp.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ThumbsUp.tsx index 8a78422083d..2bbacb56075 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ThumbsUp.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ThumbsUp.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon'; import ThumbsUp_L from 'illustration:./S2_lin_thumbsUp_160.svg'; import ThumbsUp_M from 'illustration:./S2_lin_thumbsUp_96.svg'; import ThumbsUp_S from 'illustration:./S2_lin_thumbsUp_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function ThumbsUp(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Transform.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Transform.tsx index 8ce41a13d4e..198ad0eda06 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Transform.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Transform.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon'; import Transform_L from 'illustration:./S2_lin_transform_160.svg'; import Transform_M from 'illustration:./S2_lin_transform_96.svg'; import Transform_S from 'illustration:./S2_lin_transform_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Transform(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Translate.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Translate.tsx index f409d36da99..b82cfe7f73b 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Translate.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Translate.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon'; import Translate_L from 'illustration:./S2_lin_translate_160.svg'; import Translate_M from 'illustration:./S2_lin_translate_96.svg'; import Translate_S from 'illustration:./S2_lin_translate_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Translate(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Trash.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Trash.tsx index 18beb7893b2..d557473337e 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Trash.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Trash.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon'; import Trash_L from 'illustration:./S2_lin_trash_160.svg'; import Trash_M from 'illustration:./S2_lin_trash_96.svg'; import Trash_S from 'illustration:./S2_lin_trash_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Trash(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Trophy.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Trophy.tsx index 5d9f88d6050..e1205259d80 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Trophy.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Trophy.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon'; import Trophy_L from 'illustration:./S2_lin_trophy_160.svg'; import Trophy_M from 'illustration:./S2_lin_trophy_96.svg'; import Trophy_S from 'illustration:./S2_lin_trophy_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Trophy(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Update.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Update.tsx index 6312c9c57d8..5b9a60de384 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Update.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Update.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon'; import Update_L from 'illustration:./S2_lin_update_160.svg'; import Update_M from 'illustration:./S2_lin_update_96.svg'; import Update_S from 'illustration:./S2_lin_update_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Update(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Upload.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Upload.tsx index ca6155d24e3..6bbe04c810b 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Upload.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Upload.tsx @@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon'; import Upload_L from 'illustration:./S2_lin_upload_160.svg'; import Upload_M from 'illustration:./S2_lin_upload_96.svg'; import Upload_S from 'illustration:./S2_lin_upload_48.svg'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; export default function Upload(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode { [props] = useContextProps(props, null, IllustrationContext); diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/User.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/User.tsx index c344db52244..b8bef803f81 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/User.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/User.tsx @@ -12,7 +12,7 @@ 'use client'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; import User_L from 'illustration:./S2_lin_user_160.svg'; import User_M from 'illustration:./S2_lin_user_96.svg'; import User_S from 'illustration:./S2_lin_user_48.svg'; diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/UserAvatar.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/UserAvatar.tsx index 134f8c8cc49..fc27f249ba9 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/UserAvatar.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/UserAvatar.tsx @@ -12,7 +12,7 @@ 'use client'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; import UserAvatar_L from 'illustration:./S2_lin_userAvatar_160.svg'; import UserAvatar_M from 'illustration:./S2_lin_userAvatar_96.svg'; import UserAvatar_S from 'illustration:./S2_lin_userAvatar_48.svg'; diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/UserGroup.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/UserGroup.tsx index 8420e460a4f..14013ad4f8c 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/UserGroup.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/UserGroup.tsx @@ -12,7 +12,7 @@ 'use client'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; import UserGroup_L from 'illustration:./S2_lin_userGroup_160.svg'; import UserGroup_M from 'illustration:./S2_lin_userGroup_96.svg'; import UserGroup_S from 'illustration:./S2_lin_userGroup_48.svg'; diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/VectorDraw.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/VectorDraw.tsx index 67a094e942e..69d4c245cc6 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/VectorDraw.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/VectorDraw.tsx @@ -12,7 +12,7 @@ 'use client'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; import VectorDraw_L from 'illustration:./S2_lin_vectorDraw_160.svg'; import VectorDraw_M from 'illustration:./S2_lin_vectorDraw_96.svg'; import VectorDraw_S from 'illustration:./S2_lin_vectorDraw_48.svg'; diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Video.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Video.tsx index 5afd97af1f7..be068299126 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Video.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Video.tsx @@ -12,7 +12,7 @@ 'use client'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; import Video_L from 'illustration:./S2_lin_video_160.svg'; import Video_M from 'illustration:./S2_lin_video_96.svg'; import Video_S from 'illustration:./S2_lin_video_48.svg'; diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Volume.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Volume.tsx index e4ab1129f62..97f98e31e8f 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Volume.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Volume.tsx @@ -12,7 +12,7 @@ 'use client'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; import Volume_L from 'illustration:./S2_lin_volume_160.svg'; import Volume_M from 'illustration:./S2_lin_volume_96.svg'; import Volume_S from 'illustration:./S2_lin_volume_48.svg'; diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/VolumeOff.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/VolumeOff.tsx index 0db2701e704..45c3aa458f9 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/VolumeOff.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/VolumeOff.tsx @@ -12,7 +12,7 @@ 'use client'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; import VolumeOff_L from 'illustration:./S2_lin_volumeOff_160.svg'; import VolumeOff_M from 'illustration:./S2_lin_volumeOff_96.svg'; import VolumeOff_S from 'illustration:./S2_lin_volumeOff_48.svg'; diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/VolumeOne.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/VolumeOne.tsx index aa77a29d322..4e20fccae15 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/VolumeOne.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/VolumeOne.tsx @@ -12,7 +12,7 @@ 'use client'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; import VolumeOne_L from 'illustration:./S2_lin_volumeOne_160.svg'; import VolumeOne_M from 'illustration:./S2_lin_volumeOne_96.svg'; import VolumeOne_S from 'illustration:./S2_lin_volumeOne_48.svg'; diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Wallet.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Wallet.tsx index eced80cde8f..b31d648625f 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Wallet.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Wallet.tsx @@ -12,7 +12,7 @@ 'use client'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; import Wallet_L from 'illustration:./S2_lin_wallet_160.svg'; import Wallet_M from 'illustration:./S2_lin_wallet_96.svg'; import Wallet_S from 'illustration:./S2_lin_wallet_48.svg'; diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Warning.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Warning.tsx index 5c2d86693b0..0fcbb7399c4 100644 --- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Warning.tsx +++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Warning.tsx @@ -12,7 +12,7 @@ 'use client'; import {ReactNode} from 'react'; import {IconProps, IllustrationContext} from '../../src/Icon'; -import {useContextProps} from 'react-aria-components/utils'; +import {useContextProps} from 'react-aria-components/slots'; import Warning_L from 'illustration:./S2_lin_warning_160.svg'; import Warning_M from 'illustration:./S2_lin_warning_96.svg'; import Warning_S from 'illustration:./S2_lin_warning_48.svg'; diff --git a/packages/@react-spectrum/s2/src/Accordion.tsx b/packages/@react-spectrum/s2/src/Accordion.tsx index 4c31c0d14ba..3c4ac2f03dd 100644 --- a/packages/@react-spectrum/s2/src/Accordion.tsx +++ b/packages/@react-spectrum/s2/src/Accordion.tsx @@ -11,7 +11,7 @@ */ import {AriaLabelingProps, DOMProps, DOMRef, DOMRefValue, Key} from '@react-types/shared'; -import {ContextValue, RenderProps, SlotProps} from 'react-aria-components/utils'; +import {ContextValue, SlotProps} from 'react-aria-components/slots'; import { Disclosure, DisclosureContext, @@ -22,6 +22,7 @@ import { import {DisclosureGroup} from 'react-aria-components/DisclosureGroup'; import {getAllowedOverrides, StyleProps, StylesPropWithHeight, UnsafeStyles} from './style-utils' with { type: 'macro' }; import React, {createContext, forwardRef, ReactNode} from 'react'; +import {RenderProps} from 'react-aria-components/useRenderProps'; import {style} from '../style' with { type: 'macro' }; import {useDOMRef} from './useDOMRef'; import {useSpectrumContextProps} from './useSpectrumContextProps'; diff --git a/packages/@react-spectrum/s2/src/ActionBar.tsx b/packages/@react-spectrum/s2/src/ActionBar.tsx index 460dae50378..ffc42fab4e9 100644 --- a/packages/@react-spectrum/s2/src/ActionBar.tsx +++ b/packages/@react-spectrum/s2/src/ActionBar.tsx @@ -13,7 +13,7 @@ import {ActionButtonGroup} from './ActionButtonGroup'; import {announce} from 'react-aria/private/live-announcer/LiveAnnouncer'; import {CloseButton} from './CloseButton'; -import {ContextValue, SlotProps} from 'react-aria-components/utils'; +import {ContextValue, SlotProps} from 'react-aria-components/slots'; import {createContext, ForwardedRef, forwardRef, ReactElement, ReactNode, RefObject, useCallback, useEffect, useMemo, useRef, useState} from 'react'; import {DOMProps, DOMRef, DOMRefValue, Key} from '@react-types/shared'; import {FocusScope} from 'react-aria/FocusScope'; @@ -21,7 +21,7 @@ import intlMessages from '../intl/*.json'; // @ts-ignore import {lightDark, style} from '../style' with {type: 'macro'}; import {StyleProps} from './style-utils' with { type: 'macro' }; -import {useControlledState} from 'react-stately/private/utils/useControlledState'; +import {useControlledState} from 'react-stately/useControlledState'; import {useDOMRef} from './useDOMRef'; import {useEnterAnimation, useExitAnimation} from 'react-aria/private/utils/animation'; import {useKeyboard} from 'react-aria/useKeyboard'; diff --git a/packages/@react-spectrum/s2/src/ActionButton.tsx b/packages/@react-spectrum/s2/src/ActionButton.tsx index 9642053d64c..bdb3ca7f27f 100644 --- a/packages/@react-spectrum/s2/src/ActionButton.tsx +++ b/packages/@react-spectrum/s2/src/ActionButton.tsx @@ -15,7 +15,7 @@ import {AvatarContext} from './Avatar'; import {baseColor, focusRing, fontRelative, lightDark, style} from '../style' with { type: 'macro' }; import {ButtonProps, ButtonRenderProps, Button as RACButton} from 'react-aria-components/Button'; import {centerBaseline} from './CenterBaseline'; -import {ContextValue, Provider, useSlottedContext} from 'react-aria-components/utils'; +import {ContextValue, Provider, useSlottedContext} from 'react-aria-components/slots'; import {control, getAllowedOverrides, staticColor, StyleProps} from './style-utils' with { type: 'macro' }; import {createContext, forwardRef, ReactNode, useContext} from 'react'; import {FocusableRef, FocusableRefValue, GlobalDOMAttributes} from '@react-types/shared'; diff --git a/packages/@react-spectrum/s2/src/ActionButtonGroup.tsx b/packages/@react-spectrum/s2/src/ActionButtonGroup.tsx index c97ff6a8153..d06dda5129a 100644 --- a/packages/@react-spectrum/s2/src/ActionButtonGroup.tsx +++ b/packages/@react-spectrum/s2/src/ActionButtonGroup.tsx @@ -11,7 +11,7 @@ */ import {AriaLabelingProps} from '@react-types/shared'; -import {ContextValue, SlotProps} from 'react-aria-components/utils'; +import {ContextValue, SlotProps} from 'react-aria-components/slots'; import {createContext, ForwardedRef, forwardRef, ReactNode} from 'react'; import {getAllowedOverrides, StylesPropWithHeight, UnsafeStyles} from './style-utils' with {type: 'macro'}; import {style} from '../style' with {type: 'macro'}; diff --git a/packages/@react-spectrum/s2/src/ActionMenu.tsx b/packages/@react-spectrum/s2/src/ActionMenu.tsx index d4ce8173316..b7b5cb63269 100644 --- a/packages/@react-spectrum/s2/src/ActionMenu.tsx +++ b/packages/@react-spectrum/s2/src/ActionMenu.tsx @@ -12,9 +12,9 @@ import {ActionButton, ActionButtonProps} from './ActionButton'; import {AriaLabelingProps, DOMProps, FocusableRef, FocusableRefValue} from '@react-types/shared'; -import {ContextValue} from 'react-aria-components/utils'; +import {ContextValue} from 'react-aria-components/slots'; import {createContext, forwardRef} from 'react'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {forwardRefType} from './types'; // @ts-ignore import intlMessages from '../intl/*.json'; diff --git a/packages/@react-spectrum/s2/src/AlertDialog.tsx b/packages/@react-spectrum/s2/src/AlertDialog.tsx index 23352fac67f..ffd25220a55 100644 --- a/packages/@react-spectrum/s2/src/AlertDialog.tsx +++ b/packages/@react-spectrum/s2/src/AlertDialog.tsx @@ -14,7 +14,7 @@ import AlertTriangle from '../s2wf-icons/S2_Icon_AlertTriangle_20_N.svg'; import {Button} from './Button'; import {ButtonGroup} from './ButtonGroup'; import {CenterBaseline} from './CenterBaseline'; -import {chain} from 'react-aria/private/utils/chain'; +import {chain} from 'react-aria/chain'; import {Content, Heading} from './Content'; import {Dialog} from './Dialog'; import {DOMProps, DOMRef} from '@react-types/shared'; @@ -23,7 +23,7 @@ import {IconContext} from './Icon'; // @ts-ignore import intlMessages from '../intl/*.json'; import NoticeSquare from '../s2wf-icons/S2_Icon_AlertDiamond_20_N.svg'; -import {Provider} from 'react-aria-components/utils'; +import {Provider} from 'react-aria-components/slots'; import {style} from '../style' with {type: 'macro'}; import {UnsafeStyles} from './style-utils' with {type: 'macro'}; import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter'; diff --git a/packages/@react-spectrum/s2/src/Avatar.tsx b/packages/@react-spectrum/s2/src/Avatar.tsx index 9c007741f87..cabe4159a25 100644 --- a/packages/@react-spectrum/s2/src/Avatar.tsx +++ b/packages/@react-spectrum/s2/src/Avatar.tsx @@ -11,10 +11,10 @@ */ import {centerBaselineBefore} from './CenterBaseline'; -import {ContextValue, SlotProps} from 'react-aria-components/utils'; +import {ContextValue, SlotProps} from 'react-aria-components/slots'; import {createContext, forwardRef} from 'react'; import {DOMProps, DOMRef, DOMRefValue} from '@react-types/shared'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {getAllowedOverrides, StylesPropWithoutWidth, UnsafeStyles} from './style-utils' with {type: 'macro'}; import {Image} from './Image'; import {isDocsEnv} from './macros' with {type: 'macro'}; diff --git a/packages/@react-spectrum/s2/src/AvatarGroup.tsx b/packages/@react-spectrum/s2/src/AvatarGroup.tsx index c8ecd4032d9..6eb2f49f18a 100644 --- a/packages/@react-spectrum/s2/src/AvatarGroup.tsx +++ b/packages/@react-spectrum/s2/src/AvatarGroup.tsx @@ -12,9 +12,9 @@ import {AriaLabelingProps, DOMProps, DOMRef, DOMRefValue} from '@react-types/shared'; import {AvatarContext} from './Avatar'; -import {ContextValue, SlotProps} from 'react-aria-components/utils'; +import {ContextValue, SlotProps} from 'react-aria-components/slots'; import {createContext, CSSProperties, forwardRef, ReactNode} from 'react'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {getAllowedOverrides, StylesPropWithoutWidth, UnsafeStyles} from './style-utils' with {type: 'macro'}; import {style} from '../style' with {type: 'macro'}; import {useDOMRef} from './useDOMRef'; diff --git a/packages/@react-spectrum/s2/src/Badge.tsx b/packages/@react-spectrum/s2/src/Badge.tsx index c8a95b8f85e..520777f6c62 100644 --- a/packages/@react-spectrum/s2/src/Badge.tsx +++ b/packages/@react-spectrum/s2/src/Badge.tsx @@ -12,9 +12,9 @@ import {AriaLabelingProps, DOMProps, DOMRef, DOMRefValue} from '@react-types/shared'; import {centerBaseline} from './CenterBaseline'; -import {ContextValue, Provider, SlotProps} from 'react-aria-components/utils'; +import {ContextValue, Provider, SlotProps} from 'react-aria-components/slots'; import {control, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'}; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {fontRelative, lightDark, style} from '../style' with {type: 'macro'}; import {IconContext} from './Icon'; import {TextContext as RACTextContext} from 'react-aria-components/Text'; diff --git a/packages/@react-spectrum/s2/src/Breadcrumbs.tsx b/packages/@react-spectrum/s2/src/Breadcrumbs.tsx index a221fe0b836..19ed8b00118 100644 --- a/packages/@react-spectrum/s2/src/Breadcrumbs.tsx +++ b/packages/@react-spectrum/s2/src/Breadcrumbs.tsx @@ -22,8 +22,8 @@ import { import {baseColor, focusRing, size, style} from '../style' with { type: 'macro' }; import ChevronIcon from '../ui-icons/Chevron'; import {Collection, DOMRef, DOMRefValue, GlobalDOMAttributes, LinkDOMProps, Node} from '@react-types/shared'; -import {CollectionRenderer, CollectionRendererContext, DefaultCollectionRenderer} from 'react-aria-components/Collection'; -import {ContextValue, Provider} from 'react-aria-components/utils'; +import {CollectionRenderer, CollectionRendererContext, DefaultCollectionRenderer} from 'react-aria-components/CollectionBuilder'; +import {ContextValue, Provider} from 'react-aria-components/slots'; import {controlFont, controlSize, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'}; import {createContext, forwardRef, Fragment, ReactNode, RefObject, useCallback, useContext, useEffect, useMemo, useRef, useState} from 'react'; import FolderIcon from '../s2wf-icons/S2_Icon_FolderBreadcrumb_20_N.svg'; diff --git a/packages/@react-spectrum/s2/src/Button.tsx b/packages/@react-spectrum/s2/src/Button.tsx index e0d25e367bd..30144e8b53b 100644 --- a/packages/@react-spectrum/s2/src/Button.tsx +++ b/packages/@react-spectrum/s2/src/Button.tsx @@ -13,7 +13,7 @@ import {baseColor, focusRing, fontRelative, lightDark, style} from '../style' with {type: 'macro'}; import {ButtonRenderProps, Button as RACButton, ButtonProps as RACButtonProps} from 'react-aria-components/Button'; import {centerBaseline} from './CenterBaseline'; -import {ContextValue, Provider} from 'react-aria-components/utils'; +import {ContextValue, Provider} from 'react-aria-components/slots'; import {control, getAllowedOverrides, staticColor, StyleProps} from './style-utils' with {type: 'macro'}; import {createContext, forwardRef, ReactNode, useContext, useEffect, useState} from 'react'; import {FocusableRef, FocusableRefValue, GlobalDOMAttributes} from '@react-types/shared'; diff --git a/packages/@react-spectrum/s2/src/ButtonGroup.tsx b/packages/@react-spectrum/s2/src/ButtonGroup.tsx index 85be1769f9c..740c32c8dd1 100644 --- a/packages/@react-spectrum/s2/src/ButtonGroup.tsx +++ b/packages/@react-spectrum/s2/src/ButtonGroup.tsx @@ -11,10 +11,10 @@ */ import {ButtonContext, LinkButtonContext} from './Button'; -import {ContextValue, Provider, SlotProps} from 'react-aria-components/utils'; +import {ContextValue, Provider, SlotProps} from 'react-aria-components/slots'; import {createContext, forwardRef, ReactNode, useCallback, useRef} from 'react'; import {DOMProps, DOMRef, DOMRefValue} from '@react-types/shared'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'}; import {style} from '../style' with {type: 'macro'}; import {useDOMRef} from './useDOMRef'; diff --git a/packages/@react-spectrum/s2/src/Calendar.tsx b/packages/@react-spectrum/s2/src/Calendar.tsx index 7f30cebe62d..8a197556e25 100644 --- a/packages/@react-spectrum/s2/src/Calendar.tsx +++ b/packages/@react-spectrum/s2/src/Calendar.tsx @@ -37,7 +37,7 @@ import { import {CalendarState} from 'react-stately/useCalendarState'; import ChevronLeftIcon from '../s2wf-icons/S2_Icon_ChevronLeft_20_N.svg'; import ChevronRightIcon from '../s2wf-icons/S2_Icon_ChevronRight_20_N.svg'; -import {ContextValue, Provider, useSlottedContext} from 'react-aria-components/utils'; +import {ContextValue, Provider, useSlottedContext} from 'react-aria-components/slots'; import {focusRing, lightDark, style} from '../style' with {type: 'macro'}; import {forwardRefType, GlobalDOMAttributes} from '@react-types/shared'; import {getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'}; diff --git a/packages/@react-spectrum/s2/src/Card.tsx b/packages/@react-spectrum/s2/src/Card.tsx index 88b8eb07fe6..e90087ffc4e 100644 --- a/packages/@react-spectrum/s2/src/Card.tsx +++ b/packages/@react-spectrum/s2/src/Card.tsx @@ -15,12 +15,13 @@ import {AvatarContext} from './Avatar'; import {ButtonContext, LinkButtonContext} from './Button'; import {Checkbox} from './Checkbox'; import {color, focusRing, lightDark, space, style} from '../style' with {type: 'macro'}; -import {composeRenderProps, ContextValue, DEFAULT_SLOT, Provider} from 'react-aria-components/utils'; +import {composeRenderProps} from 'react-aria-components/composeRenderProps'; import {ContentContext, FooterContext, TextContext} from './Content'; +import {ContextValue, DEFAULT_SLOT, Provider} from 'react-aria-components/slots'; import {createContext, CSSProperties, forwardRef, ReactNode, useContext} from 'react'; import {DividerContext} from './Divider'; import {DOMProps, DOMRef, DOMRefValue, GlobalDOMAttributes} from '@react-types/shared'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {getAllowedOverrides, StyleProps, UnsafeStyles} from './style-utils' with {type: 'macro'}; import {GridListItem, GridListItemProps} from 'react-aria-components/GridList'; import {IllustrationContext} from './Icon'; diff --git a/packages/@react-spectrum/s2/src/CardView.tsx b/packages/@react-spectrum/s2/src/CardView.tsx index 41de45f4a57..40017ba0f06 100644 --- a/packages/@react-spectrum/s2/src/CardView.tsx +++ b/packages/@react-spectrum/s2/src/CardView.tsx @@ -19,23 +19,20 @@ import { } from 'react-aria-components/GridList'; import {CardContext, InternalCardViewContext} from './Card'; -import {Collection} from 'react-aria/private/collections/CollectionBuilder'; -import {ContextValue} from 'react-aria-components/utils'; +import {Collection} from 'react-aria/Collection'; +import {ContextValue} from 'react-aria-components/slots'; import {createContext, forwardRef, ReactElement, useCallback, useMemo, useRef, useState} from 'react'; import {DOMRef, DOMRefValue, forwardRefType, GlobalDOMAttributes, Key, LoadingState} from '@react-types/shared'; import {focusRing, style} from '../style' with {type: 'macro'}; import {getAllowedOverrides, StylesPropWithHeight, UnsafeStyles} from './style-utils' with {type: 'macro'}; -import {GridLayout} from 'react-stately/private/layout/GridLayout'; +import {GridLayout, Size, Virtualizer, WaterfallLayout} from 'react-aria-components/Virtualizer'; import {ImageCoordinator} from './ImageCoordinator'; -import {Size} from 'react-stately/private/virtualizer/Size'; import {useActionBarContainer} from './ActionBar'; import {useDOMRef} from './useDOMRef'; import {useEffectEvent} from 'react-aria/private/utils/useEffectEvent'; import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect'; import {useResizeObserver} from 'react-aria/private/utils/useResizeObserver'; import {useSpectrumContextProps} from './useSpectrumContextProps'; -import {Virtualizer} from 'react-aria-components/Virtualizer'; -import {WaterfallLayout} from 'react-stately/private/layout/WaterfallLayout'; export interface CardViewProps extends Omit, 'layout' | 'keyboardNavigationBehavior' | 'selectionBehavior' | 'className' | 'style' | 'render' | 'isLoading' | keyof GlobalDOMAttributes>, UnsafeStyles { /** diff --git a/packages/@react-spectrum/s2/src/Checkbox.tsx b/packages/@react-spectrum/s2/src/Checkbox.tsx index 2cbecb12fb5..543b9379e82 100644 --- a/packages/@react-spectrum/s2/src/Checkbox.tsx +++ b/packages/@react-spectrum/s2/src/Checkbox.tsx @@ -19,7 +19,7 @@ import {baseColor, focusRing, space, style} from '../style' with {type: 'macro'} import {CenterBaseline} from './CenterBaseline'; import {CheckboxGroupStateContext} from 'react-aria-components/CheckboxGroup'; import CheckmarkIcon from '../ui-icons/Checkmark'; -import {ContextValue, useSlottedContext} from 'react-aria-components/utils'; +import {ContextValue, useSlottedContext} from 'react-aria-components/slots'; import {controlBorderRadius, controlFont, controlSize, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'}; import {createContext, forwardRef, ReactNode, useContext, useRef} from 'react'; import DashIcon from '../ui-icons/Dash'; diff --git a/packages/@react-spectrum/s2/src/CheckboxGroup.tsx b/packages/@react-spectrum/s2/src/CheckboxGroup.tsx index 8d576c74c6a..53b080c55dd 100644 --- a/packages/@react-spectrum/s2/src/CheckboxGroup.tsx +++ b/packages/@react-spectrum/s2/src/CheckboxGroup.tsx @@ -15,7 +15,7 @@ import { CheckboxGroupProps as AriaCheckboxGroupProps } from 'react-aria-components/CheckboxGroup'; import {CheckboxContext} from './Checkbox'; -import {ContextValue} from 'react-aria-components/utils'; +import {ContextValue} from 'react-aria-components/slots'; import {createContext, forwardRef, ReactNode, useContext} from 'react'; import {DOMRef, DOMRefValue, GlobalDOMAttributes, HelpTextProps, Orientation, SpectrumLabelableProps} from '@react-types/shared'; import {field, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'}; diff --git a/packages/@react-spectrum/s2/src/CloseButton.tsx b/packages/@react-spectrum/s2/src/CloseButton.tsx index d8149ab1c0b..69a61a4a62c 100644 --- a/packages/@react-spectrum/s2/src/CloseButton.tsx +++ b/packages/@react-spectrum/s2/src/CloseButton.tsx @@ -12,7 +12,7 @@ import {baseColor, focusRing, style} from '../style' with {type: 'macro'}; import {Button, ButtonProps} from 'react-aria-components/Button'; -import {ContextValue} from 'react-aria-components/utils'; +import {ContextValue} from 'react-aria-components/slots'; import {controlSize, getAllowedOverrides, staticColor, StyleProps} from './style-utils' with {type: 'macro'}; import {createContext, forwardRef} from 'react'; import CrossIcon from '../ui-icons/Cross'; diff --git a/packages/@react-spectrum/s2/src/CoachMark.tsx b/packages/@react-spectrum/s2/src/CoachMark.tsx index facfa72bf19..b1e663dd650 100644 --- a/packages/@react-spectrum/s2/src/CoachMark.tsx +++ b/packages/@react-spectrum/s2/src/CoachMark.tsx @@ -24,7 +24,7 @@ import {Card} from './Card'; import {CheckboxContext} from './Checkbox'; import {ColorSchemeContext} from './Provider'; import {ContentContext, FooterContext, KeyboardContext, TextContext} from './Content'; -import {ContextValue, DEFAULT_SLOT, Provider, useContextProps} from 'react-aria-components/utils'; +import {ContextValue, DEFAULT_SLOT, Provider, useContextProps} from 'react-aria-components/slots'; import { createContext, ForwardedRef, diff --git a/packages/@react-spectrum/s2/src/ColorArea.tsx b/packages/@react-spectrum/s2/src/ColorArea.tsx index ba49d761cf7..ee24996744b 100644 --- a/packages/@react-spectrum/s2/src/ColorArea.tsx +++ b/packages/@react-spectrum/s2/src/ColorArea.tsx @@ -13,7 +13,7 @@ import {ColorArea as AriaColorArea, ColorAreaProps as AriaColorAreaProps} from 'react-aria-components/ColorArea'; import {ColorHandle} from './ColorHandle'; -import {ContextValue} from 'react-aria-components/utils'; +import {ContextValue} from 'react-aria-components/slots'; import {createContext, forwardRef} from 'react'; import {DOMRef, DOMRefValue, GlobalDOMAttributes} from '@react-types/shared'; import {getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'}; diff --git a/packages/@react-spectrum/s2/src/ColorField.tsx b/packages/@react-spectrum/s2/src/ColorField.tsx index d6324fa908a..b087b60d4de 100644 --- a/packages/@react-spectrum/s2/src/ColorField.tsx +++ b/packages/@react-spectrum/s2/src/ColorField.tsx @@ -12,7 +12,7 @@ import {ColorField as AriaColorField, ColorFieldProps as AriaColorFieldProps} from 'react-aria-components/ColorField'; -import {ContextValue} from 'react-aria-components/utils'; +import {ContextValue} from 'react-aria-components/slots'; import {createContext, forwardRef, Ref, useContext, useImperativeHandle, useRef} from 'react'; import {createFocusableRef} from './useDOMRef'; import {field, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'}; diff --git a/packages/@react-spectrum/s2/src/ColorSlider.tsx b/packages/@react-spectrum/s2/src/ColorSlider.tsx index 38bfa6cb8de..87800181c79 100644 --- a/packages/@react-spectrum/s2/src/ColorSlider.tsx +++ b/packages/@react-spectrum/s2/src/ColorSlider.tsx @@ -13,7 +13,7 @@ import {ColorSlider as AriaColorSlider, ColorSliderProps as AriaColorSliderProps} from 'react-aria-components/ColorSlider'; import {ColorHandle} from './ColorHandle'; -import {ContextValue} from 'react-aria-components/utils'; +import {ContextValue} from 'react-aria-components/slots'; import {controlFont, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'}; import {createContext, forwardRef, useRef} from 'react'; import {DOMRef, DOMRefValue, GlobalDOMAttributes, SpectrumLabelableProps} from '@react-types/shared'; diff --git a/packages/@react-spectrum/s2/src/ColorSwatch.tsx b/packages/@react-spectrum/s2/src/ColorSwatch.tsx index e1db1da1192..45851ba516e 100644 --- a/packages/@react-spectrum/s2/src/ColorSwatch.tsx +++ b/packages/@react-spectrum/s2/src/ColorSwatch.tsx @@ -11,7 +11,7 @@ */ import {ColorSwatch as AriaColorSwatch, ColorSwatchProps as AriaColorSwatchProps, Color, parseColor} from 'react-aria-components/ColorSwatch'; -import {ContextValue} from 'react-aria-components/utils'; +import {ContextValue} from 'react-aria-components/slots'; import {createContext, forwardRef, JSX, ReactElement, useContext, useMemo} from 'react'; import {DOMRef, DOMRefValue, GlobalDOMAttributes} from '@react-types/shared'; import {getAllowedOverrides, StylesPropWithHeight, UnsafeStyles} from './style-utils' with {type: 'macro'}; diff --git a/packages/@react-spectrum/s2/src/ColorSwatchPicker.tsx b/packages/@react-spectrum/s2/src/ColorSwatchPicker.tsx index fe807f80d56..6d368803eb1 100644 --- a/packages/@react-spectrum/s2/src/ColorSwatchPicker.tsx +++ b/packages/@react-spectrum/s2/src/ColorSwatchPicker.tsx @@ -17,7 +17,7 @@ import { } from 'react-aria-components/ColorSwatchPicker'; import {ColorSwatchProps, InternalColorSwatchContext} from './ColorSwatch'; -import {ContextValue, SlotProps} from 'react-aria-components/utils'; +import {ContextValue, SlotProps} from 'react-aria-components/slots'; import {createContext, forwardRef, ReactElement, ReactNode} from 'react'; import {DOMRef, DOMRefValue, ValueBase} from '@react-types/shared'; import {focusRing, space, style} from '../style' with {type: 'macro'}; diff --git a/packages/@react-spectrum/s2/src/ColorWheel.tsx b/packages/@react-spectrum/s2/src/ColorWheel.tsx index fdaf951106a..fa1012aa84a 100644 --- a/packages/@react-spectrum/s2/src/ColorWheel.tsx +++ b/packages/@react-spectrum/s2/src/ColorWheel.tsx @@ -17,7 +17,7 @@ import { } from 'react-aria-components/ColorWheel'; import {ColorHandle} from './ColorHandle'; -import {ContextValue} from 'react-aria-components/utils'; +import {ContextValue} from 'react-aria-components/slots'; import {createContext, forwardRef} from 'react'; import {DOMRef, DOMRefValue, GlobalDOMAttributes} from '@react-types/shared'; import {style} from '../style' with {type: 'macro'}; diff --git a/packages/@react-spectrum/s2/src/ComboBox.tsx b/packages/@react-spectrum/s2/src/ComboBox.tsx index bbd37c860b6..89999c3d313 100644 --- a/packages/@react-spectrum/s2/src/ComboBox.tsx +++ b/packages/@react-spectrum/s2/src/ComboBox.tsx @@ -15,7 +15,6 @@ import { ComboBoxProps as AriaComboBoxProps, ComboBoxStateContext } from 'react-aria-components/ComboBox'; - import { ListBoxSection as AriaListBoxSection, ListBox, @@ -23,10 +22,10 @@ import { ListBoxItemProps, ListBoxLoadMoreItem, ListBoxProps, + ListBoxSectionProps, ListStateContext } from 'react-aria-components/ListBox'; - -import {PopoverProps as AriaPopoverProps} from 'react-aria-components/Popover'; +import {PopoverProps as AriaPopoverProps, Placement} from 'react-aria-components/Popover'; import {AsyncLoadable, GlobalDOMAttributes, HelpTextProps, LoadingState, SingleSelection, SpectrumLabelableProps} from '@react-types/shared'; import {AvatarContext} from './Avatar'; import {BaseCollection, CollectionNode} from 'react-aria/private/collections/BaseCollection'; @@ -43,12 +42,12 @@ import { } from './Menu'; import CheckmarkIcon from '../ui-icons/Checkmark'; import ChevronIcon from '../ui-icons/Chevron'; -import {Collection} from 'react-aria/private/collections/CollectionBuilder'; -import {ContextValue, Provider} from 'react-aria-components/utils'; +import {Collection} from 'react-aria/Collection'; +import {ContextValue, Provider} from 'react-aria-components/slots'; import {control, controlBorderRadius, controlFont, controlSize, field, fieldInput, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'}; import {createContext, CSSProperties, ForwardedRef, forwardRef, ReactNode, Ref, useCallback, useContext, useEffect, useImperativeHandle, useMemo, useRef, useState} from 'react'; import {createFocusableRef} from './useDOMRef'; -import {createLeafComponent} from 'react-aria/private/collections/CollectionBuilder'; +import {createLeafComponent} from 'react-aria/CollectionBuilder'; import {edgeToText} from '../style/spectrum-theme' with {type: 'macro'}; import {FieldErrorIcon, FieldGroup, FieldLabel, HelpText, Input} from './Field'; import {FormContext, useFormProps} from './Form'; @@ -57,15 +56,13 @@ import {HeaderContext, HeadingContext, Text, TextContext} from './Content'; import {IconContext} from './Icon'; import {InputContext, InputProps} from 'react-aria-components/Input'; import intlMessages from '../intl/*.json'; -import {ListLayout} from 'react-stately/private/layout/ListLayout'; -import {mergeRefs} from 'react-aria/private/utils/mergeRefs'; +import {ListLayout} from 'react-stately/useVirtualizerState'; +import {mergeRefs} from 'react-aria/mergeRefs'; // @ts-ignore import {Node} from '@react-types/shared'; -import {Placement} from 'react-aria/private/overlays/useOverlayPosition'; import {Popover} from './Popover'; import {pressScale} from './pressScale'; import {ProgressCircle} from './ProgressCircle'; -import {SectionProps} from 'react-aria-components/Collection'; import {TextFieldRef} from './TextField'; import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter'; import {useResizeObserver} from 'react-aria/private/utils/useResizeObserver'; @@ -435,7 +432,7 @@ export function ComboBoxItem(props: ComboBoxItemProps): ReactNode { ); } -export interface ComboBoxSectionProps extends Omit, keyof GlobalDOMAttributes> {} +export interface ComboBoxSectionProps extends Omit, keyof GlobalDOMAttributes> {} export function ComboBoxSection(props: ComboBoxSectionProps): ReactNode { let {size} = useContext(InternalComboboxContext); return ( diff --git a/packages/@react-spectrum/s2/src/Content.tsx b/packages/@react-spectrum/s2/src/Content.tsx index 21c8274623d..bbc935324fd 100644 --- a/packages/@react-spectrum/s2/src/Content.tsx +++ b/packages/@react-spectrum/s2/src/Content.tsx @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {ContextValue, SlotProps} from 'react-aria-components/utils'; +import {ContextValue, SlotProps} from 'react-aria-components/slots'; import {createContext, forwardRef, ReactNode, useContext} from 'react'; import {DOMRef, DOMRefValue} from '@react-types/shared'; diff --git a/packages/@react-spectrum/s2/src/ContextualHelp.tsx b/packages/@react-spectrum/s2/src/ContextualHelp.tsx index d80ad8d0f62..71521c1041a 100644 --- a/packages/@react-spectrum/s2/src/ContextualHelp.tsx +++ b/packages/@react-spectrum/s2/src/ContextualHelp.tsx @@ -1,17 +1,17 @@ import {ActionButton} from './ActionButton'; import {AriaLabelingProps, DOMProps, FocusableRef, FocusableRefValue} from '@react-types/shared'; import {ContentContext, FooterContext, HeadingContext, TextContext as SpectrumTextContext} from './Content'; -import {ContextValue, DEFAULT_SLOT, Provider} from 'react-aria-components/utils'; +import {ContextValue, DEFAULT_SLOT, Provider} from 'react-aria-components/slots'; import {createContext, forwardRef, ReactNode} from 'react'; import {dialogInner} from './Dialog'; import {DialogTrigger, DialogTriggerProps} from './DialogTrigger'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import HelpIcon from '../s2wf-icons/S2_Icon_HelpCircle_20_N.svg'; import InfoIcon from '../s2wf-icons/S2_Icon_InfoCircle_20_N.svg'; import intlMessages from '../intl/*.json'; import {mergeProps} from 'react-aria/mergeProps'; import {mergeStyles} from '../style/runtime'; -import {Placement} from 'react-aria/private/overlays/useOverlayPosition'; +import {Placement} from 'react-aria-components/Popover'; // @ts-ignore import {Popover, PopoverDialogProps} from './Popover'; import {space, style} from '../style' with {type: 'macro'}; diff --git a/packages/@react-spectrum/s2/src/CustomDialog.tsx b/packages/@react-spectrum/s2/src/CustomDialog.tsx index 5d56d3e1883..78dd75d819b 100644 --- a/packages/@react-spectrum/s2/src/CustomDialog.tsx +++ b/packages/@react-spectrum/s2/src/CustomDialog.tsx @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {composeRenderProps} from 'react-aria-components/utils'; +import {composeRenderProps} from 'react-aria-components/composeRenderProps'; import {DOMRef, GlobalDOMAttributes} from '@react-types/shared'; diff --git a/packages/@react-spectrum/s2/src/DateField.tsx b/packages/@react-spectrum/s2/src/DateField.tsx index 2eb0856bbc9..432540f1f1d 100644 --- a/packages/@react-spectrum/s2/src/DateField.tsx +++ b/packages/@react-spectrum/s2/src/DateField.tsx @@ -20,7 +20,7 @@ import { DateValue } from 'react-aria-components/DateField'; -import {ContextValue} from 'react-aria-components/utils'; +import {ContextValue} from 'react-aria-components/slots'; import {createContext, forwardRef, PropsWithChildren, ReactElement, Ref, useContext} from 'react'; import {field, fieldInput, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'}; import {FieldErrorIcon, FieldGroup, FieldLabel, HelpText} from './Field'; diff --git a/packages/@react-spectrum/s2/src/DatePicker.tsx b/packages/@react-spectrum/s2/src/DatePicker.tsx index 5581bc533b6..53fc414a646 100644 --- a/packages/@react-spectrum/s2/src/DatePicker.tsx +++ b/packages/@react-spectrum/s2/src/DatePicker.tsx @@ -15,7 +15,7 @@ import {baseColor, focusRing, fontRelative, space, style} from '../style' with { import {Button, ButtonRenderProps} from 'react-aria-components/Button'; import {Calendar, CalendarProps} from './Calendar'; import CalendarIcon from '../s2wf-icons/S2_Icon_Calendar_20_N.svg'; -import {ContextValue, Provider} from 'react-aria-components/utils'; +import {ContextValue, Provider} from 'react-aria-components/slots'; import {controlBorderRadius, field, fieldInput, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'}; import {createContext, forwardRef, ReactElement, ReactNode, Ref, useContext, useRef, useState} from 'react'; import {DateInput, DateInputContainer, InvalidIndicator} from './DateField'; diff --git a/packages/@react-spectrum/s2/src/DateRangePicker.tsx b/packages/@react-spectrum/s2/src/DateRangePicker.tsx index 2f5074e5ea8..e72004f6eb3 100644 --- a/packages/@react-spectrum/s2/src/DateRangePicker.tsx +++ b/packages/@react-spectrum/s2/src/DateRangePicker.tsx @@ -16,7 +16,7 @@ import { DateValue } from 'react-aria-components/DateRangePicker'; import {CalendarButton, CalendarPopover, timeField} from './DatePicker'; -import {ContextValue} from 'react-aria-components/utils'; +import {ContextValue} from 'react-aria-components/slots'; import {createContext, forwardRef, ReactElement, ReactNode, Ref, useContext, useState} from 'react'; import {DateInput, DateInputContainer, InvalidIndicator} from './DateField'; import {field, fieldInput, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'}; diff --git a/packages/@react-spectrum/s2/src/Dialog.tsx b/packages/@react-spectrum/s2/src/Dialog.tsx index f14d31cec04..5f820d7df12 100644 --- a/packages/@react-spectrum/s2/src/Dialog.tsx +++ b/packages/@react-spectrum/s2/src/Dialog.tsx @@ -12,10 +12,8 @@ import {ButtonGroupContext} from './ButtonGroup'; import {CloseButton} from './CloseButton'; -import {composeRenderProps, Provider} from 'react-aria-components/utils'; - +import {composeRenderProps} from 'react-aria-components/composeRenderProps'; import {ContentContext, FooterContext, HeaderContext, HeadingContext} from './Content'; - import {DOMRef, GlobalDOMAttributes} from '@react-types/shared'; import {forwardRef} from 'react'; import {ImageContext} from './Image'; @@ -25,6 +23,7 @@ import { Dialog as RACDialog, DialogProps as RACDialogProps } from 'react-aria-components/Dialog'; +import {Provider} from 'react-aria-components/slots'; import {style} from '../style' with {type: 'macro'}; import {StyleProps} from './style-utils'; import {useDOMRef} from './useDOMRef'; diff --git a/packages/@react-spectrum/s2/src/DialogContainer.tsx b/packages/@react-spectrum/s2/src/DialogContainer.tsx index 3b32f13cf25..a32106ff6cc 100644 --- a/packages/@react-spectrum/s2/src/DialogContainer.tsx +++ b/packages/@react-spectrum/s2/src/DialogContainer.tsx @@ -13,7 +13,7 @@ import {ModalContext} from 'react-aria-components/Modal'; import React, {ReactElement, ReactNode, useState} from 'react'; -import {useSlottedContext} from 'react-aria-components/utils'; +import {useSlottedContext} from 'react-aria-components/slots'; export interface DialogContainerProps { /** The Dialog to display, if any. */ diff --git a/packages/@react-spectrum/s2/src/Disclosure.tsx b/packages/@react-spectrum/s2/src/Disclosure.tsx index 14a49ad4755..cea47ab626d 100644 --- a/packages/@react-spectrum/s2/src/Disclosure.tsx +++ b/packages/@react-spectrum/s2/src/Disclosure.tsx @@ -18,7 +18,7 @@ import {CenterBaseline} from './CenterBaseline'; import Chevron from '../ui-icons/Chevron'; -import {ContextValue, Provider, useSlottedContext} from 'react-aria-components/utils'; +import {ContextValue, Provider, useSlottedContext} from 'react-aria-components/slots'; import { DisclosureStateContext, Disclosure as RACDisclosure, @@ -26,7 +26,7 @@ import { DisclosurePanelProps as RACDisclosurePanelProps, DisclosureProps as RACDisclosureProps } from 'react-aria-components/Disclosure'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {getAllowedOverrides, StyleProps, UnsafeStyles} from './style-utils' with {type: 'macro'}; import {Heading} from 'react-aria-components/Heading'; import React, {createContext, forwardRef, ReactNode, useContext} from 'react'; diff --git a/packages/@react-spectrum/s2/src/Divider.tsx b/packages/@react-spectrum/s2/src/Divider.tsx index 0cbc5fd6664..141c1bd6e85 100644 --- a/packages/@react-spectrum/s2/src/Divider.tsx +++ b/packages/@react-spectrum/s2/src/Divider.tsx @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {ContextValue} from 'react-aria-components/utils'; +import {ContextValue} from 'react-aria-components/slots'; import {createContext, forwardRef} from 'react'; import {DOMRef, DOMRefValue, GlobalDOMAttributes} from '@react-types/shared'; diff --git a/packages/@react-spectrum/s2/src/DropZone.tsx b/packages/@react-spectrum/s2/src/DropZone.tsx index 7c41ec9026e..207b5f8fb5b 100644 --- a/packages/@react-spectrum/s2/src/DropZone.tsx +++ b/packages/@react-spectrum/s2/src/DropZone.tsx @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {ContextValue} from 'react-aria-components/utils'; +import {ContextValue} from 'react-aria-components/slots'; import {createContext, forwardRef, ReactNode} from 'react'; diff --git a/packages/@react-spectrum/s2/src/Field.tsx b/packages/@react-spectrum/s2/src/Field.tsx index fb64cf347ca..7f7aea0eb22 100644 --- a/packages/@react-spectrum/s2/src/Field.tsx +++ b/packages/@react-spectrum/s2/src/Field.tsx @@ -15,7 +15,7 @@ import {Alignment, DOMRef, NecessityIndicator} from '@react-types/shared'; import AsteriskIcon from '../ui-icons/Asterisk'; import {baseColor, focusRing, fontRelative, style} from '../style' with {type: 'macro'}; import {CenterBaseline, centerBaseline, centerBaselineBefore} from './CenterBaseline'; -import {composeRenderProps, Provider} from 'react-aria-components/utils'; +import {composeRenderProps} from 'react-aria-components/composeRenderProps'; import {ContextualHelpContext} from './ContextualHelp'; import {control, controlFont, fieldInput, fieldLabel, StyleProps, UnsafeStyles} from './style-utils' with {type: 'macro'}; import {FieldError, FieldErrorProps} from 'react-aria-components/FieldError'; @@ -26,6 +26,7 @@ import {IconContext} from './Icon'; import intlMessages from '../intl/*.json'; import {Label, LabelProps} from 'react-aria-components/Label'; import {mergeStyles} from '../style/runtime'; +import {Provider} from 'react-aria-components/slots'; import {Input as RACInput, InputProps as RACInputProps} from 'react-aria-components/Input'; // @ts-ignore import {StyleString} from '../style/types'; diff --git a/packages/@react-spectrum/s2/src/FullscreenDialog.tsx b/packages/@react-spectrum/s2/src/FullscreenDialog.tsx index 48dd889ac9f..6ed632fe493 100644 --- a/packages/@react-spectrum/s2/src/FullscreenDialog.tsx +++ b/packages/@react-spectrum/s2/src/FullscreenDialog.tsx @@ -11,10 +11,8 @@ */ import {ButtonGroupContext} from './ButtonGroup'; -import {composeRenderProps, Provider} from 'react-aria-components/utils'; - +import {composeRenderProps} from 'react-aria-components/composeRenderProps'; import {ContentContext, HeaderContext, HeadingContext} from './Content'; - import {DOMRef, GlobalDOMAttributes} from '@react-types/shared'; import {forwardRef} from 'react'; import {Modal} from './Modal'; @@ -23,6 +21,7 @@ import { Dialog as RACDialog, DialogProps as RACDialogProps } from 'react-aria-components/Dialog'; +import {Provider} from 'react-aria-components/slots'; import {style} from '../style' with {type: 'macro'}; import {StyleProps} from './style-utils'; import {useDOMRef} from './useDOMRef'; diff --git a/packages/@react-spectrum/s2/src/Icon.tsx b/packages/@react-spectrum/s2/src/Icon.tsx index e2564c28006..8a8142a66af 100644 --- a/packages/@react-spectrum/s2/src/Icon.tsx +++ b/packages/@react-spectrum/s2/src/Icon.tsx @@ -12,7 +12,7 @@ import {AriaLabelingProps, DOMProps} from '@react-types/shared'; import {ComponentType, Context, createContext, FunctionComponent, ReactNode, SVGProps, useRef} from 'react'; -import {ContextValue, SlotProps} from 'react-aria-components/utils'; +import {ContextValue, SlotProps} from 'react-aria-components/slots'; import {mergeStyles} from '../style/runtime'; import {SkeletonWrapper, useSkeletonIcon} from './Skeleton'; import {style} from '../style' with {type: 'macro'}; diff --git a/packages/@react-spectrum/s2/src/IllustratedMessage.tsx b/packages/@react-spectrum/s2/src/IllustratedMessage.tsx index 7632c9e8bb0..e28b946e7ce 100644 --- a/packages/@react-spectrum/s2/src/IllustratedMessage.tsx +++ b/packages/@react-spectrum/s2/src/IllustratedMessage.tsx @@ -12,11 +12,11 @@ import {ButtonGroupContext} from './ButtonGroup'; import {ContentContext, HeadingContext} from './Content'; -import {ContextValue, Provider} from 'react-aria-components/utils'; +import {ContextValue, Provider} from 'react-aria-components/slots'; import {controlFont, getAllowedOverrides, StylesPropWithHeight, UnsafeStyles} from './style-utils' with {type: 'macro'}; import {createContext, forwardRef, ReactNode} from 'react'; import {DOMProps, DOMRef, DOMRefValue} from '@react-types/shared'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {IllustrationContext} from './Icon'; import {style} from '../style' with {type: 'macro'}; import {useDOMRef} from './useDOMRef'; diff --git a/packages/@react-spectrum/s2/src/Image.tsx b/packages/@react-spectrum/s2/src/Image.tsx index 8c7945277fc..1fdad23733e 100644 --- a/packages/@react-spectrum/s2/src/Image.tsx +++ b/packages/@react-spectrum/s2/src/Image.tsx @@ -1,5 +1,5 @@ import {ColorSchemeContext} from './Provider'; -import {ContextValue, SlotProps} from 'react-aria-components/utils'; +import {ContextValue, SlotProps} from 'react-aria-components/slots'; import {createContext, ForwardedRef, forwardRef, HTMLAttributeReferrerPolicy, JSX, ReactNode, useCallback, useContext, useMemo, useReducer, useRef, version} from 'react'; import {DefaultImageGroup, ImageGroup} from './ImageCoordinator'; import {loadingStyle, useIsSkeleton, useLoadingAnimation} from './Skeleton'; diff --git a/packages/@react-spectrum/s2/src/InlineAlert.tsx b/packages/@react-spectrum/s2/src/InlineAlert.tsx index f6109f79a50..1d4d285db05 100644 --- a/packages/@react-spectrum/s2/src/InlineAlert.tsx +++ b/packages/@react-spectrum/s2/src/InlineAlert.tsx @@ -14,9 +14,9 @@ import AlertTriangle from '../s2wf-icons/S2_Icon_AlertTriangle_20_N.svg'; import CheckmarkCircle from '../s2wf-icons/S2_Icon_CheckmarkCircle_20_N.svg'; import {ComponentType, createContext, forwardRef, ReactNode, useEffect, useRef} from 'react'; import {ContentContext, HeadingContext} from './Content'; -import {ContextValue, Provider, SlotProps} from 'react-aria-components/utils'; +import {ContextValue, Provider, SlotProps} from 'react-aria-components/slots'; import {DOMProps, DOMRef, DOMRefValue} from '@react-types/shared'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {focusRing, style} from '../style' with {type: 'macro'}; import {getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'}; import {IconContext} from './Icon'; diff --git a/packages/@react-spectrum/s2/src/Link.tsx b/packages/@react-spectrum/s2/src/Link.tsx index e68c5d5c454..fa92d9e2e54 100644 --- a/packages/@react-spectrum/s2/src/Link.tsx +++ b/packages/@react-spectrum/s2/src/Link.tsx @@ -11,7 +11,7 @@ */ import {baseColor, focusRing, style} from '../style' with {type: 'macro'}; -import {ContextValue} from 'react-aria-components/utils'; +import {ContextValue} from 'react-aria-components/slots'; import {createContext, forwardRef, ReactNode, useContext} from 'react'; import {FocusableRef, FocusableRefValue, GlobalDOMAttributes} from '@react-types/shared'; import {getAllowedOverrides, staticColor, StyleProps} from './style-utils' with {type: 'macro'}; diff --git a/packages/@react-spectrum/s2/src/ListView.tsx b/packages/@react-spectrum/s2/src/ListView.tsx index 6537b3cc437..4f6e6a9fbd2 100644 --- a/packages/@react-spectrum/s2/src/ListView.tsx +++ b/packages/@react-spectrum/s2/src/ListView.tsx @@ -17,11 +17,9 @@ import {centerBaseline} from './CenterBaseline'; import {Checkbox} from './Checkbox'; import {CheckboxContext} from 'react-aria-components/Checkbox'; import Chevron from '../ui-icons/Chevron'; -import {Collection} from 'react-aria/private/collections/CollectionBuilder'; -import {CollectionRendererContext, DefaultCollectionRenderer} from 'react-aria-components/Collection'; - -import {ContextValue, DEFAULT_SLOT, Provider, SlotProps, useSlottedContext} from 'react-aria-components/utils'; - +import {Collection} from 'react-aria/Collection'; +import {CollectionRendererContext, DefaultCollectionRenderer} from 'react-aria-components/CollectionBuilder'; +import {ContextValue, DEFAULT_SLOT, Provider, SlotProps, useSlottedContext} from 'react-aria-components/slots'; import {controlFont, getAllowedOverrides, StylesPropWithHeight, UnsafeStyles} from './style-utils' with {type: 'macro'}; import {createContext, forwardRef, ReactElement, ReactNode, useContext, useRef} from 'react'; import {DOMProps, DOMRef, DOMRefValue, forwardRefType, GlobalDOMAttributes, LoadingState} from '@react-types/shared'; @@ -40,7 +38,7 @@ import {ImageContext} from './Image'; import intlMessages from '../intl/*.json'; import {Key} from '@react-types/shared'; import LinkOutIcon from '../ui-icons/LinkOut'; -import {ListLayout} from 'react-stately/private/layout/ListLayout'; +import {ListLayout} from 'react-stately/useVirtualizerState'; // @ts-ignore import {ListState} from 'react-stately/useListState'; import {ProgressCircle} from './ProgressCircle'; diff --git a/packages/@react-spectrum/s2/src/Menu.tsx b/packages/@react-spectrum/s2/src/Menu.tsx index be6b7770062..b669b209a24 100644 --- a/packages/@react-spectrum/s2/src/Menu.tsx +++ b/packages/@react-spectrum/s2/src/Menu.tsx @@ -29,7 +29,7 @@ import {box, iconStyles} from './Checkbox'; import {centerBaseline} from './CenterBaseline'; import CheckmarkIcon from '../ui-icons/Checkmark'; import ChevronRightIcon from '../ui-icons/Chevron'; -import {ContextValue, DEFAULT_SLOT, Provider} from 'react-aria-components/utils'; +import {ContextValue, DEFAULT_SLOT, Provider} from 'react-aria-components/slots'; import {control, controlFont, controlSize, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'}; import {createContext, forwardRef, JSX, ReactElement, ReactNode, useContext, useRef, useState} from 'react'; import {divider} from './Divider'; @@ -45,7 +45,7 @@ import intlMessages from '../intl/*.json'; // @ts-ignore import LinkOutIcon from '../ui-icons/LinkOut'; import {mergeStyles} from '../style/runtime'; -import {Placement} from 'react-aria/private/overlays/useOverlayPosition'; +import {Placement} from 'react-aria/useOverlayPosition'; import {PressResponder} from 'react-aria/private/interactions/PressResponder'; import {pressScale} from './pressScale'; import {Separator, SeparatorProps} from 'react-aria-components/Separator'; diff --git a/packages/@react-spectrum/s2/src/Meter.tsx b/packages/@react-spectrum/s2/src/Meter.tsx index f1c90169ad4..5ab138429c6 100644 --- a/packages/@react-spectrum/s2/src/Meter.tsx +++ b/packages/@react-spectrum/s2/src/Meter.tsx @@ -13,7 +13,7 @@ import {Meter as AriaMeter, MeterProps as AriaMeterProps} from 'react-aria-components/Meter'; import {bar, track} from './bar-utils' with {type: 'macro'}; -import {ContextValue} from 'react-aria-components/utils'; +import {ContextValue} from 'react-aria-components/slots'; import {createContext, forwardRef, ReactNode} from 'react'; import {DOMRef, DOMRefValue, GlobalDOMAttributes, LabelPosition} from '@react-types/shared'; import {FieldLabel} from './Field'; diff --git a/packages/@react-spectrum/s2/src/NotificationBadge.tsx b/packages/@react-spectrum/s2/src/NotificationBadge.tsx index daa8d921667..837c545de98 100644 --- a/packages/@react-spectrum/s2/src/NotificationBadge.tsx +++ b/packages/@react-spectrum/s2/src/NotificationBadge.tsx @@ -11,8 +11,8 @@ */ import {AriaLabelingProps, DOMProps, DOMRef, DOMRefValue} from '@react-types/shared'; -import {ContextValue, SlotProps} from 'react-aria-components/utils'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {ContextValue, SlotProps} from 'react-aria-components/slots'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {fontRelative, style} from '../style' with {type: 'macro'}; import {getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'}; // @ts-ignore diff --git a/packages/@react-spectrum/s2/src/NumberField.tsx b/packages/@react-spectrum/s2/src/NumberField.tsx index 318f302578a..f2478553fc4 100644 --- a/packages/@react-spectrum/s2/src/NumberField.tsx +++ b/packages/@react-spectrum/s2/src/NumberField.tsx @@ -14,18 +14,18 @@ import Add from '../ui-icons/Add'; import {ButtonProps as AriaButtonProps, ButtonContext, ButtonRenderProps} from 'react-aria-components/Button'; import {NumberField as AriaNumberField, NumberFieldProps as AriaNumberFieldProps} from 'react-aria-components/NumberField'; import {baseColor, space, style} from '../style' with {type: 'macro'}; -import {ContextValue, useContextProps} from 'react-aria-components/utils'; +import {ContextValue, useContextProps} from 'react-aria-components/slots'; import {controlBorderRadius, field, fieldInput, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'}; import {createContext, CSSProperties, ForwardedRef, forwardRef, ReactNode, Ref, useContext, useImperativeHandle, useMemo, useRef} from 'react'; import {createFocusableRef} from './useDOMRef'; import Dash from '../ui-icons/Dash'; import {FieldErrorIcon, FieldGroup, FieldLabel, HelpText, Input} from './Field'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {FormContext, useFormProps} from './Form'; import {GlobalDOMAttributes, HelpTextProps, SpectrumLabelableProps} from '@react-types/shared'; import {InputContext, InputProps} from 'react-aria-components/Input'; import {mergeProps} from 'react-aria/mergeProps'; -import {mergeRefs} from 'react-aria/private/utils/mergeRefs'; +import {mergeRefs} from 'react-aria/mergeRefs'; import {pressScale} from './pressScale'; import {TextFieldRef} from './TextField'; import {useButton} from 'react-aria/useButton'; diff --git a/packages/@react-spectrum/s2/src/Picker.tsx b/packages/@react-spectrum/s2/src/Picker.tsx index cdb06a640b9..34f5aa97b8b 100644 --- a/packages/@react-spectrum/s2/src/Picker.tsx +++ b/packages/@react-spectrum/s2/src/Picker.tsx @@ -16,11 +16,10 @@ import { ListBoxItem, ListBoxItemProps, ListBoxLoadMoreItem, - ListBoxProps + ListBoxProps, + ListBoxSectionProps } from 'react-aria-components/ListBox'; - import {PopoverProps as AriaPopoverProps} from 'react-aria-components/Popover'; - import { Select as AriaSelect, SelectProps as AriaSelectProps, @@ -28,7 +27,6 @@ import { SelectStateContext, SelectValue } from 'react-aria-components/Select'; - import {AsyncLoadable, FocusableRef, FocusableRefValue, GlobalDOMAttributes, HelpTextProps, LoadingState, PressEvent, RefObject, SpectrumLabelableProps} from '@react-types/shared'; import {AvatarContext} from './Avatar'; import {baseColor, focusRing, style} from '../style' with {type: 'macro'}; @@ -46,8 +44,8 @@ import { } from './Menu'; import CheckmarkIcon from '../ui-icons/Checkmark'; import ChevronIcon from '../ui-icons/Chevron'; -import {Collection} from 'react-aria/private/collections/CollectionBuilder'; -import {ContextValue, DEFAULT_SLOT, Provider} from 'react-aria-components/utils'; +import {Collection} from 'react-aria/Collection'; +import {ContextValue, DEFAULT_SLOT, Provider} from 'react-aria-components/slots'; import {control, controlBorderRadius, controlFont, field, fieldInput, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'}; import {createHideableComponent} from 'react-aria/private/collections/Hidden'; import {createShadowTreeWalker} from 'react-aria/private/utils/shadowdom/ShadowTreeWalker'; @@ -72,16 +70,15 @@ import {HeaderContext, HeadingContext, Text, TextContext} from './Content'; import {IconContext} from './Icon'; import intlMessages from '../intl/*.json'; import {isFocusable} from 'react-aria/private/utils/isFocusable'; -import {ListLayout} from 'react-stately/private/layout/ListLayout'; +import {ListLayout} from 'react-stately/useVirtualizerState'; import {mergeStyles} from '../style/runtime'; -import {Placement} from 'react-aria/private/overlays/useOverlayPosition'; +import {Placement} from 'react-aria-components/Popover'; import {Popover} from './Popover'; // @ts-ignore import {PressResponder} from 'react-aria/private/interactions/PressResponder'; import {pressScale} from './pressScale'; import {ProgressCircle} from './ProgressCircle'; import React, {createContext, forwardRef, ReactNode, useContext, useEffect, useMemo, useRef, useState} from 'react'; -import {SectionProps} from 'react-aria-components/Collection'; import {useFocusableRef} from './useDOMRef'; import {useGlobalListeners} from 'react-aria/private/utils/useGlobalListeners'; import {useLocale} from 'react-aria/I18nProvider'; @@ -743,7 +740,7 @@ function DefaultProvider({context, value, children}: {context: React.Context{children}; } -export interface PickerSectionProps extends Omit, 'style' | 'className' | 'render' | keyof GlobalDOMAttributes>, StyleProps {} +export interface PickerSectionProps extends Omit, 'style' | 'className' | 'render' | keyof GlobalDOMAttributes>, StyleProps {} export function PickerSection(props: PickerSectionProps): ReactNode { let {size} = useContext(InternalPickerContext); return ( diff --git a/packages/@react-spectrum/s2/src/Popover.tsx b/packages/@react-spectrum/s2/src/Popover.tsx index 331a3d7cc73..6bd173bcbca 100644 --- a/packages/@react-spectrum/s2/src/Popover.tsx +++ b/packages/@react-spectrum/s2/src/Popover.tsx @@ -11,15 +11,15 @@ */ import {Popover as AriaPopover, PopoverProps as AriaPopoverProps} from 'react-aria-components/Popover'; - import {ColorSchemeContext} from './Provider'; -import {composeRenderProps, ContextValue} from 'react-aria-components/utils'; +import {composeRenderProps} from 'react-aria-components/composeRenderProps'; +import {ContextValue} from 'react-aria-components/slots'; import {createContext, ForwardedRef, forwardRef, ReactNode, useCallback, useContext, useMemo} from 'react'; import {DialogProps, OverlayTriggerStateContext} from 'react-aria-components/Dialog'; import {DOMRef, DOMRefValue, GlobalDOMAttributes} from '@react-types/shared'; import {getAllowedOverrides, heightProperties, UnsafeStyles, widthProperties} from './style-utils' with {type: 'macro'}; import {lightDark, setColorScheme, style} from '../style' with {type: 'macro'}; -import {mergeRefs} from 'react-aria/private/utils/mergeRefs'; +import {mergeRefs} from 'react-aria/mergeRefs'; import {mergeStyles} from '../style/runtime'; import {OverlayArrow} from 'react-aria-components/OverlayArrow'; import {StyleString} from '../style/types' with {type: 'macro'}; diff --git a/packages/@react-spectrum/s2/src/ProgressBar.tsx b/packages/@react-spectrum/s2/src/ProgressBar.tsx index c95aa295f04..d247dbed484 100644 --- a/packages/@react-spectrum/s2/src/ProgressBar.tsx +++ b/packages/@react-spectrum/s2/src/ProgressBar.tsx @@ -13,7 +13,7 @@ import {ProgressBar as AriaProgressBar, ProgressBarProps as AriaProgressBarProps} from 'react-aria-components/ProgressBar'; import {bar, track} from './bar-utils' with {type: 'macro'}; -import {ContextValue} from 'react-aria-components/utils'; +import {ContextValue} from 'react-aria-components/slots'; import {createContext, forwardRef, ReactNode} from 'react'; import {DOMRef, DOMRefValue, GlobalDOMAttributes, LabelPosition} from '@react-types/shared'; import {FieldLabel} from './Field'; diff --git a/packages/@react-spectrum/s2/src/ProgressCircle.tsx b/packages/@react-spectrum/s2/src/ProgressCircle.tsx index bc346b08bb2..da524324d0b 100644 --- a/packages/@react-spectrum/s2/src/ProgressCircle.tsx +++ b/packages/@react-spectrum/s2/src/ProgressCircle.tsx @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {ContextValue} from 'react-aria-components/utils'; +import {ContextValue} from 'react-aria-components/slots'; import {createContext, forwardRef} from 'react'; import {DOMRef, DOMRefValue, GlobalDOMAttributes} from '@react-types/shared'; diff --git a/packages/@react-spectrum/s2/src/Provider.tsx b/packages/@react-spectrum/s2/src/Provider.tsx index 410ced6c52b..91a453e1ffe 100644 --- a/packages/@react-spectrum/s2/src/Provider.tsx +++ b/packages/@react-spectrum/s2/src/Provider.tsx @@ -12,7 +12,7 @@ import {createContext, JSX, ReactNode, useContext} from 'react'; import {DOMProps, Href, RouterOptions} from '@react-types/shared'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {Fonts} from './Fonts'; import {generateDefaultColorSchemeStyles} from './page.macro' with {type: 'macro'}; import {I18nProvider, useLocale} from 'react-aria/I18nProvider'; diff --git a/packages/@react-spectrum/s2/src/RadioGroup.tsx b/packages/@react-spectrum/s2/src/RadioGroup.tsx index 28266184347..e3a8b3c03e9 100644 --- a/packages/@react-spectrum/s2/src/RadioGroup.tsx +++ b/packages/@react-spectrum/s2/src/RadioGroup.tsx @@ -20,7 +20,7 @@ import { import {baseColor, focusRing, space, style} from '../style' with {type: 'macro'}; import {CenterBaseline} from './CenterBaseline'; -import {ContextValue} from 'react-aria-components/utils'; +import {ContextValue} from 'react-aria-components/slots'; import {controlFont, controlSize, field, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'}; import {DOMRef, DOMRefValue, FocusableRef, GlobalDOMAttributes, HelpTextProps, Orientation, SpectrumLabelableProps} from '@react-types/shared'; import {FieldLabel, HelpText} from './Field'; diff --git a/packages/@react-spectrum/s2/src/RangeCalendar.tsx b/packages/@react-spectrum/s2/src/RangeCalendar.tsx index 065fcf2bd4b..0de1074c216 100644 --- a/packages/@react-spectrum/s2/src/RangeCalendar.tsx +++ b/packages/@react-spectrum/s2/src/RangeCalendar.tsx @@ -18,7 +18,7 @@ import { import {CalendarButton, CalendarGrid, CalendarHeading} from './Calendar'; import ChevronLeftIcon from '../s2wf-icons/S2_Icon_ChevronLeft_20_N.svg'; import ChevronRightIcon from '../s2wf-icons/S2_Icon_ChevronRight_20_N.svg'; -import {ContextValue, Provider} from 'react-aria-components/utils'; +import {ContextValue, Provider} from 'react-aria-components/slots'; import {createContext, ForwardedRef, forwardRef, ReactNode} from 'react'; import {forwardRefType, GlobalDOMAttributes} from '@react-types/shared'; import {getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'}; diff --git a/packages/@react-spectrum/s2/src/RangeSlider.tsx b/packages/@react-spectrum/s2/src/RangeSlider.tsx index ea1f67a8ea1..eca6c50e57c 100644 --- a/packages/@react-spectrum/s2/src/RangeSlider.tsx +++ b/packages/@react-spectrum/s2/src/RangeSlider.tsx @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {ContextValue} from 'react-aria-components/utils'; +import {ContextValue} from 'react-aria-components/slots'; import {createContext, forwardRef, useContext, useRef} from 'react'; import {filledTrack, SliderBase, SliderBaseProps, thumb, thumbContainer, thumbHitArea, track, upperTrack} from './Slider'; diff --git a/packages/@react-spectrum/s2/src/SearchField.tsx b/packages/@react-spectrum/s2/src/SearchField.tsx index 2ef43da6529..be784ae8549 100644 --- a/packages/@react-spectrum/s2/src/SearchField.tsx +++ b/packages/@react-spectrum/s2/src/SearchField.tsx @@ -15,7 +15,7 @@ import {SearchField as AriaSearchField, SearchFieldProps as AriaSearchFieldProps import {baseColor, fontRelative, style} from '../style' with {type: 'macro'}; import {centerBaseline} from './CenterBaseline'; import {ClearButton} from './ClearButton'; -import {ContextValue, Provider} from 'react-aria-components/utils'; +import {ContextValue, Provider} from 'react-aria-components/slots'; import {createContext, forwardRef, Ref, useContext, useImperativeHandle, useRef} from 'react'; import {createFocusableRef} from './useDOMRef'; import {css} from '../style/style-macro' with {type: 'macro'}; diff --git a/packages/@react-spectrum/s2/src/SegmentedControl.tsx b/packages/@react-spectrum/s2/src/SegmentedControl.tsx index e36fa0feca3..ba4208470dd 100644 --- a/packages/@react-spectrum/s2/src/SegmentedControl.tsx +++ b/packages/@react-spectrum/s2/src/SegmentedControl.tsx @@ -13,7 +13,7 @@ import {AriaLabelingProps, DOMRef, DOMRefValue, FocusableRef, Key} from '@react-types/shared'; import {baseColor, focusRing, style} from '../style' with {type: 'macro'}; import {centerBaseline} from './CenterBaseline'; -import {ContextValue, DEFAULT_SLOT, Provider, SlotProps} from 'react-aria-components/utils'; +import {ContextValue, DEFAULT_SLOT, Provider, SlotProps} from 'react-aria-components/slots'; import {control, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'}; import {createContext, forwardRef, ReactNode, useCallback, useContext, useRef} from 'react'; import {IconContext} from './Icon'; diff --git a/packages/@react-spectrum/s2/src/SelectBoxGroup.tsx b/packages/@react-spectrum/s2/src/SelectBoxGroup.tsx index 7bbda4031b0..cf1ffc2f986 100644 --- a/packages/@react-spectrum/s2/src/SelectBoxGroup.tsx +++ b/packages/@react-spectrum/s2/src/SelectBoxGroup.tsx @@ -12,7 +12,7 @@ import {baseColor, focusRing, style} from '../style' with {type: 'macro'}; import {box, iconStyles} from './Checkbox'; import Checkmark from '../ui-icons/Checkmark'; -import {ContextValue, DEFAULT_SLOT, Provider} from 'react-aria-components/utils'; +import {ContextValue, DEFAULT_SLOT, Provider} from 'react-aria-components/slots'; import {DOMRef, DOMRefValue, GlobalDOMAttributes, Key, Orientation} from '@react-types/shared'; import {forwardRefType} from './types'; import {getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'}; diff --git a/packages/@react-spectrum/s2/src/Skeleton.tsx b/packages/@react-spectrum/s2/src/Skeleton.tsx index 1c4dcac61ad..a6a077e7191 100644 --- a/packages/@react-spectrum/s2/src/Skeleton.tsx +++ b/packages/@react-spectrum/s2/src/Skeleton.tsx @@ -14,7 +14,7 @@ import {cloneElement, createContext, CSSProperties, ReactElement, ReactNode, Ref import {color, style} from '../style' with {type: 'macro'}; import {css} from '../style/style-macro' with {type: 'macro'}; import {inertValue} from 'react-aria/private/utils/inertValue'; -import {mergeRefs} from 'react-aria/private/utils/mergeRefs'; +import {mergeRefs} from 'react-aria/mergeRefs'; import {mergeStyles} from '../style/runtime'; import {StyleString} from '../style/types'; import {useMediaQuery} from './useMediaQuery'; diff --git a/packages/@react-spectrum/s2/src/SkeletonCollection.tsx b/packages/@react-spectrum/s2/src/SkeletonCollection.tsx index b41d6fa6f94..9998adc2ee9 100644 --- a/packages/@react-spectrum/s2/src/SkeletonCollection.tsx +++ b/packages/@react-spectrum/s2/src/SkeletonCollection.tsx @@ -11,8 +11,7 @@ */ import {CollectionNode} from 'react-aria/private/collections/BaseCollection'; - -import {createLeafComponent} from 'react-aria/private/collections/CollectionBuilder'; +import {createLeafComponent} from 'react-aria/CollectionBuilder'; import {ReactNode} from 'react'; import {Skeleton} from './Skeleton'; diff --git a/packages/@react-spectrum/s2/src/Slider.tsx b/packages/@react-spectrum/s2/src/Slider.tsx index df40c31853e..81096420e9c 100644 --- a/packages/@react-spectrum/s2/src/Slider.tsx +++ b/packages/@react-spectrum/s2/src/Slider.tsx @@ -20,7 +20,7 @@ import { } from 'react-aria-components/Slider'; import {clamp} from 'react-stately/private/utils/number'; -import {ContextValue} from 'react-aria-components/utils'; +import {ContextValue} from 'react-aria-components/slots'; import {controlFont, field, fieldInput, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'}; import {createContext, forwardRef, ReactNode, RefObject, useContext, useRef} from 'react'; import {FieldLabel} from './Field'; diff --git a/packages/@react-spectrum/s2/src/StatusLight.tsx b/packages/@react-spectrum/s2/src/StatusLight.tsx index f92505f74b0..bdc73d4a734 100644 --- a/packages/@react-spectrum/s2/src/StatusLight.tsx +++ b/packages/@react-spectrum/s2/src/StatusLight.tsx @@ -12,10 +12,10 @@ import {AriaLabelingProps, DOMProps, DOMRef, DOMRefValue} from '@react-types/shared'; import {CenterBaseline} from './CenterBaseline'; -import {ContextValue, SlotProps} from 'react-aria-components/utils'; +import {ContextValue, SlotProps} from 'react-aria-components/slots'; import {controlFont, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'}; import {createContext, forwardRef, ReactNode} from 'react'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {style} from '../style' with {type: 'macro'}; import {Text} from './Content'; import {useDOMRef} from './useDOMRef'; diff --git a/packages/@react-spectrum/s2/src/Switch.tsx b/packages/@react-spectrum/s2/src/Switch.tsx index 937aaf15f92..d503de2e73b 100644 --- a/packages/@react-spectrum/s2/src/Switch.tsx +++ b/packages/@react-spectrum/s2/src/Switch.tsx @@ -14,7 +14,7 @@ import {Switch as AriaSwitch, SwitchProps as AriaSwitchProps, SwitchRenderProps} import {baseColor, focusRing, fontRelative, style} from '../style' with {type: 'macro'}; import {CenterBaseline} from './CenterBaseline'; -import {ContextValue} from 'react-aria-components/utils'; +import {ContextValue} from 'react-aria-components/slots'; import {controlFont, controlSize, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'}; import {createContext, forwardRef, ReactNode, useContext, useRef} from 'react'; import {Direction, FocusableRef, FocusableRefValue, GlobalDOMAttributes} from '@react-types/shared'; diff --git a/packages/@react-spectrum/s2/src/TableView.tsx b/packages/@react-spectrum/s2/src/TableView.tsx index 547cfc6b917..a12b5d885fb 100644 --- a/packages/@react-spectrum/s2/src/TableView.tsx +++ b/packages/@react-spectrum/s2/src/TableView.tsx @@ -44,10 +44,10 @@ import {Checkbox} from './Checkbox'; import Checkmark from '../s2wf-icons/S2_Icon_Checkmark_20_N.svg'; import Chevron from '../ui-icons/Chevron'; import Close from '../s2wf-icons/S2_Icon_Close_20_N.svg'; -import {Collection} from 'react-aria/private/collections/CollectionBuilder'; -import {CollectionRendererContext, DefaultCollectionRenderer} from 'react-aria-components/Collection'; -import {ColumnSize} from 'react-stately/Column'; -import {ContextValue, DEFAULT_SLOT, Provider, useSlottedContext} from 'react-aria-components/utils'; +import {Collection} from 'react-aria/Collection'; +import {CollectionRendererContext, DefaultCollectionRenderer} from 'react-aria-components/CollectionBuilder'; +import {ColumnSize} from 'react-stately/useTableState'; +import {ContextValue, DEFAULT_SLOT, Provider, useSlottedContext} from 'react-aria-components/slots'; import {controlFont, getAllowedOverrides, StylesPropWithHeight, UnsafeStyles} from './style-utils' with {type: 'macro'}; import {css} from '../style/style-macro' with {type: 'macro'}; import {CustomDialog} from './CustomDialog'; @@ -60,7 +60,7 @@ import {GridNode} from 'react-stately/private/grid/GridCollection'; import {IconContext} from './Icon'; import intlMessages from '../intl/*.json'; import {Key} from '@react-types/shared'; -import {LayoutNode} from 'react-stately/private/layout/ListLayout'; +import {LayoutNode} from 'react-stately/useVirtualizerState'; import {Menu, MenuItem, MenuSection, MenuTrigger} from './Menu'; import Nubbin from '../ui-icons/S2_MoveHorizontalTableWidget.svg'; import {OverlayTriggerStateContext} from 'react-aria-components/Dialog'; @@ -69,7 +69,7 @@ import {CheckboxContext as RACCheckboxContext} from 'react-aria-components/Check // @ts-ignore import {Popover as RACPopover} from 'react-aria-components/Popover'; import React, {createContext, CSSProperties, FormEvent, FormHTMLAttributes, ForwardedRef, forwardRef, ReactElement, ReactNode, RefObject, useCallback, useContext, useEffect, useMemo, useRef, useState} from 'react'; -import {Rect} from 'react-stately/private/virtualizer/Rect'; +import {Rect, Virtualizer} from 'react-aria-components/Virtualizer'; import SortDownArrow from '../s2wf-icons/S2_Icon_SortDown_20_N.svg'; import SortUpArrow from '../s2wf-icons/S2_Icon_SortUp_20_N.svg'; import {Button as SpectrumButton} from './Button'; @@ -82,7 +82,6 @@ import {useMediaQuery} from './useMediaQuery'; import {useObjectRef} from 'react-aria/useObjectRef'; import {useScale} from './utils'; import {useSpectrumContextProps} from './useSpectrumContextProps'; -import {Virtualizer} from 'react-aria-components/Virtualizer'; import {VisuallyHidden} from 'react-aria/VisuallyHidden'; interface S2TableProps { diff --git a/packages/@react-spectrum/s2/src/Tabs.tsx b/packages/@react-spectrum/s2/src/Tabs.tsx index 5e15678da85..415406e6a4d 100644 --- a/packages/@react-spectrum/s2/src/Tabs.tsx +++ b/packages/@react-spectrum/s2/src/Tabs.tsx @@ -22,12 +22,11 @@ import { TabListStateContext, TabRenderProps } from 'react-aria-components/Tabs'; - import {baseColor, focusRing, size, style} from '../style' with {type: 'macro'}; import {centerBaseline} from './CenterBaseline'; import {Collection, DOMRef, DOMRefValue, GlobalDOMAttributes, Key, Node, Orientation, RefObject} from '@react-types/shared'; -import {CollectionBuilder} from 'react-aria/private/collections/CollectionBuilder'; -import {ContextValue, Provider} from 'react-aria-components/utils'; +import {CollectionBuilder} from 'react-aria/CollectionBuilder'; +import {ContextValue, Provider} from 'react-aria-components/slots'; import {createContext, forwardRef, ReactNode, useCallback, useContext, useEffect, useMemo, useRef, useState} from 'react'; import {getAllowedOverrides, StyleProps, StylesPropWithHeight, UnsafeStyles} from './style-utils' with {type: 'macro'}; import {Group} from 'react-aria-components/Group'; @@ -36,7 +35,7 @@ import {inertValue} from 'react-aria/private/utils/inertValue'; import {Picker, PickerItem} from './TabsPicker'; import {SelectionIndicator} from 'react-aria-components/SelectionIndicator'; import {Text, TextContext} from './Content'; -import {useControlledState} from 'react-stately/private/utils/useControlledState'; +import {useControlledState} from 'react-stately/useControlledState'; import {useDOMRef} from './useDOMRef'; import {useEffectEvent} from 'react-aria/private/utils/useEffectEvent'; import {useHasTabbableChild} from 'react-aria/private/focus/useHasTabbableChild'; diff --git a/packages/@react-spectrum/s2/src/TabsPicker.tsx b/packages/@react-spectrum/s2/src/TabsPicker.tsx index e7ecccf70f1..96c35eeb614 100644 --- a/packages/@react-spectrum/s2/src/TabsPicker.tsx +++ b/packages/@react-spectrum/s2/src/TabsPicker.tsx @@ -26,7 +26,7 @@ import { } from './Menu'; import CheckmarkIcon from '../ui-icons/Checkmark'; import ChevronIcon from '../ui-icons/Chevron'; -import {ContextValue, DEFAULT_SLOT, Provider} from 'react-aria-components/utils'; +import {ContextValue, DEFAULT_SLOT, Provider} from 'react-aria-components/slots'; import {controlFont, fieldInput, StyleProps} from './style-utils' with {type: 'macro'}; import {css} from '../style/style-macro' with {type: 'macro'}; import {edgeToText} from '../style/spectrum-theme' with {type: 'macro'}; @@ -38,7 +38,7 @@ import {forwardRefType} from './types'; import {HeaderContext, HeadingContext, Text, TextContext} from './Content'; import {IconContext} from './Icon'; import {ListBox, ListBoxItem, ListBoxItemProps, ListBoxProps} from 'react-aria-components/ListBox'; -import {Placement} from 'react-aria/private/overlays/useOverlayPosition'; +import {Placement} from 'react-aria-components/Popover'; import {Popover} from './Popover'; import {pressScale} from './pressScale'; import React, {createContext, forwardRef, ReactNode, useContext, useRef} from 'react'; diff --git a/packages/@react-spectrum/s2/src/TagGroup.tsx b/packages/@react-spectrum/s2/src/TagGroup.tsx index c4c2014869b..f12e8a08b0a 100644 --- a/packages/@react-spectrum/s2/src/TagGroup.tsx +++ b/packages/@react-spectrum/s2/src/TagGroup.tsx @@ -12,23 +12,23 @@ import {ActionButton} from './ActionButton'; import AlertIcon from '../s2wf-icons/S2_Icon_AlertTriangle_20_N.svg'; - import { Tag as AriaTag, TagGroup as AriaTagGroup, TagGroupProps as AriaTagGroupProps, TagProps as AriaTagProps, + Collection, TagList, TagListProps, TagRenderProps } from 'react-aria-components/TagGroup'; - import {AvatarContext} from './Avatar'; import {baseColor, focusRing, fontRelative, lightDark, style} from '../style' with { type: 'macro' }; import {CenterBaseline, centerBaseline} from './CenterBaseline'; import {ClearButton} from './ClearButton'; -import {Collection, CollectionBuilder} from 'react-aria/private/collections/CollectionBuilder'; -import {composeRenderProps, ContextValue, Provider, useSlottedContext} from 'react-aria-components/utils'; +import {CollectionBuilder} from 'react-aria/CollectionBuilder'; +import {composeRenderProps} from 'react-aria-components/composeRenderProps'; +import {ContextValue, Provider, useSlottedContext} from 'react-aria-components/slots'; import {control, field, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'}; import {createContext, forwardRef, ReactNode, useContext, useEffect, useMemo, useRef, useState} from 'react'; import {DOMRef, DOMRefValue, GlobalDOMAttributes, HelpTextProps, LabelableProps, Node, SpectrumLabelableProps} from '@react-types/shared'; diff --git a/packages/@react-spectrum/s2/src/TextField.tsx b/packages/@react-spectrum/s2/src/TextField.tsx index a7013ab20ee..08587e52826 100644 --- a/packages/@react-spectrum/s2/src/TextField.tsx +++ b/packages/@react-spectrum/s2/src/TextField.tsx @@ -11,10 +11,10 @@ */ import {TextArea as AriaTextArea, TextAreaContext as AriaTextAreaContext} from 'react-aria-components/TextArea'; - import {TextField as AriaTextField, TextFieldProps as AriaTextFieldProps} from 'react-aria-components/TextField'; import {centerPadding, style} from '../style' with {type: 'macro'}; -import {composeRenderProps, ContextValue, useSlottedContext} from 'react-aria-components/utils'; +import {composeRenderProps} from 'react-aria-components/composeRenderProps'; +import {ContextValue, useSlottedContext} from 'react-aria-components/slots'; import {controlSize, field, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'}; import {createContext, forwardRef, ReactNode, Ref, useContext, useImperativeHandle, useRef} from 'react'; import {createFocusableRef} from './useDOMRef'; @@ -22,7 +22,7 @@ import {FieldErrorIcon, FieldGroup, FieldLabel, HelpText, Input} from './Field'; import {FocusableRefValue, GlobalDOMAttributes, HelpTextProps, RefObject, SpectrumLabelableProps} from '@react-types/shared'; import {FormContext, useFormProps} from './Form'; import {InputContext, InputProps} from 'react-aria-components/Input'; -import {mergeRefs} from 'react-aria/private/utils/mergeRefs'; +import {mergeRefs} from 'react-aria/mergeRefs'; import {StyleString} from '../style/types'; import {useSpectrumContextProps} from './useSpectrumContextProps'; diff --git a/packages/@react-spectrum/s2/src/TimeField.tsx b/packages/@react-spectrum/s2/src/TimeField.tsx index 09580634813..7d47b6141e0 100644 --- a/packages/@react-spectrum/s2/src/TimeField.tsx +++ b/packages/@react-spectrum/s2/src/TimeField.tsx @@ -11,7 +11,7 @@ */ import {TimeField as AriaTimeField, TimeFieldProps as AriaTimeFieldProps, TimeValue} from 'react-aria-components/TimeField'; -import {ContextValue} from 'react-aria-components/utils'; +import {ContextValue} from 'react-aria-components/slots'; import {createContext, forwardRef, ReactElement, Ref, useContext} from 'react'; import {DateInput, DateInputContainer, InvalidIndicator} from './DateField'; import {field, fieldInput, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'}; diff --git a/packages/@react-spectrum/s2/src/Toast.tsx b/packages/@react-spectrum/s2/src/Toast.tsx index 0507726bcb4..ad6f3b7294c 100644 --- a/packages/@react-spectrum/s2/src/Toast.tsx +++ b/packages/@react-spectrum/s2/src/Toast.tsx @@ -19,7 +19,7 @@ import Chevron from '../s2wf-icons/S2_Icon_ChevronDown_20_N.svg'; import {CloseButton} from './CloseButton'; import {createContext, ReactNode, useContext, useEffect, useMemo, useRef} from 'react'; import {DOMProps} from '@react-types/shared'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {flushSync} from 'react-dom'; import {focusRing, style} from '../style' with {type: 'macro'}; import {FocusScope} from 'react-aria/FocusScope'; diff --git a/packages/@react-spectrum/s2/src/ToggleButton.tsx b/packages/@react-spectrum/s2/src/ToggleButton.tsx index 3fcb19fb862..c894e207769 100644 --- a/packages/@react-spectrum/s2/src/ToggleButton.tsx +++ b/packages/@react-spectrum/s2/src/ToggleButton.tsx @@ -12,7 +12,7 @@ import {ActionButtonStyleProps, btnStyles} from './ActionButton'; import {centerBaseline} from './CenterBaseline'; -import {ContextValue, Provider, useSlottedContext} from 'react-aria-components/utils'; +import {ContextValue, Provider, useSlottedContext} from 'react-aria-components/slots'; import {createContext, forwardRef, ReactNode} from 'react'; import {FocusableRef, FocusableRefValue, GlobalDOMAttributes} from '@react-types/shared'; import {fontRelative, style} from '../style' with {type: 'macro'}; diff --git a/packages/@react-spectrum/s2/src/ToggleButtonGroup.tsx b/packages/@react-spectrum/s2/src/ToggleButtonGroup.tsx index 2df87401101..10a0383797e 100644 --- a/packages/@react-spectrum/s2/src/ToggleButtonGroup.tsx +++ b/packages/@react-spectrum/s2/src/ToggleButtonGroup.tsx @@ -11,7 +11,7 @@ */ import {ActionButtonGroupProps, actionGroupStyle} from './ActionButtonGroup'; -import {ContextValue} from 'react-aria-components/utils'; +import {ContextValue} from 'react-aria-components/slots'; import {createContext, ForwardedRef, forwardRef} from 'react'; diff --git a/packages/@react-spectrum/s2/src/TreeView.tsx b/packages/@react-spectrum/s2/src/TreeView.tsx index 76d886d4654..1515dd47384 100644 --- a/packages/@react-spectrum/s2/src/TreeView.tsx +++ b/packages/@react-spectrum/s2/src/TreeView.tsx @@ -24,9 +24,9 @@ import {getAllowedOverrides, StylesPropWithHeight, UnsafeStyles} from './style-u import {IconContext} from './Icon'; import intlMessages from '../intl/*.json'; import {isFirstItem, isPrevSelected} from './ListView'; -import {ListLayout} from 'react-stately/private/layout/ListLayout'; +import {ListLayout} from 'react-stately/useVirtualizerState'; import {ProgressCircle} from './ProgressCircle'; -import {Provider, useContextProps} from 'react-aria-components/utils'; +import {Provider, useContextProps} from 'react-aria-components/slots'; // @ts-ignore import { TreeItemProps as RACTreeItemProps, diff --git a/packages/@react-spectrum/s2/src/pressScale.ts b/packages/@react-spectrum/s2/src/pressScale.ts index ac9c094cc3e..d3110fcac18 100644 --- a/packages/@react-spectrum/s2/src/pressScale.ts +++ b/packages/@react-spectrum/s2/src/pressScale.ts @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {composeRenderProps} from 'react-aria-components/utils'; +import {composeRenderProps} from 'react-aria-components/composeRenderProps'; import {CSSProperties, RefObject} from 'react'; export function pressScale(ref: RefObject, style?: CSSProperties | ((renderProps: R) => CSSProperties)): (renderProps: R) => CSSProperties { diff --git a/packages/@react-spectrum/s2/src/useSpectrumContextProps.ts b/packages/@react-spectrum/s2/src/useSpectrumContextProps.ts index d74861ee65b..4301e76b5fb 100644 --- a/packages/@react-spectrum/s2/src/useSpectrumContextProps.ts +++ b/packages/@react-spectrum/s2/src/useSpectrumContextProps.ts @@ -11,9 +11,9 @@ */ import {Context, ForwardedRef, useMemo} from 'react'; -import {ContextValue, SlotProps, useSlottedContext} from 'react-aria-components/utils'; +import {ContextValue, SlotProps, useSlottedContext} from 'react-aria-components/slots'; import {mergeProps} from 'react-aria/mergeProps'; -import {mergeRefs} from 'react-aria/private/utils/mergeRefs'; +import {mergeRefs} from 'react-aria/mergeRefs'; import {mergeStyles} from '../style/runtime'; import {RefObject} from '@react-types/shared'; import {useObjectRef} from 'react-aria/useObjectRef'; diff --git a/packages/@react-spectrum/s2/stories/CardView.stories.tsx b/packages/@react-spectrum/s2/stories/CardView.stories.tsx index 79bd53426e5..9d1577a6b73 100644 --- a/packages/@react-spectrum/s2/stories/CardView.stories.tsx +++ b/packages/@react-spectrum/s2/stories/CardView.stories.tsx @@ -15,7 +15,7 @@ import {ActionMenu} from '../src/ActionMenu'; import {Avatar} from '../src/Avatar'; import {Card, CardPreview, CollectionCardPreview} from '../src/Card'; import {CardView, CardViewProps} from '../src/CardView'; -import {Collection} from 'react-aria/private/collections/CollectionBuilder'; +import {Collection} from 'react-aria/Collection'; import {Content, Heading, Text} from '../src/Content'; import EmptyIcon from '../spectrum-illustrations/gradient/generic1/Image'; import ErrorIcon from '../spectrum-illustrations/linear/AlertNotice'; diff --git a/packages/@react-spectrum/s2/stories/ListView.stories.tsx b/packages/@react-spectrum/s2/stories/ListView.stories.tsx index 30f42843fe5..0dc94bd8b10 100644 --- a/packages/@react-spectrum/s2/stories/ListView.stories.tsx +++ b/packages/@react-spectrum/s2/stories/ListView.stories.tsx @@ -17,7 +17,7 @@ import {ActionButtonGroup} from '../src/ActionButtonGroup'; import {ActionMenu} from '../src/ActionMenu'; import {Breadcrumb, Breadcrumbs} from '../src/Breadcrumbs'; import {categorizeArgTypes} from './utils'; -import {chain} from 'react-aria/private/utils/chain'; +import {chain} from 'react-aria/chain'; import {Content, Heading, Text} from '../src/Content'; import Copy from '../s2wf-icons/S2_Icon_Copy_20_N.svg'; import Delete from '../s2wf-icons/S2_Icon_Delete_20_N.svg'; diff --git a/packages/@react-spectrum/s2/stories/TableView.stories.tsx b/packages/@react-spectrum/s2/stories/TableView.stories.tsx index d64c99799a0..45ce91272e3 100644 --- a/packages/@react-spectrum/s2/stories/TableView.stories.tsx +++ b/packages/@react-spectrum/s2/stories/TableView.stories.tsx @@ -26,7 +26,7 @@ import { TableView, TableViewProps } from '../src/TableView'; -import {Collection} from 'react-aria/private/collections/CollectionBuilder'; +import {Collection} from 'react-aria/Collection'; import {Content, Heading, Text} from '../src/Content'; import Edit from '../s2wf-icons/S2_Icon_Edit_20_N.svg'; import Filter from '../s2wf-icons/S2_Icon_Filter_20_N.svg'; diff --git a/packages/@react-spectrum/s2/stories/Tabs.stories.tsx b/packages/@react-spectrum/s2/stories/Tabs.stories.tsx index 7f4bb80a26c..a27b8bea30f 100644 --- a/packages/@react-spectrum/s2/stories/Tabs.stories.tsx +++ b/packages/@react-spectrum/s2/stories/Tabs.stories.tsx @@ -12,7 +12,7 @@ import Bell from '../s2wf-icons/S2_Icon_Bell_20_N.svg'; import {Button} from '../src/Button'; -import {Collection} from 'react-aria/private/collections/CollectionBuilder'; +import {Collection} from 'react-aria/Collection'; import Edit from '../s2wf-icons/S2_Icon_Edit_20_N.svg'; import {fn} from 'storybook/test'; import Heart from '../s2wf-icons/S2_Icon_Heart_20_N.svg'; diff --git a/packages/@react-spectrum/s2/stories/TreeView.stories.tsx b/packages/@react-spectrum/s2/stories/TreeView.stories.tsx index 5497576f9a1..b9bebd80f52 100644 --- a/packages/@react-spectrum/s2/stories/TreeView.stories.tsx +++ b/packages/@react-spectrum/s2/stories/TreeView.stories.tsx @@ -15,7 +15,7 @@ import {ActionBar} from '../src/ActionBar'; import {ActionButton} from '../src/ActionButton'; import {ActionMenu} from '../src/ActionMenu'; import {categorizeArgTypes, getActionArgs} from './utils'; -import {Collection} from 'react-aria/private/collections/CollectionBuilder'; +import {Collection} from 'react-aria/Collection'; import {Content, Heading, Text} from '../src/Content'; import Copy from '../s2wf-icons/S2_Icon_Copy_20_N.svg'; import Delete from '../s2wf-icons/S2_Icon_Delete_20_N.svg'; diff --git a/packages/@react-spectrum/s2/stories/utils.tsx b/packages/@react-spectrum/s2/stories/utils.tsx index 3ca007be5a8..2e5537267a9 100644 --- a/packages/@react-spectrum/s2/stories/utils.tsx +++ b/packages/@react-spectrum/s2/stories/utils.tsx @@ -11,7 +11,7 @@ */ -import {Collection} from 'react-aria/private/collections/CollectionBuilder'; +import {Collection} from 'react-aria/Collection'; import {fn} from 'storybook/test'; import {Header, Heading} from '../src/Content'; diff --git a/packages/@react-spectrum/s2/test/Menu.test.tsx b/packages/@react-spectrum/s2/test/Menu.test.tsx index 6b746df895a..3c035138b99 100644 --- a/packages/@react-spectrum/s2/test/Menu.test.tsx +++ b/packages/@react-spectrum/s2/test/Menu.test.tsx @@ -12,7 +12,7 @@ import {AriaMenuTests} from '../../../react-aria-components/test/AriaMenu.test-util'; import {Button} from '../src/Button'; -import {Collection} from 'react-aria/private/collections/CollectionBuilder'; +import {Collection} from 'react-aria/Collection'; import {Content, Header, Heading} from '../src/Content'; import {ContextualHelpPopover} from '../src/ContextualHelp'; diff --git a/packages/@react-spectrum/table/src/index.ts b/packages/@react-spectrum/table/src/index.ts index 0ef4950fc35..62596bb70af 100644 --- a/packages/@react-spectrum/table/src/index.ts +++ b/packages/@react-spectrum/table/src/index.ts @@ -15,7 +15,4 @@ export {TableView, TableHeader, TableBody, Column, Section, Row, Cell} from '@adobe/react-spectrum/TableView'; export type {SpectrumColumnProps, SpectrumTableProps} from '@adobe/react-spectrum/TableView'; -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'; diff --git a/packages/@react-spectrum/tree/src/index.ts b/packages/@react-spectrum/tree/src/index.ts index 927bad99e12..4d47a1f51ba 100644 --- a/packages/@react-spectrum/tree/src/index.ts +++ b/packages/@react-spectrum/tree/src/index.ts @@ -15,4 +15,4 @@ export {TreeViewItem, TreeView, TreeViewItemContent} from '@adobe/react-spectrum/TreeView'; export type {SpectrumTreeViewProps, SpectrumTreeViewItemProps, SpectrumTreeViewItemContentProps} from '@adobe/react-spectrum/TreeView'; -export {Collection} from 'react-aria/private/collections/CollectionBuilder'; +export {Collection} from 'react-aria/Collection'; diff --git a/packages/@react-stately/layout/src/index.ts b/packages/@react-stately/layout/src/index.ts index 98351724ccd..2a2985524bf 100644 --- a/packages/@react-stately/layout/src/index.ts +++ b/packages/@react-stately/layout/src/index.ts @@ -9,12 +9,5 @@ * OF ANY KIND, either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -export {GridLayout} from 'react-stately/private/layout/GridLayout'; - -export {ListLayout} from 'react-stately/private/layout/ListLayout'; -export {TableLayout} from 'react-stately/private/layout/TableLayout'; -export {WaterfallLayout} from 'react-stately/private/layout/WaterfallLayout'; -export type {GridLayoutOptions} from 'react-stately/private/layout/GridLayout'; -export type {ListLayoutOptions, LayoutNode} from 'react-stately/private/layout/ListLayout'; -export type {TableLayoutProps} from 'react-stately/private/layout/TableLayout'; -export type {WaterfallLayoutOptions} from 'react-stately/private/layout/WaterfallLayout'; +export {GridLayout, ListLayout, TableLayout, WaterfallLayout} from 'react-stately/useVirtualizerState'; +export type {GridLayoutOptions, ListLayoutOptions, LayoutNode, TableLayoutProps, WaterfallLayoutOptions} from 'react-stately/useVirtualizerState'; diff --git a/packages/@react-stately/selection/src/index.ts b/packages/@react-stately/selection/src/index.ts index 8ad193ba7c4..2b87bf4c69f 100644 --- a/packages/@react-stately/selection/src/index.ts +++ b/packages/@react-stately/selection/src/index.ts @@ -14,4 +14,5 @@ export {useMultipleSelectionState} from 'react-stately/useMultipleSelectionState export {SelectionManager} from 'react-stately/private/selection/SelectionManager'; export type {MultipleSelectionStateProps} from 'react-stately/useMultipleSelectionState'; -export type {FocusState, SingleSelectionState, MultipleSelectionState, MultipleSelectionManager} from 'react-stately/private/selection/types'; +export type {FocusState, MultipleSelectionState, MultipleSelectionManager} from 'react-stately/useMultipleSelectionState'; +export type {SingleSelectionState} from 'react-stately/useSingleSelectListState'; diff --git a/packages/@react-stately/table/src/index.ts b/packages/@react-stately/table/src/index.ts index 3abe054f4a6..febe0f9b504 100644 --- a/packages/@react-stately/table/src/index.ts +++ b/packages/@react-stately/table/src/index.ts @@ -10,23 +10,12 @@ * governing permissions and limitations under the License. */ -export {useTableColumnResizeState, useTableState, UNSTABLE_useFilteredTableState} from 'react-stately/useTableState'; - -export {TableHeader} from 'react-stately/TableHeader'; -export {TableBody} from 'react-stately/TableBody'; -export {Column} from 'react-stately/Column'; -export {Row} from 'react-stately/Row'; -export {Cell} from 'react-stately/Cell'; +export {useTableColumnResizeState, useTableState, UNSTABLE_useFilteredTableState, TableHeader, TableBody, Column, Row, Cell} from 'react-stately/useTableState'; export {TableCollection, buildHeaderRows} from 'react-stately/private/table/TableCollection'; export {TableColumnLayout} from 'react-stately/private/table/TableColumnLayout'; export {UNSTABLE_useTreeGridState} from 'react-stately/private/table/useTreeGridState'; -export type {TableColumnResizeState, TableColumnResizeStateProps, TableProps, TableState, TableStateProps} from 'react-stately/useTableState'; +export type {TableColumnResizeState, TableColumnResizeStateProps, TableProps, TableState, TableStateProps, ColumnProps, ColumnSize, ColumnDynamicSize, ColumnStaticSize, ColumnElement, ColumnRenderer, TableHeaderProps, TableBodyProps, RowProps, RowElement, CellProps, CellElement, CellRenderer} from 'react-stately/useTableState'; export type {CollectionBuilderContext} from 'react-stately/private/table/useTableState'; export type {TreeGridState, TreeGridStateProps} from 'react-stately/private/table/useTreeGridState'; -export type {ColumnProps, ColumnSize, ColumnDynamicSize, ColumnStaticSize, ColumnElement, ColumnRenderer} from 'react-stately/Column'; -export type {TableHeaderProps} from 'react-stately/TableHeader'; -export type {TableBodyProps} from 'react-stately/TableBody'; -export type {RowProps, RowElement} from 'react-stately/Row'; -export type {CellProps, CellElement, CellRenderer} from 'react-stately/Cell'; export type {ITableCollection} from 'react-stately/private/table/TableCollection'; export {Section} from 'react-stately/Section'; diff --git a/packages/@react-stately/utils/src/index.ts b/packages/@react-stately/utils/src/index.ts index 8312ac95606..f065e457fe3 100644 --- a/packages/@react-stately/utils/src/index.ts +++ b/packages/@react-stately/utils/src/index.ts @@ -9,6 +9,6 @@ * OF ANY KIND, either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -export {useControlledState} from 'react-stately/private/utils/useControlledState'; +export {useControlledState} from 'react-stately/useControlledState'; export {clamp, snapValueToStep, toFixedNumber} from 'react-stately/private/utils/number'; diff --git a/packages/@react-stately/virtualizer/src/index.ts b/packages/@react-stately/virtualizer/src/index.ts index 68847a42ef4..fa16aaf35d9 100644 --- a/packages/@react-stately/virtualizer/src/index.ts +++ b/packages/@react-stately/virtualizer/src/index.ts @@ -10,14 +10,5 @@ * governing permissions and limitations under the License. */ -export {Layout} from 'react-stately/private/virtualizer/Layout'; - -export {LayoutInfo} from 'react-stately/private/virtualizer/LayoutInfo'; -export {Point} from 'react-stately/private/virtualizer/Point'; -export {Rect} from 'react-stately/private/virtualizer/Rect'; -export {Size} from 'react-stately/private/virtualizer/Size'; -export {ReusableView} from 'react-stately/private/virtualizer/ReusableView'; -export {useVirtualizerState} from 'react-stately/private/virtualizer/useVirtualizerState'; -export type {InvalidationContext} from 'react-stately/private/virtualizer/types'; -export type {VirtualizerState} from 'react-stately/private/virtualizer/useVirtualizerState'; -export type {RectCorner} from 'react-stately/private/virtualizer/Rect'; +export {Layout, LayoutInfo, Point, Rect, Size, ReusableView, useVirtualizerState} from 'react-stately/useVirtualizerState'; +export type {InvalidationContext, VirtualizerState, RectCorner} from 'react-stately/useVirtualizerState'; diff --git a/packages/@spectrum-icons/illustrations/src/NoSearchResults.tsx b/packages/@spectrum-icons/illustrations/src/NoSearchResults.tsx index 0376782a4a6..6c619795078 100644 --- a/packages/@spectrum-icons/illustrations/src/NoSearchResults.tsx +++ b/packages/@spectrum-icons/illustrations/src/NoSearchResults.tsx @@ -1,4 +1,4 @@ -import {Illustration, IllustrationPropsWithoutChildren} from "@react-spectrum/icon"; +import {Illustration, IllustrationPropsWithoutChildren} from '@adobe/react-spectrum/private/icon/Illustration'; import React, {JSX} from "react"; export default function NoSearchResults(props: IllustrationPropsWithoutChildren): JSX.Element { diff --git a/packages/react-aria-components/exports/Autocomplete.ts b/packages/react-aria-components/exports/Autocomplete.ts index eb6a19c0e81..39c642c3bae 100644 --- a/packages/react-aria-components/exports/Autocomplete.ts +++ b/packages/react-aria-components/exports/Autocomplete.ts @@ -15,6 +15,8 @@ import 'client-only'; export {Autocomplete, AutocompleteContext, AutocompleteStateContext, SelectableCollectionContext, FieldInputContext} from '../src/Autocomplete'; +export {useFilter} from 'react-aria/useFilter'; export type {AutocompleteProps, SelectableCollectionContextValue} from '../src/Autocomplete'; export type {AutocompleteState} from 'react-stately/private/autocomplete/useAutocompleteState'; +export type {Filter} from 'react-aria/useFilter'; diff --git a/packages/react-aria-components/exports/Collection.ts b/packages/react-aria-components/exports/Collection.ts index 7cf3c0da65f..37c5b5f1212 100644 --- a/packages/react-aria-components/exports/Collection.ts +++ b/packages/react-aria-components/exports/Collection.ts @@ -14,6 +14,4 @@ // to import it from a React Server Component in a framework like Next.js. import 'client-only'; -export {Collection, createLeafComponent, createBranchComponent, CollectionBuilder} from 'react-aria/private/collections/CollectionBuilder'; -export {Section, CollectionRendererContext, DefaultCollectionRenderer} from '../src/Collection'; -export type {SectionProps, CollectionRenderer} from '../src/Collection'; +export {Collection, type CollectionProps} from 'react-aria/Collection'; diff --git a/packages/react-stately/exports/Row.ts b/packages/react-aria-components/exports/CollectionBuilder.ts similarity index 54% rename from packages/react-stately/exports/Row.ts rename to packages/react-aria-components/exports/CollectionBuilder.ts index fb047674988..9d92c139b82 100644 --- a/packages/react-stately/exports/Row.ts +++ b/packages/react-aria-components/exports/CollectionBuilder.ts @@ -1,5 +1,5 @@ /* - * Copyright 2020 Adobe. All rights reserved. + * Copyright 2022 Adobe. All rights reserved. * This file is licensed to you under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. You may obtain a copy * of the License at http://www.apache.org/licenses/LICENSE-2.0 @@ -10,6 +10,10 @@ * governing permissions and limitations under the License. */ -export type {RowProps, RowElement} from '../src/table/Row'; -export {Row} from '../src/table/Row'; -export {Section} from '../src/collections/Section'; +// Mark as a client only package. This will cause a build time error if you try +// to import it from a React Server Component in a framework like Next.js. +import 'client-only'; + +export {createLeafComponent, createBranchComponent, CollectionBuilder} from 'react-aria/CollectionBuilder'; +export {CollectionRendererContext, DefaultCollectionRenderer} from '../src/Collection'; +export type {CollectionRenderer} from '../src/Collection'; diff --git a/packages/react-aria-components/exports/ComboBox.ts b/packages/react-aria-components/exports/ComboBox.ts index 6e14b69fccf..464a483d159 100644 --- a/packages/react-aria-components/exports/ComboBox.ts +++ b/packages/react-aria-components/exports/ComboBox.ts @@ -15,5 +15,8 @@ import 'client-only'; export {ComboBox, ComboBoxValue, ComboBoxContext, ComboBoxStateContext, ComboBoxValueContext} from '../src/ComboBox'; +export {useFilter} from 'react-aria/useFilter'; + export type {ComboBoxProps, ComboBoxRenderProps, ComboBoxValueProps, ComboBoxValueRenderProps} from '../src/ComboBox'; export type {ComboBoxState} from 'react-stately/useComboBoxState'; +export type {Filter} from 'react-aria/useFilter'; diff --git a/packages/react-aria-components/exports/FieldError.ts b/packages/react-aria-components/exports/FieldError.ts index 9a03d55ad71..41097efd465 100644 --- a/packages/react-aria-components/exports/FieldError.ts +++ b/packages/react-aria-components/exports/FieldError.ts @@ -16,3 +16,4 @@ import 'client-only'; export {FieldError, FieldErrorContext} from '../src/FieldError'; export type {FieldErrorProps, FieldErrorRenderProps} from '../src/FieldError'; +export type {ValidationResult} from '@react-types/shared'; diff --git a/packages/react-aria-components/exports/Focusable.ts b/packages/react-aria-components/exports/Focusable.ts new file mode 100644 index 00000000000..4b1dbc85b68 --- /dev/null +++ b/packages/react-aria-components/exports/Focusable.ts @@ -0,0 +1 @@ +export {Focusable} from 'react-aria/Focusable'; diff --git a/packages/react-aria-components/exports/GridList.ts b/packages/react-aria-components/exports/GridList.ts index edb8908e48b..26d30101e67 100644 --- a/packages/react-aria-components/exports/GridList.ts +++ b/packages/react-aria-components/exports/GridList.ts @@ -15,6 +15,7 @@ import 'client-only'; export {GridListLoadMoreItem, GridList, GridListItem, GridListContext, GridListHeader, GridListHeaderContext, GridListSection} from '../src/GridList'; +export {Collection, type CollectionProps} from 'react-aria/Collection'; export type {GridListProps, GridListRenderProps, GridListItemProps, GridListItemRenderProps, GridListLoadMoreItemProps, GridListSectionProps} from '../src/GridList'; export type {Key, Selection, SelectionMode, DirectoryDropItem, DraggableCollectionEndEvent, DraggableCollectionMoveEvent, DraggableCollectionStartEvent, DragPreviewRenderer, DragTypes, DropItem, DropOperation, DroppableCollectionDropEvent, DroppableCollectionEnterEvent, DroppableCollectionExitEvent, DroppableCollectionInsertDropEvent, DroppableCollectionMoveEvent, DroppableCollectionOnItemDropEvent, DroppableCollectionReorderEvent, DroppableCollectionRootDropEvent, DropPosition, DropTarget, FileDropItem, ItemDropTarget, RootDropTarget, TextDropItem} from '@react-types/shared'; export type {ListState} from 'react-stately/useListState'; diff --git a/packages/react-aria-components/exports/I18nProvider.ts b/packages/react-aria-components/exports/I18nProvider.ts new file mode 100644 index 00000000000..376dcae09c4 --- /dev/null +++ b/packages/react-aria-components/exports/I18nProvider.ts @@ -0,0 +1,2 @@ +export {I18nProvider, useLocale, isRTL} from 'react-aria/I18nProvider'; +export type {I18nProviderProps, Locale} from 'react-aria/I18nProvider'; diff --git a/packages/react-aria-components/exports/ListBox.ts b/packages/react-aria-components/exports/ListBox.ts index 74abdf8d3f8..14bdde9f499 100644 --- a/packages/react-aria-components/exports/ListBox.ts +++ b/packages/react-aria-components/exports/ListBox.ts @@ -15,6 +15,7 @@ import 'client-only'; export {ListBoxLoadMoreItem, ListBox, ListBoxItem, ListBoxSection, ListBoxContext, ListStateContext} from '../src/ListBox'; +export {Collection, type CollectionProps} from 'react-aria/Collection'; export type {ListBoxProps, ListBoxRenderProps, ListBoxItemProps, ListBoxItemRenderProps, ListBoxSectionProps, ListBoxLoadMoreItemProps} from '../src/ListBox'; export type {Key, Selection, SelectionMode, DirectoryDropItem, DraggableCollectionEndEvent, DraggableCollectionMoveEvent, DraggableCollectionStartEvent, DragPreviewRenderer, DragTypes, DropItem, DropOperation, DroppableCollectionDropEvent, DroppableCollectionEnterEvent, DroppableCollectionExitEvent, DroppableCollectionInsertDropEvent, DroppableCollectionMoveEvent, DroppableCollectionOnItemDropEvent, DroppableCollectionReorderEvent, DroppableCollectionRootDropEvent, DropPosition, DropTarget, FileDropItem, ItemDropTarget, RootDropTarget, TextDropItem} from '@react-types/shared'; export type {ListState} from 'react-stately/useListState'; diff --git a/packages/react-aria-components/exports/Menu.ts b/packages/react-aria-components/exports/Menu.ts index 50c82307ee9..cbb59c226f4 100644 --- a/packages/react-aria-components/exports/Menu.ts +++ b/packages/react-aria-components/exports/Menu.ts @@ -15,6 +15,7 @@ import 'client-only'; export {Menu, MenuItem, MenuTrigger, MenuSection, MenuContext, MenuStateContext, RootMenuTriggerStateContext, SubmenuTrigger} from '../src/Menu'; +export {Collection, type CollectionProps} from 'react-aria/Collection'; export type {MenuProps, MenuItemProps, MenuItemRenderProps, MenuTriggerProps, SubmenuTriggerProps, MenuSectionProps} from '../src/Menu'; export type {Key, Selection, SelectionMode} from '@react-types/shared'; export type {ListState} from 'react-stately/useListState'; diff --git a/packages/react-aria-components/exports/Popover.ts b/packages/react-aria-components/exports/Popover.ts index 0ea467d64f0..5bd1814d89a 100644 --- a/packages/react-aria-components/exports/Popover.ts +++ b/packages/react-aria-components/exports/Popover.ts @@ -16,3 +16,4 @@ import 'client-only'; export {Popover, PopoverContext} from '../src/Popover'; export type {PopoverProps, PopoverRenderProps} from '../src/Popover'; +export type {Placement} from 'react-aria/useOverlayPosition'; diff --git a/packages/react-aria-components/exports/Pressable.ts b/packages/react-aria-components/exports/Pressable.ts new file mode 100644 index 00000000000..d50dc9db29d --- /dev/null +++ b/packages/react-aria-components/exports/Pressable.ts @@ -0,0 +1 @@ +export {Pressable} from 'react-aria/Pressable'; diff --git a/packages/react-aria-components/exports/Table.ts b/packages/react-aria-components/exports/Table.ts index 1b3fc36412e..bccdd8a3ef8 100644 --- a/packages/react-aria-components/exports/Table.ts +++ b/packages/react-aria-components/exports/Table.ts @@ -18,3 +18,4 @@ export {TableLoadMoreItem, Table, Row, Cell, Column, ColumnResizer, TableHeader, export type {TableProps, TableRenderProps, TableHeaderProps, TableBodyProps, TableBodyRenderProps, ResizableTableContainerProps, ColumnProps, ColumnRenderProps, ColumnResizerProps, ColumnResizerRenderProps, RowProps, RowRenderProps, CellProps, CellRenderProps, TableLoadMoreItemProps} from '../src/Table'; export type {Key, Selection, SortDescriptor, SortDirection, SelectionMode, DirectoryDropItem, DraggableCollectionEndEvent, DraggableCollectionMoveEvent, DraggableCollectionStartEvent, DragPreviewRenderer, DragTypes, DropItem, DropOperation, DroppableCollectionDropEvent, DroppableCollectionEnterEvent, DroppableCollectionExitEvent, DroppableCollectionInsertDropEvent, DroppableCollectionMoveEvent, DroppableCollectionOnItemDropEvent, DroppableCollectionReorderEvent, DroppableCollectionRootDropEvent, DropPosition, DropTarget, FileDropItem, ItemDropTarget, RootDropTarget, TextDropItem} from '@react-types/shared'; export type {TableState} from 'react-stately/useTableState'; +export {Collection, type CollectionProps} from 'react-aria/Collection'; diff --git a/packages/react-aria-components/exports/TagGroup.ts b/packages/react-aria-components/exports/TagGroup.ts index 3da81d09b9d..7ecfc423cf1 100644 --- a/packages/react-aria-components/exports/TagGroup.ts +++ b/packages/react-aria-components/exports/TagGroup.ts @@ -17,3 +17,4 @@ import 'client-only'; export {TagGroup, TagGroupContext, TagList, TagListContext, Tag} from '../src/TagGroup'; export type {TagGroupProps, TagListProps, TagListRenderProps, TagProps, TagRenderProps} from '../src/TagGroup'; export type {Key, Selection, SelectionMode} from '@react-types/shared'; +export {Collection, type CollectionProps} from 'react-aria/Collection'; diff --git a/packages/react-aria-components/exports/Virtualizer.ts b/packages/react-aria-components/exports/Virtualizer.ts index 3fa3cbe33d1..f974bb6b360 100644 --- a/packages/react-aria-components/exports/Virtualizer.ts +++ b/packages/react-aria-components/exports/Virtualizer.ts @@ -16,15 +16,5 @@ import 'client-only'; export {Virtualizer} from '../src/Virtualizer'; export type {VirtualizerProps} from '../src/Virtualizer'; -export {ListLayout} from 'react-stately/private/layout/ListLayout'; -export {GridLayout} from 'react-stately/private/layout/GridLayout'; -export {WaterfallLayout} from 'react-stately/private/layout/WaterfallLayout'; -export {Layout} from 'react-stately/private/virtualizer/Layout'; -export {LayoutInfo} from 'react-stately/private/virtualizer/LayoutInfo'; -export {Size} from 'react-stately/private/virtualizer/Size'; -export {Rect} from 'react-stately/private/virtualizer/Rect'; -export {Point} from 'react-stately/private/virtualizer/Point'; - -export type {ListLayoutOptions} from 'react-stately/private/layout/ListLayout'; -export type {GridLayoutOptions} from 'react-stately/private/layout/GridLayout'; -export type {WaterfallLayoutOptions} from 'react-stately/private/layout/WaterfallLayout'; +export {ListLayout, GridLayout, WaterfallLayout, Layout, LayoutInfo, Size, Rect, Point} from 'react-stately/useVirtualizerState'; +export type {ListLayoutOptions, GridLayoutOptions, WaterfallLayoutOptions} from 'react-stately/useVirtualizerState'; diff --git a/packages/react-aria-components/exports/VisuallyHidden.ts b/packages/react-aria-components/exports/VisuallyHidden.ts new file mode 100644 index 00000000000..9c11f2eea91 --- /dev/null +++ b/packages/react-aria-components/exports/VisuallyHidden.ts @@ -0,0 +1,2 @@ +export {VisuallyHidden} from 'react-aria/VisuallyHidden'; +export type {VisuallyHiddenProps} from 'react-aria/VisuallyHidden'; diff --git a/packages/react-aria-components/exports/composeRenderProps.ts b/packages/react-aria-components/exports/composeRenderProps.ts new file mode 100644 index 00000000000..53223f5e2f2 --- /dev/null +++ b/packages/react-aria-components/exports/composeRenderProps.ts @@ -0,0 +1 @@ +export {composeRenderProps} from '../src/utils'; diff --git a/packages/react-aria-components/exports/index.ts b/packages/react-aria-components/exports/index.ts index 62757ad11c8..0b987f11550 100644 --- a/packages/react-aria-components/exports/index.ts +++ b/packages/react-aria-components/exports/index.ts @@ -43,7 +43,8 @@ export {Header, HeaderContext} from '../src/Header'; export {Heading, HeadingContext} from '../src/Heading'; export {Input, InputContext} from '../src/Input'; export {Section, CollectionRendererContext, DefaultCollectionRenderer} from '../src/Collection'; -export {Collection, createLeafComponent, createBranchComponent, CollectionBuilder} from 'react-aria/private/collections/CollectionBuilder'; +export {Collection} from 'react-aria/Collection'; +export {createLeafComponent, createBranchComponent, CollectionBuilder} from 'react-aria/CollectionBuilder'; export {Keyboard, KeyboardContext} from '../src/Keyboard'; export {Label, LabelContext} from '../src/Label'; export {Link, LinkContext} from '../src/Link'; @@ -81,11 +82,10 @@ export {useDragAndDrop, DropIndicator, DropIndicatorContext, DragAndDropContext} export {Virtualizer} from '../src/Virtualizer'; export {SSRProvider} from 'react-aria/SSRProvider'; export {RouterProvider} from 'react-aria/private/utils/openLink'; -export {I18nProvider, useLocale} from 'react-aria/I18nProvider'; -export {isRTL} from 'react-aria/private/i18n/utils'; +export {I18nProvider, useLocale, isRTL} from 'react-aria/I18nProvider'; export {useFilter} from 'react-aria/useFilter'; -export {Pressable} from 'react-aria/private/interactions/Pressable'; -export {Focusable} from 'react-aria/private/interactions/useFocusable'; +export {Pressable} from 'react-aria/Pressable'; +export {Focusable} from 'react-aria/Focusable'; export {VisuallyHidden} from 'react-aria/VisuallyHidden'; export {FormValidationContext} from 'react-stately/private/form/useFormValidationState'; export {parseColor, getColorChannels} from 'react-stately/Color'; @@ -93,14 +93,13 @@ export {ToastQueue as UNSTABLE_ToastQueue} from 'react-stately/useToastState'; export {useListData} from 'react-stately/useListData'; export {useTreeData} from 'react-stately/useTreeData'; export {useAsyncList} from 'react-stately/useAsyncList'; -export {ListLayout} from 'react-stately/private/layout/ListLayout'; -export {GridLayout} from 'react-stately/private/layout/GridLayout'; -export {WaterfallLayout} from 'react-stately/private/layout/WaterfallLayout'; -export {Layout} from 'react-stately/private/virtualizer/Layout'; -export {LayoutInfo} from 'react-stately/private/virtualizer/LayoutInfo'; -export {Size} from 'react-stately/private/virtualizer/Size'; -export {Rect} from 'react-stately/private/virtualizer/Rect'; -export {Point} from 'react-stately/private/virtualizer/Point'; +export {ListLayout, GridLayout, WaterfallLayout, Layout, LayoutInfo, Size, Rect, Point} from 'react-stately/useVirtualizerState'; + +export type {I18nProviderProps, Locale} from 'react-aria/I18nProvider'; +export type {Filter} from 'react-aria/useFilter'; +export type {CollectionProps} from 'react-aria/Collection'; +export type {Placement} from 'react-aria/useOverlayPosition'; +export type {VisuallyHiddenProps} from 'react-aria/VisuallyHidden'; export type {AutocompleteProps, SelectableCollectionContextValue} from '../src/Autocomplete'; export type {BreadcrumbsProps, BreadcrumbProps, BreadcrumbRenderProps} from '../src/Breadcrumbs'; @@ -200,11 +199,9 @@ export type {ToggleGroupState} from 'react-stately/useToggleGroupState'; export type {ToggleState} from 'react-stately/useToggleState'; export type {TooltipTriggerState} from 'react-stately/useTooltipTriggerState'; export type {TreeState} from 'react-stately/useTreeState'; -export type {ListData} from 'react-stately/useListData'; -export type {TreeData} from 'react-stately/useTreeData'; -export type {AsyncListData} from 'react-stately/useAsyncList'; +export type {ListOptions as ListDataOptions, ListData} from 'react-stately/useListData'; +export type {TreeOptions as TreeDataOptions, TreeData} from 'react-stately/useTreeData'; +export type {AsyncListOptions, AsyncListData, AsyncListLoadFunction, AsyncListLoadOptions, AsyncListStateUpdate} from 'react-stately/useAsyncList'; export type {AutocompleteState} from 'react-stately/private/autocomplete/useAutocompleteState'; -export type {ListLayoutOptions} from 'react-stately/private/layout/ListLayout'; -export type {GridLayoutOptions} from 'react-stately/private/layout/GridLayout'; -export type {WaterfallLayoutOptions} from 'react-stately/private/layout/WaterfallLayout'; +export type {ListLayoutOptions, GridLayoutOptions, WaterfallLayoutOptions} from 'react-stately/useVirtualizerState'; export type {RangeValue, ValidationResult, RouterConfig} from '@react-types/shared'; diff --git a/packages/react-aria-components/exports/utils.ts b/packages/react-aria-components/exports/slots.ts similarity index 78% rename from packages/react-aria-components/exports/utils.ts rename to packages/react-aria-components/exports/slots.ts index 9d2edec412c..f24de6a9abc 100644 --- a/packages/react-aria-components/exports/utils.ts +++ b/packages/react-aria-components/exports/slots.ts @@ -14,5 +14,5 @@ // to import it from a React Server Component in a framework like Next.js. import 'client-only'; -export {composeRenderProps, DEFAULT_SLOT, Provider, useContextProps, useRenderProps, useSlottedContext} from '../src/utils'; -export type {ContextValue, RenderProps, SlotProps, StyleRenderProps} from '../src/utils'; +export {DEFAULT_SLOT, Provider, useContextProps, useSlottedContext} from '../src/utils'; +export type {ContextValue, SlotProps} from '../src/utils'; diff --git a/packages/react-aria-components/exports/useAsyncList.ts b/packages/react-aria-components/exports/useAsyncList.ts new file mode 100644 index 00000000000..af9ed6e9c67 --- /dev/null +++ b/packages/react-aria-components/exports/useAsyncList.ts @@ -0,0 +1,2 @@ +export {useAsyncList} from 'react-stately/useAsyncList'; +export type {AsyncListOptions, AsyncListData, AsyncListLoadFunction, AsyncListLoadOptions, AsyncListStateUpdate} from 'react-stately/useAsyncList'; diff --git a/packages/react-aria-components/exports/useDrag.ts b/packages/react-aria-components/exports/useDrag.ts new file mode 100644 index 00000000000..516cea2e5a9 --- /dev/null +++ b/packages/react-aria-components/exports/useDrag.ts @@ -0,0 +1,2 @@ +export {useDrag} from 'react-aria/useDrag'; +export type {DragOptions, DragResult} from 'react-aria/useDrag'; diff --git a/packages/react-aria-components/exports/useDrop.ts b/packages/react-aria-components/exports/useDrop.ts new file mode 100644 index 00000000000..374c2767cec --- /dev/null +++ b/packages/react-aria-components/exports/useDrop.ts @@ -0,0 +1 @@ +export {useDrop, DIRECTORY_DRAG_TYPE, isDirectoryDropItem, isFileDropItem, isTextDropItem} from 'react-aria/useDrop'; diff --git a/packages/react-aria-components/exports/useListData.ts b/packages/react-aria-components/exports/useListData.ts new file mode 100644 index 00000000000..eeff6ae0f82 --- /dev/null +++ b/packages/react-aria-components/exports/useListData.ts @@ -0,0 +1,2 @@ +export {useListData} from 'react-stately/useListData'; +export type {ListOptions as ListDataOptions, ListData} from 'react-stately/useListData'; diff --git a/packages/react-aria-components/exports/useRenderProps.ts b/packages/react-aria-components/exports/useRenderProps.ts new file mode 100644 index 00000000000..7a8335ae1c2 --- /dev/null +++ b/packages/react-aria-components/exports/useRenderProps.ts @@ -0,0 +1,2 @@ +export {useRenderProps} from '../src/utils'; +export type {RenderProps, StyleRenderProps} from '../src/utils'; diff --git a/packages/react-aria-components/exports/useTreeData.ts b/packages/react-aria-components/exports/useTreeData.ts new file mode 100644 index 00000000000..3e0233b34c4 --- /dev/null +++ b/packages/react-aria-components/exports/useTreeData.ts @@ -0,0 +1,2 @@ +export {useTreeData} from 'react-stately/useTreeData'; +export type {TreeOptions as TreeDataOptions, TreeData} from 'react-stately/useTreeData'; diff --git a/packages/react-aria-components/src/Autocomplete.tsx b/packages/react-aria-components/src/Autocomplete.tsx index b3e5bcd8881..52d225f17b2 100644 --- a/packages/react-aria-components/src/Autocomplete.tsx +++ b/packages/react-aria-components/src/Autocomplete.tsx @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {AriaAutocompleteProps, useAutocomplete} from 'react-aria/private/autocomplete/useAutocomplete'; +import {AriaAutocompleteProps, useAutocomplete} from 'react-aria/useAutocomplete'; import {AriaLabelingProps, DOMProps, FocusableElement, FocusEvents, KeyboardEvents, Node, ValueBase} from '@react-types/shared'; import {AriaTextFieldProps} from 'react-aria/useTextField'; import {AutocompleteState, useAutocompleteState} from 'react-stately/private/autocomplete/useAutocompleteState'; diff --git a/packages/react-aria-components/src/Breadcrumbs.tsx b/packages/react-aria-components/src/Breadcrumbs.tsx index bf1f6ddd4ef..119d784eebd 100644 --- a/packages/react-aria-components/src/Breadcrumbs.tsx +++ b/packages/react-aria-components/src/Breadcrumbs.tsx @@ -24,10 +24,11 @@ import { useRenderProps, useSlottedContext } from './utils'; -import {Collection, CollectionBuilder, createLeafComponent} from 'react-aria/private/collections/CollectionBuilder'; +import {Collection} from 'react-aria/Collection'; +import {CollectionBuilder, createLeafComponent} from 'react-aria/CollectionBuilder'; import {CollectionNode} from 'react-aria/private/collections/BaseCollection'; import {CollectionProps, CollectionRendererContext} from './Collection'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {LinkContext} from './Link'; import {mergeProps} from 'react-aria/mergeProps'; import {Node} from '@react-types/shared'; diff --git a/packages/react-aria-components/src/Button.tsx b/packages/react-aria-components/src/Button.tsx index e7113f252ce..34bc565a9d2 100644 --- a/packages/react-aria-components/src/Button.tsx +++ b/packages/react-aria-components/src/Button.tsx @@ -23,7 +23,7 @@ import { useRenderProps } from './utils'; import {createHideableComponent} from 'react-aria/private/collections/Hidden'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {GlobalDOMAttributes} from '@react-types/shared'; import {HoverEvents} from '@react-types/shared'; import {mergeProps} from 'react-aria/mergeProps'; diff --git a/packages/react-aria-components/src/Calendar.tsx b/packages/react-aria-components/src/Calendar.tsx index 04b8e027c60..1e3da48c357 100644 --- a/packages/react-aria-components/src/Calendar.tsx +++ b/packages/react-aria-components/src/Calendar.tsx @@ -31,7 +31,7 @@ import { } from './utils'; import {DateValue, useRangeCalendarState} from 'react-stately/useRangeCalendarState'; import {DOMAttributes, FocusableElement, forwardRefType, GlobalDOMAttributes, HoverEvents} from '@react-types/shared'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {HeadingContext} from './Heading'; import {mergeProps} from 'react-aria/mergeProps'; import {RangeCalendarState} from 'react-stately/useRangeCalendarState'; diff --git a/packages/react-aria-components/src/Checkbox.tsx b/packages/react-aria-components/src/Checkbox.tsx index 5cfeee10f71..674757cf5f6 100644 --- a/packages/react-aria-components/src/Checkbox.tsx +++ b/packages/react-aria-components/src/Checkbox.tsx @@ -28,13 +28,13 @@ import { useSlottedContext } from './utils'; import {FieldErrorContext} from './FieldError'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {FormContext} from './Form'; import {forwardRefType, GlobalDOMAttributes, RefObject} from '@react-types/shared'; import {HoverEvents} from '@react-types/shared'; import {LabelContext} from './Label'; import {mergeProps} from 'react-aria/mergeProps'; -import {mergeRefs} from 'react-aria/private/utils/mergeRefs'; +import {mergeRefs} from 'react-aria/mergeRefs'; import React, {createContext, ForwardedRef, forwardRef, useContext, useMemo} from 'react'; import {TextContext} from './Text'; import {useFocusRing} from 'react-aria/useFocusRing'; diff --git a/packages/react-aria-components/src/Collection.tsx b/packages/react-aria-components/src/Collection.tsx index c7aec03bca0..95c136a1e4f 100644 --- a/packages/react-aria-components/src/Collection.tsx +++ b/packages/react-aria-components/src/Collection.tsx @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ import {CollectionBase, DropTargetDelegate, GlobalDOMAttributes, ItemDropTarget, Key, LayoutDelegate, RefObject} from '@react-types/shared'; -import {createBranchComponent} from 'react-aria/private/collections/CollectionBuilder'; +import {createBranchComponent} from 'react-aria/CollectionBuilder'; import { Collection as ICollection, Node, diff --git a/packages/react-aria-components/src/ColorArea.tsx b/packages/react-aria-components/src/ColorArea.tsx index 98bd4eba6b4..372c2f28f7c 100644 --- a/packages/react-aria-components/src/ColorArea.tsx +++ b/packages/react-aria-components/src/ColorArea.tsx @@ -10,7 +10,7 @@ import { useRenderProps } from './utils'; import {ColorAreaState, useColorAreaState} from 'react-stately/useColorAreaState'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {GlobalDOMAttributes} from '@react-types/shared'; import {InternalColorThumbContext} from './ColorThumb'; import {mergeProps} from 'react-aria/mergeProps'; diff --git a/packages/react-aria-components/src/ColorField.tsx b/packages/react-aria-components/src/ColorField.tsx index f320e101b0b..57fb859a07e 100644 --- a/packages/react-aria-components/src/ColorField.tsx +++ b/packages/react-aria-components/src/ColorField.tsx @@ -28,7 +28,7 @@ import { import {ColorChannel, ColorSpace} from 'react-stately/Color'; import {ColorFieldState, useColorChannelFieldState, useColorFieldState} from 'react-stately/useColorFieldState'; import {FieldErrorContext} from './FieldError'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {GlobalDOMAttributes, InputDOMProps, ValidationResult} from '@react-types/shared'; import {GroupContext} from './Group'; import {InputContext} from './Input'; diff --git a/packages/react-aria-components/src/ColorSlider.tsx b/packages/react-aria-components/src/ColorSlider.tsx index c28c32f352c..cab88220770 100644 --- a/packages/react-aria-components/src/ColorSlider.tsx +++ b/packages/react-aria-components/src/ColorSlider.tsx @@ -11,7 +11,7 @@ import { useSlot } from './utils'; import {ColorSliderState, useColorSliderState} from 'react-stately/useColorSliderState'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {GlobalDOMAttributes} from '@react-types/shared'; import {InternalColorThumbContext} from './ColorThumb'; import {LabelContext} from './Label'; diff --git a/packages/react-aria-components/src/ColorSwatch.tsx b/packages/react-aria-components/src/ColorSwatch.tsx index 52bab1c717d..dde2b1af1fc 100644 --- a/packages/react-aria-components/src/ColorSwatch.tsx +++ b/packages/react-aria-components/src/ColorSwatch.tsx @@ -9,7 +9,7 @@ import { useRenderProps } from './utils'; import {Color} from 'react-stately/Color'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {GlobalDOMAttributes} from '@react-types/shared'; import {mergeProps} from 'react-aria/mergeProps'; import React, {createContext, ForwardedRef, forwardRef} from 'react'; diff --git a/packages/react-aria-components/src/ColorSwatchPicker.tsx b/packages/react-aria-components/src/ColorSwatchPicker.tsx index 4f6cdc920f9..a1ace6ba75a 100644 --- a/packages/react-aria-components/src/ColorSwatchPicker.tsx +++ b/packages/react-aria-components/src/ColorSwatchPicker.tsx @@ -9,7 +9,7 @@ import { } from './utils'; import {Color} from 'react-stately/Color'; import {ColorSwatchContext} from './ColorSwatch'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import intlMessages from '../intl/*.json'; import {ListBox, ListBoxItem, ListBoxItemRenderProps, ListBoxRenderProps} from './ListBox'; // @ts-ignore diff --git a/packages/react-aria-components/src/ColorThumb.tsx b/packages/react-aria-components/src/ColorThumb.tsx index 9defe196da3..8d398e6290d 100644 --- a/packages/react-aria-components/src/ColorThumb.tsx +++ b/packages/react-aria-components/src/ColorThumb.tsx @@ -1,6 +1,6 @@ import {ClassNameOrFunction, dom, RenderProps, useRenderProps} from './utils'; import {Color} from 'react-stately/Color'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {GlobalDOMAttributes, HoverEvents, RefObject} from '@react-types/shared'; import {mergeProps} from 'react-aria/mergeProps'; import React, {createContext, ForwardedRef, forwardRef, HTMLAttributes, InputHTMLAttributes, useContext} from 'react'; diff --git a/packages/react-aria-components/src/ColorWheel.tsx b/packages/react-aria-components/src/ColorWheel.tsx index 96bb774ea54..eff40cee549 100644 --- a/packages/react-aria-components/src/ColorWheel.tsx +++ b/packages/react-aria-components/src/ColorWheel.tsx @@ -11,7 +11,7 @@ import { useRenderProps } from './utils'; import {ColorWheelState, useColorWheelState} from 'react-stately/useColorWheelState'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {GlobalDOMAttributes} from '@react-types/shared'; import {InternalColorThumbContext} from './ColorThumb'; import React, {createContext, ForwardedRef, forwardRef, HTMLAttributes, useContext, useRef} from 'react'; diff --git a/packages/react-aria-components/src/ComboBox.tsx b/packages/react-aria-components/src/ComboBox.tsx index 1225277868c..9dc9bb82c51 100644 --- a/packages/react-aria-components/src/ComboBox.tsx +++ b/packages/react-aria-components/src/ComboBox.tsx @@ -27,11 +27,11 @@ import { useSlottedContext } from './utils'; import {Collection, Node} from '@react-types/shared'; -import {CollectionBuilder} from 'react-aria/private/collections/CollectionBuilder'; +import {CollectionBuilder} from 'react-aria/CollectionBuilder'; import {ComboBoxState, useComboBoxState} from 'react-stately/useComboBoxState'; import {createHideableComponent} from 'react-aria/private/collections/Hidden'; import {FieldErrorContext} from './FieldError'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {FormContext} from './Form'; import {forwardRefType, GlobalDOMAttributes, Key, RefObject} from '@react-types/shared'; import {GroupContext} from './Group'; diff --git a/packages/react-aria-components/src/DateField.tsx b/packages/react-aria-components/src/DateField.tsx index db3b30d4183..3f9b00bcf3f 100644 --- a/packages/react-aria-components/src/DateField.tsx +++ b/packages/react-aria-components/src/DateField.tsx @@ -39,7 +39,7 @@ import { useDateFieldState } from 'react-stately/useDateFieldState'; import {FieldErrorContext} from './FieldError'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {FormContext} from './Form'; import {forwardRefType, GlobalDOMAttributes} from '@react-types/shared'; import {Group, GroupContext} from './Group'; diff --git a/packages/react-aria-components/src/DatePicker.tsx b/packages/react-aria-components/src/DatePicker.tsx index 6c51b157442..71bbd55f79e 100644 --- a/packages/react-aria-components/src/DatePicker.tsx +++ b/packages/react-aria-components/src/DatePicker.tsx @@ -32,7 +32,7 @@ import {DatePickerState, DatePickerStateOptions, DateValue, useDatePickerState} import {DateRangePickerState, DateRangePickerStateOptions, useDateRangePickerState} from 'react-stately/useDateRangePickerState'; import {DialogContext, OverlayTriggerStateContext} from './Dialog'; import {FieldErrorContext} from './FieldError'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {FormContext} from './Form'; import {forwardRefType, GlobalDOMAttributes} from '@react-types/shared'; import {GroupContext} from './Group'; diff --git a/packages/react-aria-components/src/Dialog.tsx b/packages/react-aria-components/src/Dialog.tsx index 521b16637e2..d3d2a8b4fcc 100644 --- a/packages/react-aria-components/src/Dialog.tsx +++ b/packages/react-aria-components/src/Dialog.tsx @@ -13,7 +13,7 @@ import {AriaDialogProps, useDialog} from 'react-aria/useDialog'; import {ButtonContext} from './Button'; import {ContextValue, DEFAULT_SLOT, dom, DOMRenderProps, Provider, SlotProps, StyleProps, useContextProps, useRenderProps} from './utils'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {forwardRefType, GlobalDOMAttributes} from '@react-types/shared'; import {HeadingContext} from './Heading'; import {mergeProps} from 'react-aria/mergeProps'; diff --git a/packages/react-aria-components/src/Disclosure.tsx b/packages/react-aria-components/src/Disclosure.tsx index 6bb7c0fb832..c417fe721a4 100644 --- a/packages/react-aria-components/src/Disclosure.tsx +++ b/packages/react-aria-components/src/Disclosure.tsx @@ -33,10 +33,10 @@ import {DisclosureState, useDisclosureState} from 'react-stately/useDisclosureSt import {DOMProps, forwardRefType, GlobalDOMAttributes, Key} from '@react-types/shared'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {LabelAriaProps} from 'react-aria/useLabel'; import {mergeProps} from 'react-aria/mergeProps'; -import {mergeRefs} from 'react-aria/private/utils/mergeRefs'; +import {mergeRefs} from 'react-aria/mergeRefs'; import React, {createContext, DOMAttributes, ForwardedRef, forwardRef, ReactNode, useContext} from 'react'; import {useFocusRing} from 'react-aria/useFocusRing'; import {useId} from 'react-aria/useId'; diff --git a/packages/react-aria-components/src/DragAndDrop.tsx b/packages/react-aria-components/src/DragAndDrop.tsx index 4173462693b..b41e550fc39 100644 --- a/packages/react-aria-components/src/DragAndDrop.tsx +++ b/packages/react-aria-components/src/DragAndDrop.tsx @@ -16,7 +16,7 @@ import type {DragAndDropHooks} from './useDragAndDrop'; import type {DraggableCollectionState} from 'react-stately/useDraggableCollectionState'; import type {DroppableCollectionState} from 'react-stately/useDroppableCollectionState'; import type {ItemDropTarget, Key} from '@react-types/shared'; -import type {MultipleSelectionManager} from 'react-stately/private/selection/types'; +import type {MultipleSelectionManager} from 'react-stately/useMultipleSelectionState'; import React, {createContext, ForwardedRef, forwardRef, JSX, ReactNode, useCallback, useContext, useMemo} from 'react'; export interface DragAndDropContextValue { diff --git a/packages/react-aria-components/src/DropZone.tsx b/packages/react-aria-components/src/DropZone.tsx index 72be7b2f8e5..1d33d4c763a 100644 --- a/packages/react-aria-components/src/DropZone.tsx +++ b/packages/react-aria-components/src/DropZone.tsx @@ -22,7 +22,7 @@ import { useRenderProps } from './utils'; import {DropOptions, useDrop} from 'react-aria/useDrop'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {getEventTarget, nodeContains} from 'react-aria/private/utils/shadowdom/DOMFunctions'; import intlMessages from '../intl/*.json'; import {isFocusable} from 'react-aria/private/utils/isFocusable'; diff --git a/packages/react-aria-components/src/FieldError.tsx b/packages/react-aria-components/src/FieldError.tsx index d028ca83002..f932822fcc6 100644 --- a/packages/react-aria-components/src/FieldError.tsx +++ b/packages/react-aria-components/src/FieldError.tsx @@ -12,7 +12,7 @@ import {ClassNameOrFunction, RenderProps, useRenderProps} from './utils'; import {DOMProps, GlobalDOMAttributes, ValidationResult} from '@react-types/shared'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import React, {createContext, ForwardedRef, forwardRef, useContext} from 'react'; import {Text} from './Text'; diff --git a/packages/react-aria-components/src/FileTrigger.tsx b/packages/react-aria-components/src/FileTrigger.tsx index 73bd2b3148f..f534170757e 100644 --- a/packages/react-aria-components/src/FileTrigger.tsx +++ b/packages/react-aria-components/src/FileTrigger.tsx @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {getEventTarget} from 'react-aria/private/utils/shadowdom/DOMFunctions'; import {GlobalDOMAttributes} from '@react-types/shared'; diff --git a/packages/react-aria-components/src/GridList.tsx b/packages/react-aria-components/src/GridList.tsx index 8068556c595..fb481428de5 100644 --- a/packages/react-aria-components/src/GridList.tsx +++ b/packages/react-aria-components/src/GridList.tsx @@ -34,7 +34,8 @@ import { useContextProps, useRenderProps } from './utils'; -import {Collection, CollectionBuilder, createBranchComponent, createLeafComponent} from 'react-aria/private/collections/CollectionBuilder'; +import {Collection} from 'react-aria/Collection'; +import {CollectionBuilder, createBranchComponent, createLeafComponent} from 'react-aria/CollectionBuilder'; import {CollectionProps, CollectionRendererContext, DefaultCollectionRenderer, ItemRenderProps, SectionProps} from './Collection'; import {DragAndDropContext, DropIndicatorContext, DropIndicatorProps, useDndPersistedKeys, useRenderDropIndicator} from './DragAndDrop'; import {DragAndDropHooks} from './useDragAndDrop'; @@ -44,7 +45,7 @@ import {DragPreviewRenderer} from '@react-types/shared'; import {DropIndicatorAria, DroppableCollectionResult} from 'react-aria/useDroppableCollection'; import {DroppableCollectionState} from 'react-stately/useDroppableCollectionState'; import {FieldInputContext, SelectableCollectionContext, SelectableCollectionContextValue} from './Autocomplete'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {FocusScope} from 'react-aria/FocusScope'; import {forwardRefType, GlobalDOMAttributes, HoverEvents, Key, LinkDOMProps, Orientation, PressEvents, RefObject} from '@react-types/shared'; import {HeaderNode, ItemNode, LoaderNode, SectionNode} from 'react-aria/private/collections/BaseCollection'; diff --git a/packages/react-aria-components/src/Header.tsx b/packages/react-aria-components/src/Header.tsx index 1e241119322..8d7449e407b 100644 --- a/packages/react-aria-components/src/Header.tsx +++ b/packages/react-aria-components/src/Header.tsx @@ -11,7 +11,7 @@ */ import {ContextValue, dom, DOMRenderProps, useContextProps} from './utils'; -import {createLeafComponent} from 'react-aria/private/collections/CollectionBuilder'; +import {createLeafComponent} from 'react-aria/CollectionBuilder'; import {HeaderNode} from 'react-aria/private/collections/BaseCollection'; import React, {createContext, ForwardedRef, HTMLAttributes} from 'react'; diff --git a/packages/react-aria-components/src/Link.tsx b/packages/react-aria-components/src/Link.tsx index 67e8019cecc..3e72ee3a816 100644 --- a/packages/react-aria-components/src/Link.tsx +++ b/packages/react-aria-components/src/Link.tsx @@ -23,7 +23,7 @@ import { useRenderProps } from './utils'; import {DOMProps, forwardRefType, GlobalDOMAttributes} from '@react-types/shared'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {HoverEvents} from '@react-types/shared'; import {mergeProps} from 'react-aria/mergeProps'; import React, {createContext, ForwardedRef, forwardRef} from 'react'; diff --git a/packages/react-aria-components/src/ListBox.tsx b/packages/react-aria-components/src/ListBox.tsx index a6294248341..863b9797269 100644 --- a/packages/react-aria-components/src/ListBox.tsx +++ b/packages/react-aria-components/src/ListBox.tsx @@ -34,7 +34,8 @@ import { useRenderProps, useSlot } from './utils'; -import {Collection, CollectionBuilder, createBranchComponent, createLeafComponent} from 'react-aria/private/collections/CollectionBuilder'; +import {Collection} from 'react-aria/Collection'; +import {CollectionBuilder, createBranchComponent, createLeafComponent} from 'react-aria/CollectionBuilder'; import {CollectionProps, CollectionRendererContext, ItemRenderProps, SectionContext, SectionProps} from './Collection'; import {DragAndDropContext, DropIndicatorContext, DropIndicatorProps, useDndPersistedKeys, useRenderDropIndicator} from './DragAndDrop'; import {DragAndDropHooks} from './useDragAndDrop'; @@ -43,7 +44,7 @@ import {DraggableItemResult} from 'react-aria/useDraggableCollection'; import {DragPreviewRenderer} from '@react-types/shared'; import {DroppableCollectionResult, DroppableItemResult} from 'react-aria/useDroppableCollection'; import {DroppableCollectionState} from 'react-stately/useDroppableCollectionState'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {FocusEvents, forwardRefType, GlobalDOMAttributes, HoverEvents, Key, KeyboardEvents, LinkDOMProps, PressEvents, RefObject} from '@react-types/shared'; import {FocusScope} from 'react-aria/FocusScope'; import {HeaderContext} from './Header'; diff --git a/packages/react-aria-components/src/Menu.tsx b/packages/react-aria-components/src/Menu.tsx index 44913adaf9a..452d8126076 100644 --- a/packages/react-aria-components/src/Menu.tsx +++ b/packages/react-aria-components/src/Menu.tsx @@ -42,19 +42,20 @@ import { useSlot, useSlottedContext } from './utils'; -import {Collection, CollectionBuilder, createBranchComponent, createLeafComponent} from 'react-aria/private/collections/CollectionBuilder'; +import {Collection} from 'react-aria/Collection'; +import {CollectionBuilder, createBranchComponent, createLeafComponent} from 'react-aria/CollectionBuilder'; import {CollectionProps, CollectionRendererContext, ItemRenderProps, SectionContext, SectionProps, usePersistedKeys} from './Collection'; import {FieldInputContext, SelectableCollectionContext, SelectableCollectionContextValue} from './Autocomplete'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {FocusEvents, FocusStrategy, forwardRefType, GlobalDOMAttributes, HoverEvents, Key, LinkDOMProps, MultipleSelection, PressEvents} from '@react-types/shared'; import {FocusScope} from 'react-aria/FocusScope'; import {HeaderContext} from './Header'; import {Collection as ICollection, Node} from '@react-types/shared'; import {KeyboardContext} from './Keyboard'; import {mergeProps} from 'react-aria/mergeProps'; -import {MultipleSelectionState} from 'react-stately/private/selection/types'; +import {MultipleSelectionState} from 'react-stately/useMultipleSelectionState'; import {OverlayTriggerStateContext} from './Dialog'; import {PopoverContext} from './Popover'; import {PressResponder} from 'react-aria/private/interactions/PressResponder'; diff --git a/packages/react-aria-components/src/Meter.tsx b/packages/react-aria-components/src/Meter.tsx index 2f6d2639dd4..68ddff075f0 100644 --- a/packages/react-aria-components/src/Meter.tsx +++ b/packages/react-aria-components/src/Meter.tsx @@ -23,7 +23,7 @@ import { useRenderProps, useSlot } from './utils'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {forwardRefType, GlobalDOMAttributes} from '@react-types/shared'; import {LabelContext} from './Label'; import {mergeProps} from 'react-aria/mergeProps'; diff --git a/packages/react-aria-components/src/Modal.tsx b/packages/react-aria-components/src/Modal.tsx index f47bd067d35..171013938ce 100644 --- a/packages/react-aria-components/src/Modal.tsx +++ b/packages/react-aria-components/src/Modal.tsx @@ -24,10 +24,10 @@ import { } from './utils'; import {DismissButton, Overlay} from 'react-aria/Overlay'; import {DOMAttributes, forwardRefType, GlobalDOMAttributes, RefObject} from '@react-types/shared'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {isScrollable} from 'react-aria/private/utils/isScrollable'; import {mergeProps} from 'react-aria/mergeProps'; -import {mergeRefs} from 'react-aria/private/utils/mergeRefs'; +import {mergeRefs} from 'react-aria/mergeRefs'; import {OverlayTriggerProps, OverlayTriggerState, useOverlayTriggerState} from 'react-stately/useOverlayTriggerState'; import {OverlayTriggerStateContext} from './Dialog'; import React, {createContext, ForwardedRef, forwardRef, useContext, useMemo, useRef} from 'react'; diff --git a/packages/react-aria-components/src/NumberField.tsx b/packages/react-aria-components/src/NumberField.tsx index 8f74914a61b..e799d970fad 100644 --- a/packages/react-aria-components/src/NumberField.tsx +++ b/packages/react-aria-components/src/NumberField.tsx @@ -28,7 +28,7 @@ import { useSlottedContext } from './utils'; import {FieldErrorContext} from './FieldError'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {FormContext} from './Form'; import {forwardRefType, GlobalDOMAttributes, InputDOMProps} from '@react-types/shared'; import {GroupContext} from './Group'; diff --git a/packages/react-aria-components/src/OverlayArrow.tsx b/packages/react-aria-components/src/OverlayArrow.tsx index e6ec64d2f7e..1f1a2e15ee5 100644 --- a/packages/react-aria-components/src/OverlayArrow.tsx +++ b/packages/react-aria-components/src/OverlayArrow.tsx @@ -19,8 +19,8 @@ import { useRenderProps } from './utils'; import {DOMProps, forwardRefType} from '@react-types/shared'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; -import {PlacementAxis} from 'react-aria/private/overlays/useOverlayPosition'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; +import {PlacementAxis} from 'react-aria/useOverlayPosition'; import React, {createContext, CSSProperties, ForwardedRef, forwardRef, HTMLAttributes} from 'react'; interface OverlayArrowContextValue extends OverlayArrowProps { diff --git a/packages/react-aria-components/src/Popover.tsx b/packages/react-aria-components/src/Popover.tsx index ad3c2b1e93e..4df2320e97a 100644 --- a/packages/react-aria-components/src/Popover.tsx +++ b/packages/react-aria-components/src/Popover.tsx @@ -22,7 +22,7 @@ import { useRenderProps } from './utils'; import {DismissButton, Overlay} from 'react-aria/Overlay'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {focusSafely} from 'react-aria/private/interactions/focusSafely'; import {getInteractionModality} from 'react-aria/private/interactions/useFocusVisible'; import {isFocusWithin} from 'react-aria/private/utils/shadowdom/DOMFunctions'; @@ -30,7 +30,7 @@ import {mergeProps} from 'react-aria/mergeProps'; import {OverlayArrowContext} from './OverlayArrow'; import {OverlayTriggerProps, OverlayTriggerState, useOverlayTriggerState} from 'react-stately/useOverlayTriggerState'; import {OverlayTriggerStateContext} from './Dialog'; -import {PlacementAxis, PositionProps} from 'react-aria/private/overlays/useOverlayPosition'; +import {PlacementAxis, PositionProps} from 'react-aria/useOverlayPosition'; import React, {Context, createContext, ForwardedRef, forwardRef, useContext, useEffect, useMemo, useRef, useState} from 'react'; import {useEnterAnimation, useExitAnimation} from 'react-aria/private/utils/animation'; import {useIsHidden} from 'react-aria/private/collections/Hidden'; diff --git a/packages/react-aria-components/src/ProgressBar.tsx b/packages/react-aria-components/src/ProgressBar.tsx index 10d0acad6d2..3ea3fc3068b 100644 --- a/packages/react-aria-components/src/ProgressBar.tsx +++ b/packages/react-aria-components/src/ProgressBar.tsx @@ -23,7 +23,7 @@ import { useRenderProps, useSlot } from './utils'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {GlobalDOMAttributes} from '@react-types/shared'; import {LabelContext} from './Label'; import {mergeProps} from 'react-aria/mergeProps'; diff --git a/packages/react-aria-components/src/RadioGroup.tsx b/packages/react-aria-components/src/RadioGroup.tsx index d7ee0da1714..4ea6ca394c6 100644 --- a/packages/react-aria-components/src/RadioGroup.tsx +++ b/packages/react-aria-components/src/RadioGroup.tsx @@ -27,13 +27,13 @@ import { useSlottedContext } from './utils'; import {FieldErrorContext} from './FieldError'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {FormContext} from './Form'; import {forwardRefType, GlobalDOMAttributes, RefObject} from '@react-types/shared'; import {HoverEvents, Orientation} from '@react-types/shared'; import {LabelContext} from './Label'; import {mergeProps} from 'react-aria/mergeProps'; -import {mergeRefs} from 'react-aria/private/utils/mergeRefs'; +import {mergeRefs} from 'react-aria/mergeRefs'; import {RadioGroupState, useRadioGroupState} from 'react-stately/useRadioGroupState'; import React, {createContext, ForwardedRef, forwardRef, useMemo} from 'react'; import {SelectionIndicatorContext} from './SelectionIndicator'; diff --git a/packages/react-aria-components/src/SearchField.tsx b/packages/react-aria-components/src/SearchField.tsx index 5d2654f12d7..ab246763de5 100644 --- a/packages/react-aria-components/src/SearchField.tsx +++ b/packages/react-aria-components/src/SearchField.tsx @@ -29,7 +29,7 @@ import { import {createHideableComponent} from 'react-aria/private/collections/Hidden'; import {FieldErrorContext} from './FieldError'; import {FieldInputContext} from './Autocomplete'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {FormContext} from './Form'; import {GlobalDOMAttributes} from '@react-types/shared'; import {GroupContext} from './Group'; diff --git a/packages/react-aria-components/src/Select.tsx b/packages/react-aria-components/src/Select.tsx index f87cb35d0e5..d877cb7fd34 100644 --- a/packages/react-aria-components/src/Select.tsx +++ b/packages/react-aria-components/src/Select.tsx @@ -28,10 +28,10 @@ import { useSlottedContext } from './utils'; import {Collection, Node} from '@react-types/shared'; -import {CollectionBuilder} from 'react-aria/private/collections/CollectionBuilder'; +import {CollectionBuilder} from 'react-aria/CollectionBuilder'; import {createHideableComponent} from 'react-aria/private/collections/Hidden'; import {FieldErrorContext} from './FieldError'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {FormContext} from './Form'; import {forwardRefType, GlobalDOMAttributes} from '@react-types/shared'; import intlMessages from '../intl/*.json'; diff --git a/packages/react-aria-components/src/Separator.tsx b/packages/react-aria-components/src/Separator.tsx index ffefdffd1ee..56d164ed188 100644 --- a/packages/react-aria-components/src/Separator.tsx +++ b/packages/react-aria-components/src/Separator.tsx @@ -14,8 +14,8 @@ import {SeparatorProps as AriaSeparatorProps, useSeparator} from 'react-aria/use import {BaseCollection, CollectionNode} from 'react-aria/private/collections/BaseCollection'; import {ContextValue, dom, DOMRenderProps, SlotProps, StyleProps, useContextProps} from './utils'; -import {createLeafComponent} from 'react-aria/private/collections/CollectionBuilder'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {createLeafComponent} from 'react-aria/CollectionBuilder'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {GlobalDOMAttributes} from '@react-types/shared'; import {mergeProps} from 'react-aria/mergeProps'; import React, {createContext, ForwardedRef} from 'react'; diff --git a/packages/react-aria-components/src/Slider.tsx b/packages/react-aria-components/src/Slider.tsx index e3898cadd06..cb435edc9da 100644 --- a/packages/react-aria-components/src/Slider.tsx +++ b/packages/react-aria-components/src/Slider.tsx @@ -24,7 +24,7 @@ import { useSlot, useSlottedContext } from './utils'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {forwardRefType, GlobalDOMAttributes, RefObject} from '@react-types/shared'; import {HoverEvents, Orientation} from '@react-types/shared'; import {LabelContext} from './Label'; diff --git a/packages/react-aria-components/src/Switch.tsx b/packages/react-aria-components/src/Switch.tsx index e802485ca75..dc83c008893 100644 --- a/packages/react-aria-components/src/Switch.tsx +++ b/packages/react-aria-components/src/Switch.tsx @@ -22,11 +22,11 @@ import { useContextProps, useRenderProps } from './utils'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {forwardRefType, GlobalDOMAttributes, RefObject} from '@react-types/shared'; import {HoverEvents} from '@react-types/shared'; import {mergeProps} from 'react-aria/mergeProps'; -import {mergeRefs} from 'react-aria/private/utils/mergeRefs'; +import {mergeRefs} from 'react-aria/mergeRefs'; import React, {createContext, ForwardedRef, forwardRef} from 'react'; import {ToggleState, useToggleState} from 'react-stately/useToggleState'; import {useFocusRing} from 'react-aria/useFocusRing'; diff --git a/packages/react-aria-components/src/Table.tsx b/packages/react-aria-components/src/Table.tsx index e8b352c5871..c6263318ee9 100644 --- a/packages/react-aria-components/src/Table.tsx +++ b/packages/react-aria-components/src/Table.tsx @@ -18,9 +18,10 @@ import { useContextProps, useRenderProps } from './utils'; -import {Collection, CollectionBuilder, createBranchComponent, createLeafComponent} from 'react-aria/private/collections/CollectionBuilder'; +import {Collection} from 'react-aria/Collection'; +import {CollectionBuilder, createBranchComponent, createLeafComponent} from 'react-aria/CollectionBuilder'; import {CollectionProps, CollectionRendererContext, DefaultCollectionRenderer, ItemRenderProps} from './Collection'; -import {ColumnSize, ColumnStaticSize} from 'react-stately/Column'; +import {ColumnSize, ColumnStaticSize} from 'react-stately/useTableState'; import {DisabledBehavior, Node, SelectionBehavior, SelectionMode, SortDirection} from '@react-types/shared'; import {DragAndDropContext, DropIndicatorContext, DropIndicatorProps, useDndPersistedKeys, useRenderDropIndicator} from './DragAndDrop'; import {DragAndDropHooks} from './useDragAndDrop'; @@ -28,11 +29,9 @@ import {DraggableCollectionState} from 'react-stately/useDraggableCollectionStat import {DraggableItemResult} from 'react-aria/useDraggableCollection'; import {DragPreviewRenderer} from '@react-types/shared'; import {DropIndicatorAria, DroppableCollectionResult} from 'react-aria/useDroppableCollection'; - import {DroppableCollectionState} from 'react-stately/useDroppableCollectionState'; - import {FieldInputContext, SelectableCollectionContext, SelectableCollectionContextValue} from './Autocomplete'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {FocusScope} from 'react-aria/FocusScope'; import {GridNode} from 'react-stately/private/grid/GridCollection'; import {inertValue} from 'react-aria/private/utils/inertValue'; @@ -42,11 +41,9 @@ import {ITableCollection} from 'react-stately/private/table/TableCollection'; import {ListKeyboardDelegate} from 'react-aria/ListKeyboardDelegate'; import {LoadMoreSentinelProps, useLoadMoreSentinel} from 'react-aria/private/utils/useLoadMoreSentinel'; import {mergeProps} from 'react-aria/mergeProps'; -import {mergeRefs} from 'react-aria/private/utils/mergeRefs'; -import {MultipleSelectionState} from 'react-stately/private/selection/types'; - +import {mergeRefs} from 'react-aria/mergeRefs'; +import {MultipleSelectionState} from 'react-stately/useMultipleSelectionState'; import React, {createContext, ForwardedRef, forwardRef, JSX, ReactElement, ReactNode, useCallback, useContext, useEffect, useMemo, useRef, useState} from 'react'; - import ReactDOM from 'react-dom'; import {SelectionIndicatorContext} from './SelectionIndicator'; import {SharedElementTransition} from './SharedElementTransition'; @@ -60,7 +57,7 @@ import { import {TableColumnResizeState} from 'react-stately/useTableState'; import {TreeDropTargetDelegate} from './TreeDropTargetDelegate'; import {useCachedChildren} from 'react-aria/private/collections/useCachedChildren'; -import {useControlledState} from 'react-stately/private/utils/useControlledState'; +import {useControlledState} from 'react-stately/useControlledState'; import {useFocusRing} from 'react-aria/useFocusRing'; import {useHover} from 'react-aria/useHover'; import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect'; diff --git a/packages/react-aria-components/src/TableLayout.ts b/packages/react-aria-components/src/TableLayout.ts index 4f320e5e815..a26c1022eed 100644 --- a/packages/react-aria-components/src/TableLayout.ts +++ b/packages/react-aria-components/src/TableLayout.ts @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {TableLayout as BaseTableLayout, TableLayoutProps} from 'react-stately/private/layout/TableLayout'; +import {TableLayout as BaseTableLayout, TableLayoutProps} from 'react-stately/useVirtualizerState'; import {LayoutOptionsDelegate} from './Virtualizer'; import {TableColumnResizeStateContext} from './Table'; import {useContext, useMemo} from 'react'; diff --git a/packages/react-aria-components/src/Tabs.tsx b/packages/react-aria-components/src/Tabs.tsx index e650a60fd12..b6428283bc5 100644 --- a/packages/react-aria-components/src/Tabs.tsx +++ b/packages/react-aria-components/src/Tabs.tsx @@ -13,11 +13,12 @@ import {AriaLabelingProps, FocusEvents, forwardRefType, GlobalDOMAttributes, HoverEvents, Key, LinkDOMProps, PressEvents, RefObject} from '@react-types/shared'; import {AriaTabListProps, AriaTabPanelProps, useTab, useTabList, useTabPanel} from 'react-aria/useTabList'; import {ClassNameOrFunction, ContextValue, dom, DOMRenderProps, PossibleLinkDOMRenderProps, Provider, RenderProps, SlotProps, StyleProps, StyleRenderProps, useContextProps, useRenderProps, useSlottedContext} from './utils'; -import {Collection, CollectionBuilder, createLeafComponent} from 'react-aria/private/collections/CollectionBuilder'; +import {Collection} from 'react-aria/Collection'; +import {CollectionBuilder, createLeafComponent} from 'react-aria/CollectionBuilder'; import {CollectionNode} from 'react-aria/private/collections/BaseCollection'; import {CollectionProps, CollectionRendererContext, DefaultCollectionRenderer, usePersistedKeys} from './Collection'; import {createHideableComponent} from 'react-aria/private/collections/Hidden'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {Collection as ICollection, Node} from '@react-types/shared'; import {inertValue} from 'react-aria/private/utils/inertValue'; import {mergeProps} from 'react-aria/mergeProps'; diff --git a/packages/react-aria-components/src/TagGroup.tsx b/packages/react-aria-components/src/TagGroup.tsx index b3885890387..d0fc46fcc55 100644 --- a/packages/react-aria-components/src/TagGroup.tsx +++ b/packages/react-aria-components/src/TagGroup.tsx @@ -27,9 +27,10 @@ import { useRenderProps, useSlot } from './utils'; -import {Collection, CollectionBuilder, createLeafComponent} from 'react-aria/private/collections/CollectionBuilder'; +import {Collection} from 'react-aria/Collection'; +import {CollectionBuilder, createLeafComponent} from 'react-aria/CollectionBuilder'; import {CollectionProps, CollectionRendererContext, DefaultCollectionRenderer, ItemRenderProps, usePersistedKeys} from './Collection'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {FocusEvents, forwardRefType, GlobalDOMAttributes, HoverEvents, Key, LinkDOMProps, PressEvents, RefObject} from '@react-types/shared'; import {ItemNode} from 'react-aria/private/collections/BaseCollection'; import {LabelContext} from './Label'; diff --git a/packages/react-aria-components/src/TextField.tsx b/packages/react-aria-components/src/TextField.tsx index 5a9ca76cf09..93091790cbb 100644 --- a/packages/react-aria-components/src/TextField.tsx +++ b/packages/react-aria-components/src/TextField.tsx @@ -29,7 +29,7 @@ import { import {createHideableComponent} from 'react-aria/private/collections/Hidden'; import {FieldErrorContext} from './FieldError'; import {FieldInputContext} from './Autocomplete'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {FormContext} from './Form'; import {GlobalDOMAttributes} from '@react-types/shared'; import {GroupContext} from './Group'; diff --git a/packages/react-aria-components/src/Toast.tsx b/packages/react-aria-components/src/Toast.tsx index c919b7497c5..796217e05db 100644 --- a/packages/react-aria-components/src/Toast.tsx +++ b/packages/react-aria-components/src/Toast.tsx @@ -26,7 +26,7 @@ import { useRenderProps } from './utils'; import {createPortal} from 'react-dom'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {forwardRefType, GlobalDOMAttributes} from '@react-types/shared'; import {mergeProps} from 'react-aria/mergeProps'; import {QueuedToast, ToastQueue, ToastState, useToastQueue} from 'react-stately/useToastState'; diff --git a/packages/react-aria-components/src/ToggleButton.tsx b/packages/react-aria-components/src/ToggleButton.tsx index 73034a6eb13..8d11fc913e3 100644 --- a/packages/react-aria-components/src/ToggleButton.tsx +++ b/packages/react-aria-components/src/ToggleButton.tsx @@ -22,7 +22,7 @@ import { useContextProps, useRenderProps } from './utils'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {forwardRefType, GlobalDOMAttributes, Key} from '@react-types/shared'; import {HoverEvents} from '@react-types/shared'; import {mergeProps} from 'react-aria/mergeProps'; diff --git a/packages/react-aria-components/src/ToggleButtonGroup.tsx b/packages/react-aria-components/src/ToggleButtonGroup.tsx index 7866d20fd1e..ac6e5161269 100644 --- a/packages/react-aria-components/src/ToggleButtonGroup.tsx +++ b/packages/react-aria-components/src/ToggleButtonGroup.tsx @@ -20,7 +20,7 @@ import { useContextProps, useRenderProps } from './utils'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {forwardRefType, GlobalDOMAttributes, Orientation} from '@react-types/shared'; import {mergeProps} from 'react-aria/mergeProps'; import React, {createContext, ForwardedRef, forwardRef} from 'react'; diff --git a/packages/react-aria-components/src/Toolbar.tsx b/packages/react-aria-components/src/Toolbar.tsx index 50b7a474660..f5895a4d922 100644 --- a/packages/react-aria-components/src/Toolbar.tsx +++ b/packages/react-aria-components/src/Toolbar.tsx @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {AriaToolbarProps, useToolbar} from 'react-aria/private/toolbar/useToolbar'; +import {AriaToolbarProps, useToolbar} from 'react-aria/useToolbar'; import { ClassNameOrFunction, @@ -21,7 +21,7 @@ import { useContextProps, useRenderProps } from './utils'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {forwardRefType, GlobalDOMAttributes, Orientation} from '@react-types/shared'; import {mergeProps} from 'react-aria/mergeProps'; import React, {createContext, ForwardedRef, forwardRef} from 'react'; diff --git a/packages/react-aria-components/src/Tooltip.tsx b/packages/react-aria-components/src/Tooltip.tsx index 3bfde2530af..42f3fb78669 100644 --- a/packages/react-aria-components/src/Tooltip.tsx +++ b/packages/react-aria-components/src/Tooltip.tsx @@ -11,15 +11,13 @@ */ import {AriaLabelingProps, FocusableElement, forwardRefType, GlobalDOMAttributes, RefObject} from '@react-types/shared'; - import { AriaPositionProps, Placement, PlacementAxis, PositionProps, useOverlayPosition -} from 'react-aria/private/overlays/useOverlayPosition'; - +} from 'react-aria/useOverlayPosition'; import { ClassNameOrFunction, ContextValue, @@ -29,7 +27,7 @@ import { useContextProps, useRenderProps } from './utils'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {FocusableProvider} from 'react-aria/private/interactions/useFocusable'; import {mergeProps} from 'react-aria/mergeProps'; import {OverlayArrowContext} from './OverlayArrow'; diff --git a/packages/react-aria-components/src/Tree.tsx b/packages/react-aria-components/src/Tree.tsx index 9313b79b97c..7857a4d7dab 100644 --- a/packages/react-aria-components/src/Tree.tsx +++ b/packages/react-aria-components/src/Tree.tsx @@ -10,9 +10,9 @@ * governing permissions and limitations under the License. */ -import {AriaTreeItemOptions, useTreeItem} from 'react-aria/private/tree/useTreeItem'; +import {AriaTreeItemOptions, useTreeItem} from 'react-aria/useTree'; -import {AriaTreeProps, useTree} from 'react-aria/private/tree/useTree'; +import {AriaTreeProps, useTree} from 'react-aria/useTree'; import {BaseCollection, CollectionNode, LoaderNode, SectionNode} from 'react-aria/private/collections/BaseCollection'; import {ButtonContext} from './Button'; import {CheckboxContext} from './Checkbox'; @@ -30,7 +30,8 @@ import { useContextProps, useRenderProps } from './utils'; -import {Collection, CollectionBuilder, createBranchComponent, createLeafComponent} from 'react-aria/private/collections/CollectionBuilder'; +import {Collection} from 'react-aria/Collection'; +import {CollectionBuilder, createBranchComponent, createLeafComponent} from 'react-aria/CollectionBuilder'; import {CollectionProps, CollectionRendererContext, DefaultCollectionRenderer, ItemRenderProps, SectionProps} from './Collection'; import {DisabledBehavior, DragPreviewRenderer, Expandable, forwardRefType, GlobalDOMAttributes, HoverEvents, Key, LinkDOMProps, MultipleSelection, PressEvents, RefObject, SelectionMode} from '@react-types/shared'; import {DragAndDropContext, DropIndicatorContext, useDndPersistedKeys, useRenderDropIndicator} from './DragAndDrop'; @@ -39,7 +40,7 @@ import {DraggableCollectionState} from 'react-stately/useDraggableCollectionStat import {DraggableItemResult} from 'react-aria/useDraggableCollection'; import {DropIndicatorAria, DropIndicatorProps, DroppableCollectionResult} from 'react-aria/useDroppableCollection'; import {DroppableCollectionState} from 'react-stately/useDroppableCollectionState'; -import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps'; +import {filterDOMProps} from 'react-aria/filterDOMProps'; import {FocusScope} from 'react-aria/FocusScope'; import {GridListHeader, GridListHeaderContext, GridListHeaderInnerContext, GridListHeaderProps} from './GridList'; import {inertValue} from 'react-aria/private/utils/inertValue'; @@ -54,7 +55,7 @@ import {TreeDropTargetDelegate} from './TreeDropTargetDelegate'; import {TreeState, useTreeState} from 'react-stately/useTreeState'; import {useCachedChildren} from 'react-aria/private/collections/useCachedChildren'; import {useCollator} from 'react-aria/useCollator'; -import {useControlledState} from 'react-stately/private/utils/useControlledState'; +import {useControlledState} from 'react-stately/useControlledState'; import {useFocusRing} from 'react-aria/useFocusRing'; import {useGridListSection, useGridListSelectionCheckbox} from 'react-aria/useGridList'; import {useHover} from 'react-aria/useHover'; diff --git a/packages/react-aria-components/src/Virtualizer.tsx b/packages/react-aria-components/src/Virtualizer.tsx index 16a02297c53..4410d8785fe 100644 --- a/packages/react-aria-components/src/Virtualizer.tsx +++ b/packages/react-aria-components/src/Virtualizer.tsx @@ -12,11 +12,9 @@ import {CollectionBranchProps, CollectionRenderer, CollectionRendererContext, CollectionRootProps, renderAfterDropIndicators} from './Collection'; import {DropTargetDelegate, ItemDropTarget, Node} from '@react-types/shared'; -import {Layout} from 'react-stately/private/virtualizer/Layout'; +import {Layout, ReusableView, useVirtualizerState, VirtualizerState} from 'react-stately/useVirtualizerState'; import React, {createContext, JSX, ReactNode, useContext, useMemo} from 'react'; -import {ReusableView} from 'react-stately/private/virtualizer/ReusableView'; import {useScrollView} from 'react-aria/private/virtualizer/ScrollView'; -import {useVirtualizerState, VirtualizerState} from 'react-stately/private/virtualizer/useVirtualizerState'; import {VirtualizerItem} from 'react-aria/private/virtualizer/VirtualizerItem'; type View = ReusableView, ReactNode>; diff --git a/packages/react-aria-components/src/useDragAndDrop.tsx b/packages/react-aria-components/src/useDragAndDrop.tsx index 94b3a8ce2f8..3292566cf88 100644 --- a/packages/react-aria-components/src/useDragAndDrop.tsx +++ b/packages/react-aria-components/src/useDragAndDrop.tsx @@ -21,15 +21,14 @@ import { useDroppableCollection, useDroppableItem } from 'react-aria/useDroppableCollection'; - import { DraggableCollectionOptions, DraggableItemProps, DraggableItemResult, + DragPreview, useDraggableCollection, useDraggableItem } from 'react-aria/useDraggableCollection'; - import {DraggableCollectionProps, DroppableCollectionProps, Key, RefObject} from '@react-types/shared'; import { DraggableCollectionState, @@ -37,16 +36,12 @@ import { useDraggableCollectionState } from 'react-stately/useDraggableCollectionState'; import {DragItem, DropTarget, DropTargetDelegate} from '@react-types/shared'; -import {DragPreview} from 'react-aria/DragPreview'; - import { DroppableCollectionState, DroppableCollectionStateOptions, useDroppableCollectionState } from 'react-stately/useDroppableCollectionState'; - import {isVirtualDragging} from 'react-aria/private/dnd/DragManager'; - import {JSX, useMemo} from 'react'; import {ListDropTargetDelegate} from 'react-aria/ListDropTargetDelegate'; diff --git a/packages/react-aria-components/src/utils.tsx b/packages/react-aria-components/src/utils.tsx index 9dfff7dd2f9..65225f8bb68 100644 --- a/packages/react-aria-components/src/utils.tsx +++ b/packages/react-aria-components/src/utils.tsx @@ -12,7 +12,7 @@ import {AriaLabelingProps, RefObject, DOMProps as SharedDOMProps} from '@react-types/shared'; import {mergeProps} from 'react-aria/mergeProps'; -import {mergeRefs} from 'react-aria/private/utils/mergeRefs'; +import {mergeRefs} from 'react-aria/mergeRefs'; import React, {AllHTMLAttributes, AnchorHTMLAttributes, Context, CSSProperties, DetailedHTMLProps, ForwardedRef, forwardRef, JSX, ReactElement, ReactNode, RefCallback, useCallback, useContext, useMemo, useRef, useState} from 'react'; import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect'; import {useObjectRef} from 'react-aria/useObjectRef'; diff --git a/packages/react-aria-components/stories/Autocomplete.stories.tsx b/packages/react-aria-components/stories/Autocomplete.stories.tsx index 02775d71f29..c46fb4992a9 100644 --- a/packages/react-aria-components/stories/Autocomplete.stories.tsx +++ b/packages/react-aria-components/stories/Autocomplete.stories.tsx @@ -14,7 +14,7 @@ import {action} from 'storybook/actions'; import {Autocomplete} from '../src/Autocomplete'; import {Button} from '../src/Button'; import {Cell, Column, Row, Table, TableBody, TableHeader, TableLayout} from '../src/Table'; -import {Collection} from 'react-aria/private/collections/CollectionBuilder'; +import {Collection} from 'react-aria/Collection'; import {DialogTrigger} from '../src/Dialog'; import {GridList, GridListHeader, GridListSection} from '../src/GridList'; import {Header} from '../src/Header'; @@ -22,7 +22,7 @@ import {Input} from '../src/Input'; import {Keyboard} from '../src/Keyboard'; import {Label} from '../src/Label'; import {ListBox, ListBoxSection} from '../src/ListBox'; -import {ListLayout} from 'react-stately/private/layout/ListLayout'; +import {ListLayout} from 'react-stately/useVirtualizerState'; import {LoadingSpinner, MyListBoxItem, MyMenuItem} from './utils'; import {Menu, MenuItem, MenuSection, MenuTrigger, SubmenuTrigger} from '../src/Menu'; import {Meta, StoryObj} from '@storybook/react'; diff --git a/packages/react-aria-components/stories/ComboBox.stories.tsx b/packages/react-aria-components/stories/ComboBox.stories.tsx index 1455964dfb6..95e5c268950 100644 --- a/packages/react-aria-components/stories/ComboBox.stories.tsx +++ b/packages/react-aria-components/stories/ComboBox.stories.tsx @@ -12,13 +12,13 @@ import {Button} from '../src/Button'; -import {Collection} from 'react-aria/private/collections/CollectionBuilder'; +import {Collection} from 'react-aria/Collection'; import {ComboBox, ComboBoxProps, ComboBoxStateContext} from '../src/ComboBox'; import {Input} from '../src/Input'; import {Label} from '../src/Label'; import {ListBox} from '../src/ListBox'; import {ListBoxLoadMoreItem} from '../src/ListBox'; -import {ListLayout} from 'react-stately/private/layout/ListLayout'; +import {ListLayout} from 'react-stately/useVirtualizerState'; import {LoadingSpinner, MyListBoxItem} from './utils'; import {Meta, StoryFn, StoryObj} from '@storybook/react'; import {Popover} from '../src/Popover'; diff --git a/packages/react-aria-components/stories/GridList.stories.tsx b/packages/react-aria-components/stories/GridList.stories.tsx index 1f071800bc2..bb752afd9ff 100644 --- a/packages/react-aria-components/stories/GridList.stories.tsx +++ b/packages/react-aria-components/stories/GridList.stories.tsx @@ -14,12 +14,10 @@ import {action} from 'storybook/actions'; import {Button} from '../src/Button'; import {Checkbox, CheckboxProps} from '../src/Checkbox'; import {classNames} from '@adobe/react-spectrum/private/utils/classNames'; -import {Collection} from 'react-aria/private/collections/CollectionBuilder'; +import {Collection} from 'react-aria/Collection'; import {Dialog, DialogTrigger} from '../src/Dialog'; import {DropIndicator, useDragAndDrop} from '../src/useDragAndDrop'; - -import {GridLayout} from 'react-stately/private/layout/GridLayout'; - +import {GridLayout, ListLayout, Size, WaterfallLayout} from 'react-stately/useVirtualizerState'; import { GridList, GridListHeader, @@ -31,21 +29,18 @@ import { } from '../src/GridList'; import {Heading} from '../src/Heading'; import {Key} from '@react-types/shared'; -import {ListLayout} from 'react-stately/private/layout/ListLayout'; import {LoadingSpinner} from './utils'; import {LoadingState} from '@react-types/shared'; import {Meta, StoryFn, StoryObj} from '@storybook/react'; import {Modal, ModalOverlay, ModalOverlayProps} from '../src/Modal'; import {Popover} from '../src/Popover'; import React, {JSX, useState} from 'react'; -import {Size} from 'react-stately/private/virtualizer/Size'; import styles from '../example/index.css'; import {Tag, TagGroup, TagList} from '../src/TagGroup'; import {Text} from '../src/Text'; import {useAsyncList} from 'react-stately/useAsyncList'; import {useListData} from 'react-stately/useListData'; import {Virtualizer} from '../src/Virtualizer'; -import {WaterfallLayout} from 'react-stately/private/layout/WaterfallLayout'; import './styles.css'; export default { diff --git a/packages/react-aria-components/stories/ListBox.stories.tsx b/packages/react-aria-components/stories/ListBox.stories.tsx index 203a77c0b65..8a7b98c8d96 100644 --- a/packages/react-aria-components/stories/ListBox.stories.tsx +++ b/packages/react-aria-components/stories/ListBox.stories.tsx @@ -11,24 +11,21 @@ */ import {action} from 'storybook/actions'; -import {Collection} from 'react-aria/private/collections/CollectionBuilder'; +import {Collection} from 'react-aria/Collection'; import {DragAndDropHooks, DropIndicator, isTextDropItem, useDragAndDrop} from '../exports/useDragAndDrop'; -import {GridLayout} from 'react-stately/private/layout/GridLayout'; +import {GridLayout, ListLayout, Size, WaterfallLayout} from 'react-stately/useVirtualizerState'; import {Header} from '../src/Header'; import {ListBox, ListBoxItem, ListBoxProps, ListBoxSection} from '../src/ListBox'; import {ListBoxLoadMoreItem} from '../src/ListBox'; -import {ListLayout} from 'react-stately/private/layout/ListLayout'; import {LoadingSpinner, MyHeader, MyListBoxItem} from './utils'; import {Meta, StoryFn, StoryObj} from '@storybook/react'; import React, {JSX, useState} from 'react'; import {Separator} from '../src/Separator'; -import {Size} from 'react-stately/private/virtualizer/Size'; import styles from '../example/index.css'; import {Text} from '../src/Text'; import {useAsyncList} from 'react-stately/useAsyncList'; import {useListData} from 'react-stately/useListData'; import {Virtualizer} from '../src/Virtualizer'; -import {WaterfallLayout} from 'react-stately/private/layout/WaterfallLayout'; import './styles.css'; export default { diff --git a/packages/react-aria-components/stories/Menu.stories.tsx b/packages/react-aria-components/stories/Menu.stories.tsx index 6462adb0169..1417aa547e7 100644 --- a/packages/react-aria-components/stories/Menu.stories.tsx +++ b/packages/react-aria-components/stories/Menu.stories.tsx @@ -19,7 +19,7 @@ import {Input} from '../src/Input'; import {Keyboard} from '../src/Keyboard'; import {Label} from '../src/Label'; -import {ListLayout} from 'react-stately/private/layout/ListLayout'; +import {ListLayout} from 'react-stately/useVirtualizerState'; import { Menu, diff --git a/packages/react-aria-components/stories/Select.stories.tsx b/packages/react-aria-components/stories/Select.stories.tsx index 9bb655ad82f..3fe61ef466d 100644 --- a/packages/react-aria-components/stories/Select.stories.tsx +++ b/packages/react-aria-components/stories/Select.stories.tsx @@ -12,14 +12,14 @@ import {Button} from '../src/Button'; -import {Collection} from 'react-aria/private/collections/CollectionBuilder'; +import {Collection} from 'react-aria/Collection'; import {FieldError} from '../src/FieldError'; import {Form} from '../src/Form'; import {Input} from '../src/Input'; import {Label} from '../src/Label'; import {ListBox} from '../src/ListBox'; import {ListBoxLoadMoreItem} from '../src/ListBox'; -import {ListLayout} from 'react-stately/private/layout/ListLayout'; +import {ListLayout} from 'react-stately/useVirtualizerState'; import {LoadingSpinner, MyListBoxItem} from './utils'; import {Meta, StoryFn, StoryObj} from '@storybook/react'; import {OverlayArrow} from '../src/OverlayArrow'; diff --git a/packages/react-aria-components/stories/Table.stories.tsx b/packages/react-aria-components/stories/Table.stories.tsx index 4e28d1faf72..8763da7f6b7 100644 --- a/packages/react-aria-components/stories/Table.stories.tsx +++ b/packages/react-aria-components/stories/Table.stories.tsx @@ -28,7 +28,7 @@ import { import {CellProps, TableLoadMoreItem} from '../src/Table'; import {Checkbox, CheckboxProps} from '../src/Checkbox'; -import {Collection} from 'react-aria/private/collections/CollectionBuilder'; +import {Collection} from 'react-aria/Collection'; import {Dialog, DialogTrigger} from '../src/Dialog'; import {DropIndicator, isTextDropItem, useDragAndDrop} from '../exports/useDragAndDrop'; import {Heading} from '../src/Heading'; diff --git a/packages/react-aria-components/stories/Tree.stories.tsx b/packages/react-aria-components/stories/Tree.stories.tsx index cf04d5eed33..49d10eb3e8f 100644 --- a/packages/react-aria-components/stories/Tree.stories.tsx +++ b/packages/react-aria-components/stories/Tree.stories.tsx @@ -14,10 +14,10 @@ import {action} from 'storybook/actions'; import {Button} from '../src/Button'; import {Checkbox, CheckboxProps} from '../src/Checkbox'; import {classNames} from '@adobe/react-spectrum/private/utils/classNames'; -import {Collection} from 'react-aria/private/collections/CollectionBuilder'; +import {Collection} from 'react-aria/Collection'; import {DroppableCollectionReorderEvent, Key} from '@react-types/shared'; import {isTextDropItem, useDragAndDrop} from '../exports/useDragAndDrop'; -import {ListLayout} from 'react-stately/private/layout/ListLayout'; +import {ListLayout} from 'react-stately/useVirtualizerState'; import {Menu, MenuTrigger} from '../src/Menu'; import {Meta, StoryFn, StoryObj} from '@storybook/react'; diff --git a/packages/react-aria-components/test/Autocomplete.test.tsx b/packages/react-aria-components/test/Autocomplete.test.tsx index 79b81ab1153..6c157bef707 100644 --- a/packages/react-aria-components/test/Autocomplete.test.tsx +++ b/packages/react-aria-components/test/Autocomplete.test.tsx @@ -17,7 +17,7 @@ import {Autocomplete} from '../src/Autocomplete'; import {Breadcrumb, Breadcrumbs} from '../src/Breadcrumbs'; import {Button} from '../src/Button'; import {Cell, Column, Row, Table, TableBody, TableHeader} from '../src/Table'; -import {Collection} from 'react-aria/private/collections/CollectionBuilder'; +import {Collection} from 'react-aria/Collection'; import {Dialog, DialogTrigger} from '../src/Dialog'; import {GridList, GridListItem} from '../src/GridList'; import {Header} from '../src/Header'; diff --git a/packages/react-aria-components/test/ComboBox.test.js b/packages/react-aria-components/test/ComboBox.test.js index 93145bacfed..8899d732855 100644 --- a/packages/react-aria-components/test/ComboBox.test.js +++ b/packages/react-aria-components/test/ComboBox.test.js @@ -20,7 +20,7 @@ import {Header} from '../src/Header'; import {Input} from '../src/Input'; import {Label} from '../src/Label'; import {ListBox, ListBoxItem, ListBoxLoadMoreItem, ListBoxSection} from '../src/ListBox'; -import {ListLayout} from 'react-stately/private/layout/ListLayout'; +import {ListLayout} from 'react-stately/useVirtualizerState'; import {Popover} from '../src/Popover'; import React, {useState} from 'react'; import {Text} from '../src/Text'; diff --git a/packages/react-aria-components/test/GridList.test.js b/packages/react-aria-components/test/GridList.test.js index ac33a2d476c..05a232aa7d7 100644 --- a/packages/react-aria-components/test/GridList.test.js +++ b/packages/react-aria-components/test/GridList.test.js @@ -13,7 +13,7 @@ import {act, fireEvent, mockClickDefault, pointerMap, render, setupIntersectionObserverMock, within} from '@react-spectrum/test-utils-internal'; import {Button} from '../src/Button'; import {Checkbox} from '../src/Checkbox'; -import {Collection} from 'react-aria/private/collections/CollectionBuilder'; +import {Collection} from 'react-aria/Collection'; import {Dialog, DialogTrigger} from '../src/Dialog'; import {DropIndicator, useDragAndDrop} from '../src/useDragAndDrop'; import {getFocusableTreeWalker} from 'react-aria/private/focus/FocusScope'; @@ -21,7 +21,7 @@ import {GridList, GridListContext, GridListHeader, GridListItem, GridListSection import {GridListLoadMoreItem} from '../src/GridList'; import {installPointerEvent, User} from '@react-aria/test-utils'; import {Label} from '../src/Label'; -import {ListLayout} from 'react-stately/private/layout/ListLayout'; +import {ListLayout} from 'react-stately/useVirtualizerState'; import {Modal} from '../src/Modal'; import React from 'react'; import {RouterProvider} from 'react-aria/private/utils/openLink'; diff --git a/packages/react-aria-components/test/ListBox.test.js b/packages/react-aria-components/test/ListBox.test.js index 8f3326f95e8..49f4aa98c9b 100644 --- a/packages/react-aria-components/test/ListBox.test.js +++ b/packages/react-aria-components/test/ListBox.test.js @@ -12,7 +12,7 @@ import {act, fireEvent, installPointerEvent, mockClickDefault, pointerMap, render, setupIntersectionObserverMock, within} from '@react-spectrum/test-utils-internal'; import {Button} from '../src/Button'; -import {Collection} from 'react-aria/private/collections/CollectionBuilder'; +import {Collection} from 'react-aria/Collection'; import {DataTransfer, DragEvent} from 'react-aria/test/dnd/mocks'; import {Dialog, DialogTrigger} from '../src/Dialog'; import {DropIndicator, useDragAndDrop} from '../src/useDragAndDrop'; @@ -20,7 +20,7 @@ import {Header} from '../src/Header'; import {Heading} from '../src/Heading'; import {ListBox, ListBoxContext, ListBoxItem, ListBoxSection} from '../src/ListBox'; import {ListBoxLoadMoreItem} from '../src/ListBox'; -import {ListLayout} from 'react-stately/private/layout/ListLayout'; +import {ListLayout} from 'react-stately/useVirtualizerState'; import {Modal} from '../src/Modal'; import React, {useEffect, useState} from 'react'; import {Text} from '../src/Text'; diff --git a/packages/react-aria-components/test/Menu.test.tsx b/packages/react-aria-components/test/Menu.test.tsx index 64568aa00dc..798ca2d6eed 100644 --- a/packages/react-aria-components/test/Menu.test.tsx +++ b/packages/react-aria-components/test/Menu.test.tsx @@ -13,7 +13,7 @@ import {act, fireEvent, mockClickDefault, pointerMap, render, within} from '@react-spectrum/test-utils-internal'; import {AriaMenuTests} from './AriaMenu.test-util'; import {Button} from '../src/Button'; -import {Collection} from 'react-aria/private/collections/CollectionBuilder'; +import {Collection} from 'react-aria/Collection'; import {Header} from '../src/Header'; import {Heading} from '../src/Heading'; import {Input} from '../src/Input'; @@ -21,7 +21,7 @@ import {Keyboard} from '../src/Keyboard'; import {Label} from '../src/Label'; import {Menu, MenuContext, MenuItem, MenuSection, MenuTrigger, SubmenuTrigger} from '../src/Menu'; import {Popover} from '../src/Popover'; -import {Pressable} from 'react-aria/private/interactions/Pressable'; +import {Pressable} from 'react-aria/Pressable'; import React, {useState} from 'react'; import {Selection, SelectionMode} from '@react-types/shared'; import {Separator} from '../src/Separator'; diff --git a/packages/react-aria-components/test/Popover.test.js b/packages/react-aria-components/test/Popover.test.js index 8947b9f7047..ec605979748 100644 --- a/packages/react-aria-components/test/Popover.test.js +++ b/packages/react-aria-components/test/Popover.test.js @@ -15,7 +15,7 @@ import {Button} from '../src/Button'; import {Dialog, DialogTrigger} from '../src/Dialog'; import {OverlayArrow} from '../src/OverlayArrow'; import {Popover} from '../src/Popover'; -import {Pressable} from 'react-aria/private/interactions/Pressable'; +import {Pressable} from 'react-aria/Pressable'; import React, {useRef} from 'react'; import {UNSAFE_PortalProvider} from 'react-aria/PortalProvider'; import userEvent from '@testing-library/user-event'; diff --git a/packages/react-aria-components/test/Table.test.js b/packages/react-aria-components/test/Table.test.js index 776bd05d3e0..7c9262292af 100644 --- a/packages/react-aria-components/test/Table.test.js +++ b/packages/react-aria-components/test/Table.test.js @@ -28,7 +28,7 @@ import { } from '../src/Table'; import {Checkbox} from '../src/Checkbox'; -import {Collection} from 'react-aria/private/collections/CollectionBuilder'; +import {Collection} from 'react-aria/Collection'; import {composeStories} from '@storybook/react'; import {DataTransfer, DragEvent} from 'react-aria/test/dnd/mocks'; import {Dialog, DialogTrigger} from '../src/Dialog'; diff --git a/packages/react-aria-components/test/Tooltip.test.js b/packages/react-aria-components/test/Tooltip.test.js index 9e4f189e6d3..7b9b736102f 100644 --- a/packages/react-aria-components/test/Tooltip.test.js +++ b/packages/react-aria-components/test/Tooltip.test.js @@ -12,9 +12,9 @@ import {act, fireEvent, pointerMap, render} from '@react-spectrum/test-utils-internal'; import {Button} from '../src/Button'; -import {Focusable} from 'react-aria/private/interactions/useFocusable'; +import {Focusable} from 'react-aria/Focusable'; import {OverlayArrow} from '../src/OverlayArrow'; -import {Pressable} from 'react-aria/private/interactions/Pressable'; +import {Pressable} from 'react-aria/Pressable'; import React, {useRef} from 'react'; import {Tooltip, TooltipTrigger} from '../src/Tooltip'; import {UNSAFE_PortalProvider} from 'react-aria/PortalProvider'; diff --git a/packages/react-aria-components/test/Tree.test.tsx b/packages/react-aria-components/test/Tree.test.tsx index 3de2839df18..30eb7c111ca 100644 --- a/packages/react-aria-components/test/Tree.test.tsx +++ b/packages/react-aria-components/test/Tree.test.tsx @@ -14,12 +14,12 @@ import {act, fireEvent, mockClickDefault, pointerMap, render, setupIntersectionO import {AriaTreeTests} from './AriaTree.test-util'; import {Button} from '../src/Button'; import {Checkbox} from '../src/Checkbox'; -import {Collection} from 'react-aria/private/collections/CollectionBuilder'; +import {Collection} from 'react-aria/Collection'; import {composeStories} from '@storybook/react'; // @ts-ignore import {DataTransfer, DragEvent} from 'react-aria/test/dnd/mocks'; import {DropIndicator, useDragAndDrop} from '../src/useDragAndDrop'; -import {ListLayout} from 'react-stately/private/layout/ListLayout'; +import {ListLayout} from 'react-stately/useVirtualizerState'; import React from 'react'; import * as stories from '../stories/Tree.stories'; import {Text} from '../src/Text'; diff --git a/packages/react-aria-components/test/Treeble.test.js b/packages/react-aria-components/test/Treeble.test.js index 2df17da5f79..404e2f6847c 100644 --- a/packages/react-aria-components/test/Treeble.test.js +++ b/packages/react-aria-components/test/Treeble.test.js @@ -13,7 +13,7 @@ import {act, pointerMap, render, within} from '@react-spectrum/test-utils-internal'; import {Cell as AriaCell, Column, Row, Table, TableBody, TableHeader} from '../src/Table'; import {Button} from '../src/Button'; -import {Collection} from 'react-aria/private/collections/CollectionBuilder'; +import {Collection} from 'react-aria/Collection'; import {composeRenderProps} from '../src/utils'; import React from 'react'; import {useDragAndDrop} from '../src/useDragAndDrop'; diff --git a/packages/react-aria-components/test/VirtualizedMenu.test.tsx b/packages/react-aria-components/test/VirtualizedMenu.test.tsx index d85a36c42d1..d3892dbc449 100644 --- a/packages/react-aria-components/test/VirtualizedMenu.test.tsx +++ b/packages/react-aria-components/test/VirtualizedMenu.test.tsx @@ -12,7 +12,7 @@ import {act, pointerMap, render} from '@react-spectrum/test-utils-internal'; import {Button} from '../src/Button'; -import {ListLayout} from 'react-stately/private/layout/ListLayout'; +import {ListLayout} from 'react-stately/useVirtualizerState'; import {Menu, MenuItem, MenuTrigger} from '../src/Menu'; import {Popover} from '../src/Popover'; import React from 'react'; diff --git a/packages/react-aria/exports/Collection.ts b/packages/react-aria/exports/Collection.ts new file mode 100644 index 00000000000..99ae416dd16 --- /dev/null +++ b/packages/react-aria/exports/Collection.ts @@ -0,0 +1 @@ +export {Collection, type CollectionProps} from '../src/collections/CollectionBuilder'; diff --git a/packages/react-aria/exports/CollectionBuilder.ts b/packages/react-aria/exports/CollectionBuilder.ts new file mode 100644 index 00000000000..e0f0f6d7d9d --- /dev/null +++ b/packages/react-aria/exports/CollectionBuilder.ts @@ -0,0 +1 @@ +export {CollectionBuilder, createLeafComponent, createBranchComponent, type CollectionBuilderProps} from '../src/collections/CollectionBuilder'; diff --git a/packages/react-aria/exports/DragPreview.ts b/packages/react-aria/exports/DragPreview.ts deleted file mode 100644 index e1e73479d86..00000000000 --- a/packages/react-aria/exports/DragPreview.ts +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright 2020 Adobe. All rights reserved. - * This file is licensed to you under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. You may obtain a copy - * of the License at http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under - * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS - * OF ANY KIND, either express or implied. See the License for the specific language - * governing permissions and limitations under the License. - */ - -export type {DragPreviewProps} from '../src/dnd/DragPreview'; -export {DragPreview} from '../src/dnd/DragPreview'; -export type {DirectoryDropItem, DragEndEvent, DraggableCollectionEndEvent, DraggableCollectionMoveEvent, DraggableCollectionStartEvent, DragItem, DragMoveEvent, DragPreviewRenderer, DragStartEvent, DragTypes, DropEnterEvent, DropEvent, DropExitEvent, DropItem, DropMoveEvent, DropOperation, DroppableCollectionDropEvent, DroppableCollectionEnterEvent, DroppableCollectionExitEvent, DroppableCollectionInsertDropEvent, DroppableCollectionMoveEvent, DroppableCollectionOnItemDropEvent, DroppableCollectionReorderEvent, DroppableCollectionRootDropEvent, DropPosition, DropTarget, DropTargetDelegate, FileDropItem, ItemDropTarget, RootDropTarget, TextDropItem} from '@react-types/shared'; diff --git a/packages/react-aria/exports/Focusable.ts b/packages/react-aria/exports/Focusable.ts new file mode 100644 index 00000000000..d3589ffa6a0 --- /dev/null +++ b/packages/react-aria/exports/Focusable.ts @@ -0,0 +1,2 @@ +export {Focusable} from '../src/interactions/useFocusable'; +export type {FocusableComponentProps as FocusableProps} from '../src/interactions/useFocusable'; diff --git a/packages/react-aria/exports/I18nProvider.ts b/packages/react-aria/exports/I18nProvider.ts index c2280f145ec..41d006b9e6f 100644 --- a/packages/react-aria/exports/I18nProvider.ts +++ b/packages/react-aria/exports/I18nProvider.ts @@ -12,3 +12,4 @@ export {I18nProvider, useLocale} from '../src/i18n/I18nProvider'; export type {I18nProviderProps, Locale} from '../src/i18n/I18nProvider'; +export {isRTL} from '../src/i18n/utils'; diff --git a/packages/react-aria/exports/Pressable.ts b/packages/react-aria/exports/Pressable.ts new file mode 100644 index 00000000000..b3fec1c7a37 --- /dev/null +++ b/packages/react-aria/exports/Pressable.ts @@ -0,0 +1,2 @@ +export {Pressable} from '../src/interactions/Pressable'; +export type {PressableProps} from '../src/interactions/Pressable'; diff --git a/packages/react-aria/exports/chain.ts b/packages/react-aria/exports/chain.ts new file mode 100644 index 00000000000..412e426a941 --- /dev/null +++ b/packages/react-aria/exports/chain.ts @@ -0,0 +1 @@ +export {chain} from '../src/utils/chain'; diff --git a/packages/react-aria/exports/filterDOMProps.ts b/packages/react-aria/exports/filterDOMProps.ts new file mode 100644 index 00000000000..02f8bd8f105 --- /dev/null +++ b/packages/react-aria/exports/filterDOMProps.ts @@ -0,0 +1 @@ +export {filterDOMProps} from '../src/utils/filterDOMProps'; diff --git a/packages/react-aria/exports/index.ts b/packages/react-aria/exports/index.ts index 34ac199dc12..11bd1a354a3 100644 --- a/packages/react-aria/exports/index.ts +++ b/packages/react-aria/exports/index.ts @@ -10,8 +10,9 @@ * governing permissions and limitations under the License. */ +export {Collection, CollectionBuilder, createLeafComponent, createBranchComponent} from '../src/collections/CollectionBuilder'; +export {useAutocomplete} from '../src/autocomplete/useAutocomplete'; export {useBreadcrumbItem} from '../src/breadcrumbs/useBreadcrumbItem'; - export {useBreadcrumbs} from '../src/breadcrumbs/useBreadcrumbs'; export {useButton} from '../src/button/useButton'; export {useToggleButton} from '../src/button/useToggleButton'; @@ -55,7 +56,7 @@ export {isRTL} from '../src/i18n/utils'; export {useCollator} from '../src/i18n/useCollator'; export {useDateFormatter} from '../src/i18n/useDateFormatter'; export {useFilter} from '../src/i18n/useFilter'; -export {useLocalizedStringFormatter} from '../src/i18n/useLocalizedStringFormatter'; +export {useLocalizedStringFormatter, useLocalizedStringDictionary} from '../src/i18n/useLocalizedStringFormatter'; export {useNumberFormatter} from '../src/i18n/useNumberFormatter'; export {useListFormatter} from '../src/i18n/useListFormatter'; export {useFocus} from '../src/interactions/useFocus'; @@ -125,6 +126,7 @@ export {useTagGroup} from '../src/tag/useTagGroup'; export {useTextField} from '../src/textfield/useTextField'; export {useToast} from '../src/toast/useToast'; export {useToastRegion} from '../src/toast/useToastRegion'; +export {useToolbar} from '../src/toolbar/useToolbar'; export {useTooltip} from '../src/tooltip/useTooltip'; export {useTooltipTrigger} from '../src/tooltip/useTooltipTrigger'; export {useTree} from '../src/tree/useTree'; @@ -135,6 +137,9 @@ export {useId} from '../src/utils/useId'; export {useObjectRef} from '../src/utils/useObjectRef'; export {RouterProvider} from '../src/utils/openLink'; export {VisuallyHidden, useVisuallyHidden} from '../src/visually-hidden/VisuallyHidden'; + +export type {AriaAutocompleteProps, AriaAutocompleteOptions, AutocompleteAria, CollectionOptions, InputProps} from '../src/autocomplete/useAutocomplete'; +export type {CollectionProps, CollectionBuilderProps} from '../src/collections/CollectionBuilder'; export type {AriaBreadcrumbItemProps, BreadcrumbItemAria, BreadcrumbItemProps} from '../src/breadcrumbs/useBreadcrumbItem'; export type {AriaBreadcrumbsProps, BreadcrumbsAria} from '../src/breadcrumbs/useBreadcrumbs'; export type {AriaButtonOptions, AriaButtonProps, ButtonAria, ButtonProps, LinkButtonProps, AriaBaseButtonProps} from '../src/button/useButton'; @@ -166,7 +171,7 @@ export type {TimeValue, MappedTimeValue} from 'react-stately/useTimeFieldState'; export type {AriaDialogProps, DialogAria} from '../src/dialog/useDialog'; export type {DisclosureAria, AriaDisclosureProps} from '../src/disclosure/useDisclosure'; export type {AriaFocusRingProps, FocusRingAria} from '../src/focus/useFocusRing'; -export type {FocusableAria, FocusableOptions} from '../src/interactions/useFocusable'; +export type {FocusableAria, FocusableOptions, FocusableComponentProps as FocusableProps} from '../src/interactions/useFocusable'; export type {FocusManager, FocusManagerOptions, FocusScopeProps} from '../src/focus/FocusScope'; export type {FocusRingProps} from '../src/focus/FocusRing'; export type {DateFormatter} from '@internationalized/date'; @@ -194,6 +199,7 @@ export type {LongPressProps, LongPressResult} from '../src/interactions/useLongP export type {MoveEvents, PressEvent, PressEvents, LongPressEvent, MoveStartEvent, MoveMoveEvent, MoveEndEvent, MoveEvent, HoverEvent, HoverEvents, FocusEvents, KeyboardEvents} from '@react-types/shared'; export type {MoveResult} from '../src/interactions/useMove'; export type {PressHookProps, PressProps, PressResult} from '../src/interactions/usePress'; +export type {PressableProps} from '../src/interactions/Pressable'; export type {ScrollWheelProps} from '../src/interactions/useScrollWheel'; export type {AriaFieldProps, FieldAria} from '../src/label/useField'; export type {LabelAria, LabelAriaProps} from '../src/label/useLabel'; @@ -217,7 +223,7 @@ export type {AriaModalOptions, ModalAria, ModalProviderAria, ModalProviderProps, export type {AriaModalOverlayProps, ModalOverlayAria} from '../src/overlays/useModalOverlay'; export type {AriaOverlayProps, OverlayAria} from '../src/overlays/useOverlay'; export type {AriaPopoverProps, PopoverAria} from '../src/overlays/usePopover'; -export type {AriaPositionProps, PositionAria, Placement, PlacementAxis, PositionProps} from '../src/overlays/useOverlayPosition'; +export type {AriaPositionProps, PositionAria, Placement, PlacementAxis, PositionProps, Axis, SizeAxis} from '../src/overlays/useOverlayPosition'; export type {DismissButtonProps} from '../src/overlays/DismissButton'; export type {OverlayProps} from '../src/overlays/Overlay'; export type {OverlayTriggerAria, OverlayTriggerProps} from '../src/overlays/useOverlayTrigger'; @@ -249,6 +255,7 @@ export type {AriaTagProps, TagAria} from '../src/tag/useTag'; export type {AriaTextFieldOptions, AriaTextFieldProps, TextFieldAria, TextFieldProps} from '../src/textfield/useTextField'; export type {AriaToastRegionProps, ToastRegionAria} from '../src/toast/useToastRegion'; export type {AriaToastProps, ToastAria} from '../src/toast/useToast'; +export type {AriaToolbarProps, ToolbarAria} from '../src/toolbar/useToolbar'; export type {AriaTooltipProps, TooltipAria, TooltipProps} from '../src/tooltip/useTooltip'; export type {TooltipTriggerAria} from '../src/tooltip/useTooltipTrigger'; export type {TooltipTriggerProps} from 'react-stately/useTooltipTriggerState'; diff --git a/packages/react-aria/exports/mergeRefs.ts b/packages/react-aria/exports/mergeRefs.ts new file mode 100644 index 00000000000..4fd4ddb213a --- /dev/null +++ b/packages/react-aria/exports/mergeRefs.ts @@ -0,0 +1 @@ +export {mergeRefs} from '../src/utils/mergeRefs'; diff --git a/packages/react-aria/exports/private/autocomplete/useAutocomplete.ts b/packages/react-aria/exports/private/autocomplete/useAutocomplete.ts deleted file mode 100644 index 7b424974fc8..00000000000 --- a/packages/react-aria/exports/private/autocomplete/useAutocomplete.ts +++ /dev/null @@ -1 +0,0 @@ -export {type AriaAutocompleteProps, useAutocomplete, type AriaAutocompleteOptions, type AutocompleteAria, type CollectionOptions, type InputProps} from '../../../src/autocomplete/useAutocomplete'; diff --git a/packages/react-aria/exports/private/collections/CollectionBuilder.ts b/packages/react-aria/exports/private/collections/CollectionBuilder.ts deleted file mode 100644 index 07cc0f93dc8..00000000000 --- a/packages/react-aria/exports/private/collections/CollectionBuilder.ts +++ /dev/null @@ -1 +0,0 @@ -export {Collection, CollectionBuilder, createLeafComponent, createBranchComponent, type CollectionBuilderProps, type CollectionProps} from '../../../src/collections/CollectionBuilder'; diff --git a/packages/react-aria/exports/private/i18n/useLocalizedStringFormatter.ts b/packages/react-aria/exports/private/i18n/useLocalizedStringFormatter.ts deleted file mode 100644 index 7524921cd0f..00000000000 --- a/packages/react-aria/exports/private/i18n/useLocalizedStringFormatter.ts +++ /dev/null @@ -1 +0,0 @@ -export {useLocalizedStringDictionary} from '../../../src/i18n/useLocalizedStringFormatter'; diff --git a/packages/react-aria/exports/private/i18n/utils.ts b/packages/react-aria/exports/private/i18n/utils.ts deleted file mode 100644 index 35ba57138a6..00000000000 --- a/packages/react-aria/exports/private/i18n/utils.ts +++ /dev/null @@ -1 +0,0 @@ -export {isRTL} from '../../../src/i18n/utils'; diff --git a/packages/react-aria/exports/private/interactions/Pressable.ts b/packages/react-aria/exports/private/interactions/Pressable.ts deleted file mode 100644 index 458a27595f1..00000000000 --- a/packages/react-aria/exports/private/interactions/Pressable.ts +++ /dev/null @@ -1 +0,0 @@ -export {Pressable} from '../../../src/interactions/Pressable'; diff --git a/packages/react-aria/exports/private/interactions/useFocusable.ts b/packages/react-aria/exports/private/interactions/useFocusable.ts index 467ee6876b5..e073b8e3ef4 100644 --- a/packages/react-aria/exports/private/interactions/useFocusable.ts +++ b/packages/react-aria/exports/private/interactions/useFocusable.ts @@ -1 +1 @@ -export {Focusable, FocusableProvider, useFocusable, FocusableContext, type FocusableAria, type FocusableOptions, type FocusableProviderProps} from '../../../src/interactions/useFocusable'; +export {FocusableProvider, FocusableContext, type FocusableProviderProps} from '../../../src/interactions/useFocusable'; diff --git a/packages/react-aria/exports/private/overlays/usePreventScroll.ts b/packages/react-aria/exports/private/overlays/usePreventScroll.ts deleted file mode 100644 index 37159089230..00000000000 --- a/packages/react-aria/exports/private/overlays/usePreventScroll.ts +++ /dev/null @@ -1 +0,0 @@ -export {usePreventScroll} from '../../../src/overlays/usePreventScroll'; diff --git a/packages/react-aria/exports/private/toolbar/useToolbar.ts b/packages/react-aria/exports/private/toolbar/useToolbar.ts deleted file mode 100644 index 12f935650a5..00000000000 --- a/packages/react-aria/exports/private/toolbar/useToolbar.ts +++ /dev/null @@ -1 +0,0 @@ -export {type AriaToolbarProps, useToolbar, type ToolbarAria} from '../../../src/toolbar/useToolbar'; diff --git a/packages/react-aria/exports/private/tree/useTree.ts b/packages/react-aria/exports/private/tree/useTree.ts deleted file mode 100644 index 65a884e1c40..00000000000 --- a/packages/react-aria/exports/private/tree/useTree.ts +++ /dev/null @@ -1 +0,0 @@ -export {type AriaTreeProps, useTree, type AriaTreeOptions, type TreeAria, type TreeProps} from '../../../src/tree/useTree'; diff --git a/packages/react-aria/exports/private/tree/useTreeItem.ts b/packages/react-aria/exports/private/tree/useTreeItem.ts deleted file mode 100644 index f48ba8fcf17..00000000000 --- a/packages/react-aria/exports/private/tree/useTreeItem.ts +++ /dev/null @@ -1 +0,0 @@ -export {type AriaTreeItemOptions, useTreeItem, type TreeItemAria} from '../../../src/tree/useTreeItem'; diff --git a/packages/react-aria/exports/private/utils/chain.ts b/packages/react-aria/exports/private/utils/chain.ts deleted file mode 100644 index 053445d2e5d..00000000000 --- a/packages/react-aria/exports/private/utils/chain.ts +++ /dev/null @@ -1 +0,0 @@ -export {chain} from '../../../src/utils/chain'; diff --git a/packages/react-aria/exports/private/utils/filterDOMProps.ts b/packages/react-aria/exports/private/utils/filterDOMProps.ts deleted file mode 100644 index 0dba9105e38..00000000000 --- a/packages/react-aria/exports/private/utils/filterDOMProps.ts +++ /dev/null @@ -1 +0,0 @@ -export {filterDOMProps} from '../../../src/utils/filterDOMProps'; diff --git a/packages/react-aria/exports/private/utils/mergeRefs.ts b/packages/react-aria/exports/private/utils/mergeRefs.ts deleted file mode 100644 index 2fdffe182e5..00000000000 --- a/packages/react-aria/exports/private/utils/mergeRefs.ts +++ /dev/null @@ -1 +0,0 @@ -export {mergeRefs} from '../../../src/utils/mergeRefs'; diff --git a/packages/react-aria/exports/useAutocomplete.ts b/packages/react-aria/exports/useAutocomplete.ts new file mode 100644 index 00000000000..00c26308813 --- /dev/null +++ b/packages/react-aria/exports/useAutocomplete.ts @@ -0,0 +1,2 @@ +export {useAutocomplete} from '../src/autocomplete/useAutocomplete'; +export type {AriaAutocompleteProps, AriaAutocompleteOptions, AutocompleteAria, CollectionOptions, InputProps} from '../src/autocomplete/useAutocomplete'; diff --git a/packages/react-aria/exports/useDrag.ts b/packages/react-aria/exports/useDrag.ts index f248903c249..732b28193af 100644 --- a/packages/react-aria/exports/useDrag.ts +++ b/packages/react-aria/exports/useDrag.ts @@ -13,4 +13,6 @@ export type {DragOptions, DragResult} from '../src/dnd/useDrag'; export {useDrag} from '../src/dnd/useDrag'; export {DIRECTORY_DRAG_TYPE} from '../src/dnd/utils'; +export type {DragPreviewProps} from '../src/dnd/DragPreview'; +export {DragPreview} from '../src/dnd/DragPreview'; export type {DragEndEvent, DragItem, DragMoveEvent, DragPreviewRenderer, DragStartEvent, DragTypes} from '@react-types/shared'; diff --git a/packages/react-aria/exports/useDraggableCollection.ts b/packages/react-aria/exports/useDraggableCollection.ts index a2957445c8a..61222a9b4ef 100644 --- a/packages/react-aria/exports/useDraggableCollection.ts +++ b/packages/react-aria/exports/useDraggableCollection.ts @@ -14,4 +14,6 @@ export type {DraggableItemProps, DraggableItemResult} from '../src/dnd/useDragga export type {DraggableCollectionOptions} from '../src/dnd/useDraggableCollection'; export {useDraggableItem} from '../src/dnd/useDraggableItem'; export {useDraggableCollection} from '../src/dnd/useDraggableCollection'; +export type {DragPreviewProps} from '../src/dnd/DragPreview'; +export {DragPreview} from '../src/dnd/DragPreview'; export type {DragEndEvent, DraggableCollectionEndEvent, DraggableCollectionMoveEvent, DraggableCollectionStartEvent, DragItem, DragMoveEvent, DragPreviewRenderer, DragStartEvent, DragTypes} from '@react-types/shared'; diff --git a/packages/react-aria/exports/useFocusable.ts b/packages/react-aria/exports/useFocusable.ts new file mode 100644 index 00000000000..e779f113df0 --- /dev/null +++ b/packages/react-aria/exports/useFocusable.ts @@ -0,0 +1 @@ +export {useFocusable, type FocusableAria, type FocusableOptions} from '../src/interactions/useFocusable'; diff --git a/packages/react-aria/exports/private/interactions/useInteractOutside.ts b/packages/react-aria/exports/useInteractOutside.ts similarity index 59% rename from packages/react-aria/exports/private/interactions/useInteractOutside.ts rename to packages/react-aria/exports/useInteractOutside.ts index 3a64551646b..cb1e82076a9 100644 --- a/packages/react-aria/exports/private/interactions/useInteractOutside.ts +++ b/packages/react-aria/exports/useInteractOutside.ts @@ -1 +1 @@ -export {useInteractOutside, type InteractOutsideProps} from '../../../src/interactions/useInteractOutside'; +export {useInteractOutside, type InteractOutsideProps} from '../src/interactions/useInteractOutside'; diff --git a/packages/react-aria/exports/useLocalizedStringFormatter.ts b/packages/react-aria/exports/useLocalizedStringFormatter.ts index 6eeb75b1107..bc634dea5bb 100644 --- a/packages/react-aria/exports/useLocalizedStringFormatter.ts +++ b/packages/react-aria/exports/useLocalizedStringFormatter.ts @@ -10,5 +10,5 @@ * governing permissions and limitations under the License. */ -export {useLocalizedStringFormatter} from '../src/i18n/useLocalizedStringFormatter'; +export {useLocalizedStringFormatter, useLocalizedStringDictionary} from '../src/i18n/useLocalizedStringFormatter'; export type {LocalizedStringFormatter} from '@internationalized/string'; diff --git a/packages/react-aria/exports/private/overlays/useOverlay.ts b/packages/react-aria/exports/useOverlay.ts similarity index 62% rename from packages/react-aria/exports/private/overlays/useOverlay.ts rename to packages/react-aria/exports/useOverlay.ts index 72c632ade1d..1f56209fe75 100644 --- a/packages/react-aria/exports/private/overlays/useOverlay.ts +++ b/packages/react-aria/exports/useOverlay.ts @@ -1 +1 @@ -export {useOverlay, type AriaOverlayProps, type OverlayAria} from '../../../src/overlays/useOverlay'; +export {useOverlay, type AriaOverlayProps, type OverlayAria} from '../src/overlays/useOverlay'; diff --git a/packages/react-aria/exports/private/overlays/useOverlayPosition.ts b/packages/react-aria/exports/useOverlayPosition.ts similarity index 63% rename from packages/react-aria/exports/private/overlays/useOverlayPosition.ts rename to packages/react-aria/exports/useOverlayPosition.ts index 649007f277c..e05d6baefe4 100644 --- a/packages/react-aria/exports/private/overlays/useOverlayPosition.ts +++ b/packages/react-aria/exports/useOverlayPosition.ts @@ -1 +1 @@ -export {type PlacementAxis, type PositionProps, type AriaPositionProps, type Placement, useOverlayPosition, type PositionAria, type Axis, type SizeAxis} from '../../../src/overlays/useOverlayPosition'; +export {type PlacementAxis, type PositionProps, type AriaPositionProps, type Placement, useOverlayPosition, type PositionAria, type Axis, type SizeAxis} from '../src/overlays/useOverlayPosition'; diff --git a/packages/react-aria/exports/usePreventScroll.ts b/packages/react-aria/exports/usePreventScroll.ts new file mode 100644 index 00000000000..0fa72048346 --- /dev/null +++ b/packages/react-aria/exports/usePreventScroll.ts @@ -0,0 +1 @@ +export {usePreventScroll} from '../src/overlays/usePreventScroll'; diff --git a/packages/react-aria/exports/useToolbar.ts b/packages/react-aria/exports/useToolbar.ts new file mode 100644 index 00000000000..8eda8613393 --- /dev/null +++ b/packages/react-aria/exports/useToolbar.ts @@ -0,0 +1,2 @@ +export {useToolbar} from '../src/toolbar/useToolbar'; +export type {AriaToolbarProps, ToolbarAria} from '../src/toolbar/useToolbar'; diff --git a/packages/react-aria/exports/useTree.ts b/packages/react-aria/exports/useTree.ts new file mode 100644 index 00000000000..cd5d14ddffd --- /dev/null +++ b/packages/react-aria/exports/useTree.ts @@ -0,0 +1,2 @@ +export {type AriaTreeProps, useTree, type AriaTreeOptions, type TreeAria, type TreeProps} from '../src/tree/useTree'; +export {type AriaTreeItemOptions, useTreeItem, type TreeItemAria} from '../src/tree/useTreeItem'; diff --git a/packages/react-aria/src/grid/useHighlightSelectionDescription.ts b/packages/react-aria/src/grid/useHighlightSelectionDescription.ts index ce47fcecae1..9afb1db353d 100644 --- a/packages/react-aria/src/grid/useHighlightSelectionDescription.ts +++ b/packages/react-aria/src/grid/useHighlightSelectionDescription.ts @@ -13,7 +13,7 @@ import {AriaLabelingProps} from '@react-types/shared'; // @ts-ignore import intlMessages from '../../intl/grid/*.json'; -import {MultipleSelectionManager} from 'react-stately/private/selection/types'; +import {MultipleSelectionManager} from 'react-stately/useMultipleSelectionState'; import {useDescription} from '../utils/useDescription'; import {useInteractionModality} from '../interactions/useFocusVisible'; import {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter'; diff --git a/packages/react-aria/src/interactions/Pressable.tsx b/packages/react-aria/src/interactions/Pressable.tsx index a5cfe57a8de..0b99a5ecd35 100644 --- a/packages/react-aria/src/interactions/Pressable.tsx +++ b/packages/react-aria/src/interactions/Pressable.tsx @@ -20,7 +20,7 @@ import React, {ForwardedRef, ReactElement, useEffect} from 'react'; import {useFocusable} from './useFocusable'; import {useObjectRef} from '../utils/useObjectRef'; -interface PressableProps extends PressProps { +export interface PressableProps extends PressProps { children: ReactElement } diff --git a/packages/react-aria/src/selection/useSelectableCollection.ts b/packages/react-aria/src/selection/useSelectableCollection.ts index 1628873baac..799e0e5b9a5 100644 --- a/packages/react-aria/src/selection/useSelectableCollection.ts +++ b/packages/react-aria/src/selection/useSelectableCollection.ts @@ -25,7 +25,7 @@ import {getItemElement, isNonContiguousSelectionModifier, useCollectionId} from import {isCtrlKeyPressed} from '../utils/keyboard'; import {isTabbable} from '../utils/isFocusable'; import {mergeProps} from '../utils/mergeProps'; -import {MultipleSelectionManager} from 'react-stately/private/selection/types'; +import {MultipleSelectionManager} from 'react-stately/useMultipleSelectionState'; import {scrollIntoView, scrollIntoViewport} from '../utils/scrollIntoView'; import {useEvent} from '../utils/useEvent'; import {useLocale} from '../i18n/I18nProvider'; diff --git a/packages/react-aria/src/selection/useSelectableItem.ts b/packages/react-aria/src/selection/useSelectableItem.ts index 7c67876c4c2..bc90da7cb89 100644 --- a/packages/react-aria/src/selection/useSelectableItem.ts +++ b/packages/react-aria/src/selection/useSelectableItem.ts @@ -19,7 +19,7 @@ import {getCollectionId, isNonContiguousSelectionModifier} from './utils'; import {isCtrlKeyPressed} from '../utils/keyboard'; import {mergeProps} from '../utils/mergeProps'; import {moveVirtualFocus} from '../focus/virtualFocus'; -import {MultipleSelectionManager} from 'react-stately/private/selection/types'; +import {MultipleSelectionManager} from 'react-stately/useMultipleSelectionState'; import {openLink, useRouter} from '../utils/openLink'; import {PressHookProps, usePress} from '../interactions/usePress'; import {useEffect, useRef} from 'react'; diff --git a/packages/react-aria/src/selection/useTypeSelect.ts b/packages/react-aria/src/selection/useTypeSelect.ts index 1bc798938a0..75b3569bb55 100644 --- a/packages/react-aria/src/selection/useTypeSelect.ts +++ b/packages/react-aria/src/selection/useTypeSelect.ts @@ -13,7 +13,7 @@ import {DOMAttributes, Key, KeyboardDelegate} from '@react-types/shared'; import {getEventTarget, nodeContains} from '../utils/shadowdom/DOMFunctions'; import {KeyboardEvent, useRef} from 'react'; -import {MultipleSelectionManager} from 'react-stately/private/selection/types'; +import {MultipleSelectionManager} from 'react-stately/useMultipleSelectionState'; /** * Controls how long to wait before clearing the typeahead buffer. diff --git a/packages/react-aria/src/table/useTableColumnResize.ts b/packages/react-aria/src/table/useTableColumnResize.ts index e88e69637fa..ef54633c57b 100644 --- a/packages/react-aria/src/table/useTableColumnResize.ts +++ b/packages/react-aria/src/table/useTableColumnResize.ts @@ -11,7 +11,7 @@ */ import {ChangeEvent, useCallback, useEffect, useRef} from 'react'; -import {ColumnSize} from 'react-stately/Column'; +import {ColumnSize} from 'react-stately/useTableState'; import {DOMAttributes, FocusableElement, Key, RefObject} from '@react-types/shared'; import {focusSafely} from '../interactions/focusSafely'; import {getActiveElement, getEventTarget} from '../utils/shadowdom/DOMFunctions'; diff --git a/packages/react-aria/src/textfield/useTextField.ts b/packages/react-aria/src/textfield/useTextField.ts index fe6a1299a26..c9afd3dfb7e 100644 --- a/packages/react-aria/src/textfield/useTextField.ts +++ b/packages/react-aria/src/textfield/useTextField.ts @@ -36,7 +36,7 @@ import React, { RefObject, useState } from 'react'; -import {useControlledState} from 'react-stately/private/utils/useControlledState'; +import {useControlledState} from 'react-stately/useControlledState'; import {useField} from '../label/useField'; import {useFocusable} from '../interactions/useFocusable'; import {useFormReset} from '../utils/useFormReset'; diff --git a/packages/react-aria/src/virtualizer/ScrollView.tsx b/packages/react-aria/src/virtualizer/ScrollView.tsx index 05260b5ee78..975858679d8 100644 --- a/packages/react-aria/src/virtualizer/ScrollView.tsx +++ b/packages/react-aria/src/virtualizer/ScrollView.tsx @@ -14,7 +14,7 @@ import {flushSync} from 'react-dom'; import {getEventTarget, nodeContains} from '../utils/shadowdom/DOMFunctions'; import {getScrollLeft} from './utils'; -import {Point} from 'react-stately/private/virtualizer/Point'; +import {Point, Rect, Size} from 'react-stately/useVirtualizerState'; import React, { CSSProperties, ForwardedRef, @@ -26,8 +26,6 @@ import React, { useRef, useState } from 'react'; -import {Rect} from 'react-stately/private/virtualizer/Rect'; -import {Size} from 'react-stately/private/virtualizer/Size'; import {useEffectEvent} from '../utils/useEffectEvent'; import {useLayoutEffect} from '../utils/useLayoutEffect'; import {useLocale} from '../i18n/I18nProvider'; diff --git a/packages/react-aria/src/virtualizer/Virtualizer.tsx b/packages/react-aria/src/virtualizer/Virtualizer.tsx index c8f7a012744..06e0a648da2 100644 --- a/packages/react-aria/src/virtualizer/Virtualizer.tsx +++ b/packages/react-aria/src/virtualizer/Virtualizer.tsx @@ -11,15 +11,12 @@ */ import {Collection, Key, RefObject} from '@react-types/shared'; -import {Layout} from 'react-stately/private/virtualizer/Layout'; +import {Layout, Rect, ReusableView, useVirtualizerState} from 'react-stately/useVirtualizerState'; import {mergeProps} from '../utils/mergeProps'; import React, {ForwardedRef, HTMLAttributes, ReactElement, ReactNode, useCallback} from 'react'; -import {Rect} from 'react-stately/private/virtualizer/Rect'; -import {ReusableView} from 'react-stately/private/virtualizer/ReusableView'; import {ScrollView} from './ScrollView'; import {useLoadMore} from '../utils/useLoadMore'; import {useObjectRef} from '../utils/useObjectRef'; -import {useVirtualizerState} from 'react-stately/private/virtualizer/useVirtualizerState'; import {VirtualizerItem} from './VirtualizerItem'; type RenderWrapper = ( diff --git a/packages/react-aria/src/virtualizer/VirtualizerItem.tsx b/packages/react-aria/src/virtualizer/VirtualizerItem.tsx index 5075301b634..6e27c3e1a30 100644 --- a/packages/react-aria/src/virtualizer/VirtualizerItem.tsx +++ b/packages/react-aria/src/virtualizer/VirtualizerItem.tsx @@ -11,7 +11,7 @@ */ import {Direction} from '@react-types/shared'; -import {LayoutInfo} from 'react-stately/private/virtualizer/LayoutInfo'; +import {LayoutInfo} from 'react-stately/useVirtualizerState'; import React, {CSSProperties, JSX, ReactNode, useRef} from 'react'; import {useLocale} from '../i18n/I18nProvider'; import {useVirtualizerItem, VirtualizerItemOptions} from './useVirtualizerItem'; diff --git a/packages/react-aria/src/virtualizer/useVirtualizerItem.ts b/packages/react-aria/src/virtualizer/useVirtualizerItem.ts index 20cf2c69a76..8f4ceabb3f2 100644 --- a/packages/react-aria/src/virtualizer/useVirtualizerItem.ts +++ b/packages/react-aria/src/virtualizer/useVirtualizerItem.ts @@ -11,8 +11,7 @@ */ import {Key, RefObject} from '@react-types/shared'; -import {LayoutInfo} from 'react-stately/private/virtualizer/LayoutInfo'; -import {Size} from 'react-stately/private/virtualizer/Size'; +import {LayoutInfo, Size} from 'react-stately/useVirtualizerState'; import {useCallback} from 'react'; import {useLayoutEffect} from '../utils/useLayoutEffect'; diff --git a/packages/react-aria/stories/dnd/VirtualizedListBox.tsx b/packages/react-aria/stories/dnd/VirtualizedListBox.tsx index 9189ef86bc4..99ea6407a9c 100644 --- a/packages/react-aria/stories/dnd/VirtualizedListBox.tsx +++ b/packages/react-aria/stories/dnd/VirtualizedListBox.tsx @@ -21,7 +21,7 @@ import {FocusRing} from '../../src/focus/FocusRing'; import Folder from '@spectrum-icons/workflow/Folder'; import {Item} from 'react-stately/Item'; import {ListKeyboardDelegate} from '../../src/selection/ListKeyboardDelegate'; -import {ListLayout} from 'react-stately/private/layout/ListLayout'; +import {ListLayout} from 'react-stately/useVirtualizerState'; import {ListState, useListState} from 'react-stately/useListState'; import {mergeProps} from '../../src/utils/mergeProps'; import React, {JSX, useMemo} from 'react'; diff --git a/packages/react-aria/stories/table/example-resizing.tsx b/packages/react-aria/stories/table/example-resizing.tsx index b1614946620..a0be7026bba 100644 --- a/packages/react-aria/stories/table/example-resizing.tsx +++ b/packages/react-aria/stories/table/example-resizing.tsx @@ -13,7 +13,7 @@ import ariaStyles from './resizing.css'; import {AriaTableColumnResizeProps, useTableColumnResize} from '../../src/table/useTableColumnResize'; import {classNames} from '@adobe/react-spectrum/private/utils/classNames'; -import {ColumnSize} from 'react-stately/Column'; +import {ColumnSize} from 'react-stately/useTableState'; import {FocusRing} from '../../src/focus/FocusRing'; import {Key} from '@react-types/shared'; import {mergeProps} from '../../src/utils/mergeProps'; diff --git a/packages/react-aria/stories/table/useTable.stories.tsx b/packages/react-aria/stories/table/useTable.stories.tsx index bdc94055ff8..1ade9e79813 100644 --- a/packages/react-aria/stories/table/useTable.stories.tsx +++ b/packages/react-aria/stories/table/useTable.stories.tsx @@ -12,18 +12,14 @@ import {action} from 'storybook/actions'; import {Table as BackwardCompatTable} from './example-backwards-compat'; -import {Cell} from 'react-stately/Cell'; -import {Column, ColumnSize} from 'react-stately/Column'; +import {Cell, Column, ColumnSize, Row, TableBody, TableHeader} from 'react-stately/useTableState'; import {Table as DocsTable} from './example-docs'; import {Key} from '@react-types/shared'; import {Meta, StoryObj} from '@storybook/react'; import React, {JSX, useCallback, useMemo, useState} from 'react'; import {Table as ResizingTable} from './example-resizing'; -import {Row} from 'react-stately/Row'; import {SpectrumTableProps} from '@adobe/react-spectrum/TableView'; import {Table} from './example'; -import {TableBody} from 'react-stately/TableBody'; -import {TableHeader} from 'react-stately/TableHeader'; const meta: Meta> = { title: 'useTable' diff --git a/packages/react-aria/test/table/ariaTableResizing.test.tsx b/packages/react-aria/test/table/ariaTableResizing.test.tsx index ab8a88fd3ae..bda6a0bdae0 100644 --- a/packages/react-aria/test/table/ariaTableResizing.test.tsx +++ b/packages/react-aria/test/table/ariaTableResizing.test.tsx @@ -11,19 +11,15 @@ */ import {act, fireEvent} from '@react-spectrum/test-utils-internal'; -import {Cell} from 'react-stately/Cell'; -import {Column} from 'react-stately/Column'; +import {Cell, Column, Row, TableBody, TableHeader} from 'react-stately/useTableState'; import {composeStories} from '@storybook/react'; import {Key} from '@react-types/shared'; import React from 'react'; import {render} from '@testing-library/react'; import {Table as ResizingTable} from '../../stories/table/example-resizing'; import {resizingTests} from './tableResizingTests'; -import {Row} from 'react-stately/Row'; import {setInteractionModality} from '../../src/interactions/useFocusVisible'; import * as stories from '../../stories/table/useTable.stories'; -import {TableBody} from 'react-stately/TableBody'; -import {TableHeader} from 'react-stately/TableHeader'; import {within} from '@testing-library/dom'; diff --git a/packages/react-aria/test/table/useTable.test.tsx b/packages/react-aria/test/table/useTable.test.tsx index ed6fa2bcc82..6e132d19084 100644 --- a/packages/react-aria/test/table/useTable.test.tsx +++ b/packages/react-aria/test/table/useTable.test.tsx @@ -12,12 +12,9 @@ jest.mock('../../src/live-announcer/LiveAnnouncer'); import {announce} from '../../src/live-announcer/LiveAnnouncer'; -import {Cell} from 'react-stately/Cell'; -import {Column} from 'react-stately/Column'; +import {Cell, Column, Row, TableBody, TableHeader} from 'react-stately/useTableState'; import {pointerMap, render} from '@react-spectrum/test-utils-internal'; import React, {useRef} from 'react'; -import {Row} from 'react-stately/Row'; -import {TableBody} from 'react-stately/TableBody'; import { TableCell, TableCheckboxCell, @@ -27,7 +24,6 @@ import { TableRowGroup, TableSelectAllCell } from '../../stories/table/example'; -import {TableHeader} from 'react-stately/TableHeader'; import userEvent from '@testing-library/user-event'; import {useTable} from '../../src/table/useTable'; import {useTableState} from 'react-stately/useTableState'; diff --git a/packages/react-aria/test/table/useTableBackwardCompat.test.tsx b/packages/react-aria/test/table/useTableBackwardCompat.test.tsx index 0fda7301fce..8c924ed23e0 100644 --- a/packages/react-aria/test/table/useTableBackwardCompat.test.tsx +++ b/packages/react-aria/test/table/useTableBackwardCompat.test.tsx @@ -12,12 +12,9 @@ jest.mock('../../src/live-announcer/LiveAnnouncer'); import {announce} from '../../src/live-announcer/LiveAnnouncer'; -import {Cell} from 'react-stately/Cell'; -import {Column} from 'react-stately/Column'; +import {Cell, Column, Row, TableBody, TableHeader} from 'react-stately/useTableState'; import {pointerMap, render} from '@react-spectrum/test-utils-internal'; import React, {useRef} from 'react'; -import {Row} from 'react-stately/Row'; -import {TableBody} from 'react-stately/TableBody'; import { TableCell, TableCheckboxCell, @@ -27,7 +24,6 @@ import { TableRowGroup, TableSelectAllCell } from '../../stories/table/example-backwards-compat'; -import {TableHeader} from 'react-stately/TableHeader'; import userEvent from '@testing-library/user-event'; import {useTable} from '../../src/table/useTable'; import {useTableState} from 'react-stately/useTableState'; diff --git a/packages/react-stately/exports/Cell.ts b/packages/react-stately/exports/Cell.ts deleted file mode 100644 index 782ffcb3ff0..00000000000 --- a/packages/react-stately/exports/Cell.ts +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright 2020 Adobe. All rights reserved. - * This file is licensed to you under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. You may obtain a copy - * of the License at http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under - * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS - * OF ANY KIND, either express or implied. See the License for the specific language - * governing permissions and limitations under the License. - */ - -export type {CellProps, CellElement, CellRenderer} from '../src/table/Cell'; -export {Cell} from '../src/table/Cell'; -export {Section} from '../src/collections/Section'; diff --git a/packages/react-stately/exports/Column.ts b/packages/react-stately/exports/Column.ts deleted file mode 100644 index 0e7efc2bda4..00000000000 --- a/packages/react-stately/exports/Column.ts +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright 2020 Adobe. All rights reserved. - * This file is licensed to you under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. You may obtain a copy - * of the License at http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under - * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS - * OF ANY KIND, either express or implied. See the License for the specific language - * governing permissions and limitations under the License. - */ - -export type {ColumnProps, ColumnSize, ColumnDynamicSize, ColumnStaticSize, ColumnElement, ColumnRenderer} from '../src/table/Column'; -export {Column} from '../src/table/Column'; -export {Section} from '../src/collections/Section'; diff --git a/packages/react-stately/exports/Item.ts b/packages/react-stately/exports/Item.ts index 61b4ceba75c..257f3515bae 100644 --- a/packages/react-stately/exports/Item.ts +++ b/packages/react-stately/exports/Item.ts @@ -11,3 +11,4 @@ */ export {Item} from '../src/collections/Item'; +export type {ItemProps} from '@react-types/shared'; diff --git a/packages/react-stately/exports/Section.ts b/packages/react-stately/exports/Section.ts index ffc2389f956..522b79c5a04 100644 --- a/packages/react-stately/exports/Section.ts +++ b/packages/react-stately/exports/Section.ts @@ -11,3 +11,4 @@ */ export {Section} from '../src/collections/Section'; +export type {SectionProps} from '@react-types/shared'; diff --git a/packages/react-stately/exports/TableBody.ts b/packages/react-stately/exports/TableBody.ts deleted file mode 100644 index 47a01c71c7c..00000000000 --- a/packages/react-stately/exports/TableBody.ts +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright 2020 Adobe. All rights reserved. - * This file is licensed to you under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. You may obtain a copy - * of the License at http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under - * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS - * OF ANY KIND, either express or implied. See the License for the specific language - * governing permissions and limitations under the License. - */ - -export type {TableBodyProps} from '../src/table/TableBody'; -export {TableBody} from '../src/table/TableBody'; -export {Section} from '../src/collections/Section'; diff --git a/packages/react-stately/exports/TableHeader.ts b/packages/react-stately/exports/TableHeader.ts deleted file mode 100644 index 53cfd5ccfc3..00000000000 --- a/packages/react-stately/exports/TableHeader.ts +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright 2020 Adobe. All rights reserved. - * This file is licensed to you under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. You may obtain a copy - * of the License at http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under - * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS - * OF ANY KIND, either express or implied. See the License for the specific language - * governing permissions and limitations under the License. - */ - -export type {TableHeaderProps} from '../src/table/TableHeader'; -export {TableHeader} from '../src/table/TableHeader'; -export {Section} from '../src/collections/Section'; diff --git a/packages/react-stately/exports/index.ts b/packages/react-stately/exports/index.ts index eb86dca64be..4c42566fc03 100644 --- a/packages/react-stately/exports/index.ts +++ b/packages/react-stately/exports/index.ts @@ -11,7 +11,6 @@ */ export type {CalendarState, RangeCalendarState, DateValue} from '../src/calendar/types'; - export type {CalendarStateOptions, CalendarProps} from '../src/calendar/useCalendarState'; export type {RangeCalendarStateOptions, DateRange, RangeCalendarProps} from '../src/calendar/useRangeCalendarState'; export type {CheckboxGroupProps, CheckboxGroupState} from '../src/checkbox/useCheckboxGroupState'; @@ -32,7 +31,7 @@ export type {DisclosureState, DisclosureProps} from '../src/disclosure/useDisclo export type {DisclosureGroupState, DisclosureGroupProps} from '../src/disclosure/useDisclosureGroupState'; export type {DraggableCollectionStateOptions, DraggableCollectionState} from '../src/dnd/useDraggableCollectionState'; export type {DroppableCollectionStateOptions, DroppableCollectionState} from '../src/dnd/useDroppableCollectionState'; -export type {AsyncListData, AsyncListOptions} from '../src/data/useAsyncList'; +export type {AsyncListOptions, AsyncListData, AsyncListLoadFunction, AsyncListLoadOptions, AsyncListStateUpdate} from '../src/data/useAsyncList'; export type {ListData, ListOptions} from '../src/data/useListData'; export type {TreeData, TreeOptions} from '../src/data/useTreeData'; export type {ListProps, ListState} from '../src/list/useListState'; @@ -44,7 +43,7 @@ export type {RadioGroupProps, RadioGroupState} from '../src/radio/useRadioGroupS export type {SearchFieldProps, SearchFieldState} from '../src/searchfield/useSearchFieldState'; export type {SelectProps, SelectState, SelectStateOptions} from '../src/select/useSelectState'; export type {SliderState, SliderStateOptions, SliderProps} from '../src/slider/useSliderState'; -export type {MultipleSelectionManager, MultipleSelectionState, SingleSelectionState} from '../src/selection/types'; +export type {MultipleSelectionManager, MultipleSelectionState, SingleSelectionState, FocusState} from '../src/selection/types'; export type {MultipleSelectionStateProps} from '../src/selection/useMultipleSelectionState'; export type {NumberFieldState, NumberFieldStateOptions, NumberFieldProps} from '../src/numberfield/useNumberFieldState'; export type {TableProps, TableState, TableStateProps} from '../src/table/useTableState'; @@ -62,6 +61,13 @@ export type {ToggleGroupProps, ToggleGroupState} from '../src/toggle/useToggleGr export type {TooltipTriggerProps, TooltipTriggerState} from '../src/tooltip/useTooltipTriggerState'; export type {TreeProps, TreeState} from '../src/tree/useTreeState'; export type {ItemProps, Key, SectionProps, Collection, Node, Orientation, DisabledBehavior, Selection, SelectionBehavior, SelectionMode, SortDescriptor, SortDirection, ValidationState} from '@react-types/shared'; +export type {GridLayoutOptions} from '../src/layout/GridLayout'; +export type {ListLayoutOptions, LayoutNode} from '../src/layout/ListLayout'; +export type {TableLayoutProps} from '../src/layout/TableLayout'; +export type {WaterfallLayoutOptions} from '../src/layout/WaterfallLayout'; +export type {InvalidationContext} from '../src/virtualizer/types'; +export type {RectCorner} from '../src/virtualizer/Rect'; +export type {VirtualizerState} from '../src/virtualizer/useVirtualizerState'; export {useCalendarState} from '../src/calendar/useCalendarState'; export {useRangeCalendarState} from '../src/calendar/useRangeCalendarState'; @@ -113,3 +119,14 @@ export {useToggleGroupState} from '../src/toggle/useToggleGroupState'; export {useTooltipTriggerState} from '../src/tooltip/useTooltipTriggerState'; export {useTreeState} from '../src/tree/useTreeState'; export {FormValidationContext} from '../src/form/useFormValidationState'; +export {useVirtualizerState} from '../src/virtualizer/useVirtualizerState'; +export {Layout} from '../src/virtualizer/Layout'; +export {LayoutInfo} from '../src/virtualizer/LayoutInfo'; +export {Point} from '../src/virtualizer/Point'; +export {Rect} from '../src/virtualizer/Rect'; +export {ReusableView} from '../src/virtualizer/ReusableView'; +export {Size} from '../src/virtualizer/Size'; +export {GridLayout} from '../src/layout/GridLayout'; +export {ListLayout} from '../src/layout/ListLayout'; +export {TableLayout} from '../src/layout/TableLayout'; +export {WaterfallLayout} from '../src/layout/WaterfallLayout'; diff --git a/packages/react-stately/exports/private/layout/GridLayout.ts b/packages/react-stately/exports/private/layout/GridLayout.ts deleted file mode 100644 index e233f594296..00000000000 --- a/packages/react-stately/exports/private/layout/GridLayout.ts +++ /dev/null @@ -1 +0,0 @@ -export {GridLayout, type GridLayoutOptions} from '../../../src/layout/GridLayout'; diff --git a/packages/react-stately/exports/private/layout/ListLayout.ts b/packages/react-stately/exports/private/layout/ListLayout.ts deleted file mode 100644 index 0140e88f01d..00000000000 --- a/packages/react-stately/exports/private/layout/ListLayout.ts +++ /dev/null @@ -1 +0,0 @@ -export {ListLayout, type ListLayoutOptions, type LayoutNode} from '../../../src/layout/ListLayout'; diff --git a/packages/react-stately/exports/private/layout/TableLayout.ts b/packages/react-stately/exports/private/layout/TableLayout.ts deleted file mode 100644 index de613caea76..00000000000 --- a/packages/react-stately/exports/private/layout/TableLayout.ts +++ /dev/null @@ -1 +0,0 @@ -export {TableLayout, type TableLayoutProps} from '../../../src/layout/TableLayout'; diff --git a/packages/react-stately/exports/private/layout/WaterfallLayout.ts b/packages/react-stately/exports/private/layout/WaterfallLayout.ts deleted file mode 100644 index 9ef5e40eb79..00000000000 --- a/packages/react-stately/exports/private/layout/WaterfallLayout.ts +++ /dev/null @@ -1 +0,0 @@ -export {WaterfallLayout, type WaterfallLayoutOptions} from '../../../src/layout/WaterfallLayout'; diff --git a/packages/react-stately/exports/private/selection/types.ts b/packages/react-stately/exports/private/selection/types.ts deleted file mode 100644 index dbe90def9c9..00000000000 --- a/packages/react-stately/exports/private/selection/types.ts +++ /dev/null @@ -1 +0,0 @@ -export {type MultipleSelectionManager, type MultipleSelectionState, type FocusState, type SingleSelectionState} from '../../../src/selection/types'; diff --git a/packages/react-stately/exports/private/utils/useControlledState.ts b/packages/react-stately/exports/private/utils/useControlledState.ts deleted file mode 100644 index c0f73f75fe8..00000000000 --- a/packages/react-stately/exports/private/utils/useControlledState.ts +++ /dev/null @@ -1 +0,0 @@ -export {useControlledState} from '../../../src/utils/useControlledState'; diff --git a/packages/react-stately/exports/private/virtualizer/Layout.ts b/packages/react-stately/exports/private/virtualizer/Layout.ts deleted file mode 100644 index 115a7e3e80d..00000000000 --- a/packages/react-stately/exports/private/virtualizer/Layout.ts +++ /dev/null @@ -1 +0,0 @@ -export {Layout} from '../../../src/virtualizer/Layout'; diff --git a/packages/react-stately/exports/private/virtualizer/LayoutInfo.ts b/packages/react-stately/exports/private/virtualizer/LayoutInfo.ts deleted file mode 100644 index d18d8b6841b..00000000000 --- a/packages/react-stately/exports/private/virtualizer/LayoutInfo.ts +++ /dev/null @@ -1 +0,0 @@ -export {LayoutInfo} from '../../../src/virtualizer/LayoutInfo'; diff --git a/packages/react-stately/exports/private/virtualizer/Point.ts b/packages/react-stately/exports/private/virtualizer/Point.ts deleted file mode 100644 index 0e736e4ee52..00000000000 --- a/packages/react-stately/exports/private/virtualizer/Point.ts +++ /dev/null @@ -1 +0,0 @@ -export {Point} from '../../../src/virtualizer/Point'; diff --git a/packages/react-stately/exports/private/virtualizer/Rect.ts b/packages/react-stately/exports/private/virtualizer/Rect.ts deleted file mode 100644 index 4296c3a71ad..00000000000 --- a/packages/react-stately/exports/private/virtualizer/Rect.ts +++ /dev/null @@ -1 +0,0 @@ -export {Rect, type RectCorner} from '../../../src/virtualizer/Rect'; diff --git a/packages/react-stately/exports/private/virtualizer/ReusableView.ts b/packages/react-stately/exports/private/virtualizer/ReusableView.ts deleted file mode 100644 index 8f4c816d41a..00000000000 --- a/packages/react-stately/exports/private/virtualizer/ReusableView.ts +++ /dev/null @@ -1 +0,0 @@ -export {ReusableView} from '../../../src/virtualizer/ReusableView'; diff --git a/packages/react-stately/exports/private/virtualizer/Size.ts b/packages/react-stately/exports/private/virtualizer/Size.ts deleted file mode 100644 index b2e8f0cdbc0..00000000000 --- a/packages/react-stately/exports/private/virtualizer/Size.ts +++ /dev/null @@ -1 +0,0 @@ -export {Size} from '../../../src/virtualizer/Size'; diff --git a/packages/react-stately/exports/private/virtualizer/types.ts b/packages/react-stately/exports/private/virtualizer/types.ts deleted file mode 100644 index 7de941cfb27..00000000000 --- a/packages/react-stately/exports/private/virtualizer/types.ts +++ /dev/null @@ -1 +0,0 @@ -export {type InvalidationContext} from '../../../src/virtualizer/types'; diff --git a/packages/react-stately/exports/private/virtualizer/useVirtualizerState.ts b/packages/react-stately/exports/private/virtualizer/useVirtualizerState.ts deleted file mode 100644 index 9dccd08f5c0..00000000000 --- a/packages/react-stately/exports/private/virtualizer/useVirtualizerState.ts +++ /dev/null @@ -1 +0,0 @@ -export {useVirtualizerState, type VirtualizerState} from '../../../src/virtualizer/useVirtualizerState'; diff --git a/packages/react-stately/exports/useControlledState.ts b/packages/react-stately/exports/useControlledState.ts new file mode 100644 index 00000000000..1adda402694 --- /dev/null +++ b/packages/react-stately/exports/useControlledState.ts @@ -0,0 +1 @@ +export {useControlledState} from '../src/utils/useControlledState'; diff --git a/packages/react-stately/exports/useMultipleSelectionState.ts b/packages/react-stately/exports/useMultipleSelectionState.ts index 6ff58a002fb..e2b323eab63 100644 --- a/packages/react-stately/exports/useMultipleSelectionState.ts +++ b/packages/react-stately/exports/useMultipleSelectionState.ts @@ -12,3 +12,5 @@ export type {MultipleSelectionStateProps} from '../src/selection/useMultipleSelectionState'; export {useMultipleSelectionState} from '../src/selection/useMultipleSelectionState'; +export {type MultipleSelectionManager, type MultipleSelectionState, type FocusState} from '../src/selection/types'; +export type {DisabledBehavior, Selection, SelectionBehavior} from '@react-types/shared'; diff --git a/packages/react-stately/exports/useSingleSelectListState.ts b/packages/react-stately/exports/useSingleSelectListState.ts index 9c919ebeb17..dc411cbd70b 100644 --- a/packages/react-stately/exports/useSingleSelectListState.ts +++ b/packages/react-stately/exports/useSingleSelectListState.ts @@ -12,3 +12,4 @@ export type {SingleSelectListProps, SingleSelectListState} from '../src/list/useSingleSelectListState'; export {useSingleSelectListState} from '../src/list/useSingleSelectListState'; +export {type FocusState, type SingleSelectionState} from '../src/selection/types'; diff --git a/packages/react-stately/exports/useTableState.ts b/packages/react-stately/exports/useTableState.ts index 2a93c3b2ef9..a9ad2c8dd0c 100644 --- a/packages/react-stately/exports/useTableState.ts +++ b/packages/react-stately/exports/useTableState.ts @@ -15,3 +15,20 @@ export type {TableProps, TableState, TableStateProps} from '../src/table/useTabl export {useTableColumnResizeState} from '../src/table/useTableColumnResizeState'; export {useTableState, UNSTABLE_useFilteredTableState} from '../src/table/useTableState'; + +export type {CellProps, CellElement, CellRenderer} from '../src/table/Cell'; +export {Cell} from '../src/table/Cell'; + +export type {ColumnProps, ColumnSize, ColumnDynamicSize, ColumnStaticSize, ColumnElement, ColumnRenderer} from '../src/table/Column'; +export {Column} from '../src/table/Column'; + +export type {RowProps, RowElement} from '../src/table/Row'; +export {Row} from '../src/table/Row'; + +export type {TableBodyProps} from '../src/table/TableBody'; +export {TableBody} from '../src/table/TableBody'; + +export type {TableHeaderProps} from '../src/table/TableHeader'; +export {TableHeader} from '../src/table/TableHeader'; + +export type {SortDescriptor, SortDirection} from '@react-types/shared'; diff --git a/packages/react-stately/exports/useVirtualizerState.ts b/packages/react-stately/exports/useVirtualizerState.ts new file mode 100644 index 00000000000..d0c878ae641 --- /dev/null +++ b/packages/react-stately/exports/useVirtualizerState.ts @@ -0,0 +1,13 @@ +export {useVirtualizerState, type VirtualizerState} from '../src/virtualizer/useVirtualizerState'; +export {Layout} from '../src/virtualizer/Layout'; +export {LayoutInfo} from '../src/virtualizer/LayoutInfo'; +export {Point} from '../src/virtualizer/Point'; +export {Rect, type RectCorner} from '../src/virtualizer/Rect'; +export {ReusableView} from '../src/virtualizer/ReusableView'; +export {Size} from '../src/virtualizer/Size'; +export {type InvalidationContext} from '../src/virtualizer/types'; + +export {GridLayout, type GridLayoutOptions} from '../src/layout/GridLayout'; +export {ListLayout, type ListLayoutOptions, type LayoutNode} from '../src/layout/ListLayout'; +export {TableLayout, type TableLayoutProps} from '../src/layout/TableLayout'; +export {WaterfallLayout, type WaterfallLayoutOptions} from '../src/layout/WaterfallLayout';