@pingux/astro 1.42.2 → 2.0.0-alpha.4

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

@@ -1,65 +1,42 @@
 "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");
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
-
 var _react = _interopRequireDefault(require("react"));
-
 var _themeUi = require("theme-ui");
-
-var _testWrapper = require("../../utils/testUtils/testWrapper");
-
-var _ = _interopRequireDefault(require("."));
-
 var _testAxe = _interopRequireDefault(require("../../utils/testUtils/testAxe"));
-
 var _testTheme = _interopRequireDefault(require("../../utils/testUtils/testTheme"));
-
+var _testWrapper = require("../../utils/testUtils/testWrapper");
+var _ = _interopRequireDefault(require("."));
 var _react2 = require("@emotion/react");
-
 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 testId = 'test-text';
 var defaultProps = {
   'data-testid': testId
 };
-
 var getComponent = function getComponent() {
   var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var children = props.children;
   return (0, _testWrapper.render)((0, _react2.jsx)(_themeUi.ThemeProvider, {
     theme: _testTheme["default"]
   }, (0, _react2.jsx)(_["default"], (0, _extends2["default"])({}, defaultProps, props), children)));
-}; // 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('default text', function () {
   getComponent();
-
   var text = _testWrapper.screen.getByTestId(testId);
-
   expect(text).toBeInstanceOf(HTMLSpanElement);
   expect(text).toBeInTheDocument();
 });
@@ -74,16 +51,12 @@ test('typography props will be applied', function () {
     fontStyle: 'italic'
   };
   getComponent(_objectSpread({}, customTypographyProps));
-
   var text = _testWrapper.screen.getByTestId(testId);
-
-  expect(text).toHaveStyle({
-    fontFamily: 'times',
-    fontSize: '23px',
-    fontWeight: 900,
-    lineHeight: '2em',
-    letterSpacing: '5px',
-    textAlign: 'right',
-    fontStyle: 'italic'
-  });
+  expect(text).toHaveStyle('fontFamily: times');
+  expect(text).toHaveStyle('fontSize: xx');
+  expect(text).toHaveStyle('fontWeight: 900');
+  expect(text).toHaveStyle('lineHeight: 2em');
+  expect(text).toHaveStyle('letterSpacing: 5px');
+  expect(text).toHaveStyle('textAlign: right');
+  expect(text).toHaveStyle('fontStyle: italic');
 });

package/lib/cjs/components/Text/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 _Text["default"];
   }
 });
-
 var _Text = _interopRequireDefault(require("./Text"));

package/lib/cjs/components/TextArea/TextArea.js

@@ -1,33 +1,20 @@
 "use strict";
 
 var _typeof = require("@babel/runtime-corejs3/helpers/typeof");
-
 var _WeakMap = require("@babel/runtime-corejs3/core-js-stable/weak-map");
-
 var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
-
 var _Object$getOwnPropertyDescriptor = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor");
-
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
 _Object$defineProperty(exports, "__esModule", {
   value: true
 });
-
 exports["default"] = void 0;
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
-
 var _react = _interopRequireWildcard(require("react"));
-
 var _themeUi = require("theme-ui");
-
 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; }
-
 /**
  * Basic textarea input.
  * Built on top of the [TextArea from Theme-UI Forms](https://theme-ui.com/components/textarea and
@@ -35,9 +22,11 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
  *
  * **Note: Requires a label. It's recommended to use `TextAreaField` for a complete solution.**
  */
