@dxc-technology/halstack-react 0.0.0-4e1277a → 0.0.0-4e3dbad

package/text-input/TextInput.accessibility.test.js

@@ -0,0 +1,320 @@
+"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 _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _react = _interopRequireDefault(require("react"));
+var _react2 = require("@testing-library/react");
+var _axeHelper = require("../../test/accessibility/axe-helper.js");
+var _TextInput = _interopRequireDefault(require("./TextInput"));
+var countries = ["Afghanistan", "Albania", "Algeria", "Andorra", "Angola", "Antigua and Barbuda", "Bahamas", "Bahrain", "Bangladesh", "Barbados", "Cabo Verde", "Cambodia", "Cameroon", "Canada", "Cayman Islands, The", "Central African Republic", "Chad", "Democratic Republic of the Congo", "Dominican Republic", "Dominica", "Denmark", "Djibouti"];
+var action = {
+  onClick: function onClick() {},
+  icon: /*#__PURE__*/_react["default"].createElement("svg", {
+    xmlns: "http://www.w3.org/2000/svg",
+    height: "24px",
+    viewBox: "0 0 24 24",
+    width: "24px",
+    fill: "currentColor"
+  }, /*#__PURE__*/_react["default"].createElement("path", {
+    d: "M0 0h24v24H0V0z",
+    fill: "none"
+  }), /*#__PURE__*/_react["default"].createElement("path", {
+    d: "M16 1H4c-1.1 0-2 .9-2 2v14h2V3h12V1zm3 4H8c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h11c1.1 0 2-.9 2-2V7c0-1.1-.9-2-2-2zm0 16H8V7h11v14z"
+  })),
+  title: "Action Title"
+};
+
+// Mocking DOMRect for Radix Primitive Popover
+global.globalThis = global;
+global.DOMRect = {
+  fromRect: function fromRect() {
+    return {
+      top: 0,
+      left: 0,
+      bottom: 0,
+      right: 0,
+      width: 0,
+      height: 0
+    };
+  }
+};
+global.ResizeObserver = /*#__PURE__*/function () {
+  function ResizeObserver() {
+    (0, _classCallCheck2["default"])(this, ResizeObserver);
+  }
+  return (0, _createClass2["default"])(ResizeObserver, [{
+    key: "observe",
+    value: function observe() {}
+  }, {
+    key: "unobserve",
+    value: function unobserve() {}
+  }, {
+    key: "disconnect",
+    value: function disconnect() {}
+  }]);
+}();
+describe("TextInput component accessibility tests", function () {
+  it("Should not have basic accessibility issues", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+    var _render, baseElement, results;
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          // baseElement is needed when using React Portals
+          _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_TextInput["default"], {
+            label: "Label",
+            placeholder: "Placeholder",
+            helperText: "Helper Text",
+            margin: "medium",
+            name: "Name",
+            size: "medium",
+            suffix: "Suffix",
+            prefix: "Prefix",
+            defaultValue: "Value",
+            action: action,
+            minLength: 0,
+            maxLength: 100,
+            clearable: true
+          })), baseElement = _render.baseElement;
+          _context.next = 3;
+          return (0, _axeHelper.axe)(baseElement);
+        case 3:
+          results = _context.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })));
+  it("Should not have basic accessibility issues for autocomplete mode", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+    var _render2, baseElement, results;
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          // baseElement is needed when using React Portals
+          _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_TextInput["default"], {
+            label: "Label",
+            placeholder: "Placeholder",
+            helperText: "Helper Text",
+            margin: "medium",
+            name: "Name",
+            size: "medium",
+            suffix: "Suffix",
+            prefix: "Prefix",
+            defaultValue: "Value",
+            action: action,
+            minLength: 0,
+            maxLength: 100,
+            clearable: true,
+            autocomplete: "on"
+          })), baseElement = _render2.baseElement;
+          _context2.next = 3;
+          return (0, _axeHelper.axe)(baseElement);
+        case 3:
+          results = _context2.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  })));
+  it("Should not have basic accessibility issues for suggestions mode", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+    var _render3, baseElement, results;
+    return _regenerator["default"].wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          // baseElement is needed when using React Portals
+          _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_TextInput["default"], {
+            label: "Label",
+            placeholder: "Placeholder",
+            helperText: "Helper Text",
+            margin: "medium",
+            name: "Name",
+            size: "medium",
+            suffix: "Suffix",
+            prefix: "Prefix",
+            defaultValue: "Value",
+            action: action,
+            minLength: 0,
+            maxLength: 100,
+            clearable: true,
+            suggestions: countries
+          })), baseElement = _render3.baseElement;
+          _context3.next = 3;
+          return (0, _axeHelper.axe)(baseElement);
+        case 3:
+          results = _context3.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  })));
+  it("Should not have basic accessibility issues for pattern mode", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
+    var _render4, baseElement, results;
+    return _regenerator["default"].wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
+        case 0:
+          // baseElement is needed when using React Portals
+          _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_TextInput["default"], {
+            label: "Label",
+            placeholder: "Placeholder",
+            helperText: "Helper Text",
+            margin: "medium",
+            name: "Name",
+            size: "medium",
+            suffix: "Suffix",
+            prefix: "Prefix",
+            defaultValue: "Value",
+            action: action,
+            minLength: 0,
+            maxLength: 100,
+            clearable: true,
+            pattern: "^.*(?=.*[a-zA-Z])(?=.*\\d)(?=.*[!&$%&? \"]).*$"
+          })), baseElement = _render4.baseElement;
+          _context4.next = 3;
+          return (0, _axeHelper.axe)(baseElement);
+        case 3:
+          results = _context4.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context4.stop();
+      }
+    }, _callee4);
+  })));
+  it("Should not have basic accessibility issues for optional mode", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
+    var _render5, baseElement, results;
+    return _regenerator["default"].wrap(function _callee5$(_context5) {
+      while (1) switch (_context5.prev = _context5.next) {
+        case 0:
+          // baseElement is needed when using React Portals
+          _render5 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_TextInput["default"], {
+            label: "Label",
+            placeholder: "Placeholder",
+            helperText: "Helper Text",
+            margin: "medium",
+            name: "Name",
+            size: "medium",
+            suffix: "Suffix",
+            prefix: "Prefix",
+            defaultValue: "Value",
+            action: action,
+            minLength: 0,
+            maxLength: 100,
+            clearable: true,
+            optional: true
+          })), baseElement = _render5.baseElement;
+          _context5.next = 3;
+          return (0, _axeHelper.axe)(baseElement);
+        case 3:
+          results = _context5.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context5.stop();
+      }
+    }, _callee5);
+  })));
+  it("Should not have basic accessibility issues for error mode", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6() {
+    var _render6, baseElement, results;
+    return _regenerator["default"].wrap(function _callee6$(_context6) {
+      while (1) switch (_context6.prev = _context6.next) {
+        case 0:
+          // baseElement is needed when using React Portals
+          _render6 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_TextInput["default"], {
+            label: "Label",
+            placeholder: "Placeholder",
+            helperText: "Helper Text",
+            margin: "medium",
+            name: "Name",
+            size: "medium",
+            suffix: "Suffix",
+            prefix: "Prefix",
+            defaultValue: "Value",
+            error: "Error message.",
+            action: action,
+            minLength: 0,
+            maxLength: 100,
+            clearable: true
+          })), baseElement = _render6.baseElement;
+          _context6.next = 3;
+          return (0, _axeHelper.axe)(baseElement);
+        case 3:
+          results = _context6.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context6.stop();
+      }
+    }, _callee6);
+  })));
+  it("Should not have basic accessibility issues for read-only mode", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7() {
+    var _render7, baseElement, results;
+    return _regenerator["default"].wrap(function _callee7$(_context7) {
+      while (1) switch (_context7.prev = _context7.next) {
+        case 0:
+          // baseElement is needed when using React Portals
+          _render7 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_TextInput["default"], {
+            label: "Label",
+            placeholder: "Placeholder",
+            helperText: "Helper Text",
+            margin: "medium",
+            name: "Name",
+            size: "medium",
+            suffix: "Suffix",
+            prefix: "Prefix",
+            defaultValue: "Value",
+            action: action,
+            minLength: 0,
+            maxLength: 100,
+            readOnly: true
+          })), baseElement = _render7.baseElement;
+          _context7.next = 3;
+          return (0, _axeHelper.axe)(baseElement);
+        case 3:
+          results = _context7.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context7.stop();
+      }
+    }, _callee7);
+  })));
+  it("Should not have basic accessibility issues for disabled mode", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8() {
+    var _render8, baseElement, results;
+    return _regenerator["default"].wrap(function _callee8$(_context8) {
+      while (1) switch (_context8.prev = _context8.next) {
+        case 0:
+          // baseElement is needed when using React Portals
+          _render8 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_TextInput["default"], {
+            label: "Label",
+            placeholder: "Placeholder",
+            helperText: "Helper Text",
+            margin: "medium",
+            name: "Name",
+            size: "medium",
+            suffix: "Suffix",
+            prefix: "Prefix",
+            action: action,
+            minLength: 0,
+            maxLength: 100,
+            disabled: true
+          })), baseElement = _render8.baseElement;
+          _context8.next = 3;
+          return (0, _axeHelper.axe)(baseElement);
+        case 3:
+          results = _context8.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context8.stop();
+      }
+    }, _callee8);
+  })));
+});

