@dxc-technology/halstack-react 0.0.0-5a1e592 → 0.0.0-5b15506

package/text-input/types.d.ts

@@ -1,27 +1,29 @@
 /// <reference types="react" />
-declare type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
-declare type Margin = {
+type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
+type Margin = {
     top?: Space;
     bottom?: Space;
     left?: Space;
     right?: Space;
 };
-declare type SVG = React.ReactNode & React.SVGProps<SVGSVGElement>;
-declare type Action = {
+type SVG = React.ReactNode & React.SVGProps<SVGSVGElement>;
+type Action = {
     /**
      * This function will be called when the user clicks the action.
      */
     onClick: () => void;
     /**
-     * Icon to be shown in the action.
+     * Icon to be placed in the action..
      */
     icon: string | SVG;
     /**
-     * Title of the action.
+     * Text representing advisory information related
+     * to the button's action. Under the hood, this prop also serves
+     * as an accessible label for the component.
      */
     title?: string;
 };
-declare type Props = {
+type Props = {
     /**
      * Text to be placed above the input. This label will be used as the aria-label attribute of the list of suggestions.
      */
@@ -47,8 +49,7 @@ declare type Props = {
      */
     placeholder?: string;
     /**
-     * Action to be shown in the input. This is an object composed of an onClick function and an icon,
-     * being the latter either an inline svg or a URL to the image.
+     * Action to be shown in the input.
      */
     action?: Action;
     /**
@@ -61,6 +62,8 @@ declare type Props = {
     disabled?: boolean;
     /**
      * If true, the component will not be mutable, meaning the user can not edit the control.
+     * In addition, the clear action will not be displayed even if the flag is set to true
+     * and the custom action will not execute its onClick event.
      */
     readOnly?: boolean;
     /**
@@ -110,8 +113,9 @@ declare type Props = {
     /**
      * These are the options to be displayed as suggestions. It can be either an array or a function:
      *    - Array:    Array of options that will be filtered by the component.
-     *    - Function: This function will be called when the user changes the value, we will send as a parameter the new value;
-     *                apart from that this function should return one promise on which we should make 'then' to get the suggestions filtered.
+     *    - Function: This function will be called when the user changes the value.
+     *                It will receive the new value as a parameter and should return a promise
+     *                that resolves to an array with the filtered options.
      */
     suggestions?: string[] | ((value: string) => Promise<string[]>);
     /**
@@ -125,7 +129,7 @@ declare type Props = {
      */
     pattern?: string;
     /**
-     * Specifies the minimun length allowed by the input.
+     * Specifies the minimum length allowed by the input.
      * This will be checked both when the input element loses the
      * focus and while typing within it. If the string entered does not
      * comply the minimum length, the onBlur and onChange functions will be called
@@ -166,7 +170,7 @@ declare type Props = {
 /**
  * List of suggestions of an Text Input component.
  */
-export declare type SuggestionsProps = {
+export type SuggestionsProps = {
     id: string;
     value: string;
     suggestions: string[];
@@ -175,16 +179,16 @@ export declare type SuggestionsProps = {
     searchHasErrors: boolean;
     isSearching: boolean;
     suggestionOnClick: (suggestion: string) => void;
-    getTextInputWidth: () => number;
+    styles: React.CSSProperties;
 };
 /**
  * Reference to the component.
  */
-export declare type RefType = HTMLDivElement;
+export type RefType = HTMLDivElement;
 /**
  * Single suggestion of an Text Input component.
  */
-export declare type SuggestionProps = {
+export type SuggestionProps = {
     id: string;
     value: string;
     onClick: (suggestion: string) => void;
@@ -193,7 +197,7 @@ export declare type SuggestionProps = {
     visuallyFocused: boolean;
     highlighted: boolean;
 };
-export declare type AutosuggestWrapperProps = {
+export type AutosuggestWrapperProps = {
     condition: boolean;
     wrapper: (children: React.ReactNode) => JSX.Element;
     children: React.ReactNode;

package/textarea/Textarea.accessibility.test.js

@@ -0,0 +1,155 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _react = _interopRequireDefault(require("react"));
+var _react2 = require("@testing-library/react");
+var _jestAxe = require("jest-axe");
+var _Textarea = _interopRequireDefault(require("./Textarea.tsx"));
+describe("Textarea component accessibility tests", function () {
+  it("Should not have basic accessibility issues", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+    var _render, container, results;
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Textarea["default"], {
+            label: "Example label",
+            helperText: "Helper Text",
+            defaultValue: "Value",
+            margin: "medium",
+            placeholder: "Placeholder",
+            verticalGrow: "manual",
+            name: "Name",
+            autocomplete: "on",
+            minLength: 0,
+            maxLength: 100,
+            optional: true
+          })), container = _render.container;
+          _context.next = 3;
+          return (0, _jestAxe.axe)(container);
+        case 3:
+          results = _context.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })));
+  it("Should not have basic accessibility issues for pattern mode", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+    var _render2, container, results;
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Textarea["default"], {
+            label: "Example label",
+            helperText: "Helper Text",
+            defaultValue: "Value",
+            margin: "medium",
+            placeholder: "Placeholder",
+            verticalGrow: "manual",
+            name: "Name",
+            autocomplete: "on",
+            minLength: 0,
+            maxLength: 100,
+            pattern: "^.*(?=.*[a-zA-Z])(?=.*)(?=.*[!&$%&? \"]).*$"
+          })), container = _render2.container;
+          _context2.next = 3;
+          return (0, _jestAxe.axe)(container);
+        case 3:
+          results = _context2.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  })));
+  it("Should not have basic accessibility issues for error mode", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+    var _render3, container, results;
+    return _regenerator["default"].wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Textarea["default"], {
+            label: "Example label",
+            helperText: "Helper Text",
+            defaultValue: "Value",
+            margin: "medium",
+            placeholder: "Placeholder",
+            verticalGrow: "manual",
+            name: "Name",
+            error: "Error message.",
+            minLength: 0,
+            maxLength: 100
+          })), container = _render3.container;
+          _context3.next = 3;
+          return (0, _jestAxe.axe)(container);
+        case 3:
+          results = _context3.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  })));
+  it("Should not have basic accessibility issues for disabled mode", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
+    var _render4, container, results;
+    return _regenerator["default"].wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
+        case 0:
+          _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Textarea["default"], {
+            label: "Example label",
+            helperText: "Helper Text",
+            defaultValue: "Value",
+            margin: "medium",
+            placeholder: "Placeholder",
+            verticalGrow: "manual",
+            name: "Name",
+            autocomplete: "on",
+            minLength: 0,
+            maxLength: 100,
+            disabled: true
+          })), container = _render4.container;
+          _context4.next = 3;
+          return (0, _jestAxe.axe)(container);
+        case 3:
+          results = _context4.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context4.stop();
+      }
+    }, _callee4);
+  })));
+  it("Should not have basic accessibility issues for read-only mode", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
+    var _render5, container, results;
+    return _regenerator["default"].wrap(function _callee5$(_context5) {
+      while (1) switch (_context5.prev = _context5.next) {
+        case 0:
+          _render5 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Textarea["default"], {
+            label: "Example label",
+            helperText: "Helper Text",
+            defaultValue: "Value",
+            margin: "medium",
+            placeholder: "Placeholder",
+            verticalGrow: "manual",
+            name: "Name",
+            autocomplete: "on",
+            minLength: 0,
+            maxLength: 100,
+            readOnly: true
+          })), container = _render5.container;
+          _context5.next = 3;
+          return (0, _jestAxe.axe)(container);
+        case 3:
+          results = _context5.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context5.stop();
+      }
+    }, _callee5);
+  })));
+});

