@dxc-technology/halstack-react 0.0.0-5b2ad05 → 0.0.0-5b6503c

package/dist/select/Select.js

@@ -25,16 +25,24 @@ var _useTheme = _interopRequireDefault(require("../useTheme.js"));
 
 var _variables = require("../common/variables.js");
 
-var _BackgroundColorContext = _interopRequireDefault(require("../BackgroundColorContext.js"));
-
 var _uuid = require("uuid");
 
 var _utils = require("../common/utils.js");
 
 var _Checkbox = _interopRequireDefault(require("../checkbox/Checkbox"));
 
+function _templateObject28() {
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  height: 16px;\n  width: 16px;\n  margin-left: 4px;\n  color: ", ";\n"]);
+
+  _templateObject28 = function _templateObject28() {
+    return data;
+  };
+
+  return data;
+}
+
 function _templateObject27() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  height: 16px;\n  width: 16px;\n  margin-left: 4px;\n  color: #4d4d4d;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n"]);
 
   _templateObject27 = function _templateObject27() {
     return data;
@@ -44,7 +52,7 @@ function _templateObject27() {
 }
 
 function _templateObject26() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  width: 16px;\n  height: 16px;\n"]);
 
   _templateObject26 = function _templateObject26() {
     return data;
@@ -54,7 +62,7 @@ function _templateObject26() {
 }
 
 function _templateObject25() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  width: 16px;\n  height: 16px;\n"]);
+  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"]);
 
   _templateObject25 = function _templateObject25() {
     return data;
@@ -64,7 +72,7 @@ function _templateObject25() {
 }
 
 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"]);
+  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"]);
 
   _templateObject24 = function _templateObject24() {
     return data;
@@ -74,7 +82,7 @@ function _templateObject24() {
 }
 
 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"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  padding: 4px 8px 3px 0;\n  min-height: 24px;\n  ", "\n  ", ";\n"]);
 
   _templateObject23 = function _templateObject23() {
     return data;
@@ -84,7 +92,7 @@ function _templateObject23() {
 }
 
 function _templateObject22() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  padding: 4px 8px 3px 0;\n  min-height: 24px;\n  ", "\n  ", ";\n"]);
+  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"]);
 
   _templateObject22 = function _templateObject22() {
     return data;
@@ -94,7 +102,7 @@ function _templateObject22() {
 }
 
 function _templateObject21() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  padding: 0 8px;\n  line-height: 1.715em;\n  cursor: pointer;\n\n  ", ";\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  padding: 4px 16px;\n  font-weight: ", ";\n  line-height: 1.715em;\n"]);
 
   _templateObject21 = function _templateObject21() {
     return data;
@@ -104,7 +112,7 @@ function _templateObject21() {
 }
 
 function _templateObject20() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  padding: 4px 16px;\n  line-height: 1.715em;\n  font-weight: 600;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  padding: 0;\n"]);
 
   _templateObject20 = function _templateObject20() {
     return data;
@@ -134,7 +142,7 @@ function _templateObject18() {
 }
 
 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: #ffffff;\n  border-radius: 4px;\n  border: 1px solid ", ";\n  box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1);\n  cursor: default;\n  font-family: ", ";\n  color: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n"]);
+  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;
@@ -144,7 +152,7 @@ function _templateObject17() {
 }
 
 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\n  background-color: ", ";\n  color: ", ";\n\n  ", "\n\n  svg {\n    line-height: 18px;\n  }\n"]);
+  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;
@@ -154,7 +162,7 @@ function _templateObject16() {
 }
 
 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\n  color: ", ";\n"]);
+  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;
@@ -164,7 +172,7 @@ function _templateObject15() {
 }
 
 function _templateObject14() {
-  var data = (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"]);
+  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;
@@ -184,7 +192,7 @@ function _templateObject13() {
 }
 
 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\n  color: ", ";\n\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: 1.5em;\n\n  ::placeholder {\n    color: ", ";\n  }\n"]);
+  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;
@@ -224,7 +232,7 @@ function _templateObject9() {
 }
 
 function _templateObject8() {
-  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  font-family: ", ";\n  font-size: 11px;\n  ", "\n"]);
+  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;
@@ -234,7 +242,7 @@ function _templateObject8() {
 }
 
 function _templateObject7() {
-  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"]);
+  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;
@@ -254,7 +262,7 @@ function _templateObject6() {
 }
 
 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  ", "\n  box-shadow: 0 0 0 2px transparent;\n  border-radius: 4px;\n  border: 1px solid\n    ", ";\n  ", "\n  ", ";\n\n  ", ";\n"]);
+  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;
@@ -264,7 +272,7 @@ function _templateObject5() {
 }
 
 function _templateObject4() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: 1.5em;\n"]);
+  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;
@@ -284,7 +292,7 @@ function _templateObject3() {
 }
 
 function _templateObject2() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: 1.715em;\n  cursor: default;\n"]);
+  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;
@@ -382,6 +390,22 @@ var getNotOptionalErrorMessage = function getNotOptionalErrorMessage() {
   return "This field is required. Please, enter a value.";
 };
 
+var filterOptionsBySearchValue = function filterOptionsBySearchValue(options, searchValue) {
+  if ((options === null || options === void 0 ? void 0 : options.length) > 0) {
+    if (options[0].options) return options.map(function (optionGroup) {
+      var group = {
+        label: optionGroup.label,
+        options: optionGroup.options.filter(function (option) {
+          return option.label.toUpperCase().includes(searchValue.toUpperCase());
+        })
+      };
+      return group;
+    });else return options.filter(function (option) {
+      return option.label.toUpperCase().includes(searchValue.toUpperCase());
+    });
+  }
+};
+
 var DxcSelect = _react["default"].forwardRef(function (_ref, ref) {
   var _ref3;
 
@@ -418,6 +442,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),
@@ -429,41 +454,23 @@ var DxcSelect = _react["default"].forwardRef(function (_ref, ref) {
       searchValue = _useState6[0],
       setSearchValue = _useState6[1];
 
-  var _useState7 = (0, _react.useState)(false),
+  var _useState7 = (0, _react.useState)(-1),
       _useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
-      isBackgroundValue = _useState8[0],
-      changeIsBackgroundValue = _useState8[1];
+      visualFocusIndex = _useState8[0],
+      changeVisualFocusIndex = _useState8[1];
 
   var _useState9 = (0, _react.useState)(false),
       _useState10 = (0, _slicedToArray2["default"])(_useState9, 2),
       isOpen = _useState10[0],
       changeIsOpen = _useState10[1];
 
-  var _useState11 = (0, _react.useState)(false),
-      _useState12 = (0, _slicedToArray2["default"])(_useState11, 2),
-      isActiveOption = _useState12[0],
-      changeIsActiveOption = _useState12[1];
-
-  var _useState13 = (0, _react.useState)(false),
-      _useState14 = (0, _slicedToArray2["default"])(_useState13, 2),
-      isScrollable = _useState14[0],
-      changeIsScrollable = _useState14[1];
-
-  var _useState15 = (0, _react.useState)([]),
-      _useState16 = (0, _slicedToArray2["default"])(_useState15, 2),
-      filteredOptions = _useState16[0],
-      setFilteredOptions = _useState16[1];
-
-  var _useState17 = (0, _react.useState)(-1),
-      _useState18 = (0, _slicedToArray2["default"])(_useState17, 2),
-      visualFocusIndex = _useState18[0],
-      changeVisualFocusIndex = _useState18[1];
-
   var selectContainerRef = (0, _react.useRef)(null);
   var selectSearchInputRef = (0, _react.useRef)(null);
   var selectOptionsListRef = (0, _react.useRef)(null);
   var colorsTheme = (0, _useTheme["default"])();
-  var backgroundType = (0, _react.useContext)(_BackgroundColorContext["default"]);
+  var filteredOptions = (0, _react.useMemo)(function () {
+    return filterOptionsBySearchValue(options, searchValue);
+  }, [options, searchValue]);
   var optionalEmptyOption = {
     label: placeholder,
     value: ""
@@ -496,15 +503,11 @@ var DxcSelect = _react["default"].forwardRef(function (_ref, ref) {
   };
 
   var openOptions = function openOptions() {
-    if (!isOpen && canBeOpenOptions()) {
-      searchable && changeIsBackgroundValue(true);
-      changeIsOpen(true);
-    }
+    if (!isOpen && canBeOpenOptions()) changeIsOpen(true);
   };
 
   var closeOptions = function closeOptions() {
     if (isOpen) {
-      searchable && changeIsBackgroundValue(false);
       changeIsOpen(false);
       changeVisualFocusIndex(-1);
     }
@@ -544,8 +547,11 @@ var DxcSelect = _react["default"].forwardRef(function (_ref, ref) {
   };
 
   var handleSelectOnClick = function handleSelectOnClick() {
-    changeVisualFocusIndex(0);
-    isOpen ? closeOptions() : openOptions();
+    if (isOpen) {
+      closeOptions();
+      setSearchValue("");
+    } else openOptions();
+
     searchable && selectSearchInputRef.current.focus();
   };
 
@@ -577,8 +583,6 @@ var DxcSelect = _react["default"].forwardRef(function (_ref, ref) {
           if (visualFocusIndex < lastOptionIndex) return visualFocusIndex + 1;else if (visualFocusIndex === lastOptionIndex) return 0;
         });
         openOptions();
-        changeIsActiveOption(false);
-        isOpen && changeIsScrollable(true);
         break;
 
       case 38:
@@ -588,8 +592,6 @@ var DxcSelect = _react["default"].forwardRef(function (_ref, ref) {
           return visualFocusIndex === 0 || visualFocusIndex === -1 ? lastOptionIndex : visualFocusIndex - 1;
         });
         openOptions();
-        changeIsActiveOption(false);
-        isOpen && changeIsScrollable(true);
         break;
 
       case 27:
@@ -601,7 +603,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) {
@@ -632,7 +634,7 @@ var DxcSelect = _react["default"].forwardRef(function (_ref, ref) {
 
   var handleSearchIOnChange = function handleSearchIOnChange(event) {
     setSearchValue(event.target.value);
-    !isOpen && changeVisualFocusIndex(0);
+    changeVisualFocusIndex(-1);
     openOptions();
   };
 
@@ -701,36 +703,23 @@ var DxcSelect = _react["default"].forwardRef(function (_ref, ref) {
     return getSelectedOption();
   }, [options, multiple, value !== null && value !== void 0 ? value : innerValue]);
   (0, _react.useLayoutEffect)(function () {
-    if (isScrollable) {
-      var _selectOptionsListRef;
+    var _selectOptionsListRef;
 
-      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({
-        block: "nearest",
-        inline: "start"
+    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({
+      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
       });
-      return changeIsScrollable(false);
-    }
-  }, [isScrollable]);
-  (0, _react.useEffect)(function () {
-    if (searchable && (options === null || options === void 0 ? void 0 : options.length) > 0) {
-      if (options[0].options) {
-        setFilteredOptions(options.map(function (optionGroup) {
-          var group = JSON.parse(JSON.stringify(optionGroup)); // circular issue
-
-          group.options = group.options.filter(function (option) {
-            return option.label.toUpperCase().includes(searchValue.toUpperCase());
-          });
-          return group;
-        }));
-      } else setFilteredOptions(options.filter(function (option) {
-        return option.label.toUpperCase().includes(searchValue.toUpperCase());
-      }));
     }
-  }, [options, searchable, searchValue]);
-  (0, _react.useEffect)(function () {
-    visualFocusIndex > lastOptionIndex && changeVisualFocusIndex(0);
-  }, [filteredOptions]);
+  }, [isOpen]);
 
   var Option = function Option(_ref2) {
     var option = _ref2.option,
@@ -740,33 +729,19 @@ var DxcSelect = _react["default"].forwardRef(function (_ref, ref) {
     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, {
-      onMouseDown: function onMouseDown(event) {
+      id: "option-".concat(index),
+      onClick: function onClick(event) {
         // left mouse button only
-        event.button === 0 && changeIsActiveOption(true);
-      },
-      onMouseUp: function onMouseUp(event) {
-        if (event.button === 0 && isActiveOption) {
-          // left mouse button only
-          handleSelectChangeValue(option);
-          !multiple && closeOptions();
-          setSearchValue("");
-          changeIsActiveOption(false);
-        }
-      },
-      onMouseEnter: function onMouseEnter() {
-        changeVisualFocusIndex(index);
-      },
-      onMouseLeave: function onMouseLeave() {
-        changeIsActiveOption(false);
+        handleSelectChangeValue(option);
+        !multiple && closeOptions();
+        setSearchValue("");
       },
       visualFocused: visualFocusIndex === index,
-      active: visualFocusIndex === index && isActiveOption,
       selected: isSelected,
-      "aria-selected": isSelected && "true",
-      role: "option"
+      role: "option",
+      "aria-selected": isSelected && "true"
     }, _react["default"].createElement(StyledOption, {
       visualFocused: visualFocusIndex === index,
-      active: visualFocusIndex === index && isActiveOption,
       selected: isSelected,
       last: isLastOption,
       grouped: isGroupedOption,
@@ -774,27 +749,33 @@ var DxcSelect = _react["default"].forwardRef(function (_ref, ref) {
     }, multiple && _react["default"].createElement(_Checkbox["default"], {
       tabIndex: -1,
       checked: isSelected
-    }), option.icon && _react["default"].createElement(OptionIcon, null, typeof option.icon === "string" ? _react["default"].createElement(OptionIconImg, {
+    }), option.icon && _react["default"].createElement(OptionIcon, {
+      selected: isSelected
+    }, typeof option.icon === "string" ? _react["default"].createElement(OptionIconImg, {
       src: option.icon
     }) : option.icon), _react["default"].createElement(OptionContent, {
       grouped: isGroupedOption,
       hasIcon: option.icon,
       multiple: multiple
-    }, _react["default"].createElement(OptionLabel, null, option.label), !multiple && isSelected && _react["default"].createElement(SelectedIcon, null, selectIcons.selected))));
+    }, _react["default"].createElement(OptionLabel, null, option.label), !multiple && isSelected && _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 mapOptionFunc = function mapOptionFunc(option) {
     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) {
+      return option.options.length > 0 && _react["default"].createElement("li", null, _react["default"].createElement(GroupList, {
+        role: "group"
+      }, _react["default"].createElement(GroupLabel, {
+        role: "presentation"
+      }, option.label), option.options.map(function (singleOption) {
         global_index++;
         return _react["default"].createElement(Option, {
           option: singleOption,
           index: global_index,
           isGroupedOption: true
         });
-      }));
+      })));
     } else {
       global_index++;
       return _react["default"].createElement(Option, {
@@ -806,23 +787,20 @@ var DxcSelect = _react["default"].forwardRef(function (_ref, ref) {
 
   return _react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.select
-  }, _react["default"].createElement(DxcSelectContainer, {
+  }, _react["default"].createElement(SelectContainer, {
     margin: margin,
     size: size,
     ref: ref
   }, _react["default"].createElement(Label, {
     id: selectLabelId,
     disabled: disabled,
-    backgroundType: backgroundType,
     onClick: function onClick() {
       selectContainerRef.current.focus();
     }
   }, label, " ", optional && _react["default"].createElement(OptionalLabel, null, "(Optional)")), _react["default"].createElement(HelperText, {
-    disabled: disabled,
-    backgroundType: backgroundType
-  }, helperText), _react["default"].createElement(SelectContainer, {
+    disabled: disabled
+  }, helperText), _react["default"].createElement(Select, {
     id: selectId,
-    backgroundType: backgroundType,
     disabled: disabled,
     error: error,
     onBlur: handleSelectOnBlur,
@@ -831,16 +809,25 @@ 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(SelectionValue, null, selectedOption.length, " "), _react["default"].createElement(ClearOptionsAction, {
+    role: "combobox",
+    "aria-controls": optionsListId,
+    "aria-expanded": isOpen ? "true" : "false",
+    "aria-haspopup": "listbox",
+    "aria-labelledby": selectLabelId,
+    "aria-activedescendant": visualFocusIndex >= 0 && "option-".concat(visualFocusIndex),
+    "aria-invalid": error ? "true" : "false",
+    "aria-required": optional ? "false" : "true"
+  }, multiple && selectedOption.length > 0 && _react["default"].createElement(SelectionIndicator, null, _react["default"].createElement(SelectionNumber, {
+    disabled: disabled
+  }, selectedOption.length, " "), _react["default"].createElement(ClearOptionsAction, {
+    disabled: disabled,
     onClick: handleClearOptionsActionOnClick,
-    backgroundType: backgroundType,
     tabIndex: -1,
     title: "Clear selected options",
     "aria-label": "Clear selected options"
   }, selectIcons.clear)), _react["default"].createElement(SearchableValueContainer, null, _react["default"].createElement(ValueInput, {
     name: name,
-    value: value !== null && value !== void 0 ? value : innerValue,
+    value: multiple ? (value !== null && value !== void 0 ? value : innerValue).join(", ") : value !== null && value !== void 0 ? value : innerValue,
     readOnly: true
   }), searchable && _react["default"].createElement(SearchInput, {
     value: searchValue,
@@ -851,24 +838,21 @@ var DxcSelect = _react["default"].forwardRef(function (_ref, ref) {
     autoCorrect: "off"
   }), (!searchable || searchValue === "") && (multiple ? _react["default"].createElement(SelectedOption, {
     disabled: disabled,
-    backgroundValue: (value !== null && value !== void 0 ? value : innerValue).length === 0 || isBackgroundValue
+    atBackground: (value !== null && value !== void 0 ? value : innerValue).length === 0 || isOpen
   }, _react["default"].createElement(OptionLabel, null, selectedOption.map(function (option) {
     return option.label;
   }).join(", ")), selectedOption.length === 0 && placeholder) : _react["default"].createElement(SelectedOption, {
     disabled: disabled,
-    backgroundValue: !(value !== null && value !== void 0 ? value : innerValue) || isBackgroundValue
-  }, _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, {
-    backgroundType: backgroundType
-  }, selectIcons.error), searchable && searchValue.length > 0 && _react["default"].createElement(ClearAction, {
+    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,
-    backgroundType: backgroundType,
     tabIndex: -1,
     title: "Clear search text",
     "aria-label": "Clear search text"
-  }, selectIcons.clear), _react["default"].createElement(Arrow, {
-    disabled: disabled,
-    backgroundType: backgroundType
+  }, selectIcons.clear), _react["default"].createElement(CollapseIndicator, {
+    disabled: disabled
   }, isOpen ? selectIcons.arrowUp : selectIcons.arrowDown), isOpen && _react["default"].createElement(OptionsList, {
+    id: optionsListId,
     onClick: function onClick(event) {
       event.stopPropagation();
     },
@@ -877,13 +861,12 @@ var DxcSelect = _react["default"].forwardRef(function (_ref, ref) {
     },
     ref: selectOptionsListRef,
     role: "listbox",
-    "aria-label": label
+    "aria-labelledby": selectLabelId,
+    "aria-multiselectable": multiple ? "true" : "false"
   }, 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, {
     option: optionalEmptyOption,
     index: 0
-  }), searchable ? filteredOptions.map(mapOptionFunc) : options.map(mapOptionFunc))), !disabled && _react["default"].createElement(Error, {
-    backgroundType: backgroundType
-  }, error)));
+  }), searchable ? filteredOptions.map(mapOptionFunc) : options.map(mapOptionFunc))), !disabled && _react["default"].createElement(Error, null, error)));
 });
 
 var sizes = {
@@ -897,7 +880,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(), function (props) {
   return calculateWidth(props.margin, props.size);
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) !== "object" ? _variables.spaces[props.margin] : "0px";
@@ -912,7 +895,7 @@ var DxcSelectContainer = _styledComponents["default"].div(_templateObject(), fun
 });
 
 var Label = _styledComponents["default"].span(_templateObject2(), function (props) {
-  return props.disabled ? props.backgroundType === "dark" ? props.theme.disabledLabelFontColorOnDark : props.theme.disabledLabelFontColor : props.backgroundType === "dark" ? props.theme.labelFontColorOnDark : props.theme.labelFontColor;
+  return props.disabled ? props.theme.disabledColor : props.theme.labelFontColor;
 }, function (props) {
   return props.theme.fontFamily;
 }, function (props) {
@@ -921,6 +904,8 @@ var Label = _styledComponents["default"].span(_templateObject2(), function (prop
   return props.theme.labelFontStyle;
 }, function (props) {
   return props.theme.labelFontWeight;
+}, function (props) {
+  return props.theme.labelLineHeight;
 });
 
 var OptionalLabel = _styledComponents["default"].span(_templateObject3(), function (props) {
@@ -928,7 +913,7 @@ var OptionalLabel = _styledComponents["default"].span(_templateObject3(), functi
 });
 
 var HelperText = _styledComponents["default"].span(_templateObject4(), function (props) {
-  return props.disabled ? props.backgroundType === "dark" ? props.theme.disabledHelperTextFontColorOnDark : props.theme.disabledHelperTextFontColor : props.backgroundType === "dark" ? props.theme.helperTextFontColorOnDark : props.theme.helperTextFontColor;
+  return props.disabled ? props.theme.disabledColor : props.theme.helperTextFontColor;
 }, function (props) {
   return props.theme.fontFamily;
 }, function (props) {
@@ -937,50 +922,58 @@ var HelperText = _styledComponents["default"].span(_templateObject4(), function
   return props.theme.helperTextFontStyle;
 }, function (props) {
   return props.theme.helperTextFontWeight;
+}, function (props) {
+  return props.theme.helperTextLineHeight;
 });
 
-var SelectContainer = _styledComponents["default"].div(_templateObject5(), function (props) {
-  if (props.disabled) return props.backgroundType === "dark" ? "background-color: ".concat(props.theme.disabledContainerFillColorOnDark, ";") : "background-color: ".concat(props.theme.disabledContainerFillColor, ";");
+var Select = _styledComponents["default"].div(_templateObject5(), function (props) {
+  return props.disabled ? props.theme.disabledInputBorderColor : props.theme.enabledInputBorderColor;
 }, function (props) {
-  if (props.disabled) return props.backgroundType === "dark" ? props.theme.disabledBorderColorOnDark : props.theme.disabledBorderColor;else return props.backgroundType === "dark" ? props.theme.enabledBorderColorOnDark : props.theme.enabledBorderColor;
-}, function (props) {
-  return props.error && !props.disabled && "border-color: transparent;\n     box-shadow: 0 0 0 2px ".concat(props.backgroundType === "dark" ? props.theme.errorBorderColorOnDark : props.theme.errorBorderColor, ";\n  ");
+  return props.error && !props.disabled && "border-color: transparent;\n     box-shadow: 0 0 0 2px ".concat(props.theme.errorInputBorderColor, ";\n  ");
 }, function (props) {
   return props.disabled ? "cursor: not-allowed;" : "cursor: pointer;";
 }, function (props) {
-  return !props.disabled && "\n      &:hover {\n        border-color: ".concat(props.error ? "transparent" : props.backgroundType === "dark" ? props.theme.hoverBorderColorOnDark : props.theme.hoverBorderColor, ";\n        ").concat(props.error && "box-shadow: 0 0 0 2px ".concat(props.backgroundType === "dark" ? props.theme.hoverErrorBorderColorOnDark : props.theme.hoverErrorBorderColor, ";"), "\n      }\n      &:focus-within {\n        border-color: transparent;\n        box-shadow: 0 0 0 2px ").concat(props.backgroundType === "dark" ? props.theme.focusBorderColorOnDark : props.theme.focusBorderColor, ";\n      }\n    ");
+  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) {
   return props.theme.selectionIndicatorBorderColor;
 });
 
-var ClearOptionsAction = _styledComponents["default"].button(_templateObject7(), function (props) {
+var SelectionNumber = _styledComponents["default"].span(_templateObject7(), function (props) {
+  return props.theme.selectionIndicatorBackgroundColor;
+}, function (props) {
+  return props.theme.selectionIndicatorBorderColor;
+}, function (props) {
+  return props.disabled ? props.theme.disabledColor : props.theme.selectionIndicatorFontColor;
+}, function (props) {
   return props.theme.fontFamily;
 }, function (props) {
-  return props.disabled ? "cursor: not-allowed;" : "cursor: pointer;";
+  return props.theme.selectionIndicatorFontSize;
 }, function (props) {
-  return props.theme.enabledSelectionIndicatorActionBackgroundColor;
+  return props.theme.selectionIndicatorFontStyle;
 }, function (props) {
-  return props.theme.enabledSelectionIndicatorActionIconColor;
+  return props.theme.selectionIndicatorFontWeight;
 }, 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    ");
+  return props.disabled ? "cursor: not-allowed;" : "cursor: default;";
 });
 
-var SelectionValue = _styledComponents["default"].span(_templateObject8(), function (props) {
-  return props.theme.selectionIndicatorBackgroundColor;
+var ClearOptionsAction = _styledComponents["default"].button(_templateObject8(), function (props) {
+  return props.theme.fontFamily;
 }, function (props) {
-  return props.theme.selectionIndicatorBorderColor;
+  return props.disabled ? "cursor: not-allowed;" : "cursor: pointer;";
 }, function (props) {
-  return props.theme.fontFamily;
+  return props.theme.enabledSelectionIndicatorActionBackgroundColor;
 }, function (props) {
-  return props.disabled ? "cursor: not-allowed;" : "cursor: default;";
+  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 SelectedOption = _styledComponents["default"].span(_templateObject10(), function (props) {
-  if (props.backgroundValue) return props.disabled ? props.backgroundType === "dark" ? props.theme.disabledPlaceholderFontColorOnDark : props.theme.disabledPlaceholderFontColor : props.backgroundType === "dark" ? props.theme.placeholderFontColorOnDark : props.theme.placeholderFontColor;else return props.disabled ? props.backgroundType === "dark" ? props.theme.disabledValueFontColorOnDark : props.theme.disabledValueFontColor : props.backgroundType === "dark" ? props.theme.valueFontColorOnDark : props.theme.valueFontColor;
+  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;
 }, function (props) {
@@ -994,7 +987,7 @@ var SelectedOption = _styledComponents["default"].span(_templateObject10(), func
 var ValueInput = _styledComponents["default"].input(_templateObject11());
 
 var SearchInput = _styledComponents["default"].input(_templateObject12(), function (props) {
-  return props.disabled ? props.backgroundType === "dark" ? props.theme.disabledValueFontColorOnDark : props.theme.disabledValueFontColor : props.backgroundType === "dark" ? props.theme.valueFontColorOnDark : props.theme.valueFontColor;
+  return props.disabled ? props.theme.disabledColor : props.theme.valueFontColor;
 }, function (props) {
   return props.theme.fontFamily;
 }, function (props) {
@@ -1003,22 +996,28 @@ var SearchInput = _styledComponents["default"].input(_templateObject12(), functi
   return props.theme.valueFontStyle;
 }, function (props) {
   return props.theme.valueFontWeight;
-}, function (props) {
-  return props.disabled ? props.backgroundType === "dark" ? props.theme.disabledPlaceholderFontColorOnDark : props.theme.disabledPlaceholderFontColor : props.backgroundType === "dark" ? props.theme.placeholderFontColorOnDark : props.theme.placeholderFontColor;
 });
 
 var ErrorIcon = _styledComponents["default"].span(_templateObject13(), function (props) {
-  return props.backgroundType === "dark" ? props.theme.errorIconColorOnDark : props.theme.errorIconColor;
+  return props.theme.errorColor;
 });
 
 var Error = _styledComponents["default"].span(_templateObject14(), function (props) {
-  return props.backgroundType === "dark" ? props.theme.errorMessageColorOnDark : props.theme.errorMessageColor;
+  return props.theme.errorColor;
 }, 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 Arrow = _styledComponents["default"].span(_templateObject15(), function (props) {
-  return props.disabled ? props.backgroundType === "dark" ? props.theme.disabledArrowColorOnDark : props.theme.disabledArrowColor : props.backgroundType === "dark" ? props.theme.arrowColorOnDark : props.theme.arrowColor;
+var CollapseIndicator = _styledComponents["default"].span(_templateObject15(), function (props) {
+  return props.disabled ? props.theme.disabledColor : props.theme.collapseIndicatorColor;
 });
 
 var ClearAction = _styledComponents["default"].button(_templateObject16(), function (props) {
@@ -1026,25 +1025,27 @@ var ClearAction = _styledComponents["default"].button(_templateObject16(), funct
 }, function (props) {
   return props.disabled ? "cursor: not-allowed;" : "cursor: pointer;";
 }, function (props) {
-  return props.disabled ? props.backgroundType === "dark" ? props.theme.disabledActionBackgroundColorOnDark : props.theme.disabledActionBackgroundColor : props.backgroundType === "dark" ? props.theme.actionBackgroundColorOnDark : props.theme.actionBackgroundColor;
+  return props.disabled ? props.theme.disabledActionBackgroundColor : props.theme.actionBackgroundColor;
 }, function (props) {
-  return props.disabled ? props.backgroundType === "dark" ? props.theme.disabledActionIconColorOnDark : props.theme.disabledActionIconColor : props.backgroundType === "dark" ? props.theme.actionIconColorOnDark : props.theme.actionIconColor;
+  return props.disabled ? props.theme.disabledColor : props.theme.actionIconColor;
 }, function (props) {
-  return !props.disabled && "\n      &:hover {\n        background-color: ".concat(props.backgroundType === "dark" ? props.theme.hoverActionBackgroundColorOnDark : props.theme.hoverActionBackgroundColor, ";\n        color: ").concat(props.backgroundType === "dark" ? props.theme.hoverActionIconColorOnDark : props.theme.hoverActionIconColor, ";\n      }\n      &:active {\n        background-color: ").concat(props.backgroundType === "dark" ? props.theme.activeActionBackgroundColorOnDark : props.theme.activeActionBackgroundColor, ";\n        color: ").concat(props.backgroundType === "dark" ? props.theme.activeActionIconColorOnDark : props.theme.activeActionIconColor, ";\n      }\n    ");
+  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    ");
 });
 
 var OptionsList = _styledComponents["default"].ul(_templateObject17(), function (props) {
-  return props.theme.enabledListBorderColor;
+  return props.theme.itemListBackgroundColor;
 }, function (props) {
-  return props.theme.fontFamily;
+  return props.theme.itemListBorderColor;
 }, function (props) {
-  return props.theme.listOptionFontColor;
+  return props.theme.listItemFontColor;
 }, function (props) {
-  return props.theme.listOptionFontSize;
+  return props.theme.fontFamily;
+}, function (props) {
+  return props.theme.listItemFontSize;
 }, function (props) {
-  return props.theme.listOptionFontStyle;
+  return props.theme.listItemFontStyle;
 }, function (props) {
-  return props.theme.listOptionFontWeight;
+  return props.theme.listItemFontWeight;
 });
 
 var OptionsSystemMessage = _styledComponents["default"].span(_templateObject18(), function (props) {
@@ -1053,33 +1054,43 @@ var OptionsSystemMessage = _styledComponents["default"].span(_templateObject18()
 
 var NoMatchesFoundIcon = _styledComponents["default"].span(_templateObject19());
 
-var OptionGroupLabel = _styledComponents["default"].li(_templateObject20());
+var GroupList = _styledComponents["default"].ul(_templateObject20());
 
-var OptionItem = _styledComponents["default"].li(_templateObject21(), function (props) {
-  if (props.selected) {
-    if (props.active) return "background-color: #BFBFBF";else if (props.visualFocused) return "background-color: #CCCCCC";else return "background-color: ".concat(props.theme.selectedListOptionBackgroundColor);
-  } else {
-    if (props.active) return "background-color: ".concat(props.theme.activeListOptionBackgroundColor, ";");else if (props.visualFocused) return "background-color: ".concat(props.theme.hoverListOptionBackgroundColor, ";");
-  }
+var GroupLabel = _styledComponents["default"].li(_templateObject21(), function (props) {
+  return props.theme.listGroupItemFontWeight;
+});
+
+var OptionItem = _styledComponents["default"].li(_templateObject22(), function (props) {
+  return props.visualFocused && "box-shadow: inset 0 0 0 2px ".concat(props.theme.focusListItemBorderColor, ";");
+}, function (props) {
+  return props.selected && "background-color: ".concat(props.theme.selectedListItemBackgroundColor);
+}, function (props) {
+  return props.selected ? "background-color: ".concat(props.theme.selectedHoverListItemBackgroundColor, ";") : "background-color: ".concat(props.theme.unselectedHoverListItemBackgroundColor, ";");
+}, function (props) {
+  return props.selected ? "background-color: ".concat(props.theme.selectedActiveListItemBackgroundColor, ";") : "background-color: ".concat(props.theme.unselectedActiveListItemBackgroundColor, ";");
 });
 
-var StyledOption = _styledComponents["default"].span(_templateObject22(), function (props) {
+var StyledOption = _styledComponents["default"].span(_templateObject23(), function (props) {
   return props.grouped && props.multiple && "padding-left: 16px;";
 }, function (props) {
-  return props.last ? "border-bottom: 1px solid transparent" : "border-bottom: 1px solid ".concat(props.theme.listOptionBorderBottomColor);
+  return props.last || props.visualFocused || props.selected ? "border-bottom: 1px solid transparent" : "border-bottom: 1px solid ".concat(props.theme.listItemDividerColor);
 });
 
-var OptionContent = _styledComponents["default"].span(_templateObject23(), function (props) {
+var OptionContent = _styledComponents["default"].span(_templateObject24(), function (props) {
   return props.grouped && !props.multiple && !props.hasIcon && "padding-left: 16px;";
 });
 
-var OptionIcon = _styledComponents["default"].span(_templateObject24());
+var OptionIcon = _styledComponents["default"].span(_templateObject25(), function (props) {
+  return props.theme.listItemIconColor;
+});
 
-var OptionIconImg = _styledComponents["default"].img(_templateObject25());
+var OptionIconImg = _styledComponents["default"].img(_templateObject26());
 
-var OptionLabel = _styledComponents["default"].span(_templateObject26());
+var OptionLabel = _styledComponents["default"].span(_templateObject27());
 
-var SelectedIcon = _styledComponents["default"].span(_templateObject27());
+var OptionSelectedIndicator = _styledComponents["default"].span(_templateObject28(), function (props) {
+  return props.theme.selectedListItemIconColor;
+});
 
 var _default = DxcSelect;
 exports["default"] = _default;