diff --git a/.storybook-s2/docs/typography.js b/.storybook-s2/docs/typography.js index ddb37b14e2c..84b709b59db 100644 --- a/.storybook-s2/docs/typography.js +++ b/.storybook-s2/docs/typography.js @@ -1,6 +1,6 @@ import { style } from '../../packages/@react-spectrum/s2/style/spectrum-theme' with {type: 'macro'}; import {Link as S2Link} from '@react-spectrum/s2'; -import {useFocusRing, useHover} from 'react-aria'; +import {useFocusRing, useHover} from '@react-aria-nutrient/react-aria'; function AnchorLink({id, isHovered}) { let { isFocusVisible, focusProps } = useFocusRing({within: true}); diff --git a/lib/yarn-plugin-rsp-duplicates.js b/lib/yarn-plugin-rsp-duplicates.js index 1ca268edbd1..e58386a225f 100644 --- a/lib/yarn-plugin-rsp-duplicates.js +++ b/lib/yarn-plugin-rsp-duplicates.js @@ -24,7 +24,7 @@ module.exports = { let packages = new Map(); let hasRSP = false; for (const pkg of project.storedPackages.values()) { - if (!structUtils.isVirtualLocator(pkg) && (pkg.scope === 'react-aria' || pkg.scope === 'react-spectrum' || pkg.scope === 'react-stately')) { + if (!structUtils.isVirtualLocator(pkg) && (pkg.scope === '@react-aria-nutrient/react-aria' || pkg.scope === 'react-spectrum' || pkg.scope === 'react-stately')) { let key = `@${pkg.scope}/${pkg.name}`; if (!packages.has(key)) { packages.set(key, new Set([pkg.version])); diff --git a/packages/@react-aria/autocomplete/docs/useSearchAutocomplete.mdx b/packages/@react-aria/autocomplete/docs/useSearchAutocomplete.mdx index a9d6ebe2d96..68f14efc354 100644 --- a/packages/@react-aria/autocomplete/docs/useSearchAutocomplete.mdx +++ b/packages/@react-aria/autocomplete/docs/useSearchAutocomplete.mdx @@ -204,7 +204,7 @@ See [usePopover](usePopover.html) for more examples of popovers. Show code ```tsx example export=true render=false -import type {AriaPopoverProps} from 'react-aria'; +import type {AriaPopoverProps} from '@react-aria-nutrient/react-aria'; import type {OverlayTriggerState} from 'react-stately'; import {usePopover, Overlay, DismissButton} from '@react-aria-nutrient/overlays'; diff --git a/packages/@react-aria/combobox/docs/useComboBox.mdx b/packages/@react-aria/combobox/docs/useComboBox.mdx index 843bfd09090..402226f4931 100644 --- a/packages/@react-aria/combobox/docs/useComboBox.mdx +++ b/packages/@react-aria/combobox/docs/useComboBox.mdx @@ -231,7 +231,7 @@ See [usePopover](usePopover.html) for more examples of popovers. Show code ```tsx example export=true render=false -import type {AriaPopoverProps} from 'react-aria'; +import type {AriaPopoverProps} from '@react-aria-nutrient/react-aria'; import type {OverlayTriggerState} from 'react-stately'; import {usePopover, Overlay, DismissButton} from '@react-aria-nutrient/overlays'; diff --git a/packages/@react-aria/datepicker/docs/useDatePicker.mdx b/packages/@react-aria/datepicker/docs/useDatePicker.mdx index a80796f33c7..02f6e448aa6 100644 --- a/packages/@react-aria/datepicker/docs/useDatePicker.mdx +++ b/packages/@react-aria/datepicker/docs/useDatePicker.mdx @@ -244,7 +244,7 @@ See [usePopover](usePopover.html) for more examples of popovers. Show code ```tsx example export=true render=false -import type {AriaPopoverProps} from 'react-aria'; +import type {AriaPopoverProps} from '@react-aria-nutrient/react-aria'; import type {OverlayTriggerState} from 'react-stately'; import {usePopover, Overlay, DismissButton} from '@react-aria-nutrient/overlays'; diff --git a/packages/@react-aria/datepicker/docs/useDateRangePicker.mdx b/packages/@react-aria/datepicker/docs/useDateRangePicker.mdx index 85b583ad187..adbf21f397c 100644 --- a/packages/@react-aria/datepicker/docs/useDateRangePicker.mdx +++ b/packages/@react-aria/datepicker/docs/useDateRangePicker.mdx @@ -256,7 +256,7 @@ See [usePopover](usePopover.html) for more examples of popovers. Show code ```tsx example export=true render=false -import type {AriaPopoverProps} from 'react-aria'; +import type {AriaPopoverProps} from '@react-aria-nutrient/react-aria'; import type {OverlayTriggerState} from 'react-stately'; import {usePopover, Overlay, DismissButton} from '@react-aria-nutrient/overlays'; diff --git a/packages/@react-aria/disclosure/docs/useDisclosure.mdx b/packages/@react-aria/disclosure/docs/useDisclosure.mdx index e7481c91b51..c9acadbdcad 100644 --- a/packages/@react-aria/disclosure/docs/useDisclosure.mdx +++ b/packages/@react-aria/disclosure/docs/useDisclosure.mdx @@ -72,7 +72,7 @@ This example displays a basic disclosure with a button that toggles the visibili import {useDisclosureState} from '@react-stately/disclosure'; import {useDisclosure} from '@react-aria-nutrient/disclosure'; import {useButton} from '@react-aria-nutrient/button'; -import {mergeProps, useFocusRing} from 'react-aria'; +import {mergeProps, useFocusRing} from '@react-aria-nutrient/react-aria'; function Disclosure(props) { let state = useDisclosureState(props); diff --git a/packages/@react-aria/menu/docs/useMenu.mdx b/packages/@react-aria/menu/docs/useMenu.mdx index 7a6d7967d28..5954432b9e6 100644 --- a/packages/@react-aria/menu/docs/useMenu.mdx +++ b/packages/@react-aria/menu/docs/useMenu.mdx @@ -267,7 +267,7 @@ See [usePopover](usePopover.html) for more examples of popovers. Show code ```tsx example export=true render=false -import type {AriaPopoverProps} from 'react-aria'; +import type {AriaPopoverProps} from '@react-aria-nutrient/react-aria'; import type {OverlayTriggerState} from 'react-stately'; import {usePopover, Overlay, DismissButton} from '@react-aria-nutrient/overlays'; diff --git a/packages/@react-aria/overlays/docs/usePopover.mdx b/packages/@react-aria/overlays/docs/usePopover.mdx index 775798315f6..03e84d57756 100644 --- a/packages/@react-aria/overlays/docs/usePopover.mdx +++ b/packages/@react-aria/overlays/docs/usePopover.mdx @@ -81,7 +81,7 @@ The `Popover` component uses an < also hides content outside the popover from screen readers, which is important since the surrounding content won't be in context of the original trigger due to the portal. To allow screen reader users to dismiss the popover without a keyboard (e.g. on mobile), visually hidden <> elements are added at the start and end of the popover. An underlay is also used to prevent scrolling and interacting with elements outside the popover with a pointer, to avoid unintentially repositioning or closing it. ```tsx example export=true render=false -import type {AriaPopoverProps} from 'react-aria'; +import type {AriaPopoverProps} from '@react-aria-nutrient/react-aria'; import type {OverlayTriggerState} from 'react-stately'; import {usePopover, Overlay, DismissButton} from '@react-aria-nutrient/overlays'; diff --git a/packages/@react-aria/select/docs/useSelect.mdx b/packages/@react-aria/select/docs/useSelect.mdx index 70ada660b95..05d43fbde51 100644 --- a/packages/@react-aria/select/docs/useSelect.mdx +++ b/packages/@react-aria/select/docs/useSelect.mdx @@ -208,7 +208,7 @@ See [usePopover](usePopover.html) for more examples of popovers. Show code ```tsx example export=true render=false -import type {AriaPopoverProps} from 'react-aria'; +import type {AriaPopoverProps} from '@react-aria-nutrient/react-aria'; import type {OverlayTriggerState} from 'react-stately'; import {usePopover, Overlay, DismissButton} from '@react-aria-nutrient/overlays'; diff --git a/packages/@react-aria/ssr/src/SSRProvider.tsx b/packages/@react-aria/ssr/src/SSRProvider.tsx index 633368d1bcb..1bb3d413cd5 100644 --- a/packages/@react-aria/ssr/src/SSRProvider.tsx +++ b/packages/@react-aria/ssr/src/SSRProvider.tsx @@ -152,14 +152,14 @@ function useLegacySSRSafeId(defaultId?: string): string { } let counter = useCounter(!!defaultId); - let prefix = ctx === defaultContext && process.env.NODE_ENV === 'test' ? 'react-aria' : `react-aria${ctx.prefix}`; + let prefix = ctx === defaultContext && process.env.NODE_ENV === 'test' ? '@react-aria-nutrient/react-aria' : `react-aria${ctx.prefix}`; return defaultId || `${prefix}-${counter}`; } function useModernSSRSafeId(defaultId?: string): string { let id = React.useId(); let [didSSR] = useState(useIsSSR()); - let prefix = didSSR || process.env.NODE_ENV === 'test' ? 'react-aria' : `react-aria${defaultContext.prefix}`; + let prefix = didSSR || process.env.NODE_ENV === 'test' ? '@react-aria-nutrient/react-aria' : `react-aria${defaultContext.prefix}`; return defaultId || `${prefix}-${id}`; } diff --git a/packages/@react-aria/ssr/test/SSRProvider.test.js b/packages/@react-aria/ssr/test/SSRProvider.test.js index 7517e8e7817..1c635e0a6fa 100644 --- a/packages/@react-aria/ssr/test/SSRProvider.test.js +++ b/packages/@react-aria/ssr/test/SSRProvider.test.js @@ -30,7 +30,7 @@ describe('SSRProvider', function () { let divs = tree.getAllByTestId('test'); if (React.useId) { - expect(divs[0].id.startsWith('react-aria')).toBe(true); + expect(divs[0].id.startsWith('@react-aria-nutrient/react-aria')).toBe(true); expect(divs[0].id).not.toBe(divs[1].id); } else { expect(divs[0].id).toBe('react-aria-1'); @@ -129,7 +129,7 @@ describe('SSRProvider', function () { let env = process.env.NODE_ENV; process.env.NODE_ENV = 'test'; let tree = render(); - expect(/^react-aria-/.test(tree.getByTestId('test').id)).toBe(true); + expect(/^@react-aria-nutrient\/react-aria-/.test(tree.getByTestId('test').id)).toBe(true); process.env.NODE_ENV = env; }); }); diff --git a/packages/@react-aria/table/stories/example-docs.tsx b/packages/@react-aria/table/stories/example-docs.tsx index 76d94919453..3d298ab6610 100644 --- a/packages/@react-aria/table/stories/example-docs.tsx +++ b/packages/@react-aria/table/stories/example-docs.tsx @@ -14,7 +14,7 @@ import ariaStyles from './docs-example.css'; import {classNames} from '@react-spectrum/utils'; import {mergeProps} from '@react-aria-nutrient/utils'; import React, {useCallback, useRef} from 'react'; -import {useButton} from 'react-aria'; +import {useButton} from '@react-aria-nutrient/react-aria'; import {useFocusRing} from '@react-aria-nutrient/focus'; import {useTable, useTableCell, useTableColumnHeader, useTableColumnResize, useTableHeaderRow, useTableRow, useTableRowGroup} from '@react-aria-nutrient/table'; import {useTableColumnResizeState, useTableState} from '@react-stately/table'; diff --git a/packages/@react-aria/tabs/docs/useTabList.mdx b/packages/@react-aria/tabs/docs/useTabList.mdx index 46f2362a7d6..60805b696c3 100644 --- a/packages/@react-aria/tabs/docs/useTabList.mdx +++ b/packages/@react-aria/tabs/docs/useTabList.mdx @@ -391,7 +391,7 @@ This example uses [React Router](https://reactrouter.com/en/main) to setup route ```tsx import {useLocation, useNavigate, BrowserRouter, Routes, Route} from 'react-router-dom'; -import {RouterProvider} from 'react-aria'; +import {RouterProvider} from '@react-aria-nutrient/react-aria'; function AppTabs() { let {pathname} = useLocation(); diff --git a/packages/@react-aria/toast/stories/Example.tsx b/packages/@react-aria/toast/stories/Example.tsx index 1d79d62cad4..9f86a592076 100644 --- a/packages/@react-aria/toast/stories/Example.tsx +++ b/packages/@react-aria/toast/stories/Example.tsx @@ -12,7 +12,7 @@ import React, {createContext, useContext, useRef} from 'react'; import {ToastState, useToastState} from '@react-stately/toast'; -import {useButton} from 'react-aria'; +import {useButton} from '@react-aria-nutrient/react-aria'; import {useToast, useToastRegion} from '../src'; const ToastContext = createContext | null>(null); diff --git a/packages/@react-spectrum/dropzone/stories/DropZone.stories.tsx b/packages/@react-spectrum/dropzone/stories/DropZone.stories.tsx index e7e35491599..cb56b6fe52a 100644 --- a/packages/@react-spectrum/dropzone/stories/DropZone.stories.tsx +++ b/packages/@react-spectrum/dropzone/stories/DropZone.stories.tsx @@ -16,7 +16,7 @@ import {Cell, Column, Row, TableBody, TableHeader, TableView} from '@react-spect import {classNames} from '@react-spectrum/utils'; import {Content} from '@react-spectrum/view'; import {Draggable} from '@react-aria-nutrient/dnd/stories/dnd.stories'; -import {DropEvent, FileDropItem, TextDropItem, useDrag} from 'react-aria'; +import {DropEvent, FileDropItem, TextDropItem, useDrag} from '@react-aria-nutrient/react-aria'; import {DropZone} from '../'; import File from '@spectrum-icons/illustrations/File'; import {FileTrigger} from 'react-aria-components'; diff --git a/packages/@react-spectrum/s2/chromatic/DropZone.stories.tsx b/packages/@react-spectrum/s2/chromatic/DropZone.stories.tsx index 3686a4b09a2..68341fc8d6b 100644 --- a/packages/@react-spectrum/s2/chromatic/DropZone.stories.tsx +++ b/packages/@react-spectrum/s2/chromatic/DropZone.stories.tsx @@ -14,7 +14,7 @@ import {Button, ButtonGroup, Content, DropZone, FileTrigger, Heading, Illustrate import Cloud from '../spectrum-illustrations/linear/Cloud'; import CloudUpload from '../spectrum-illustrations/gradient/generic1/CloudUpload'; import DropToUpload from '../spectrum-illustrations/linear/DropToUpload'; -import {FocusRing, mergeProps, useButton, useClipboard, useDrag} from 'react-aria'; +import {FocusRing, mergeProps, useButton, useClipboard, useDrag} from '@react-aria-nutrient/react-aria'; import type {Meta} from '@storybook/react'; import React, {useState} from 'react'; import {style} from '../style/spectrum-theme' with { type: 'macro' }; diff --git a/packages/@react-spectrum/s2/package.json b/packages/@react-spectrum/s2/package.json index cabf015e2c6..5884901d121 100644 --- a/packages/@react-spectrum/s2/package.json +++ b/packages/@react-spectrum/s2/package.json @@ -135,6 +135,7 @@ "@react-aria-nutrient/i18n": "^3.12.7", "@react-aria-nutrient/interactions": "^3.24.1", "@react-aria-nutrient/live-announcer": "^3.4.1", + "@react-aria-nutrient/react-aria": "^3.38.1", "@react-aria-nutrient/utils": "^3.28.1", "@react-spectrum/utils": "^3.12.3", "@react-stately/layout": "^4.2.1", @@ -146,7 +147,6 @@ "@react-types/table": "^3.11.0", "@react-types/textfield": "^3.12.0", "csstype": "^3.0.2", - "react-aria": "^3.38.1", "react-aria-components": "^1.7.1" }, "peerDependencies": { diff --git a/packages/@react-spectrum/s2/src/ActionBar.tsx b/packages/@react-spectrum/s2/src/ActionBar.tsx index cef6927ae38..bdbb5aa4ddf 100644 --- a/packages/@react-spectrum/s2/src/ActionBar.tsx +++ b/packages/@react-spectrum/s2/src/ActionBar.tsx @@ -16,7 +16,7 @@ import {CloseButton} from './CloseButton'; import {ContextValue, SlotProps} from 'react-aria-components'; import {createContext, ForwardedRef, forwardRef, ReactElement, ReactNode, RefObject, useCallback, useEffect, useMemo, useRef, useState} from 'react'; import {DOMRef, DOMRefValue, Key} from '@react-types/shared'; -import {FocusScope, useKeyboard} from 'react-aria'; +import {FocusScope, useKeyboard} from '@react-aria-nutrient/react-aria'; // @ts-ignore import intlMessages from '../intl/*.json'; import {style} from '../style' with {type: 'macro'}; diff --git a/packages/@react-spectrum/s2/src/AvatarGroup.tsx b/packages/@react-spectrum/s2/src/AvatarGroup.tsx index 67a6010d52d..80b2cbc914c 100644 --- a/packages/@react-spectrum/s2/src/AvatarGroup.tsx +++ b/packages/@react-spectrum/s2/src/AvatarGroup.tsx @@ -18,7 +18,7 @@ import {filterDOMProps} from '@react-aria-nutrient/utils'; import {getAllowedOverrides, StylesPropWithoutWidth, UnsafeStyles} from './style-utils' with {type: 'macro'}; import {style} from '../style' with {type: 'macro'}; import {useDOMRef} from '@react-spectrum/utils'; -import {useLabel} from 'react-aria'; +import {useLabel} from '@react-aria-nutrient/react-aria'; import {useSpectrumContextProps} from './useSpectrumContextProps'; export interface AvatarGroupProps extends UnsafeStyles, DOMProps, AriaLabelingProps, SlotProps { diff --git a/packages/@react-spectrum/s2/src/Breadcrumbs.tsx b/packages/@react-spectrum/s2/src/Breadcrumbs.tsx index 6620eb66476..fe0daf9dae5 100644 --- a/packages/@react-spectrum/s2/src/Breadcrumbs.tsx +++ b/packages/@react-spectrum/s2/src/Breadcrumbs.tsx @@ -23,7 +23,7 @@ import { Provider, Breadcrumbs as RACBreadcrumbs } from 'react-aria-components'; -import {AriaBreadcrumbItemProps, useLocale} from 'react-aria'; +import {AriaBreadcrumbItemProps, useLocale} from '@react-aria-nutrient/react-aria'; import ChevronIcon from '../ui-icons/Chevron'; import {Collection, DOMRef, DOMRefValue, LinkDOMProps, Node} from '@react-types/shared'; import {createContext, forwardRef, Fragment, ReactNode, RefObject, useCallback, useContext, useEffect, useMemo, useRef, useState} from 'react'; diff --git a/packages/@react-spectrum/s2/src/ComboBox.tsx b/packages/@react-spectrum/s2/src/ComboBox.tsx index 4a9d8f96148..d541ad7206c 100644 --- a/packages/@react-spectrum/s2/src/ComboBox.tsx +++ b/packages/@react-spectrum/s2/src/ComboBox.tsx @@ -52,7 +52,7 @@ import {HelpTextProps, SpectrumLabelableProps} from '@react-types/shared'; import {IconContext} from './Icon'; import {menu} from './Picker'; import {mergeRefs, useResizeObserver} from '@react-aria-nutrient/utils'; -import {Placement} from 'react-aria'; +import {Placement} from '@react-aria-nutrient/react-aria'; import {PopoverBase} from './Popover'; import {pressScale} from './pressScale'; import {TextFieldRef} from '@react-types/textfield'; diff --git a/packages/@react-spectrum/s2/src/InlineAlert.tsx b/packages/@react-spectrum/s2/src/InlineAlert.tsx index 3d6b0a86132..d105de70b19 100644 --- a/packages/@react-spectrum/s2/src/InlineAlert.tsx +++ b/packages/@react-spectrum/s2/src/InlineAlert.tsx @@ -25,7 +25,7 @@ import InfoCircle from '../s2wf-icons/S2_Icon_InfoCircle_20_N.svg'; import intlMessages from '../intl/*.json'; import NoticeSquare from '../s2wf-icons/S2_Icon_AlertDiamond_20_N.svg'; import {useDOMRef} from '@react-spectrum/utils'; -import {useFocusRing} from 'react-aria'; +import {useFocusRing} from '@react-aria-nutrient/react-aria'; import {useLocalizedStringFormatter} from '@react-aria-nutrient/i18n'; import {useSpectrumContextProps} from './useSpectrumContextProps'; diff --git a/packages/@react-spectrum/s2/src/Menu.tsx b/packages/@react-spectrum/s2/src/Menu.tsx index 40186bde762..3e1374175bd 100644 --- a/packages/@react-spectrum/s2/src/Menu.tsx +++ b/packages/@react-spectrum/s2/src/Menu.tsx @@ -42,7 +42,7 @@ import {IconContext} from './Icon'; // chevron right removed?? import {ImageContext} from './Image'; import LinkOutIcon from '../ui-icons/LinkOut'; import {mergeStyles} from '../style/runtime'; -import {Placement, useLocale} from 'react-aria'; +import {Placement, useLocale} from '@react-aria-nutrient/react-aria'; import {PopoverBase} from './Popover'; import {PressResponder} from '@react-aria-nutrient/interactions'; import {pressScale} from './pressScale'; diff --git a/packages/@react-spectrum/s2/src/NumberField.tsx b/packages/@react-spectrum/s2/src/NumberField.tsx index a7de96d7166..d07a83404e9 100644 --- a/packages/@react-spectrum/s2/src/NumberField.tsx +++ b/packages/@react-spectrum/s2/src/NumberField.tsx @@ -32,7 +32,7 @@ import {FormContext} from './Form'; import {HelpTextProps, SpectrumLabelableProps} from '@react-types/shared'; import {pressScale} from './pressScale'; import {TextFieldRef} from '@react-types/textfield'; -import {useButton, useFocusRing, useHover} from 'react-aria'; +import {useButton, useFocusRing, useHover} from '@react-aria-nutrient/react-aria'; import {useSpectrumContextProps} from './useSpectrumContextProps'; diff --git a/packages/@react-spectrum/s2/src/Picker.tsx b/packages/@react-spectrum/s2/src/Picker.tsx index ed363b4a04b..0b77da26f6f 100644 --- a/packages/@react-spectrum/s2/src/Picker.tsx +++ b/packages/@react-spectrum/s2/src/Picker.tsx @@ -56,7 +56,7 @@ import {HeaderContext, HeadingContext, Text, TextContext} from './Content'; import {IconContext} from './Icon'; // @ts-ignore import intlMessages from '../intl/*.json'; -import {Placement} from 'react-aria'; +import {Placement} from '@react-aria-nutrient/react-aria'; import {PopoverBase} from './Popover'; import {PressResponder} from '@react-aria-nutrient/interactions'; import {pressScale} from './pressScale'; diff --git a/packages/@react-spectrum/s2/src/TableView.tsx b/packages/@react-spectrum/s2/src/TableView.tsx index 876023d0a75..6c3f96a73b7 100644 --- a/packages/@react-spectrum/s2/src/TableView.tsx +++ b/packages/@react-spectrum/s2/src/TableView.tsx @@ -68,7 +68,7 @@ import {useLoadMore} from '@react-aria-nutrient/utils'; import {useLocalizedStringFormatter} from '@react-aria-nutrient/i18n'; import {useScale} from './utils'; import {useSpectrumContextProps} from './useSpectrumContextProps'; -import {VisuallyHidden} from 'react-aria'; +import {VisuallyHidden} from '@react-aria-nutrient/react-aria'; interface S2TableProps { /** Whether the Table should be displayed with a quiet style. */ diff --git a/packages/@react-spectrum/s2/src/TabsPicker.tsx b/packages/@react-spectrum/s2/src/TabsPicker.tsx index f417bba8859..7b4eaf1bae4 100644 --- a/packages/@react-spectrum/s2/src/TabsPicker.tsx +++ b/packages/@react-spectrum/s2/src/TabsPicker.tsx @@ -44,7 +44,7 @@ import {FocusableRef, FocusableRefValue, SpectrumLabelableProps} from '@react-ty import {forwardRefType} from './types'; import {HeaderContext, HeadingContext, Text, TextContext} from './Content'; import {IconContext} from './Icon'; -import {Placement} from 'react-aria'; +import {Placement} from '@react-aria-nutrient/react-aria'; import {PopoverBase} from './Popover'; import {pressScale} from './pressScale'; import {raw} from '../style/style-macro' with {type: 'macro'}; diff --git a/packages/@react-spectrum/s2/src/TreeView.tsx b/packages/@react-spectrum/s2/src/TreeView.tsx index 0973a5a7872..57fca20b621 100644 --- a/packages/@react-spectrum/s2/src/TreeView.tsx +++ b/packages/@react-spectrum/s2/src/TreeView.tsx @@ -38,7 +38,7 @@ import {raw} from '../style/style-macro' with {type: 'macro'}; import React, {createContext, forwardRef, JSXElementConstructor, ReactElement, ReactNode, useContext, useRef} from 'react'; import {TextContext} from './Content'; import {useDOMRef} from '@react-spectrum/utils'; -import {useLocale} from 'react-aria'; +import {useLocale} from '@react-aria-nutrient/react-aria'; import {useScale} from './utils'; interface S2TreeProps { diff --git a/packages/@react-spectrum/s2/src/useSpectrumContextProps.ts b/packages/@react-spectrum/s2/src/useSpectrumContextProps.ts index 8747713acb1..454964ab714 100644 --- a/packages/@react-spectrum/s2/src/useSpectrumContextProps.ts +++ b/packages/@react-spectrum/s2/src/useSpectrumContextProps.ts @@ -12,7 +12,7 @@ import {Context, ForwardedRef, useMemo} from 'react'; import {ContextValue, SlotProps, useSlottedContext} from 'react-aria-components'; -import {mergeProps, useObjectRef} from 'react-aria'; +import {mergeProps, useObjectRef} from '@react-aria-nutrient/react-aria'; import {mergeRefs} from '@react-aria-nutrient/utils'; import {mergeStyles} from '../style/runtime'; import {RefObject} from '@react-types/shared'; diff --git a/packages/@react-spectrum/s2/stories/Accordion.stories.tsx b/packages/@react-spectrum/s2/stories/Accordion.stories.tsx index 93a9ef16ad5..04ac9896d2a 100644 --- a/packages/@react-spectrum/s2/stories/Accordion.stories.tsx +++ b/packages/@react-spectrum/s2/stories/Accordion.stories.tsx @@ -11,7 +11,7 @@ */ import {Accordion, ActionButton, Disclosure, DisclosureHeader, DisclosurePanel, DisclosureTitle, TextField} from '../src'; -import {Key} from 'react-aria'; +import {Key} from '@react-aria-nutrient/react-aria'; import type {Meta, StoryObj} from '@storybook/react'; import NewIcon from '../s2wf-icons/S2_Icon_New_20_N.svg'; import React from 'react'; diff --git a/packages/@react-spectrum/s2/stories/ActionButton.stories.tsx b/packages/@react-spectrum/s2/stories/ActionButton.stories.tsx index 13ee3788e26..2407621a579 100644 --- a/packages/@react-spectrum/s2/stories/ActionButton.stories.tsx +++ b/packages/@react-spectrum/s2/stories/ActionButton.stories.tsx @@ -18,7 +18,7 @@ import type {Meta, StoryObj} from '@storybook/react'; import NewIcon from '../s2wf-icons/S2_Icon_New_20_N.svg'; import {style} from '../style' with { type: 'macro' }; import './unsafe.css'; -import {useNumberFormatter} from 'react-aria'; +import {useNumberFormatter} from '@react-aria-nutrient/react-aria'; const meta: Meta = { component: ActionButton, diff --git a/packages/@react-spectrum/s2/stories/Breadcrumbs.stories.tsx b/packages/@react-spectrum/s2/stories/Breadcrumbs.stories.tsx index ccdde7c8ee3..79b5bfc9107 100644 --- a/packages/@react-spectrum/s2/stories/Breadcrumbs.stories.tsx +++ b/packages/@react-spectrum/s2/stories/Breadcrumbs.stories.tsx @@ -55,7 +55,7 @@ export const Example = (args: any) => ( let items = [ {id: 'home', name: 'Home'}, - {id: 'react-aria', name: 'React Aria'}, + {id: '@react-aria-nutrient/react-aria', name: 'React Aria'}, {id: 'breadcrumbs', name: 'Breadcrumbs'} ]; export const WithActions = (args: any) => ( diff --git a/packages/@react-spectrum/s2/stories/DropZone.stories.tsx b/packages/@react-spectrum/s2/stories/DropZone.stories.tsx index 5637af83b13..5133ad48857 100644 --- a/packages/@react-spectrum/s2/stories/DropZone.stories.tsx +++ b/packages/@react-spectrum/s2/stories/DropZone.stories.tsx @@ -15,7 +15,7 @@ import {categorizeArgTypes} from './utils'; import Cloud from '../spectrum-illustrations/linear/Cloud'; import CloudUpload from '../spectrum-illustrations/gradient/generic1/CloudUpload'; import DropToUpload from '../spectrum-illustrations/linear/DropToUpload'; -import {FocusRing, mergeProps, useButton, useClipboard, useDrag} from 'react-aria'; +import {FocusRing, mergeProps, useButton, useClipboard, useDrag} from '@react-aria-nutrient/react-aria'; import type {Meta} from '@storybook/react'; import React, {useState} from 'react'; import {style} from '../style' with { type: 'macro' }; diff --git a/packages/@react-stately/combobox/test/useComboBoxState.test.js b/packages/@react-stately/combobox/test/useComboBoxState.test.js index 996476d4b02..15ce6f1e705 100644 --- a/packages/@react-stately/combobox/test/useComboBoxState.test.js +++ b/packages/@react-stately/combobox/test/useComboBoxState.test.js @@ -14,7 +14,7 @@ import {actHook as act, renderHook} from '@react-spectrum/test-utils-internal'; import {Item} from '@react-stately/collections'; import React from 'react'; import {useComboBoxState} from '../'; -import {useFilter} from 'react-aria'; +import {useFilter} from '@react-aria-nutrient/react-aria'; describe('useComboBoxState tests', function () { describe('open state', function () { diff --git a/packages/@react-stately/tooltip/test/useTooltipTriggerState.test.js b/packages/@react-stately/tooltip/test/useTooltipTriggerState.test.js index 6e84dd425d0..40c48c3b500 100644 --- a/packages/@react-stately/tooltip/test/useTooltipTriggerState.test.js +++ b/packages/@react-stately/tooltip/test/useTooltipTriggerState.test.js @@ -11,7 +11,7 @@ */ import {act, fireEvent, render} from '@react-spectrum/test-utils-internal'; -import {mergeProps, useTooltip, useTooltipTrigger} from 'react-aria'; +import {mergeProps, useTooltip, useTooltipTrigger} from '@react-aria-nutrient/react-aria'; import React from 'react'; import {useTooltipTriggerState} from '../src'; diff --git a/packages/dev/codemods/src/use-monopackages/src/codemod.ts b/packages/dev/codemods/src/use-monopackages/src/codemod.ts index f92f43eccd4..061f132f3b0 100644 --- a/packages/dev/codemods/src/use-monopackages/src/codemod.ts +++ b/packages/dev/codemods/src/use-monopackages/src/codemod.ts @@ -15,7 +15,7 @@ function areSpecifiersAlphabetized(specifiers: ImportSpecifier[]) { * * Works for: * - `@react-spectrum/*` -> `@adobe/react-spectrum`. - * - `@react-aria-nutrient/*` -> `react-aria`. + * - `@react-aria/*` -> `react-aria`. * - `@react-stately/*` -> `react-stately`. * * By default this will apply to all the above packages, or optionally you can specify which packages to apply this by passing a comma-separated list to the packages option: `--packages=react-aria,react-stately,react-spectrum`. diff --git a/packages/dev/docs/pages/react-aria/home/A11y.tsx b/packages/dev/docs/pages/react-aria/home/A11y.tsx index 73a14913dd5..c52f36ddd19 100644 --- a/packages/dev/docs/pages/react-aria/home/A11y.tsx +++ b/packages/dev/docs/pages/react-aria/home/A11y.tsx @@ -14,7 +14,7 @@ import {Button} from 'tailwind-starter/Button'; import {ChevronDown, WifiIcon} from 'lucide-react'; import {createPortal, flushSync} from 'react-dom'; import {Finger} from './components'; -import {Key, useDateFormatter} from 'react-aria'; +import {Key, useDateFormatter} from '@react-aria-nutrient/react-aria'; import {Label} from 'tailwind-starter/Field'; import {ListBox, Select, SelectValue} from 'react-aria-components'; import {Popover} from 'tailwind-starter/Popover'; diff --git a/packages/dev/docs/pages/react-aria/home/ExampleApp.tsx b/packages/dev/docs/pages/react-aria/home/ExampleApp.tsx index 0ecd739b676..c10603354ef 100644 --- a/packages/dev/docs/pages/react-aria/home/ExampleApp.tsx +++ b/packages/dev/docs/pages/react-aria/home/ExampleApp.tsx @@ -32,7 +32,7 @@ import {Tag, TagGroup} from 'tailwind-starter/TagGroup'; import {TextField} from 'tailwind-starter/TextField'; import {Tooltip} from 'tailwind-starter/Tooltip'; import {tv} from 'tailwind-variants'; -import {useCollator, useFilter, VisuallyHidden} from 'react-aria'; +import {useCollator, useFilter, VisuallyHidden} from '@react-aria-nutrient/react-aria'; import {useMediaQuery} from '@react-spectrum/utils'; type Plant = typeof plants[0] & {isFavorite: boolean}; diff --git a/packages/dev/docs/pages/react-aria/hooks.mdx b/packages/dev/docs/pages/react-aria/hooks.mdx index 2eb6b23ec27..a6f13bfc302 100644 --- a/packages/dev/docs/pages/react-aria/hooks.mdx +++ b/packages/dev/docs/pages/react-aria/hooks.mdx @@ -44,7 +44,7 @@ Once installed, hooks can be used from the monopackage or individual packages th ```tsx // Monopackage -import {useButton} from 'react-aria'; +import {useButton} from '@react-aria-nutrient/react-aria'; ``` ```tsx keepIndividualImports @@ -126,7 +126,7 @@ with the [useNumberFieldState](../react-stately/useNumberFieldState.html) hook f ```tsx example import {useNumberFieldState} from 'react-stately'; -import {useLocale, useNumberField} from 'react-aria'; +import {useLocale, useNumberField} from '@react-aria-nutrient/react-aria'; function NumberField(props) { let {locale} = useLocale(); diff --git a/packages/dev/docs/pages/react-aria/index.mdx b/packages/dev/docs/pages/react-aria/index.mdx index bfe5abab450..beace85e69f 100644 --- a/packages/dev/docs/pages/react-aria/index.mdx +++ b/packages/dev/docs/pages/react-aria/index.mdx @@ -576,7 +576,7 @@ function DatePickerClearButton() { ```tsx format=false -import {useCalendarGrid} from 'react-aria'; +import {useCalendarGrid} from '@react-aria-nutrient/react-aria'; // Custom calendar that displays one week at a time. function WeekCalendarGrid(props) { diff --git a/packages/dev/docs/src/DocSearch.js b/packages/dev/docs/src/DocSearch.js index d23099eea71..63a8e5e74e3 100644 --- a/packages/dev/docs/src/DocSearch.js +++ b/packages/dev/docs/src/DocSearch.js @@ -42,7 +42,7 @@ const searchOptions = { }; const sectionTitles = { - 'react-aria': 'React Aria', + '@react-aria-nutrient/react-aria': 'React Aria', 'react-spectrum': 'React Spectrum', 'react-stately': 'React Stately', 'internationalized': 'Internationalized', diff --git a/packages/dev/docs/src/ExampleCard.js b/packages/dev/docs/src/ExampleCard.js index a09872e8978..1c10b714f44 100644 --- a/packages/dev/docs/src/ExampleCard.js +++ b/packages/dev/docs/src/ExampleCard.js @@ -4,7 +4,7 @@ import {Image} from './Image'; import React from 'react'; import styles from './ExampleCard.css'; import typographyStyles from '@adobe/spectrum-css-temp/components/typography/vars.css'; -import {useId} from 'react-aria'; +import {useId} from '@react-aria-nutrient/react-aria'; export function ExampleCard(props) { let titleId = useId(); diff --git a/packages/dev/docs/src/HeaderInfo.js b/packages/dev/docs/src/HeaderInfo.js index 4ba093971e1..d99b56fee21 100644 --- a/packages/dev/docs/src/HeaderInfo.js +++ b/packages/dev/docs/src/HeaderInfo.js @@ -29,7 +29,7 @@ const monopackages = { version: rspMonopackage.version }, '@react-aria': { - importName: 'react-aria', + importName: '@react-aria-nutrient/react-aria', version: ariaMonopackage.version }, '@react-stately': { diff --git a/packages/dev/docs/src/Layout.js b/packages/dev/docs/src/Layout.js index 60f8592e172..2e812d1243c 100644 --- a/packages/dev/docs/src/Layout.js +++ b/packages/dev/docs/src/Layout.js @@ -44,7 +44,7 @@ const TLD = process.env.DOCS_ENV === 'production' : 'reactspectrum.blob.core.windows.net'; const HERO = { 'react-spectrum': heroImageSpectrum, - 'react-aria': heroImageAria, + '@react-aria-nutrient/react-aria': heroImageAria, 'react-stately': heroImageStately, 'internationalized': heroImageInternationalized }; @@ -396,7 +396,7 @@ function Nav({currentPageName, pages}) { }; let sections = []; - if (currentPageName.startsWith('react-aria') && ENABLE_PAGE_TYPES) { + if (currentPageName.startsWith('@react-aria-nutrient/react-aria') && ENABLE_PAGE_TYPES) { let {Introduction, Concepts, Guides, Interactions, Focus, Internationalization, 'Server Side Rendering': ssr, Utilities, ...hooks} = pagesByType.other; let interactions = {...pagesByType.interaction, Interactions, Focus}; let utilities = {Internationalization, 'Server Side Rendering': ssr, Utilities}; diff --git a/packages/react-aria-components/docs/Button.mdx b/packages/react-aria-components/docs/Button.mdx index 56f53734430..55b5db54396 100644 --- a/packages/react-aria-components/docs/Button.mdx +++ b/packages/react-aria-components/docs/Button.mdx @@ -407,7 +407,7 @@ This example uses [Framer Motion](https://www.framer.com/motion/) to create an ` ```tsx import type {ButtonProps} from 'react-aria-components'; import {ButtonContext, useContextProps} from 'react-aria-components'; -import {useButton} from 'react-aria'; +import {useButton} from '@react-aria-nutrient/react-aria'; import {motion} from 'framer-motion'; const AnimatedButton = React.forwardRef((props: ButtonProps, ref: React.ForwardedRef) => { diff --git a/packages/react-aria-components/docs/Calendar.mdx b/packages/react-aria-components/docs/Calendar.mdx index 92d4a6cad9c..17c21a55662 100644 --- a/packages/react-aria-components/docs/Calendar.mdx +++ b/packages/react-aria-components/docs/Calendar.mdx @@ -496,7 +496,7 @@ This example validates that the selected date is a weekday and not a weekend acc ```tsx example import {today, isWeekend} from '@internationalized/date'; -import {useLocale} from 'react-aria'; +import {useLocale} from '@react-aria-nutrient/react-aria'; function Example() { let [date, setDate] = React.useState(today(getLocalTimeZone())); @@ -834,7 +834,7 @@ Now you can combine a `Calendar` and one or more `Preset` components in a `Calen ```tsx example import {startOfWeek, startOfMonth} from '@internationalized/date'; -import {useLocale} from 'react-aria'; +import {useLocale} from '@react-aria-nutrient/react-aria'; function Example() { let {locale} = useLocale(); @@ -906,7 +906,7 @@ This example shows a `CalendarValue` component that can be placed within a `Cale ```tsx example import {CalendarStateContext} from 'react-aria-components'; -import {useDateFormatter} from 'react-aria'; +import {useDateFormatter} from '@react-aria-nutrient/react-aria'; function CalendarValue() { /*- begin highlight -*/ @@ -942,7 +942,7 @@ This example uses the ) => { // Merge the local props and ref with the ones provided via context. diff --git a/packages/react-aria-components/docs/CheckboxGroup.mdx b/packages/react-aria-components/docs/CheckboxGroup.mdx index 82eec4c5f79..79b02f19d1d 100644 --- a/packages/react-aria-components/docs/CheckboxGroup.mdx +++ b/packages/react-aria-components/docs/CheckboxGroup.mdx @@ -511,7 +511,7 @@ This example shows a `CheckboxDescription` component that accepts a checkbox in ```tsx example import {CheckboxContext} from 'react-aria-components'; -import {useId} from 'react-aria'; +import {useId} from '@react-aria-nutrient/react-aria'; interface CheckboxDescriptionProps { children?: React.ReactNode, diff --git a/packages/react-aria-components/docs/ColorArea.mdx b/packages/react-aria-components/docs/ColorArea.mdx index 1b5f3c0e7bf..5c8e861f16f 100644 --- a/packages/react-aria-components/docs/ColorArea.mdx +++ b/packages/react-aria-components/docs/ColorArea.mdx @@ -408,7 +408,7 @@ This example shows a `ColorAreaDescription` component that accepts a color wheel ```tsx example import {ColorAreaContext} from 'react-aria-components'; -import {useId} from 'react-aria'; +import {useId} from '@react-aria-nutrient/react-aria'; interface ColorAreaDescriptionProps { children?: React.ReactNode, diff --git a/packages/react-aria-components/docs/ColorSlider.mdx b/packages/react-aria-components/docs/ColorSlider.mdx index 5d63f6b85cd..92b40f3494c 100644 --- a/packages/react-aria-components/docs/ColorSlider.mdx +++ b/packages/react-aria-components/docs/ColorSlider.mdx @@ -573,7 +573,7 @@ This example shows a `ColorSliderDescription` component that accepts a color sli ```tsx example import {ColorSliderContext} from 'react-aria-components'; -import {useId} from 'react-aria'; +import {useId} from '@react-aria-nutrient/react-aria'; interface ColorSliderDescriptionProps { children?: React.ReactNode, diff --git a/packages/react-aria-components/docs/ColorWheel.mdx b/packages/react-aria-components/docs/ColorWheel.mdx index 24c8c0fd014..c011379220b 100644 --- a/packages/react-aria-components/docs/ColorWheel.mdx +++ b/packages/react-aria-components/docs/ColorWheel.mdx @@ -360,7 +360,7 @@ This example shows a `ColorWheelDescription` component that accepts a color whee ```tsx example import {ColorWheelContext} from 'react-aria-components'; -import {useId} from 'react-aria'; +import {useId} from '@react-aria-nutrient/react-aria'; interface ColorWheelDescriptionProps { children?: React.ReactNode, diff --git a/packages/react-aria-components/docs/DateField.mdx b/packages/react-aria-components/docs/DateField.mdx index 3d2063050a6..807019e1b1e 100644 --- a/packages/react-aria-components/docs/DateField.mdx +++ b/packages/react-aria-components/docs/DateField.mdx @@ -470,7 +470,7 @@ This example validates that the selected date is a weekday and not a weekend acc ```tsx example import {isWeekend} from '@internationalized/date'; -import {useLocale} from 'react-aria'; +import {useLocale} from '@react-aria-nutrient/react-aria'; function Example() { let {locale} = useLocale(); @@ -704,7 +704,7 @@ This example shows a `FieldGroup` component that renders a group of date fields ```tsx example import {DateFieldContext} from 'react-aria-components'; -import {useId} from 'react-aria'; +import {useId} from '@react-aria-nutrient/react-aria'; interface FieldGroupProps { title?: string, @@ -798,7 +798,7 @@ This example shows a `DateFormat` component that can be placed within a `DateFie ```tsx example import {DateFieldStateContext} from 'react-aria-components'; -import {useLocale} from 'react-aria'; +import {useLocale} from '@react-aria-nutrient/react-aria'; function DateFormat() { /*- begin highlight -*/ diff --git a/packages/react-aria-components/docs/DatePicker.mdx b/packages/react-aria-components/docs/DatePicker.mdx index 3721f23136d..50ca1b6e20c 100644 --- a/packages/react-aria-components/docs/DatePicker.mdx +++ b/packages/react-aria-components/docs/DatePicker.mdx @@ -616,7 +616,7 @@ This example validates that the selected date is a weekday and not a weekend acc ```tsx example import {isWeekend} from '@internationalized/date'; -import {useLocale} from 'react-aria'; +import {useLocale} from '@react-aria-nutrient/react-aria'; function Example() { let {locale} = useLocale(); @@ -1030,7 +1030,7 @@ This example shows a `FieldGroup` component that renders a group of date pickers ```tsx example import {DatePickerContext} from 'react-aria-components'; -import {useId} from 'react-aria'; +import {useId} from '@react-aria-nutrient/react-aria'; interface FieldGroupProps { title?: string, diff --git a/packages/react-aria-components/docs/DateRangePicker.mdx b/packages/react-aria-components/docs/DateRangePicker.mdx index 25d9f32471b..c257f57d50c 100644 --- a/packages/react-aria-components/docs/DateRangePicker.mdx +++ b/packages/react-aria-components/docs/DateRangePicker.mdx @@ -1119,7 +1119,7 @@ This example shows a `FieldGroup` component that renders a group of date pickers ```tsx example import {DateRangePickerContext} from 'react-aria-components'; -import {useId} from 'react-aria'; +import {useId} from '@react-aria-nutrient/react-aria'; interface FieldGroupProps { title?: string, diff --git a/packages/react-aria-components/docs/DropZone.mdx b/packages/react-aria-components/docs/DropZone.mdx index 3fa9156e577..7b62b0f857f 100644 --- a/packages/react-aria-components/docs/DropZone.mdx +++ b/packages/react-aria-components/docs/DropZone.mdx @@ -240,7 +240,7 @@ To allow the selection of files from the user's device, pass `FileTrigger` as a ```tsx example import {FileTrigger, Button} from 'react-aria-components'; -import type {FileDropItem} from 'react-aria' +import type {FileDropItem} from '@react-aria-nutrient/react-aria' function Example() { let [files, setFiles] = React.useState(null); diff --git a/packages/react-aria-components/docs/Form.mdx b/packages/react-aria-components/docs/Form.mdx index 1140097c02a..92a432917aa 100644 --- a/packages/react-aria-components/docs/Form.mdx +++ b/packages/react-aria-components/docs/Form.mdx @@ -343,7 +343,7 @@ You can also consume `FormValidationContext` in your own custom form input compo ```tsx example import type {SelectHTMLAttributes} from 'react'; import {useContext} from 'react'; -import {useId} from 'react-aria'; +import {useId} from '@react-aria-nutrient/react-aria'; function NativeSelect(props: SelectHTMLAttributes & {label: string}) { let errors = useContext(FormValidationContext); diff --git a/packages/react-aria-components/docs/GridList.mdx b/packages/react-aria-components/docs/GridList.mdx index f0f2875ea1f..608f0f65307 100644 --- a/packages/react-aria-components/docs/GridList.mdx +++ b/packages/react-aria-components/docs/GridList.mdx @@ -1837,7 +1837,7 @@ This example consumes from `CheckboxContext` in an existing styled checkbox comp import type {CheckboxProps} from 'react-aria-components'; import {CheckboxContext, useContextProps} from 'react-aria-components'; import {useToggleState} from 'react-stately'; -import {useCheckbox} from 'react-aria'; +import {useCheckbox} from '@react-aria-nutrient/react-aria'; const MyCustomCheckbox = React.forwardRef((props: CheckboxProps, ref: React.ForwardedRef) => { // Merge the local props and ref with the ones provided via context. diff --git a/packages/react-aria-components/docs/Group.mdx b/packages/react-aria-components/docs/Group.mdx index dcea7b9b810..e1d6902d692 100644 --- a/packages/react-aria-components/docs/Group.mdx +++ b/packages/react-aria-components/docs/Group.mdx @@ -208,7 +208,7 @@ This example shows a `LabeledGroup` component that accepts a label and a group a ```tsx example import {LabelContext, GroupContext} from 'react-aria-components'; -import {useId} from 'react-aria'; +import {useId} from '@react-aria-nutrient/react-aria'; function LabeledGroup({children}) { let labelId = useId(); diff --git a/packages/react-aria-components/docs/Menu.mdx b/packages/react-aria-components/docs/Menu.mdx index a79c9199edf..9679b78060e 100644 --- a/packages/react-aria-components/docs/Menu.mdx +++ b/packages/react-aria-components/docs/Menu.mdx @@ -1174,7 +1174,7 @@ This example implements a custom `OptionMenuTrigger` component that intercepts t ```tsx example render=false export=true import {ButtonContext, OverlayTriggerStateContext, PopoverContext, MenuContext, Provider} from 'react-aria-components'; import {useMenuTriggerState} from 'react-stately'; -import {useMenuTrigger} from 'react-aria'; +import {useMenuTrigger} from '@react-aria-nutrient/react-aria'; function OptionMenuTrigger(props: MenuTriggerProps) { let state = useMenuTriggerState(props); diff --git a/packages/react-aria-components/docs/RadioGroup.mdx b/packages/react-aria-components/docs/RadioGroup.mdx index 1ca9676e188..0bb46a05701 100644 --- a/packages/react-aria-components/docs/RadioGroup.mdx +++ b/packages/react-aria-components/docs/RadioGroup.mdx @@ -549,7 +549,7 @@ This example shows a `RadioDescription` component that accepts a radio in its ch ```tsx example import {RadioContext} from 'react-aria-components'; -import {useId} from 'react-aria'; +import {useId} from '@react-aria-nutrient/react-aria'; interface RadioDescriptionProps { children?: React.ReactNode, diff --git a/packages/react-aria-components/docs/RangeCalendar.mdx b/packages/react-aria-components/docs/RangeCalendar.mdx index 30ed467b70f..8d736bcdece 100644 --- a/packages/react-aria-components/docs/RangeCalendar.mdx +++ b/packages/react-aria-components/docs/RangeCalendar.mdx @@ -889,7 +889,7 @@ Now you can combine a `RangeCalendar` and one or more `Preset` components in a ` ```tsx example import {startOfWeek, endOfWeek, startOfMonth, endOfMonth} from '@internationalized/date'; -import {useLocale} from 'react-aria'; +import {useLocale} from '@react-aria-nutrient/react-aria'; function Example() { let {locale} = useLocale(); @@ -962,7 +962,7 @@ This example shows a `RangeCalendarValue` component that can be placed within a ```tsx example import {RangeCalendarStateContext} from 'react-aria-components'; -import {useDateFormatter} from 'react-aria'; +import {useDateFormatter} from '@react-aria-nutrient/react-aria'; function RangeCalendarValue() { /*- begin highlight -*/ diff --git a/packages/react-aria-components/docs/Slider.mdx b/packages/react-aria-components/docs/Slider.mdx index 10b23053674..4bfb2a5586b 100644 --- a/packages/react-aria-components/docs/Slider.mdx +++ b/packages/react-aria-components/docs/Slider.mdx @@ -554,7 +554,7 @@ This example shows a `SliderDescription` component that accepts a slider in its ```tsx example import {SliderContext} from 'react-aria-components'; -import {useId} from 'react-aria'; +import {useId} from '@react-aria-nutrient/react-aria'; interface SliderDescriptionProps { children?: React.ReactNode, diff --git a/packages/react-aria-components/docs/Switch.mdx b/packages/react-aria-components/docs/Switch.mdx index 6cb60372cf8..6a9aab24d87 100644 --- a/packages/react-aria-components/docs/Switch.mdx +++ b/packages/react-aria-components/docs/Switch.mdx @@ -312,7 +312,7 @@ This example shows a `SwitchDescription` component that accepts a switch in its ```tsx example import {SwitchContext} from 'react-aria-components'; -import {useId} from 'react-aria'; +import {useId} from '@react-aria-nutrient/react-aria'; interface SwitchDescriptionProps { children?: React.ReactNode, diff --git a/packages/react-aria-components/docs/Table.mdx b/packages/react-aria-components/docs/Table.mdx index 329ca607ddc..b874eeffecd 100644 --- a/packages/react-aria-components/docs/Table.mdx +++ b/packages/react-aria-components/docs/Table.mdx @@ -2442,7 +2442,7 @@ This example consumes from `CheckboxContext` in an existing styled checkbox comp import type {CheckboxProps} from 'react-aria-components'; import {CheckboxContext, useContextProps} from 'react-aria-components'; import {useToggleState} from 'react-stately'; -import {useCheckbox} from 'react-aria'; +import {useCheckbox} from '@react-aria-nutrient/react-aria'; const MyCustomCheckbox = React.forwardRef((props: CheckboxProps, ref: React.ForwardedRef) => { // Merge the local props and ref with the ones provided via context. diff --git a/packages/react-aria-components/docs/TextField.mdx b/packages/react-aria-components/docs/TextField.mdx index 64b09535981..5c7ff934d5c 100644 --- a/packages/react-aria-components/docs/TextField.mdx +++ b/packages/react-aria-components/docs/TextField.mdx @@ -471,7 +471,7 @@ This example shows a `FieldGroup` component that renders a group of text fields ```tsx example import {TextFieldContext} from 'react-aria-components'; -import {useId} from 'react-aria'; +import {useId} from '@react-aria-nutrient/react-aria'; interface FieldGroupProps { title?: string, diff --git a/packages/react-aria-components/docs/TimeField.mdx b/packages/react-aria-components/docs/TimeField.mdx index 4ac74ff7dfe..ecfa9fede50 100644 --- a/packages/react-aria-components/docs/TimeField.mdx +++ b/packages/react-aria-components/docs/TimeField.mdx @@ -618,7 +618,7 @@ This example shows a `FieldGroup` component that renders a group of time fields ```tsx example import {TimeFieldContext} from 'react-aria-components'; -import {useId} from 'react-aria'; +import {useId} from '@react-aria-nutrient/react-aria'; interface FieldGroupProps { title?: string, @@ -712,7 +712,7 @@ This example shows a `TimeZoneName` component that can be placed within a `TimeF ```tsx example import {TimeFieldStateContext} from 'react-aria-components'; -import {useDateFormatter} from 'react-aria'; +import {useDateFormatter} from '@react-aria-nutrient/react-aria'; function TimeZoneName() { /*- begin highlight -*/ diff --git a/packages/react-aria-components/docs/ToggleButton.mdx b/packages/react-aria-components/docs/ToggleButton.mdx index 2bb2a7a5d0a..b0206152487 100644 --- a/packages/react-aria-components/docs/ToggleButton.mdx +++ b/packages/react-aria-components/docs/ToggleButton.mdx @@ -262,7 +262,7 @@ This example uses [Framer Motion](https://www.framer.com/motion/) to create an ` import type {ToggleButtonProps} from 'react-aria-components'; import {ToggleButtonContext, useContextProps} from 'react-aria-components'; import {useToggleState} from 'react-stately'; -import {useToggleButton} from 'react-aria'; +import {useToggleButton} from '@react-aria-nutrient/react-aria'; import {motion} from 'framer-motion'; const AnimatedToggleButton = React.forwardRef((props: ToggleButtonProps, ref: React.ForwardedRef) => { diff --git a/packages/react-aria-components/docs/Tree.mdx b/packages/react-aria-components/docs/Tree.mdx index 02631611b94..317222ffb87 100644 --- a/packages/react-aria-components/docs/Tree.mdx +++ b/packages/react-aria-components/docs/Tree.mdx @@ -908,7 +908,7 @@ This example consumes from `CheckboxContext` in an existing styled checkbox comp import type {CheckboxProps, useContextProps} from 'react-aria-components'; import {CheckboxContext} from 'react-aria-components'; import {useToggleState} from 'react-stately'; -import {useCheckbox} from 'react-aria'; +import {useCheckbox} from '@react-aria-nutrient/react-aria'; const MyCustomCheckbox = React.forwardRef((props: CheckboxProps, ref: React.ForwardedRef) => { // Merge the local props and ref with the ones provided via context. diff --git a/packages/react-aria-components/docs/advanced.mdx b/packages/react-aria-components/docs/advanced.mdx index a6e590fc993..d710fea74ea 100644 --- a/packages/react-aria-components/docs/advanced.mdx +++ b/packages/react-aria-components/docs/advanced.mdx @@ -237,7 +237,7 @@ You can access the state from a parent component via the same contexts in order ```tsx import {CalendarStateContext} from 'react-aria-components'; -import {useDateFormatter} from 'react-aria'; +import {useDateFormatter} from '@react-aria-nutrient/react-aria'; import {getLocalTimeZone} from '@internationalized/date'; function CalendarValue() { @@ -289,7 +289,7 @@ This example shows how a custom checkbox could be set up using `CheckboxContext` import type {CheckboxProps} from 'react-aria-components'; import {CheckboxContext, useContextProps} from 'react-aria-components'; import {useToggleState} from 'react-stately'; -import {useCheckbox} from 'react-aria'; +import {useCheckbox} from '@react-aria-nutrient/react-aria'; const MyCheckbox = React.forwardRef((props: CheckboxProps, ref: React.ForwardedRef) => { // Merge the local props and ref with the ones provided via context. @@ -327,7 +327,7 @@ This example shows how a custom number field could be set up. First, follow the import type {NumberFieldProps} from 'react-aria-components'; import {Provider, GroupContext, InputContext, LabelContext, ButtonContext} from 'react-aria-components'; import {useNumberFieldState} from 'react-stately'; -import {useNumberField, useLocale} from 'react-aria'; +import {useNumberField, useLocale} from '@react-aria-nutrient/react-aria'; function CustomNumberField(props: NumberFieldProps) { // Follow the hook docs... diff --git a/packages/react-aria-components/package.json b/packages/react-aria-components/package.json index 5e5665d31cd..467cf9923ba 100644 --- a/packages/react-aria-components/package.json +++ b/packages/react-aria-components/package.json @@ -45,6 +45,7 @@ "@react-aria-nutrient/focus": "^3.20.1", "@react-aria-nutrient/interactions": "^3.24.1", "@react-aria-nutrient/live-announcer": "^3.4.1", + "@react-aria-nutrient/react-aria": "^3.38.1", "@react-aria-nutrient/ssr": "^3.9.7", "@react-aria-nutrient/toolbar": "3.0.0-beta.14", "@react-aria-nutrient/utils": "^3.28.1", @@ -61,7 +62,6 @@ "@react-types/table": "^3.11.0", "@swc/helpers": "^0.5.0", "client-only": "^0.0.1", - "react-aria": "^3.38.1", "react-stately": "^3.36.1", "use-sync-external-store": "^1.4.0" }, diff --git a/packages/react-aria-components/src/Breadcrumbs.tsx b/packages/react-aria-components/src/Breadcrumbs.tsx index b64e13bef3b..357c6b99f52 100644 --- a/packages/react-aria-components/src/Breadcrumbs.tsx +++ b/packages/react-aria-components/src/Breadcrumbs.tsx @@ -9,7 +9,7 @@ * OF ANY KIND, either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -import {AriaBreadcrumbsProps, useBreadcrumbs} from 'react-aria'; +import {AriaBreadcrumbsProps, useBreadcrumbs} from '@react-aria-nutrient/react-aria'; import {Collection, CollectionBuilder, createLeafComponent} from '@react-aria-nutrient/collections'; import {CollectionProps, CollectionRendererContext} from './Collection'; import {ContextValue, RenderProps, SlotProps, StyleProps, useContextProps, useRenderProps, useSlottedContext} from './utils'; diff --git a/packages/react-aria-components/src/Button.tsx b/packages/react-aria-components/src/Button.tsx index e8730b09987..1203945d8c6 100644 --- a/packages/react-aria-components/src/Button.tsx +++ b/packages/react-aria-components/src/Button.tsx @@ -19,7 +19,7 @@ import { useFocusRing, useHover, useId -} from 'react-aria'; +} from '@react-aria-nutrient/react-aria'; import { ContextValue, RenderProps, diff --git a/packages/react-aria-components/src/Calendar.tsx b/packages/react-aria-components/src/Calendar.tsx index 593d2404173..2746eef81b0 100644 --- a/packages/react-aria-components/src/Calendar.tsx +++ b/packages/react-aria-components/src/Calendar.tsx @@ -22,7 +22,7 @@ import { useLocale, useRangeCalendar, VisuallyHidden -} from 'react-aria'; +} from '@react-aria-nutrient/react-aria'; import {ButtonContext} from './Button'; import {CalendarDate, CalendarIdentifier, createCalendar, DateDuration, endOfMonth, Calendar as ICalendar, isSameDay, isSameMonth} from '@internationalized/date'; import {CalendarState, RangeCalendarState, useCalendarState, useRangeCalendarState} from 'react-stately'; diff --git a/packages/react-aria-components/src/Checkbox.tsx b/packages/react-aria-components/src/Checkbox.tsx index 3c4a0c336cd..cd74ccaff63 100644 --- a/packages/react-aria-components/src/Checkbox.tsx +++ b/packages/react-aria-components/src/Checkbox.tsx @@ -9,7 +9,7 @@ * OF ANY KIND, either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -import {AriaCheckboxGroupProps, AriaCheckboxProps, HoverEvents, mergeProps, useCheckbox, useCheckboxGroup, useCheckboxGroupItem, useFocusRing, useHover, VisuallyHidden} from 'react-aria'; +import {AriaCheckboxGroupProps, AriaCheckboxProps, HoverEvents, mergeProps, useCheckbox, useCheckboxGroup, useCheckboxGroupItem, useFocusRing, useHover, VisuallyHidden} from '@react-aria-nutrient/react-aria'; import {CheckboxContext} from './RSPContexts'; import {CheckboxGroupState, useCheckboxGroupState, useToggleState} from 'react-stately'; import {ContextValue, Provider, RACValidation, removeDataAttributes, RenderProps, SlotProps, useContextProps, useRenderProps, useSlot, useSlottedContext} from './utils'; diff --git a/packages/react-aria-components/src/ColorArea.tsx b/packages/react-aria-components/src/ColorArea.tsx index ef35eea17e9..60addf9dd10 100644 --- a/packages/react-aria-components/src/ColorArea.tsx +++ b/packages/react-aria-components/src/ColorArea.tsx @@ -1,4 +1,4 @@ -import {AriaColorAreaProps, useColorArea} from 'react-aria'; +import {AriaColorAreaProps, useColorArea} from '@react-aria-nutrient/react-aria'; import {ColorAreaContext} from './RSPContexts'; import {ColorAreaState, useColorAreaState} from 'react-stately'; import {filterDOMProps} from '@react-aria-nutrient/utils'; diff --git a/packages/react-aria-components/src/ColorField.tsx b/packages/react-aria-components/src/ColorField.tsx index e8e84ed05fc..8c4b0f5de9a 100644 --- a/packages/react-aria-components/src/ColorField.tsx +++ b/packages/react-aria-components/src/ColorField.tsx @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {AriaColorFieldProps, useColorChannelField, useColorField, useLocale} from 'react-aria'; +import {AriaColorFieldProps, useColorChannelField, useColorField, useLocale} from '@react-aria-nutrient/react-aria'; import {ColorChannel, ColorFieldState, ColorSpace, useColorChannelFieldState, useColorFieldState} from 'react-stately'; import {ColorFieldContext} from './RSPContexts'; import {FieldErrorContext} from './FieldError'; diff --git a/packages/react-aria-components/src/ColorPicker.tsx b/packages/react-aria-components/src/ColorPicker.tsx index 20fbaff1051..182a652fdf9 100644 --- a/packages/react-aria-components/src/ColorPicker.tsx +++ b/packages/react-aria-components/src/ColorPicker.tsx @@ -14,7 +14,7 @@ import {Color, ColorPickerState, ColorPickerProps as StatelyColorPickerProps, us import {ColorAreaContext, ColorFieldContext, ColorSliderContext, ColorWheelContext} from './RSPContexts'; import {ColorSwatchContext} from './ColorSwatch'; import {ColorSwatchPickerContext} from './ColorSwatchPicker'; -import {mergeProps} from 'react-aria'; +import {mergeProps} from '@react-aria-nutrient/react-aria'; import {Provider, RenderProps, SlotProps, SlottedContextValue, useRenderProps, useSlottedContext} from './utils'; import React, {createContext, ReactNode} from 'react'; diff --git a/packages/react-aria-components/src/ColorSlider.tsx b/packages/react-aria-components/src/ColorSlider.tsx index 6ffe4ff012e..1e923f616f5 100644 --- a/packages/react-aria-components/src/ColorSlider.tsx +++ b/packages/react-aria-components/src/ColorSlider.tsx @@ -1,4 +1,4 @@ -import {AriaColorSliderProps, Orientation, useColorSlider, useLocale} from 'react-aria'; +import {AriaColorSliderProps, Orientation, useColorSlider, useLocale} from '@react-aria-nutrient/react-aria'; import {ColorSliderContext} from './RSPContexts'; import {ColorSliderState, useColorSliderState} from 'react-stately'; import {filterDOMProps} from '@react-aria-nutrient/utils'; diff --git a/packages/react-aria-components/src/ColorSwatch.tsx b/packages/react-aria-components/src/ColorSwatch.tsx index a19eb138502..e86e84ccf0e 100644 --- a/packages/react-aria-components/src/ColorSwatch.tsx +++ b/packages/react-aria-components/src/ColorSwatch.tsx @@ -1,4 +1,4 @@ -import {AriaColorSwatchProps, useColorSwatch} from 'react-aria'; +import {AriaColorSwatchProps, useColorSwatch} from '@react-aria-nutrient/react-aria'; import {Color} from 'react-stately'; import {ContextValue, SlotProps, StyleRenderProps, useContextProps, useRenderProps} from './utils'; 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 66955b798d8..3ae03bf0a6e 100644 --- a/packages/react-aria-components/src/ColorSwatchPicker.tsx +++ b/packages/react-aria-components/src/ColorSwatchPicker.tsx @@ -7,7 +7,7 @@ import {filterDOMProps} from '@react-aria-nutrient/utils'; import intlMessages from '../intl/*.json'; import {ListBox, ListBoxItem, ListBoxItemRenderProps, ListBoxRenderProps} from './ListBox'; import React, {createContext, ForwardedRef, forwardRef, ReactNode, useContext, useEffect, useMemo} from 'react'; -import {useLocale, useLocalizedStringFormatter} from 'react-aria'; +import {useLocale, useLocalizedStringFormatter} from '@react-aria-nutrient/react-aria'; export interface ColorSwatchPickerRenderProps extends Omit {} export interface ColorSwatchPickerProps extends ValueBase, AriaLabelingProps, StyleRenderProps { diff --git a/packages/react-aria-components/src/ColorThumb.tsx b/packages/react-aria-components/src/ColorThumb.tsx index acbd9ee8de1..d0fd1874999 100644 --- a/packages/react-aria-components/src/ColorThumb.tsx +++ b/packages/react-aria-components/src/ColorThumb.tsx @@ -1,7 +1,7 @@ import {Color} from 'react-stately'; import {filterDOMProps} from '@react-aria-nutrient/utils'; import {HoverEvents, RefObject} from '@react-types/shared'; -import {mergeProps, useFocusRing, useHover} from 'react-aria'; +import {mergeProps, useFocusRing, useHover} from '@react-aria-nutrient/react-aria'; import React, {createContext, ForwardedRef, forwardRef, HTMLAttributes, InputHTMLAttributes, useContext} from 'react'; import {RenderProps, useRenderProps} from './utils'; diff --git a/packages/react-aria-components/src/ColorWheel.tsx b/packages/react-aria-components/src/ColorWheel.tsx index 9e1e86f8a67..31da6f54d4f 100644 --- a/packages/react-aria-components/src/ColorWheel.tsx +++ b/packages/react-aria-components/src/ColorWheel.tsx @@ -1,4 +1,4 @@ -import {AriaColorWheelOptions, useColorWheel} from 'react-aria'; +import {AriaColorWheelOptions, useColorWheel} from '@react-aria-nutrient/react-aria'; import {ColorWheelContext} from './RSPContexts'; import {ColorWheelState, useColorWheelState} from 'react-stately'; import {ContextValue, Provider, RenderProps, SlotProps, StyleRenderProps, useContextProps, useRenderProps} from './utils'; diff --git a/packages/react-aria-components/src/ComboBox.tsx b/packages/react-aria-components/src/ComboBox.tsx index 35955902c72..73635f53fcf 100644 --- a/packages/react-aria-components/src/ComboBox.tsx +++ b/packages/react-aria-components/src/ComboBox.tsx @@ -9,7 +9,7 @@ * OF ANY KIND, either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -import {AriaComboBoxProps, useComboBox, useFilter} from 'react-aria'; +import {AriaComboBoxProps, useComboBox, useFilter} from '@react-aria-nutrient/react-aria'; import {ButtonContext} from './Button'; import {Collection, ComboBoxState, Node, useComboBoxState} from 'react-stately'; import {CollectionBuilder} from '@react-aria-nutrient/collections'; diff --git a/packages/react-aria-components/src/DateField.tsx b/packages/react-aria-components/src/DateField.tsx index 49f9d3f196c..384fc455988 100644 --- a/packages/react-aria-components/src/DateField.tsx +++ b/packages/react-aria-components/src/DateField.tsx @@ -9,7 +9,7 @@ * OF ANY KIND, either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -import {AriaDateFieldProps, AriaTimeFieldProps, DateValue, HoverEvents, mergeProps, TimeValue, useDateField, useDateSegment, useFocusRing, useHover, useLocale, useTimeField} from 'react-aria'; +import {AriaDateFieldProps, AriaTimeFieldProps, DateValue, HoverEvents, mergeProps, TimeValue, useDateField, useDateSegment, useFocusRing, useHover, useLocale, useTimeField} from '@react-aria-nutrient/react-aria'; import {ContextValue, Provider, RACValidation, removeDataAttributes, RenderProps, SlotProps, StyleRenderProps, useContextProps, useRenderProps, useSlot, useSlottedContext} from './utils'; import {createCalendar} from '@internationalized/date'; import {DateFieldState, DateSegmentType, DateSegment as IDateSegment, TimeFieldState, useDateFieldState, useTimeFieldState} from 'react-stately'; diff --git a/packages/react-aria-components/src/DatePicker.tsx b/packages/react-aria-components/src/DatePicker.tsx index e2cdcf537de..e3c548f6605 100644 --- a/packages/react-aria-components/src/DatePicker.tsx +++ b/packages/react-aria-components/src/DatePicker.tsx @@ -9,7 +9,7 @@ * OF ANY KIND, either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -import {AriaDatePickerProps, AriaDateRangePickerProps, DateValue, useDatePicker, useDateRangePicker, useFocusRing} from 'react-aria'; +import {AriaDatePickerProps, AriaDateRangePickerProps, DateValue, useDatePicker, useDateRangePicker, useFocusRing} from '@react-aria-nutrient/react-aria'; import {ButtonContext} from './Button'; import {CalendarContext, RangeCalendarContext} from './Calendar'; import {ContextValue, Provider, RACValidation, removeDataAttributes, RenderProps, SlotProps, useContextProps, useRenderProps, useSlot, useSlottedContext} from './utils'; diff --git a/packages/react-aria-components/src/Dialog.tsx b/packages/react-aria-components/src/Dialog.tsx index c5c58454065..fb40f3481dd 100644 --- a/packages/react-aria-components/src/Dialog.tsx +++ b/packages/react-aria-components/src/Dialog.tsx @@ -9,7 +9,7 @@ * OF ANY KIND, either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -import {AriaDialogProps, useDialog, useId, useOverlayTrigger} from 'react-aria'; +import {AriaDialogProps, useDialog, useId, useOverlayTrigger} from '@react-aria-nutrient/react-aria'; import {ButtonContext} from './Button'; import {ContextValue, DEFAULT_SLOT, Provider, SlotProps, StyleProps, useContextProps, useRenderProps} from './utils'; import {filterDOMProps} from '@react-aria-nutrient/utils'; diff --git a/packages/react-aria-components/src/Disclosure.tsx b/packages/react-aria-components/src/Disclosure.tsx index a5eaf1864cf..354b51d1156 100644 --- a/packages/react-aria-components/src/Disclosure.tsx +++ b/packages/react-aria-components/src/Disclosure.tsx @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {AriaDisclosureProps, useDisclosure, useFocusRing} from 'react-aria'; +import {AriaDisclosureProps, useDisclosure, useFocusRing} from '@react-aria-nutrient/react-aria'; import {ButtonContext} from './Button'; import {ContextValue, DEFAULT_SLOT, Provider, RenderProps, SlotProps, useContextProps, useRenderProps} from './utils'; import {DisclosureGroupState, DisclosureState, DisclosureGroupProps as StatelyDisclosureGroupProps, useDisclosureGroupState, useDisclosureState} from 'react-stately'; diff --git a/packages/react-aria-components/src/DragAndDrop.tsx b/packages/react-aria-components/src/DragAndDrop.tsx index fb79336a8a4..8673a4d087d 100644 --- a/packages/react-aria-components/src/DragAndDrop.tsx +++ b/packages/react-aria-components/src/DragAndDrop.tsx @@ -9,7 +9,7 @@ * OF ANY KIND, either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -import type {DropIndicatorProps as AriaDropIndicatorProps, ItemDropTarget, Key} from 'react-aria'; +import type {DropIndicatorProps as AriaDropIndicatorProps, ItemDropTarget, Key} from '@react-aria-nutrient/react-aria'; import type {DragAndDropHooks} from './useDragAndDrop'; import type {DraggableCollectionState, DroppableCollectionState, MultipleSelectionManager} from 'react-stately'; import React, {createContext, ForwardedRef, forwardRef, JSX, ReactNode, useCallback, useContext, useMemo} from 'react'; diff --git a/packages/react-aria-components/src/DropZone.tsx b/packages/react-aria-components/src/DropZone.tsx index 2c272bffc19..068c12e320c 100644 --- a/packages/react-aria-components/src/DropZone.tsx +++ b/packages/react-aria-components/src/DropZone.tsx @@ -12,7 +12,7 @@ import {AriaLabelingProps, HoverEvents} from '@react-types/shared'; import {ContextValue, Provider, RenderProps, SlotProps, useContextProps, useRenderProps} from './utils'; -import {DropOptions, mergeProps, useButton, useClipboard, useDrop, useFocusRing, useHover, useLocalizedStringFormatter, VisuallyHidden} from 'react-aria'; +import {DropOptions, mergeProps, useButton, useClipboard, useDrop, useFocusRing, useHover, useLocalizedStringFormatter, VisuallyHidden} from '@react-aria-nutrient/react-aria'; import {filterDOMProps, isFocusable, useLabels, useObjectRef, useSlotId} from '@react-aria-nutrient/utils'; // @ts-ignore import intlMessages from '../intl/*.json'; diff --git a/packages/react-aria-components/src/GridList.tsx b/packages/react-aria-components/src/GridList.tsx index b70215096da..0a94e2361ef 100644 --- a/packages/react-aria-components/src/GridList.tsx +++ b/packages/react-aria-components/src/GridList.tsx @@ -9,7 +9,7 @@ * OF ANY KIND, either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -import {AriaGridListProps, DraggableItemResult, DragPreviewRenderer, DropIndicatorAria, DroppableCollectionResult, FocusScope, ListKeyboardDelegate, mergeProps, useCollator, useFocusRing, useGridList, useGridListItem, useGridListSelectionCheckbox, useHover, useLocale, useVisuallyHidden} from 'react-aria'; +import {AriaGridListProps, DraggableItemResult, DragPreviewRenderer, DropIndicatorAria, DroppableCollectionResult, FocusScope, ListKeyboardDelegate, mergeProps, useCollator, useFocusRing, useGridList, useGridListItem, useGridListSelectionCheckbox, useHover, useLocale, useVisuallyHidden} from '@react-aria-nutrient/react-aria'; import {ButtonContext} from './Button'; import {CheckboxContext} from './RSPContexts'; import {Collection, CollectionBuilder, createLeafComponent} from '@react-aria-nutrient/collections'; diff --git a/packages/react-aria-components/src/Group.tsx b/packages/react-aria-components/src/Group.tsx index 222ca6a0037..61dc8f9ac4a 100644 --- a/packages/react-aria-components/src/Group.tsx +++ b/packages/react-aria-components/src/Group.tsx @@ -12,7 +12,7 @@ import {AriaLabelingProps, DOMProps, forwardRefType} from '@react-types/shared'; import {ContextValue, RenderProps, SlotProps, useContextProps, useRenderProps} from './utils'; -import {HoverProps, mergeProps, useFocusRing, useHover} from 'react-aria'; +import {HoverProps, mergeProps, useFocusRing, useHover} from '@react-aria-nutrient/react-aria'; import React, {createContext, ForwardedRef, forwardRef, HTMLAttributes} from 'react'; export interface GroupRenderProps { diff --git a/packages/react-aria-components/src/Input.tsx b/packages/react-aria-components/src/Input.tsx index bfe319ef622..b9e39925151 100644 --- a/packages/react-aria-components/src/Input.tsx +++ b/packages/react-aria-components/src/Input.tsx @@ -12,7 +12,7 @@ import {ContextValue, StyleRenderProps, useContextProps, useRenderProps} from './utils'; import {createHideableComponent} from '@react-aria-nutrient/collections'; -import {HoverEvents, mergeProps, useFocusRing, useHover} from 'react-aria'; +import {HoverEvents, mergeProps, useFocusRing, useHover} from '@react-aria-nutrient/react-aria'; import React, {createContext, ForwardedRef, InputHTMLAttributes} from 'react'; export interface InputRenderProps { diff --git a/packages/react-aria-components/src/Link.tsx b/packages/react-aria-components/src/Link.tsx index 061bd0f3fa6..40315da8d9a 100644 --- a/packages/react-aria-components/src/Link.tsx +++ b/packages/react-aria-components/src/Link.tsx @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {AriaLinkOptions, HoverEvents, mergeProps, useFocusRing, useHover, useLink} from 'react-aria'; +import {AriaLinkOptions, HoverEvents, mergeProps, useFocusRing, useHover, useLink} from '@react-aria-nutrient/react-aria'; import {ContextValue, RenderProps, SlotProps, useContextProps, useRenderProps} from './utils'; import {forwardRefType} from '@react-types/shared'; import React, {createContext, ElementType, ForwardedRef, forwardRef} from 'react'; diff --git a/packages/react-aria-components/src/ListBox.tsx b/packages/react-aria-components/src/ListBox.tsx index 3365506b6c5..f5bc4a8c377 100644 --- a/packages/react-aria-components/src/ListBox.tsx +++ b/packages/react-aria-components/src/ListBox.tsx @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {AriaListBoxOptions, AriaListBoxProps, DraggableItemResult, DragPreviewRenderer, DroppableCollectionResult, DroppableItemResult, FocusScope, ListKeyboardDelegate, mergeProps, useCollator, useFocusRing, useHover, useListBox, useListBoxSection, useLocale, useOption} from 'react-aria'; +import {AriaListBoxOptions, AriaListBoxProps, DraggableItemResult, DragPreviewRenderer, DroppableCollectionResult, DroppableItemResult, FocusScope, ListKeyboardDelegate, mergeProps, useCollator, useFocusRing, useHover, useListBox, useListBoxSection, useLocale, useOption} from '@react-aria-nutrient/react-aria'; import {Collection, CollectionBuilder, createBranchComponent, createLeafComponent} from '@react-aria-nutrient/collections'; import {CollectionProps, CollectionRendererContext, ItemRenderProps, SectionContext, SectionProps} from './Collection'; import {ContextValue, DEFAULT_SLOT, Provider, RenderProps, ScrollableProps, SlotProps, StyleRenderProps, useContextProps, useRenderProps, useSlot} from './utils'; diff --git a/packages/react-aria-components/src/Menu.tsx b/packages/react-aria-components/src/Menu.tsx index b2253dad769..13cbd0c1a70 100644 --- a/packages/react-aria-components/src/Menu.tsx +++ b/packages/react-aria-components/src/Menu.tsx @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {AriaMenuProps, FocusScope, mergeProps, useHover, useMenu, useMenuItem, useMenuSection, useMenuTrigger, useSubmenuTrigger} from 'react-aria'; +import {AriaMenuProps, FocusScope, mergeProps, useHover, useMenu, useMenuItem, useMenuSection, useMenuTrigger, useSubmenuTrigger} from '@react-aria-nutrient/react-aria'; import {BaseCollection, Collection, CollectionBuilder, createBranchComponent, createLeafComponent} from '@react-aria-nutrient/collections'; import {MenuTriggerProps as BaseMenuTriggerProps, Collection as ICollection, Node, RootMenuTriggerState, TreeState, useMenuTriggerState, useSubmenuTriggerState, useTreeState} from 'react-stately'; import {CollectionProps, CollectionRendererContext, ItemRenderProps, SectionContext, SectionProps, usePersistedKeys} from './Collection'; diff --git a/packages/react-aria-components/src/Meter.tsx b/packages/react-aria-components/src/Meter.tsx index d74a1c226b2..c08b3f50d2e 100644 --- a/packages/react-aria-components/src/Meter.tsx +++ b/packages/react-aria-components/src/Meter.tsx @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {AriaMeterProps, useMeter} from 'react-aria'; +import {AriaMeterProps, useMeter} from '@react-aria-nutrient/react-aria'; import {clamp} from '@react-stately/utils'; import {ContextValue, RenderProps, SlotProps, useContextProps, useRenderProps, useSlot} from './utils'; import {forwardRefType} from '@react-types/shared'; diff --git a/packages/react-aria-components/src/Modal.tsx b/packages/react-aria-components/src/Modal.tsx index ee53498137d..d9a4461a3fe 100644 --- a/packages/react-aria-components/src/Modal.tsx +++ b/packages/react-aria-components/src/Modal.tsx @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {AriaModalOverlayProps, DismissButton, Overlay, useIsSSR, useModalOverlay} from 'react-aria'; +import {AriaModalOverlayProps, DismissButton, Overlay, useIsSSR, useModalOverlay} from '@react-aria-nutrient/react-aria'; import {ContextValue, Provider, RenderProps, SlotProps, useContextProps, useRenderProps} from './utils'; import {DOMAttributes, forwardRefType, RefObject} from '@react-types/shared'; import {filterDOMProps, mergeProps, mergeRefs, useEnterAnimation, useExitAnimation, useObjectRef, useViewportSize} from '@react-aria-nutrient/utils'; diff --git a/packages/react-aria-components/src/NumberField.tsx b/packages/react-aria-components/src/NumberField.tsx index b80e75142a0..4e57568f20b 100644 --- a/packages/react-aria-components/src/NumberField.tsx +++ b/packages/react-aria-components/src/NumberField.tsx @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {AriaNumberFieldProps, useLocale, useNumberField} from 'react-aria'; +import {AriaNumberFieldProps, useLocale, useNumberField} from '@react-aria-nutrient/react-aria'; import {ButtonContext} from './Button'; import {ContextValue, Provider, RACValidation, removeDataAttributes, RenderProps, SlotProps, useContextProps, useRenderProps, useSlot, useSlottedContext} from './utils'; import {FieldErrorContext} from './FieldError'; diff --git a/packages/react-aria-components/src/OverlayArrow.tsx b/packages/react-aria-components/src/OverlayArrow.tsx index 18fef3566be..a523283cfda 100644 --- a/packages/react-aria-components/src/OverlayArrow.tsx +++ b/packages/react-aria-components/src/OverlayArrow.tsx @@ -13,7 +13,7 @@ import {ContextValue, RenderProps, useContextProps, useRenderProps} from './utils'; import {DOMProps, forwardRefType} from '@react-types/shared'; import {filterDOMProps} from '@react-aria-nutrient/utils'; -import {PlacementAxis} from 'react-aria'; +import {PlacementAxis} from '@react-aria-nutrient/react-aria'; 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 4098678bde8..ad65e3829b6 100644 --- a/packages/react-aria-components/src/Popover.tsx +++ b/packages/react-aria-components/src/Popover.tsx @@ -11,7 +11,7 @@ */ import {AriaLabelingProps, forwardRefType, RefObject} from '@react-types/shared'; -import {AriaPopoverProps, DismissButton, Overlay, PlacementAxis, PositionProps, useLocale, usePopover} from 'react-aria'; +import {AriaPopoverProps, DismissButton, Overlay, PlacementAxis, PositionProps, useLocale, usePopover} from '@react-aria-nutrient/react-aria'; import {ContextValue, RenderProps, SlotProps, useContextProps, useRenderProps} from './utils'; import {filterDOMProps, mergeProps, useEnterAnimation, useExitAnimation, useLayoutEffect} from '@react-aria-nutrient/utils'; import {focusSafely} from '@react-aria-nutrient/interactions'; diff --git a/packages/react-aria-components/src/ProgressBar.tsx b/packages/react-aria-components/src/ProgressBar.tsx index f18c67f7f22..2b016fe7d37 100644 --- a/packages/react-aria-components/src/ProgressBar.tsx +++ b/packages/react-aria-components/src/ProgressBar.tsx @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {AriaProgressBarProps, useProgressBar} from 'react-aria'; +import {AriaProgressBarProps, useProgressBar} from '@react-aria-nutrient/react-aria'; import {clamp} from '@react-stately/utils'; import {ContextValue, RenderProps, SlotProps, useContextProps, useRenderProps, useSlot} from './utils'; import {LabelContext} from './Label'; diff --git a/packages/react-aria-components/src/RadioGroup.tsx b/packages/react-aria-components/src/RadioGroup.tsx index 53c63882d51..555a7f07f0d 100644 --- a/packages/react-aria-components/src/RadioGroup.tsx +++ b/packages/react-aria-components/src/RadioGroup.tsx @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {AriaRadioGroupProps, AriaRadioProps, HoverEvents, Orientation, useFocusRing, useHover, useRadio, useRadioGroup, VisuallyHidden} from 'react-aria'; +import {AriaRadioGroupProps, AriaRadioProps, HoverEvents, Orientation, useFocusRing, useHover, useRadio, useRadioGroup, VisuallyHidden} from '@react-aria-nutrient/react-aria'; import {ContextValue, Provider, RACValidation, removeDataAttributes, RenderProps, SlotProps, useContextProps, useRenderProps, useSlot, useSlottedContext} from './utils'; import {FieldErrorContext} from './FieldError'; import {filterDOMProps, mergeProps, mergeRefs, useObjectRef} from '@react-aria-nutrient/utils'; diff --git a/packages/react-aria-components/src/SearchField.tsx b/packages/react-aria-components/src/SearchField.tsx index 41dda45a1ba..0e7ac4f5964 100644 --- a/packages/react-aria-components/src/SearchField.tsx +++ b/packages/react-aria-components/src/SearchField.tsx @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {AriaSearchFieldProps, useSearchField} from 'react-aria'; +import {AriaSearchFieldProps, useSearchField} from '@react-aria-nutrient/react-aria'; import {ButtonContext} from './Button'; import {ContextValue, Provider, RACValidation, removeDataAttributes, RenderProps, SlotProps, useContextProps, useRenderProps, useSlot, useSlottedContext} from './utils'; import {createHideableComponent} from '@react-aria-nutrient/collections'; diff --git a/packages/react-aria-components/src/Select.tsx b/packages/react-aria-components/src/Select.tsx index 963dfed576e..76436907ff4 100644 --- a/packages/react-aria-components/src/Select.tsx +++ b/packages/react-aria-components/src/Select.tsx @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {AriaSelectProps, HiddenSelect, useFocusRing, useLocalizedStringFormatter, useSelect} from 'react-aria'; +import {AriaSelectProps, HiddenSelect, useFocusRing, useLocalizedStringFormatter, useSelect} from '@react-aria-nutrient/react-aria'; import {ButtonContext} from './Button'; import {Collection, Node, SelectState, useSelectState} from 'react-stately'; import {CollectionBuilder} from '@react-aria-nutrient/collections'; diff --git a/packages/react-aria-components/src/Separator.tsx b/packages/react-aria-components/src/Separator.tsx index a0caf24f572..e42e4ad791f 100644 --- a/packages/react-aria-components/src/Separator.tsx +++ b/packages/react-aria-components/src/Separator.tsx @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {SeparatorProps as AriaSeparatorProps, useSeparator} from 'react-aria'; +import {SeparatorProps as AriaSeparatorProps, useSeparator} from '@react-aria-nutrient/react-aria'; import {ContextValue, SlotProps, StyleProps, useContextProps} from './utils'; import {createLeafComponent} from '@react-aria-nutrient/collections'; import {filterDOMProps} from '@react-aria-nutrient/utils'; diff --git a/packages/react-aria-components/src/Slider.tsx b/packages/react-aria-components/src/Slider.tsx index 05182aecf5e..fa9a5337162 100644 --- a/packages/react-aria-components/src/Slider.tsx +++ b/packages/react-aria-components/src/Slider.tsx @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {AriaSliderProps, AriaSliderThumbProps, HoverEvents, mergeProps, Orientation, useFocusRing, useHover, useNumberFormatter, useSlider, useSliderThumb, VisuallyHidden} from 'react-aria'; +import {AriaSliderProps, AriaSliderThumbProps, HoverEvents, mergeProps, Orientation, useFocusRing, useHover, useNumberFormatter, useSlider, useSliderThumb, VisuallyHidden} from '@react-aria-nutrient/react-aria'; import {ContextValue, Provider, RenderProps, SlotProps, useContextProps, useRenderProps, useSlot, useSlottedContext} from './utils'; import {filterDOMProps} from '@react-aria-nutrient/utils'; import {forwardRefType, RefObject} from '@react-types/shared'; diff --git a/packages/react-aria-components/src/Switch.tsx b/packages/react-aria-components/src/Switch.tsx index b458a7c4ba1..7c366d185c9 100644 --- a/packages/react-aria-components/src/Switch.tsx +++ b/packages/react-aria-components/src/Switch.tsx @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {AriaSwitchProps, HoverEvents, mergeProps, useFocusRing, useHover, useSwitch, VisuallyHidden} from 'react-aria'; +import {AriaSwitchProps, HoverEvents, mergeProps, useFocusRing, useHover, useSwitch, VisuallyHidden} from '@react-aria-nutrient/react-aria'; import {ContextValue, removeDataAttributes, RenderProps, SlotProps, useContextProps, useRenderProps} from './utils'; import {filterDOMProps, mergeRefs, useObjectRef} from '@react-aria-nutrient/utils'; import {forwardRefType, RefObject} from '@react-types/shared'; diff --git a/packages/react-aria-components/src/Table.tsx b/packages/react-aria-components/src/Table.tsx index 1342a5cf167..5a489673ae3 100644 --- a/packages/react-aria-components/src/Table.tsx +++ b/packages/react-aria-components/src/Table.tsx @@ -9,7 +9,7 @@ import {ContextValue, DEFAULT_SLOT, DOMProps, Provider, RenderProps, ScrollableP import {DisabledBehavior, DraggableCollectionState, DroppableCollectionState, MultipleSelectionState, Node, SelectionBehavior, SelectionMode, SortDirection, TableState, useMultipleSelectionState, useTableColumnResizeState, useTableState} from 'react-stately'; import {DragAndDropContext, DropIndicatorContext, DropIndicatorProps, useDndPersistedKeys, useRenderDropIndicator} from './DragAndDrop'; import {DragAndDropHooks} from './useDragAndDrop'; -import {DraggableItemResult, DragPreviewRenderer, DropIndicatorAria, DroppableCollectionResult, FocusScope, ListKeyboardDelegate, mergeProps, useFocusRing, useHover, useLocale, useLocalizedStringFormatter, useTable, useTableCell, useTableColumnHeader, useTableColumnResize, useTableHeaderRow, useTableRow, useTableRowGroup, useTableSelectAllCheckbox, useTableSelectionCheckbox, useVisuallyHidden} from 'react-aria'; +import {DraggableItemResult, DragPreviewRenderer, DropIndicatorAria, DroppableCollectionResult, FocusScope, ListKeyboardDelegate, mergeProps, useFocusRing, useHover, useLocale, useLocalizedStringFormatter, useTable, useTableCell, useTableColumnHeader, useTableColumnResize, useTableHeaderRow, useTableRow, useTableRowGroup, useTableSelectAllCheckbox, useTableSelectionCheckbox, useVisuallyHidden} from '@react-aria-nutrient/react-aria'; import {filterDOMProps, isScrollable, mergeRefs, useLayoutEffect, useObjectRef, useResizeObserver} from '@react-aria-nutrient/utils'; import {GridNode} from '@react-types/grid'; // @ts-ignore diff --git a/packages/react-aria-components/src/Tabs.tsx b/packages/react-aria-components/src/Tabs.tsx index a9750fabb1e..da170991979 100644 --- a/packages/react-aria-components/src/Tabs.tsx +++ b/packages/react-aria-components/src/Tabs.tsx @@ -11,7 +11,7 @@ */ import {AriaLabelingProps, forwardRefType, HoverEvents, Key, LinkDOMProps, RefObject} from '@react-types/shared'; -import {AriaTabListProps, AriaTabPanelProps, mergeProps, Orientation, useFocusRing, useHover, useTab, useTabList, useTabPanel} from 'react-aria'; +import {AriaTabListProps, AriaTabPanelProps, mergeProps, Orientation, useFocusRing, useHover, useTab, useTabList, useTabPanel} from '@react-aria-nutrient/react-aria'; import {Collection, CollectionBuilder, createHideableComponent, createLeafComponent} from '@react-aria-nutrient/collections'; import {CollectionProps, CollectionRendererContext, DefaultCollectionRenderer, usePersistedKeys} from './Collection'; import {ContextValue, Provider, RenderProps, SlotProps, StyleRenderProps, useContextProps, useRenderProps, useSlottedContext} from './utils'; diff --git a/packages/react-aria-components/src/TagGroup.tsx b/packages/react-aria-components/src/TagGroup.tsx index 958ef5e3232..4ff4cd25e99 100644 --- a/packages/react-aria-components/src/TagGroup.tsx +++ b/packages/react-aria-components/src/TagGroup.tsx @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {AriaTagGroupProps, useFocusRing, useHover, useTag, useTagGroup} from 'react-aria'; +import {AriaTagGroupProps, useFocusRing, useHover, useTag, useTagGroup} from '@react-aria-nutrient/react-aria'; import {ButtonContext} from './Button'; import {Collection, CollectionBuilder, createLeafComponent} from '@react-aria-nutrient/collections'; import {CollectionProps, CollectionRendererContext, DefaultCollectionRenderer, ItemRenderProps, usePersistedKeys} from './Collection'; diff --git a/packages/react-aria-components/src/TextArea.tsx b/packages/react-aria-components/src/TextArea.tsx index ae811bf7954..e1fc30949d1 100644 --- a/packages/react-aria-components/src/TextArea.tsx +++ b/packages/react-aria-components/src/TextArea.tsx @@ -1,5 +1,5 @@ import {ContextValue, StyleRenderProps, useContextProps, useRenderProps} from './utils'; -import {HoverEvents, mergeProps, useFocusRing, useHover} from 'react-aria'; +import {HoverEvents, mergeProps, useFocusRing, useHover} from '@react-aria-nutrient/react-aria'; import {InputRenderProps} from './Input'; import React, {createContext, ForwardedRef, forwardRef, TextareaHTMLAttributes} from 'react'; diff --git a/packages/react-aria-components/src/TextField.tsx b/packages/react-aria-components/src/TextField.tsx index 354af16e08b..daab13cc50d 100644 --- a/packages/react-aria-components/src/TextField.tsx +++ b/packages/react-aria-components/src/TextField.tsx @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {AriaTextFieldProps, useTextField} from 'react-aria'; +import {AriaTextFieldProps, useTextField} from '@react-aria-nutrient/react-aria'; import {ContextValue, DOMProps, Provider, RACValidation, removeDataAttributes, RenderProps, SlotProps, useContextProps, useRenderProps, useSlot, useSlottedContext} from './utils'; import {createHideableComponent} from '@react-aria-nutrient/collections'; import {FieldErrorContext} from './FieldError'; diff --git a/packages/react-aria-components/src/Toast.tsx b/packages/react-aria-components/src/Toast.tsx index e9665be9b33..a756031c89b 100644 --- a/packages/react-aria-components/src/Toast.tsx +++ b/packages/react-aria-components/src/Toast.tsx @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {AriaToastProps, AriaToastRegionProps, mergeProps, useFocusRing, useToast, useToastRegion} from 'react-aria'; +import {AriaToastProps, AriaToastRegionProps, mergeProps, useFocusRing, useToast, useToastRegion} from '@react-aria-nutrient/react-aria'; import {ButtonContext} from './Button'; import {ContextValue, DEFAULT_SLOT, Provider, RenderProps, StyleRenderProps, useContextProps, useRenderProps} from './utils'; import {createPortal} from 'react-dom'; diff --git a/packages/react-aria-components/src/ToggleButton.tsx b/packages/react-aria-components/src/ToggleButton.tsx index 3361ccf73d8..016656ef4b9 100644 --- a/packages/react-aria-components/src/ToggleButton.tsx +++ b/packages/react-aria-components/src/ToggleButton.tsx @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {AriaToggleButtonProps, HoverEvents, mergeProps, useFocusRing, useHover, useToggleButton, useToggleButtonGroupItem} from 'react-aria'; +import {AriaToggleButtonProps, HoverEvents, mergeProps, useFocusRing, useHover, useToggleButton, useToggleButtonGroupItem} from '@react-aria-nutrient/react-aria'; import {ButtonRenderProps} from './Button'; import {ContextValue, RenderProps, SlotProps, useContextProps, useRenderProps} from './utils'; import {forwardRefType, Key} from '@react-types/shared'; diff --git a/packages/react-aria-components/src/ToggleButtonGroup.tsx b/packages/react-aria-components/src/ToggleButtonGroup.tsx index 44381b50f1c..265727405bd 100644 --- a/packages/react-aria-components/src/ToggleButtonGroup.tsx +++ b/packages/react-aria-components/src/ToggleButtonGroup.tsx @@ -9,7 +9,7 @@ * OF ANY KIND, either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -import {AriaToggleButtonGroupProps, useToggleButtonGroup} from 'react-aria'; +import {AriaToggleButtonGroupProps, useToggleButtonGroup} from '@react-aria-nutrient/react-aria'; import {ContextValue, RenderProps, SlotProps, useContextProps, useRenderProps} from './utils'; import {forwardRefType} from '@react-types/shared'; 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 3aed1f24ae9..fe0c275857f 100644 --- a/packages/react-aria-components/src/Tooltip.tsx +++ b/packages/react-aria-components/src/Tooltip.tsx @@ -11,7 +11,7 @@ */ import {AriaLabelingProps, FocusableElement, forwardRefType, RefObject} from '@react-types/shared'; -import {AriaPositionProps, mergeProps, OverlayContainer, Placement, PlacementAxis, PositionProps, useOverlayPosition, useTooltip, useTooltipTrigger} from 'react-aria'; +import {AriaPositionProps, mergeProps, OverlayContainer, Placement, PlacementAxis, PositionProps, useOverlayPosition, useTooltip, useTooltipTrigger} from '@react-aria-nutrient/react-aria'; import {ContextValue, Provider, RenderProps, useContextProps, useRenderProps} from './utils'; import {FocusableProvider} from '@react-aria-nutrient/focus'; import {OverlayArrowContext} from './OverlayArrow'; diff --git a/packages/react-aria-components/src/Tree.tsx b/packages/react-aria-components/src/Tree.tsx index 1d11cbf7973..fe662c29f02 100644 --- a/packages/react-aria-components/src/Tree.tsx +++ b/packages/react-aria-components/src/Tree.tsx @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {AriaTreeItemOptions, AriaTreeProps, FocusScope, mergeProps, useFocusRing, useGridListSelectionCheckbox, useHover, useTree, useTreeItem} from 'react-aria'; +import {AriaTreeItemOptions, AriaTreeProps, FocusScope, mergeProps, useFocusRing, useGridListSelectionCheckbox, useHover, useTree, useTreeItem} from '@react-aria-nutrient/react-aria'; import {ButtonContext} from './Button'; import {CheckboxContext} from './RSPContexts'; import {Collection, CollectionBuilder, CollectionNode, createBranchComponent, createLeafComponent, useCachedChildren} from '@react-aria-nutrient/collections'; diff --git a/packages/react-aria-components/src/index.ts b/packages/react-aria-components/src/index.ts index 72bd4c65b77..3bd5a042f93 100644 --- a/packages/react-aria-components/src/index.ts +++ b/packages/react-aria-components/src/index.ts @@ -79,7 +79,7 @@ export {UNSTABLE_TreeLoadingIndicator, Tree, TreeItem, TreeContext, TreeItemCont export {useDragAndDrop} from './useDragAndDrop'; export {DropIndicator, DropIndicatorContext, DragAndDropContext} from './DragAndDrop'; export {Virtualizer} from './Virtualizer'; -export {DIRECTORY_DRAG_TYPE, isDirectoryDropItem, isFileDropItem, isTextDropItem, SSRProvider, RouterProvider, I18nProvider, useLocale, useFilter, Pressable, Focusable} from 'react-aria'; +export {DIRECTORY_DRAG_TYPE, isDirectoryDropItem, isFileDropItem, isTextDropItem, SSRProvider, RouterProvider, I18nProvider, useLocale, useFilter, Pressable, Focusable} from '@react-aria-nutrient/react-aria'; export {FormValidationContext, parseColor, getColorChannels, ToastQueue as UNSTABLE_ToastQueue} from 'react-stately'; export {ListLayout, GridLayout, WaterfallLayout} from '@react-stately/layout'; export {Layout, LayoutInfo, Size, Rect, Point} from '@react-stately/virtualizer'; @@ -144,8 +144,8 @@ export type {DropIndicatorProps, DropIndicatorRenderProps} from './DragAndDrop'; export type {ContextValue, SlotProps} from './utils'; export type {VirtualizerProps} from './Virtualizer'; -export type {DateValue, DateRange, TimeValue} from 'react-aria'; -export type {DirectoryDropItem, DraggableCollectionEndEvent, DraggableCollectionMoveEvent, DraggableCollectionStartEvent, DragPreviewRenderer, DragTypes, DropItem, DropOperation, DroppableCollectionDropEvent, DroppableCollectionEnterEvent, DroppableCollectionExitEvent, DroppableCollectionInsertDropEvent, DroppableCollectionMoveEvent, DroppableCollectionOnItemDropEvent, DroppableCollectionReorderEvent, DroppableCollectionRootDropEvent, DropPosition, DropTarget, FileDropItem, ItemDropTarget, RootDropTarget, TextDropItem, PressEvent} from 'react-aria'; +export type {DateValue, DateRange, TimeValue} from '@react-aria-nutrient/react-aria'; +export type {DirectoryDropItem, DraggableCollectionEndEvent, DraggableCollectionMoveEvent, DraggableCollectionStartEvent, DragPreviewRenderer, DragTypes, DropItem, DropOperation, DroppableCollectionDropEvent, DroppableCollectionEnterEvent, DroppableCollectionExitEvent, DroppableCollectionInsertDropEvent, DroppableCollectionMoveEvent, DroppableCollectionOnItemDropEvent, DroppableCollectionReorderEvent, DroppableCollectionRootDropEvent, DropPosition, DropTarget, FileDropItem, ItemDropTarget, RootDropTarget, TextDropItem, PressEvent} from '@react-aria-nutrient/react-aria'; export type {Color, ColorSpace, ColorFormat, Key, QueuedToast, Selection, SortDescriptor, SortDirection, SelectionMode, ToastOptions} from 'react-stately'; export type {ValidationResult, RouterConfig} from '@react-types/shared'; export type {ListLayoutOptions, GridLayoutOptions, WaterfallLayoutOptions} from '@react-stately/layout'; diff --git a/packages/react-aria-components/src/useDragAndDrop.tsx b/packages/react-aria-components/src/useDragAndDrop.tsx index da7b49def3a..64a5298e35c 100644 --- a/packages/react-aria-components/src/useDragAndDrop.tsx +++ b/packages/react-aria-components/src/useDragAndDrop.tsx @@ -30,7 +30,7 @@ import { useDropIndicator, useDroppableCollection, useDroppableItem -} from 'react-aria'; +} from '@react-aria-nutrient/react-aria'; import {DraggableCollectionProps, DroppableCollectionProps, Key, RefObject} from '@react-types/shared'; import { DraggableCollectionState, diff --git a/packages/react-aria-components/stories/Autocomplete.stories.tsx b/packages/react-aria-components/stories/Autocomplete.stories.tsx index 7489a98db93..17daf58ca10 100644 --- a/packages/react-aria-components/stories/Autocomplete.stories.tsx +++ b/packages/react-aria-components/stories/Autocomplete.stories.tsx @@ -16,7 +16,7 @@ import {MyListBoxItem, MyMenuItem} from './utils'; import React from 'react'; import styles from '../example/index.css'; import {useAsyncList, useListData, useTreeData} from 'react-stately'; -import {useFilter} from 'react-aria'; +import {useFilter} from '@react-aria-nutrient/react-aria'; export default { title: 'React Aria Components', diff --git a/packages/react-aria-components/stories/Dropzone.stories.tsx b/packages/react-aria-components/stories/Dropzone.stories.tsx index 6b405581383..c0c969edb17 100644 --- a/packages/react-aria-components/stories/Dropzone.stories.tsx +++ b/packages/react-aria-components/stories/Dropzone.stories.tsx @@ -13,7 +13,7 @@ import {action} from '@storybook/addon-actions'; import {Button, DropZone, FileTrigger, Link, Text} from 'react-aria-components'; import {classNames} from '@react-spectrum/utils'; -import {FocusRing, mergeProps, useButton, useClipboard, useDrag} from 'react-aria'; +import {FocusRing, mergeProps, useButton, useClipboard, useDrag} from '@react-aria-nutrient/react-aria'; import React, {useRef} from 'react'; import styles from '../example/index.css'; diff --git a/packages/react-aria-components/stories/Table.stories.tsx b/packages/react-aria-components/stories/Table.stories.tsx index 37b24b874a8..3a2678d6f6e 100644 --- a/packages/react-aria-components/stories/Table.stories.tsx +++ b/packages/react-aria-components/stories/Table.stories.tsx @@ -12,7 +12,7 @@ import {action} from '@storybook/addon-actions'; import {Button, Cell, Checkbox, CheckboxProps, Collection, Column, ColumnProps, ColumnResizer, Dialog, DialogTrigger, DropIndicator, Heading, Menu, MenuTrigger, Modal, ModalOverlay, Popover, ResizableTableContainer, Row, Table, TableBody, TableHeader, TableLayout, useDragAndDrop, Virtualizer} from 'react-aria-components'; -import {isTextDropItem} from 'react-aria'; +import {isTextDropItem} from '@react-aria-nutrient/react-aria'; import {MyMenuItem} from './utils'; import React, {Suspense, useMemo, useRef, useState} from 'react'; import styles from '../example/index.css'; diff --git a/packages/react-aria/package.json b/packages/react-aria/package.json index e1fc2d9a014..ad07a123720 100644 --- a/packages/react-aria/package.json +++ b/packages/react-aria/package.json @@ -1,5 +1,5 @@ { - "name": "react-aria", + "name": "@react-aria-nutrient/react-aria", "version": "3.38.1", "description": "Spectrum UI components in React", "license": "Apache-2.0", diff --git a/rfcs/2023-react-aria-components.md b/rfcs/2023-react-aria-components.md index 1aad1abdc4b..97c6373e81d 100644 --- a/rfcs/2023-react-aria-components.md +++ b/rfcs/2023-react-aria-components.md @@ -171,7 +171,7 @@ As described above, each component exposes a corresponding context which can be ```jsx import {ListBoxContext, useContextProps} from 'react-aria-components'; -import {useListBox} from 'react-aria'; +import {useListBox} from '@react-aria-nutrient/react-aria'; function MyListBox(props) { // Merge local props and ref with props from context. @@ -215,7 +215,7 @@ import {MyListBox} from './MyListBox'; This also works the other way. If you need to customize `ComboBox` itself, but want to reuse the components it contains, you can do so by providing the necessary contexts. ```jsx -import {useComboBox} from 'react-aria'; +import {useComboBox} from '@react-aria-nutrient/react-aria'; import {ButtonContext, InputContext, LabelContext, ListBoxContext, Provider} from 'react-aria-components'; function MyComboBox(props) { diff --git a/scripts/buildI18n.js b/scripts/buildI18n.js index 42d97b4f274..715e1d5da85 100644 --- a/scripts/buildI18n.js +++ b/scripts/buildI18n.js @@ -143,4 +143,4 @@ export declare function createLocalizedStringDictionary(packages: string[]): Loc build('{@react-aria-nutrient/*,@react-stately/*,@react-spectrum/*,react-aria-components}', '@adobe/react-spectrum'); build('{@react-aria-nutrient/*,@react-stately/*,react-aria-components}', 'react-aria-components'); -build('{@react-aria,@react-stately}/*', 'react-aria'); +build('{@react-aria,@react-stately}/*', '@react-aria-nutrient/react-aria'); diff --git a/scripts/buildPublishedAPI.js b/scripts/buildPublishedAPI.js index b60fb165f08..7d85e6d061e 100644 --- a/scripts/buildPublishedAPI.js +++ b/scripts/buildPublishedAPI.js @@ -175,7 +175,7 @@ async function build() { // Copy package.json for each package into docs dir so we can find the correct version numbers console.log('moving over from node_modules'); for (let p of packages) { - if (p === 'react-stately' || p === 'react-aria' || p === 'react-aria-components' || p === 'tailwindcss-react-aria-components') { + if (p === 'react-stately' || p === '@react-aria-nutrient/react-aria' || p === 'react-aria-components' || p === 'tailwindcss-react-aria-components') { continue; } if (!p.includes('spectrum-css') && !p.includes('example-theme') && fs.existsSync(path.join(dir, 'node_modules', p))) { diff --git a/scripts/buildWebsite.js b/scripts/buildWebsite.js index 001f197bf36..5e66803f647 100644 --- a/scripts/buildWebsite.js +++ b/scripts/buildWebsite.js @@ -68,7 +68,7 @@ async function build() { dependencies: { '@adobe/react-spectrum': 'latest', '@react-aria-nutrient/example-theme': 'latest', - 'react-aria': 'latest', + '@react-aria-nutrient/react-aria': 'latest', 'react-stately': 'latest', 'react-aria-components': 'latest', 'tailwindcss-react-aria-components': 'latest', diff --git a/scripts/bumpVersions.js b/scripts/bumpVersions.js index 5be5309f5d2..c8dd81933d0 100644 --- a/scripts/bumpVersions.js +++ b/scripts/bumpVersions.js @@ -37,7 +37,7 @@ let excludedPackages = new Set([ let monopackages = new Set([ '@adobe/react-spectrum', - 'react-aria', + '@react-aria-nutrient/react-aria', 'react-stately' ]); diff --git a/scripts/esm-support/testESM.mjs b/scripts/esm-support/testESM.mjs index 85fd34c8d0c..f762079b3f2 100644 --- a/scripts/esm-support/testESM.mjs +++ b/scripts/esm-support/testESM.mjs @@ -10,6 +10,6 @@ * governing permissions and limitations under the License. */ -export * from 'react-aria'; +export * from '@react-aria-nutrient/react-aria'; export * from 'react-stately'; export * from '@adobe/react-spectrum'; diff --git a/scripts/migrateIntl.mjs b/scripts/migrateIntl.mjs index 075c554cf15..e75034ede10 100644 --- a/scripts/migrateIntl.mjs +++ b/scripts/migrateIntl.mjs @@ -74,7 +74,7 @@ if (!fs.existsSync(dest)) { } let packs = new Map(); for (let intlPkg of rspIntlPackages) { - if (intlPkg.includes('react-aria-components') || intlPkg.includes('react-stately') || intlPkg.includes('react-aria')) { + if (intlPkg.includes('react-aria-components') || intlPkg.includes('react-stately') || intlPkg.includes('@react-aria-nutrient/react-aria')) { continue; } let matches = intlPkg.match(/packages\/(.*)\/intl\/en-US.json/); diff --git a/starters/tailwind/src/AlertDialog.tsx b/starters/tailwind/src/AlertDialog.tsx index d6a10512f41..59cf252c21a 100644 --- a/starters/tailwind/src/AlertDialog.tsx +++ b/starters/tailwind/src/AlertDialog.tsx @@ -1,6 +1,6 @@ import { AlertCircleIcon, InfoIcon } from "lucide-react"; import React, { ReactNode } from "react"; -import { chain } from "react-aria"; +import { chain } from "@react-aria-nutrient/react-aria"; import { DialogProps, Heading } from "react-aria-components"; import { Button } from "./Button"; import { Dialog } from "./Dialog"; diff --git a/yarn.config.cjs b/yarn.config.cjs index 3edc96c1904..40fbe2a7a07 100644 --- a/yarn.config.cjs +++ b/yarn.config.cjs @@ -42,7 +42,7 @@ function enforceConsistentDependenciesAcrossTheProject({Yarn}) { if (isPublishing(workspace) // should these be included in the requirement? && workspace.ident !== '@adobe/react-spectrum' - && workspace.ident !== 'react-aria' + && workspace.ident !== '@react-aria-nutrient/react-aria' && workspace.ident !== 'react-stately' && workspace.ident !== '@internationalized/string-compiler' && workspace.ident !== 'tailwindcss-react-aria-components' @@ -123,7 +123,7 @@ function isOurPackage(dependency) { || name.includes('@spectrum-icons') || name.startsWith('react-aria-components') || name.startsWith('tailwindcss-react-aria-components') - || name.startsWith('react-aria') + || name.startsWith('@react-aria-nutrient/react-aria') || name.startsWith('react-stately'); } @@ -278,11 +278,11 @@ function enforceExports({Yarn}) { workspace.set('types', 'dist/types.d.ts'); } - if (name !== '@adobe/react-spectrum' && name !== 'react-aria' && name !== 'react-stately' && name !== '@internationalized/string-compiler' && name !== 'tailwindcss-react-aria-components') { + if (name !== '@adobe/react-spectrum' && name !== '@react-aria-nutrient/react-aria' && name !== 'react-stately' && name !== '@internationalized/string-compiler' && name !== 'tailwindcss-react-aria-components') { workspace.set('source', 'src/index.ts'); } - if (name !== '@adobe/react-spectrum' && name !== 'react-aria' && name !== 'react-stately' && name !== '@internationalized/string-compiler' && name !== 'tailwindcss-react-aria-components') { + if (name !== '@adobe/react-spectrum' && name !== '@react-aria-nutrient/react-aria' && name !== 'react-stately' && name !== '@internationalized/string-compiler' && name !== 'tailwindcss-react-aria-components') { if (!workspace.manifest.files || (!workspace.manifest.files.includes('dist') && !workspace.manifest.files.includes('src'))) { workspace.set('files', [...workspace.manifest.files || [], 'dist', 'src']); } else if (!workspace.manifest.files.includes('dist')) { diff --git a/yarn.lock b/yarn.lock index da9a0325b69..66f260903b6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6500,6 +6500,60 @@ __metadata: languageName: unknown linkType: soft +"@react-aria-nutrient/react-aria@npm:^3.38.1, @react-aria-nutrient/react-aria@workspace:packages/react-aria": + version: 0.0.0-use.local + resolution: "@react-aria-nutrient/react-aria@workspace:packages/react-aria" + dependencies: + "@babel/cli": "npm:^7.24.1" + "@babel/core": "npm:^7.24.3" + "@internationalized/string": "npm:^3.2.5" + "@react-aria-nutrient/breadcrumbs": "npm:^3.5.22" + "@react-aria-nutrient/button": "npm:^3.12.1" + "@react-aria-nutrient/calendar": "npm:^3.7.2" + "@react-aria-nutrient/checkbox": "npm:^3.15.3" + "@react-aria-nutrient/color": "npm:^3.0.5" + "@react-aria-nutrient/combobox": "npm:^3.12.1" + "@react-aria-nutrient/datepicker": "npm:^3.14.1" + "@react-aria-nutrient/dialog": "npm:^3.5.23" + "@react-aria-nutrient/disclosure": "npm:^3.0.3" + "@react-aria-nutrient/dnd": "npm:^3.9.1" + "@react-aria-nutrient/focus": "npm:^3.20.1" + "@react-aria-nutrient/gridlist": "npm:^3.11.1" + "@react-aria-nutrient/i18n": "npm:^3.12.7" + "@react-aria-nutrient/interactions": "npm:^3.24.1" + "@react-aria-nutrient/label": "npm:^3.7.16" + "@react-aria-nutrient/landmark": "npm:^3.0.1" + "@react-aria-nutrient/link": "npm:^3.7.10" + "@react-aria-nutrient/listbox": "npm:^3.14.2" + "@react-aria-nutrient/menu": "npm:^3.18.1" + "@react-aria-nutrient/meter": "npm:^3.4.21" + "@react-aria-nutrient/numberfield": "npm:^3.11.12" + "@react-aria-nutrient/overlays": "npm:^3.26.1" + "@react-aria-nutrient/progress": "npm:^3.4.21" + "@react-aria-nutrient/radio": "npm:^3.11.1" + "@react-aria-nutrient/searchfield": "npm:^3.8.2" + "@react-aria-nutrient/select": "npm:^3.15.3" + "@react-aria-nutrient/selection": "npm:^3.23.1" + "@react-aria-nutrient/separator": "npm:^3.4.7" + "@react-aria-nutrient/slider": "npm:^3.7.17" + "@react-aria-nutrient/ssr": "npm:^3.9.7" + "@react-aria-nutrient/switch": "npm:^3.7.1" + "@react-aria-nutrient/table": "npm:^3.17.1" + "@react-aria-nutrient/tabs": "npm:^3.10.1" + "@react-aria-nutrient/tag": "npm:^3.5.1" + "@react-aria-nutrient/textfield": "npm:^3.17.1" + "@react-aria-nutrient/toast": "npm:^3.0.1" + "@react-aria-nutrient/tooltip": "npm:^3.8.1" + "@react-aria-nutrient/tree": "npm:^3.0.1" + "@react-aria-nutrient/utils": "npm:^3.28.1" + "@react-aria-nutrient/visually-hidden": "npm:^3.8.21" + "@react-types/shared": "npm:^3.28.0" + peerDependencies: + react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1 + react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1 + languageName: unknown + linkType: soft + "@react-aria-nutrient/searchfield@npm:^3.8.2, @react-aria-nutrient/searchfield@workspace:packages/@react-aria/searchfield": version: 0.0.0-use.local resolution: "@react-aria-nutrient/searchfield@workspace:packages/@react-aria/searchfield" @@ -7999,6 +8053,7 @@ __metadata: "@react-aria-nutrient/i18n": "npm:^3.12.7" "@react-aria-nutrient/interactions": "npm:^3.24.1" "@react-aria-nutrient/live-announcer": "npm:^3.4.1" + "@react-aria-nutrient/react-aria": "npm:^3.38.1" "@react-aria-nutrient/test-utils": "npm:1.0.0-alpha.5" "@react-aria-nutrient/utils": "npm:^3.28.1" "@react-spectrum/utils": "npm:^3.12.3" @@ -8015,7 +8070,6 @@ __metadata: "@testing-library/user-event": "npm:^14.0.0" csstype: "npm:^3.0.2" jest: "npm:^29.5.0" - react-aria: "npm:^3.38.1" react-aria-components: "npm:^1.7.1" peerDependencies: react: ^18.0.0 || ^19.0.0-rc.1 @@ -29310,6 +29364,7 @@ __metadata: "@react-aria-nutrient/focus": "npm:^3.20.1" "@react-aria-nutrient/interactions": "npm:^3.24.1" "@react-aria-nutrient/live-announcer": "npm:^3.4.1" + "@react-aria-nutrient/react-aria": "npm:^3.38.1" "@react-aria-nutrient/ssr": "npm:^3.9.7" "@react-aria-nutrient/toolbar": "npm:3.0.0-beta.14" "@react-aria-nutrient/utils": "npm:^3.28.1" @@ -29327,7 +29382,6 @@ __metadata: "@swc/helpers": "npm:^0.5.0" "@tailwindcss/postcss": "npm:^4.0.0" client-only: "npm:^0.0.1" - react-aria: "npm:^3.38.1" react-stately: "npm:^3.36.1" use-sync-external-store: "npm:^1.4.0" peerDependencies: @@ -29336,60 +29390,6 @@ __metadata: languageName: unknown linkType: soft -"react-aria@npm:^3.38.1, react-aria@workspace:packages/react-aria": - version: 0.0.0-use.local - resolution: "react-aria@workspace:packages/react-aria" - dependencies: - "@babel/cli": "npm:^7.24.1" - "@babel/core": "npm:^7.24.3" - "@internationalized/string": "npm:^3.2.5" - "@react-aria-nutrient/breadcrumbs": "npm:^3.5.22" - "@react-aria-nutrient/button": "npm:^3.12.1" - "@react-aria-nutrient/calendar": "npm:^3.7.2" - "@react-aria-nutrient/checkbox": "npm:^3.15.3" - "@react-aria-nutrient/color": "npm:^3.0.5" - "@react-aria-nutrient/combobox": "npm:^3.12.1" - "@react-aria-nutrient/datepicker": "npm:^3.14.1" - "@react-aria-nutrient/dialog": "npm:^3.5.23" - "@react-aria-nutrient/disclosure": "npm:^3.0.3" - "@react-aria-nutrient/dnd": "npm:^3.9.1" - "@react-aria-nutrient/focus": "npm:^3.20.1" - "@react-aria-nutrient/gridlist": "npm:^3.11.1" - "@react-aria-nutrient/i18n": "npm:^3.12.7" - "@react-aria-nutrient/interactions": "npm:^3.24.1" - "@react-aria-nutrient/label": "npm:^3.7.16" - "@react-aria-nutrient/landmark": "npm:^3.0.1" - "@react-aria-nutrient/link": "npm:^3.7.10" - "@react-aria-nutrient/listbox": "npm:^3.14.2" - "@react-aria-nutrient/menu": "npm:^3.18.1" - "@react-aria-nutrient/meter": "npm:^3.4.21" - "@react-aria-nutrient/numberfield": "npm:^3.11.12" - "@react-aria-nutrient/overlays": "npm:^3.26.1" - "@react-aria-nutrient/progress": "npm:^3.4.21" - "@react-aria-nutrient/radio": "npm:^3.11.1" - "@react-aria-nutrient/searchfield": "npm:^3.8.2" - "@react-aria-nutrient/select": "npm:^3.15.3" - "@react-aria-nutrient/selection": "npm:^3.23.1" - "@react-aria-nutrient/separator": "npm:^3.4.7" - "@react-aria-nutrient/slider": "npm:^3.7.17" - "@react-aria-nutrient/ssr": "npm:^3.9.7" - "@react-aria-nutrient/switch": "npm:^3.7.1" - "@react-aria-nutrient/table": "npm:^3.17.1" - "@react-aria-nutrient/tabs": "npm:^3.10.1" - "@react-aria-nutrient/tag": "npm:^3.5.1" - "@react-aria-nutrient/textfield": "npm:^3.17.1" - "@react-aria-nutrient/toast": "npm:^3.0.1" - "@react-aria-nutrient/tooltip": "npm:^3.8.1" - "@react-aria-nutrient/tree": "npm:^3.0.1" - "@react-aria-nutrient/utils": "npm:^3.28.1" - "@react-aria-nutrient/visually-hidden": "npm:^3.8.21" - "@react-types/shared": "npm:^3.28.0" - peerDependencies: - react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1 - react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1 - languageName: unknown - linkType: soft - "react-axe@npm:^3.0.2": version: 3.3.0 resolution: "react-axe@npm:3.3.0"