package/textarea/Textarea.js

@@ -1,103 +1,77 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _typeof3 = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
 var _react = _interopRequireWildcard(require("react"));
-
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
-
 var _utils = require("../common/utils");
-
 var _useTheme = _interopRequireDefault(require("../useTheme"));
-
 var _useTranslatedLabels = _interopRequireDefault(require("../useTranslatedLabels"));
-
 var _variables = require("../common/variables");
-
 var _uuid = require("uuid");
-
-var _BackgroundColorContext = _interopRequireDefault(require("../BackgroundColorContext"));
-
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
-
-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 || _typeof3(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 _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof3(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 var patternMatch = function patternMatch(pattern, value) {
   return new RegExp(pattern).test(value);
 };
-
 var DxcTextarea = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
   var label = _ref.label,
-      _ref$name = _ref.name,
-      name = _ref$name === void 0 ? "" : _ref$name,
-      _ref$defaultValue = _ref.defaultValue,
-      defaultValue = _ref$defaultValue === void 0 ? "" : _ref$defaultValue,
-      value = _ref.value,
-      helperText = _ref.helperText,
-      _ref$placeholder = _ref.placeholder,
-      placeholder = _ref$placeholder === void 0 ? "" : _ref$placeholder,
-      _ref$disabled = _ref.disabled,
-      disabled = _ref$disabled === void 0 ? false : _ref$disabled,
-      _ref$readOnly = _ref.readOnly,
-      readOnly = _ref$readOnly === void 0 ? false : _ref$readOnly,
-      _ref$optional = _ref.optional,
-      optional = _ref$optional === void 0 ? false : _ref$optional,
-      _ref$verticalGrow = _ref.verticalGrow,
-      verticalGrow = _ref$verticalGrow === void 0 ? "auto" : _ref$verticalGrow,
-      _ref$rows = _ref.rows,
-      rows = _ref$rows === void 0 ? 4 : _ref$rows,
-      onChange = _ref.onChange,
-      onBlur = _ref.onBlur,
-      error = _ref.error,
-      pattern = _ref.pattern,
-      minLength = _ref.minLength,
-      maxLength = _ref.maxLength,
-      _ref$autocomplete = _ref.autocomplete,
-      autocomplete = _ref$autocomplete === void 0 ? "off" : _ref$autocomplete,
-      margin = _ref.margin,
-      _ref$size = _ref.size,
-      size = _ref$size === void 0 ? "medium" : _ref$size,
-      _ref$tabIndex = _ref.tabIndex,
-      tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex;
-
+    _ref$name = _ref.name,
+    name = _ref$name === void 0 ? "" : _ref$name,
+    _ref$defaultValue = _ref.defaultValue,
+    defaultValue = _ref$defaultValue === void 0 ? "" : _ref$defaultValue,
+    value = _ref.value,
+    helperText = _ref.helperText,
+    _ref$placeholder = _ref.placeholder,
+    placeholder = _ref$placeholder === void 0 ? "" : _ref$placeholder,
+    _ref$disabled = _ref.disabled,
+    disabled = _ref$disabled === void 0 ? false : _ref$disabled,
+    _ref$readOnly = _ref.readOnly,
+    readOnly = _ref$readOnly === void 0 ? false : _ref$readOnly,
+    _ref$optional = _ref.optional,
+    optional = _ref$optional === void 0 ? false : _ref$optional,
+    _ref$verticalGrow = _ref.verticalGrow,
+    verticalGrow = _ref$verticalGrow === void 0 ? "auto" : _ref$verticalGrow,
+    _ref$rows = _ref.rows,
+    rows = _ref$rows === void 0 ? 4 : _ref$rows,
+    onChange = _ref.onChange,
+    onBlur = _ref.onBlur,
+    error = _ref.error,
+    pattern = _ref.pattern,
+    minLength = _ref.minLength,
+    maxLength = _ref.maxLength,
+    _ref$autocomplete = _ref.autocomplete,
+    autocomplete = _ref$autocomplete === void 0 ? "off" : _ref$autocomplete,
+    margin = _ref.margin,
+    _ref$size = _ref.size,
+    size = _ref$size === void 0 ? "medium" : _ref$size,
+    _ref$tabIndex = _ref.tabIndex,
+    tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex;
   var _useState = (0, _react.useState)(defaultValue),
-      _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-      innerValue = _useState2[0],
-      setInnerValue = _useState2[1];
-
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    innerValue = _useState2[0],
+    setInnerValue = _useState2[1];
   var _useState3 = (0, _react.useState)("textarea-".concat((0, _uuid.v4)())),
-      _useState4 = (0, _slicedToArray2["default"])(_useState3, 1),
-      textareaId = _useState4[0];
-
+    _useState4 = (0, _slicedToArray2["default"])(_useState3, 1),
+    textareaId = _useState4[0];
   var colorsTheme = (0, _useTheme["default"])();
-  var backgroundType = (0, _react.useContext)(_BackgroundColorContext["default"]);
   var translatedLabels = (0, _useTranslatedLabels["default"])();
   var textareaRef = (0, _react.useRef)(null);
   var errorId = "error-".concat(textareaId);
-
   var isNotOptional = function isNotOptional(value) {
     return value === "" && !optional;
   };
-
   var isLengthIncorrect = function isLengthIncorrect(value) {
     return value !== "" && minLength && maxLength && (value.length < minLength || value.length > maxLength);
   };
-
   var changeValue = function changeValue(newValue) {
     value !== null && value !== void 0 ? value : setInnerValue(newValue);
     if (isNotOptional(newValue)) onChange === null || onChange === void 0 ? void 0 : onChange({
@@ -113,7 +87,6 @@ var DxcTextarea = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref)
       value: newValue
     });
   };
-
   var autoVerticalGrow = function autoVerticalGrow() {
     var textareaLineHeight = parseInt(window.getComputedStyle(textareaRef.current)["line-height"]);
     var textareaPaddingTopBottom = parseInt(window.getComputedStyle(textareaRef.current)["padding-top"]) * 2;
@@ -121,7 +94,6 @@ var DxcTextarea = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref)
     var newHeight = textareaRef.current.scrollHeight - textareaPaddingTopBottom;
     textareaRef.current.style.height = "".concat(newHeight, "px");
   };