package/text-input/TextInput.js

@@ -17,14 +17,14 @@ var _variables = require("../common/variables");
 var _utils = require("../common/utils");
 var _Suggestions = _interopRequireDefault(require("./Suggestions"));
 var Popover = _interopRequireWildcard(require("@radix-ui/react-popover"));
-var _Icons = _interopRequireDefault(require("./Icons"));
-var _uuid = require("uuid");
 var _ActionIcon = _interopRequireDefault(require("../action-icon/ActionIcon"));
 var _Flex = _interopRequireDefault(require("../flex/Flex"));
 var _NumberInputContext = require("../number-input/NumberInputContext");
+var _Icon = _interopRequireDefault(require("../icon/Icon"));
+var _useWidth = _interopRequireDefault(require("../utils/useWidth"));
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10;
 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; }
+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 && {}.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 sizes = {
   small: "240px",
   medium: "360px",
@@ -75,26 +75,6 @@ var isNumberIncorrect = function isNumberIncorrect(value, minNumber, maxNumber)
 var patternMismatch = function patternMismatch(pattern, value) {
   return pattern != null && !new RegExp(pattern).test(value);
 };
-var useWidth = function useWidth(target) {
-  var _useState = (0, _react.useState)(0),
-    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-    width = _useState2[0],
-    setWidth = _useState2[1];
-  (0, _react.useEffect)(function () {
-    if (target != null) {
-      setWidth(target.getBoundingClientRect().width);
-      var triggerObserver = new ResizeObserver(function (entries) {
-        var rect = entries[0].target.getBoundingClientRect();
-        setWidth(rect === null || rect === void 0 ? void 0 : rect.width);
-      });
-      triggerObserver.observe(target);
-      return function () {
-        triggerObserver.unobserve(target);
-      };
-    }
-  }, [target]);
-  return width;
-};
 var DxcTextInput = /*#__PURE__*/_react["default"].forwardRef(function (_ref2, ref) {
   var label = _ref2.label,
     _ref2$name = _ref2.name,
@@ -132,39 +112,37 @@ var DxcTextInput = /*#__PURE__*/_react["default"].forwardRef(function (_ref2, re
     size = _ref2$size === void 0 ? "medium" : _ref2$size,
     _ref2$tabIndex = _ref2.tabIndex,
     tabIndex = _ref2$tabIndex === void 0 ? 0 : _ref2$tabIndex;
-  var _useState3 = (0, _react.useState)("input-".concat((0, _uuid.v4)())),
-    _useState4 = (0, _slicedToArray2["default"])(_useState3, 1),
-    inputId = _useState4[0];
+  var inputId = "input-".concat((0, _react.useId)());
   var autosuggestId = "suggestions-".concat(inputId);
   var errorId = "error-".concat(inputId);
-  var _useState5 = (0, _react.useState)(defaultValue),
+  var _useState = (0, _react.useState)(defaultValue),
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    innerValue = _useState2[0],
+    setInnerValue = _useState2[1];
+  var _useState3 = (0, _react.useState)(false),
+    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
+    isOpen = _useState4[0],
+    changeIsOpen = _useState4[1];
+  var _useState5 = (0, _react.useState)(false),
     _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
-    innerValue = _useState6[0],
-    setInnerValue = _useState6[1];
+    isSearching = _useState6[0],
+    changeIsSearching = _useState6[1];
   var _useState7 = (0, _react.useState)(false),
     _useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
-    isOpen = _useState8[0],
-    changeIsOpen = _useState8[1];
-  var _useState9 = (0, _react.useState)(false),
+    isAutosuggestError = _useState8[0],
+    changeIsAutosuggestError = _useState8[1];
+  var _useState9 = (0, _react.useState)([]),
     _useState10 = (0, _slicedToArray2["default"])(_useState9, 2),
-    isSearching = _useState10[0],
-    changeIsSearching = _useState10[1];
-  var _useState11 = (0, _react.useState)(false),
+    filteredSuggestions = _useState10[0],
+    changeFilteredSuggestions = _useState10[1];
+  var _useState11 = (0, _react.useState)(-1),
     _useState12 = (0, _slicedToArray2["default"])(_useState11, 2),
-    isAutosuggestError = _useState12[0],
-    changeIsAutosuggestError = _useState12[1];
-  var _useState13 = (0, _react.useState)([]),
-    _useState14 = (0, _slicedToArray2["default"])(_useState13, 2),
-    filteredSuggestions = _useState14[0],
-    changeFilteredSuggestions = _useState14[1];
-  var _useState15 = (0, _react.useState)(-1),
-    _useState16 = (0, _slicedToArray2["default"])(_useState15, 2),
-    visualFocusIndex = _useState16[0],
-    changeVisualFocusIndex = _useState16[1];
+    visualFocusIndex = _useState12[0],
+    changeVisualFocusIndex = _useState12[1];
   var inputRef = (0, _react.useRef)(null);
   var inputContainerRef = (0, _react.useRef)(null);
   var actionRef = (0, _react.useRef)(null);
-  var width = useWidth(inputContainerRef.current);
+  var width = (0, _useWidth["default"])(inputContainerRef.current);
   var colorsTheme = (0, _useTheme["default"])();
   var translatedLabels = (0, _useTranslatedLabels["default"])();
   var numberInputContext = (0, _react.useContext)(_NumberInputContext.NumberInputContext);
@@ -281,6 +259,7 @@ var DxcTextInput = /*#__PURE__*/_react["default"].forwardRef(function (_ref2, re
       case "Esc":
       case "Escape":
         event.preventDefault();
+        isOpen && event.stopPropagation();
         if (hasSuggestions(suggestions)) {
           changeValue("");
           isOpen && closeSuggestions();
@@ -364,7 +343,10 @@ var DxcTextInput = /*#__PURE__*/_react["default"].forwardRef(function (_ref2, re
         open: isOpen && (filteredSuggestions.length > 0 || isSearching || isAutosuggestError)
       }, /*#__PURE__*/_react["default"].createElement(Popover.Trigger, {
         asChild: true,
-        "aria-controls": undefined
+        type: undefined,
+        "aria-controls": undefined,
+        "aria-haspopup": undefined,
+        "aria-expanded": undefined
       }, children), /*#__PURE__*/_react["default"].createElement(Popover.Portal, null, /*#__PURE__*/_react["default"].createElement(Popover.Content, {
         sideOffset: 5,
         style: {
@@ -440,22 +422,24 @@ var DxcTextInput = /*#__PURE__*/_react["default"].forwardRef(function (_ref2, re
     "aria-errormessage": error ? errorId : undefined,
     "aria-required": !disabled && !optional
   }), !disabled && error && /*#__PURE__*/_react["default"].createElement(ErrorIcon, {
-    "aria-label": "Error"
-  }, _Icons["default"].error), !disabled && !readOnly && clearable && (value !== null && value !== void 0 ? value : innerValue).length > 0 && /*#__PURE__*/_react["default"].createElement(_ActionIcon["default"], {
+    "aria-hidden": "true"
+  }, /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
+    icon: "filled_error"
+  })), !disabled && !readOnly && clearable && (value !== null && value !== void 0 ? value : innerValue).length > 0 && /*#__PURE__*/_react["default"].createElement(_ActionIcon["default"], {
     onClick: handleClearActionOnClick,
-    icon: _Icons["default"].clear,
+    icon: "close",
     tabIndex: tabIndex,
     title: translatedLabels.textInput.clearFieldActionTitle
   }), (numberInputContext === null || numberInputContext === void 0 ? void 0 : numberInputContext.typeNumber) === "number" && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_ActionIcon["default"], {
     onClick: !readOnly ? handleDecrementActionOnClick : undefined,
-    icon: _Icons["default"].decrement,
+    icon: "remove",
     tabIndex: tabIndex,
     ref: actionRef,
     title: translatedLabels.numberInput.decrementValueTitle,
     disabled: disabled
   }), /*#__PURE__*/_react["default"].createElement(_ActionIcon["default"], {
     onClick: !readOnly ? handleIncrementActionOnClick : undefined,
-    icon: _Icons["default"].increment,
+    icon: "add",
     tabIndex: tabIndex,
     ref: actionRef,
     title: translatedLabels.numberInput.incrementValueTitle,
@@ -471,11 +455,14 @@ var DxcTextInput = /*#__PURE__*/_react["default"].forwardRef(function (_ref2, re
     disabled: disabled
   }, suffix))), !disabled && typeof error === "string" && /*#__PURE__*/_react["default"].createElement(Error, {
     id: errorId,
+    role: "alert",
     "aria-live": error ? "assertive" : "off"
   }, error)));
 });
-var TextInputContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\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) {
+var TextInputContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\n  display: flex;\n  flex-direction: column;\n  width: ", ";\n  ", ";\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  font-family: ", ";\n"])), function (props) {
   return calculateWidth(props.margin, props.size);
+}, function (props) {
+  return props.size !== "fillParent" && "min-width:" + calculateWidth(props.margin, props.size);
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) !== "object" ? _variables.spaces[props.margin] : "0px";
 }, function (props) {
@@ -486,11 +473,11 @@ var TextInputContainer = _styledComponents["default"].div(_templateObject || (_t
   return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.bottom ? _variables.spaces[props.margin.bottom] : "";
 }, 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.theme.disabledLabelFontColor : props.theme.labelFontColor;
 }, function (props) {
   return props.theme.fontFamily;
+});
+var Label = _styledComponents["default"].label(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: ", ";\n  ", "\n"])), function (props) {
+  return props.disabled ? props.theme.disabledLabelFontColor : props.theme.labelFontColor;
 }, function (props) {
   return props.theme.labelFontSize;
 }, function (props) {
@@ -505,10 +492,8 @@ var Label = _styledComponents["default"].label(_templateObject2 || (_templateObj
 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  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: ", ";\n  margin-bottom: 0.25rem;\n"])), function (props) {
+var HelperText = _styledComponents["default"].span(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: ", ";\n  margin-bottom: 0.25rem;\n"])), function (props) {
   return props.disabled ? props.theme.disabledHelperTextFontColor : props.theme.helperTextFontColor;
-}, function (props) {
-  return props.theme.fontFamily;
 }, function (props) {
   return props.theme.helperTextFontSize;
 }, function (props) {
@@ -518,7 +503,7 @@ var HelperText = _styledComponents["default"].span(_templateObject4 || (_templat
 }, function (props) {
   return props.theme.helperTextLineHeight;
 });
-var InputContainer = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  position: relative;\n  display: flex;\n  align-items: center;\n  height: calc(2.5rem - 2px);\n  padding: 0 0.5rem;\n\n  ", "\n  box-shadow: 0 0 0 2px transparent;\n  border-radius: 4px;\n  border: 1px solid\n    ", ";\n  ", "\n\n  ", ";\n"])), function (props) {
+var InputContainer = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  position: relative;\n  display: flex;\n  align-items: center;\n  height: calc(2.5rem - 2px);\n  padding: 0 0.5rem;\n  ", "\n  box-shadow: 0 0 0 2px transparent;\n  border-radius: 4px;\n  border: 1px solid\n    ", ";\n  ", "\n  ", ";\n"])), function (props) {
   if (props.disabled) return "background-color: ".concat(props.theme.disabledContainerFillColor, ";");
 }, function (props) {
   if (props.disabled) return props.theme.disabledBorderColor;else if (props.readOnly) return props.theme.readOnlyBorderColor;else return props.theme.enabledBorderColor;
@@ -527,7 +512,7 @@ var InputContainer = _styledComponents["default"].div(_templateObject5 || (_temp
 }, function (props) {
   return !props.disabled ? "\n      &: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-within {\n        border-color: transparent;\n        box-shadow: 0 0 0 2px ").concat(props.theme.focusBorderColor, ";\n      }\n    ") : "cursor: not-allowed;";
 });
-var Input = _styledComponents["default"].input(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  height: calc(2.5rem - 2px);\n  width: 100%;\n  background: none;\n  border: none;\n  outline: none;\n  padding: 0 0.5rem;\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n\n  color: ", ";\n\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: 1.5em;\n  ", "\n\n  ::placeholder {\n    color: ", ";\n  }\n"])), function (props) {
+var Input = _styledComponents["default"].input(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  height: calc(2.5rem - 2px);\n  width: 100%;\n  background: none;\n  border: none;\n  outline: none;\n  padding: 0 0.5rem;\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: 1.5em;\n  ", "\n\n  ::placeholder {\n    color: ", ";\n  }\n"])), function (props) {
   return props.disabled ? props.theme.disabledValueFontColor : props.theme.valueFontColor;
 }, function (props) {
   return props.theme.fontFamily;
@@ -542,24 +527,22 @@ var Input = _styledComponents["default"].input(_templateObject6 || (_templateObj
 }, function (props) {
   return props.disabled ? props.theme.disabledPlaceholderFontColor : props.theme.placeholderFontColor;
 });
-var Prefix = _styledComponents["default"].span(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  height: 1.5rem;\n  line-height: 1.5rem;\n  margin-left: 0.25rem;\n  padding: 0 0.5rem 0 0;\n  ", ";\n  font-family: ", ";\n  font-size: 1rem;\n  pointer-events: none;\n"])), function (props) {
-  var color = props.disabled ? props.theme.disabledPrefixColor : props.theme.prefixColor;
-  return "color: ".concat(color, "; border-right: 1px solid ").concat(color, ";");
+var Prefix = _styledComponents["default"].span(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  height: 1.5rem;\n  margin-left: 0.25rem;\n  padding-right: ", ";\n  ", ";\n  font-size: 1rem;\n  line-height: 1.5rem;\n  pointer-events: none;\n"])), function (props) {
+  return props.theme.prefixDividerPaddingRight;
 }, function (props) {
-  return props.theme.fontFamily;
+  var color = props.disabled ? props.theme.disabledPrefixColor : props.theme.prefixColor;
+  return "color: ".concat(color, "; border-right: ").concat(props.theme.prefixDividerBorderWidth, " ").concat(props.theme.prefixDividerBorderStyle, " ").concat(color, ";");
 });
-var Suffix = _styledComponents["default"].span(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2["default"])(["\n  height: 1.5rem;\n  line-height: 1.5rem;\n  margin: 0 0.25rem;\n  padding: 0 0 0 0.5rem;\n  ", ";\n  font-family: ", ";\n  font-size: 1rem;\n  pointer-events: none;\n"])), function (props) {
-  var color = props.disabled ? props.theme.disabledSuffixColor : props.theme.suffixColor;
-  return "color: ".concat(color, "; border-left: 1px solid ").concat(color, ";");
+var Suffix = _styledComponents["default"].span(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2["default"])(["\n  height: 1.5rem;\n  margin: 0 0.25rem;\n  padding-left: ", ";\n  ", ";\n  font-size: 1rem;\n  line-height: 1.5rem;\n  pointer-events: none;\n"])), function (props) {
+  return props.theme.suffixDividerPaddingLeft;
 }, function (props) {
-  return props.theme.fontFamily;
+  var color = props.disabled ? props.theme.disabledSuffixColor : props.theme.suffixColor;
+  return "color: ".concat(color, "; border-left: ").concat(props.theme.suffixDividerBorderWidth, " ").concat(props.theme.suffixDividerBorderStyle, " ").concat(color, ";");
 });
-var ErrorIcon = _styledComponents["default"].span(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-wrap: wrap;\n  align-content: center;\n  padding: 3px;\n  height: 18px;\n  width: 18px;\n  color: ", ";\n\n  svg {\n    line-height: 18px;\n    font-size: 1.25rem;\n  }\n"])), function (props) {
+var ErrorIcon = _styledComponents["default"].span(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-wrap: wrap;\n  align-content: center;\n  padding: 3px;\n  height: 18px;\n  width: 18px;\n  font-size: 18px;\n  color: ", ";\n"])), function (props) {
   return props.theme.errorIconColor;
 });
-var Error = _styledComponents["default"].span(_templateObject10 || (_templateObject10 = (0, _taggedTemplateLiteral2["default"])(["\n  min-height: 1.5em;\n  color: ", ";\n  font-family: ", ";\n  font-size: 0.75rem;\n  font-weight: 400;\n  line-height: 1.5em;\n  margin-top: 0.25rem;\n"])), function (props) {
+var Error = _styledComponents["default"].span(_templateObject10 || (_templateObject10 = (0, _taggedTemplateLiteral2["default"])(["\n  min-height: 1.5em;\n  color: ", ";\n  font-size: 0.75rem;\n  font-weight: 400;\n  line-height: 1.5em;\n  margin-top: 0.25rem;\n"])), function (props) {
   return props.theme.errorMessageColor;
-}, function (props) {
-  return props.theme.fontFamily;
 });
 var _default = exports["default"] = DxcTextInput;