Merge branch 'ritesh/rename-packages' of https://github.com/PSPDFKit-labs/react-spectrum into ritesh/react-aria-renaming

Author: ritz078

.parcelrc

@@ -10,7 +10,7 @@
     "bundle-text:*.svg": ["@parcel/transformer-svg", "@parcel/transformer-inline-string"],
     "*.{md,mdx}": ["parcel-transformer-mdx-docs"],
     "*.svg": ["@parcel/transformer-svg-react"],
-    "packages/@react-aria-nutrient/example-theme/**/*.css": ["@parcel/transformer-css"],
+    "packages/@react-aria/example-theme/**/*.css": ["@parcel/transformer-css"],
     "*.css": ["...", "parcel-transformer-css-env"],
     "*.{js,mjs,jsm,jsx,es6,cjs,ts,tsx}": [
       "@parcel/transformer-js",

.storybook/main.js

@@ -1,7 +1,7 @@
 
 module.exports = {
   stories: [
-    '../packages/@{react-aria-nutrient,react-stately,spectrum-icons}/*/stories/*.stories.{js,jsx,ts,tsx}',
+    '../packages/@{react-aria,react-stately,spectrum-icons}/*/stories/*.stories.{js,jsx,ts,tsx}',
     '../packages/@react-spectrum/!(s2)/stories/*.stories.{js,jsx,ts,tsx}',
     '../packages/react-aria-components/stories/*.stories.{js,jsx,ts,tsx}'
   ],

CONTRIBUTING.md

@@ -209,7 +209,7 @@ It's likely that you are using a different version of Node.js. Please use Node.j
 For example:
 
 ```
-@parcel/core: packages/@react-aria-nutrient/virtualizer/src/index.ts does not export 'useVirtualizer'
+@parcel/core: packages/@react-aria/virtualizer/src/index.ts does not export 'useVirtualizer'
 ```
 
 You may have run `yarn build` before. Please run `make clean_all && yarn` to clean up the build artifacts.

Makefile

@@ -34,7 +34,7 @@ clean_dist:
 	rm -rf packages/{react-aria,react-aria-components,react-stately}/dist
 	rm -rf packages/{react-aria,react-aria-components,react-stately}/i18n
 	rm -rf packages/@adobe/react-spectrum/i18n
-	rm -rf packages/@react-aria-nutrient/i18n/server
+	rm -rf packages/@react-aria/i18n/server
 	rm -rf packages/@react-spectrum/s2/style/dist packages/@react-spectrum/s2/page.css packages/@react-spectrum/s2/icons packages/@react-spectrum/s2/illustrations
 
 clean_parcel:
@@ -102,9 +102,9 @@ publish-nightly: build
 	yarn publish:nightly
 
 build:
-	parcel build packages/@react-{spectrum,aria-nutrient,stately}/*/ packages/@internationalized/{message,string,date,number}/ packages/react-aria-components --no-optimize --config .parcelrc-build
+	parcel build packages/@react-{spectrum,aria,stately}/*/ packages/@internationalized/{message,string,date,number}/ packages/react-aria-components --no-optimize --config .parcelrc-build
 	yarn workspaces foreach --all -pt run prepublishOnly
-	for pkg in packages/@react-{spectrum,aria-nutrient,stately}/*/  packages/@internationalized/{message,string,date,number}/ packages/@adobe/react-spectrum/ packages/react-aria/ packages/react-stately/ packages/react-aria-components/; \
+	for pkg in packages/@react-{spectrum,aria,stately}/*/  packages/@internationalized/{message,string,date,number}/ packages/@adobe/react-spectrum/ packages/react-aria/ packages/react-stately/ packages/react-aria-components/; \
 		do node scripts/buildEsm.js $$pkg; \
 	done
 	node scripts/buildI18n.js

eslint.config.mjs

@@ -34,7 +34,7 @@ const ERROR = 2;
 
 export default [{
     ignores: [
-        "packages/@react-aria-nutrient/i18n/server",
+        "packages/@react-aria/i18n/server",
         "packages/@spectrum-icons/color/**/*",
         "packages/@spectrum-icons/ui/**/*",
         "packages/@spectrum-icons/workflow/**/*",
@@ -462,8 +462,8 @@ export default [{
     },
 }, {
     files: [
-        "packages/@react-aria-nutrient/focus/src/**/*.ts",
-        "packages/@react-aria-nutrient/focus/src/**/*.tsx",
+        "packages/@react-aria/focus/src/**/*.ts",
+        "packages/@react-aria/focus/src/**/*.tsx",
     ],
 
     rules: {
@@ -477,8 +477,8 @@ export default [{
     },
 }, {
     files: [
-        "packages/@react-aria-nutrient/interactions/src/**/*.ts",
-        "packages/@react-aria-nutrient/interactions/src/**/*.tsx",
+        "packages/@react-aria/interactions/src/**/*.ts",
+        "packages/@react-aria/interactions/src/**/*.tsx",
     ],
 
     rules: {

packages/@internationalized/number/test/NumberParser.test.js

@@ -11,7 +11,7 @@
  */
 
 import fc from 'fast-check';
-import messages from '../../../@react-aria-nutrient/numberfield/intl/*.json';
+import messages from '../../../@react-aria/numberfield/intl/*.json';
 import {NumberParser} from '../src/NumberParser';
 
 // for some reason hu-HU isn't supported in jsdom/node

packages/@react-spectrum/dnd/docs/dnd.mdx

@@ -15,12 +15,12 @@ import docs from 'docs:@react-spectrum/dnd';
 import dndDocs from 'docs:@react-types/shared/src/dnd.d.ts';
 import {FunctionAPI, PageDescription, TypeContext, InterfaceType} from '@react-spectrum/docs';
 import {Keyboard} from '@react-spectrum/text';
-import DragPreview from '../../../@react-aria-nutrient/dnd/docs/DragPreview.svg';
-import BetweenDropPosition from '../../../@react-aria-nutrient/dnd/docs/BetweenDropPosition.svg';
-import OnDropPosition from '../../../@react-aria-nutrient/dnd/docs/OnDropPosition.svg';
-import RootDropPosition from '../../../@react-aria-nutrient/dnd/docs/RootDropPosition.svg';
-import DragAffordance from '../../../@react-aria-nutrient/dnd/docs/DragAffordance.svg';
-import Anatomy from '../../../@react-aria-nutrient/dnd/docs/Anatomy.svg';
+import DragPreview from '../../../@react-aria/dnd/docs/DragPreview.svg';
+import BetweenDropPosition from '../../../@react-aria/dnd/docs/BetweenDropPosition.svg';
+import OnDropPosition from '../../../@react-aria/dnd/docs/OnDropPosition.svg';
+import RootDropPosition from '../../../@react-aria/dnd/docs/RootDropPosition.svg';
+import DragAffordance from '../../../@react-aria/dnd/docs/DragAffordance.svg';
+import Anatomy from '../../../@react-aria/dnd/docs/Anatomy.svg';
 
 ---
 category: Concepts

packages/@react-spectrum/numberfield/test/NumberField.test.js

@@ -16,7 +16,7 @@ import {announce} from '@react-aria-nutrient/live-announcer';
 import {Button} from '@react-spectrum/button';
 import {chain} from '@react-aria-nutrient/utils';
 import {Form} from '@react-spectrum/form';
-import messages from '../../../@react-aria-nutrient/numberfield/intl/*.json';
+import messages from '../../../@react-aria/numberfield/intl/*.json';
 import {NumberField} from '../';
 import {Provider} from '@react-spectrum/provider';
 import React, {useState} from 'react';

packages/@react-spectrum/table/stories/TableDnD.stories.tsx

@@ -15,7 +15,7 @@ import {ComponentMeta} from '@storybook/react';
 import defaultConfig, {TableStory} from './Table.stories';
 import {Divider} from '@react-spectrum/divider';
 import {DragBetweenTablesExample, DragBetweenTablesRootOnlyExample, DragExample, DragOntoRowExample, DragWithoutRowHeaderExample, items, ReorderExample} from './TableDnDExamples';
-import {Droppable} from '../../../@react-aria-nutrient/dnd/stories/dnd.stories';
+import {Droppable} from '../../../@react-aria/dnd/stories/dnd.stories';
 import {Flex} from '@react-spectrum/layout';
 import React from 'react';
 import {TableView} from '../';

packages/@react-spectrum/table/stories/TableDnDUtil.stories.tsx

@@ -14,7 +14,7 @@ import {action} from '@storybook/addon-actions';
 import {ComponentMeta} from '@storybook/react';
 import defaultConfig, {TableStory} from './Table.stories';
 import {DragBetweenTablesComplex, DragBetweenTablesOverride, DragExampleUtilHandlers, FinderDropUtilHandlers, InsertExampleUtilHandlers, ItemDropExampleUtilHandlers, ReorderExampleUtilHandlers, RootDropExampleUtilHandlers} from './TableDnDUtilExamples';
-import {Droppable} from '../../../@react-aria-nutrient/dnd/stories/dnd.stories';
+import {Droppable} from '../../../@react-aria/dnd/stories/dnd.stories';
 import {Flex} from '@react-spectrum/layout';
 import React from 'react';
 import {TableView} from '..';

packages/dev/docs/pages/blog/building-a-combobox.mdx

@@ -63,7 +63,7 @@ space for the tray.
 
 Luckily for us, iOS 13 added support for the [VisualViewport](https://developer.mozilla.org/en-US/docs/Web/API/VisualViewport) API. By querying `window.visualViewport.height` we could get a reliable measurement of how much vertical space was available on screen. Furthermore, we could track
 when the onscreen keyboard was opened or dismissed by listening to the VisualViewport's `resize` event. Leveraging these two allowed us to create a tray that properly adjusts to the presence of iOS onscreen keyboard. Check out the video below
-to see how the ComboBox tray worked before and after we switched to the VisualViewport API. If you'd like to track the visual viewport size in your own app, you can use the [useViewportSize](https://github.com/adobe/react-spectrum/blob/main/packages/@react-aria-nutrient/utils/src/useViewportSize.ts) hook available in the `@react-aria-nutrient/utils` package.
+to see how the ComboBox tray worked before and after we switched to the VisualViewport API. If you'd like to track the visual viewport size in your own app, you can use the [useViewportSize](https://github.com/adobe/react-spectrum/blob/main/packages/@react-aria/utils/src/useViewportSize.ts) hook available in the `@react-aria-nutrient/utils` package.
 
 <Video src={comboboxVisualViewportUrl} loop autoPlay muted style={{maxWidth: 'min(80%, 350px)', display: 'block', margin: '20px auto'}} />
 
@@ -72,7 +72,7 @@ to see how the ComboBox tray worked before and after we switched to the VisualVi
 Another issue we encountered had to do with iOS Safari page scrolling behavior. When the onscreen keyboard is visible, iOS Safari makes the page scrollable so that users can still access content that is hidden behind the keyboard. However,
 now that our ComboBox tray sizes itself to fit in the visual viewport, users could now scroll the entire tray itself off screen. To stop this from happening, we prevent default on `touchmove` events that happen on the document body
 or root element of the document. This preserves the user's ability to scroll through the options in the tray but blocks any attempt to scroll the page itself until the tray is closed. The video below
-illustrates the difference in scrolling behavior before and after our fix. If you are building your own overlays and would like to prevent this kind of document scrolling behavior, check out the [usePreventScroll](https://github.com/adobe/react-spectrum/blob/main/packages/@react-aria-nutrient/overlays/src/usePreventScroll.ts) hook in the `react-aria/overlays` package.
+illustrates the difference in scrolling behavior before and after our fix. If you are building your own overlays and would like to prevent this kind of document scrolling behavior, check out the [usePreventScroll](https://github.com/adobe/react-spectrum/blob/main/packages/@react-aria/overlays/src/usePreventScroll.ts) hook in the `react-aria/overlays` package.
 
 <Video src={comboboxScrollingUrl} loop autoPlay muted style={{maxWidth: 'min(80%, 350px)', display: 'block', margin: '20px auto'}} />
 
@@ -94,7 +94,7 @@ set. Therefore, we had to figure out a way to make the input and listbox the onl
 The solution that we came up with was to crawl the DOM and apply `aria-hidden` to every element that wasn't the input or listbox. To crawl the DOM we used a [TreeWalker](https://developer.mozilla.org/en-US/docs/Web/API/TreeWalker),
 setting up a node filter to determine if a node should be left visible, hidden, or skipped in the case where its parent was already hidden. In addition, we watch for any changes in the DOM while the listbox is open
 via a [MutationObserver](https://developer.mozilla.org/en-US/docs/Web/API/MutationObserver), hiding those new elements if need be. When the popover closes, every node that we modified is reverted back to its previous state.
-Check out our [ariaHideOutside](https://github.com/adobe/react-spectrum/blob/main/packages/@react-aria-nutrient/overlays/src/ariaHideOutside.ts) function in `@react-aria-nutrient/overlays` if you'd like to learn more.
+Check out our [ariaHideOutside](https://github.com/adobe/react-spectrum/blob/main/packages/@react-aria/overlays/src/ariaHideOutside.ts) function in `@react-aria-nutrient/overlays` if you'd like to learn more.
 
 ### Mobile implementation divergence
 
@@ -133,7 +133,7 @@ Special care was taken such that the messages themselves only contained relevant
 When the user then moves to a different option in the same section, only the newly focused item name is announced. Similarly, the total option count is only announced when number of options available in the listbox changes. Since many of these messages were added to fill in gaps in VoiceOver's announcement,
 we only trigger the `LiveAnnouncer` on Apple devices to avoid announcement overlap on other screen readers.
 
-If you are interested in using this `LiveAnnouncer` yourself, check out [LiveAnnouncer](https://github.com/adobe/react-spectrum/blob/main/packages/@react-aria-nutrient/live-announcer/src/LiveAnnouncer.tsx) in `@react-aria-nutrient/live-announcer`. Otherwise, the [useComboBox](../react-aria/useComboBox.html) hook provides you with all of the custom messaging out of the box. See the video below for a sneak peek!
+If you are interested in using this `LiveAnnouncer` yourself, check out [LiveAnnouncer](https://github.com/adobe/react-spectrum/blob/main/packages/@react-aria/live-announcer/src/LiveAnnouncer.tsx) in `@react-aria-nutrient/live-announcer`. Otherwise, the [useComboBox](../react-aria/useComboBox.html) hook provides you with all of the custom messaging out of the box. See the video below for a sneak peek!
 
 <Video src={comboboxAccessibilityUrl} alt="Demo of VoiceOver announcement in ComboBox" style={{maxWidth: 'min(100%, 700px)', display: 'block', margin: '20px auto'}} controls />
 

scripts/extractStarter.mjs

@@ -109,7 +109,7 @@ function MyTreeItemContent`);
   }
 }
 
-let theme = fs.readFileSync('packages/@react-aria-nutrient/example-theme/src/index.css', 'utf8');
+let theme = fs.readFileSync('packages/@react-aria/example-theme/src/index.css', 'utf8');
 theme = `/* Base styles */
 :root {
   font-family: system-ui;

scripts/lint-packages.js

@@ -73,7 +73,7 @@ for (let pkgPath of packagePaths) {
 for (let pkg of packagePaths) {
   let json = packages[pkg];
 
-  if (!pkg.includes('@react-types') && !pkg.includes('@spectrum-icons') && !pkg.includes('@react-aria-nutrient/example-theme') && !pkg.includes('@react-spectrum/style-macro-s1') && json.rsp?.type !== 'cli') {
+  if (!pkg.includes('@react-types') && !pkg.includes('@spectrum-icons') && !pkg.includes('@react-aria/example-theme') && !pkg.includes('@react-spectrum/style-macro-s1') && json.rsp?.type !== 'cli') {
     let topIndexExists = fs.existsSync(path.join(pkg, '..', 'index.ts'));
     if (topIndexExists) {
       let contents = fs.readFileSync(path.join(pkg, '..', 'index.ts'));

scripts/plopfile.js

@@ -78,7 +78,7 @@ module.exports = function (plop) {
             type: 'addMany',
             templateFiles: '../plop-templates/@react-aria-nutrient/**',
             base: '../plop-templates/@react-aria-nutrient/',
-            destination: `../packages/@react-aria-nutrient/${packageName}`,
+            destination: `../packages/@react-aria/${packageName}`,
             data: {componentName, scopes}
           });
         }

scripts/react-16-install-prep.mjs

@@ -13,10 +13,10 @@ try {
 }
 
 try {
-  let content = fs.readFileSync('./packages/@react-aria-nutrient/test-utils/package.json', 'utf8');
+  let content = fs.readFileSync('./packages/@react-aria/test-utils/package.json', 'utf8');
   let pkg = JSON.parse(content);
   pkg.peerDependencies['@testing-library/react'] = '^12';
-  fs.writeFileSync('./packages/@react-aria-nutrient/test-utils/package.json', JSON.stringify(pkg, null, 2));
+  fs.writeFileSync('./packages/@react-aria/test-utils/package.json', JSON.stringify(pkg, null, 2));
 } catch (e) {
   console.error('Error:', e);
 }

scripts/react-17-install-prep.mjs

@@ -13,10 +13,10 @@ try {
 }
 
 try {
-  let content = fs.readFileSync('./packages/@react-aria-nutrient/test-utils/package.json', 'utf8');
+  let content = fs.readFileSync('./packages/@react-aria/test-utils/package.json', 'utf8');
   let pkg = JSON.parse(content);
   pkg.peerDependencies['@testing-library/react'] = '^12';
-  fs.writeFileSync('./packages/@react-aria-nutrient/test-utils/package.json', JSON.stringify(pkg, null, 2));
+  fs.writeFileSync('./packages/@react-aria/test-utils/package.json', JSON.stringify(pkg, null, 2));
 } catch (e) {
   console.error('Error:', e);
 }