@pingux/astro 1.42.2 → 2.0.0-alpha.4

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

@@ -1,68 +1,40 @@
 "use strict";
 
 var _typeof = require("@babel/runtime-corejs3/helpers/typeof");
-
 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 _WeakMap = require("@babel/runtime-corejs3/core-js-stable/weak-map");
-
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
 _Object$defineProperty(exports, "__esModule", {
   value: true
 });
-
 exports["default"] = exports.WithoutStatusIndicator = exports.WithSlots = exports.Unresizable = exports.Rows = exports.Required = exports.ReadOnly = exports.MaxLength = exports.FloatLabel = exports.Error = exports.Disabled = exports.Default = exports.Controlled = void 0;
-
 var _values = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/values"));
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/slicedToArray"));
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
-
 var _react = _interopRequireWildcard(require("react"));
-
 var _SearchIcon = _interopRequireDefault(require("mdi-react/SearchIcon"));
-
-var _ = _interopRequireDefault(require("."));
-
-var _2 = require("../../");
-
+var _ = require("../..");
+var _statuses = _interopRequireDefault(require("../../utils/devUtils/constants/statuses"));
 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"));
-
+var _2 = _interopRequireDefault(require("."));
 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); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = _Object$defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { _Object$defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 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 _default = {
   title: 'Form/TextAreaField',
-  component: _["default"],
+  component: _2["default"],
   parameters: {
     docs: {
       source: {
@@ -70,7 +42,7 @@ var _default = {
       }
     }
   },
-  argTypes: _objectSpread({
+  argTypes: _objectSpread(_objectSpread({
     label: {
       control: {
         type: 'text'
@@ -113,31 +85,26 @@ var _default = {
     id: {},
     autocomplete: {},
     className: {},
-    containerProps: {},
-    labelProps: {},
-    controlProps: {},
     value: {
       control: {
         type: 'none'
       }
     }
-  }, _ariaAttributes.ariaAttributeBaseArgTypes)
+  }, _ariaAttributes.ariaAttributeBaseArgTypes), _fieldAttributes.inputFieldAttributeBaseArgTypes)
 };
 exports["default"] = _default;
-var IconSlot = (0, _react2.jsx)(_2.Box, {
+var IconSlot = (0, _react2.jsx)(_.Box, {
   isRow: true
-}, (0, _react2.jsx)(_2.Icon, {
+}, (0, _react2.jsx)(_.Icon, {
   icon: _SearchIcon["default"]
 }));
-
 var Default = function Default(args) {
-  return (0, _react2.jsx)(_["default"], args);
+  return (0, _react2.jsx)(_2["default"], args);
 };
-
 exports.Default = Default;
-
 var WithSlots = function WithSlots(args) {
-  return (// This is an example of a slot that can be passed into the component
+  return (
+    // This is an example of a slot that can be passed into the component
     // const IconSlot = (
     //   <Box isRow>
     //     <Icon
@@ -145,32 +112,27 @@ var WithSlots = function WithSlots(args) {
     //     />
     //   </Box>
     // );
-    (0, _react2.jsx)(_["default"], (0, _extends2["default"])({}, args, {
+    (0, _react2.jsx)(_2["default"], (0, _extends2["default"])({}, args, {
       slots: {
         inContainer: IconSlot
       }
     }))
   );
 };
-
 exports.WithSlots = WithSlots;
-
 var FloatLabel = function FloatLabel() {
-  return (0, _react2.jsx)(_["default"], {
+  return (0, _react2.jsx)(_2["default"], {
     label: "Example label",
     labelMode: "float"
   });
 };
-
 exports.FloatLabel = FloatLabel;
-
 var Controlled = function Controlled() {
   var _useState = (0, _react.useState)(),
-      _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-      value = _useState2[0],
-      setValue = _useState2[1];
-
-  return (0, _react2.jsx)(_["default"], {
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    value = _useState2[0],
+    setValue = _useState2[1];
+  return (0, _react2.jsx)(_2["default"], {
     label: "Example Label",
     onChange: function onChange(e) {
       return setValue(e.target.value);
@@ -178,80 +140,63 @@ var Controlled = function Controlled() {
     value: value
   });
 };
-
 exports.Controlled = Controlled;
-
 var Disabled = function Disabled() {
-  return (0, _react2.jsx)(_["default"], {
+  return (0, _react2.jsx)(_2["default"], {
     isDisabled: true,
     label: "Example Label",
     value: "This is disabled"
   });
 };
-
 exports.Disabled = Disabled;
-
 var ReadOnly = function ReadOnly() {
-  return (0, _react2.jsx)(_["default"], {
+  return (0, _react2.jsx)(_2["default"], {
     isReadOnly: true,
     label: "Example Label",
     value: "This is read only"
   });
 };
-
 exports.ReadOnly = ReadOnly;
-
 var Required = function Required() {
-  return (0, _react2.jsx)(_["default"], {
+  return (0, _react2.jsx)(_2["default"], {
     isRequired: true,
     label: "Example Label"
   });
 };
-
 exports.Required = Required;
-
 var Rows = function Rows() {
-  return (0, _react2.jsx)(_["default"], {
+  return (0, _react2.jsx)(_2["default"], {
     label: "Example label",
     rows: 5
   });
 };
-
 exports.Rows = Rows;
-
 var Unresizable = function Unresizable() {
-  return (0, _react2.jsx)(_["default"], {
+  return (0, _react2.jsx)(_2["default"], {
     isUnresizable: true,
     label: "Example label"
   });
 };
-
 exports.Unresizable = Unresizable;
-
 var Error = function Error() {
-  return (0, _react2.jsx)(_["default"], {
+  return (0, _react2.jsx)(_2["default"], {
     helperText: "Here is some helpful text...",
     label: "Example Label",
     status: "error"
   });
 };
-
 exports.Error = Error;
-
 var WithoutStatusIndicator = function WithoutStatusIndicator() {
-  return (0, _react2.jsx)(_["default"], {
+  return (0, _react2.jsx)(_2["default"], {
     label: "Example Label",
     hasNoStatusIndicator: true
   });
 };
-
 exports.WithoutStatusIndicator = WithoutStatusIndicator;
-
 var MaxLength = function MaxLength() {
-  return (0, _react2.jsx)(_["default"], {
+  return (0, _react2.jsx)(_2["default"], {
     label: "Example label",
     maxLength: 9
   });
 };
-
 exports.MaxLength = MaxLength;

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

@@ -1,61 +1,42 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
 var _getOwnPropertyDescriptor = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor"));
-
 var _defineProperties = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/define-properties"));
-
 var _defineProperty = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/define-property"));
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
-
 var _react = _interopRequireDefault(require("react"));
-
-var _userEvent = _interopRequireDefault(require("@testing-library/user-event"));
-
 var _react2 = require("@testing-library/react");
-
+var _userEvent = _interopRequireDefault(require("@testing-library/user-event"));
+var _statuses = _interopRequireDefault(require("../../utils/devUtils/constants/statuses"));
 var _testAxe = _interopRequireDefault(require("../../utils/testUtils/testAxe"));
-
 var _testWrapper = require("../../utils/testUtils/testWrapper");
-
-var _statuses = _interopRequireDefault(require("../../utils/devUtils/constants/statuses"));
-
 var _ = _interopRequireDefault(require("."));
-
 var _react3 = require("@emotion/react");
-
 var testId = 'test-textAreaField';
 var defaultProps = {
   'data-testid': testId,
   label: 'testLabel'
 };
-
 var getComponent = function getComponent() {
   var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return (0, _testWrapper.render)((0, _react3.jsx)(_["default"], (0, _extends2["default"])({}, defaultProps, props)));
 };
+var mockfunction = jest.fn();
 
-var mockfunction = jest.fn(); // Need to be added to each test file to test accessibility using axe.
-
+// Need to be added to each test file to test accessibility using axe.
 (0, _testAxe["default"])(getComponent);
 test('disabled prop disables input', function () {
   getComponent({
     isDisabled: true
   });
-
   var textArea = _testWrapper.screen.getByLabelText(defaultProps.label);
-
   expect(textArea).toBeDisabled();
 });
 test('text area field has focus', function () {
   getComponent();
-
   var textArea = _testWrapper.screen.getByLabelText(defaultProps.label);
-
   _userEvent["default"].tab();
-
   expect(textArea).toHaveFocus();
   expect(textArea).toHaveClass('is-focused');
 });
@@ -63,9 +44,7 @@ test('disabled prop disables text field label', function () {
   getComponent({
     isDisabled: true
   });
-
   var label = _testWrapper.screen.getByText(defaultProps.label);
-
   expect(label).toHaveClass('is-disabled');
 });
 test('text area field with helper text', function () {
@@ -73,9 +52,7 @@ test('text area field with helper text', function () {
   getComponent({
     helperText: helperText
   });
-
   var helper = _testWrapper.screen.getByText(helperText);
-
   expect(helper).toBeInTheDocument();
 });
 test('float label prop adds float label class', function () {
@@ -85,9 +62,7 @@ test('float label prop adds float label class', function () {
     helperText: helperText,
     labelMode: labelMode
   });
-
   var label = _testWrapper.screen.getByText(defaultProps.label);
-
   expect(label).toHaveClass('is-float-label');
 });
 test('mousemove calls resize event', function () {
@@ -98,13 +73,9 @@ test('mousemove calls resize event', function () {
     labelMode: labelMode,
     resizeCallback: mockfunction
   });
-
   var textArea = _testWrapper.screen.getByLabelText(defaultProps.label);
-
   _react2.fireEvent.mouseMove(textArea);
-
   _react2.fireEvent.mouseMove(textArea);
-
   expect(mockfunction).toHaveBeenCalledTimes(2);
 });
 test('label will receive gridRow attribute if it will be higher than textarea', function () {
@@ -125,9 +96,7 @@ test('form wrapper will have default max label column width when no custom width
   getComponent({
     labelMode: labelMode
   });
-
   var textAreaContainer = _testWrapper.screen.getByTestId(testId);
-
   expect(textAreaContainer).toHaveStyle('grid-template-columns: 40% auto');
 });
 test('passing read only prop applys the is-read-only class to the textarea', function () {
@@ -135,9 +104,7 @@ test('passing read only prop applys the is-read-only class to the textarea', fun
   getComponent({
     isReadOnly: isReadOnly
   });
-
   var textArea = _testWrapper.screen.getByLabelText(defaultProps.label);
-
   expect(textArea).toHaveClass('is-read-only');
 });
 test('form wrapper will have a max label column width when custom width set', function () {
@@ -151,9 +118,7 @@ test('form wrapper will have a max label column width when custom width set', fu
     labelMode: labelMode,
     containerProps: containerProps
   });
-
   var textAreaContainer = _testWrapper.screen.getByTestId(testId);
-
   expect(textAreaContainer).toHaveStyle('grid-template-columns: 120px auto');
 });
 test('providing slot props causes slot to render', function () {
@@ -174,14 +139,10 @@ test('passing helper text should display it and correct aria attributes on input
     helperText: testHelperText,
     status: _statuses["default"].ERROR
   });
-
   var helper = _testWrapper.screen.getByText(testHelperText);
-
   expect(helper).toBeInTheDocument();
   expect(helper).toHaveClass("is-".concat(_statuses["default"].ERROR));
-
   var input = _testWrapper.screen.getByRole('textbox');
-
   expect(input).toHaveAttribute('aria-invalid', 'true');
   var helperTextID = helper.getAttribute('id');
   expect(input).toHaveAttribute('aria-describedby', helperTextID);

package/lib/cjs/components/TextAreaField/index.js

@@ -1,18 +1,14 @@
 "use strict";
 
 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
 });
-
 _Object$defineProperty(exports, "default", {
   enumerable: true,
   get: function get() {
     return _TextAreaField["default"];
   }
 });
-
 var _TextAreaField = _interopRequireDefault(require("./TextAreaField"));

package/lib/cjs/components/TextField/TextField.js

@@ -1,100 +1,67 @@
 "use strict";
 
 var _typeof = require("@babel/runtime-corejs3/helpers/typeof");
-
 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 _WeakMap = require("@babel/runtime-corejs3/core-js-stable/weak-map");
-
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
 _Object$defineProperty(exports, "__esModule", {
   value: true
 });
-
 exports["default"] = void 0;
-
 var _values = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/values"));
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
-
 var _react = _interopRequireWildcard(require("react"));
-
 var _propTypes = _interopRequireDefault(require("prop-types"));
-
 var _uuid = require("uuid");
-
-var _ = require("../../");
-
-var _ariaAttributes = require("../../utils/devUtils/props/ariaAttributes");
-
+var _ = require("../..");
 var _hooks = require("../../hooks");
-
-var _statuses = _interopRequireDefault(require("../../utils/devUtils/constants/statuses"));
-
 var _useColumnStyles = _interopRequireDefault(require("../../hooks/useColumnStyles"));
-
+var _statuses = _interopRequireDefault(require("../../utils/devUtils/constants/statuses"));
+var _ariaAttributes = require("../../utils/devUtils/props/ariaAttributes");
+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); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = _Object$defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { _Object$defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 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; }
-
 /**
  * Combines a text input, label, and helper text for a complete, form-ready solution.
  */
 var TextField = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var helperText = props.helperText,
-      slots = props.slots,
-      status = props.status,
-      wrapperProps = props.wrapperProps;
-
+    slots = props.slots,
+    status = props.status;
   var _useField = (0, _hooks.useField)(props),
-      fieldContainerProps = _useField.fieldContainerProps,
-      fieldControlProps = _useField.fieldControlProps,
-      fieldLabelProps = _useField.fieldLabelProps;
-
+    fieldContainerProps = _useField.fieldContainerProps,
+    fieldControlInputProps = _useField.fieldControlInputProps,
+    fieldControlWrapperProps = _useField.fieldControlWrapperProps,
+    fieldLabelProps = _useField.fieldLabelProps;
   var inputRef = (0, _react.useRef)();
   var labelRef = (0, _react.useRef)();
   (0, _hooks.usePropWarning)(props, 'disabled', 'isDisabled');
   /* istanbul ignore next */
-
   (0, _react.useImperativeHandle)(ref, function () {
     return inputRef.current;
   });
-
   var _useLabelHeight = (0, _hooks.useLabelHeight)({
-    labelRef: labelRef,
-    inputRef: inputRef
-  }),
-      isLabelHigher = _useLabelHeight.isLabelHigher;
-
+      labelRef: labelRef,
+      inputRef: inputRef
+    }),
+    isLabelHigher = _useLabelHeight.isLabelHigher;
   var columnStyleProps = (0, _useColumnStyles["default"])({
     labelMode: props.labelMode
   });
   var helperTextId = (0, _uuid.v4)();
   return (0, _react2.jsx)(_.Box, (0, _extends2["default"])({
-    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, (0, _extends2["default"])({}, fieldLabelProps, {
@@ -103,11 +70,10 @@ var TextField = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       gridRow: '1/5'
     }
   })), (0, _react2.jsx)(_.Box, (0, _extends2["default"])({
-    variant: "forms.input.container",
-    className: fieldControlProps.className
-  }, wrapperProps), slots === null || slots === void 0 ? void 0 : slots.beforeInput, (0, _react2.jsx)(_.Input, (0, _extends2["default"])({
+    variant: "forms.input.fieldControlWrapper"
+  }, fieldControlWrapperProps), slots === null || slots === void 0 ? void 0 : slots.beforeInput, (0, _react2.jsx)(_.Input, (0, _extends2["default"])({
     ref: inputRef
-  }, fieldControlProps, {
+  }, fieldControlInputProps, {
     "aria-invalid": status === 'error' && true,
     "aria-describedby": helperText && helperTextId
   })), slots === null || slots === void 0 ? void 0 : slots.inContainer), helperText && (0, _react2.jsx)(_.FieldHelperText, {
@@ -115,22 +81,17 @@ var TextField = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     id: helperTextId
   }, helperText));
 });
-TextField.propTypes = _objectSpread({
+TextField.propTypes = _objectSpread(_objectSpread({
   /** The rendered label for the field. */
   label: _propTypes["default"].node,
-
   /** A string designating whether or not the label is a float label. */
   labelMode: _propTypes["default"].string,
-
   /** Text rendered below the input. */
   helperText: _propTypes["default"].node,
-
   /** The unique identifier for the input element. */
   id: _propTypes["default"].string,
-
   /** The name for the input element. See [MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#htmlattrdefname). */
   name: _propTypes["default"].string,
-
   /**
    * Callback fired when the value is changed on the input element.
    *
@@ -138,83 +99,54 @@ TextField.propTypes = _objectSpread({
    * You can pull out the new value by accessing `event.target.value` (string).
    */
   onChange: _propTypes["default"].func,
-
   /** The value for the input element (controlled). */
   value: _propTypes["default"].string,
-
   /** How the input should handle autocompletion according to the browser. See [MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#htmlattrdefautocomplete). The `autocomplete` prop is an alias for this. */
   autoComplete: _propTypes["default"].string,
-
   /** @ignore Alias for `autoComplete` prop. Exists for backwards-compatibility. */
   autocomplete: _propTypes["default"].string,
-
   /** A list of class names to apply to the input element. */
   className: _propTypes["default"].oneOfType([_propTypes["default"].string, _propTypes["default"].arrayOf(_propTypes["default"].string)]),
-
   /** The default value for the input element. */
   defaultValue: _propTypes["default"].string,
-
   /** Whether the input element is automatically focused when loaded onto the page. See [MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#htmlattrdefautofocus). */
   hasAutoFocus: _propTypes["default"].bool,
-
   /** If present this prop will cause a help hint to render in the label of the field. */
   hintText: _propTypes["default"].string,
-
   /** Whether the field has a status indicator. */
   hasNoStatusIndicator: _propTypes["default"].bool,
-
   /** Whether the field is disabled. */
   isDisabled: _propTypes["default"].bool,
-
   /** Whether the input can be selected, but not changed by the user. */
   isReadOnly: _propTypes["default"].bool,
-
   /** Whether the field is required. */
   isRequired: _propTypes["default"].bool,
-
   /** Add max Length to input value */
   maxLength: _propTypes["default"].number,
-
   /**
    * Callback fired when focus is lost on the input element.
    */
   onBlur: _propTypes["default"].func,
-
   /**
    * Callback fired when focus is lost on the input element.
    */
   onFocus: _propTypes["default"].func,
-
   /** The placeholder text to display in the input element. */
   placeholder: _propTypes["default"].string,
-
   /** Provides a way to insert markup in specified places. */
   slots: _propTypes["default"].shape({
     /** The given node will be inserted before the input. */
     beforeInput: _propTypes["default"].node,
-
     /** The given node will be inserted into the field container. */
     inContainer: _propTypes["default"].node
   }),
-
   /** Determines the input status indicator and helper text styling. */
   status: _propTypes["default"].oneOf((0, _values["default"])(_statuses["default"])),
-
   /** Determines the type of input to use. See [MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#htmlattrdeftype). */
   type: _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({}),
-
   /** Props object that is spread directly into the input wrapper element. */
   wrapperProps: _propTypes["default"].shape({})
-}, _ariaAttributes.ariaAttributesBasePropTypes);
+}, _ariaAttributes.ariaAttributesBasePropTypes), _fieldAttributes.inputFieldAttributesBasePropTypes);
 TextField.defaultProps = {
   hasAutoFocus: false,
   isDisabled: false,