Skip to content

Commit 95233ec

Browse files
committed
Rename react-aria to "@react-aria-nutrient/*"
1 parent e5b7a19 commit 95233ec

File tree

134 files changed

+155
-155
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+155
-155
lines changed

.storybook-s2/docs/typography.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { style } from '../../packages/@react-spectrum/s2/style/spectrum-theme' with {type: 'macro'};
22
import {Link as S2Link} from '@react-spectrum/s2';
3-
import {useFocusRing, useHover} from 'react-aria';
3+
import {useFocusRing, useHover} from '@react-aria-nutrient/react-aria';
44

55
function AnchorLink({id, isHovered}) {
66
let { isFocusVisible, focusProps } = useFocusRing({within: true});

lib/yarn-plugin-rsp-duplicates.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ module.exports = {
2424
let packages = new Map();
2525
let hasRSP = false;
2626
for (const pkg of project.storedPackages.values()) {
27-
if (!structUtils.isVirtualLocator(pkg) && (pkg.scope === 'react-aria' || pkg.scope === 'react-spectrum' || pkg.scope === 'react-stately')) {
27+
if (!structUtils.isVirtualLocator(pkg) && (pkg.scope === '@react-aria-nutrient/react-aria' || pkg.scope === 'react-spectrum' || pkg.scope === 'react-stately')) {
2828
let key = `@${pkg.scope}/${pkg.name}`;
2929
if (!packages.has(key)) {
3030
packages.set(key, new Set([pkg.version]));

packages/@react-aria-nutrient/autocomplete/docs/useSearchAutocomplete.mdx

+1-1

packages/@react-aria-nutrient/combobox/docs/useComboBox.mdx

+1-1

packages/@react-aria-nutrient/datepicker/docs/useDatePicker.mdx

+1-1

packages/@react-aria-nutrient/datepicker/docs/useDateRangePicker.mdx

+1-1

packages/@react-aria-nutrient/disclosure/docs/useDisclosure.mdx

+1-1

packages/@react-aria-nutrient/menu/docs/useMenu.mdx

+1-1

packages/@react-aria-nutrient/overlays/docs/usePopover.mdx

+1-1

packages/@react-aria-nutrient/select/docs/useSelect.mdx

+1-1

packages/@react-aria-nutrient/ssr/src/SSRProvider.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -152,14 +152,14 @@ function useLegacySSRSafeId(defaultId?: string): string {
152152
}
153153

154154
let counter = useCounter(!!defaultId);
155-
let prefix = ctx === defaultContext && process.env.NODE_ENV === 'test' ? 'react-aria' : `react-aria${ctx.prefix}`;
155+
let prefix = ctx === defaultContext && process.env.NODE_ENV === 'test' ? '@react-aria-nutrient/react-aria' : `react-aria${ctx.prefix}`;
156156
return defaultId || `${prefix}-${counter}`;
157157
}
158158

159159
function useModernSSRSafeId(defaultId?: string): string {
160160
let id = React.useId();
161161
let [didSSR] = useState(useIsSSR());
162-
let prefix = didSSR || process.env.NODE_ENV === 'test' ? 'react-aria' : `react-aria${defaultContext.prefix}`;
162+
let prefix = didSSR || process.env.NODE_ENV === 'test' ? '@react-aria-nutrient/react-aria' : `react-aria${defaultContext.prefix}`;
163163
return defaultId || `${prefix}-${id}`;
164164
}
165165

packages/@react-aria-nutrient/ssr/test/SSRProvider.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ describe('SSRProvider', function () {
3030

3131
let divs = tree.getAllByTestId('test');
3232
if (React.useId) {
33-
expect(divs[0].id.startsWith('react-aria')).toBe(true);
33+
expect(divs[0].id.startsWith('@react-aria-nutrient/react-aria')).toBe(true);
3434
expect(divs[0].id).not.toBe(divs[1].id);
3535
} else {
3636
expect(divs[0].id).toBe('react-aria-1');

packages/@react-aria-nutrient/table/stories/example-docs.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import ariaStyles from './docs-example.css';
1414
import {classNames} from '@react-spectrum/utils';
1515
import {mergeProps} from '@react-aria-nutrient/utils';
1616
import React, {useCallback, useRef} from 'react';
17-
import {useButton} from 'react-aria';
17+
import {useButton} from '@react-aria-nutrient/react-aria';
1818
import {useFocusRing} from '@react-aria-nutrient/focus';
1919
import {useTable, useTableCell, useTableColumnHeader, useTableColumnResize, useTableHeaderRow, useTableRow, useTableRowGroup} from '@react-aria-nutrient/table';
2020
import {useTableColumnResizeState, useTableState} from '@react-stately/table';

packages/@react-aria-nutrient/tabs/docs/useTabList.mdx

+1-1

packages/@react-aria-nutrient/toast/stories/Example.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
import React, {createContext, useContext, useRef} from 'react';
1414
import {ToastState, useToastState} from '@react-stately/toast';
15-
import {useButton} from 'react-aria';
15+
import {useButton} from '@react-aria-nutrient/react-aria';
1616
import {useToast, useToastRegion} from '../src';
1717

1818
const ToastContext = createContext<ToastState<string> | null>(null);

packages/@react-spectrum/dropzone/stories/DropZone.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {Cell, Column, Row, TableBody, TableHeader, TableView} from '@react-spect
1616
import {classNames} from '@react-spectrum/utils';
1717
import {Content} from '@react-spectrum/view';
1818
import {Draggable} from '@react-aria-nutrient/dnd/stories/dnd.stories';
19-
import {DropEvent, FileDropItem, TextDropItem, useDrag} from 'react-aria';
19+
import {DropEvent, FileDropItem, TextDropItem, useDrag} from '@react-aria-nutrient/react-aria';
2020
import {DropZone} from '../';
2121
import File from '@spectrum-icons/illustrations/File';
2222
import {FileTrigger} from 'react-aria-components';

packages/@react-spectrum/s2/chromatic/DropZone.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {Button, ButtonGroup, Content, DropZone, FileTrigger, Heading, Illustrate
1414
import Cloud from '../spectrum-illustrations/linear/Cloud';
1515
import CloudUpload from '../spectrum-illustrations/gradient/generic1/CloudUpload';
1616
import DropToUpload from '../spectrum-illustrations/linear/DropToUpload';
17-
import {FocusRing, mergeProps, useButton, useClipboard, useDrag} from 'react-aria';
17+
import {FocusRing, mergeProps, useButton, useClipboard, useDrag} from '@react-aria-nutrient/react-aria';
1818
import type {Meta} from '@storybook/react';
1919
import React, {useState} from 'react';
2020
import {style} from '../style/spectrum-theme' with { type: 'macro' };

packages/@react-spectrum/s2/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
"@react-types/table": "^3.11.0",
147147
"@react-types/textfield": "^3.12.0",
148148
"csstype": "^3.0.2",
149-
"react-aria": "^3.38.1",
149+
"@react-aria-nutrient/react-aria": "^3.38.1",
150150
"react-aria-components": "^1.7.1"
151151
},
152152
"peerDependencies": {

packages/@react-spectrum/s2/src/ActionBar.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {CloseButton} from './CloseButton';
1616
import {ContextValue, SlotProps} from 'react-aria-components';
1717
import {createContext, ForwardedRef, forwardRef, ReactElement, ReactNode, RefObject, useCallback, useEffect, useMemo, useRef, useState} from 'react';
1818
import {DOMRef, DOMRefValue, Key} from '@react-types/shared';
19-
import {FocusScope, useKeyboard} from 'react-aria';
19+
import {FocusScope, useKeyboard} from '@react-aria-nutrient/react-aria';
2020
// @ts-ignore
2121
import intlMessages from '../intl/*.json';
2222
import {style} from '../style' with {type: 'macro'};

packages/@react-spectrum/s2/src/AvatarGroup.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {filterDOMProps} from '@react-aria-nutrient/utils';
1818
import {getAllowedOverrides, StylesPropWithoutWidth, UnsafeStyles} from './style-utils' with {type: 'macro'};
1919
import {style} from '../style' with {type: 'macro'};
2020
import {useDOMRef} from '@react-spectrum/utils';
21-
import {useLabel} from 'react-aria';
21+
import {useLabel} from '@react-aria-nutrient/react-aria';
2222
import {useSpectrumContextProps} from './useSpectrumContextProps';
2323

2424
export interface AvatarGroupProps extends UnsafeStyles, DOMProps, AriaLabelingProps, SlotProps {

packages/@react-spectrum/s2/src/Breadcrumbs.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import {
2323
Provider,
2424
Breadcrumbs as RACBreadcrumbs
2525
} from 'react-aria-components';
26-
import {AriaBreadcrumbItemProps, useLocale} from 'react-aria';
26+
import {AriaBreadcrumbItemProps, useLocale} from '@react-aria-nutrient/react-aria';
2727
import ChevronIcon from '../ui-icons/Chevron';
2828
import {Collection, DOMRef, DOMRefValue, LinkDOMProps, Node} from '@react-types/shared';
2929
import {createContext, forwardRef, Fragment, ReactNode, RefObject, useCallback, useContext, useEffect, useMemo, useRef, useState} from 'react';

packages/@react-spectrum/s2/src/ComboBox.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ import {HelpTextProps, SpectrumLabelableProps} from '@react-types/shared';
5252
import {IconContext} from './Icon';
5353
import {menu} from './Picker';
5454
import {mergeRefs, useResizeObserver} from '@react-aria-nutrient/utils';
55-
import {Placement} from 'react-aria';
55+
import {Placement} from '@react-aria-nutrient/react-aria';
5656
import {PopoverBase} from './Popover';
5757
import {pressScale} from './pressScale';
5858
import {TextFieldRef} from '@react-types/textfield';

packages/@react-spectrum/s2/src/InlineAlert.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import InfoCircle from '../s2wf-icons/S2_Icon_InfoCircle_20_N.svg';
2525
import intlMessages from '../intl/*.json';
2626
import NoticeSquare from '../s2wf-icons/S2_Icon_AlertDiamond_20_N.svg';
2727
import {useDOMRef} from '@react-spectrum/utils';
28-
import {useFocusRing} from 'react-aria';
28+
import {useFocusRing} from '@react-aria-nutrient/react-aria';
2929
import {useLocalizedStringFormatter} from '@react-aria-nutrient/i18n';
3030
import {useSpectrumContextProps} from './useSpectrumContextProps';
3131

packages/@react-spectrum/s2/src/Menu.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import {IconContext} from './Icon'; // chevron right removed??
4242
import {ImageContext} from './Image';
4343
import LinkOutIcon from '../ui-icons/LinkOut';
4444
import {mergeStyles} from '../style/runtime';
45-
import {Placement, useLocale} from 'react-aria';
45+
import {Placement, useLocale} from '@react-aria-nutrient/react-aria';
4646
import {PopoverBase} from './Popover';
4747
import {PressResponder} from '@react-aria-nutrient/interactions';
4848
import {pressScale} from './pressScale';

packages/@react-spectrum/s2/src/NumberField.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import {FormContext} from './Form';
3232
import {HelpTextProps, SpectrumLabelableProps} from '@react-types/shared';
3333
import {pressScale} from './pressScale';
3434
import {TextFieldRef} from '@react-types/textfield';
35-
import {useButton, useFocusRing, useHover} from 'react-aria';
35+
import {useButton, useFocusRing, useHover} from '@react-aria-nutrient/react-aria';
3636
import {useSpectrumContextProps} from './useSpectrumContextProps';
3737

3838

packages/@react-spectrum/s2/src/Picker.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ import {HeaderContext, HeadingContext, Text, TextContext} from './Content';
5656
import {IconContext} from './Icon';
5757
// @ts-ignore
5858
import intlMessages from '../intl/*.json';
59-
import {Placement} from 'react-aria';
59+
import {Placement} from '@react-aria-nutrient/react-aria';
6060
import {PopoverBase} from './Popover';
6161
import {PressResponder} from '@react-aria-nutrient/interactions';
6262
import {pressScale} from './pressScale';

packages/@react-spectrum/s2/src/TableView.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ import {useLoadMore} from '@react-aria-nutrient/utils';
6868
import {useLocalizedStringFormatter} from '@react-aria-nutrient/i18n';
6969
import {useScale} from './utils';
7070
import {useSpectrumContextProps} from './useSpectrumContextProps';
71-
import {VisuallyHidden} from 'react-aria';
71+
import {VisuallyHidden} from '@react-aria-nutrient/react-aria';
7272

7373
interface S2TableProps {
7474
/** Whether the Table should be displayed with a quiet style. */

packages/@react-spectrum/s2/src/TabsPicker.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import {FocusableRef, FocusableRefValue, SpectrumLabelableProps} from '@react-ty
4444
import {forwardRefType} from './types';
4545
import {HeaderContext, HeadingContext, Text, TextContext} from './Content';
4646
import {IconContext} from './Icon';
47-
import {Placement} from 'react-aria';
47+
import {Placement} from '@react-aria-nutrient/react-aria';
4848
import {PopoverBase} from './Popover';
4949
import {pressScale} from './pressScale';
5050
import {raw} from '../style/style-macro' with {type: 'macro'};

packages/@react-spectrum/s2/src/TreeView.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import {raw} from '../style/style-macro' with {type: 'macro'};
3838
import React, {createContext, forwardRef, JSXElementConstructor, ReactElement, ReactNode, useContext, useRef} from 'react';
3939
import {TextContext} from './Content';
4040
import {useDOMRef} from '@react-spectrum/utils';
41-
import {useLocale} from 'react-aria';
41+
import {useLocale} from '@react-aria-nutrient/react-aria';
4242
import {useScale} from './utils';
4343

4444
interface S2TreeProps {

packages/@react-spectrum/s2/src/useSpectrumContextProps.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
import {Context, ForwardedRef, useMemo} from 'react';
1414
import {ContextValue, SlotProps, useSlottedContext} from 'react-aria-components';
15-
import {mergeProps, useObjectRef} from 'react-aria';
15+
import {mergeProps, useObjectRef} from '@react-aria-nutrient/react-aria';
1616
import {mergeRefs} from '@react-aria-nutrient/utils';
1717
import {mergeStyles} from '../style/runtime';
1818
import {RefObject} from '@react-types/shared';

packages/@react-spectrum/s2/stories/Accordion.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

1313
import {Accordion, ActionButton, Disclosure, DisclosureHeader, DisclosurePanel, DisclosureTitle, TextField} from '../src';
14-
import {Key} from 'react-aria';
14+
import {Key} from '@react-aria-nutrient/react-aria';
1515
import type {Meta, StoryObj} from '@storybook/react';
1616
import NewIcon from '../s2wf-icons/S2_Icon_New_20_N.svg';
1717
import React from 'react';

packages/@react-spectrum/s2/stories/ActionButton.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import type {Meta, StoryObj} from '@storybook/react';
1818
import NewIcon from '../s2wf-icons/S2_Icon_New_20_N.svg';
1919
import {style} from '../style' with { type: 'macro' };
2020
import './unsafe.css';
21-
import {useNumberFormatter} from 'react-aria';
21+
import {useNumberFormatter} from '@react-aria-nutrient/react-aria';
2222

2323
const meta: Meta<typeof ActionButton> = {
2424
component: ActionButton,

packages/@react-spectrum/s2/stories/Breadcrumbs.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export const Example = (args: any) => (
5555

5656
let items = [
5757
{id: 'home', name: 'Home'},
58-
{id: 'react-aria', name: 'React Aria'},
58+
{id: '@react-aria-nutrient/react-aria', name: 'React Aria'},
5959
{id: 'breadcrumbs', name: 'Breadcrumbs'}
6060
];
6161
export const WithActions = (args: any) => (

packages/@react-spectrum/s2/stories/DropZone.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {categorizeArgTypes} from './utils';
1515
import Cloud from '../spectrum-illustrations/linear/Cloud';
1616
import CloudUpload from '../spectrum-illustrations/gradient/generic1/CloudUpload';
1717
import DropToUpload from '../spectrum-illustrations/linear/DropToUpload';
18-
import {FocusRing, mergeProps, useButton, useClipboard, useDrag} from 'react-aria';
18+
import {FocusRing, mergeProps, useButton, useClipboard, useDrag} from '@react-aria-nutrient/react-aria';
1919
import type {Meta} from '@storybook/react';
2020
import React, {useState} from 'react';
2121
import {style} from '../style' with { type: 'macro' };

packages/@react-stately/combobox/test/useComboBoxState.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {actHook as act, renderHook} from '@react-spectrum/test-utils-internal';
1414
import {Item} from '@react-stately/collections';
1515
import React from 'react';
1616
import {useComboBoxState} from '../';
17-
import {useFilter} from 'react-aria';
17+
import {useFilter} from '@react-aria-nutrient/react-aria';
1818

1919
describe('useComboBoxState tests', function () {
2020
describe('open state', function () {

packages/@react-stately/tooltip/test/useTooltipTriggerState.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

1313
import {act, fireEvent, render} from '@react-spectrum/test-utils-internal';
14-
import {mergeProps, useTooltip, useTooltipTrigger} from 'react-aria';
14+
import {mergeProps, useTooltip, useTooltipTrigger} from '@react-aria-nutrient/react-aria';
1515
import React from 'react';
1616
import {useTooltipTriggerState} from '../src';
1717

packages/dev/codemods/src/use-monopackages/src/codemod.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ export default function transformer(file: FileInfo, api: API, options: Options)
3131
monopackage: '@adobe/react-spectrum',
3232
individualPrefix: '@react-spectrum/'
3333
},
34-
'react-aria': {
35-
monopackage: 'react-aria',
34+
'@react-aria-nutrient/react-aria': {
35+
monopackage: '@react-aria-nutrient/react-aria',
3636
individualPrefix: '@react-aria-nutrient/'
3737
},
3838
'react-stately': {

packages/dev/docs/pages/react-aria/home/A11y.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {Button} from 'tailwind-starter/Button';
1414
import {ChevronDown, WifiIcon} from 'lucide-react';
1515
import {createPortal, flushSync} from 'react-dom';
1616
import {Finger} from './components';
17-
import {Key, useDateFormatter} from 'react-aria';
17+
import {Key, useDateFormatter} from '@react-aria-nutrient/react-aria';
1818
import {Label} from 'tailwind-starter/Field';
1919
import {ListBox, Select, SelectValue} from 'react-aria-components';
2020
import {Popover} from 'tailwind-starter/Popover';

packages/dev/docs/pages/react-aria/home/ExampleApp.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import {Tag, TagGroup} from 'tailwind-starter/TagGroup';
3232
import {TextField} from 'tailwind-starter/TextField';
3333
import {Tooltip} from 'tailwind-starter/Tooltip';
3434
import {tv} from 'tailwind-variants';
35-
import {useCollator, useFilter, VisuallyHidden} from 'react-aria';
35+
import {useCollator, useFilter, VisuallyHidden} from '@react-aria-nutrient/react-aria';
3636
import {useMediaQuery} from '@react-spectrum/utils';
3737

3838
type Plant = typeof plants[0] & {isFavorite: boolean};

packages/dev/docs/pages/react-aria/hooks.mdx

+2-2

packages/dev/docs/pages/react-aria/index.mdx

+1-1

0 commit comments

Comments
 (0)