@pingux/astro 1.42.0-alpha.0 → 2.0.0-alpha.1

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

@@ -46,6 +46,8 @@ 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); }
@@ -74,7 +76,7 @@ var SelectField = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     "aria-invalid": status === 'error' && true
   }));
 });
-SelectField.propTypes = _objectSpread({
+SelectField.propTypes = _objectSpread(_objectSpread({
   /** Alignment of the popover menu relative to the trigger. */
   align: _propTypes["default"].oneOf(['start', 'end', 'middle']),
 
@@ -166,20 +168,14 @@ SelectField.propTypes = _objectSpread({
    *
    * (key: Key) => any
    */
-  onSelectionChange: _propTypes["default"].func,
-
+  onSelectionChange: _propTypes["default"].func
+}, _fieldAttributes.inputFieldAttributesBasePropTypes), {}, {
   /**
    * 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,14 +50,16 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/he
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _overlays = require("@react-aria/overlays");
+var _reactAria = require("react-aria");
 
-var _data = require("@react-stately/data");
+var _reactStately = require("react-stately");
 
 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"));
@@ -161,7 +163,7 @@ var _default = {
       }
     }
   },
-  argTypes: _objectSpread({
+  argTypes: _objectSpread(_objectSpread({
     label: {
       control: {
         type: 'text'
@@ -204,18 +206,17 @@ var _default = {
     isDisabled: {},
     isOpen: {},
     isRequired: {},
-    controlProps: {},
     selectedKey: {
       control: {
         type: 'none'
       }
     }
-  }, _ariaAttributes.ariaAttributeBaseArgTypes)
+  }, _ariaAttributes.ariaAttributeBaseArgTypes), _fieldAttributes.inputFieldAttributeBaseArgTypes)
 };
 exports["default"] = _default;
 
 var Default = function Default(args) {
-  return (0, _react2.jsx)(_overlays.OverlayProvider, null, (0, _react2.jsx)(_2.SelectField, (0, _extends2["default"])({}, args, {
+  return (0, _react2.jsx)(_reactAria.OverlayProvider, null, (0, _react2.jsx)(_2.SelectField, (0, _extends2["default"])({}, args, {
     width: "100%"
   }), (0, _react2.jsx)(_2.Item, {
     key: "red"
@@ -229,7 +230,7 @@ var Default = function Default(args) {
 exports.Default = Default;
 
 var WithSections = function WithSections(args) {
-  return (0, _react2.jsx)(_overlays.OverlayProvider, null, (0, _react2.jsx)(_2.SelectField, (0, _extends2["default"])({
+  return (0, _react2.jsx)(_reactAria.OverlayProvider, null, (0, _react2.jsx)(_2.SelectField, (0, _extends2["default"])({
     items: withSection
   }, args), function (section) {
     return (0, _react2.jsx)(_2.Section, {
@@ -247,7 +248,7 @@ var WithSections = function WithSections(args) {
 exports.WithSections = WithSections;
 
 var WithCustomHeight = function WithCustomHeight(args) {
-  return (0, _react2.jsx)(_overlays.OverlayProvider, null, (0, _react2.jsx)(_2.SelectField, (0, _extends2["default"])({
+  return (0, _react2.jsx)(_reactAria.OverlayProvider, null, (0, _react2.jsx)(_2.SelectField, (0, _extends2["default"])({
     label: "Example label",
     items: animals,
     scrollBoxProps: {
@@ -388,7 +389,7 @@ var DynamicItems = function DynamicItems() {
       _useState4 = (0, _slicedToArray2["default"])(_useState3, 1),
       items = _useState4[0];
 
-  return (0, _react2.jsx)(_overlays.OverlayProvider, null, (0, _react2.jsx)(_2.SelectField, {
+  return (0, _react2.jsx)(_reactAria.OverlayProvider, null, (0, _react2.jsx)(_2.SelectField, {
     label: "Select an option...",
     items: items
   }, function (item) {
@@ -407,7 +408,7 @@ DynamicItems.parameters = {
 
 var AsyncLoading = function AsyncLoading() {
   // This example uses `useAsyncList` from "@react-stately/data"
-  var list = (0, _data.useAsyncList)({
+  var list = (0, _reactStately.useAsyncList)({
     load: function load(_ref) {
       return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
         var signal, cursor, res, json;
@@ -448,7 +449,7 @@ var AsyncLoading = function AsyncLoading() {
       }))();
     }
   });
-  return (0, _react2.jsx)(_overlays.OverlayProvider, null, (0, _react2.jsx)(_2.SelectField, {
+  return (0, _react2.jsx)(_reactAria.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 _overlays = require("@react-aria/overlays");
+var _reactAria = require("react-aria");
 
 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)(_overlays.OverlayProvider, null, (0, _react2.jsx)(_index.SelectField, (0, _extends2["default"])({}, defaultProps, props, {
+  return renderFn((0, _react2.jsx)(_reactAria.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 _propTypes = _interopRequireDefault(require("prop-types"));
+var _MenuDownIcon = _interopRequireDefault(require("mdi-react/MenuDownIcon"));
 
-var _select = require("@react-aria/select");
+var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _MenuDownIcon = _interopRequireDefault(require("mdi-react/MenuDownIcon"));
+var _reactAria = require("react-aria");
 
 var _uuid = require("uuid");
 
@@ -68,7 +68,7 @@ var _Text = _interopRequireDefault(require("../Text"));
 
 var _react2 = require("@emotion/react");
 
-var _excluded = ["columnStyleProps", "defaultText", "fieldContainerProps", "fieldControlProps", "fieldLabelProps", "helperText", "isLoadingInitial", "label", "labelMode", "name", "overlay", "placeholder", "slots", "state", "status", "trigger", "triggerProps", "triggerRef", "valueProps"];
+var _excluded = ["columnStyleProps", "defaultText", "fieldContainerProps", "fieldControlInputProps", "fieldControlWrapperProps", "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,7 +89,8 @@ var SelectFieldBase = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var columnStyleProps = _ref.columnStyleProps,
       defaultText = _ref.defaultText,
       fieldContainerProps = _ref.fieldContainerProps,
-      fieldControlProps = _ref.fieldControlProps,
+      fieldControlInputProps = _ref.fieldControlInputProps,
+      fieldControlWrapperProps = _ref.fieldControlWrapperProps,
       fieldLabelProps = _ref.fieldLabelProps,
       helperText = _ref.helperText,
       isLoadingInitial = _ref.isLoadingInitial,
@@ -110,16 +111,18 @@ var SelectFieldBase = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var _getAriaAttributeProp = (0, _ariaAttributes.getAriaAttributeProps)(others),
       ariaProps = _getAriaAttributeProp.ariaProps;
 
-  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,
+  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,
     ref: triggerRef,
-    variant: "forms.select",
+    variant: "forms.select"
+  }, triggerProps, ariaProps, {
     "aria-describedby": helperText && helperTextId
-  }, triggerProps, ariaProps), (0, _react2.jsx)(_Box["default"], (0, _extends2["default"])({
+  }), (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"], {
@@ -138,10 +141,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.wrapper"
+    variant: "forms.input.fieldContainer"
   }, 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)(_select.HiddenSelect, {
+  }), (0, _react2.jsx)(_Label["default"], fieldLabelProps, label), (0, _react2.jsx)(_reactAria.HiddenSelect, {
     state: state,
     triggerRef: triggerRef,
     label: label,
@@ -183,7 +186,7 @@ SelectFieldBase.propTypes = _objectSpread({
   }),
 
   /** Determines props that applied to control field. */
-  fieldControlProps: _propTypes["default"].shape({
+  fieldControlInputProps: _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 _separator = require("@react-aria/separator");
+var _reactAria = require("react-aria");
 
 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, _separator.useSeparator)(props, ref),
+  var _useSeparator = (0, _reactAria.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 _CheckBoldIcon = _interopRequireDefault(require("mdi-react/CheckBoldIcon"));
+var _reactStately = require("react-stately");
 
 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 = _collections.Item;
+var _default = _reactStately.Item;
 exports["default"] = _default;

package/lib/cjs/{styles/variants/stepper.js → components/Stepper/Stepper.styles.js}

@@ -26,7 +26,7 @@ exports["default"] = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
 
-var _buttons = require("./buttons");
+var _Buttons = require("../Button/Buttons.styles");
 
 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; }
 
@@ -47,7 +47,7 @@ var tab = {
   outline: 'none',
   '&.is-focused': _objectSpread({
     borderRadius: '50%'
-  }, _buttons.defaultFocus),
+  }, _Buttons.defaultFocus),
   '&:not(:first-of-type)': {
     flex: 1,
     maxWidth: 122
@@ -56,7 +56,7 @@ var tab = {
 var tabLabel = {
   mb: 0
 };
-var stepWrapper = {
+var outerWrapper = {
   alignItems: 'center'
 };
 /** Step styles */
@@ -117,7 +117,7 @@ var _default = {
   tabs: tabs,
   tab: tab,
   tabLabel: tabLabel,
-  stepWrapper: stepWrapper,
+  outerWrapper: outerWrapper,
   step: step,
   line: line
 };

package/lib/cjs/components/Switch/Switch.js

@@ -22,7 +22,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _visuallyHidden = require("@react-aria/visually-hidden");
+var _reactAria = require("react-aria");
 
 var _Box = _interopRequireDefault(require("../Box"));
 
@@ -43,7 +43,7 @@ var Switch = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var inputProps = props.inputProps;
   return (0, _react2.jsx)(_Box["default"], (0, _extends2["default"])({
     variant: "forms.switch.container"
-  }, props), (0, _react2.jsx)(_visuallyHidden.VisuallyHidden, null, (0, _react2.jsx)(_Box["default"], (0, _extends2["default"])({
+  }, props), (0, _react2.jsx)(_reactAria.VisuallyHidden, null, (0, _react2.jsx)(_Box["default"], (0, _extends2["default"])({
     as: "input"
   }, inputProps, {
     ref: ref

package/lib/cjs/{styles/forms/switch.js → components/Switch/Switch.styles.js}

@@ -26,7 +26,7 @@ exports.thumbContainer = exports.thumb = exports.label = exports.container = voi
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
 
-var _buttons = require("../variants/buttons");
+var _Buttons = require("../Button/Buttons.styles");
 
 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; }
 
@@ -58,7 +58,7 @@ var thumbContainer = {
     bg: 'active',
     borderColor: 'active'
   },
-  'label.is-focused &, &:focus': _objectSpread({}, _buttons.defaultFocus)
+  'label.is-focused &, &:focus': _objectSpread({}, _Buttons.defaultFocus)
 };
 exports.thumbContainer = thumbContainer;
 var thumb = {

package/lib/cjs/components/SwitchField/SwitchField.js

@@ -40,13 +40,13 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime-c
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
 var _omit = _interopRequireDefault(require("lodash/omit"));
 
-var _toggle = require("@react-stately/toggle");
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+var _reactAria = require("react-aria");
 
-var _switch = require("@react-aria/switch");
+var _reactStately = require("react-stately");
 
 var _interactions = require("@react-aria/interactions");
 
@@ -58,6 +58,8 @@ var _hooks = require("../../hooks");
 
 var _statuses = _interopRequireDefault(require("../../utils/devUtils/constants/statuses"));
 
+var _fieldAttributes = require("../../utils/devUtils/props/fieldAttributes");
+
 var _react2 = require("@emotion/react");
 
 var _excluded = ["label", "helperText", "isDefaultSelected", "isSelected", "onChange", "value", "name", "id", "isDisabled", "isReadOnly", "isRequired", "hasAutoFocus", "onFocus", "onBlur", "onFocusChange", "onKeyDown", "onKeyUp", "status", "controlProps"];
@@ -104,18 +106,18 @@ var SwitchField = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   (0, _react.useImperativeHandle)(ref, function () {
     return switchRef.current;
   });
-  var state = (0, _toggle.useToggleState)(_objectSpread({
+  var state = (0, _reactStately.useToggleState)(_objectSpread({
     defaultSelected: isDefaultSelected
   }, props));
 
   var _usePress = (0, _interactions.usePress)({
     isDisabled: isDisabled
   }),
-      containerPressProps = _usePress.pressProps;
+      pressProps = _usePress.pressProps;
 
   var whitelistedProps = (0, _omit["default"])(props, (0, _keys["default"])(others));
 
-  var _useSwitch = (0, _switch.useSwitch)(_objectSpread({
+  var _useSwitch = (0, _reactAria.useSwitch)(_objectSpread({
     children: label
   }, whitelistedProps), state, switchRef),
       inputProps = _useSwitch.inputProps;
@@ -126,11 +128,12 @@ var SwitchField = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
   var _useField = (0, _hooks.useField)(_objectSpread(_objectSpread(_objectSpread({
     statusClasses: statusClasses
-  }, containerPressProps), props), {}, {
+  }, pressProps), props), {}, {
     controlProps: _objectSpread(_objectSpread({}, controlProps), inputProps)
   })),
       fieldContainerProps = _useField.fieldContainerProps,
-      fieldControlProps = _useField.fieldControlProps,
+      fieldControlInputProps = _useField.fieldControlInputProps,
+      fieldControlWrapperProps = _useField.fieldControlWrapperProps,
       fieldLabelProps = _useField.fieldLabelProps;
 
   var unhandledAriaProps = {
@@ -139,23 +142,17 @@ var SwitchField = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   };
   return (0, _react2.jsx)(_.Box, fieldContainerProps, (0, _react2.jsx)(_.Label, (0, _extends2["default"])({
     variant: "forms.switch.label"
-  }, fieldLabelProps), (0, _react2.jsx)(_.Switch, (0, _extends2["default"])({
+  }, fieldLabelProps), (0, _react2.jsx)(_.Box, fieldControlWrapperProps, (0, _react2.jsx)(_.Switch, (0, _extends2["default"])({
     ref: switchRef,
-    inputProps: fieldControlProps
-  }, unhandledAriaProps)), label), helperText && (0, _react2.jsx)(_.FieldHelperText, {
+    inputProps: fieldControlInputProps
+  }, unhandledAriaProps))), label), helperText && (0, _react2.jsx)(_.FieldHelperText, {
     status: status
   }, helperText));
 });
-SwitchField.propTypes = _objectSpread({
+SwitchField.propTypes = _objectSpread(_objectSpread({
   /** A list of class names to apply to the input element. */
   className: _propTypes["default"].oneOfType([_propTypes["default"].string, _propTypes["default"].arrayOf(_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({}),
-
   /** Whether the element should receive focus on render. */
   hasAutoFocus: _propTypes["default"].bool,
 
@@ -186,9 +183,6 @@ SwitchField.propTypes = _objectSpread({
   /** The rendered label for the field. */
   label: _propTypes["default"].node,
 
-  /** Props object that is spread directly into the label element. */
-  labelProps: _propTypes["default"].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["default"].string,
 
@@ -215,7 +209,7 @@ SwitchField.propTypes = _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["default"].string
-}, _ariaAttributes.ariaAttributesBasePropTypes);
+}, _ariaAttributes.ariaAttributesBasePropTypes), _fieldAttributes.inputFieldAttributesBasePropTypes);
 SwitchField.defaultProps = {
   isDisabled: false,
   isReadOnly: false,

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

@@ -40,6 +40,8 @@ var _ = _interopRequireDefault(require("."));
 
 var _ariaAttributes = require("../../utils/devUtils/props/ariaAttributes");
 
+var _fieldAttributes = require("../../utils/devUtils/props/fieldAttributes");
+
 var _index = require("../../index");
 
 var _statuses = _interopRequireDefault(require("../../utils/devUtils/constants/statuses"));
@@ -64,7 +66,7 @@ var _default = {
       }
     }
   },
-  argTypes: _objectSpread({
+  argTypes: _objectSpread(_objectSpread({
     label: {
       control: {
         type: 'text'
@@ -98,16 +100,13 @@ var _default = {
     isReadOnly: {},
     isDefaultSelected: {},
     hasAutoFocus: {},
-    containerProps: {},
-    labelProps: {},
-    controlProps: {},
     id: {},
     isSelected: {
       control: {
         type: 'none'
       }
     }
-  }, _ariaAttributes.ariaAttributeBaseArgTypes)
+  }, _ariaAttributes.ariaAttributeBaseArgTypes), _fieldAttributes.inputFieldAttributeBaseArgTypes)
 };
 exports["default"] = _default;
 

package/lib/cjs/components/Tab/Tab.js

@@ -24,16 +24,12 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _tabs = require("@react-aria/tabs");
+var _reactAria = require("react-aria");
 
-var _focus = require("@react-aria/focus");
+var _reactStately = require("react-stately");
 
 var _interactions = require("@react-aria/interactions");
 
-var _utils = require("@react-aria/utils");
-
-var _collections = require("@react-stately/collections");
-
 var _Tabs = require("../Tabs");
 
 var _hooks = require("../../hooks");
@@ -80,7 +76,7 @@ var CollectionTab = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var isDisabled = tabsDisabled || tabDisabled || state.disabledKeys.has(key);
   var isSelected = state.selectedKey === key;
 
-  var _useFocusRing = (0, _focus.useFocusRing)(),
+  var _useFocusRing = (0, _reactAria.useFocusRing)(),
       isFocusVisible = _useFocusRing.isFocusVisible,
       focusProps = _useFocusRing.focusProps;
 
@@ -106,7 +102,7 @@ var CollectionTab = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     return tabRef.current;
   });
 
-  var _useTab = (0, _tabs.useTab)({
+  var _useTab = (0, _reactAria.useTab)({
     key: key,
     isDisabled: isDisabled
   }, state, tabRef),
@@ -117,7 +113,7 @@ var CollectionTab = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   }, slots === null || slots === void 0 ? void 0 : slots.beforeTab, (0, _react2.jsx)(_.Box, (0, _extends2["default"])({
     className: classNames,
     variant: "tab"
-  }, (0, _utils.mergeProps)(focusProps, hoverProps, tabProps), otherItemProps, {
+  }, (0, _reactAria.mergeProps)(focusProps, hoverProps, tabProps), otherItemProps, {
     ref: tabRef,
     title: titleAttr || undefined
   }), icon, (0, _react2.jsx)(_.Text, (0, _extends2["default"])({
@@ -131,7 +127,7 @@ var CollectionTab = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       items: itemProps.list,
       state: state,
       item: item
-    }, (0, _utils.mergeProps)(focusProps, hoverProps, tabProps), otherItemProps));
+    }, (0, _reactAria.mergeProps)(focusProps, hoverProps, tabProps), otherItemProps));
   }
 
   if (mode === 'tooltip') {
@@ -182,5 +178,5 @@ var TabLine = function TabLine(props) {
 
 
 exports.TabLine = TabLine;
-var _default = _collections.Item;
+var _default = _reactStately.Item;
 exports["default"] = _default;

package/lib/cjs/components/TabPicker/TabPicker.js

@@ -38,13 +38,13 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime-c
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
-var _collections = require("@react-stately/collections");
+var _ArrowDropDownIcon = _interopRequireDefault(require("mdi-react/ArrowDropDownIcon"));
 
 var _ArrowDropUpIcon = _interopRequireDefault(require("mdi-react/ArrowDropUpIcon"));
 
-var _ArrowDropDownIcon = _interopRequireDefault(require("mdi-react/ArrowDropDownIcon"));
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+var _reactStately = require("react-stately");
 
 var _interactions = require("@react-aria/interactions");
 
@@ -228,7 +228,7 @@ var TabPicker = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     selectedKeys: [selectionManager.focusedKey],
     ref: menuRef
   }, (0, _map["default"])(items).call(items, function (tab) {
-    return (0, _react2.jsx)(_collections.Item, {
+    return (0, _react2.jsx)(_reactStately.Item, {
       role: tab.role,
       key: tab.key
     }, tab.name);

package/lib/cjs/components/Table/Table.js

@@ -35,7 +35,7 @@ var Table = function Table(props) {
       others = (0, _objectWithoutProperties2["default"])(props, _excluded);
   return (0, _react2.jsx)(_Box["default"], (0, _extends2["default"])({
     as: "table",
-    variant: "table.table"
+    variant: "table.container"
   }, others), children);
 };