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

package/lib/cjs/components/RadioField/RadioField.js

@@ -38,7 +38,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _reactAria = require("react-aria");
+var _radio = require("@react-aria/radio");
 
 var _hooks = require("../../hooks");
 
@@ -52,8 +52,6 @@ var _Label = _interopRequireDefault(require("../Label"));
 
 var _FieldHelperText = _interopRequireDefault(require("../FieldHelperText"));
 
-var _ariaAttributes = require("../../utils/devUtils/props/ariaAttributes");
-
 var _react2 = require("@emotion/react");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -92,7 +90,7 @@ var RadioField = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var groupDisabled = state.isDisabled;
   var isDisabled = radioDisabled || groupDisabled;
 
-  var _useRadio = (0, _reactAria.useRadio)(_objectSpread(_objectSpread({
+  var _useRadio = (0, _radio.useRadio)(_objectSpread(_objectSpread({
     children: label,
     autoFocus: hasAutoFocus,
     isDisabled: isDisabled
@@ -111,25 +109,22 @@ var RadioField = /*#__PURE__*/(0, _react.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 (0, _react2.jsx)(_Box["default"], (0, _extends2["default"])({
-    variant: "forms.radio.outerContainer"
+    variant: "forms.radioField"
   }, fieldContainerProps), (0, _react2.jsx)(_Label["default"], (0, _extends2["default"])({
     variant: "forms.label.radio"
-  }, fieldLabelProps), (0, _react2.jsx)(_Box["default"], fieldControlWrapperProps, (0, _react2.jsx)(_Radio["default"], (0, _extends2["default"])({
+  }, fieldLabelProps), (0, _react2.jsx)(_Radio["default"], (0, _extends2["default"])({
     ref: radioFieldRef
-  }, fieldControlInputProps, {
-    variant: "forms.radio.base"
-  }))), label), helperText && (0, _react2.jsx)(_FieldHelperText["default"], {
+  }, fieldControlProps)), label), helperText && (0, _react2.jsx)(_FieldHelperText["default"], {
     status: status
   }, helperText), isChecked && checkedContent && (0, _react2.jsx)(_Box["default"], {
-    variant: "forms.radio.checkedContent"
+    variant: "boxes.radioCheckedContent"
   }, checkedContent));
 });
-RadioField.propTypes = _objectSpread({
+RadioField.propTypes = {
   /** Content to display when the radio is checked. */
   checkedContent: _propTypes["default"].node,
 
@@ -194,8 +189,17 @@ RadioField.propTypes = _objectSpread({
    * Identifies the element (or elements) that provide a detailed, extended description for the
    * object.
   */
-  'aria-details': _propTypes["default"].string
-}, _ariaAttributes.ariaAttributesBasePropTypes);
+  'aria-details': _propTypes["default"].string,
+
+  /** Props object that is spread directly into the root (top-level) element. */
+  containerProps: _propTypes["default"].shape({}),
+
+  /** Props object that is spread directly into the input element. */
+  controlProps: _propTypes["default"].shape({}),
+
+  /** Props object that is spread directly into the label element. */
+  labelProps: _propTypes["default"].shape({})
+};
 RadioField.displayName = 'RadioField';
 var _default = RadioField;
 exports["default"] = _default;

package/lib/cjs/components/RadioGroupField/RadioGroupField.js

@@ -36,11 +36,11 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/e
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _propTypes = _interopRequireDefault(require("prop-types"));
+var _radio = require("@react-aria/radio");
 
-var _reactAria = require("react-aria");
+var _radio2 = require("@react-stately/radio");
 
-var _reactStately = require("react-stately");
+var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _uuid = require("uuid");
 
@@ -48,8 +48,6 @@ var _ = require("../../");
 
 var _ariaAttributes = require("../../utils/devUtils/props/ariaAttributes");
 
-var _fieldAttributes = require("../../utils/devUtils/props/fieldAttributes");
-
 var _hooks = require("../../hooks");
 
 var _orientation = _interopRequireDefault(require("../../utils/devUtils/constants/orientation"));
@@ -86,9 +84,9 @@ var RadioGroupField = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref)
       label = props.label,
       orientation = props.orientation,
       status = props.status;
-  var state = (0, _reactStately.useRadioGroupState)(props);
+  var state = (0, _radio2.useRadioGroupState)(props);
 
-  var _useRadioGroup = (0, _reactAria.useRadioGroup)(props, state),
+  var _useRadioGroup = (0, _radio.useRadioGroup)(props, state),
       radioGroupProps = _useRadioGroup.radioGroupProps,
       labelProps = _useRadioGroup.labelProps;
 
@@ -101,9 +99,7 @@ var RadioGroupField = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref)
   var unhandledAriaProps = {
     'aria-controls': props['aria-controls']
   };
-  var helperTextId = (0, _react.useMemo)(function () {
-    return (0, _uuid.v4)();
-  }, []);
+  var helperTextId = (0, _uuid.v4)();
   return (0, _react2.jsx)(_.Box, (0, _extends2["default"])({
     ref: ref,
     className: classNames
@@ -129,7 +125,7 @@ var RadioGroupField = /*#__PURE__*/(0, _react.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["default"].string,
 
@@ -172,7 +168,7 @@ 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["default"].string
-}, _ariaAttributes.ariaAttributesBasePropTypes), _fieldAttributes.inputFieldAttributesBasePropTypes);
+}, _ariaAttributes.ariaAttributesBasePropTypes);
 RadioGroupField.displayName = 'RadioGroupField';
 var _default = RadioGroupField;
 exports["default"] = _default;

package/lib/cjs/components/RockerButton/RockerButton.js

@@ -36,9 +36,9 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _reactAria = require("react-aria");
+var _collections = require("@react-stately/collections");
 
-var _reactStately = require("react-stately");
+var _focus = require("@react-aria/focus");
 
 var _hooks = require("../../hooks");
 
@@ -87,12 +87,12 @@ var CollectionRockerButton = /*#__PURE__*/(0, _react.forwardRef)(function (props
   }, state, rockerButtonRef),
       rockerButtonProps = _useRockerButton.rockerButtonProps;
 
-  return (0, _react2.jsx)(_reactAria.FocusRing, {
+  return (0, _react2.jsx)(_focus.FocusRing, {
     focusRingClass: "is-focused"
   }, (0, _react2.jsx)(_index.Box, (0, _extends2["default"])({
     as: "button",
     className: classNames,
-    variant: "variants.rockerButton.thumbSwitch"
+    variant: "buttons.rocker"
   }, rockerButtonProps, {
     ref: rockerButtonRef
   }, itemProps, {
@@ -131,5 +131,5 @@ CollectionRockerButton.defaultProps = {
 }; // Export Item as default for simplicity, convert to CollectionRockerButton within
 // RockerButtonGroup component.
 
-var _default = _reactStately.Item;
+var _default = _collections.Item;
 exports["default"] = _default;

package/lib/cjs/components/RockerButtonGroup/RockerButtonGroup.js

@@ -42,9 +42,9 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _reactAria = require("react-aria");
+var _tabs = require("@react-aria/tabs");
 
-var _reactStately = require("react-stately");
+var _tabs2 = require("@react-stately/tabs");
 
 var _hooks = require("../../hooks");
 
@@ -87,11 +87,11 @@ var RockerButtonGroup = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref
   (0, _react.useImperativeHandle)(ref, function () {
     return buttonGroupRef.current;
   });
-  var state = (0, _reactStately.useTabListState)(_objectSpread(_objectSpread({}, props), {}, {
+  var state = (0, _tabs2.useTabListState)(_objectSpread(_objectSpread({}, props), {}, {
     onSelectionChange: onSelectionChange
   }));
 
-  var _useTabList = (0, _reactAria.useTabList)(props, state, buttonGroupRef),
+  var _useTabList = (0, _tabs.useTabList)(props, state, buttonGroupRef),
       raTabListProps = _useTabList.tabListProps; // removed tabList role for now as this isn't really the role we are looking for
 
 
@@ -99,9 +99,9 @@ var RockerButtonGroup = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref
   return (0, _react2.jsx)(RockerContext.Provider, {
     value: state
   }, (0, _react2.jsx)(_Box["default"], (0, _extends2["default"])({
-    variant: "rockerButton.container"
+    variant: "rockerbutton.rockerContainer"
   }, others), (0, _react2.jsx)(_Box["default"], (0, _extends2["default"])({
-    variant: "rockerButton.innerContainer",
+    variant: "rockerbutton.rockerContainerInner",
     isRow: true
   }, tabListProps, raTabListProps, {
     ref: buttonGroupRef,

package/lib/cjs/components/ScrollBox/ScrollBox.js

@@ -118,7 +118,7 @@ var ScrollBox = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       classNames = _useStatusClasses.classNames;
 
   return (0, _react2.jsx)(_react["default"].Fragment, null, (0, _react2.jsx)(_Box["default"], {
-    variant: "scrollBox.topShadowBox",
+    variant: "boxes.topShadowScrollbox",
     className: classNames,
     role: "separator"
   }), (0, _react2.jsx)(_Box["default"], (0, _extends2["default"])({
@@ -128,9 +128,9 @@ var ScrollBox = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       overflowY: 'auto'
     }, sx),
     onScroll: onScroll,
-    variant: "scrollBox.container"
+    variant: "boxes.scrollbox"
   }, others), children), (0, _react2.jsx)(_Box["default"], {
-    variant: "scrollBox.bottomShadowBox",
+    variant: "boxes.bottomShadowScrollbox",
     className: classNames,
     role: "separator"
   }));

package/lib/cjs/components/SearchField/SearchField.js

@@ -34,22 +34,20 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/he
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _searchfield = require("@react-aria/searchfield");
+
+var _searchfield2 = require("@react-stately/searchfield");
+
 var _CloseIcon = _interopRequireDefault(require("mdi-react/CloseIcon"));
 
 var _SearchIcon = _interopRequireDefault(require("mdi-react/SearchIcon"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _reactAria = require("react-aria");
-
-var _reactStately = require("react-stately");
-
 var _ = require("../../");
 
 var _ariaAttributes = require("../../utils/devUtils/props/ariaAttributes");
 
-var _fieldAttributes = require("../../utils/devUtils/props/fieldAttributes");
-
 var _hooks = require("../../hooks");
 
 var _react2 = require("@emotion/react");
@@ -88,9 +86,9 @@ var SearchField = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   (0, _react.useImperativeHandle)(ref, function () {
     return searchRef.current;
   });
-  var state = (0, _reactStately.useSearchFieldState)(props);
+  var state = (0, _searchfield2.useSearchFieldState)(props);
 
-  var _useSearchField = (0, _reactAria.useSearchField)(_objectSpread({
+  var _useSearchField = (0, _searchfield.useSearchField)(_objectSpread({
     autoComplete: autocomplete,
     autoFocus: hasAutoFocus,
     excludeFromTabOrder: isExcludedFromTabOrder
@@ -104,8 +102,7 @@ var SearchField = /*#__PURE__*/(0, _react.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) {
@@ -116,13 +113,15 @@ var SearchField = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     }
   };
 
-  return (0, _react2.jsx)(_.Box, fieldContainerProps, label && (0, _react2.jsx)(_.Label, fieldLabelProps), (0, _react2.jsx)(_.Box, (0, _extends2["default"])({
-    variant: "forms.search.wrapper"
-  }, fieldControlWrapperProps), (0, _react2.jsx)(_.Input, (0, _extends2["default"])({
+  return (0, _react2.jsx)(_.Box, fieldContainerProps, label && (0, _react2.jsx)(_.Label, fieldLabelProps), (0, _react2.jsx)(_.Box, {
+    variant: "forms.search.container"
+  }, (0, _react2.jsx)(_.Input, (0, _extends2["default"])({
     ref: searchRef,
     pl: 40,
     pr: 40
-  }, fieldControlInputProps)), icon && (0, _react2.jsx)(_.Icon, (0, _extends2["default"])({
+  }, fieldControlProps, {
+    variant: "forms.input.search"
+  })), icon && (0, _react2.jsx)(_.Icon, (0, _extends2["default"])({
     icon: icon,
     variant: "forms.search.icon",
     size: 22
@@ -141,7 +140,7 @@ var SearchField = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     icon: _CloseIcon["default"]
   }))));
 });
-SearchField.propTypes = _objectSpread(_objectSpread({
+SearchField.propTypes = _objectSpread({
   /**
    * @ignore
    * Identifies the currently active element when DOM focus is on a composite widget, textbox,
@@ -240,9 +239,16 @@ SearchField.propTypes = _objectSpread(_objectSpread({
    * (value: string) => void
    */
   onChange: _propTypes["default"].func,
+  containerProps: _propTypes["default"].shape({}),
+
+  /** Props object that is spread into the input element. */
+  controlProps: _propTypes["default"].shape({}),
 
   /** Props object that is spread into the icon element. */
   iconProps: _propTypes["default"].shape({}),
+
+  /** Props object that is spread into the label element. */
+  labelProps: _propTypes["default"].shape({}),
   // NOTE: unsurfaced useSearchField / useSearchFieldState props listed below
 
   /** @ignore Whether the input can be selected but not changed by the user. */
@@ -340,7 +346,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["default"].func
-}, _ariaAttributes.ariaAttributesBasePropTypes), _fieldAttributes.inputFieldAttributesBasePropTypes);
+}, _ariaAttributes.ariaAttributesBasePropTypes);
 SearchField.defaultProps = {
   hasNoClearButton: false,
   icon: _SearchIcon["default"]

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

@@ -44,8 +44,6 @@ var _ = require("../../");
 
 var _ariaAttributes = require("../../utils/devUtils/props/ariaAttributes");
 
-var _fieldAttributes = require("../../utils/devUtils/props/fieldAttributes");
-
 var _hooks = require("../../hooks");
 
 var _react2 = require("@emotion/react");
@@ -68,7 +66,7 @@ var _default = {
       }
     }
   },
-  argTypes: _objectSpread(_objectSpread({
+  argTypes: _objectSpread({
     label: {
       control: {
         type: 'text'
@@ -87,7 +85,10 @@ var _default = {
     hasAutoFocus: {},
     hasNoClearButton: {},
     autoComplete: {},
+    containerProps: {},
     iconProps: {},
+    controlProps: {},
+    labelProps: {},
     name: {},
     id: {},
     'aria-autocomplete': {
@@ -98,7 +99,7 @@ var _default = {
         type: 'none'
       }
     }
-  }, _ariaAttributes.ariaAttributeBaseArgTypes), _fieldAttributes.inputFieldAttributeBaseArgTypes)
+  }, _ariaAttributes.ariaAttributeBaseArgTypes)
 };
 exports["default"] = _default;
 

package/lib/cjs/components/SelectField/SelectField.js

@@ -46,8 +46,6 @@ var _SelectFieldBase = _interopRequireDefault(require("../SelectFieldBase"));
 
 var _statuses = _interopRequireDefault(require("../../utils/devUtils/constants/statuses"));
 
-var _fieldAttributes = require("../../utils/devUtils/props/fieldAttributes");
-
 var _react2 = require("@emotion/react");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -76,7 +74,7 @@ var SelectField = /*#__PURE__*/(0, _react.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["default"].oneOf(['start', 'end', 'middle']),
 
@@ -168,14 +166,20 @@ SelectField.propTypes = _objectSpread(_objectSpread({
    *
    * (key: Key) => any
    */
-  onSelectionChange: _propTypes["default"].func
-}, _fieldAttributes.inputFieldAttributesBasePropTypes), {}, {
+  onSelectionChange: _propTypes["default"].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["default"].shape({}),
 
+  /** Props object passed along to the root container as-is. */
+  containerProps: _propTypes["default"].shape({}),
+
+  /** Props object passed along to the label as-is. */
+  labelProps: _propTypes["default"].shape({}),
+
   /** Props object that is spread directly into the ScrollBox element. */
   // /** Props object that is spread directly into the ScrollBox element. */
 

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

@@ -50,16 +50,14 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/he
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _reactAria = require("react-aria");
+var _overlays = require("@react-aria/overlays");
 
-var _reactStately = require("react-stately");
+var _data = require("@react-stately/data");
 
 var _2 = require("../../");
 
 var _ariaAttributes = require("../../utils/devUtils/props/ariaAttributes");
 
-var _fieldAttributes = require("../../utils/devUtils/props/fieldAttributes");
-
 var _constants = require("../Label/constants");
 
 var _statuses = _interopRequireDefault(require("../../utils/devUtils/constants/statuses"));
@@ -163,7 +161,7 @@ var _default = {
       }
     }
   },
-  argTypes: _objectSpread(_objectSpread({
+  argTypes: _objectSpread({
     label: {
       control: {
         type: 'text'
@@ -206,17 +204,18 @@ var _default = {
     isDisabled: {},
     isOpen: {},
     isRequired: {},
+    controlProps: {},
     selectedKey: {
       control: {
         type: 'none'
       }
     }
-  }, _ariaAttributes.ariaAttributeBaseArgTypes), _fieldAttributes.inputFieldAttributeBaseArgTypes)
+  }, _ariaAttributes.ariaAttributeBaseArgTypes)
 };
 exports["default"] = _default;
 
 var Default = function Default(args) {
-  return (0, _react2.jsx)(_reactAria.OverlayProvider, null, (0, _react2.jsx)(_2.SelectField, (0, _extends2["default"])({}, args, {
+  return (0, _react2.jsx)(_overlays.OverlayProvider, null, (0, _react2.jsx)(_2.SelectField, (0, _extends2["default"])({}, args, {
     width: "100%"
   }), (0, _react2.jsx)(_2.Item, {
     key: "red"
@@ -230,7 +229,7 @@ var Default = function Default(args) {
 exports.Default = Default;
 
 var WithSections = function WithSections(args) {
-  return (0, _react2.jsx)(_reactAria.OverlayProvider, null, (0, _react2.jsx)(_2.SelectField, (0, _extends2["default"])({
+  return (0, _react2.jsx)(_overlays.OverlayProvider, null, (0, _react2.jsx)(_2.SelectField, (0, _extends2["default"])({
     items: withSection
   }, args), function (section) {
     return (0, _react2.jsx)(_2.Section, {
@@ -248,7 +247,7 @@ var WithSections = function WithSections(args) {
 exports.WithSections = WithSections;
 
 var WithCustomHeight = function WithCustomHeight(args) {
-  return (0, _react2.jsx)(_reactAria.OverlayProvider, null, (0, _react2.jsx)(_2.SelectField, (0, _extends2["default"])({
+  return (0, _react2.jsx)(_overlays.OverlayProvider, null, (0, _react2.jsx)(_2.SelectField, (0, _extends2["default"])({
     label: "Example label",
     items: animals,
     scrollBoxProps: {
@@ -389,7 +388,7 @@ var DynamicItems = function DynamicItems() {
       _useState4 = (0, _slicedToArray2["default"])(_useState3, 1),
       items = _useState4[0];
 
-  return (0, _react2.jsx)(_reactAria.OverlayProvider, null, (0, _react2.jsx)(_2.SelectField, {
+  return (0, _react2.jsx)(_overlays.OverlayProvider, null, (0, _react2.jsx)(_2.SelectField, {
     label: "Select an option...",
     items: items
   }, function (item) {
@@ -408,7 +407,7 @@ DynamicItems.parameters = {
 
 var AsyncLoading = function AsyncLoading() {
   // This example uses `useAsyncList` from "@react-stately/data"
-  var list = (0, _reactStately.useAsyncList)({
+  var list = (0, _data.useAsyncList)({
     load: function load(_ref) {
       return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
         var signal, cursor, res, json;
@@ -449,7 +448,7 @@ var AsyncLoading = function AsyncLoading() {
       }))();
     }
   });
-  return (0, _react2.jsx)(_reactAria.OverlayProvider, null, (0, _react2.jsx)(_2.SelectField, {
+  return (0, _react2.jsx)(_overlays.OverlayProvider, null, (0, _react2.jsx)(_2.SelectField, {
     label: "Pick a Pokemon",
     items: list.items,
     isLoading: list.isLoading,

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

@@ -6,7 +6,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/e
 
 var _react = _interopRequireDefault(require("react"));
 
-var _reactAria = require("react-aria");
+var _overlays = require("@react-aria/overlays");
 
 var _userEvent = _interopRequireDefault(require("@testing-library/user-event"));
 
@@ -92,7 +92,7 @@ var getComponentWithSections = function getComponentWithSections() {
       _ref2$renderFn = _ref2.renderFn,
       renderFn = _ref2$renderFn === void 0 ? _testWrapper.render : _ref2$renderFn;
 
-  return renderFn((0, _react2.jsx)(_reactAria.OverlayProvider, null, (0, _react2.jsx)(_index.SelectField, (0, _extends2["default"])({}, defaultProps, props, {
+  return renderFn((0, _react2.jsx)(_overlays.OverlayProvider, null, (0, _react2.jsx)(_index.SelectField, (0, _extends2["default"])({}, defaultProps, props, {
     items: withSection
   }), function (section) {
     return (0, _react2.jsx)(_index.Section, {

package/lib/cjs/components/SelectFieldBase/SelectFieldBase.js

@@ -38,11 +38,11 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime-c
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _MenuDownIcon = _interopRequireDefault(require("mdi-react/MenuDownIcon"));
-
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _reactAria = require("react-aria");
+var _select = require("@react-aria/select");
+
+var _MenuDownIcon = _interopRequireDefault(require("mdi-react/MenuDownIcon"));
 
 var _uuid = require("uuid");
 
@@ -68,7 +68,7 @@ var _Text = _interopRequireDefault(require("../Text"));
 
 var _react2 = require("@emotion/react");
 
-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"];
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -89,8 +89,7 @@ var SelectFieldBase = /*#__PURE__*/(0, _react.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,
@@ -111,18 +110,16 @@ var SelectFieldBase = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var _getAriaAttributeProp = (0, _ariaAttributes.getAriaAttributeProps)(others),
       ariaProps = _getAriaAttributeProp.ariaProps;
 
-  var helperTextId = (0, _react.useMemo)(function () {
-    return (0, _uuid.v4)();
-  }, []);
-  var defaultTrigger = (0, _react2.jsx)(_Box["default"], (0, _extends2["default"])({}, fieldControlWrapperProps, {
-    variant: "forms.input.fieldControlWrapper"
-  }), (0, _react2.jsx)(_Button["default"], (0, _extends2["default"])({
-    className: fieldControlInputProps.className,
+  var helperTextId = (0, _uuid.v4)();
+  var defaultTrigger = (0, _react2.jsx)(_Box["default"], {
+    className: fieldControlProps.className,
+    variant: "forms.input.container"
+  }, (0, _react2.jsx)(_Button["default"], (0, _extends2["default"])({
+    className: fieldControlProps.className,
     ref: triggerRef,
-    variant: "forms.select"
-  }, triggerProps, ariaProps, {
+    variant: "forms.select",
     "aria-describedby": helperText && helperTextId
-  }), (0, _react2.jsx)(_Box["default"], (0, _extends2["default"])({
+  }, triggerProps, ariaProps), (0, _react2.jsx)(_Box["default"], (0, _extends2["default"])({
     as: "span",
     variant: "forms.select.currentValue"
   }, valueProps), state.selectedItem ? state.selectedItem.rendered : (0, _react2.jsx)(_Text["default"], {
@@ -141,10 +138,10 @@ var SelectFieldBase = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   }))), slots === null || slots === void 0 ? void 0 : slots.inContainer);
   return (0, _react2.jsx)(_Box["default"], (0, _extends2["default"])({
     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)
-  }), (0, _react2.jsx)(_Label["default"], fieldLabelProps, label), (0, _react2.jsx)(_reactAria.HiddenSelect, {
+  }), (0, _react2.jsx)(_Label["default"], fieldLabelProps, label), (0, _react2.jsx)(_select.HiddenSelect, {
     state: state,
     triggerRef: triggerRef,
     label: label,
@@ -186,7 +183,7 @@ SelectFieldBase.propTypes = _objectSpread({
   }),
 
   /** Determines props that applied to control field. */
-  fieldControlInputProps: _propTypes["default"].shape({
+  fieldControlProps: _propTypes["default"].shape({
     className: _propTypes["default"].string
   }),
 

package/lib/cjs/components/Separator/Separator.js

@@ -24,7 +24,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _reactAria = require("react-aria");
+var _separator = require("@react-aria/separator");
 
 var _Box = _interopRequireDefault(require("../Box/Box"));
 
@@ -49,7 +49,7 @@ var Separator = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       orientation = props.orientation,
       others = (0, _objectWithoutProperties2["default"])(props, _excluded);
 
-  var _useSeparator = (0, _reactAria.useSeparator)(props, ref),
+  var _useSeparator = (0, _separator.useSeparator)(props, ref),
       separatorProps = _useSeparator.separatorProps;
 
   var _useStatusClasses = (0, _hooks.useStatusClasses)(className, {

package/lib/cjs/components/Stepper/Step.js

@@ -22,14 +22,14 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/e
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _CheckBoldIcon = _interopRequireDefault(require("mdi-react/CheckBoldIcon"));
-
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _reactStately = require("react-stately");
+var _CheckBoldIcon = _interopRequireDefault(require("mdi-react/CheckBoldIcon"));
 
 var _interactions = require("@react-aria/interactions");
 
+var _collections = require("@react-stately/collections");
+
 var _Stepper = require("./Stepper.constants");
 
 var _index = require("../../index");
@@ -68,5 +68,5 @@ CollectionStep.defaultProps = {
   status: INACTIVE,
   value: 0
 };
-var _default = _reactStately.Item;
+var _default = _collections.Item;
 exports["default"] = _default;