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

package/lib/cjs/components/Radio/Radio.styles.js

@@ -0,0 +1,75 @@
+"use strict";
+
+var _Object$keys = require("@babel/runtime-corejs3/core-js-stable/object/keys");
+
+var _Object$getOwnPropertySymbols = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols");
+
+var _filterInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/filter");
+
+var _Object$getOwnPropertyDescriptor = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor");
+
+var _forEachInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/for-each");
+
+var _Object$getOwnPropertyDescriptors = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors");
+
+var _Object$defineProperties = require("@babel/runtime-corejs3/core-js-stable/object/define-properties");
+
+var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
+
+var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
+
+_Object$defineProperty(exports, "__esModule", {
+  value: true
+});
+
+exports["default"] = void 0;
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
+
+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; }
+
+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) { (0, _defineProperty2["default"])(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; }
+
+// Styles for default radio and variants go here.
+// Default radio
+var base = {
+  width: 20,
+  height: 20,
+  color: 'active',
+  mr: 'xs',
+  // override the default focus styling
+  'input:focus ~ &': {
+    bg: 'transparent'
+  },
+  'input ~ &.is-focused': _objectSpread({}, _Buttons.focusWithCroppedOutline)
+};
+var outerContainer = {
+  '.is-horizontal &': {
+    mr: '15px'
+  }
+}; // Used to give a border to radio elements
+
+var container = {
+  borderWidth: 1,
+  borderStyle: 'solid',
+  borderColor: 'active',
+  borderRadius: 3,
+  padding: 'md',
+  mb: 'md'
+}; // Used to add spacing for content shown when a radio is checked
+
+var checkedContent = {
+  pb: 'sm',
+  pl: 'lg',
+  color: 'text.secondary',
+  fontSize: 'md'
+};
+var _default = {
+  base: base,
+  outerContainer: outerContainer,
+  container: container,
+  checkedContent: checkedContent
+};
+exports["default"] = _default;

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

@@ -38,7 +38,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _radio = require("@react-aria/radio");
+var _reactAria = require("react-aria");
 
 var _hooks = require("../../hooks");
 
@@ -52,6 +52,8 @@ 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); }
@@ -90,7 +92,7 @@ var RadioField = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var groupDisabled = state.isDisabled;
   var isDisabled = radioDisabled || groupDisabled;
 
-  var _useRadio = (0, _radio.useRadio)(_objectSpread(_objectSpread({
+  var _useRadio = (0, _reactAria.useRadio)(_objectSpread(_objectSpread({
     children: label,
     autoFocus: hasAutoFocus,
     isDisabled: isDisabled
@@ -109,22 +111,25 @@ var RadioField = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     controlProps: _objectSpread(_objectSpread({}, controlProps), inputProps)
   })),
       fieldContainerProps = _useField.fieldContainerProps,
-      fieldControlProps = _useField.fieldControlProps,
+      fieldControlInputProps = _useField.fieldControlInputProps,
+      fieldControlWrapperProps = _useField.fieldControlWrapperProps,
       fieldLabelProps = _useField.fieldLabelProps;
 
   return (0, _react2.jsx)(_Box["default"], (0, _extends2["default"])({
-    variant: "forms.radioField"
+    variant: "forms.radio.outerContainer"
   }, fieldContainerProps), (0, _react2.jsx)(_Label["default"], (0, _extends2["default"])({
     variant: "forms.label.radio"
-  }, fieldLabelProps), (0, _react2.jsx)(_Radio["default"], (0, _extends2["default"])({
+  }, fieldLabelProps), (0, _react2.jsx)(_Box["default"], fieldControlWrapperProps, (0, _react2.jsx)(_Radio["default"], (0, _extends2["default"])({
     ref: radioFieldRef
-  }, fieldControlProps)), label), helperText && (0, _react2.jsx)(_FieldHelperText["default"], {
+  }, fieldControlInputProps, {
+    variant: "forms.radio.base"
+  }))), label), helperText && (0, _react2.jsx)(_FieldHelperText["default"], {
     status: status
   }, helperText), isChecked && checkedContent && (0, _react2.jsx)(_Box["default"], {
-    variant: "boxes.radioCheckedContent"
+    variant: "forms.radio.checkedContent"
   }, checkedContent));
 });
-RadioField.propTypes = {
+RadioField.propTypes = _objectSpread({
   /** Content to display when the radio is checked. */
   checkedContent: _propTypes["default"].node,
 
@@ -189,17 +194,8 @@ RadioField.propTypes = {
    * Identifies the element (or elements) that provide a detailed, extended description for the
    * object.
   */
-  '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({})
-};
+  'aria-details': _propTypes["default"].string
+}, _ariaAttributes.ariaAttributesBasePropTypes);
 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 _radio = require("@react-aria/radio");
+var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _radio2 = require("@react-stately/radio");
+var _reactAria = require("react-aria");
 
-var _propTypes = _interopRequireDefault(require("prop-types"));
+var _reactStately = require("react-stately");
 
 var _uuid = require("uuid");
 
@@ -48,6 +48,8 @@ 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"));
@@ -84,9 +86,9 @@ var RadioGroupField = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref)
       label = props.label,
       orientation = props.orientation,
       status = props.status;
-  var state = (0, _radio2.useRadioGroupState)(props);
+  var state = (0, _reactStately.useRadioGroupState)(props);
 
-  var _useRadioGroup = (0, _radio.useRadioGroup)(props, state),
+  var _useRadioGroup = (0, _reactAria.useRadioGroup)(props, state),
       radioGroupProps = _useRadioGroup.radioGroupProps,
       labelProps = _useRadioGroup.labelProps;
 
@@ -99,7 +101,9 @@ var RadioGroupField = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref)
   var unhandledAriaProps = {
     'aria-controls': props['aria-controls']
   };
-  var helperTextId = (0, _uuid.v4)();
+  var helperTextId = (0, _react.useMemo)(function () {
+    return (0, _uuid.v4)();
+  }, []);
   return (0, _react2.jsx)(_.Box, (0, _extends2["default"])({
     ref: ref,
     className: classNames
@@ -125,7 +129,7 @@ var RadioGroupField = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref)
     id: helperTextId
   }, helperText));
 });
