@dxc-technology/halstack-react 0.0.0-b3de035 → 0.0.0-b3e1a2f

package/{dist/select → select}/Select.js

@@ -1,9 +1,9 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
-
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
+var _typeof3 = require("@babel/runtime/helpers/typeof");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -21,7 +21,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
-var _useTheme = _interopRequireDefault(require("../useTheme.js"));
+var _useTheme = _interopRequireDefault(require("../useTheme"));
 
 var _variables = require("../common/variables.js");
 
@@ -31,347 +31,89 @@ var _utils = require("../common/utils.js");
 
 var _Checkbox = _interopRequireDefault(require("../checkbox/Checkbox"));
 
-function _templateObject27() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  height: 16px;\n  width: 16px;\n  margin-left: 4px;\n  color: ", ";\n"]);
-
-  _templateObject27 = function _templateObject27() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject26() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n"]);
-
-  _templateObject26 = function _templateObject26() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject25() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  width: 16px;\n  height: 16px;\n"]);
-
-  _templateObject25 = function _templateObject25() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject24() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-wrap: wrap;\n  align-content: center;\n  height: 24px;\n  width: 24px;\n  margin-left: 8px;\n  color: ", ";\n"]);
-
-  _templateObject24 = function _templateObject24() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject23() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  justify-content: space-between;\n  width: 100%;\n  overflow: hidden;\n  padding-left: 8px;\n  ", "\n"]);
-
-  _templateObject23 = function _templateObject23() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject22() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  padding: 4px 8px 3px 0;\n  min-height: 24px;\n  ", "\n  ", ";\n"]);
-
-  _templateObject22 = function _templateObject22() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject21() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  padding: 0 8px;\n  box-shadow: inset 0 0 0 2px transparent;\n  ", "\n  ", ";\n  line-height: 1.715em;\n  cursor: pointer;\n\n  &:hover {\n    ", ";\n  }\n  &:active {\n    ", ";\n  }\n"]);
-
-  _templateObject21 = function _templateObject21() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject20() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  padding: 4px 16px;\n  font-weight: ", ";\n  line-height: 1.715em;\n"]);
-
-  _templateObject20 = function _templateObject20() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject19() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-wrap: wrap;\n  align-content: center;\n  height: 16px;\n  width: 16px;\n  padding: 4px;\n  margin-right: calc(1rem * 0.25);\n"]);
-
-  _templateObject19 = function _templateObject19() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject18() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  padding: 4px 16px;\n  color: ", ";\n  font-size: 0.875rem;\n  line-height: 1.715em;\n"]);
-
-  _templateObject18 = function _templateObject18() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject17() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  position: absolute;\n  z-index: 1;\n  max-height: 304px;\n  overflow-x: auto;\n  top: calc(100% + 4px);\n  left: 0;\n  margin: 0;\n  padding: 4px 0;\n  width: 100%;\n  box-sizing: border-box;\n  background-color: ", ";\n  border: 1px solid ", ";\n  border-radius: 4px;\n  box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1);\n  cursor: default;\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n"]);
-
-  _templateObject17 = function _templateObject17() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject16() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-wrap: wrap;\n  align-content: center;\n  height: 24px;\n  width: 24px;\n  font-size: 1rem;\n  font-family: ", ";\n  border: 1px solid transparent;\n  border-radius: 2px;\n  padding: 3px;\n  margin-left: calc(1rem * 0.25);\n  ", "\n  background-color: ", ";\n  color: ", ";\n\n  ", "\n\n  svg {\n    line-height: 18px;\n  }\n"]);
-
-  _templateObject16 = function _templateObject16() {
-    return data;
-  };
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17, _templateObject18, _templateObject19, _templateObject20, _templateObject21, _templateObject22, _templateObject23, _templateObject24, _templateObject25, _templateObject26, _templateObject27, _templateObject28;
 
-  return data;
-}
-
-function _templateObject15() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-wrap: wrap;\n  align-content: center;\n  height: 16px;\n  width: 16px;\n  padding: 4px;\n  margin-left: calc(1rem * 0.25);\n  color: ", ";\n"]);
-
-  _templateObject15 = function _templateObject15() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject14() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  min-height: 1.5em;\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: ", ";\n"]);
-
-  _templateObject14 = function _templateObject14() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject13() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-wrap: wrap;\n  align-content: center;\n  padding: 3px;\n  height: 18px;\n  width: 18px;\n  margin-left: calc(1rem * 0.25);\n  pointer-events: none;\n  color: ", ";\n\n  svg {\n    line-height: 18px;\n    font-size: 1.25rem;\n  }\n"]);
-
-  _templateObject13 = function _templateObject13() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject12() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  grid-area: 1 / 1 / 1 / 1;\n  height: calc(calc(1rem * 2.5) - calc(1px * 2));\n  background: none;\n  border: none;\n  outline: none;\n  padding: 0 calc(1rem * 0.5);\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: 1.5em;\n"]);
-
-  _templateObject12 = function _templateObject12() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject11() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: none;\n"]);
-
-  _templateObject11 = function _templateObject11() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject10() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  grid-area: 1 / 1 / 1 / 1;\n  display: inline-flex;\n  align-items: center;\n  height: calc(calc(1rem * 2.5) - calc(1px * 2));\n  padding: 0 calc(1rem * 0.5);\n  user-select: none;\n  overflow: hidden;\n\n  color: ", ";\n\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: 1.5em;\n"]);
-
-  _templateObject10 = function _templateObject10() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject9() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: grid;\n  width: 100%;\n"]);
-
-  _templateObject9 = function _templateObject9() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject8() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-wrap: wrap;\n  align-content: center;\n  height: 24px;\n  width: 24px;\n  font-size: 1rem;\n  font-family: ", ";\n  border: 1px solid transparent;\n  padding: 3px;\n  ", "\n  background-color: ", ";\n  color: ", ";\n\n  ", "\n\n  svg {\n    line-height: 18px;\n  }\n"]);
-
-  _templateObject8 = function _templateObject8() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject7() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  width: 24px;\n  user-select: none;\n  background-color: ", ";\n  border-right: 1px solid ", ";\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  ", "\n"]);
-
-  _templateObject7 = function _templateObject7() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject6() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  border: 1px solid ", ";\n  border-radius: 2px;\n  width: 48px;\n"]);
-
-  _templateObject6 = function _templateObject6() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject5() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  position: relative;\n  align-items: center;\n  height: calc(calc(1rem * 2.5) - calc(1px * 2));\n  margin: calc(1rem * 0.25) 0;\n  padding: 0 calc(1rem * 0.5);\n  outline: none;\n  box-shadow: 0 0 0 2px transparent;\n  border-radius: 4px;\n  border: 1px solid\n    ", ";\n  ", "\n  ", ";\n\n  ", ";\n"]);
-
-  _templateObject5 = function _templateObject5() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject4() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: ", ";\n"]);
-
-  _templateObject4 = function _templateObject4() {
-    return data;
-  };
+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); }
 
