@dxc-technology/halstack-react 0.0.0-59b9187 → 0.0.0-5a4d834

package/select/Select.js

@@ -15,122 +15,15 @@ var _styledComponents = _interopRequireWildcard(require("styled-components"));
 var _useTheme = _interopRequireDefault(require("../useTheme"));
 var _useTranslatedLabels = _interopRequireDefault(require("../useTranslatedLabels"));
 var _variables = require("../common/variables");
-var _uuid = require("uuid");
 var _utils = require("../common/utils");
 var _Listbox = _interopRequireDefault(require("./Listbox"));
 var Popover = _interopRequireWildcard(require("@radix-ui/react-popover"));
 var _Icon = _interopRequireDefault(require("../icon/Icon"));
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17;
+var _useWidth = _interopRequireDefault(require("../utils/useWidth"));
+var _selectUtils = require("./selectUtils");
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16;
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof3(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
-var isOptionGroup = function isOptionGroup(option) {
-  return "options" in option && option.options != null;
-};
-var isArrayOfOptionGroups = function isArrayOfOptionGroups(options) {
-  return isOptionGroup(options[0]);
-};
-var groupsHaveOptions = function groupsHaveOptions(filteredOptions) {
-  return isArrayOfOptionGroups(filteredOptions) ? 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 canOpenOptions = function canOpenOptions(options, disabled) {
-  return !disabled && (options === null || options === void 0 ? void 0 : options.length) > 0 && groupsHaveOptions(options);
-};
-var filterOptionsBySearchValue = function filterOptionsBySearchValue(options, searchValue) {
-  if ((options === null || options === void 0 ? void 0 : options.length) > 0) {
-    if (isArrayOfOptionGroups(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 getLastOptionIndex = function getLastOptionIndex(options, filteredOptions, searchable, optional, multiple) {
-  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 === null || filteredOptions === void 0 ? void 0 : filteredOptions.length) > 0) isArrayOfOptionGroups(filteredOptions) ? last = filteredOptions.reduce(reducer, 0) - 1 : last = filteredOptions.length - 1;else if ((options === null || options === void 0 ? void 0 : options.length) > 0) isArrayOfOptionGroups(options) ? last = options.reduce(reducer, 0) - 1 : last = options.length - 1;
-  return optional && !multiple ? last + 1 : last;
-};
-var getSelectedOption = function getSelectedOption(value, options, multiple, optional, optionalItem) {
-  var selectedOption = multiple ? [] : {};
-  var singleSelectionIndex;
-  if (multiple) {
-    if ((options === null || options === void 0 ? void 0 : options.length) > 0) {
-      options.forEach(function (option) {
-        if (isOptionGroup(option)) option.options.forEach(function (singleOption) {
-          if (value.includes(singleOption.value) && Array.isArray(selectedOption)) selectedOption.push(singleOption);
-        });else if (value.includes(option.value) && Array.isArray(selectedOption)) selectedOption.push(option);
-      });
-    }
-  } else {
-    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 (isOptionGroup(option)) {
-          option.options.some(function (singleOption) {
-            if (singleOption.value === value) {
-              selectedOption = singleOption;
-              singleSelectionIndex = optional ? group_index + 1 : group_index;
-              return true;
-            }
-            group_index++;
-          });
-        } else if (option.value === value) {
-          selectedOption = option;
-          singleSelectionIndex = optional ? index + 1 : index;
-          return true;
-        }
-      });
-    }
-  }
-  return {
-    selectedOption: selectedOption,
-    singleSelectionIndex: singleSelectionIndex
-  };
-};
-var getSelectedOptionLabel = function getSelectedOptionLabel(placeholder, selectedOption) {
-  var _selectedOption$label;
-  if (Array.isArray(selectedOption)) return selectedOption.length === 0 ? placeholder : selectedOption.map(function (option) {
-    return option.label;
-  }).join(", ");else return (_selectedOption$label = selectedOption === null || selectedOption === void 0 ? void 0 : selectedOption.label) !== null && _selectedOption$label !== void 0 ? _selectedOption$label : placeholder;
-};
-var notOptionalCheck = function notOptionalCheck(value, multiple, optional) {
-  return !optional && (multiple ? value.length === 0 : value === "");
-};
-var useWidth = function useWidth(target) {
-  var _useState = (0, _react.useState)(0),
-    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-    width = _useState2[0],
-    setWidth = _useState2[1];
-  (0, _react.useEffect)(function () {
-    if (target != null) {
-      setWidth(target.getBoundingClientRect().width);
-      var triggerObserver = new ResizeObserver(function (entries) {
-        var rect = entries[0].target.getBoundingClientRect();
-        setWidth(rect === null || rect === void 0 ? void 0 : rect.width);
-      });
-      triggerObserver.observe(target);
-      return function () {
-        triggerObserver.unobserve(target);
-      };
-    }
-  }, [target]);
-  return width;
-};
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof3(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
   var _ref4;
   var label = _ref.label,
@@ -144,12 +37,12 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     placeholder = _ref$placeholder === void 0 ? "" : _ref$placeholder,
     _ref$disabled = _ref.disabled,
     disabled = _ref$disabled === void 0 ? false : _ref$disabled,
+    _ref$multiple = _ref.multiple,
+    multiple = _ref$multiple === void 0 ? false : _ref$multiple,
     _ref$optional = _ref.optional,
     optional = _ref$optional === void 0 ? false : _ref$optional,
     _ref$searchable = _ref.searchable,
     searchable = _ref$searchable === void 0 ? false : _ref$searchable,
-    _ref$multiple = _ref.multiple,
-    multiple = _ref$multiple === void 0 ? false : _ref$multiple,
     onChange = _ref.onChange,
     onBlur = _ref.onBlur,
     error = _ref.error,
@@ -158,32 +51,30 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     size = _ref$size === void 0 ? "medium" : _ref$size,
     _ref$tabIndex = _ref.tabIndex,
     tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex;
-  var _useState3 = (0, _react.useState)("select-".concat((0, _uuid.v4)())),
-    _useState4 = (0, _slicedToArray2["default"])(_useState3, 1),
-    selectId = _useState4[0];
+  var selectId = "select-".concat((0, _react.useId)());
   var selectLabelId = "label-".concat(selectId);
   var errorId = "error-".concat(selectId);
-  var optionsListId = "".concat(selectId, "-listbox");
-  var _useState5 = (0, _react.useState)(defaultValue !== null && defaultValue !== void 0 ? defaultValue : multiple ? [] : ""),
+  var listboxId = "".concat(selectId, "-listbox");
+  var _useState = (0, _react.useState)(defaultValue !== null && defaultValue !== void 0 ? defaultValue : multiple ? [] : ""),
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    innerValue = _useState2[0],
+    setInnerValue = _useState2[1];
+  var _useState3 = (0, _react.useState)(""),
+    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
+    searchValue = _useState4[0],
+    setSearchValue = _useState4[1];
+  var _useState5 = (0, _react.useState)(-1),
     _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
-    innerValue = _useState6[0],
-    setInnerValue = _useState6[1];
-  var _useState7 = (0, _react.useState)(""),
+    visualFocusIndex = _useState6[0],
+    changeVisualFocusIndex = _useState6[1];
+  var _useState7 = (0, _react.useState)(false),
     _useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
-    searchValue = _useState8[0],
-    setSearchValue = _useState8[1];
-  var _useState9 = (0, _react.useState)(-1),
-    _useState10 = (0, _slicedToArray2["default"])(_useState9, 2),
-    visualFocusIndex = _useState10[0],
-    changeVisualFocusIndex = _useState10[1];
-  var _useState11 = (0, _react.useState)(false),
-    _useState12 = (0, _slicedToArray2["default"])(_useState11, 2),
-    isOpen = _useState12[0],
-    changeIsOpen = _useState12[1];
+    isOpen = _useState8[0],
+    changeIsOpen = _useState8[1];
   var selectRef = (0, _react.useRef)(null);
   var selectSearchInputRef = (0, _react.useRef)(null);
   var selectedOptionLabelRef = (0, _react.useRef)(null);
-  var width = useWidth(selectRef.current);
+  var width = (0, _useWidth["default"])(selectRef.current);
   var colorsTheme = (0, _useTheme["default"])();
   var translatedLabels = (0, _useTranslatedLabels["default"])();
   var optionalItem = {
@@ -191,20 +82,20 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     value: ""
   };
   var filteredOptions = (0, _react.useMemo)(function () {
-    return filterOptionsBySearchValue(options, searchValue);
+    return (0, _selectUtils.filterOptionsBySearchValue)(options, searchValue);
   }, [options, searchValue]);
   var lastOptionIndex = (0, _react.useMemo)(function () {
-    return getLastOptionIndex(options, filteredOptions, searchable, optional, multiple);
+    return (0, _selectUtils.getLastOptionIndex)(options, filteredOptions, searchable, optional, multiple);
   }, [options, filteredOptions, searchable, optional, multiple]);
   var _useMemo = (0, _react.useMemo)(function () {
-      return getSelectedOption(value !== null && value !== void 0 ? value : innerValue, options, multiple, optional, optionalItem);
+      return (0, _selectUtils.getSelectedOption)(value !== null && value !== void 0 ? value : innerValue, options, multiple, optional, optionalItem);
     }, [value, innerValue, options, multiple, optional, optionalItem]),
     selectedOption = _useMemo.selectedOption,
     singleSelectionIndex = _useMemo.singleSelectionIndex;
-  var openOptions = function openOptions() {
-    if (!isOpen && canOpenOptions(options, disabled)) changeIsOpen(true);
+  var openListbox = function openListbox() {
+    if (!isOpen && (0, _selectUtils.canOpenOptions)(options, disabled)) changeIsOpen(true);
   };
-  var closeOptions = function closeOptions() {
+  var closeListbox = function closeListbox() {
     if (isOpen) {
       changeIsOpen(false);
       changeVisualFocusIndex(-1);
@@ -219,7 +110,7 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
       });else newValue = [].concat((0, _toConsumableArray2["default"])((_ref3 = value && Array.isArray(value) && value) !== null && _ref3 !== void 0 ? _ref3 : innerValue && Array.isArray(innerValue) && innerValue), [newOption.value]);
     } else newValue = newOption.value;
     value !== null && value !== void 0 ? value : setInnerValue(newValue);
-    notOptionalCheck(newValue, multiple, optional) ? onChange === null || onChange === void 0 ? void 0 : onChange({
+    (0, _selectUtils.notOptionalCheck)(newValue, multiple, optional) ? onChange === null || onChange === void 0 ? void 0 : onChange({
       value: newValue,
       error: translatedLabels.formFields.requiredValueErrorMessage
     }) : onChange === null || onChange === void 0 ? void 0 : onChange({
@@ -229,20 +120,19 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
   var handleSelectOnClick = function handleSelectOnClick() {
     searchable && selectSearchInputRef.current.focus();
     if (isOpen) {
-      closeOptions();
+      closeListbox();
       setSearchValue("");
-    } else openOptions();
+    } else openListbox();
   };
   var handleSelectOnFocus = function handleSelectOnFocus(event) {
     if (!event.currentTarget.contains(event.relatedTarget)) searchable && selectSearchInputRef.current.focus();
   };
   var handleSelectOnBlur = function handleSelectOnBlur(event) {
-    // focus leaves container (outside, not to a child)
     if (!event.currentTarget.contains(event.relatedTarget)) {
-      closeOptions();
+      closeListbox();
       setSearchValue("");
       var currentValue = value !== null && value !== void 0 ? value : innerValue;
-      notOptionalCheck(currentValue, multiple, optional) ? onBlur === null || onBlur === void 0 ? void 0 : onBlur({
+      (0, _selectUtils.notOptionalCheck)(currentValue, multiple, optional) ? onBlur === null || onBlur === void 0 ? void 0 : onBlur({
         value: currentValue,
         error: translatedLabels.formFields.requiredValueErrorMessage
       }) : onBlur === null || onBlur === void 0 ? void 0 : onBlur({
@@ -258,7 +148,7 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
         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();
+        openListbox();
         break;
       case "Up":
       case "ArrowUp":
@@ -266,12 +156,13 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
         singleSelectionIndex !== undefined && (!isOpen || visualFocusIndex === -1 && singleSelectionIndex > -1 && singleSelectionIndex <= lastOptionIndex) ? changeVisualFocusIndex(singleSelectionIndex) : changeVisualFocusIndex(function (visualFocusIndex) {
           return visualFocusIndex === 0 || visualFocusIndex === -1 ? lastOptionIndex : visualFocusIndex - 1;
         });
-        openOptions();
+        openListbox();
         break;
       case "Esc":
       case "Escape":
         event.preventDefault();
-        closeOptions();
+        isOpen && event.stopPropagation();
+        closeListbox();
         setSearchValue("");
         break;
       case "Enter":
@@ -279,7 +170,7 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
           var accLength = optional && !multiple ? 1 : 0;
           if (searchable) {
             if (filteredOptions.length > 0) {
-              if (optional && !multiple && visualFocusIndex === 0 && groupsHaveOptions(filteredOptions)) handleSelectChangeValue(optionalItem);else isArrayOfOptionGroups(filteredOptions) ? groupsHaveOptions(filteredOptions) && filteredOptions.some(function (groupOption) {
+              if (optional && !multiple && visualFocusIndex === 0 && (0, _selectUtils.groupsHaveOptions)(filteredOptions)) handleSelectChangeValue(optionalItem);else (0, _selectUtils.isArrayOfOptionGroups)(filteredOptions) ? (0, _selectUtils.groupsHaveOptions)(filteredOptions) && filteredOptions.some(function (groupOption) {
                 var groupLength = accLength + groupOption.options.length;
                 groupLength > visualFocusIndex && handleSelectChangeValue(groupOption.options[visualFocusIndex - accLength]);
                 accLength = groupLength;
@@ -287,14 +178,14 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
               }) : handleSelectChangeValue(filteredOptions[visualFocusIndex - accLength]);
             }
           } else {
-            if (optional && !multiple && visualFocusIndex === 0) handleSelectChangeValue(optionalItem);else isArrayOfOptionGroups(options) ? options.some(function (groupOption) {
+            if (optional && !multiple && visualFocusIndex === 0) handleSelectChangeValue(optionalItem);else (0, _selectUtils.isArrayOfOptionGroups)(options) ? options.some(function (groupOption) {
               var groupLength = accLength + groupOption.options.length;
               groupLength > visualFocusIndex && handleSelectChangeValue(groupOption.options[visualFocusIndex - accLength]);
               accLength = groupLength;
               return groupLength > visualFocusIndex;
             }) : handleSelectChangeValue(options[visualFocusIndex - accLength]);
           }
-          !multiple && closeOptions();
+          !multiple && closeListbox();
           setSearchValue("");
         }
         break;
@@ -303,7 +194,7 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
   var handleSearchIOnChange = function handleSearchIOnChange(event) {
     setSearchValue(event.target.value);
     changeVisualFocusIndex(-1);
-    openOptions();
+    openListbox();
   };
   var handleClearOptionsActionOnClick = function handleClearOptionsActionOnClick(event) {
     event.stopPropagation();
@@ -321,12 +212,12 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
   };
   var handleOptionOnClick = (0, _react.useCallback)(function (option) {
     handleSelectChangeValue(option);
-    !multiple && closeOptions();
+    !multiple && closeListbox();
     setSearchValue("");
-  }, [handleSelectChangeValue, closeOptions, multiple]);
-  (0, _react.useEffect)(function () {
+  }, [handleSelectChangeValue, closeListbox, multiple]);
+  (0, _react.useLayoutEffect)(function () {
     if ((selectedOptionLabelRef === null || selectedOptionLabelRef === void 0 ? void 0 : selectedOptionLabelRef.current) != null) {
-      if ((selectedOptionLabelRef === null || selectedOptionLabelRef === void 0 ? void 0 : selectedOptionLabelRef.current.scrollWidth) > (selectedOptionLabelRef === null || selectedOptionLabelRef === void 0 ? void 0 : selectedOptionLabelRef.current.clientWidth)) selectedOptionLabelRef.current.title = getSelectedOptionLabel(placeholder, selectedOption);else selectedOptionLabelRef.current.title = "";
+      if ((selectedOptionLabelRef === null || selectedOptionLabelRef === void 0 ? void 0 : selectedOptionLabelRef.current.scrollWidth) > (selectedOptionLabelRef === null || selectedOptionLabelRef === void 0 ? void 0 : selectedOptionLabelRef.current.clientWidth)) selectedOptionLabelRef.current.title = (0, _selectUtils.getSelectedOptionLabel)(placeholder, selectedOption);else selectedOptionLabelRef.current.title = "";
     }
   }, [placeholder, selectedOption]);
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
@@ -360,7 +251,7 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     ref: selectRef,
     tabIndex: disabled ? -1 : tabIndex,
     role: "combobox",
-    "aria-controls": optionsListId,
+    "aria-controls": listboxId,
     "aria-disabled": disabled,
     "aria-expanded": isOpen,
     "aria-haspopup": "listbox",
@@ -382,8 +273,11 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     title: translatedLabels.select.actionClearSelectionTitle,
     "aria-label": translatedLabels.select.actionClearSelectionTitle
   }, /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
-    icon: "clear"
-  }))), /*#__PURE__*/_react["default"].createElement(SearchableValueContainer, null, /*#__PURE__*/_react["default"].createElement(ValueInput, {
+    icon: "close"
+  }))), /*#__PURE__*/_react["default"].createElement(SearchableValueContainer, null, /*#__PURE__*/_react["default"].createElement("input", {
+    style: {
+      display: "none"
+    },
     name: name,
     disabled: disabled,
     value: multiple ? ((_ref4 = value && Array.isArray(value) && value) !== null && _ref4 !== void 0 ? _ref4 : innerValue && Array.isArray(innerValue) && innerValue).join(",") : value !== null && value !== void 0 ? value : innerValue,
@@ -396,13 +290,14 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     ref: selectSearchInputRef,
     autoComplete: "nope",
     autoCorrect: "nope",
-    size: 1
+    size: 1,
+    "aria-labelledby": label ? selectLabelId : undefined
   }), (!searchable || searchValue === "") && /*#__PURE__*/_react["default"].createElement(SelectedOption, {
     disabled: disabled,
     atBackground: (multiple ? (value !== null && value !== void 0 ? value : innerValue).length === 0 : !(value !== null && value !== void 0 ? value : innerValue)) || searchable && isOpen
   }, /*#__PURE__*/_react["default"].createElement(SelectedOptionLabel, {
     ref: selectedOptionLabelRef
-  }, getSelectedOptionLabel(placeholder, selectedOption)))), !disabled && error && /*#__PURE__*/_react["default"].createElement(ErrorIcon, null, /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
+  }, (0, _selectUtils.getSelectedOptionLabel)(placeholder, selectedOption)))), !disabled && error && /*#__PURE__*/_react["default"].createElement(ErrorIcon, null, /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
     icon: "filled_error"
   })), searchable && searchValue.length > 0 && /*#__PURE__*/_react["default"].createElement(ClearSearchAction, {
     onMouseDown: function onMouseDown(event) {
@@ -433,7 +328,7 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
       event.preventDefault();
     }
   }, /*#__PURE__*/_react["default"].createElement(_Listbox["default"], {
-    id: optionsListId,
+    id: listboxId,
     currentValue: value !== null && value !== void 0 ? value : innerValue,
     options: searchable ? filteredOptions : options,
     visualFocusIndex: visualFocusIndex,
@@ -448,6 +343,7 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     }
   })))), !disabled && typeof error === "string" && /*#__PURE__*/_react["default"].createElement(Error, {
     id: errorId,
+    role: "alert",
     "aria-live": error ? "assertive" : "off"
   }, error)));
 });