+
 var TextArea = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   return (0, _react2.jsx)(_themeUi.Textarea, (0, _extends2["default"])({
-    ref: ref // this requires to fix safari resizing issue (UIP-4995)
+    ref: ref
+    // this requires to fix safari resizing issue (UIP-4995)
     ,
     sx: {
       position: 'relative'

package/lib/cjs/{styles/forms/textarea.js → components/TextArea/TextArea.styles.js}

@@ -1,39 +1,25 @@
 "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.textarea = void 0;
-
+exports["default"] = exports.baseField = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
-
-var _input = require("./input");
-
+var _Input = require("../Input/Input.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 input and variants go here.
-var textarea = _objectSpread(_objectSpread({}, _input.input), {}, {
+
+var baseField = _objectSpread(_objectSpread({}, _Input.input), {}, {
   height: 'unset',
   '&.is-unresizable': {
     resize: 'none'
@@ -42,5 +28,27 @@ var textarea = _objectSpread(_objectSpread({}, _input.input), {}, {
     height: 'unset'
   }
 });
-
-exports.textarea = textarea;
+exports.baseField = baseField;
+var containerSlot = {
+  position: 'absolute',
+  bg: 'transparent',
+  width: '20px',
+  right: '10px',
+  top: '50%',
+  transform: 'translateY(-50%)'
+};
+var floatLabelWrapper = {
+  width: 'calc(100% - 4px)',
+  backgroundColor: 'white',
+  position: 'relative',
+  height: '17px',
+  bottom: '-18px',
+  left: '3px',
+  zIndex: 2
+};
+var _default = {
+  baseField: baseField,
+  containerSlot: containerSlot,
+  floatLabelWrapper: floatLabelWrapper
+};
+exports["default"] = _default;

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

@@ -1,30 +1,22 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
-
 var _react = _interopRequireDefault(require("react"));
-
 var _react2 = require("@testing-library/react");
-
-var _ = _interopRequireDefault(require("."));
-
 var _testAxe = _interopRequireDefault(require("../../utils/testUtils/testAxe"));
-
+var _ = _interopRequireDefault(require("."));
 var _react3 = require("@emotion/react");
-
 var testId = 'textAreaField';
 var defaultProps = {
   'data-testid': testId
 };
-
 var getComponent = function getComponent() {
   var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return (0, _react2.render)((0, _react3.jsx)(_["default"], (0, _extends2["default"])({}, defaultProps, props)));
-}; // 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, {
   // TextArea with label provided by TextAreaField
   rules: {
@@ -35,9 +27,7 @@ var getComponent = function getComponent() {
 });
 test('TextArea renders', function () {
   getComponent();
-
   var textArea = _react2.screen.getByTestId(testId);
-
   expect(textArea).toBeInstanceOf(HTMLTextAreaElement);
   expect(textArea).toBeInTheDocument();
 });

package/lib/cjs/components/TextArea/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 _TextArea["default"];
   }
 });
-
 var _TextArea = _interopRequireDefault(require("./TextArea"));

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

@@ -1,87 +1,58 @@
 "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 _utils = require("@react-aria/utils");
-
+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 _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 textarea, label, and helper text for a complete, form-ready solution.
  */
 var TextAreaField = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var helperText = props.helperText,
-      isUnresizable = props.isUnresizable,
-      rows = props.rows,
-      status = props.status,
-      slots = props.slots;
+    isUnresizable = props.isUnresizable,
+    rows = props.rows,
+    status = props.status,
+    slots = props.slots;
   var statusClasses = {
     isUnresizable: isUnresizable
   };
-
   var _useField = (0, _hooks.useField)(_objectSpread({
-    statusClasses: statusClasses
-  }, props)),
-      fieldContainerProps = _useField.fieldContainerProps,
-      fieldControlProps = _useField.fieldControlProps,
-      fieldLabelProps = _useField.fieldLabelProps;
-
+      statusClasses: statusClasses
+    }, props)),
+    fieldContainerProps = _useField.fieldContainerProps,
+    fieldControlInputProps = _useField.fieldControlInputProps,
+    fieldControlWrapperProps = _useField.fieldControlWrapperProps,
+    fieldLabelProps = _useField.fieldLabelProps;
   var containerRef = (0, _react.useRef)();
-  var inputContainerRef = (0, _react.useRef)();
+  var fieldControlWrapperRef = (0, _react.useRef)();
   var labelRef = (0, _react.useRef)();
   var labelWrapperRef = (0, _react.useRef)();
   var slotContainer = (0, _react.useRef)();
@@ -89,24 +60,21 @@ var TextAreaField = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var helperTextId = (0, _uuid.v4)();
   (0, _hooks.usePropWarning)(props, 'disabled', 'isDisabled');
   /* istanbul ignore next */
-
   (0, _react.useImperativeHandle)(ref, function () {
     return textAreaRef.current;
   });
-  /* istanbul ignore next */
 
+  /* istanbul ignore next */
   var resizeFloatLabel = function resizeFloatLabel() {
     /* istanbul ignore next */
     labelRef.current.style.width = textAreaRef.current.style.width;
     labelWrapperRef.current.style.width = "".concat(textAreaRef.current.clientWidth - 2, "px");
   };
-  /* istanbul ignore next */
-
 
+  /* istanbul ignore next */
   var resizeSlotContainer = function resizeSlotContainer() {
-    inputContainerRef.current.style.width = textAreaRef.current.style.width;
+    fieldControlWrapperRef.current.style.width = textAreaRef.current.style.width;
   };
-
   var onResize = (0, _react.useCallback)(function () {
     /* istanbul ignore next */
     if (slots !== null && slots !== void 0 && slots.inContainer) {
@@ -118,23 +86,19 @@ var TextAreaField = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     onResize: onResize
   });
   (0, _utils.useLayoutEffect)(onResize, [onResize]);
-
   var _useLabelHeight = (0, _hooks.useLabelHeight)({
-    labelRef: labelRef,
-    inputRef: textAreaRef
-  }),
-      isLabelHigher = _useLabelHeight.isLabelHigher;
-
+      labelRef: labelRef,
+      inputRef: textAreaRef
+    }),
+    isLabelHigher = _useLabelHeight.isLabelHigher;
   var columnStyleProps = (0, _hooks.useColumnStyles)({
     labelMode: props.labelMode
   });
   (0, _react.useEffect)(function () {
     var thisRef = textAreaRef.current;
-
     if (!props.isUnresizable && props.labelMode === 'float') {
       thisRef.addEventListener('mousemove', props.resizeCallback ? props.resizeCallback : resizeFloatLabel);
     }
-
     return function () {
       thisRef.removeEventListener('mousemove', props.resizeCallback ? props.resizeCallback : resizeFloatLabel);
     };
@@ -147,26 +111,26 @@ var TextAreaField = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     }
   }));
   var wrappedLabel = (0, _react2.jsx)(_.Box, {
-    variant: "boxes.floatLabelWrapper",
+    variant: "forms.textarea.floatLabelWrapper",
     ref: labelWrapperRef
   }, labelNode);
   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),
     ref: containerRef,
     maxWidth: "100%"