-RadioGroupField.propTypes = _objectSpread({
+RadioGroupField.propTypes = _objectSpread(_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,
 
@@ -168,7 +172,7 @@ RadioGroupField.propTypes = _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);
+}, _ariaAttributes.ariaAttributesBasePropTypes), _fieldAttributes.inputFieldAttributesBasePropTypes);
 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 _collections = require("@react-stately/collections");
+var _reactAria = require("react-aria");
 
-var _focus = require("@react-aria/focus");
+var _reactStately = require("react-stately");
 
 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)(_focus.FocusRing, {
+  return (0, _react2.jsx)(_reactAria.FocusRing, {
     focusRingClass: "is-focused"
   }, (0, _react2.jsx)(_index.Box, (0, _extends2["default"])({
     as: "button",
     className: classNames,
-    variant: "buttons.rocker"
+    variant: "variants.rockerButton.thumbSwitch"
   }, rockerButtonProps, {
     ref: rockerButtonRef
   }, itemProps, {
@@ -131,5 +131,5 @@ CollectionRockerButton.defaultProps = {
 }; // Export Item as default for simplicity, convert to CollectionRockerButton within
 // RockerButtonGroup component.
 
-var _default = _collections.Item;
+var _default = _reactStately.Item;
 exports["default"] = _default;

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

@@ -0,0 +1,72 @@
+"use strict";
+
+var _Object$keys = require("@babel/runtime-corejs3/core-js-stable/object/keys");
+
+var _Object$getOwnPropertySymbols = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols");
+
+var _filterInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/filter");
+
+var _Object$getOwnPropertyDescriptor = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor");
+
+var _forEachInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/for-each");
+
+var _Object$getOwnPropertyDescriptors = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors");
+
+var _Object$defineProperties = require("@babel/runtime-corejs3/core-js-stable/object/define-properties");
+
+var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
+
+var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
+
+_Object$defineProperty(exports, "__esModule", {
+  value: true
+});
+
+exports["default"] = void 0;
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
+
+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; }
+
+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) { (0, _defineProperty2["default"])(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; }
+
+var container = {
+  alignItems: 'flex-start'
+};
+var innerContainer = {
+  bg: 'accent.95',
+  border: '1px solid',
+  borderColor: 'accent.90',
+  boxShadow: 'standard',
+  borderRadius: '15px',
+  padding: '2px'
+};
+
+var thumbSwitch = _objectSpread(_objectSpread({}, _Buttons.base), {}, {
+  border: '0',
+  display: 'inline-flex',
+  height: '26px',
+  lineHeight: '26px',
+  fontSize: '14px',
+  borderRadius: '15px',
+  alignSelf: 'center',
+  paddingTop: '0px',
+  paddingBottom: '0px',
+  textTransform: 'uppercase',
+  bg: 'accent.95',
+  '&.is-selected': {
+    bg: 'active',
+    color: 'white',
+    zIndex: '1'
+  },
+  '&.is-focused': _objectSpread({}, _Buttons.defaultFocus)
+});
+
+var _default = {
+  container: container,
+  innerContainer: innerContainer,
+  thumbSwitch: thumbSwitch
+};
+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 _tabs = require("@react-aria/tabs");
+var _reactAria = require("react-aria");
 
-var _tabs2 = require("@react-stately/tabs");
+var _reactStately = require("react-stately");
 
 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, _tabs2.useTabListState)(_objectSpread(_objectSpread({}, props), {}, {
+  var state = (0, _reactStately.useTabListState)(_objectSpread(_objectSpread({}, props), {}, {
     onSelectionChange: onSelectionChange
   }));
 
-  var _useTabList = (0, _tabs.useTabList)(props, state, buttonGroupRef),
+  var _useTabList = (0, _reactAria.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.rockerContainer"
+    variant: "rockerButton.container"
   }, others), (0, _react2.jsx)(_Box["default"], (0, _extends2["default"])({
-    variant: "rockerbutton.rockerContainerInner",
+    variant: "rockerButton.innerContainer",
     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: "boxes.topShadowScrollbox",
+    variant: "scrollBox.topShadowBox",
     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: "boxes.scrollbox"
+    variant: "scrollBox.container"
   }, others), children), (0, _react2.jsx)(_Box["default"], {
-    variant: "boxes.bottomShadowScrollbox",
+    variant: "scrollBox.bottomShadowBox",
     className: classNames,
     role: "separator"
   }));

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

@@ -0,0 +1,53 @@
+"use strict";
+
+var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
+
+_Object$defineProperty(exports, "__esModule", {
+  value: true
+});
+
+exports["default"] = void 0;
+var topShadowBox = {
+  '&.has-shadows.is-top-shadow-showing': {
+    position: 'relative',
+    zIndex: '10000',
+    boxShadow: '0px 4px 2px 1px rgb(37, 55, 70, 0.15)',
+    height: '4px',
+    marginBottom: '-4px',
+    backgroundColor: '#FFFFFF'
+  }
+};
+var bottomShadowBox = {
+  '&.has-shadows.is-bottom-shadow-showing': {
+    position: 'relative',
+    zIndex: '10000',
+    boxShadow: '0px -4px 2px 1px rgb(37, 55, 70, 0.15)',
+    height: '4px',
+    marginTop: '-2px',
+    backgroundColor: '#FFFFFF'
+  }
+};
+var container = {
+  '&::-webkit-scrollbar': {
+    display: 'none',
+    width: '0px !important'
+  },
+  '&::-webkit-scrollbar-track': {
+    width: '0px',
+    display: 'none'
+  },
+  '&::-webkit-scrollbar-thumb': {
+    borderRadius: '0px',
+    display: 'none'
+  },
+  position: 'relative',
+  '& > *': {
+    overflow: 'hidden auto'
+  }
+};
+var _default = {
+  container: container,
+  topShadowBox: topShadowBox,
+  bottomShadowBox: bottomShadowBox
+};
+exports["default"] = _default;

package/lib/cjs/{styles/forms/search.js → components/SearchField/Search.styles.js}

@@ -6,19 +6,19 @@ _Object$defineProperty(exports, "__esModule", {
   value: true
 });
 
-exports.icon = exports["default"] = exports.container = exports.clearButtonIcon = void 0;
+exports.wrapper = exports.icon = exports["default"] = exports.clearButtonIcon = void 0;
 var clearButtonIcon = {
   color: 'neutral.40'
 };
 exports.clearButtonIcon = clearButtonIcon;
-var container = {
+var wrapper = {
   position: 'relative',
   justifyContent: 'center',
   '> input::-webkit-search-cancel-button, > input::-webkit-search-decoration': {
     WebkitAppearance: 'none'
   }
 };
-exports.container = container;
+exports.wrapper = wrapper;
 var icon = {
   position: 'absolute',
   color: 'neutral.40',
@@ -27,7 +27,7 @@ var icon = {
 exports.icon = icon;
 var _default = {
   clearButtonIcon: clearButtonIcon,
-  container: container,
+  wrapper: wrapper,
   icon: icon
 };
 exports["default"] = _default;

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

@@ -34,20 +34,22 @@ 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");
@@ -86,9 +88,9 @@ var SearchField = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   (0, _react.useImperativeHandle)(ref, function () {
     return searchRef.current;
   });
-  var state = (0, _searchfield2.useSearchFieldState)(props);
+  var state = (0, _reactStately.useSearchFieldState)(props);
 
-  var _useSearchField = (0, _searchfield.useSearchField)(_objectSpread({
+  var _useSearchField = (0, _reactAria.useSearchField)(_objectSpread({
     autoComplete: autocomplete,
     autoFocus: hasAutoFocus,
     excludeFromTabOrder: isExcludedFromTabOrder
@@ -102,7 +104,8 @@ var SearchField = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     controlProps: _objectSpread(_objectSpread({}, controlProps), raInputProps)
   })),
       fieldContainerProps = _useField.fieldContainerProps,
-      fieldControlProps = _useField.fieldControlProps,
+      fieldControlInputProps = _useField.fieldControlInputProps,
+      fieldControlWrapperProps = _useField.fieldControlWrapperProps,
       fieldLabelProps = _useField.fieldLabelProps;
 
   var handleKeyDownEvent = function handleKeyDownEvent(e) {
@@ -113,15 +116,13 @@ 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, {
-    variant: "forms.search.container"
-  }, (0, _react2.jsx)(_.Input, (0, _extends2["default"])({
+  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"])({
     ref: searchRef,
     pl: 40,
     pr: 40
-  }, fieldControlProps, {
-    variant: "forms.input.search"
-  })), icon && (0, _react2.jsx)(_.Icon, (0, _extends2["default"])({
+  }, fieldControlInputProps)), icon && (0, _react2.jsx)(_.Icon, (0, _extends2["default"])({
     icon: icon,
     variant: "forms.search.icon",
     size: 22
@@ -140,7 +141,7 @@ var SearchField = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     icon: _CloseIcon["default"]
   }))));
 });
-SearchField.propTypes = _objectSpread({
+SearchField.propTypes = _objectSpread(_objectSpread({
   /**
    * @ignore
    * Identifies the currently active element when DOM focus is on a composite widget, textbox,
@@ -239,16 +240,9 @@ SearchField.propTypes = _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. */
@@ -346,7 +340,7 @@ SearchField.propTypes = _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);
+}, _ariaAttributes.ariaAttributesBasePropTypes), _fieldAttributes.inputFieldAttributesBasePropTypes);
 SearchField.defaultProps = {
   hasNoClearButton: false,
   icon: _SearchIcon["default"]

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

@@ -44,6 +44,8 @@ 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");
@@ -66,7 +68,7 @@ var _default = {
       }
     }
   },
-  argTypes: _objectSpread({
+  argTypes: _objectSpread(_objectSpread({
     label: {
       control: {
         type: 'text'
@@ -85,10 +87,7 @@ var _default = {
     hasAutoFocus: {},
     hasNoClearButton: {},
     autoComplete: {},
-    containerProps: {},
     iconProps: {},
-    controlProps: {},
-    labelProps: {},
     name: {},
     id: {},
     'aria-autocomplete': {
@@ -99,7 +98,7 @@ var _default = {
         type: 'none'
       }
     }
-  }, _ariaAttributes.ariaAttributeBaseArgTypes)
+  }, _ariaAttributes.ariaAttributeBaseArgTypes), _fieldAttributes.inputFieldAttributeBaseArgTypes)
 };
 exports["default"] = _default;
 

package/lib/cjs/{styles/forms/select.js → components/SelectField/Select.styles.js}

@@ -26,11 +26,11 @@ exports.select = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
 
-var _input = require("./input");
+var _Input = require("../Input/Input.styles");
 
-var _variants = require("../variants");
+var _variants = require("../../styles/variants");
 
-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; }
 
@@ -41,10 +41,10 @@ var activeFloatLabel = {
   pb: 'xs'
 }; // Default select
 
-var select = _objectSpread(_objectSpread({}, _input.input), {}, {
+var select = _objectSpread(_objectSpread({}, _Input.input), {}, {
   display: 'flex',
   alignItems: 'center',
-  '&.is-focused': _objectSpread({}, _buttons.defaultFocus),
+  '&.is-focused': _objectSpread({}, _Buttons.defaultFocus),
   '.is-float-label &': _objectSpread({
     height: '45px'
   }, activeFloatLabel)
@@ -61,7 +61,7 @@ select.currentValue = {
   // ThemeUI adds display: flex after other styles and ellipsis goes away
   display: 'inline !important'
 };
-select.listBoxPopup = _objectSpread(_objectSpread({}, _input.input), {}, {
+select.listBoxPopup = _objectSpread(_objectSpread({}, _Input.input), {}, {
   position: 'absolute',
   width: '100%',
   height: 'fit-content',