diff --git a/packages/@adobe/react-spectrum/package.json b/packages/@adobe/react-spectrum/package.json index 60481d68012..1696a36b050 100644 --- a/packages/@adobe/react-spectrum/package.json +++ b/packages/@adobe/react-spectrum/package.json @@ -99,7 +99,7 @@ "@react-spectrum/well": "^3.4.21", "@react-stately/collections": "^3.12.2", "@react-stately/data": "^3.12.2", - "@react-types/shared": "^3.28.0", + "@react-types-nutrient/shared": "^3.28.0", "client-only": "^0.0.1" }, "publishConfig": { diff --git a/packages/@adobe/react-spectrum/src/index.ts b/packages/@adobe/react-spectrum/src/index.ts index c88c97e5a30..a17bd25ef16 100644 --- a/packages/@adobe/react-spectrum/src/index.ts +++ b/packages/@adobe/react-spectrum/src/index.ts @@ -127,5 +127,5 @@ export type {VisuallyHiddenAria, VisuallyHiddenProps} from '@react-aria-nutrient export type {DateFormatter, DateFormatterOptions, Filter, FormatMessage, Locale, LocalizedStrings} from '@react-aria-nutrient/i18n'; export type {SSRProviderProps} from '@react-aria-nutrient/ssr'; export type {DirectoryDropItem, DragAndDropHooks, DragAndDropOptions, DraggableCollectionEndEvent, DraggableCollectionMoveEvent, DraggableCollectionStartEvent, DragPreviewRenderer, DragTypes, DropItem, DropOperation, DroppableCollectionDropEvent, DroppableCollectionEnterEvent, DroppableCollectionExitEvent, DroppableCollectionInsertDropEvent, DroppableCollectionMoveEvent, DroppableCollectionOnItemDropEvent, DroppableCollectionReorderEvent, DroppableCollectionRootDropEvent, DropPosition, DropTarget, FileDropItem, ItemDropTarget, RootDropTarget, TextDropItem} from '@react-spectrum/dnd'; -export type {Key, Selection, ItemProps, SectionProps, RouterConfig} from '@react-types/shared'; +export type {Key, Selection, ItemProps, SectionProps, RouterConfig} from '@react-types-nutrient/shared'; export type {SpectrumAccordionProps, SpectrumDisclosureProps, SpectrumDisclosurePanelProps, SpectrumDisclosureTitleProps} from '@react-spectrum/accordion'; diff --git a/packages/@react-aria/actiongroup/package.json b/packages/@react-aria/actiongroup/package.json index 33e7032fbbb..ca8fdc2426e 100644 --- a/packages/@react-aria/actiongroup/package.json +++ b/packages/@react-aria/actiongroup/package.json @@ -27,8 +27,8 @@ "@react-aria-nutrient/interactions": "^3.24.1", "@react-aria-nutrient/utils": "^3.28.1", "@react-stately/list": "^3.12.0", - "@react-types/actiongroup": "^3.4.15", - "@react-types/shared": "^3.28.0", + "@react-types-nutrient/actiongroup": "^3.4.15", + "@react-types-nutrient/shared": "^3.28.0", "@swc/helpers": "^0.5.0" }, "peerDependencies": { diff --git a/packages/@react-aria/actiongroup/src/index.ts b/packages/@react-aria/actiongroup/src/index.ts index 5a0f49a27e8..c1540b2ef78 100644 --- a/packages/@react-aria/actiongroup/src/index.ts +++ b/packages/@react-aria/actiongroup/src/index.ts @@ -12,5 +12,5 @@ export type {ActionGroupAria} from './useActionGroup'; export {useActionGroup} from './useActionGroup'; export {useActionGroupItem} from './useActionGroupItem'; -export type {AriaActionGroupProps} from '@react-types/actiongroup'; +export type {AriaActionGroupProps} from '@react-types-nutrient/actiongroup'; export type {ActionGroupItemAria, AriaActionGroupItemProps} from './useActionGroupItem'; diff --git a/packages/@react-aria/actiongroup/src/useActionGroup.ts b/packages/@react-aria/actiongroup/src/useActionGroup.ts index bbd3f959fea..d0bc91f5075 100644 --- a/packages/@react-aria/actiongroup/src/useActionGroup.ts +++ b/packages/@react-aria/actiongroup/src/useActionGroup.ts @@ -10,9 +10,9 @@ * governing permissions and limitations under the License. */ -import {AriaActionGroupProps} from '@react-types/actiongroup'; +import {AriaActionGroupProps} from '@react-types-nutrient/actiongroup'; import {createFocusManager} from '@react-aria-nutrient/focus'; -import {DOMAttributes, FocusableElement, Orientation, RefObject} from '@react-types/shared'; +import {DOMAttributes, FocusableElement, Orientation, RefObject} from '@react-types-nutrient/shared'; import {filterDOMProps, useLayoutEffect} from '@react-aria-nutrient/utils'; import {ListState} from '@react-stately/list'; import {useLocale} from '@react-aria-nutrient/i18n'; diff --git a/packages/@react-aria/actiongroup/src/useActionGroupItem.ts b/packages/@react-aria/actiongroup/src/useActionGroupItem.ts index 9f773027f5d..9a91c1bd32f 100644 --- a/packages/@react-aria/actiongroup/src/useActionGroupItem.ts +++ b/packages/@react-aria/actiongroup/src/useActionGroupItem.ts @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {DOMAttributes, FocusableElement, Key, RefObject} from '@react-types/shared'; +import {DOMAttributes, FocusableElement, Key, RefObject} from '@react-types-nutrient/shared'; import {ListState} from '@react-stately/list'; import {mergeProps, useEffectEvent} from '@react-aria-nutrient/utils'; import {PressProps} from '@react-aria-nutrient/interactions'; diff --git a/packages/@react-aria/actiongroup/test/useActionGroup.test.ts b/packages/@react-aria/actiongroup/test/useActionGroup.test.ts index 47ed9679fc7..026bf067eee 100644 --- a/packages/@react-aria/actiongroup/test/useActionGroup.test.ts +++ b/packages/@react-aria/actiongroup/test/useActionGroup.test.ts @@ -11,7 +11,7 @@ */ import {createRef} from 'react'; -import {FocusableElement} from '@react-types/shared'; +import {FocusableElement} from '@react-types-nutrient/shared'; import {renderHook} from '@react-spectrum/test-utils-internal'; import {useActionGroup} from '../'; import {useListState} from '@react-stately/list'; diff --git a/packages/@react-aria/autocomplete/docs/useSearchAutocomplete.mdx b/packages/@react-aria/autocomplete/docs/useSearchAutocomplete.mdx index 68f14efc354..203f57c5ec2 100644 --- a/packages/@react-aria/autocomplete/docs/useSearchAutocomplete.mdx +++ b/packages/@react-aria/autocomplete/docs/useSearchAutocomplete.mdx @@ -11,7 +11,7 @@ import {Layout} from '@react-spectrum/docs'; export default Layout; import docs from 'docs:@react-aria-nutrient/autocomplete'; -import collectionsDocs from 'docs:@react-types/shared/src/collections.d.ts'; +import collectionsDocs from 'docs:@react-types-nutrient/shared/src/collections.d.ts'; import {FunctionAPI, HeaderInfo, InterfaceType, TypeContext, TypeLink, PageDescription} from '@react-spectrum/docs'; import i18nDocs from 'docs:@react-aria-nutrient/i18n'; import overlaysDocs from 'docs:@react-aria-nutrient/overlays'; diff --git a/packages/@react-aria/autocomplete/package.json b/packages/@react-aria/autocomplete/package.json index 1d9be5b03eb..210d2f023ab 100644 --- a/packages/@react-aria/autocomplete/package.json +++ b/packages/@react-aria/autocomplete/package.json @@ -32,9 +32,9 @@ "@react-aria-nutrient/utils": "^3.28.1", "@react-stately/autocomplete": "3.0.0-beta.0", "@react-stately/combobox": "^3.10.3", - "@react-types/autocomplete": "3.0.0-alpha.29", - "@react-types/button": "^3.11.0", - "@react-types/shared": "^3.28.0", + "@react-types-nutrient/autocomplete": "3.0.0-alpha.29", + "@react-types-nutrient/button": "^3.11.0", + "@react-types-nutrient/shared": "^3.28.0", "@swc/helpers": "^0.5.0" }, "peerDependencies": { diff --git a/packages/@react-aria/autocomplete/src/index.ts b/packages/@react-aria/autocomplete/src/index.ts index 3635d09fcf2..3fcbfabdecb 100644 --- a/packages/@react-aria/autocomplete/src/index.ts +++ b/packages/@react-aria/autocomplete/src/index.ts @@ -13,5 +13,5 @@ export {useSearchAutocomplete} from './useSearchAutocomplete'; export {useAutocomplete} from './useAutocomplete'; export type {AriaSearchAutocompleteOptions, SearchAutocompleteAria} from './useSearchAutocomplete'; -export type {AriaSearchAutocompleteProps} from '@react-types/autocomplete'; +export type {AriaSearchAutocompleteProps} from '@react-types-nutrient/autocomplete'; export type {AriaAutocompleteProps, AriaAutocompleteOptions, AutocompleteAria, CollectionOptions} from './useAutocomplete'; diff --git a/packages/@react-aria/autocomplete/src/useAutocomplete.ts b/packages/@react-aria/autocomplete/src/useAutocomplete.ts index 81599038d11..5dce89418dd 100644 --- a/packages/@react-aria/autocomplete/src/useAutocomplete.ts +++ b/packages/@react-aria/autocomplete/src/useAutocomplete.ts @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {AriaLabelingProps, BaseEvent, DOMProps, RefObject} from '@react-types/shared'; +import {AriaLabelingProps, BaseEvent, DOMProps, RefObject} from '@react-types-nutrient/shared'; import {AriaTextFieldProps} from '@react-aria-nutrient/textfield'; import {AutocompleteProps, AutocompleteState} from '@react-stately/autocomplete'; import {CLEAR_FOCUS_EVENT, FOCUS_EVENT, getActiveElement, getOwnerDocument, isCtrlKeyPressed, mergeProps, mergeRefs, useEffectEvent, useId, useLabels, useObjectRef} from '@react-aria-nutrient/utils'; diff --git a/packages/@react-aria/autocomplete/src/useSearchAutocomplete.ts b/packages/@react-aria/autocomplete/src/useSearchAutocomplete.ts index 9f5f2ba96bf..200464ea02c 100644 --- a/packages/@react-aria/autocomplete/src/useSearchAutocomplete.ts +++ b/packages/@react-aria/autocomplete/src/useSearchAutocomplete.ts @@ -10,11 +10,11 @@ * governing permissions and limitations under the License. */ -import {AriaButtonProps} from '@react-types/button'; +import {AriaButtonProps} from '@react-types-nutrient/button'; import {AriaListBoxOptions} from '@react-aria-nutrient/listbox'; -import {AriaSearchAutocompleteProps} from '@react-types/autocomplete'; +import {AriaSearchAutocompleteProps} from '@react-types-nutrient/autocomplete'; import {ComboBoxState} from '@react-stately/combobox'; -import {DOMAttributes, KeyboardDelegate, LayoutDelegate, RefObject, ValidationResult} from '@react-types/shared'; +import {DOMAttributes, KeyboardDelegate, LayoutDelegate, RefObject, ValidationResult} from '@react-types-nutrient/shared'; import {InputHTMLAttributes} from 'react'; import {mergeProps} from '@react-aria-nutrient/utils'; import {useComboBox} from '@react-aria-nutrient/combobox'; diff --git a/packages/@react-aria/breadcrumbs/package.json b/packages/@react-aria/breadcrumbs/package.json index 9b646b51cee..b0446cfdf76 100644 --- a/packages/@react-aria/breadcrumbs/package.json +++ b/packages/@react-aria/breadcrumbs/package.json @@ -25,8 +25,8 @@ "@react-aria-nutrient/i18n": "^3.12.7", "@react-aria-nutrient/link": "^3.7.10", "@react-aria-nutrient/utils": "^3.28.1", - "@react-types/breadcrumbs": "^3.7.11", - "@react-types/shared": "^3.28.0", + "@react-types-nutrient/breadcrumbs": "^3.7.11", + "@react-types-nutrient/shared": "^3.28.0", "@swc/helpers": "^0.5.0" }, "peerDependencies": { diff --git a/packages/@react-aria/breadcrumbs/src/index.ts b/packages/@react-aria/breadcrumbs/src/index.ts index 5e8220708ca..82ecce80be4 100644 --- a/packages/@react-aria/breadcrumbs/src/index.ts +++ b/packages/@react-aria/breadcrumbs/src/index.ts @@ -11,6 +11,6 @@ */ export {useBreadcrumbItem} from './useBreadcrumbItem'; export {useBreadcrumbs} from './useBreadcrumbs'; -export type {AriaBreadcrumbItemProps, AriaBreadcrumbsProps} from '@react-types/breadcrumbs'; +export type {AriaBreadcrumbItemProps, AriaBreadcrumbsProps} from '@react-types-nutrient/breadcrumbs'; export type {BreadcrumbItemAria} from './useBreadcrumbItem'; export type {BreadcrumbsAria} from './useBreadcrumbs'; diff --git a/packages/@react-aria/breadcrumbs/src/useBreadcrumbItem.ts b/packages/@react-aria/breadcrumbs/src/useBreadcrumbItem.ts index 99dd6341f3e..a7fd700a070 100644 --- a/packages/@react-aria/breadcrumbs/src/useBreadcrumbItem.ts +++ b/packages/@react-aria/breadcrumbs/src/useBreadcrumbItem.ts @@ -10,8 +10,8 @@ * governing permissions and limitations under the License. */ -import {AriaBreadcrumbItemProps} from '@react-types/breadcrumbs'; -import {DOMAttributes, FocusableElement, RefObject} from '@react-types/shared'; +import {AriaBreadcrumbItemProps} from '@react-types-nutrient/breadcrumbs'; +import {DOMAttributes, FocusableElement, RefObject} from '@react-types-nutrient/shared'; import {useLink} from '@react-aria-nutrient/link'; export interface BreadcrumbItemAria { diff --git a/packages/@react-aria/breadcrumbs/src/useBreadcrumbs.ts b/packages/@react-aria/breadcrumbs/src/useBreadcrumbs.ts index b30fd5d1c22..f8ea12e074a 100644 --- a/packages/@react-aria/breadcrumbs/src/useBreadcrumbs.ts +++ b/packages/@react-aria/breadcrumbs/src/useBreadcrumbs.ts @@ -10,8 +10,8 @@ * governing permissions and limitations under the License. */ -import {AriaBreadcrumbsProps} from '@react-types/breadcrumbs'; -import {DOMAttributes} from '@react-types/shared'; +import {AriaBreadcrumbsProps} from '@react-types-nutrient/breadcrumbs'; +import {DOMAttributes} from '@react-types-nutrient/shared'; import {filterDOMProps} from '@react-aria-nutrient/utils'; // @ts-ignore import intlMessages from '../intl/*.json'; diff --git a/packages/@react-aria/button/docs/useButton.mdx b/packages/@react-aria/button/docs/useButton.mdx index 0a72d27dfc2..5db49310377 100644 --- a/packages/@react-aria/button/docs/useButton.mdx +++ b/packages/@react-aria/button/docs/useButton.mdx @@ -11,7 +11,7 @@ import {Layout} from '@react-spectrum/docs'; export default Layout; import docs from 'docs:@react-aria-nutrient/button'; -import typesDocs from 'docs:@react-types/shared/src/events.d.ts'; +import typesDocs from 'docs:@react-types-nutrient/shared/src/events.d.ts'; import {HeaderInfo, FunctionAPI, TypeLink, PageDescription} from '@react-spectrum/docs'; import {Keyboard} from '@react-spectrum/text'; import packageData from '@react-aria-nutrient/button/package.json'; diff --git a/packages/@react-aria/button/package.json b/packages/@react-aria/button/package.json index fd54bc139dc..93a9130733f 100644 --- a/packages/@react-aria/button/package.json +++ b/packages/@react-aria/button/package.json @@ -26,8 +26,8 @@ "@react-aria-nutrient/toolbar": "3.0.0-beta.14", "@react-aria-nutrient/utils": "^3.28.1", "@react-stately/toggle": "^3.8.2", - "@react-types/button": "^3.11.0", - "@react-types/shared": "^3.28.0", + "@react-types-nutrient/button": "^3.11.0", + "@react-types-nutrient/shared": "^3.28.0", "@swc/helpers": "^0.5.0" }, "peerDependencies": { diff --git a/packages/@react-aria/button/src/index.ts b/packages/@react-aria/button/src/index.ts index dbae2a493f6..68c8c2ad95c 100644 --- a/packages/@react-aria/button/src/index.ts +++ b/packages/@react-aria/button/src/index.ts @@ -13,5 +13,5 @@ export {useButton} from './useButton'; export {useToggleButton} from './useToggleButton'; export {useToggleButtonGroup, useToggleButtonGroupItem} from './useToggleButtonGroup'; export type {AriaButtonOptions, ButtonAria} from './useButton'; -export type {AriaButtonProps, AriaToggleButtonProps} from '@react-types/button'; +export type {AriaButtonProps, AriaToggleButtonProps} from '@react-types-nutrient/button'; export type {AriaToggleButtonGroupProps, ToggleButtonGroupAria, AriaToggleButtonGroupItemProps} from './useToggleButtonGroup'; diff --git a/packages/@react-aria/button/src/useButton.ts b/packages/@react-aria/button/src/useButton.ts index c00ce59f2f6..5916fe65fc6 100644 --- a/packages/@react-aria/button/src/useButton.ts +++ b/packages/@react-aria/button/src/useButton.ts @@ -18,8 +18,8 @@ import { InputHTMLAttributes, RefObject } from 'react'; -import {AriaButtonProps} from '@react-types/button'; -import {DOMAttributes} from '@react-types/shared'; +import {AriaButtonProps} from '@react-types-nutrient/button'; +import {DOMAttributes} from '@react-types-nutrient/shared'; import {filterDOMProps, mergeProps} from '@react-aria-nutrient/utils'; import {useFocusable, usePress} from '@react-aria-nutrient/interactions'; diff --git a/packages/@react-aria/button/src/useToggleButton.ts b/packages/@react-aria/button/src/useToggleButton.ts index faf2446cc28..624d356bd7d 100644 --- a/packages/@react-aria/button/src/useToggleButton.ts +++ b/packages/@react-aria/button/src/useToggleButton.ts @@ -18,10 +18,10 @@ import { InputHTMLAttributes, RefObject } from 'react'; -import {AriaToggleButtonProps} from '@react-types/button'; +import {AriaToggleButtonProps} from '@react-types-nutrient/button'; import {ButtonAria, useButton} from './useButton'; import {chain, mergeProps} from '@react-aria-nutrient/utils'; -import {DOMAttributes} from '@react-types/shared'; +import {DOMAttributes} from '@react-types-nutrient/shared'; import {ToggleState} from '@react-stately/toggle'; export interface AriaToggleButtonOptions extends Omit, 'children'> {} diff --git a/packages/@react-aria/button/src/useToggleButtonGroup.ts b/packages/@react-aria/button/src/useToggleButtonGroup.ts index ae4dc6be239..08c058cfeb7 100644 --- a/packages/@react-aria/button/src/useToggleButtonGroup.ts +++ b/packages/@react-aria/button/src/useToggleButtonGroup.ts @@ -17,8 +17,8 @@ import { HTMLAttributes, InputHTMLAttributes } from 'react'; -import {AriaLabelingProps, DOMAttributes, Orientation, RefObject} from '@react-types/shared'; -import {AriaToggleButtonGroupItemProps} from '@react-types/button'; +import {AriaLabelingProps, DOMAttributes, Orientation, RefObject} from '@react-types-nutrient/shared'; +import {AriaToggleButtonGroupItemProps} from '@react-types-nutrient/button'; import {ToggleButtonAria, useToggleButton} from './useToggleButton'; import {ToggleGroupProps, ToggleGroupState, ToggleState} from '@react-stately/toggle'; import {useToolbar} from '@react-aria-nutrient/toolbar'; diff --git a/packages/@react-aria/button/stories/useButton.stories.tsx b/packages/@react-aria/button/stories/useButton.stories.tsx index 150b05c42bb..ed54c8673bf 100644 --- a/packages/@react-aria/button/stories/useButton.stories.tsx +++ b/packages/@react-aria/button/stories/useButton.stories.tsx @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {AriaButtonProps} from '@react-types/button'; +import {AriaButtonProps} from '@react-types-nutrient/button'; import React, {useRef} from 'react'; import {useButton} from '../'; diff --git a/packages/@react-aria/calendar/package.json b/packages/@react-aria/calendar/package.json index 93b4fc3b772..08708c2ca6d 100644 --- a/packages/@react-aria/calendar/package.json +++ b/packages/@react-aria/calendar/package.json @@ -28,9 +28,9 @@ "@react-aria-nutrient/live-announcer": "^3.4.1", "@react-aria-nutrient/utils": "^3.28.1", "@react-stately/calendar": "^3.7.1", - "@react-types/button": "^3.11.0", - "@react-types/calendar": "^3.6.1", - "@react-types/shared": "^3.28.0", + "@react-types-nutrient/button": "^3.11.0", + "@react-types-nutrient/calendar": "^3.6.1", + "@react-types-nutrient/shared": "^3.28.0", "@swc/helpers": "^0.5.0" }, "peerDependencies": { diff --git a/packages/@react-aria/calendar/src/index.ts b/packages/@react-aria/calendar/src/index.ts index 1676e603a42..4d2522b72e1 100644 --- a/packages/@react-aria/calendar/src/index.ts +++ b/packages/@react-aria/calendar/src/index.ts @@ -15,7 +15,7 @@ export {useRangeCalendar} from './useRangeCalendar'; export {useCalendarGrid} from './useCalendarGrid'; export {useCalendarCell} from './useCalendarCell'; -export type {AriaCalendarProps, AriaRangeCalendarProps, CalendarProps, DateValue, RangeCalendarProps} from '@react-types/calendar'; +export type {AriaCalendarProps, AriaRangeCalendarProps, CalendarProps, DateValue, RangeCalendarProps} from '@react-types-nutrient/calendar'; export type {CalendarAria} from './useCalendarBase'; export type {AriaCalendarGridProps, CalendarGridAria} from './useCalendarGrid'; export type {AriaCalendarCellProps, CalendarCellAria} from './useCalendarCell'; diff --git a/packages/@react-aria/calendar/src/useCalendar.ts b/packages/@react-aria/calendar/src/useCalendar.ts index 40ac2395117..e9875efd51f 100644 --- a/packages/@react-aria/calendar/src/useCalendar.ts +++ b/packages/@react-aria/calendar/src/useCalendar.ts @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {AriaCalendarProps, DateValue} from '@react-types/calendar'; +import {AriaCalendarProps, DateValue} from '@react-types-nutrient/calendar'; import {CalendarAria, useCalendarBase} from './useCalendarBase'; import {CalendarState} from '@react-stately/calendar'; diff --git a/packages/@react-aria/calendar/src/useCalendarBase.ts b/packages/@react-aria/calendar/src/useCalendarBase.ts index 1a7e775aa4e..554c23ee373 100644 --- a/packages/@react-aria/calendar/src/useCalendarBase.ts +++ b/packages/@react-aria/calendar/src/useCalendarBase.ts @@ -11,9 +11,9 @@ */ import {announce} from '@react-aria-nutrient/live-announcer'; -import {AriaButtonProps} from '@react-types/button'; -import {AriaLabelingProps, DOMAttributes, DOMProps} from '@react-types/shared'; -import {CalendarPropsBase} from '@react-types/calendar'; +import {AriaButtonProps} from '@react-types-nutrient/button'; +import {AriaLabelingProps, DOMAttributes, DOMProps} from '@react-types-nutrient/shared'; +import {CalendarPropsBase} from '@react-types-nutrient/calendar'; import {CalendarState, RangeCalendarState} from '@react-stately/calendar'; import {filterDOMProps, mergeProps, useLabels, useSlotId, useUpdateEffect} from '@react-aria-nutrient/utils'; import {hookData, useSelectedDateDescription, useVisibleRangeDescription} from './utils'; diff --git a/packages/@react-aria/calendar/src/useCalendarCell.ts b/packages/@react-aria/calendar/src/useCalendarCell.ts index f2f058885a8..5251aeb59d5 100644 --- a/packages/@react-aria/calendar/src/useCalendarCell.ts +++ b/packages/@react-aria/calendar/src/useCalendarCell.ts @@ -12,7 +12,7 @@ import {CalendarDate, isEqualDay, isSameDay, isToday} from '@internationalized/date'; import {CalendarState, RangeCalendarState} from '@react-stately/calendar'; -import {DOMAttributes, RefObject} from '@react-types/shared'; +import {DOMAttributes, RefObject} from '@react-types-nutrient/shared'; import {focusWithoutScrolling, getScrollParent, mergeProps, scrollIntoViewport, useDeepMemo, useDescription} from '@react-aria-nutrient/utils'; import {getEraFormat, hookData} from './utils'; import {getInteractionModality, usePress} from '@react-aria-nutrient/interactions'; diff --git a/packages/@react-aria/calendar/src/useCalendarGrid.ts b/packages/@react-aria/calendar/src/useCalendarGrid.ts index 08ae712df7e..38055907187 100644 --- a/packages/@react-aria/calendar/src/useCalendarGrid.ts +++ b/packages/@react-aria/calendar/src/useCalendarGrid.ts @@ -12,7 +12,7 @@ import {CalendarDate, getWeeksInMonth, startOfWeek, today} from '@internationalized/date'; import {CalendarState, RangeCalendarState} from '@react-stately/calendar'; -import {DOMAttributes} from '@react-types/shared'; +import {DOMAttributes} from '@react-types-nutrient/shared'; import {hookData, useVisibleRangeDescription} from './utils'; import {KeyboardEvent, useMemo} from 'react'; import {mergeProps, useLabels} from '@react-aria-nutrient/utils'; diff --git a/packages/@react-aria/calendar/src/useRangeCalendar.ts b/packages/@react-aria/calendar/src/useRangeCalendar.ts index 8f80cda84c7..f8d6c35805d 100644 --- a/packages/@react-aria/calendar/src/useRangeCalendar.ts +++ b/packages/@react-aria/calendar/src/useRangeCalendar.ts @@ -10,9 +10,9 @@ * governing permissions and limitations under the License. */ -import {AriaRangeCalendarProps, DateValue} from '@react-types/calendar'; +import {AriaRangeCalendarProps, DateValue} from '@react-types-nutrient/calendar'; import {CalendarAria, useCalendarBase} from './useCalendarBase'; -import {FocusableElement, RefObject} from '@react-types/shared'; +import {FocusableElement, RefObject} from '@react-types-nutrient/shared'; import {RangeCalendarState} from '@react-stately/calendar'; import {useEvent} from '@react-aria-nutrient/utils'; import {useRef} from 'react'; diff --git a/packages/@react-aria/checkbox/package.json b/packages/@react-aria/checkbox/package.json index 87881b7fd92..61253706fb8 100644 --- a/packages/@react-aria/checkbox/package.json +++ b/packages/@react-aria/checkbox/package.json @@ -30,8 +30,8 @@ "@react-stately/checkbox": "^3.6.12", "@react-stately/form": "^3.1.2", "@react-stately/toggle": "^3.8.2", - "@react-types/checkbox": "^3.9.2", - "@react-types/shared": "^3.28.0", + "@react-types-nutrient/checkbox": "^3.9.2", + "@react-types-nutrient/shared": "^3.28.0", "@swc/helpers": "^0.5.0" }, "peerDependencies": { diff --git a/packages/@react-aria/checkbox/src/index.ts b/packages/@react-aria/checkbox/src/index.ts index 536cafb0826..ce7276701fe 100644 --- a/packages/@react-aria/checkbox/src/index.ts +++ b/packages/@react-aria/checkbox/src/index.ts @@ -13,5 +13,5 @@ export type {CheckboxAria} from './useCheckbox'; export {useCheckbox} from './useCheckbox'; export {useCheckboxGroup} from './useCheckboxGroup'; export {useCheckboxGroupItem} from './useCheckboxGroupItem'; -export type {AriaCheckboxGroupItemProps, AriaCheckboxGroupProps, AriaCheckboxProps} from '@react-types/checkbox'; +export type {AriaCheckboxGroupItemProps, AriaCheckboxGroupProps, AriaCheckboxProps} from '@react-types-nutrient/checkbox'; export type {CheckboxGroupAria} from './useCheckboxGroup'; diff --git a/packages/@react-aria/checkbox/src/useCheckbox.ts b/packages/@react-aria/checkbox/src/useCheckbox.ts index e722d2bfb9b..9ba06a287be 100644 --- a/packages/@react-aria/checkbox/src/useCheckbox.ts +++ b/packages/@react-aria/checkbox/src/useCheckbox.ts @@ -10,11 +10,11 @@ * governing permissions and limitations under the License. */ -import {AriaCheckboxProps} from '@react-types/checkbox'; +import {AriaCheckboxProps} from '@react-types-nutrient/checkbox'; import {InputHTMLAttributes, LabelHTMLAttributes, useEffect} from 'react'; import {mergeProps} from '@react-aria-nutrient/utils'; import {privateValidationStateProp, useFormValidationState} from '@react-stately/form'; -import {RefObject, ValidationResult} from '@react-types/shared'; +import {RefObject, ValidationResult} from '@react-types-nutrient/shared'; import {ToggleState} from '@react-stately/toggle'; import {useFormValidation} from '@react-aria-nutrient/form'; import {usePress} from '@react-aria-nutrient/interactions'; diff --git a/packages/@react-aria/checkbox/src/useCheckboxGroup.ts b/packages/@react-aria/checkbox/src/useCheckboxGroup.ts index b9e88c68f8a..9a58d3172d0 100644 --- a/packages/@react-aria/checkbox/src/useCheckboxGroup.ts +++ b/packages/@react-aria/checkbox/src/useCheckboxGroup.ts @@ -10,10 +10,10 @@ * governing permissions and limitations under the License. */ -import {AriaCheckboxGroupProps} from '@react-types/checkbox'; +import {AriaCheckboxGroupProps} from '@react-types-nutrient/checkbox'; import {checkboxGroupData} from './utils'; import {CheckboxGroupState} from '@react-stately/checkbox'; -import {DOMAttributes, ValidationResult} from '@react-types/shared'; +import {DOMAttributes, ValidationResult} from '@react-types-nutrient/shared'; import {filterDOMProps, mergeProps} from '@react-aria-nutrient/utils'; import {useField} from '@react-aria-nutrient/label'; import {useFocusWithin} from '@react-aria-nutrient/interactions'; diff --git a/packages/@react-aria/checkbox/src/useCheckboxGroupItem.ts b/packages/@react-aria/checkbox/src/useCheckboxGroupItem.ts index 41a66b79a7d..dccb66060ca 100644 --- a/packages/@react-aria/checkbox/src/useCheckboxGroupItem.ts +++ b/packages/@react-aria/checkbox/src/useCheckboxGroupItem.ts @@ -10,12 +10,12 @@ * governing permissions and limitations under the License. */ -import {AriaCheckboxGroupItemProps} from '@react-types/checkbox'; +import {AriaCheckboxGroupItemProps} from '@react-types-nutrient/checkbox'; import {CheckboxAria, useCheckbox} from './useCheckbox'; import {checkboxGroupData} from './utils'; import {CheckboxGroupState} from '@react-stately/checkbox'; import {DEFAULT_VALIDATION_RESULT, privateValidationStateProp, useFormValidationState} from '@react-stately/form'; -import {RefObject, ValidationResult} from '@react-types/shared'; +import {RefObject, ValidationResult} from '@react-types-nutrient/shared'; import {useEffect, useRef} from 'react'; import {useToggleState} from '@react-stately/toggle'; diff --git a/packages/@react-aria/checkbox/test/useCheckboxGroup.test.tsx b/packages/@react-aria/checkbox/test/useCheckboxGroup.test.tsx index 7d904b87cab..8b35167a1f1 100644 --- a/packages/@react-aria/checkbox/test/useCheckboxGroup.test.tsx +++ b/packages/@react-aria/checkbox/test/useCheckboxGroup.test.tsx @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {AriaCheckboxGroupItemProps, AriaCheckboxGroupProps} from '@react-types/checkbox'; +import {AriaCheckboxGroupItemProps, AriaCheckboxGroupProps} from '@react-types-nutrient/checkbox'; import {CheckboxGroupState, useCheckboxGroupState} from '@react-stately/checkbox'; import {pointerMap, render} from '@react-spectrum/test-utils-internal'; import React, {useRef} from 'react'; diff --git a/packages/@react-aria/collections/package.json b/packages/@react-aria/collections/package.json index 6b452056180..c20667e5df3 100644 --- a/packages/@react-aria/collections/package.json +++ b/packages/@react-aria/collections/package.json @@ -25,7 +25,7 @@ "@react-aria-nutrient/interactions": "^3.24.1", "@react-aria-nutrient/ssr": "^3.9.7", "@react-aria-nutrient/utils": "^3.28.1", - "@react-types/shared": "^3.28.0", + "@react-types-nutrient/shared": "^3.28.0", "@swc/helpers": "^0.5.0", "use-sync-external-store": "^1.4.0" }, diff --git a/packages/@react-aria/collections/src/BaseCollection.ts b/packages/@react-aria/collections/src/BaseCollection.ts index ac655733c6e..ef147b0980d 100644 --- a/packages/@react-aria/collections/src/BaseCollection.ts +++ b/packages/@react-aria/collections/src/BaseCollection.ts @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {Collection as ICollection, Key, Node} from '@react-types/shared'; +import {Collection as ICollection, Key, Node} from '@react-types-nutrient/shared'; import {ReactElement, ReactNode} from 'react'; export type Mutable = { diff --git a/packages/@react-aria/collections/src/CollectionBuilder.tsx b/packages/@react-aria/collections/src/CollectionBuilder.tsx index 6eb8a025e08..17c030ee166 100644 --- a/packages/@react-aria/collections/src/CollectionBuilder.tsx +++ b/packages/@react-aria/collections/src/CollectionBuilder.tsx @@ -15,7 +15,7 @@ import {BaseNode, Document, ElementNode} from './Document'; import {CachedChildrenOptions, useCachedChildren} from './useCachedChildren'; import {createPortal} from 'react-dom'; import {FocusableContext} from '@react-aria-nutrient/interactions'; -import {forwardRefType, Node} from '@react-types/shared'; +import {forwardRefType, Node} from '@react-types-nutrient/shared'; import {Hidden} from './Hidden'; import React, {createContext, ForwardedRef, forwardRef, JSX, ReactElement, ReactNode, useCallback, useContext, useMemo, useRef, useState} from 'react'; import {useIsSSR} from '@react-aria-nutrient/ssr'; diff --git a/packages/@react-aria/collections/src/Document.ts b/packages/@react-aria/collections/src/Document.ts index 1385e18a413..f30dcc1db85 100644 --- a/packages/@react-aria/collections/src/Document.ts +++ b/packages/@react-aria/collections/src/Document.ts @@ -12,7 +12,7 @@ import {BaseCollection, CollectionNode, Mutable} from './BaseCollection'; import {CSSProperties, ForwardedRef, ReactElement, ReactNode} from 'react'; -import {Node} from '@react-types/shared'; +import {Node} from '@react-types-nutrient/shared'; // This Collection implementation is perhaps a little unusual. It works by rendering the React tree into a // Portal to a fake DOM implementation. This gives us efficient access to the tree of rendered objects, and diff --git a/packages/@react-aria/collections/src/Hidden.tsx b/packages/@react-aria/collections/src/Hidden.tsx index ca2c2c3a605..686b47a3dc8 100644 --- a/packages/@react-aria/collections/src/Hidden.tsx +++ b/packages/@react-aria/collections/src/Hidden.tsx @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {forwardRefType} from '@react-types/shared'; +import {forwardRefType} from '@react-types-nutrient/shared'; import React, {createContext, forwardRef, ReactElement, ReactNode, useContext} from 'react'; // React doesn't understand the