@@ -460,8 +356,10 @@ var sizes = {
 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 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) {
+var SelectContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\n  display: flex;\n  flex-direction: column;\n  width: ", ";\n  ", ";\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  font-family: ", ";\n"])), function (props) {
   return calculateWidth(props.margin, props.size);
+}, function (props) {
+  return props.size !== "fillParent" && "min-width:" + calculateWidth(props.margin, props.size);
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) !== "object" ? _variables.spaces[props.margin] : "0px";
 }, function (props) {
@@ -472,11 +370,11 @@ var SelectContainer = _styledComponents["default"].div(_templateObject || (_temp
   return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.bottom ? _variables.spaces[props.margin.bottom] : "";
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.left ? _variables.spaces[props.margin.left] : "";
-});
-var Label = _styledComponents["default"].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;
+});
+var Label = _styledComponents["default"].label(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: ", ";\n  cursor: default;\n  ", "\n"])), function (props) {
+  return props.disabled ? props.theme.disabledColor : props.theme.labelFontColor;
 }, function (props) {
   return props.theme.labelFontSize;
 }, function (props) {
@@ -491,10 +389,8 @@ var Label = _styledComponents["default"].span(_templateObject2 || (_templateObje
 var OptionalLabel = _styledComponents["default"].span(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  font-weight: ", ";\n"])), function (props) {
   return props.theme.optionalLabelFontWeight;
 });
-var HelperText = _styledComponents["default"].span(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: ", ";\n  margin-bottom: 0.25rem;\n"])), function (props) {
+var HelperText = _styledComponents["default"].span(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: ", ";\n  margin-bottom: 0.25rem;\n"])), function (props) {
   return props.disabled ? props.theme.disabledColor : props.theme.helperTextFontColor;
-}, function (props) {
-  return props.theme.fontFamily;
 }, function (props) {
   return props.theme.helperTextFontSize;
 }, function (props) {
@@ -515,17 +411,15 @@ var Select = _styledComponents["default"].div(_templateObject5 || (_templateObje
 }, function (props) {
   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 || (_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) {
+var SelectionIndicator = _styledComponents["default"].div(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\n  display: grid;\n  grid-template-columns: 1fr 1fr;\n  min-width: 48px;\n  min-height: 24px;\n  border-radius: 2px;\n  border: 1px solid ", ";\n"])), function (props) {
   return props.theme.selectionIndicatorBorderColor;
 });
-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) {
+var SelectionNumber = _styledComponents["default"].span(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  display: grid;\n  place-items: center;\n  border-right: 1px solid ", ";\n  user-select: none;\n  ", ";\n  color: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  ", "\n"])), function (props) {
   return props.theme.selectionIndicatorBorderColor;
 }, function (props) {
-  return props.disabled ? props.theme.disabledColor : props.theme.selectionIndicatorFontColor;
+  return !props.disabled && "background-color: ".concat(props.theme.selectionIndicatorBackgroundColor);
 }, function (props) {
-  return props.theme.fontFamily;
+  return props.disabled ? props.theme.disabledColor : props.theme.selectionIndicatorFontColor;
 }, function (props) {
   return props.theme.selectionIndicatorFontSize;
 }, function (props) {
@@ -535,7 +429,7 @@ var SelectionNumber = _styledComponents["default"].span(_templateObject7 || (_te
 }, function (props) {
   return props.disabled ? "cursor: not-allowed;" : "cursor: default;";
 });
-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  border: none;\n  padding: 0.25rem;\n  ", "\n  background-color: ", ";\n  color: ", ";\n\n  :focus-visible {\n    outline: none;\n  }\n  ", "\n\n  font-size:16px;\n"])), function (props) {
+var ClearOptionsAction = _styledComponents["default"].button(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2["default"])(["\n  display: grid;\n  place-items: center;\n  border: none;\n  padding: 0;\n  ", "\n  background-color: ", ";\n  color: ", ";\n  font-size: 16px;\n\n  :focus-visible {\n    outline: none;\n  }\n  ", "\n"])), function (props) {
   return props.disabled ? "cursor: not-allowed;" : "cursor: pointer;";
 }, function (props) {
   return props.disabled ? "transparent" : props.theme.enabledSelectionIndicatorActionBackgroundColor;
@@ -545,10 +439,8 @@ var ClearOptionsAction = _styledComponents["default"].button(_templateObject8 ||
   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 || (_templateObject9 = (0, _taggedTemplateLiteral2["default"])(["\n  display: grid;\n  width: 100%;\n"])));
-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) {
+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  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;
 }, function (props) {
   return props.theme.valueFontSize;
 }, function (props) {
@@ -557,11 +449,8 @@ var SelectedOption = _styledComponents["default"].span(_templateObject10 || (_te
   return props.theme.valueFontWeight;
 });
 var SelectedOptionLabel = _styledComponents["default"].span(_templateObject11 || (_templateObject11 = (0, _taggedTemplateLiteral2["default"])(["\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n"])));
-var ValueInput = _styledComponents["default"].input(_templateObject12 || (_templateObject12 = (0, _taggedTemplateLiteral2["default"])(["\n  display: none;\n"])));
-var SearchInput = _styledComponents["default"].input(_templateObject13 || (_templateObject13 = (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) {
+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-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;
 }, function (props) {
   return props.theme.valueFontSize;
 }, function (props) {
@@ -569,20 +458,16 @@ var SearchInput = _styledComponents["default"].input(_templateObject13 || (_temp
 }, function (props) {
   return props.theme.valueFontWeight;
 });
-var ErrorIcon = _styledComponents["default"].span(_templateObject14 || (_templateObject14 = (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  font-size: 1.25rem;\n"])), function (props) {
+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  color: ", ";\n  font-size: 1.25rem;\n"])), function (props) {
   return props.theme.errorIconColor;
 });
-var Error = _styledComponents["default"].span(_templateObject15 || (_templateObject15 = (0, _taggedTemplateLiteral2["default"])(["\n  min-height: 1.5em;\n  color: ", ";\n  font-family: ", ";\n  font-size: 0.75rem;\n  font-weight: 400;\n  line-height: 1.5em;\n  margin-top: 0.25rem;\n"])), function (props) {
+var Error = _styledComponents["default"].span(_templateObject14 || (_templateObject14 = (0, _taggedTemplateLiteral2["default"])(["\n  min-height: 1.5em;\n  color: ", ";\n  font-size: 0.75rem;\n  line-height: 1.5em;\n  margin-top: 0.25rem;\n"])), function (props) {
   return props.theme.errorMessageColor;
-}, function (props) {
-  return props.theme.fontFamily;
 });
-var CollapseIndicator = _styledComponents["default"].span(_templateObject16 || (_templateObject16 = (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) {
+var CollapseIndicator = _styledComponents["default"].span(_templateObject15 || (_templateObject15 = (0, _taggedTemplateLiteral2["default"])(["\n  display: grid;\n  place-items: center;\n  padding: 4px;\n  font-size: 16px;\n  margin-left: 0.25rem;\n  color: ", ";\n"])), function (props) {
   return props.disabled ? props.theme.disabledColor : props.theme.collapseIndicatorColor;
 });
-var ClearSearchAction = _styledComponents["default"].button(_templateObject17 || (_templateObject17 = (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  font-size: 16px;\n"])), function (props) {
-  return props.theme.fontFamily;
-}, function (props) {
+var ClearSearchAction = _styledComponents["default"].button(_templateObject16 || (_templateObject16 = (0, _taggedTemplateLiteral2["default"])(["\n  display: grid;\n  place-items: center;\n  min-height: 24px;\n  min-width: 24px;\n  margin-left: 0.25rem;\n  border: none;\n  border-radius: 2px;\n  padding: 0;\n  background-color: ", ";\n  color: ", ";\n  font-size: 1rem;\n  cursor: pointer;\n\n  &:hover {\n    background-color: ", ";\n    color: ", ";\n  }\n  &:active {\n    background-color: ", ";\n    color: ", ";\n  }\n"])), function (props) {
   return props.theme.actionBackgroundColor;
 }, function (props) {
   return props.theme.actionIconColor;