Skip to content

chore: Rename @react-types/* to @react-types-nutrient/* #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion packages/@adobe/react-spectrum/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/@adobe/react-spectrum/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
4 changes: 2 additions & 2 deletions packages/@react-aria/actiongroup/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-aria/actiongroup/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
4 changes: 2 additions & 2 deletions packages/@react-aria/actiongroup/src/useActionGroup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-aria/actiongroup/src/useActionGroupItem.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
6 changes: 3 additions & 3 deletions packages/@react-aria/autocomplete/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-aria/autocomplete/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
2 changes: 1 addition & 1 deletion packages/@react-aria/autocomplete/src/useAutocomplete.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-aria/breadcrumbs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-aria/breadcrumbs/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
4 changes: 2 additions & 2 deletions packages/@react-aria/breadcrumbs/src/useBreadcrumbItem.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-aria/breadcrumbs/src/useBreadcrumbs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-aria/button/docs/useButton.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-aria/button/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-aria/button/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
4 changes: 2 additions & 2 deletions packages/@react-aria/button/src/useButton.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
4 changes: 2 additions & 2 deletions packages/@react-aria/button/src/useToggleButton.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<E extends ElementType> extends Omit<AriaToggleButtonProps<E>, 'children'> {}
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-aria/button/src/useToggleButtonGroup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-aria/button/stories/useButton.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 '../';

Expand Down
6 changes: 3 additions & 3 deletions packages/@react-aria/calendar/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-aria/calendar/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
2 changes: 1 addition & 1 deletion packages/@react-aria/calendar/src/useCalendar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
6 changes: 3 additions & 3 deletions packages/@react-aria/calendar/src/useCalendarBase.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-aria/calendar/src/useCalendarCell.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-aria/calendar/src/useCalendarGrid.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-aria/calendar/src/useRangeCalendar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-aria/checkbox/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-aria/checkbox/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
4 changes: 2 additions & 2 deletions packages/@react-aria/checkbox/src/useCheckbox.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-aria/checkbox/src/useCheckboxGroup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-aria/checkbox/src/useCheckboxGroupItem.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-aria/collections/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-aria/collections/src/BaseCollection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<T> = {
Expand Down
Loading