-  }), props.labelMode === 'float' ? wrappedLabel : labelNode, (0, _react2.jsx)(_.Box, {
+  }), props.labelMode === 'float' ? wrappedLabel : labelNode, (0, _react2.jsx)(_.Box, (0, _extends2["default"])({
     isRow: true,
-    variant: "forms.input.container",
-    className: fieldControlProps.className,
+    variant: "forms.input.fieldControlWrapper",
     minWidth: "40px",
     maxWidth: "100%",
-    ref: inputContainerRef
-  }, (0, _react2.jsx)(_.TextArea, (0, _extends2["default"])({
+    ref: fieldControlWrapperRef
+  }, fieldControlWrapperProps), (0, _react2.jsx)(_.TextArea, (0, _extends2["default"])({
     ref: textAreaRef,
-    rows: rows
-  }, fieldControlProps, {
+    rows: rows,
+    variant: "forms.textarea.baseField"
+  }, fieldControlInputProps, {
     sx: slots !== null && slots !== void 0 && slots.inContainer ? {
       paddingRight: '35px'
     } : {
@@ -175,35 +139,28 @@ var TextAreaField = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     "aria-invalid": status === 'error' && true,
     "aria-describedby": helperText && helperTextId
   })), (slots === null || slots === void 0 ? void 0 : slots.inContainer) && (0, _react2.jsx)(_.Box, {
-    variant: "boxes.textFieldInContainerSlot",
+    variant: "forms.textarea.containerSlot",
     ref: slotContainer
   }, slots === null || slots === void 0 ? void 0 : slots.inContainer)), helperText && (0, _react2.jsx)(_.FieldHelperText, {
     status: status,
     id: helperTextId
   }, helperText));
 });
-TextAreaField.propTypes = _objectSpread({
+TextAreaField.propTypes = _objectSpread(_objectSpread({
   /** The rendered label for the field. */
   label: _propTypes["default"].node,
-
   /** Text rendered below the textarea. */
   helperText: _propTypes["default"].node,
-
   /** If present this prop will cause a help hint to render in the label of the field. */
   hintText: _propTypes["default"].string,
-
   /** The unique identifier for the textarea element. */
   id: _propTypes["default"].string,
-
   /** A string designating whether or not the label is a float label. */
   labelMode: _propTypes["default"].string,
-
   /** Whether the textarea is unable to be resized. */
   isUnresizable: _propTypes["default"].bool,
-
   /** The name for the textarea element. See [MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/textarea#attr-name). */
   name: _propTypes["default"].string,
-
   /**
    * Callback fired when the value is changed on the textarea element.
    *
@@ -211,79 +168,52 @@ TextAreaField.propTypes = _objectSpread({
    * You can pull out the new value by accessing `event.target.value` (string).
    */
   onChange: _propTypes["default"].func,
-
   /** The value for the textarea 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 textarea element. */
   className: _propTypes["default"].oneOfType([_propTypes["default"].string, _propTypes["default"].arrayOf(_propTypes["default"].string)]),
-
   /** The default value for the textarea element. */
   defaultValue: _propTypes["default"].string,
-
   /** Whether the textarea element is automatically focused when loaded onto the page. See [MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/textarea#attr-autofocus). */
   hasAutoFocus: _propTypes["default"].bool,
-
   /** 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 textarea element.
    */
   onBlur: _propTypes["default"].func,
-
   /**
    * Callback fired when focus is lost on the textarea element.
    */
   onFocus: _propTypes["default"].func,
-
   /**
    * Callback fired when textfield is resized.
    */
   resizeCallback: _propTypes["default"].func,
-
   /** The placeholder text to display in the textarea element. */
   placeholder: _propTypes["default"].string,
-
   /** The number of rows to display for the textarea. Controls the default height. */
   rows: _propTypes["default"].number,
-
   /** Determines the textarea status indicator and helper text styling. */
   status: _propTypes["default"].oneOf((0, _values["default"])(_statuses["default"])),
-
-  /** 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({}),
-
   /** Provides a way to insert markup in specified places. */
   slots: _propTypes["default"].shape({
     /** The given node will be inserted into the field container. */
     inContainer: _propTypes["default"].node
   })
-}, _ariaAttributes.ariaAttributesBasePropTypes);
+}, _ariaAttributes.ariaAttributesBasePropTypes), _fieldAttributes.inputFieldAttributesBasePropTypes);
 TextAreaField.defaultProps = {
   hasAutoFocus: false,
   isDisabled: false,