@pingux/astro 1.41.0-alpha.5 → 1.42.0-alpha.0

package/lib/components/PopoverMenu/PopoverMenu.js

@@ -17,9 +17,11 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 import React, { forwardRef, useImperativeHandle, useRef } from 'react';
 import PropTypes from 'prop-types';
-import { DismissButton, FocusScope, useMenuTrigger, useOverlayPosition } from 'react-aria';
-import { useMenuTriggerState } from 'react-stately';
+import { DismissButton, useOverlayPosition } from '@react-aria/overlays';
+import { FocusScope } from '@react-aria/focus';
 import { PressResponder } from '@react-aria/interactions';
+import { useMenuTrigger } from '@react-aria/menu';
+import { useMenuTriggerState } from '@react-stately/menu';
 import PopoverContainer from '../PopoverContainer';
 import { MenuContext } from '../../context/MenuContext';
 /**

package/lib/components/RadioField/RadioField.js

@@ -16,14 +16,13 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 import React, { forwardRef, createContext, useContext, useRef, useImperativeHandle } from 'react';
 import PropTypes from 'prop-types';
-import { useRadio } from 'react-aria';
+import { useRadio } from '@react-aria/radio';
 import { useField, usePropWarning } from '../../hooks';
 import statuses from '../../utils/devUtils/constants/statuses';
 import Box from '../Box';
 import Radio from '../Radio';
 import Label from '../Label';
 import FieldHelperText from '../FieldHelperText';
-import { ariaAttributesBasePropTypes } from '../../utils/devUtils/props/ariaAttributes';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 export var RadioContext = /*#__PURE__*/createContext();
 /**
@@ -71,25 +70,22 @@ var RadioField = /*#__PURE__*/forwardRef(function (props, ref) {
     controlProps: _objectSpread(_objectSpread({}, controlProps), inputProps)
   })),
       fieldContainerProps = _useField.fieldContainerProps,
-      fieldControlInputProps = _useField.fieldControlInputProps,
-      fieldControlWrapperProps = _useField.fieldControlWrapperProps,
+      fieldControlProps = _useField.fieldControlProps,
       fieldLabelProps = _useField.fieldLabelProps;
 
   return ___EmotionJSX(Box, _extends({
-    variant: "forms.radio.outerContainer"
+    variant: "forms.radioField"
   }, fieldContainerProps), ___EmotionJSX(Label, _extends({
     variant: "forms.label.radio"
-  }, fieldLabelProps), ___EmotionJSX(Box, fieldControlWrapperProps, ___EmotionJSX(Radio, _extends({
+  }, fieldLabelProps), ___EmotionJSX(Radio, _extends({
     ref: radioFieldRef
-  }, fieldControlInputProps, {
-    variant: "forms.radio.base"
-  }))), label), helperText && ___EmotionJSX(FieldHelperText, {
+  }, fieldControlProps)), label), helperText && ___EmotionJSX(FieldHelperText, {
     status: status
   }, helperText), isChecked && checkedContent && ___EmotionJSX(Box, {
-    variant: "forms.radio.checkedContent"
+    variant: "boxes.radioCheckedContent"
   }, checkedContent));
 });
