@dxc-technology/halstack-react 0.0.0-c908d78 → 0.0.0-cae3419

package/select/Select.js

@@ -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");
 
@@ -29,99 +29,34 @@ var _uuid = require("uuid");
 
 var _utils = require("../common/utils.js");
 
-var _Checkbox = _interopRequireDefault(require("../checkbox/Checkbox"));
+var _Option = _interopRequireDefault(require("../select/Option"));
 
-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;
+var _Icons = _interopRequireDefault(require("./Icons"));
+
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17, _templateObject18, _templateObject19, _templateObject20, _templateObject21, _templateObject22;
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof3(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-var selectIcons = {
-  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"
-  }, /*#__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: /*#__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"
-  }, /*#__PURE__*/_react["default"].createElement("path", {
-    d: "M0 0h24v24H0V0z",
-    fill: "none"
-  }), /*#__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: /*#__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"
-  }, /*#__PURE__*/_react["default"].createElement("path", {
-    d: "M0 0h24v24H0V0z",
-    fill: "none"
-  }), /*#__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: /*#__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"
-  }, /*#__PURE__*/_react["default"].createElement("path", {
-    d: "M0 0h24v24H0V0z",
-    fill: "none"
-  }), /*#__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: /*#__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"
-  }, /*#__PURE__*/_react["default"].createElement("path", {
-    d: "M0 0h24v24H0z",
-    fill: "none"
-  }), /*#__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: /*#__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"
-  }, /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("rect", {
-    fill: "none",
-    height: "24",
-    width: "24"
-  })), /*#__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"
-  }), /*#__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"
-  }))))
-};
-
 var getNotOptionalErrorMessage = function getNotOptionalErrorMessage() {
   return "This field is required. Please, enter a value.";
 };
 
+var groupsHaveOptions = function groupsHaveOptions(innerOptions) {
+  return innerOptions[0].hasOwnProperty("options") ? innerOptions[0].options ? innerOptions.some(function (groupOption) {
+    return groupOption.options.length > 0;
+  }) : false : true;
+};
+
+var filteredGroupsHaveOptions = function filteredGroupsHaveOptions(filteredOptions) {
+  return filteredOptions !== null && filteredOptions !== void 0 && filteredOptions[0].options ? filteredOptions.some(function (groupOption) {
+    var _groupOption$options;
+
+    return ((_groupOption$options = groupOption.options) === null || _groupOption$options === void 0 ? void 0 : _groupOption$options.length) > 0;
+  }) : true;
+};
+
 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) {
@@ -151,9 +86,8 @@ var getLastOptionIndex = function getLastOptionIndex(options, filteredOptions, s
   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 getSelectedOption = function getSelectedOption(value, options, multiple, optional, optionalItem) {
+  var selectedOption = multiple ? [] : {};
   var singleSelectionIndex;
 
   if (multiple) {
@@ -161,21 +95,21 @@ var getSelectedOption = function getSelectedOption(options, multiple, optional,
       options.forEach(function (option) {
         if (option.options) {
           option.options.forEach(function (singleOption) {
-            if (val.includes(singleOption.value)) selectedOption.push(singleOption);
+            if (value.includes(singleOption.value)) selectedOption.push(singleOption);
           });
-        } else if (val.includes(option.value)) selectedOption.push(option);
+        } else if (value.includes(option.value)) selectedOption.push(option);
       });
     }
   } else {
-    if (optional && val === "") {
-      selectedOption = optionalEmptyOption;
+    if (optional && value === "") {
+      selectedOption = optionalItem;
       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) {
+            if (singleOption.value === value) {
               selectedOption = singleOption;
               singleSelectionIndex = optional ? group_index + 1 : group_index;
               return true;
@@ -183,7 +117,7 @@ var getSelectedOption = function getSelectedOption(options, multiple, optional,
 
             group_index++;
           });
-        } else if (option.value === val) {
+        } else if (option.value === value) {
           selectedOption = option;
           singleSelectionIndex = optional ? index + 1 : index;
           return true;
@@ -201,14 +135,13 @@ var getSelectedOption = function getSelectedOption(options, multiple, optional,
 var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
   var _selectedOption$label;
 
-  var _ref$label = _ref.label,
-      label = _ref$label === void 0 ? "" : _ref$label,
+  var label = _ref.label,
       _ref$name = _ref.name,
       name = _ref$name === void 0 ? "" : _ref$name,
+      defaultValue = _ref.defaultValue,
       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,
@@ -221,8 +154,7 @@ var DxcSelect = /*#__PURE__*/_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,
@@ -234,9 +166,10 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
       selectId = _useState2[0];
 
   var selectLabelId = "label-".concat(selectId);
+  var errorId = "error-".concat(selectId);
   var optionsListId = "".concat(selectId, "-listbox");
 
-  var _useState3 = (0, _react.useState)(multiple ? [] : ""),
+  var _useState3 = (0, _react.useState)(defaultValue !== null && defaultValue !== void 0 ? defaultValue : multiple ? [] : ""),
       _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
       innerValue = _useState4[0],
       setInnerValue = _useState4[1];
@@ -260,7 +193,7 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
   var selectSearchInputRef = (0, _react.useRef)(null);
   var selectOptionsListRef = (0, _react.useRef)(null);
   var colorsTheme = (0, _useTheme["default"])();
-  var optionalEmptyOption = {
+  var optionalItem = {
     label: placeholder,
     value: ""
   };
@@ -269,11 +202,11 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
   }, [options, searchValue]);
   var lastOptionIndex = (0, _react.useMemo)(function () {
     return getLastOptionIndex(options, filteredOptions, searchable, optional, multiple);
-  }, [searchable, optional, multiple, filteredOptions, options]);
+  }, [options, filteredOptions, searchable, optional, multiple, filteredOptions]);
 
   var _useMemo = (0, _react.useMemo)(function () {
-    return getSelectedOption(options, multiple, optional, optionalEmptyOption, value, innerValue);
-  }, [options, multiple, optional, value, innerValue]),
+    return getSelectedOption(value !== null && value !== void 0 ? value : innerValue, options, multiple, optional, optionalItem);
+  }, [value, innerValue, options, multiple, optional, optionalItem]),
       selectedOption = _useMemo.selectedOption,
       singleSelectionIndex = _useMemo.singleSelectionIndex;
 