-
   var handleOnBlur = function handleOnBlur(event) {
     if (isNotOptional(event.target.value)) onBlur === null || onBlur === void 0 ? void 0 : onBlur({
       value: event.target.value,
@@ -136,12 +108,10 @@ var DxcTextarea = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref)
       value: event.target.value
     });
   };
-
   var handleOnChange = function handleOnChange(event) {
     changeValue(event.target.value);
     verticalGrow === "auto" && autoVerticalGrow();
   };
-
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.textarea
   }, /*#__PURE__*/_react["default"].createElement(TextareaContainer, {
@@ -151,11 +121,9 @@ var DxcTextarea = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref)
   }, label && /*#__PURE__*/_react["default"].createElement(Label, {
     htmlFor: textareaId,
     disabled: disabled,
-    backgroundType: backgroundType,
     helperText: helperText
   }, label, " ", optional && /*#__PURE__*/_react["default"].createElement(OptionalLabel, null, translatedLabels.formFields.optionalLabel)), helperText && /*#__PURE__*/_react["default"].createElement(HelperText, {
-    disabled: disabled,
-    backgroundType: backgroundType
+    disabled: disabled
   }, helperText), /*#__PURE__*/_react["default"].createElement(Textarea, {
     id: textareaId,
     name: name,
@@ -171,7 +139,6 @@ var DxcTextarea = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref)
     minLength: minLength,
     maxLength: maxLength,
     autoComplete: autocomplete,
-    backgroundType: backgroundType,
     ref: textareaRef,
     tabIndex: tabIndex,
     "aria-invalid": error ? true : false,
@@ -179,22 +146,18 @@ var DxcTextarea = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref)
     "aria-required": !disabled && !optional
   }), !disabled && typeof error === "string" && /*#__PURE__*/_react["default"].createElement(Error, {
     id: errorId,
-    backgroundType: backgroundType,
     "aria-live": error ? "assertive" : "off"
   }, error)));
 });