-RadioField.propTypes = _objectSpread({
+RadioField.propTypes = {
   /** Content to display when the radio is checked. */
   checkedContent: PropTypes.node,
 
@@ -154,7 +150,16 @@ RadioField.propTypes = _objectSpread({
    * Identifies the element (or elements) that provide a detailed, extended description for the
    * object.
   */
-  'aria-details': PropTypes.string
-}, ariaAttributesBasePropTypes);
+  'aria-details': PropTypes.string,
+
+  /** Props object that is spread directly into the root (top-level) element. */
+  containerProps: PropTypes.shape({}),
+
+  /** Props object that is spread directly into the input element. */
+  controlProps: PropTypes.shape({}),
+
+  /** Props object that is spread directly into the label element. */
+  labelProps: PropTypes.shape({})
+};
 RadioField.displayName = 'RadioField';
 export default RadioField;

package/lib/components/RadioGroupField/RadioGroupField.js

@@ -14,14 +14,13 @@ function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context, _context2; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(source), !0)).call(_context, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context2 = ownKeys(Object(source))).call(_context2, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-import React, { forwardRef, useMemo } from 'react';
+import React, { forwardRef } from 'react';
+import { useRadioGroup } from '@react-aria/radio';
+import { useRadioGroupState } from '@react-stately/radio';
 import PropTypes from 'prop-types';
-import { useRadioGroup } from 'react-aria';
-import { useRadioGroupState } from 'react-stately';
 import { v4 as uuid } from 'uuid';
 import { Box, FieldHelperText, Label } from '../../';
 import { ariaAttributesBasePropTypes } from '../../utils/devUtils/props/ariaAttributes';
-import { inputFieldAttributesBasePropTypes } from '../../utils/devUtils/props/fieldAttributes';
 import { useStatusClasses, usePropWarning } from '../../hooks';
 import ORIENTATION from '../../utils/devUtils/constants/orientation';
 import { RadioContext } from '../RadioField';
@@ -61,9 +60,7 @@ var RadioGroupField = /*#__PURE__*/forwardRef(function (props, ref) {
   var unhandledAriaProps = {
     'aria-controls': props['aria-controls']
   };
-  var helperTextId = useMemo(function () {
-    return uuid();
-  }, []);
+  var helperTextId = uuid();
   return ___EmotionJSX(Box, _extends({
     ref: ref,
     className: classNames
@@ -89,7 +86,7 @@ var RadioGroupField = /*#__PURE__*/forwardRef(function (props, ref) {
     id: helperTextId
   }, helperText));
 });
-RadioGroupField.propTypes = _objectSpread(_objectSpread({
+RadioGroupField.propTypes = _objectSpread({
   /** The name of the RadioGroupField, used when submitting an HTML form. See [MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#name_and_radio_buttons). */
   name: PropTypes.string,
 
@@ -132,6 +129,6 @@ RadioGroupField.propTypes = _objectSpread(_objectSpread({
 
   /** The element's unique identifier. See [MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/id). */
   id: PropTypes.string
-}, ariaAttributesBasePropTypes), inputFieldAttributesBasePropTypes);
+}, ariaAttributesBasePropTypes);
 RadioGroupField.displayName = 'RadioGroupField';
 export default RadioGroupField;

package/lib/components/RockerButton/RockerButton.js

@@ -15,8 +15,8 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 import React, { forwardRef, useContext, useImperativeHandle, useRef } from 'react';
 import PropTypes from 'prop-types';
-import { FocusRing } from 'react-aria';
-import { Item } from 'react-stately';
+import { Item } from '@react-stately/collections';
+import { FocusRing } from '@react-aria/focus';
 import { useRockerButton, useStatusClasses, usePropWarning } from '../../hooks';
 import { Box } from '../../index';
 import { RockerContext } from '../RockerButtonGroup';
@@ -57,7 +57,7 @@ export var CollectionRockerButton = /*#__PURE__*/forwardRef(function (props, ref
   }, ___EmotionJSX(Box, _extends({
     as: "button",
     className: classNames,
-    variant: "variants.rockerButton.thumbSwitch"
+    variant: "buttons.rocker"
   }, rockerButtonProps, {
     ref: rockerButtonRef
   }, itemProps, {

package/lib/components/RockerButtonGroup/RockerButtonGroup.js

@@ -19,8 +19,8 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 import React, { forwardRef, useImperativeHandle, useRef } from 'react';
 import PropTypes from 'prop-types';
-import { useTabList } from 'react-aria';
-import { useTabListState } from 'react-stately';
+import { useTabList } from '@react-aria/tabs';
+import { useTabListState } from '@react-stately/tabs';
 import { usePropWarning } from '../../hooks';
 import Box from '../Box';
 import { CollectionRockerButton } from '../RockerButton';
@@ -59,9 +59,9 @@ var RockerButtonGroup = /*#__PURE__*/forwardRef(function (props, ref) {
   return ___EmotionJSX(RockerContext.Provider, {
     value: state
   }, ___EmotionJSX(Box, _extends({
-    variant: "rockerButton.container"
+    variant: "rockerbutton.rockerContainer"
   }, others), ___EmotionJSX(Box, _extends({
-    variant: "rockerButton.innerContainer",
+    variant: "rockerbutton.rockerContainerInner",
     isRow: true
   }, tabListProps, raTabListProps, {
     ref: buttonGroupRef,

package/lib/components/ScrollBox/ScrollBox.js

@@ -84,7 +84,7 @@ var ScrollBox = /*#__PURE__*/forwardRef(function (props, ref) {
       classNames = _useStatusClasses.classNames;
 
   return ___EmotionJSX(React.Fragment, null, ___EmotionJSX(Box, {
-    variant: "scrollBox.topShadowBox",
+    variant: "boxes.topShadowScrollbox",
     className: classNames,
     role: "separator"
   }), ___EmotionJSX(Box, _extends({
@@ -94,9 +94,9 @@ var ScrollBox = /*#__PURE__*/forwardRef(function (props, ref) {
       overflowY: 'auto'
     }, sx),
     onScroll: onScroll,
-    variant: "scrollBox.container"
+    variant: "boxes.scrollbox"
   }, others), children), ___EmotionJSX(Box, {
-    variant: "scrollBox.bottomShadowBox",
+    variant: "boxes.bottomShadowScrollbox",
     className: classNames,
     role: "separator"
   }));

package/lib/components/SearchField/SearchField.js

@@ -14,14 +14,13 @@ function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context, _context2; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(source), !0)).call(_context, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context2 = ownKeys(Object(source))).call(_context2, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 import React, { forwardRef, useImperativeHandle, useRef } from 'react';
+import { useSearchField } from '@react-aria/searchfield';
+import { useSearchFieldState } from '@react-stately/searchfield';
 import CloseIcon from 'mdi-react/CloseIcon';
 import SearchIcon from 'mdi-react/SearchIcon';
 import PropTypes from 'prop-types';
-import { useSearchField } from 'react-aria';
-import { useSearchFieldState } from 'react-stately';
 import { Box, Icon, IconButton, Input, Label } from '../../';
 import { ariaAttributesBasePropTypes } from '../../utils/devUtils/props/ariaAttributes';
-import { inputFieldAttributesBasePropTypes } from '../../utils/devUtils/props/fieldAttributes';
 import { useField, usePropWarning } from '../../hooks';
 /**
  * Renders a search field with associated controls including visual elements and keyboard
@@ -67,8 +66,7 @@ var SearchField = /*#__PURE__*/forwardRef(function (props, ref) {
     controlProps: _objectSpread(_objectSpread({}, controlProps), raInputProps)
   })),
       fieldContainerProps = _useField.fieldContainerProps,
-      fieldControlInputProps = _useField.fieldControlInputProps,
-      fieldControlWrapperProps = _useField.fieldControlWrapperProps,
+      fieldControlProps = _useField.fieldControlProps,
       fieldLabelProps = _useField.fieldLabelProps;
 
   var handleKeyDownEvent = function handleKeyDownEvent(e) {
@@ -79,13 +77,15 @@ var SearchField = /*#__PURE__*/forwardRef(function (props, ref) {
     }
   };
 
-  return ___EmotionJSX(Box, fieldContainerProps, label && ___EmotionJSX(Label, fieldLabelProps), ___EmotionJSX(Box, _extends({
-    variant: "forms.search.wrapper"
-  }, fieldControlWrapperProps), ___EmotionJSX(Input, _extends({
+  return ___EmotionJSX(Box, fieldContainerProps, label && ___EmotionJSX(Label, fieldLabelProps), ___EmotionJSX(Box, {
+    variant: "forms.search.container"
+  }, ___EmotionJSX(Input, _extends({
     ref: searchRef,
     pl: 40,
     pr: 40
-  }, fieldControlInputProps)), icon && ___EmotionJSX(Icon, _extends({
+  }, fieldControlProps, {
+    variant: "forms.input.search"
+  })), icon && ___EmotionJSX(Icon, _extends({
     icon: icon,
     variant: "forms.search.icon",
     size: 22
@@ -104,7 +104,7 @@ var SearchField = /*#__PURE__*/forwardRef(function (props, ref) {
     icon: CloseIcon
   }))));
 });
-SearchField.propTypes = _objectSpread(_objectSpread({
+SearchField.propTypes = _objectSpread({
   /**
    * @ignore
    * Identifies the currently active element when DOM focus is on a composite widget, textbox,
@@ -203,9 +203,16 @@ SearchField.propTypes = _objectSpread(_objectSpread({
    * (value: string) => void
    */
   onChange: PropTypes.func,
+  containerProps: PropTypes.shape({}),
+
+  /** Props object that is spread into the input element. */
+  controlProps: PropTypes.shape({}),
 
   /** Props object that is spread into the icon element. */
   iconProps: PropTypes.shape({}),
+
+  /** Props object that is spread into the label element. */
+  labelProps: PropTypes.shape({}),
   // NOTE: unsurfaced useSearchField / useSearchFieldState props listed below
 
   /** @ignore Whether the input can be selected but not changed by the user. */
@@ -303,7 +310,7 @@ SearchField.propTypes = _objectSpread(_objectSpread({
    * Handler that is called when the input value is modified. See [MDN](https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/input_event).
    */
   onInput: PropTypes.func
-}, ariaAttributesBasePropTypes), inputFieldAttributesBasePropTypes);
+}, ariaAttributesBasePropTypes);
 SearchField.defaultProps = {
   hasNoClearButton: false,
   icon: SearchIcon

package/lib/components/SearchField/SearchField.stories.js

@@ -19,7 +19,6 @@ import Users from 'mdi-react/AccountGroupIcon';
 import SearchIcon from 'mdi-react/SearchIcon';
 import { Box, SearchField, Text } from '../../';
 import { ariaAttributeBaseArgTypes, ariaAttributeBaseDocSettings } from '../../utils/devUtils/props/ariaAttributes';
-import { inputFieldAttributeBaseArgTypes } from '../../utils/devUtils/props/fieldAttributes';
 import { useDebounce } from '../../hooks';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 export default {
@@ -32,7 +31,7 @@ export default {
       }
     }
   },
-  argTypes: _objectSpread(_objectSpread({
+  argTypes: _objectSpread({
     label: {
       control: {
         type: 'text'
@@ -51,7 +50,10 @@ export default {
     hasAutoFocus: {},
     hasNoClearButton: {},
     autoComplete: {},
+    containerProps: {},
     iconProps: {},
+    controlProps: {},
+    labelProps: {},
     name: {},
     id: {},
     'aria-autocomplete': {
@@ -62,7 +64,7 @@ export default {
         type: 'none'
       }
     }
-  }, ariaAttributeBaseArgTypes), inputFieldAttributeBaseArgTypes)
+  }, ariaAttributeBaseArgTypes)
 };
 export var Default = function Default(args) {
   return ___EmotionJSX(SearchField, _extends({}, args, {

package/lib/components/SelectField/SelectField.js

@@ -20,7 +20,6 @@ import { ariaAttributesBasePropTypes } from '../../utils/devUtils/props/ariaAttr
 import { useSelectField, usePropWarning } from '../../hooks';
 import SelectFieldBase from '../SelectFieldBase';
 import statuses from '../../utils/devUtils/constants/statuses';
-import { inputFieldAttributesBasePropTypes } from '../../utils/devUtils/props/fieldAttributes';
 /**
  * Select field (dropdown) that does not rely on native browser or mobile implementations.
  *
@@ -41,7 +40,7 @@ var SelectField = /*#__PURE__*/forwardRef(function (props, ref) {
     "aria-invalid": status === 'error' && true
   }));
 });
-SelectField.propTypes = _objectSpread(_objectSpread({
+SelectField.propTypes = _objectSpread({
   /** Alignment of the popover menu relative to the trigger. */
   align: PropTypes.oneOf(['start', 'end', 'middle']),
 
@@ -133,14 +132,20 @@ SelectField.propTypes = _objectSpread(_objectSpread({
    *
    * (key: Key) => any
    */
-  onSelectionChange: PropTypes.func
-}, inputFieldAttributesBasePropTypes), {}, {
+  onSelectionChange: PropTypes.func,
+
   /**
    * Props object passed along to `useSelect` from React Aria, `useSelectState` from React Stately,
    * and/or the visible button representation for the select input.
    */
   controlProps: PropTypes.shape({}),
 
+  /** Props object passed along to the root container as-is. */
+  containerProps: PropTypes.shape({}),
+
+  /** Props object passed along to the label as-is. */
+  labelProps: PropTypes.shape({}),
+
   /** Props object that is spread directly into the ScrollBox element. */
   // /** Props object that is spread directly into the ScrollBox element. */
 

package/lib/components/SelectField/SelectField.stories.js

@@ -25,11 +25,10 @@ function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context4, _context5; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context4 = ownKeys(Object(source), !0)).call(_context4, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context5 = ownKeys(Object(source))).call(_context5, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 import React, { useState } from 'react';
-import { OverlayProvider } from 'react-aria';
-import { useAsyncList } from 'react-stately';
+import { OverlayProvider } from '@react-aria/overlays';
+import { useAsyncList } from '@react-stately/data';
 import { Item, Section, SelectField, Separator } from '../../';
 import { ariaAttributeBaseArgTypes } from '../../utils/devUtils/props/ariaAttributes';
-import { inputFieldAttributeBaseArgTypes } from '../../utils/devUtils/props/fieldAttributes';
 import { modes as labelModes } from '../Label/constants';
 import statuses from '../../utils/devUtils/constants/statuses';
 import { jsx as ___EmotionJSX } from "@emotion/react";
@@ -120,7 +119,7 @@ export default {
       }
     }
   },
-  argTypes: _objectSpread(_objectSpread({
+  argTypes: _objectSpread({
     label: {
       control: {
         type: 'text'
@@ -163,12 +162,13 @@ export default {
     isDisabled: {},
     isOpen: {},
     isRequired: {},
+    controlProps: {},
     selectedKey: {
       control: {
         type: 'none'
       }
     }
-  }, ariaAttributeBaseArgTypes), inputFieldAttributeBaseArgTypes)
+  }, ariaAttributeBaseArgTypes)
 };
 export var Default = function Default(args) {
   return ___EmotionJSX(OverlayProvider, null, ___EmotionJSX(SelectField, _extends({}, args, {

package/lib/components/SelectField/SelectField.test.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime-corejs3/helpers/esm/extends";
 import React from 'react';
-import { OverlayProvider } from 'react-aria';
+import { OverlayProvider } from '@react-aria/overlays';
 import userEvent from '@testing-library/user-event';
 import axeTest from '../../utils/testUtils/testAxe';
 import { render, screen } from '../../utils/testUtils/testWrapper';

package/lib/components/SelectFieldBase/SelectFieldBase.js

@@ -9,17 +9,17 @@ import _Object$defineProperty from "@babel/runtime-corejs3/core-js-stable/object
 import _defineProperty from "@babel/runtime-corejs3/helpers/esm/defineProperty";
 import _extends from "@babel/runtime-corejs3/helpers/esm/extends";
 import _objectWithoutProperties from "@babel/runtime-corejs3/helpers/esm/objectWithoutProperties";
-var _excluded = ["columnStyleProps", "defaultText", "fieldContainerProps", "fieldControlInputProps", "fieldControlWrapperProps", "fieldLabelProps", "helperText", "isLoadingInitial", "label", "labelMode", "name", "overlay", "placeholder", "slots", "state", "status", "trigger", "triggerProps", "triggerRef", "valueProps"];
+var _excluded = ["columnStyleProps", "defaultText", "fieldContainerProps", "fieldControlProps", "fieldLabelProps", "helperText", "isLoadingInitial", "label", "labelMode", "name", "overlay", "placeholder", "slots", "state", "status", "trigger", "triggerProps", "triggerRef", "valueProps"];
 import _Object$values from "@babel/runtime-corejs3/core-js-stable/object/values";
 
 function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context, _context2; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(source), !0)).call(_context, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context2 = ownKeys(Object(source))).call(_context2, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-import React, { forwardRef, useMemo } from 'react';
-import MenuDown from 'mdi-react/MenuDownIcon';
+import React, { forwardRef } from 'react';
 import PropTypes from 'prop-types';
-import { HiddenSelect } from 'react-aria';
+import { HiddenSelect } from '@react-aria/select';
+import MenuDown from 'mdi-react/MenuDownIcon';
 import { v4 as uuid } from 'uuid';
 import { ariaAttributesBasePropTypes, getAriaAttributeProps } from '../../utils/devUtils/props/ariaAttributes';
 import statuses from '../../utils/devUtils/constants/statuses';
@@ -44,8 +44,7 @@ var SelectFieldBase = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var columnStyleProps = _ref.columnStyleProps,
       defaultText = _ref.defaultText,
       fieldContainerProps = _ref.fieldContainerProps,
-      fieldControlInputProps = _ref.fieldControlInputProps,
-      fieldControlWrapperProps = _ref.fieldControlWrapperProps,
+      fieldControlProps = _ref.fieldControlProps,
       fieldLabelProps = _ref.fieldLabelProps,
       helperText = _ref.helperText,
       isLoadingInitial = _ref.isLoadingInitial,
@@ -66,19 +65,17 @@ var SelectFieldBase = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var _getAriaAttributeProp = getAriaAttributeProps(others),
       ariaProps = _getAriaAttributeProp.ariaProps;
 
-  var helperTextId = useMemo(function () {
-    return uuid();
-  }, []);
+  var helperTextId = uuid();
 
-  var defaultTrigger = ___EmotionJSX(Box, _extends({}, fieldControlWrapperProps, {
-    variant: "forms.input.fieldControlWrapper"
-  }), ___EmotionJSX(Button, _extends({
-    className: fieldControlInputProps.className,
+  var defaultTrigger = ___EmotionJSX(Box, {
+    className: fieldControlProps.className,
+    variant: "forms.input.container"
+  }, ___EmotionJSX(Button, _extends({
+    className: fieldControlProps.className,
     ref: triggerRef,
-    variant: "forms.select"
-  }, triggerProps, ariaProps, {
+    variant: "forms.select",
     "aria-describedby": helperText && helperTextId
-  }), ___EmotionJSX(Box, _extends({
+  }, triggerProps, ariaProps), ___EmotionJSX(Box, _extends({
     as: "span",
     variant: "forms.select.currentValue"
   }, valueProps), state.selectedItem ? state.selectedItem.rendered : ___EmotionJSX(Text, {
@@ -98,7 +95,7 @@ var SelectFieldBase = /*#__PURE__*/forwardRef(function (_ref, ref) {
 
   return ___EmotionJSX(Box, _extends({
     ref: ref,
-    variant: "forms.input.fieldContainer"
+    variant: "forms.input.wrapper"
   }, fieldContainerProps, {
     sx: _objectSpread(_objectSpread({}, columnStyleProps === null || columnStyleProps === void 0 ? void 0 : columnStyleProps.sx), fieldContainerProps === null || fieldContainerProps === void 0 ? void 0 : fieldContainerProps.sx)
   }), ___EmotionJSX(Label, fieldLabelProps, label), ___EmotionJSX(HiddenSelect, {
@@ -143,7 +140,7 @@ SelectFieldBase.propTypes = _objectSpread({
   }),
 
   /** Determines props that applied to control field. */
-  fieldControlInputProps: PropTypes.shape({
+  fieldControlProps: PropTypes.shape({
     className: PropTypes.string
   }),
 

package/lib/components/Separator/Separator.js

@@ -3,7 +3,7 @@ import _objectWithoutProperties from "@babel/runtime-corejs3/helpers/esm/objectW
 var _excluded = ["className", "orientation"];
 import React, { forwardRef } from 'react';
 import PropTypes from 'prop-types';
-import { useSeparator } from 'react-aria';
+import { useSeparator } from '@react-aria/separator';
 import Box from '../Box/Box';
 import { useStatusClasses } from '../../hooks';
 import ORIENTATION from '../../utils/devUtils/constants/orientation';

package/lib/components/Stepper/Step.js

@@ -1,10 +1,10 @@
 import _extends from "@babel/runtime-corejs3/helpers/esm/extends";
 import _Object$values from "@babel/runtime-corejs3/core-js-stable/object/values";
 import React, { forwardRef } from 'react';
-import CheckBoldIcon from 'mdi-react/CheckBoldIcon';
 import PropTypes from 'prop-types';
-import { Item as Step } from 'react-stately';
+import CheckBoldIcon from 'mdi-react/CheckBoldIcon';
 import { useHover } from '@react-aria/interactions';
+import { Item as Step } from '@react-stately/collections';
 import { stepStatuses } from './Stepper.constants';
 import { Box, Icon } from '../../index';
 import { jsx as ___EmotionJSX } from "@emotion/react";

package/lib/components/Switch/Switch.js

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime-corejs3/helpers/esm/extends";
 import React, { forwardRef } from 'react';
 import PropTypes from 'prop-types';
-import { VisuallyHidden } from 'react-aria';
+import { VisuallyHidden } from '@react-aria/visually-hidden';
 import Box from '../Box';
 /**
  * Basic Switch input wrapped in a label.

package/lib/components/SwitchField/SwitchField.js

@@ -17,16 +17,15 @@ function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context, _context2; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(source), !0)).call(_context, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context2 = ownKeys(Object(source))).call(_context2, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 import React, { forwardRef, useRef, useImperativeHandle } from 'react';
-import omit from 'lodash/omit';
 import PropTypes from 'prop-types';
-import { useSwitch } from 'react-aria';
-import { useToggleState } from 'react-stately';
+import omit from 'lodash/omit';
+import { useToggleState } from '@react-stately/toggle';
+import { useSwitch } from '@react-aria/switch';
 import { usePress } from '@react-aria/interactions';
 import { Box, FieldHelperText, Label, Switch } from '../../';
 import { ariaAttributesBasePropTypes } from '../../utils/devUtils/props/ariaAttributes';
 import { useField, usePropWarning } from '../../hooks';
 import statuses from '../../utils/devUtils/constants/statuses';
-import { inputFieldAttributesBasePropTypes } from '../../utils/devUtils/props/fieldAttributes';
 /**
  * Combines a switch, label, and helper text for a complete, form-ready solution.
  *
@@ -71,7 +70,7 @@ var SwitchField = /*#__PURE__*/forwardRef(function (props, ref) {
   var _usePress = usePress({
     isDisabled: isDisabled
   }),
-      pressProps = _usePress.pressProps;
+      containerPressProps = _usePress.pressProps;
 
   var whitelistedProps = omit(props, _Object$keys(others));
 
@@ -86,12 +85,11 @@ var SwitchField = /*#__PURE__*/forwardRef(function (props, ref) {
 
   var _useField = useField(_objectSpread(_objectSpread(_objectSpread({
     statusClasses: statusClasses
-  }, pressProps), props), {}, {
+  }, containerPressProps), props), {}, {
     controlProps: _objectSpread(_objectSpread({}, controlProps), inputProps)
   })),
       fieldContainerProps = _useField.fieldContainerProps,
-      fieldControlInputProps = _useField.fieldControlInputProps,
-      fieldControlWrapperProps = _useField.fieldControlWrapperProps,
+      fieldControlProps = _useField.fieldControlProps,
       fieldLabelProps = _useField.fieldLabelProps;
 
   var unhandledAriaProps = {
@@ -100,17 +98,23 @@ var SwitchField = /*#__PURE__*/forwardRef(function (props, ref) {
   };
   return ___EmotionJSX(Box, fieldContainerProps, ___EmotionJSX(Label, _extends({
     variant: "forms.switch.label"
-  }, fieldLabelProps), ___EmotionJSX(Box, fieldControlWrapperProps, ___EmotionJSX(Switch, _extends({
+  }, fieldLabelProps), ___EmotionJSX(Switch, _extends({
     ref: switchRef,
-    inputProps: fieldControlInputProps
-  }, unhandledAriaProps))), label), helperText && ___EmotionJSX(FieldHelperText, {
+    inputProps: fieldControlProps
+  }, unhandledAriaProps)), label), helperText && ___EmotionJSX(FieldHelperText, {
     status: status
   }, helperText));
 });
-SwitchField.propTypes = _objectSpread(_objectSpread({
+SwitchField.propTypes = _objectSpread({
   /** A list of class names to apply to the input element. */
   className: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.string)]),
 
+  /** Props object that is spread directly into the root (top-level) element. */
+  containerProps: PropTypes.shape({}),
+
+  /** Props object that is spread directly into the input element. */
+  controlProps: PropTypes.shape({}),
+
   /** Whether the element should receive focus on render. */
   hasAutoFocus: PropTypes.bool,
 
@@ -141,6 +145,9 @@ SwitchField.propTypes = _objectSpread(_objectSpread({
   /** The rendered label for the field. */
   label: PropTypes.node,
 
+  /** Props object that is spread directly into the label element. */
+  labelProps: PropTypes.shape({}),
+
   /** The name of the input element, used when submitting an HTML form. See [MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#htmlattrdefname). */
   name: PropTypes.string,
 
@@ -167,7 +174,7 @@ SwitchField.propTypes = _objectSpread(_objectSpread({
 
   /** The value of the input element, used when submitting an HTML form. See [MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#htmlattrdefvalue). */
   value: PropTypes.string
-}, ariaAttributesBasePropTypes), inputFieldAttributesBasePropTypes);
+}, ariaAttributesBasePropTypes);
 SwitchField.defaultProps = {
   isDisabled: false,
   isReadOnly: false,

package/lib/components/SwitchField/SwitchField.stories.js

@@ -17,7 +17,6 @@ import React, { useState } from 'react';
 import { Pressable } from '@react-aria/interactions';
 import SwitchField from '.';
 import { ariaAttributeBaseArgTypes } from '../../utils/devUtils/props/ariaAttributes';
-import { inputFieldAttributeBaseArgTypes } from '../../utils/devUtils/props/fieldAttributes';
 import { Tooltip, TooltipTrigger } from '../../index';
 import statuses from '../../utils/devUtils/constants/statuses';
 import { jsx as ___EmotionJSX } from "@emotion/react";
@@ -31,7 +30,7 @@ export default {
       }
     }
   },
-  argTypes: _objectSpread(_objectSpread({
+  argTypes: _objectSpread({
     label: {
       control: {
         type: 'text'
@@ -65,13 +64,16 @@ export default {
     isReadOnly: {},
     isDefaultSelected: {},
     hasAutoFocus: {},
+    containerProps: {},
+    labelProps: {},
+    controlProps: {},
     id: {},
     isSelected: {
       control: {
         type: 'none'
       }
     }
-  }, ariaAttributeBaseArgTypes), inputFieldAttributeBaseArgTypes)
+  }, ariaAttributeBaseArgTypes)
 };
 export var Default = function Default(args) {
   return ___EmotionJSX(SwitchField, args);