-  return data;
-}
-
-function _templateObject3() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font-weight: ", ";\n"]);
-
-  _templateObject3 = function _templateObject3() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject2() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: ", ";\n  cursor: default;\n"]);
-
-  _templateObject2 = function _templateObject2() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: column;\n\n  width: ", ";\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n"]);
-
-  _templateObject = function _templateObject() {
-    return data;
-  };
-
-  return data;
-}
+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; }
 
 var selectIcons = {
-  error: _react["default"].createElement("svg", {
+  error: /*#__PURE__*/_react["default"].createElement("svg", {
+    role: "img",
     xmlns: "http://www.w3.org/2000/svg",
     height: "24px",
     viewBox: "0 0 24 24",
     width: "24px",
     fill: "currentColor"
-  }, _react["default"].createElement("path", {
+  }, /*#__PURE__*/_react["default"].createElement("path", {
     d: "M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-2h2v2zm0-4h-2V7h2v6z"
   })),
-  arrowUp: _react["default"].createElement("svg", {
+  arrowUp: /*#__PURE__*/_react["default"].createElement("svg", {
+    role: "img",
     xmlns: "http://www.w3.org/2000/svg",
     height: "24px",
     viewBox: "0 0 24 24",
     width: "24px",
     fill: "currentColor"
-  }, _react["default"].createElement("path", {
+  }, /*#__PURE__*/_react["default"].createElement("path", {
     d: "M0 0h24v24H0V0z",
     fill: "none"
-  }), _react["default"].createElement("path", {
+  }), /*#__PURE__*/_react["default"].createElement("path", {
     d: "M7.41 15.41L12 10.83l4.59 4.58L18 14l-6-6-6 6 1.41 1.41z"
   })),
-  arrowDown: _react["default"].createElement("svg", {
+  arrowDown: /*#__PURE__*/_react["default"].createElement("svg", {
+    role: "img",
     xmlns: "http://www.w3.org/2000/svg",
     height: "24px",
     viewBox: "0 0 24 24",
     width: "24px",
     fill: "currentColor"
-  }, _react["default"].createElement("path", {
+  }, /*#__PURE__*/_react["default"].createElement("path", {
     d: "M0 0h24v24H0V0z",
     fill: "none"
-  }), _react["default"].createElement("path", {
+  }), /*#__PURE__*/_react["default"].createElement("path", {
     d: "M7.41 8.59L12 13.17l4.59-4.58L18 10l-6 6-6-6 1.41-1.41z"
   })),
-  clear: _react["default"].createElement("svg", {
+  clear: /*#__PURE__*/_react["default"].createElement("svg", {
+    role: "img",
     xmlns: "http://www.w3.org/2000/svg",
     width: "24",
     height: "24",
     viewBox: "0 0 24 24",
     fill: "currentColor"
-  }, _react["default"].createElement("path", {
+  }, /*#__PURE__*/_react["default"].createElement("path", {
     d: "M0 0h24v24H0V0z",
     fill: "none"
-  }), _react["default"].createElement("path", {
+  }), /*#__PURE__*/_react["default"].createElement("path", {
     d: "M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12 19 6.41z"
   })),
-  selected: _react["default"].createElement("svg", {
+  selected: /*#__PURE__*/_react["default"].createElement("svg", {
+    role: "img",
     xmlns: "http://www.w3.org/2000/svg",
     height: "24px",
     viewBox: "0 0 24 24",
     width: "24px",
     fill: "currentColor"
-  }, _react["default"].createElement("path", {
+  }, /*#__PURE__*/_react["default"].createElement("path", {
     d: "M0 0h24v24H0z",
     fill: "none"
-  }), _react["default"].createElement("path", {
+  }), /*#__PURE__*/_react["default"].createElement("path", {
     d: "M9 16.2L4.8 12l-1.4 1.4L9 19 21 7l-1.4-1.4L9 16.2z"
   })),
-  searchOff: _react["default"].createElement("svg", {
+  searchOff: /*#__PURE__*/_react["default"].createElement("svg", {
+    role: "img",
     xmlns: "http://www.w3.org/2000/svg",
     height: "24px",
     viewBox: "0 0 24 24",
     width: "24px",
     fill: "currentColor"
-  }, _react["default"].createElement("g", null, _react["default"].createElement("rect", {
+  }, /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("rect", {
     fill: "none",
     height: "24",
     width: "24"
-  })), _react["default"].createElement("g", null, _react["default"].createElement("g", null, _react["default"].createElement("path", {
+  })), /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("path", {
     d: "M15.5,14h-0.79l-0.28-0.27C15.41,12.59,16,11.11,16,9.5C16,5.91,13.09,3,9.5,3C6.08,3,3.28,5.64,3.03,9h2.02 C5.3,6.75,7.18,5,9.5,5C11.99,5,14,7.01,14,9.5S11.99,14,9.5,14c-0.17,0-0.33-0.03-0.5-0.05v2.02C9.17,15.99,9.33,16,9.5,16 c1.61,0,3.09-0.59,4.23-1.57L14,14.71v0.79l5,4.99L20.49,19L15.5,14z"
-  }), _react["default"].createElement("polygon", {
+  }), /*#__PURE__*/_react["default"].createElement("polygon", {
     points: "6.47,10.82 4,13.29 1.53,10.82 0.82,11.53 3.29,14 0.82,16.47 1.53,17.18 4,14.71 6.47,17.18 7.18,16.47 4.71,14 7.18,11.53"
   }))))
 };
@@ -396,17 +138,75 @@ var filterOptionsBySearchValue = function filterOptionsBySearchValue(options, se
   }
 };
 
-var DxcSelect = _react["default"].forwardRef(function (_ref, ref) {
-  var _ref3;
+var getLastOptionIndex = function getLastOptionIndex(options, filteredOptions, searchable, optional, multiple) {
+  var last = 0;
 
-  var _ref$label = _ref.label,
-      label = _ref$label === void 0 ? "" : _ref$label,
+  var reducer = function reducer(acc, current) {
+    var _current$options;
+
+    return acc + ((_current$options = current.options) === null || _current$options === void 0 ? void 0 : _current$options.length);
+  };
+
+  if (searchable && filteredOptions.length > 0) filteredOptions[0].options ? last = filteredOptions.reduce(reducer, 0) - 1 : last = filteredOptions.length - 1;else if ((options === null || options === void 0 ? void 0 : options.length) > 0) options[0].options ? last = options.reduce(reducer, 0) - 1 : last = options.length - 1;
+  return optional && !multiple ? last + 1 : last;
+};
+
+var getSelectedOption = function getSelectedOption(options, multiple, optional, optionalEmptyOption, value, innerValue) {
+  var val = value !== null && value !== void 0 ? value : innerValue;
+  var selectedOption = multiple ? [] : {};
+  var singleSelectionIndex;
+
+  if (multiple) {
+    if ((options === null || options === void 0 ? void 0 : options.length) > 0) {
+      options.forEach(function (option) {
+        if (option.options) {
+          option.options.forEach(function (singleOption) {
+            if (val.includes(singleOption.value)) selectedOption.push(singleOption);
+          });
+        } else if (val.includes(option.value)) selectedOption.push(option);
+      });
+    }
+  } else {
+    if (optional && val === "") {
+      selectedOption = optionalEmptyOption;
+      singleSelectionIndex = 0;
+    } else if ((options === null || options === void 0 ? void 0 : options.length) > 0) {
+      var group_index = 0;
+      options.some(function (option, index) {
+        if (option.options) {
+          option.options.some(function (singleOption) {
+            if (singleOption.value === val) {
+              selectedOption = singleOption;
+              singleSelectionIndex = optional ? group_index + 1 : group_index;
+              return true;
+            }
+
+            group_index++;
+          });
+        } else if (option.value === val) {
+          selectedOption = option;
+          singleSelectionIndex = optional ? index + 1 : index;
+          return true;
+        }
+      });
+    }
+  }
+
+  return {
+    selectedOption: selectedOption,
+    singleSelectionIndex: singleSelectionIndex
+  };
+};
+
+var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
+  var _selectedOption$label;
+
+  var label = _ref.label,
       _ref$name = _ref.name,
       name = _ref$name === void 0 ? "" : _ref$name,
       value = _ref.value,
       options = _ref.options,
-      _ref$helperText = _ref.helperText,
-      helperText = _ref$helperText === void 0 ? "" : _ref$helperText,
+      helperText = _ref.helperText,
       _ref$placeholder = _ref.placeholder,
       placeholder = _ref$placeholder === void 0 ? "" : _ref$placeholder,
       _ref$disabled = _ref.disabled,
@@ -419,8 +219,7 @@ var DxcSelect = _react["default"].forwardRef(function (_ref, ref) {
       multiple = _ref$multiple === void 0 ? false : _ref$multiple,
       onChange = _ref.onChange,
       onBlur = _ref.onBlur,
-      _ref$error = _ref.error,
-      error = _ref$error === void 0 ? "" : _ref$error,
+      error = _ref.error,
       margin = _ref.margin,
       _ref$size = _ref.size,
       size = _ref$size === void 0 ? "medium" : _ref$size,
@@ -432,6 +231,7 @@ var DxcSelect = _react["default"].forwardRef(function (_ref, ref) {
       selectId = _useState2[0];
 
   var selectLabelId = "label-".concat(selectId);
+  var optionsListId = "".concat(selectId, "-listbox");
 
   var _useState3 = (0, _react.useState)(multiple ? [] : ""),
       _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
@@ -457,13 +257,22 @@ var DxcSelect = _react["default"].forwardRef(function (_ref, ref) {
   var selectSearchInputRef = (0, _react.useRef)(null);
   var selectOptionsListRef = (0, _react.useRef)(null);
   var colorsTheme = (0, _useTheme["default"])();
-  var filteredOptions = (0, _react.useMemo)(function () {
-    return filterOptionsBySearchValue(options, searchValue);
-  }, [options, searchValue]);
   var optionalEmptyOption = {
     label: placeholder,
     value: ""
   };
+  var filteredOptions = (0, _react.useMemo)(function () {
+    return filterOptionsBySearchValue(options, searchValue);
+  }, [options, searchValue]);
+  var lastOptionIndex = (0, _react.useMemo)(function () {
+    return getLastOptionIndex(options, filteredOptions, searchable, optional, multiple);
+  }, [searchable, optional, multiple, filteredOptions, options]);
+
+  var _useMemo = (0, _react.useMemo)(function () {
+    return getSelectedOption(options, multiple, optional, optionalEmptyOption, value, innerValue);
+  }, [options, multiple, optional, value, innerValue]),
+      selectedOption = _useMemo.selectedOption,
+      singleSelectionIndex = _useMemo.singleSelectionIndex;
 
   var notOptionalCheck = function notOptionalCheck(value) {
     return value === "" && !optional;
@@ -536,16 +345,16 @@ var DxcSelect = _react["default"].forwardRef(function (_ref, ref) {
   };
 
   var handleSelectOnClick = function handleSelectOnClick() {
+    searchable && selectSearchInputRef.current.focus();
+
     if (isOpen) {
       closeOptions();
       setSearchValue("");
     } else openOptions();
-
-    searchable && selectSearchInputRef.current.focus();
   };
 
-  var handleSelectOnFocus = function handleSelectOnFocus() {
-    searchable && selectSearchInputRef.current.focus();
+  var handleSelectOnFocus = function handleSelectOnFocus(event) {
+    if (!event.currentTarget.contains(event.relatedTarget)) searchable && selectSearchInputRef.current.focus();
   };
 
   var handleSelectOnBlur = function handleSelectOnBlur(event) {
@@ -568,7 +377,7 @@ var DxcSelect = _react["default"].forwardRef(function (_ref, ref) {
       case 40:
         // Arrow Down
         event.preventDefault();
-        changeVisualFocusIndex(function (visualFocusIndex) {
+        singleSelectionIndex !== undefined && (!isOpen || visualFocusIndex === -1 && singleSelectionIndex > -1 && singleSelectionIndex <= lastOptionIndex) ? changeVisualFocusIndex(singleSelectionIndex) : changeVisualFocusIndex(function (visualFocusIndex) {
           if (visualFocusIndex < lastOptionIndex) return visualFocusIndex + 1;else if (visualFocusIndex === lastOptionIndex) return 0;
         });
         openOptions();
@@ -577,7 +386,7 @@ var DxcSelect = _react["default"].forwardRef(function (_ref, ref) {
       case 38:
         // Arrow Up
         event.preventDefault();
-        changeVisualFocusIndex(function (visualFocusIndex) {
+        singleSelectionIndex !== undefined && (!isOpen || visualFocusIndex === -1 && singleSelectionIndex > -1 && singleSelectionIndex <= lastOptionIndex) ? changeVisualFocusIndex(singleSelectionIndex) : changeVisualFocusIndex(function (visualFocusIndex) {
           return visualFocusIndex === 0 || visualFocusIndex === -1 ? lastOptionIndex : visualFocusIndex - 1;
         });
         openOptions();
@@ -592,7 +401,7 @@ var DxcSelect = _react["default"].forwardRef(function (_ref, ref) {
 
       case 13:
         // Enter
-        if (isOpen) {
+        if (isOpen && visualFocusIndex >= 0) {
           var accLength = optional && !multiple ? 1 : 0;
 
           if (searchable) {
@@ -627,11 +436,6 @@ var DxcSelect = _react["default"].forwardRef(function (_ref, ref) {
     openOptions();
   };
 
-  var handleClearActionOnClick = function handleClearActionOnClick(event) {
-    event.stopPropagation();
-    setSearchValue("");
-  };
-
   var handleClearOptionsActionOnClick = function handleClearOptionsActionOnClick(event) {
     event.stopPropagation();
     value !== null && value !== void 0 ? value : setInnerValue([]);
@@ -639,76 +443,33 @@ var DxcSelect = _react["default"].forwardRef(function (_ref, ref) {
       value: [],
       error: getNotOptionalErrorMessage()
     });
-    selectContainerRef.current.focus();
   };
 
-  var getLastOptionIndex = function getLastOptionIndex() {
-    var last = 0;
-
-    var reducer = function reducer(acc, current) {
-      var _current$options;
-
-      return acc + ((_current$options = current.options) === null || _current$options === void 0 ? void 0 : _current$options.length);
-    };
-
-    if (searchable && filteredOptions.length > 0) filteredOptions[0].options ? last = filteredOptions.reduce(reducer, 0) - 1 : last = filteredOptions.length - 1;else if ((options === null || options === void 0 ? void 0 : options.length) > 0) options[0].options ? last = options.reduce(reducer, 0) - 1 : last = options.length - 1;
-    return optional && !multiple ? last + 1 : last;
+  var handleClearSearchActionOnClick = function handleClearSearchActionOnClick(event) {
+    event.stopPropagation();
+    setSearchValue("");
   };
 
-  var lastOptionIndex = (0, _react.useMemo)(function () {
-    return getLastOptionIndex();
-  }, [searchable, optional, multiple, searchable ? filteredOptions : options]);
-
-  var getSelectedOption = function getSelectedOption() {
-    var val = value !== null && value !== void 0 ? value : innerValue;
-    var selectedOption = multiple ? [] : "";
+  (0, _react.useLayoutEffect)(function () {
+    if (isOpen && singleSelectionIndex) {
+      var _listEl$scrollTo;
 
-    if (multiple) {
-      if ((options === null || options === void 0 ? void 0 : options.length) > 0) {
-        options.forEach(function (option) {
-          if (option.options) {
-            option.options.forEach(function (singleOption) {
-              if (val.includes(singleOption.value)) selectedOption.push(singleOption);
-            });
-          } else if (val.includes(option.value)) selectedOption.push(option);
-        });
-      }
-    } else {
-      if ((options === null || options === void 0 ? void 0 : options.length) > 0) {
-        options.forEach(function (option) {
-          if (option.options) {
-            option.options.forEach(function (singleOption) {
-              if (singleOption.value === val) selectedOption = singleOption;
-            });
-          } else if (option.value === val) selectedOption = option;
-        });
-      }
+      var listEl = selectOptionsListRef === null || selectOptionsListRef === void 0 ? void 0 : selectOptionsListRef.current;
+      var selectedListOptionEl = listEl === null || listEl === void 0 ? void 0 : listEl.querySelector("[aria-selected='true']");
+      listEl === null || listEl === void 0 ? void 0 : (_listEl$scrollTo = listEl.scrollTo) === null || _listEl$scrollTo === void 0 ? void 0 : _listEl$scrollTo.call(listEl, {
+        top: (selectedListOptionEl === null || selectedListOptionEl === void 0 ? void 0 : selectedListOptionEl.offsetTop) - (listEl === null || listEl === void 0 ? void 0 : listEl.clientHeight) / 2
+      });
     }
-
-    return selectedOption;
-  };
-
-  var selectedOption = (0, _react.useMemo)(function () {
-    return getSelectedOption();
-  }, [options, multiple, value !== null && value !== void 0 ? value : innerValue]);
+  }, [isOpen]);
   (0, _react.useLayoutEffect)(function () {
-    var _selectOptionsListRef;
+    var _selectOptionsListRef, _visualFocusedOptionE;
 
     var visualFocusedOptionEl = selectOptionsListRef === null || selectOptionsListRef === void 0 ? void 0 : (_selectOptionsListRef = selectOptionsListRef.current) === null || _selectOptionsListRef === void 0 ? void 0 : _selectOptionsListRef.querySelectorAll("[role='option']")[visualFocusIndex];
-    visualFocusedOptionEl === null || visualFocusedOptionEl === void 0 ? void 0 : visualFocusedOptionEl.scrollIntoView({
+    visualFocusedOptionEl === null || visualFocusedOptionEl === void 0 ? void 0 : (_visualFocusedOptionE = visualFocusedOptionEl.scrollIntoView) === null || _visualFocusedOptionE === void 0 ? void 0 : _visualFocusedOptionE.call(visualFocusedOptionEl, {
       block: "nearest",
       inline: "start"
     });
   }, [visualFocusIndex]);
-  (0, _react.useLayoutEffect)(function () {
-    if (isOpen && !multiple) {
-      var listEl = selectOptionsListRef === null || selectOptionsListRef === void 0 ? void 0 : selectOptionsListRef.current;
-      var selectedListOptionEl = listEl === null || listEl === void 0 ? void 0 : listEl.querySelector("[aria-selected='true']");
-      listEl === null || listEl === void 0 ? void 0 : listEl.scrollTo({
-        top: (selectedListOptionEl === null || selectedListOptionEl === void 0 ? void 0 : selectedListOptionEl.offsetTop) - (listEl === null || listEl === void 0 ? void 0 : listEl.clientHeight) / 2
-      });
-    }
-  }, [isOpen]);
 
   var Option = function Option(_ref2) {
     var option = _ref2.option,
@@ -717,73 +478,84 @@ var DxcSelect = _react["default"].forwardRef(function (_ref, ref) {
         isGroupedOption = _ref2$isGroupedOption === void 0 ? false : _ref2$isGroupedOption;
     var isSelected = multiple ? (value !== null && value !== void 0 ? value : innerValue).includes(option.value) : (value !== null && value !== void 0 ? value : innerValue) === option.value;
     var isLastOption = index === lastOptionIndex;
-    return _react["default"].createElement(OptionItem, {
-      onClick: function onClick(event) {
-        // left mouse button only
+    return /*#__PURE__*/_react["default"].createElement(OptionItem, {
+      id: "option-".concat(index),
+      onClick: function onClick() {
         handleSelectChangeValue(option);
         !multiple && closeOptions();
         setSearchValue("");
       },
       visualFocused: visualFocusIndex === index,
       selected: isSelected,
-      "aria-selected": isSelected && "true",
-      role: "option"
-    }, _react["default"].createElement(StyledOption, {
+      role: "option",
+      "aria-selected": isSelected
+    }, /*#__PURE__*/_react["default"].createElement(StyledOption, {
       visualFocused: visualFocusIndex === index,
       selected: isSelected,
       last: isLastOption,
       grouped: isGroupedOption,
       multiple: multiple
-    }, multiple && _react["default"].createElement(_Checkbox["default"], {
+    }, multiple && /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
       tabIndex: -1,
       checked: isSelected
-    }), option.icon && _react["default"].createElement(OptionIcon, {
-      selected: isSelected
-    }, typeof option.icon === "string" ? _react["default"].createElement(OptionIconImg, {
+    }), option.icon && /*#__PURE__*/_react["default"].createElement(OptionIcon, {
+      grouped: isGroupedOption,
+      multiple: multiple,
+      role: !(typeof option.icon === "string") && "img"
+    }, typeof option.icon === "string" ? /*#__PURE__*/_react["default"].createElement(OptionIconImg, {
       src: option.icon
-    }) : option.icon), _react["default"].createElement(OptionContent, {
+    }) : option.icon), /*#__PURE__*/_react["default"].createElement(OptionContent, {
       grouped: isGroupedOption,
       hasIcon: option.icon,
       multiple: multiple
-    }, _react["default"].createElement(OptionLabel, null, option.label), !multiple && isSelected && _react["default"].createElement(OptionSelectedIndicator, null, selectIcons.selected))));
+    }, /*#__PURE__*/_react["default"].createElement(OptionLabel, null, option.label), !multiple && isSelected && /*#__PURE__*/_react["default"].createElement(OptionSelectedIndicator, null, selectIcons.selected))));
   };
 
-  var global_index = optional && !multiple ? 0 : -1; // index for options (not groups), starting from 0 to options.length -1
+  var globalIndex = optional && !multiple ? 0 : -1; // index for options, starting from 0 to options.length -1
 
-  var mapOptionFunc = function mapOptionFunc(option) {
+  var mapOptionFunc = function mapOptionFunc(option, mapIndex) {
     if (option.options) {
-      return _react["default"].createElement(_react["default"].Fragment, null, option.options.length > 0 && _react["default"].createElement(OptionGroupLabel, null, option.label), option.options.map(function (singleOption) {
-        global_index++;
-        return _react["default"].createElement(Option, {
+      var groupId = "group-".concat(mapIndex);
+      return option.options.length > 0 && /*#__PURE__*/_react["default"].createElement("li", null, /*#__PURE__*/_react["default"].createElement(GroupList, {
+        role: "group",
+        "aria-labelledby": groupId
+      }, /*#__PURE__*/_react["default"].createElement(GroupLabel, {
+        role: "presentation",
+        id: groupId
+      }, option.label), option.options.map(function (singleOption) {
+        globalIndex++;
+        return /*#__PURE__*/_react["default"].createElement(Option, {
           option: singleOption,
-          index: global_index,
+          index: globalIndex,
           isGroupedOption: true
         });
-      }));
+      })));
     } else {
-      global_index++;
-      return _react["default"].createElement(Option, {
+      globalIndex++;
+      return /*#__PURE__*/_react["default"].createElement(Option, {
+        key: "option-".concat(option.value),
         option: option,
-        index: global_index
+        index: globalIndex
       });
     }
   };
 
-  return _react["default"].createElement(_styledComponents.ThemeProvider, {
+  return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.select
-  }, _react["default"].createElement(DxcSelectContainer, {
+  }, /*#__PURE__*/_react["default"].createElement(SelectContainer, {
     margin: margin,
     size: size,
     ref: ref
-  }, _react["default"].createElement(Label, {
+  }, label && /*#__PURE__*/_react["default"].createElement(Label, {
     id: selectLabelId,
     disabled: disabled,
     onClick: function onClick() {
       selectContainerRef.current.focus();
-    }
-  }, label, " ", optional && _react["default"].createElement(OptionalLabel, null, "(Optional)")), _react["default"].createElement(HelperText, {
+    },
+    helperText: helperText
+  }, label, " ", optional && /*#__PURE__*/_react["default"].createElement(OptionalLabel, null, "(Optional)")), helperText && /*#__PURE__*/_react["default"].createElement(HelperText, {
     disabled: disabled
-  }, helperText), _react["default"].createElement(SelectContainer, {
+  }, helperText), /*#__PURE__*/_react["default"].createElement(Select, {
     id: selectId,
     disabled: disabled,
     error: error,
@@ -793,42 +565,60 @@ var DxcSelect = _react["default"].forwardRef(function (_ref, ref) {
     onKeyDown: handleSelectOnKeyDown,
     ref: selectContainerRef,
     tabIndex: tabIndex,
-    "aria-labelledby": selectLabelId
-  }, multiple && selectedOption.length > 0 && _react["default"].createElement(SelectionIndicator, null, _react["default"].createElement(SelectionNumber, {
+    role: "combobox",
+    "aria-controls": optionsListId,
+    "aria-expanded": isOpen,
+    "aria-haspopup": "listbox",
+    "aria-labelledby": selectLabelId,
+    "aria-activedescendant": visualFocusIndex >= 0 ? "option-".concat(visualFocusIndex) : undefined,
+    "aria-invalid": error ? "true" : "false",
+    "aria-required": !optional
+  }, multiple && selectedOption.length > 0 && /*#__PURE__*/_react["default"].createElement(SelectionIndicator, null, /*#__PURE__*/_react["default"].createElement(SelectionNumber, {
     disabled: disabled
-  }, selectedOption.length, " "), _react["default"].createElement(ClearOptionsAction, {
+  }, selectedOption.length), /*#__PURE__*/_react["default"].createElement(ClearOptionsAction, {
     disabled: disabled,
+    onMouseDown: function onMouseDown(event) {
+      // Avoid input to lose focus when pressed
+      event.preventDefault();
+    },
     onClick: handleClearOptionsActionOnClick,
     tabIndex: -1,
-    title: "Clear selected options",
-    "aria-label": "Clear selected options"
-  }, selectIcons.clear)), _react["default"].createElement(SearchableValueContainer, null, _react["default"].createElement(ValueInput, {
+    title: "Clear selection",
+    "aria-label": "Clear selection"
+  }, selectIcons.clear)), /*#__PURE__*/_react["default"].createElement(SearchableValueContainer, null, /*#__PURE__*/_react["default"].createElement(ValueInput, {
     name: name,
     value: multiple ? (value !== null && value !== void 0 ? value : innerValue).join(", ") : value !== null && value !== void 0 ? value : innerValue,
-    readOnly: true
-  }), searchable && _react["default"].createElement(SearchInput, {
+    readOnly: true,
+    "aria-hidden": "true"
+  }), searchable && /*#__PURE__*/_react["default"].createElement(SearchInput, {
     value: searchValue,
     disabled: disabled,
     onChange: handleSearchIOnChange,
     ref: selectSearchInputRef,
     autoComplete: "off",
-    autoCorrect: "off"
-  }), (!searchable || searchValue === "") && (multiple ? _react["default"].createElement(SelectedOption, {
+    autoCorrect: "off",
+    size: "1"
+  }), (!searchable || searchValue === "") && (multiple ? /*#__PURE__*/_react["default"].createElement(SelectedOption, {
     disabled: disabled,
-    atBackground: (value !== null && value !== void 0 ? value : innerValue).length === 0 || isOpen
-  }, _react["default"].createElement(OptionLabel, null, selectedOption.map(function (option) {
+    atBackground: (value !== null && value !== void 0 ? value : innerValue).length === 0 || searchable && isOpen
+  }, /*#__PURE__*/_react["default"].createElement(OptionLabel, null, selectedOption.map(function (option) {
     return option.label;
-  }).join(", ")), selectedOption.length === 0 && placeholder) : _react["default"].createElement(SelectedOption, {
+  }).join(", ")), selectedOption.length === 0 && placeholder) : /*#__PURE__*/_react["default"].createElement(SelectedOption, {
     disabled: disabled,
-    atBackground: !(value !== null && value !== void 0 ? value : innerValue) || isOpen
-  }, _react["default"].createElement(OptionLabel, null, (_ref3 = selectedOption === null || selectedOption === void 0 ? void 0 : selectedOption.label) !== null && _ref3 !== void 0 ? _ref3 : placeholder)))), !disabled && error && _react["default"].createElement(ErrorIcon, null, selectIcons.error), searchable && searchValue.length > 0 && _react["default"].createElement(ClearAction, {
-    onClick: handleClearActionOnClick,
+    atBackground: !(value !== null && value !== void 0 ? value : innerValue) || searchable && isOpen
+  }, /*#__PURE__*/_react["default"].createElement(OptionLabel, null, (_selectedOption$label = selectedOption === null || selectedOption === void 0 ? void 0 : selectedOption.label) !== null && _selectedOption$label !== void 0 ? _selectedOption$label : placeholder)))), !disabled && error && /*#__PURE__*/_react["default"].createElement(ErrorIcon, null, selectIcons.error), searchable && searchValue.length > 0 && /*#__PURE__*/_react["default"].createElement(ClearSearchAction, {
+    onMouseDown: function onMouseDown(event) {
+      // Avoid input to lose focus
+      event.preventDefault();
+    },
+    onClick: handleClearSearchActionOnClick,
     tabIndex: -1,
-    title: "Clear search text",
-    "aria-label": "Clear search text"
-  }, selectIcons.clear), _react["default"].createElement(CollapseIndicator, {
+    title: "Clear search",
+    "aria-label": "Clear search"
+  }, selectIcons.clear), /*#__PURE__*/_react["default"].createElement(CollapseIndicator, {
     disabled: disabled
-  }, isOpen ? selectIcons.arrowUp : selectIcons.arrowDown), isOpen && _react["default"].createElement(OptionsList, {
+  }, isOpen ? selectIcons.arrowUp : selectIcons.arrowDown), isOpen && /*#__PURE__*/_react["default"].createElement(OptionsList, {
+    id: optionsListId,
     onClick: function onClick(event) {
       event.stopPropagation();
     },
@@ -837,11 +627,11 @@ var DxcSelect = _react["default"].forwardRef(function (_ref, ref) {
     },
     ref: selectOptionsListRef,
     role: "listbox",
-    "aria-label": label
-  }, searchable && (filteredOptions.length === 0 || !filteredGroupsHaveOptions()) ? _react["default"].createElement(OptionsSystemMessage, null, _react["default"].createElement(NoMatchesFoundIcon, null, selectIcons.searchOff), "No matches found") : optional && !multiple && _react["default"].createElement(Option, {
+    "aria-multiselectable": multiple
+  }, searchable && (filteredOptions.length === 0 || !filteredGroupsHaveOptions()) ? /*#__PURE__*/_react["default"].createElement(OptionsSystemMessage, null, /*#__PURE__*/_react["default"].createElement(NoMatchesFoundIcon, null, selectIcons.searchOff), "No matches found") : optional && !multiple && /*#__PURE__*/_react["default"].createElement(Option, {
     option: optionalEmptyOption,
     index: 0
-  }), searchable ? filteredOptions.map(mapOptionFunc) : options.map(mapOptionFunc))), !disabled && _react["default"].createElement(Error, null, error)));
+  }), searchable ? filteredOptions.map(mapOptionFunc) : options.map(mapOptionFunc))), !disabled && typeof error === "string" && /*#__PURE__*/_react["default"].createElement(Error, null, error)));
 });
 
 var sizes = {
@@ -855,7 +645,7 @@ 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 DxcSelectContainer = _styledComponents["default"].div(_templateObject(), function (props) {
+var SelectContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: column;\n  box-sizing: border-box;\n\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) {
   return props.margin && (0, _typeof2["default"])(props.margin) !== "object" ? _variables.spaces[props.margin] : "0px";
@@ -869,7 +659,7 @@ var DxcSelectContainer = _styledComponents["default"].div(_templateObject(), fun
   return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.left ? _variables.spaces[props.margin.left] : "";
 });
 
-var Label = _styledComponents["default"].span(_templateObject2(), function (props) {
+var Label = _styledComponents["default"].span(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: ", ";\n  cursor: default;\n  ", "\n"])), function (props) {
   return props.disabled ? props.theme.disabledColor : props.theme.labelFontColor;
 }, function (props) {
   return props.theme.fontFamily;
@@ -881,13 +671,15 @@ var Label = _styledComponents["default"].span(_templateObject2(), function (prop
   return props.theme.labelFontWeight;
 }, function (props) {
   return props.theme.labelLineHeight;
+}, function (props) {
+  return !props.helperText && "margin-bottom: 0.25rem";
 });
 
-var OptionalLabel = _styledComponents["default"].span(_templateObject3(), function (props) {
+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(), function (props) {
+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) {
   return props.disabled ? props.theme.disabledColor : props.theme.helperTextFontColor;
 }, function (props) {
   return props.theme.fontFamily;
@@ -901,7 +693,9 @@ var HelperText = _styledComponents["default"].span(_templateObject4(), function
   return props.theme.helperTextLineHeight;
 });
 
-var SelectContainer = _styledComponents["default"].div(_templateObject5(), function (props) {
+var Select = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  position: relative;\n  align-items: center;\n  height: calc(2.5rem - 2px);\n  padding: 0 0.5rem;\n  outline: none;\n  ", ";\n  box-shadow: 0 0 0 2px transparent;\n  border-radius: 4px;\n  border: 1px solid\n    ", ";\n  ", "\n  ", ";\n\n  ", ";\n"])), function (props) {
+  return props.disabled && "background-color: ".concat(props.theme.disabledInputBackgroundColor);
+}, function (props) {
   return props.disabled ? props.theme.disabledInputBorderColor : props.theme.enabledInputBorderColor;
 }, function (props) {
   return props.error && !props.disabled && "border-color: transparent;\n     box-shadow: 0 0 0 2px ".concat(props.theme.errorInputBorderColor, ";\n  ");
@@ -911,12 +705,12 @@ var SelectContainer = _styledComponents["default"].div(_templateObject5(), funct
   return !props.disabled && "\n      &:hover {\n        border-color: ".concat(props.error ? "transparent" : props.theme.hoverInputBorderColor, ";\n        ").concat(props.error && "box-shadow: 0 0 0 2px ".concat(props.theme.hoverInputErrorBorderColor, ";"), "\n      }\n      &:focus-within {\n        border-color: transparent;\n        box-shadow: 0 0 0 2px ").concat(props.theme.focusInputBorderColor, ";\n      }\n    ");
 });
 
-var SelectionIndicator = _styledComponents["default"].span(_templateObject6(), function (props) {
+var SelectionIndicator = _styledComponents["default"].span(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  border: 1px solid ", ";\n  border-radius: 2px;\n  max-height: 22px;\n  width: 46px;\n"])), function (props) {
   return props.theme.selectionIndicatorBorderColor;
 });
 
-var SelectionNumber = _styledComponents["default"].span(_templateObject7(), function (props) {
-  return props.theme.selectionIndicatorBackgroundColor;
+var SelectionNumber = _styledComponents["default"].span(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  width: 22px;\n  height: 22px;\n  user-select: none;\n  ", ";\n  border-right: 1px solid ", ";\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  ", "\n"])), function (props) {
+  return !props.disabled && "background-color: ".concat(props.theme.selectionIndicatorBackgroundColor);
 }, function (props) {
   return props.theme.selectionIndicatorBorderColor;
 }, function (props) {
@@ -933,21 +727,21 @@ var SelectionNumber = _styledComponents["default"].span(_templateObject7(), func
   return props.disabled ? "cursor: not-allowed;" : "cursor: default;";
 });
 
-var ClearOptionsAction = _styledComponents["default"].button(_templateObject8(), function (props) {
+var ClearOptionsAction = _styledComponents["default"].button(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-wrap: wrap;\n  align-content: center;\n  width: 23px;\n  height: 22px;\n  font-size: 1rem;\n  font-family: ", ";\n  border: none;\n  padding: 0.25rem;\n  ", "\n  background-color: ", ";\n  color: ", ";\n\n  :focus-visible {\n    outline: none;\n  }\n  ", "\n\n  svg {\n    line-height: 18px;\n  }\n"])), function (props) {
   return props.theme.fontFamily;
 }, function (props) {
   return props.disabled ? "cursor: not-allowed;" : "cursor: pointer;";
 }, function (props) {
-  return props.theme.enabledSelectionIndicatorActionBackgroundColor;
+  return props.disabled ? "transparent" : props.theme.enabledSelectionIndicatorActionBackgroundColor;
 }, function (props) {
   return props.disabled ? props.theme.disabledColor : props.theme.enabledSelectionIndicatorActionIconColor;
 }, function (props) {
   return !props.disabled && "\n      &:hover {\n        background-color: ".concat(props.theme.hoverSelectionIndicatorActionBackgroundColor, ";\n        color: ").concat(props.theme.hoverSelectionIndicatorActionIconColor, ";\n      }\n      &:active {\n        background-color: ").concat(props.theme.activeSelectionIndicatorActionBackgroundColor, ";\n        color: ").concat(props.theme.activeSelectionIndicatorActionIconColor, ";\n      }\n    ");
 });
 
-var SearchableValueContainer = _styledComponents["default"].div(_templateObject9());
+var SearchableValueContainer = _styledComponents["default"].div(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteral2["default"])(["\n  display: grid;\n  width: 100%;\n"])));
 
-var SelectedOption = _styledComponents["default"].span(_templateObject10(), function (props) {
+var SelectedOption = _styledComponents["default"].span(_templateObject10 || (_templateObject10 = (0, _taggedTemplateLiteral2["default"])(["\n  grid-area: 1 / 1 / 1 / 1;\n  display: inline-flex;\n  align-items: center;\n  height: calc(2.5rem - 2px);\n  padding: 0 0.5rem;\n  user-select: none;\n  overflow: hidden;\n\n  color: ", ";\n\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n"])), function (props) {
   if (props.disabled) return props.theme.disabledColor;else if (props.atBackground) return props.theme.placeholderFontColor;else return props.theme.valueFontColor;
 }, function (props) {
   return props.theme.fontFamily;
@@ -959,9 +753,9 @@ var SelectedOption = _styledComponents["default"].span(_templateObject10(), func
   return props.theme.valueFontWeight;
 });
 
-var ValueInput = _styledComponents["default"].input(_templateObject11());
+var ValueInput = _styledComponents["default"].input(_templateObject11 || (_templateObject11 = (0, _taggedTemplateLiteral2["default"])(["\n  display: none;\n"])));
 
-var SearchInput = _styledComponents["default"].input(_templateObject12(), function (props) {
+var SearchInput = _styledComponents["default"].input(_templateObject12 || (_templateObject12 = (0, _taggedTemplateLiteral2["default"])(["\n  grid-area: 1 / 1 / 1 / 1;\n  height: calc(2.5rem - 2px);\n  background: none;\n  border: none;\n  outline: none;\n  padding: 0 0.5rem;\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: 1.5em;\n"])), function (props) {
   return props.disabled ? props.theme.disabledColor : props.theme.valueFontColor;
 }, function (props) {
   return props.theme.fontFamily;
@@ -973,96 +767,96 @@ var SearchInput = _styledComponents["default"].input(_templateObject12(), functi
   return props.theme.valueFontWeight;
 });
 
-var ErrorIcon = _styledComponents["default"].span(_templateObject13(), function (props) {
-  return props.theme.errorColor;
+var ErrorIcon = _styledComponents["default"].span(_templateObject13 || (_templateObject13 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-wrap: wrap;\n  align-content: center;\n  padding: 3px;\n  height: 18px;\n  width: 18px;\n  margin-left: 0.25rem;\n  pointer-events: none;\n  color: ", ";\n\n  svg {\n    line-height: 18px;\n    font-size: 1.25rem;\n  }\n"])), function (props) {
+  return props.theme.errorIconColor;
 });
 
-var Error = _styledComponents["default"].span(_templateObject14(), function (props) {
-  return props.theme.errorColor;
+var Error = _styledComponents["default"].span(_templateObject14 || (_templateObject14 = (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) {
+  return props.theme.errorMessageColor;
 }, function (props) {
   return props.theme.fontFamily;
-}, function (props) {
-  return props.theme.errorMessageFontSize;
-}, function (props) {
-  return props.theme.errorMessagetFontStyle;
-}, function (props) {
-  return props.theme.errorMessageFontWeight;
-}, function (props) {
-  return props.theme.errorMessagetLineHeight;
 });
 
-var CollapseIndicator = _styledComponents["default"].span(_templateObject15(), function (props) {
+var CollapseIndicator = _styledComponents["default"].span(_templateObject15 || (_templateObject15 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-wrap: wrap;\n  align-content: center;\n  height: 16px;\n  width: 16px;\n  padding: 4px;\n  margin-left: 0.25rem;\n  color: ", ";\n"])), function (props) {
   return props.disabled ? props.theme.disabledColor : props.theme.collapseIndicatorColor;
 });
 
-var ClearAction = _styledComponents["default"].button(_templateObject16(), function (props) {
+var ClearSearchAction = _styledComponents["default"].button(_templateObject16 || (_templateObject16 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-wrap: wrap;\n  align-content: center;\n  height: 24px;\n  width: 24px;\n  font-size: 1rem;\n  font-family: ", ";\n  border: 1px solid transparent;\n  border-radius: 2px;\n  padding: 3px;\n  margin-left: 0.25rem;\n  background-color: ", ";\n  color: ", ";\n\n  cursor: pointer;\n  &:hover {\n    background-color: ", ";\n    color: ", ";\n  }\n  &:active {\n    background-color: ", ";\n    color: ", ";\n  }\n  svg {\n    line-height: 18px;\n  }\n"])), function (props) {
   return props.theme.fontFamily;
 }, function (props) {
-  return props.disabled ? "cursor: not-allowed;" : "cursor: pointer;";
+  return props.theme.actionBackgroundColor;
+}, function (props) {
+  return props.theme.actionIconColor;
+}, function (props) {
+  return props.theme.hoverActionBackgroundColor;
 }, function (props) {
-  return props.disabled ? props.theme.disabledActionBackgroundColor : props.theme.actionBackgroundColor;
+  return props.theme.hoverActionIconColor;
 }, function (props) {
-  return props.disabled ? props.theme.disabledColor : props.theme.actionIconColor;
+  return props.theme.activeActionBackgroundColor;
 }, function (props) {
-  return !props.disabled && "\n      &:hover {\n        background-color: ".concat(props.theme.hoverActionBackgroundColor, ";\n        color: ").concat(props.theme.hoverActionIconColor, ";\n      }\n      &:active {\n        background-color: ").concat(props.theme.activeActionBackgroundColor, ";\n        color: ").concat(props.theme.activeActionIconColor, ";\n      }\n    ");
+  return props.theme.activeActionIconColor;
 });
 
-var OptionsList = _styledComponents["default"].ul(_templateObject17(), function (props) {
-  return props.theme.itemListBackgroundColor;
+var OptionsList = _styledComponents["default"].ul(_templateObject17 || (_templateObject17 = (0, _taggedTemplateLiteral2["default"])(["\n  position: absolute;\n  z-index: 1;\n  max-height: 304px;\n  overflow-y: auto;\n  top: calc(100% + 4px);\n  left: 0;\n  margin: 0;\n  padding: 0.25rem 0;\n  width: 100%;\n  background-color: ", ";\n  border: 1px solid ", ";\n  border-radius: 0.25rem;\n  box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1);\n  cursor: default;\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n"])), function (props) {
+  return props.theme.listDialogBackgroundColor;
 }, function (props) {
-  return props.theme.itemListBorderColor;
+  return props.theme.listDialogBorderColor;
 }, function (props) {
-  return props.theme.listItemFontColor;
+  return props.theme.listOptionFontColor;
 }, function (props) {
   return props.theme.fontFamily;
 }, function (props) {
-  return props.theme.listItemFontSize;
+  return props.theme.listOptionFontSize;
 }, function (props) {
-  return props.theme.listItemFontStyle;
+  return props.theme.listOptionFontStyle;
 }, function (props) {
-  return props.theme.listItemFontWeight;
+  return props.theme.listOptionFontWeight;
 });
 
-var OptionsSystemMessage = _styledComponents["default"].span(_templateObject18(), function (props) {
+var OptionsSystemMessage = _styledComponents["default"].span(_templateObject18 || (_templateObject18 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  padding: 4px 16px;\n  color: ", ";\n  font-size: 0.875rem;\n  line-height: 1.715em;\n"])), function (props) {
   return props.theme.systemMessageFontColor;
 });
 
-var NoMatchesFoundIcon = _styledComponents["default"].span(_templateObject19());
+var NoMatchesFoundIcon = _styledComponents["default"].span(_templateObject19 || (_templateObject19 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-wrap: wrap;\n  align-content: center;\n  height: 16px;\n  width: 16px;\n  padding: 4px;\n  margin-right: 0.25rem;\n"])));
 
-var OptionGroupLabel = _styledComponents["default"].li(_templateObject20(), function (props) {
-  return props.theme.listGroupItemFontWeight;
+var GroupList = _styledComponents["default"].ul(_templateObject20 || (_templateObject20 = (0, _taggedTemplateLiteral2["default"])(["\n  padding: 0;\n"])));
+
+var GroupLabel = _styledComponents["default"].li(_templateObject21 || (_templateObject21 = (0, _taggedTemplateLiteral2["default"])(["\n  padding: 4px 16px;\n  font-weight: ", ";\n  line-height: 1.715em;\n"])), function (props) {
+  return props.theme.listGroupLabelFontWeight;
 });
 
-var OptionItem = _styledComponents["default"].li(_templateObject21(), function (props) {
-  return props.visualFocused && "box-shadow: inset 0 0 0 2px ".concat(props.theme.focusListItemBorderColor, ";");
+var OptionItem = _styledComponents["default"].li(_templateObject22 || (_templateObject22 = (0, _taggedTemplateLiteral2["default"])(["\n  padding: 0 0.5rem;\n  box-shadow: inset 0 0 0 2px transparent;\n  ", "\n  ", ";\n  line-height: 1.715em;\n  cursor: pointer;\n\n  &:hover {\n    ", ";\n  }\n  &:active {\n    ", ";\n  }\n"])), function (props) {
+  return props.visualFocused && "box-shadow: inset 0 0 0 2px ".concat(props.theme.focusListOptionBorderColor, ";");
 }, function (props) {
-  return props.selected && "background-color: ".concat(props.theme.selectedListItemBackgroundColor);
+  return props.selected && "background-color: ".concat(props.theme.selectedListOptionBackgroundColor);
 }, function (props) {
-  return props.selected ? "background-color: ".concat(props.theme.selectedHoverListItemBackgroundColor, ";") : "background-color: ".concat(props.theme.unselectedHoverListItemBackgroundColor, ";");
+  return props.selected ? "background-color: ".concat(props.theme.selectedHoverListOptionBackgroundColor, ";") : "background-color: ".concat(props.theme.unselectedHoverListOptionBackgroundColor, ";");
 }, function (props) {
-  return props.selected ? "background-color: ".concat(props.theme.selectedActiveListItemBackgroundColor, ";") : "background-color: ".concat(props.theme.unselectedActiveListItemBackgroundColor, ";");
+  return props.selected ? "background-color: ".concat(props.theme.selectedActiveListOptionBackgroundColor, ";") : "background-color: ".concat(props.theme.unselectedActiveListOptionBackgroundColor, ";");
 });
 
-var StyledOption = _styledComponents["default"].span(_templateObject22(), function (props) {
+var StyledOption = _styledComponents["default"].span(_templateObject23 || (_templateObject23 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  padding: 0.25rem 0.5rem 0.188rem 0;\n  min-height: 24px;\n  ", "\n  ", ";\n"])), function (props) {
   return props.grouped && props.multiple && "padding-left: 16px;";
 }, function (props) {
-  return props.last || props.visualFocused || props.selected ? "border-bottom: 1px solid transparent" : "border-bottom: 1px solid ".concat(props.theme.listItemDividerColor);
+  return props.last || props.visualFocused || props.selected ? "border-bottom: 1px solid transparent" : "border-bottom: 1px solid ".concat(props.theme.listOptionDividerColor);
 });
 
-var OptionContent = _styledComponents["default"].span(_templateObject23(), function (props) {
-  return props.grouped && !props.multiple && !props.hasIcon && "padding-left: 16px;";
+var OptionContent = _styledComponents["default"].span(_templateObject24 || (_templateObject24 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  justify-content: space-between;\n  width: 100%;\n  overflow: hidden;\n  ", "\n"])), function (props) {
+  return props.grouped && !props.multiple && !props.hasIcon ? "padding-left: 16px;" : "padding-left: 8px;";
 });
 
-var OptionIcon = _styledComponents["default"].span(_templateObject24(), function (props) {
-  return props.theme.listItemIconColor;
+var OptionIcon = _styledComponents["default"].span(_templateObject25 || (_templateObject25 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-wrap: wrap;\n  align-content: center;\n  height: 24px;\n  width: 24px;\n  ", "\n  color: ", ";\n"])), function (props) {
+  return props.grouped && !props.multiple ? "padding-left: 16px;" : "padding-left: 8px;";
+}, function (props) {
+  return props.theme.listOptionIconColor;
 });
 
-var OptionIconImg = _styledComponents["default"].img(_templateObject25());
+var OptionIconImg = _styledComponents["default"].img(_templateObject26 || (_templateObject26 = (0, _taggedTemplateLiteral2["default"])(["\n  width: 16px;\n  height: 16px;\n"])));
 
-var OptionLabel = _styledComponents["default"].span(_templateObject26());
+var OptionLabel = _styledComponents["default"].span(_templateObject27 || (_templateObject27 = (0, _taggedTemplateLiteral2["default"])(["\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n"])));
 
-var OptionSelectedIndicator = _styledComponents["default"].span(_templateObject27(), function (props) {
-  return props.theme.selectedListItemIconColor;
+var OptionSelectedIndicator = _styledComponents["default"].span(_templateObject28 || (_templateObject28 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  height: 16px;\n  width: 16px;\n  margin-left: 4px;\n  color: ", ";\n"])), function (props) {
+  return props.theme.selectedListOptionIconColor;
 });
 
 var _default = DxcSelect;