-
 var sizes = {
   small: "240px",
   medium: "360px",
   large: "480px",
   fillParent: "100%"
 };
-
 var calculateWidth = function calculateWidth(margin, size) {
   return size === "fillParent" ? "calc(".concat(sizes[size], " - ").concat((0, _utils.getMargin)(margin, "left"), " - ").concat((0, _utils.getMargin)(margin, "right"), ")") : sizes[size];
 };
-
 var TextareaContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: column;\n  width: ", ";\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n"])), function (props) {
   return calculateWidth(props.margin, props.size);
 }, function (props) {
@@ -208,9 +171,8 @@ var TextareaContainer = _styledComponents["default"].div(_templateObject || (_te
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.left ? _variables.spaces[props.margin.left] : "";
 });
-
 var Label = _styledComponents["default"].label(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: ", ";\n  ", "\n"])), function (props) {
-  return props.disabled ? props.backgroundType === "dark" ? props.theme.disabledLabelFontColorOnDark : props.theme.disabledLabelFontColor : props.backgroundType === "dark" ? props.theme.labelFontColorOnDark : props.theme.labelFontColor;
+  return props.disabled ? props.theme.disabledLabelFontColor : props.theme.labelFontColor;
 }, function (props) {
   return props.theme.fontFamily;
 }, function (props) {
@@ -224,13 +186,11 @@ var Label = _styledComponents["default"].label(_templateObject2 || (_templateObj
 }, function (props) {
   return !props.helperText && "margin-bottom: 0.25rem";
 });
-
 var OptionalLabel = _styledComponents["default"].span(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  font-weight: ", ";\n"])), function (props) {
   return props.theme.optionalLabelFontWeight;
 });
-
 var HelperText = _styledComponents["default"].span(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: ", ";\n  margin-bottom: 0.25rem;\n"])), function (props) {
-  return props.disabled ? props.backgroundType === "dark" ? props.theme.disabledHelperTextFontColorOnDark : props.theme.disabledHelperTextFontColor : props.backgroundType === "dark" ? props.theme.helperTextFontColorOnDark : props.theme.helperTextFontColor;
+  return props.disabled ? props.theme.disabledHelperTextFontColor : props.theme.helperTextFontColor;
 }, function (props) {
   return props.theme.fontFamily;
 }, function (props) {
@@ -242,20 +202,19 @@ var HelperText = _styledComponents["default"].span(_templateObject4 || (_templat
 }, function (props) {
   return props.theme.helperTextLineHeight;
 });
-
 var Textarea = _styledComponents["default"].textarea(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  ", ";\n\n  ", "\n\n  padding: 0.5rem 1rem;\n  box-shadow: 0 0 0 2px transparent;\n  border-radius: 0.25rem;\n  border: 1px solid\n    ", ";\n\n  ", "\n\n  ", ";\n\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: 1.5em;\n\n  ::placeholder {\n    color: ", ";\n  }\n"])), function (_ref2) {
   var verticalGrow = _ref2.verticalGrow;
   if (verticalGrow === "none") return "resize: none;";else if (verticalGrow === "auto") return "resize: none; overflow: hidden;";else if (verticalGrow === "manual") return "resize: vertical;";else return "resize: none;";
 }, function (props) {
-  if (props.disabled) return props.backgroundType === "dark" ? "background-color: ".concat(props.theme.disabledContainerFillColorOnDark, ";") : "background-color: ".concat(props.theme.disabledContainerFillColor, ";");else return "background-color: transparent;";
+  return props.disabled ? "background-color: ".concat(props.theme.disabledContainerFillColor, ";") : "background-color: transparent;";
 }, function (props) {
-  if (props.disabled) return props.backgroundType === "dark" ? props.theme.disabledBorderColorOnDark : props.theme.disabledBorderColor;else if (props.error) return "transparent";else if (props.readOnly) return props.theme.readOnlyBorderColor;else return props.backgroundType === "dark" ? props.theme.enabledBorderColorOnDark : props.theme.enabledBorderColor;
+  if (props.disabled) return props.theme.disabledBorderColor;else if (props.error) return "transparent";else if (props.readOnly) return props.theme.readOnlyBorderColor;else props.theme.enabledBorderColor;
 }, function (props) {
-  return props.error && !props.disabled && "box-shadow: 0 0 0 2px ".concat(props.backgroundType === "dark" ? props.theme.errorBorderColorOnDark : props.theme.errorBorderColor, ";\n  ");
+  return props.error && !props.disabled && "box-shadow: 0 0 0 2px ".concat(props.theme.errorBorderColor, ";\n  ");
 }, function (props) {
-  return !props.disabled ? "&:hover {\n        border-color: ".concat(props.error ? "transparent" : props.readOnly ? props.theme.hoverReadOnlyBorderColor : props.backgroundType === "dark" ? props.theme.hoverBorderColorOnDark : props.theme.hoverBorderColor, ";\n        ").concat(props.error && "box-shadow: 0 0 0 2px ".concat(props.backgroundType === "dark" ? props.theme.hoverErrorBorderColorOnDark : props.theme.hoverErrorBorderColor, ";"), "\n      }\n      &:focus, &:focus-within {\n        outline: none;\n        border-color: transparent;\n        box-shadow: 0 0 0 2px ").concat(props.backgroundType === "dark" ? props.theme.focusBorderColorOnDark : props.theme.focusBorderColor, ";\n      }") : "cursor: not-allowed;";
+  return !props.disabled ? "&:hover {\n        border-color: ".concat(props.error ? "transparent" : props.readOnly ? props.theme.hoverReadOnlyBorderColor : props.theme.hoverBorderColor, ";\n        ").concat(props.error && "box-shadow: 0 0 0 2px ".concat(props.theme.hoverErrorBorderColor, ";"), "\n      }\n      &:focus, &:focus-within {\n        outline: none;\n        border-color: transparent;\n        box-shadow: 0 0 0 2px ").concat(props.theme.focusBorderColor, ";\n      }") : "cursor: not-allowed;";
 }, function (props) {
-  return props.disabled ? props.backgroundType === "dark" ? props.theme.disabledValueFontColorOnDark : props.theme.disabledValueFontColor : props.backgroundType === "dark" ? props.theme.valueFontColorOnDark : props.theme.valueFontColor;
+  return props.disabled ? props.theme.disabledValueFontColor : props.theme.valueFontColor;
 }, function (props) {
   return props.theme.fontFamily;
 }, function (props) {
@@ -265,14 +224,11 @@ var Textarea = _styledComponents["default"].textarea(_templateObject5 || (_templ
 }, function (props) {
   return props.theme.valueFontWeight;
 }, function (props) {
-  return props.disabled ? props.backgroundType === "dark" ? props.theme.disabledPlaceholderFontColorOnDark : props.theme.disabledPlaceholderFontColor : props.backgroundType === "dark" ? props.theme.placeholderFontColorOnDark : props.theme.placeholderFontColor;
+  return props.disabled ? props.theme.disabledPlaceholderFontColor : props.theme.placeholderFontColor;
 });
-
 var Error = _styledComponents["default"].span(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  font-family: ", ";\n  font-size: 0.75rem;\n  font-weight: 400;\n  min-height: 1.5em;\n  line-height: 1.5em;\n  margin-top: 0.25rem;\n"])), function (props) {
-  return props.backgroundType === "dark" ? props.theme.errorMessageColorOnDark : props.theme.errorMessageColor;
+  return props.theme.errorMessageColor;
 }, function (props) {
   return props.theme.fontFamily;
 });
-
-var _default = DxcTextarea;
-exports["default"] = _default;
+var _default = exports["default"] = DxcTextarea;