@@ -286,21 +219,7 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
   };
 
   var canBeOpenOptions = function canBeOpenOptions() {
-    return !disabled && (options === null || options === void 0 ? void 0 : options.length) > 0 && groupsHaveOptions();
-  };
-
-  var groupsHaveOptions = function groupsHaveOptions() {
-    return options[0].hasOwnProperty("options") ? options[0].options ? options.some(function (groupOption) {
-      return groupOption.options.length > 0;
-    }) : false : true;
-  };
-
-  var filteredGroupsHaveOptions = function filteredGroupsHaveOptions() {
-    return filteredOptions !== null && filteredOptions !== void 0 && filteredOptions[0].options ? filteredOptions.some(function (groupOption) {
-      var _groupOption$options;
-
-      return ((_groupOption$options = groupOption.options) === null || _groupOption$options === void 0 ? void 0 : _groupOption$options.length) > 0;
-    }) : true;
+    return !disabled && (options === null || options === void 0 ? void 0 : options.length) > 0 && groupsHaveOptions(options);
   };
 
   var openOptions = function openOptions() {
@@ -409,7 +328,7 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
 
           if (searchable) {
             if (filteredOptions.length > 0) {
-              if (optional && !multiple && visualFocusIndex === 0 && filteredGroupsHaveOptions()) handleSelectChangeValue(optionalEmptyOption);else filteredOptions[0].options ? filteredGroupsHaveOptions() && filteredOptions.some(function (groupOption) {
+              if (optional && !multiple && visualFocusIndex === 0 && filteredGroupsHaveOptions(filteredOptions)) handleSelectChangeValue(optionalItem);else filteredOptions[0].options ? filteredGroupsHaveOptions(filteredOptions) && filteredOptions.some(function (groupOption) {
                 var groupLength = accLength + groupOption.options.length;
                 groupLength > visualFocusIndex && handleSelectChangeValue(groupOption.options[visualFocusIndex - accLength]);
                 accLength = groupLength;
@@ -417,7 +336,7 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
               }) : handleSelectChangeValue(filteredOptions[visualFocusIndex - accLength]);
             }
           } else {
-            if (optional && !multiple && visualFocusIndex === 0) handleSelectChangeValue(optionalEmptyOption);else options[0].options ? options.some(function (groupOption) {
+            if (optional && !multiple && visualFocusIndex === 0) handleSelectChangeValue(optionalItem);else options[0].options ? options.some(function (groupOption) {
               var groupLength = accLength + groupOption.options.length;
               groupLength > visualFocusIndex && handleSelectChangeValue(groupOption.options[visualFocusIndex - accLength]);
               accLength = groupLength;
@@ -453,6 +372,11 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     setSearchValue("");
   };
 
+  var handleOptionOnClick = (0, _react.useCallback)(function (option) {
+    handleSelectChangeValue(option);
+    !multiple && closeOptions();
+    setSearchValue("");
+  }, [handleSelectChangeValue, closeOptions, multiple]);
   (0, _react.useLayoutEffect)(function () {
     if (isOpen && singleSelectionIndex) {
       var _listEl$scrollTo;
@@ -473,47 +397,6 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
       inline: "start"
     });
   }, [visualFocusIndex]);
-
-  var Option = function Option(_ref2) {
-    var option = _ref2.option,
-        index = _ref2.index,
-        _ref2$isGroupedOption = _ref2.isGroupedOption,
-        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 /*#__PURE__*/_react["default"].createElement(OptionItem, {
-      id: "option-".concat(index),
-      onClick: function onClick() {
-        handleSelectChangeValue(option);
-        !multiple && closeOptions();
-        setSearchValue("");
-      },
-      visualFocused: visualFocusIndex === index,
-      selected: isSelected,
-      role: "option",
-      "aria-selected": isSelected
-    }, /*#__PURE__*/_react["default"].createElement(StyledOption, {
-      visualFocused: visualFocusIndex === index,
-      selected: isSelected,
-      last: isLastOption,
-      grouped: isGroupedOption,
-      multiple: multiple
-    }, multiple && /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
-      tabIndex: -1,
-      checked: isSelected
-    }), 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), /*#__PURE__*/_react["default"].createElement(OptionContent, {
-      grouped: isGroupedOption,
-      hasIcon: option.icon,
-      multiple: multiple
-    }, /*#__PURE__*/_react["default"].createElement(OptionLabel, null, option.label), !multiple && isSelected && /*#__PURE__*/_react["default"].createElement(OptionSelectedIndicator, null, selectIcons.selected))));
-  };
-
   var globalIndex = optional && !multiple ? 0 : -1; // index for options, starting from 0 to options.length -1
 
   var mapOptionFunc = function mapOptionFunc(option, mapIndex) {
@@ -527,18 +410,29 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
         id: groupId
       }, option.label), option.options.map(function (singleOption) {
         globalIndex++;
-        return /*#__PURE__*/_react["default"].createElement(Option, {
+        return /*#__PURE__*/_react["default"].createElement(_Option["default"], {
+          id: "option-".concat(globalIndex),
           option: singleOption,
-          index: globalIndex,
-          isGroupedOption: true
+          onClick: handleOptionOnClick,
+          multiple: multiple,
+          visualFocused: visualFocusIndex === globalIndex,
+          isGroupedOption: true,
+          isLastOption: lastOptionIndex === globalIndex,
+          isSelected: multiple ? (value !== null && value !== void 0 ? value : innerValue).includes(singleOption.value) : (value !== null && value !== void 0 ? value : innerValue) === singleOption.value
         });
       })));
     } else {
       globalIndex++;
-      return /*#__PURE__*/_react["default"].createElement(Option, {
+      return /*#__PURE__*/_react["default"].createElement(_Option["default"], {
         key: "option-".concat(option.value),
+        id: "option-".concat(globalIndex),
         option: option,
-        index: globalIndex
+        onClick: handleOptionOnClick,
+        multiple: multiple,
+        visualFocused: visualFocusIndex === globalIndex,
+        isGroupedOption: false,
+        isLastOption: lastOptionIndex === globalIndex,
+        isSelected: multiple ? (value !== null && value !== void 0 ? value : innerValue).includes(option.value) : (value !== null && value !== void 0 ? value : innerValue) === option.value
       });
     }
   };
@@ -549,13 +443,14 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     margin: margin,
     size: size,
     ref: ref
-  }, /*#__PURE__*/_react["default"].createElement(Label, {
+  }, label && /*#__PURE__*/_react["default"].createElement(Label, {
     id: selectLabelId,
     disabled: disabled,
     onClick: function onClick() {
       selectContainerRef.current.focus();
-    }
-  }, label, " ", optional && /*#__PURE__*/_react["default"].createElement(OptionalLabel, null, "(Optional)")), /*#__PURE__*/_react["default"].createElement(HelperText, {
+    },
+    helperText: helperText
+  }, label, " ", optional && /*#__PURE__*/_react["default"].createElement(OptionalLabel, null, "(Optional)")), helperText && /*#__PURE__*/_react["default"].createElement(HelperText, {
     disabled: disabled
   }, helperText), /*#__PURE__*/_react["default"].createElement(Select, {
     id: selectId,
@@ -569,12 +464,14 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     tabIndex: tabIndex,
     role: "combobox",
     "aria-controls": optionsListId,
+    "aria-disabled": disabled,
     "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
+    "aria-errormessage": error ? errorId : undefined,
+    "aria-required": !disabled && !optional
   }, multiple && selectedOption.length > 0 && /*#__PURE__*/_react["default"].createElement(SelectionIndicator, null, /*#__PURE__*/_react["default"].createElement(SelectionNumber, {
     disabled: disabled
   }, selectedOption.length), /*#__PURE__*/_react["default"].createElement(ClearOptionsAction, {
@@ -585,11 +482,11 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     },
     onClick: handleClearOptionsActionOnClick,
     tabIndex: -1,
-    title: "Clear selected options",
-    "aria-label": "Clear selected options"
-  }, selectIcons.clear)), /*#__PURE__*/_react["default"].createElement(SearchableValueContainer, null, /*#__PURE__*/_react["default"].createElement(ValueInput, {
+    title: "Clear selection",
+    "aria-label": "Clear selection"
+  }, _Icons["default"].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,
+    value: multiple ? (value !== null && value !== void 0 ? value : innerValue).join(",") : value !== null && value !== void 0 ? value : innerValue,
     readOnly: true,
     "aria-hidden": "true"
   }), searchable && /*#__PURE__*/_react["default"].createElement(SearchInput, {
@@ -597,8 +494,8 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     disabled: disabled,
     onChange: handleSearchIOnChange,
     ref: selectSearchInputRef,
-    autoComplete: "off",
-    autoCorrect: "off",
+    autoComplete: "nope",
+    autoCorrect: "nope",
     size: "1"
   }), (!searchable || searchValue === "") && (multiple ? /*#__PURE__*/_react["default"].createElement(SelectedOption, {
     disabled: disabled,
@@ -608,18 +505,18 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
   }).join(", ")), selectedOption.length === 0 && placeholder) : /*#__PURE__*/_react["default"].createElement(SelectedOption, {
     disabled: disabled,
     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, {
+  }, /*#__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, _Icons["default"].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), /*#__PURE__*/_react["default"].createElement(CollapseIndicator, {
+    title: "Clear search",
+    "aria-label": "Clear search"
+  }, _Icons["default"].clear), /*#__PURE__*/_react["default"].createElement(CollapseIndicator, {
     disabled: disabled
-  }, isOpen ? selectIcons.arrowUp : selectIcons.arrowDown), isOpen && /*#__PURE__*/_react["default"].createElement(OptionsList, {
+  }, isOpen ? _Icons["default"].arrowUp : _Icons["default"].arrowDown), isOpen && /*#__PURE__*/_react["default"].createElement(OptionsList, {
     id: optionsListId,
     onClick: function onClick(event) {
       event.stopPropagation();
@@ -629,11 +526,21 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     },
     ref: selectOptionsListRef,
     role: "listbox",
-    "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 && /*#__PURE__*/_react["default"].createElement(Error, null, error)));
+    "aria-multiselectable": multiple,
+    "aria-orientation": "vertical"
+  }, searchable && (filteredOptions.length === 0 || !filteredGroupsHaveOptions(filteredOptions)) ? /*#__PURE__*/_react["default"].createElement(OptionsSystemMessage, null, /*#__PURE__*/_react["default"].createElement(NoMatchesFoundIcon, null, _Icons["default"].searchOff), "No matches found") : optional && !multiple && /*#__PURE__*/_react["default"].createElement(_Option["default"], {
+    id: "option-".concat(0),
+    option: optionalItem,
+    onClick: handleOptionOnClick,
+    multiple: multiple,
+    visualFocused: visualFocusIndex === 0,
+    isGroupedOption: false,
+    isLastOption: lastOptionIndex === 0,
+    isSelected: multiple ? (value !== null && value !== void 0 ? value : innerValue).includes(optionalItem.value) : (value !== null && value !== void 0 ? value : innerValue) === optionalItem.value
+  }), searchable ? filteredOptions.map(mapOptionFunc) : options.map(mapOptionFunc))), !disabled && typeof error === "string" && /*#__PURE__*/_react["default"].createElement(Error, {
+    id: errorId,
+    "aria-live": error ? "assertive" : "off"
+  }, error)));
 });
 
 var sizes = {
@@ -661,7 +568,7 @@ var SelectContainer = _styledComponents["default"].div(_templateObject || (_temp
   return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.left ? _variables.spaces[props.margin.left] : "";
 });
 
-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"])), 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;
@@ -673,13 +580,15 @@ var Label = _styledComponents["default"].span(_templateObject2 || (_templateObje
   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 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  font-weight: ", ";\n"])), function (props) {
   return props.theme.optionalLabelFontWeight;
 });
 
-var HelperText = _styledComponents["default"].span(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: ", ";\n"])), 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;
@@ -693,9 +602,7 @@ var HelperText = _styledComponents["default"].span(_templateObject4 || (_templat
   return props.theme.helperTextLineHeight;
 });
 
-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  margin: ", ";\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 "".concat(props.theme.inputMarginTop, " 0 ").concat(props.theme.inputMarginBottom, " 0");
-}, 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;
@@ -773,7 +680,7 @@ var ErrorIcon = _styledComponents["default"].span(_templateObject13 || (_templat
   return props.theme.errorIconColor;
 });
 
-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"])), function (props) {
+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;
@@ -827,39 +734,7 @@ var GroupLabel = _styledComponents["default"].li(_templateObject21 || (_template
   return props.theme.listGroupLabelFontWeight;
 });
 
-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.selectedListOptionBackgroundColor);
-}, function (props) {
-  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.selectedActiveListOptionBackgroundColor, ";") : "background-color: ".concat(props.theme.unselectedActiveListOptionBackgroundColor, ";");
-});
-
-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.listOptionDividerColor);
-});
-
-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(_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(_templateObject26 || (_templateObject26 = (0, _taggedTemplateLiteral2["default"])(["\n  width: 16px;\n  height: 16px;\n"])));
-
-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(_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 OptionLabel = _styledComponents["default"].span(_templateObject22 || (_templateObject22 = (0, _taggedTemplateLiteral2["default"])(["\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n"])));
 
 var _default = DxcSelect;
 exports["default"] = _default;