@dxc-technology/halstack-react 0.0.0-0271b6e → 0.0.0-0276e5a

package/select/Select.js

@@ -23,26 +23,26 @@ var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
 var _useTheme = _interopRequireDefault(require("../useTheme"));
 
-var _variables = require("../common/variables.js");
+var _useTranslatedLabels = _interopRequireDefault(require("../useTranslatedLabels"));
 
-var _uuid = require("uuid");
+var _variables = require("../common/variables");
 
-var _utils = require("../common/utils.js");
+var _uuid = require("uuid");
 
-var _Option = _interopRequireDefault(require("../select/Option"));
+var _utils = require("../common/utils");
 
 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;
+var _Listbox = _interopRequireDefault(require("./Listbox"));
+
+var Popover = _interopRequireWildcard(require("@radix-ui/react-popover"));
+
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17;
 
 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 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;
@@ -57,6 +57,10 @@ var filteredGroupsHaveOptions = function filteredGroupsHaveOptions(filteredOptio
   }) : 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 (options[0].options) return options.map(function (optionGroup) {
@@ -95,9 +99,9 @@ var getSelectedOption = function getSelectedOption(value, options, multiple, opt
       options.forEach(function (option) {
         if (option.options) {
           option.options.forEach(function (singleOption) {
-            if (value.includes(singleOption.value)) selectedOption.push(singleOption);
+            if (value.includes(singleOption.value) && Array.isArray(selectedOption)) selectedOption.push(singleOption);
           });
-        } else if (value.includes(option.value)) selectedOption.push(option);
+        } else if (value.includes(option.value) && Array.isArray(selectedOption)) selectedOption.push(option);
       });
     }
   } else {
@@ -132,8 +136,34 @@ var getSelectedOption = function getSelectedOption(value, options, multiple, opt
   };
 };
 
+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;
+};
+
 var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
-  var _selectedOption$label;
+  var _ref4, _selectedOption$label;
 
   var label = _ref.label,
       _ref$name = _ref.name,
@@ -161,38 +191,39 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
       _ref$tabIndex = _ref.tabIndex,
       tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex;
 
-  var _useState = (0, _react.useState)("select-".concat((0, _uuid.v4)())),
-      _useState2 = (0, _slicedToArray2["default"])(_useState, 1),
-      selectId = _useState2[0];
+  var _useState3 = (0, _react.useState)("select-".concat((0, _uuid.v4)())),
+      _useState4 = (0, _slicedToArray2["default"])(_useState3, 1),
+      selectId = _useState4[0];
 
   var selectLabelId = "label-".concat(selectId);
   var errorId = "error-".concat(selectId);
   var optionsListId = "".concat(selectId, "-listbox");
 
-  var _useState3 = (0, _react.useState)(defaultValue !== null && defaultValue !== void 0 ? defaultValue : multiple ? [] : ""),
-      _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
-      innerValue = _useState4[0],
-      setInnerValue = _useState4[1];
-
-  var _useState5 = (0, _react.useState)(""),
+  var _useState5 = (0, _react.useState)(defaultValue !== null && defaultValue !== void 0 ? defaultValue : multiple ? [] : ""),
       _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
-      searchValue = _useState6[0],
-      setSearchValue = _useState6[1];
+      innerValue = _useState6[0],
+      setInnerValue = _useState6[1];
 
-  var _useState7 = (0, _react.useState)(-1),
+  var _useState7 = (0, _react.useState)(""),
       _useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
-      visualFocusIndex = _useState8[0],
-      changeVisualFocusIndex = _useState8[1];
+      searchValue = _useState8[0],
+      setSearchValue = _useState8[1];
 
-  var _useState9 = (0, _react.useState)(false),
+  var _useState9 = (0, _react.useState)(-1),
       _useState10 = (0, _slicedToArray2["default"])(_useState9, 2),
-      isOpen = _useState10[0],
-      changeIsOpen = _useState10[1];
+      visualFocusIndex = _useState10[0],
+      changeVisualFocusIndex = _useState10[1];
+
+  var _useState11 = (0, _react.useState)(false),
+      _useState12 = (0, _slicedToArray2["default"])(_useState11, 2),
+      isOpen = _useState12[0],
+      changeIsOpen = _useState12[1];
 
-  var selectContainerRef = (0, _react.useRef)(null);
+  var selectRef = (0, _react.useRef)(null);
   var selectSearchInputRef = (0, _react.useRef)(null);
-  var selectOptionsListRef = (0, _react.useRef)(null);
+  var width = useWidth(selectRef.current);
   var colorsTheme = (0, _useTheme["default"])();
+  var translatedLabels = (0, _useTranslatedLabels["default"])();
   var optionalItem = {
     label: placeholder,
     value: ""
@@ -202,7 +233,7 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
   }, [options, searchValue]);
   var lastOptionIndex = (0, _react.useMemo)(function () {
     return getLastOptionIndex(options, filteredOptions, searchable, optional, multiple);
-  }, [options, filteredOptions, searchable, optional, multiple, filteredOptions]);
+  }, [options, filteredOptions, searchable, optional, multiple]);
 
   var _useMemo = (0, _react.useMemo)(function () {
     return getSelectedOption(value !== null && value !== void 0 ? value : innerValue, options, multiple, optional, optionalItem);
@@ -210,20 +241,8 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
       selectedOption = _useMemo.selectedOption,
       singleSelectionIndex = _useMemo.singleSelectionIndex;
 
-  var notOptionalCheck = function notOptionalCheck(value) {
-    return value === "" && !optional;
-  };
-
-  var notOptionalMultipleCheck = function notOptionalMultipleCheck() {
-    return (value !== null && value !== void 0 ? value : innerValue).length === 0 && !optional;
-  };
-
-  var canBeOpenOptions = function canBeOpenOptions() {
-    return !disabled && (options === null || options === void 0 ? void 0 : options.length) > 0 && groupsHaveOptions(options);
-  };
-
   var openOptions = function openOptions() {
-    if (!isOpen && canBeOpenOptions()) changeIsOpen(true);
+    if (!isOpen && canOpenOptions(options, disabled)) changeIsOpen(true);
   };
 
   var closeOptions = function closeOptions() {
@@ -234,36 +253,23 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
   };
 
   var handleSelectChangeValue = function handleSelectChangeValue(newOption) {
+    var newValue;
+
     if (multiple) {
-      var _res, _res2;
+      var _ref2, _ref3;
 
-      var res;
-      if ((value !== null && value !== void 0 ? value : innerValue).includes(newOption.value)) value ? res = value.filter(function (optionVal) {
+      if ((value !== null && value !== void 0 ? value : innerValue).includes(newOption.value)) newValue = ((_ref2 = value && Array.isArray(value) && value) !== null && _ref2 !== void 0 ? _ref2 : innerValue && Array.isArray(innerValue) && innerValue).filter(function (optionVal) {
         return optionVal !== newOption.value;
-      }) : setInnerValue(function (previous) {
-        return previous.filter(function (optionVal) {
-          return optionVal !== newOption.value;
-        });
-      });else value ? res = [].concat((0, _toConsumableArray2["default"])(value), [newOption.value]) : setInnerValue(function (previous) {
-        return [].concat((0, _toConsumableArray2["default"])(previous), [newOption.value]);
-      });
-      if (notOptionalMultipleCheck(newOption.value)) onChange === null || onChange === void 0 ? void 0 : onChange({
-        value: (_res = res) !== null && _res !== void 0 ? _res : innerValue,
-        error: getNotOptionalErrorMessage()
-      });else onChange === null || onChange === void 0 ? void 0 : onChange({
-        value: (_res2 = res) !== null && _res2 !== void 0 ? _res2 : innerValue,
-        error: null
-      });
-    } else {
-      value !== null && value !== void 0 ? value : setInnerValue(newOption.value);
-      if (notOptionalCheck(newOption.value)) onChange === null || onChange === void 0 ? void 0 : onChange({
-        value: newOption.value,
-        error: getNotOptionalErrorMessage()
-      });else onChange === null || onChange === void 0 ? void 0 : onChange({
-        value: newOption.value,
-        error: null
-      });
-    }
+      });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({
+      value: newValue,
+      error: translatedLabels.formFields.requiredValueErrorMessage
+    }) : onChange === null || onChange === void 0 ? void 0 : onChange({
+      value: newValue
+    });
   };
 
   var handleSelectOnClick = function handleSelectOnClick() {
@@ -284,20 +290,20 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     if (!event.currentTarget.contains(event.relatedTarget)) {
       closeOptions();
       setSearchValue("");
-      if (notOptionalCheck(value !== null && value !== void 0 ? value : innerValue)) onBlur === null || onBlur === void 0 ? void 0 : onBlur({
-        value: value !== null && value !== void 0 ? value : innerValue,
-        error: getNotOptionalErrorMessage()
-      });else onBlur === null || onBlur === void 0 ? void 0 : onBlur({
-        value: value !== null && value !== void 0 ? value : innerValue,
-        error: null
+      var currentValue = value !== null && value !== void 0 ? value : innerValue;
+      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({
+        value: currentValue
       });
     }
   };
 
   var handleSelectOnKeyDown = function handleSelectOnKeyDown(event) {
-    switch (event.keyCode) {
-      case 40:
-        // Arrow Down
+    switch (event.key) {
+      case "Down":
+      case "ArrowDown":
         event.preventDefault();
         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;
@@ -305,8 +311,8 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
         openOptions();
         break;
 
-      case 38:
-        // Arrow Up
+      case "Up":
+      case "ArrowUp":
         event.preventDefault();
         singleSelectionIndex !== undefined && (!isOpen || visualFocusIndex === -1 && singleSelectionIndex > -1 && singleSelectionIndex <= lastOptionIndex) ? changeVisualFocusIndex(singleSelectionIndex) : changeVisualFocusIndex(function (visualFocusIndex) {
           return visualFocusIndex === 0 || visualFocusIndex === -1 ? lastOptionIndex : visualFocusIndex - 1;
@@ -314,15 +320,14 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
         openOptions();
         break;
 
-      case 27:
-        // Esc
+      case "Esc":
+      case "Escape":
         event.preventDefault();
         closeOptions();
         setSearchValue("");
         break;
 
-      case 13:
-        // Enter
+      case "Enter":
         if (isOpen && visualFocusIndex >= 0) {
           var accLength = optional && !multiple ? 1 : 0;
 
@@ -361,9 +366,11 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
   var handleClearOptionsActionOnClick = function handleClearOptionsActionOnClick(event) {
     event.stopPropagation();
     value !== null && value !== void 0 ? value : setInnerValue([]);
-    onChange === null || onChange === void 0 ? void 0 : onChange({
+    !optional ? onChange === null || onChange === void 0 ? void 0 : onChange({
       value: [],
-      error: getNotOptionalErrorMessage()
+      error: translatedLabels.formFields.requiredValueErrorMessage
+    }) : onChange === null || onChange === void 0 ? void 0 : onChange({
+      value: []
     });
   };
 
@@ -377,66 +384,6 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     !multiple && closeOptions();
     setSearchValue("");
   }, [handleSelectChangeValue, closeOptions, multiple]);
-  (0, _react.useLayoutEffect)(function () {
-    if (isOpen && singleSelectionIndex) {
-      var _listEl$scrollTo;
-
-      var listEl = selectOptionsListRef === null || selectOptionsListRef === void 0 ? void 0 : selectOptionsListRef.current;
-      var selectedListOptionEl = listEl === null || listEl === void 0 ? void 0 : listEl.querySelector("[aria-selected='true']");
-      listEl === null || listEl === void 0 ? void 0 : (_listEl$scrollTo = listEl.scrollTo) === null || _listEl$scrollTo === void 0 ? void 0 : _listEl$scrollTo.call(listEl, {
-        top: (selectedListOptionEl === null || selectedListOptionEl === void 0 ? void 0 : selectedListOptionEl.offsetTop) - (listEl === null || listEl === void 0 ? void 0 : listEl.clientHeight) / 2
-      });
-    }
-  }, [isOpen]);
-  (0, _react.useLayoutEffect)(function () {
-    var _selectOptionsListRef, _visualFocusedOptionE;
-
-    var visualFocusedOptionEl = selectOptionsListRef === null || selectOptionsListRef === void 0 ? void 0 : (_selectOptionsListRef = selectOptionsListRef.current) === null || _selectOptionsListRef === void 0 ? void 0 : _selectOptionsListRef.querySelectorAll("[role='option']")[visualFocusIndex];
-    visualFocusedOptionEl === null || visualFocusedOptionEl === void 0 ? void 0 : (_visualFocusedOptionE = visualFocusedOptionEl.scrollIntoView) === null || _visualFocusedOptionE === void 0 ? void 0 : _visualFocusedOptionE.call(visualFocusedOptionEl, {
-      block: "nearest",
-      inline: "start"
-    });
-  }, [visualFocusIndex]);
-  var globalIndex = optional && !multiple ? 0 : -1; // index for options, starting from 0 to options.length -1
-
-  var mapOptionFunc = function mapOptionFunc(option, mapIndex) {
-    if (option.options) {
-      var groupId = "group-".concat(mapIndex);
-      return option.options.length > 0 && /*#__PURE__*/_react["default"].createElement("li", null, /*#__PURE__*/_react["default"].createElement(GroupList, {
-        role: "group",
-        "aria-labelledby": groupId
-      }, /*#__PURE__*/_react["default"].createElement(GroupLabel, {
-        role: "presentation",
-        id: groupId
-      }, option.label), option.options.map(function (singleOption) {
-        globalIndex++;
-        return /*#__PURE__*/_react["default"].createElement(_Option["default"], {
-          id: "option-".concat(globalIndex),
-          option: singleOption,
-          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["default"], {
-        key: "option-".concat(option.value),
-        id: "option-".concat(globalIndex),
-        option: option,
-        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
-      });
-    }
-  };
-
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.select
   }, /*#__PURE__*/_react["default"].createElement(SelectContainer, {
@@ -447,12 +394,17 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     id: selectLabelId,
     disabled: disabled,
     onClick: function onClick() {
-      selectContainerRef.current.focus();
+      selectRef.current.focus();
     },
     helperText: helperText
-  }, label, " ", optional && /*#__PURE__*/_react["default"].createElement(OptionalLabel, null, "(Optional)")), helperText && /*#__PURE__*/_react["default"].createElement(HelperText, {
+  }, label, " ", optional && /*#__PURE__*/_react["default"].createElement(OptionalLabel, null, translatedLabels.formFields.optionalLabel)), helperText && /*#__PURE__*/_react["default"].createElement(HelperText, {
     disabled: disabled
-  }, helperText), /*#__PURE__*/_react["default"].createElement(Select, {
+  }, helperText), /*#__PURE__*/_react["default"].createElement(Popover.Root, {
+    open: isOpen
+  }, /*#__PURE__*/_react["default"].createElement(Popover.Trigger, {
+    asChild: true,
+    type: undefined
+  }, /*#__PURE__*/_react["default"].createElement(Select, {
     id: selectId,
     disabled: disabled,
     error: error,
@@ -460,19 +412,19 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     onClick: handleSelectOnClick,
     onFocus: handleSelectOnFocus,
     onKeyDown: handleSelectOnKeyDown,
-    ref: selectContainerRef,
-    tabIndex: tabIndex,
+    ref: selectRef,
+    tabIndex: disabled ? -1 : tabIndex,
     role: "combobox",
     "aria-controls": optionsListId,
     "aria-disabled": disabled,
     "aria-expanded": isOpen,
     "aria-haspopup": "listbox",
-    "aria-labelledby": selectLabelId,
+    "aria-labelledby": label ? selectLabelId : undefined,
     "aria-activedescendant": visualFocusIndex >= 0 ? "option-".concat(visualFocusIndex) : undefined,
-    "aria-invalid": error ? "true" : "false",
+    "aria-invalid": error ? true : false,
     "aria-errormessage": error ? errorId : undefined,
     "aria-required": !disabled && !optional
-  }, multiple && selectedOption.length > 0 && /*#__PURE__*/_react["default"].createElement(SelectionIndicator, null, /*#__PURE__*/_react["default"].createElement(SelectionNumber, {
+  }, multiple && Array.isArray(selectedOption) && selectedOption.length > 0 && /*#__PURE__*/_react["default"].createElement(SelectionIndicator, null, /*#__PURE__*/_react["default"].createElement(SelectionNumber, {
     disabled: disabled
   }, selectedOption.length), /*#__PURE__*/_react["default"].createElement(ClearOptionsAction, {
     disabled: disabled,
@@ -482,11 +434,12 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     },
     onClick: handleClearOptionsActionOnClick,
     tabIndex: -1,
-    title: "Clear selection",
-    "aria-label": "Clear selection"
+    title: translatedLabels.select.actionClearSelectionTitle,
+    "aria-label": translatedLabels.select.actionClearSelectionTitle
   }, _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,
+    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,
     readOnly: true,
     "aria-hidden": "true"
   }), searchable && /*#__PURE__*/_react["default"].createElement(SearchInput, {
@@ -496,48 +449,51 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     ref: selectSearchInputRef,
     autoComplete: "nope",
     autoCorrect: "nope",
-    size: "1"
+    size: 1
   }), (!searchable || searchValue === "") && (multiple ? /*#__PURE__*/_react["default"].createElement(SelectedOption, {
     disabled: disabled,
     atBackground: (value !== null && value !== void 0 ? value : innerValue).length === 0 || searchable && isOpen
-  }, /*#__PURE__*/_react["default"].createElement(OptionLabel, null, selectedOption.map(function (option) {
+  }, /*#__PURE__*/_react["default"].createElement(SelectedOptionLabel, null, Array.isArray(selectedOption) && selectedOption.map(function (option) {
     return option.label;
-  }).join(", ")), selectedOption.length === 0 && placeholder) : /*#__PURE__*/_react["default"].createElement(SelectedOption, {
+  }).join(", ")), Array.isArray(selectedOption) && 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, _Icons["default"].error), searchable && searchValue.length > 0 && /*#__PURE__*/_react["default"].createElement(ClearSearchAction, {
+  }, /*#__PURE__*/_react["default"].createElement(SelectedOptionLabel, 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",
-    "aria-label": "Clear search"
+    title: translatedLabels.select.actionClearSearchTitle,
+    "aria-label": translatedLabels.select.actionClearSearchTitle
   }, _Icons["default"].clear), /*#__PURE__*/_react["default"].createElement(CollapseIndicator, {
     disabled: disabled
-  }, isOpen ? _Icons["default"].arrowUp : _Icons["default"].arrowDown), isOpen && /*#__PURE__*/_react["default"].createElement(OptionsList, {
-    id: optionsListId,
-    onClick: function onClick(event) {
-      event.stopPropagation();
-    },
-    onMouseDown: function onMouseDown(event) {
+  }, isOpen ? _Icons["default"].arrowUp : _Icons["default"].arrowDown))), /*#__PURE__*/_react["default"].createElement(Popover.Content, {
+    sideOffset: 4,
+    onOpenAutoFocus: function onOpenAutoFocus(event) {
+      // Avoid select to lose focus when the list is opened
       event.preventDefault();
     },
-    ref: selectOptionsListRef,
-    role: "listbox",
-    "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,
+    onCloseAutoFocus: function onCloseAutoFocus(event) {
+      // Avoid select to lose focus when the list is closed
+      event.preventDefault();
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_Listbox["default"], {
+    id: optionsListId,
+    currentValue: value !== null && value !== void 0 ? value : innerValue,
+    options: searchable ? filteredOptions : options,
+    visualFocusIndex: visualFocusIndex,
+    lastOptionIndex: lastOptionIndex,
     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, {
+    optional: optional,
+    optionalItem: optionalItem,
+    searchable: searchable,
+    handleOptionOnClick: handleOptionOnClick,
+    styles: {
+      width: width
+    }
+  }))), !disabled && typeof error === "string" && /*#__PURE__*/_react["default"].createElement(Error, {
     id: errorId,
     "aria-live": error ? "assertive" : "off"
   }, error)));
@@ -636,9 +592,7 @@ var SelectionNumber = _styledComponents["default"].span(_templateObject7 || (_te
   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  font-size: 1rem;\n  font-family: ", ";\n  border: none;\n  padding: 0.25rem;\n  ", "\n  background-color: ", ";\n  color: ", ";\n\n  :focus-visible {\n    outline: none;\n  }\n  ", "\n\n  svg {\n    line-height: 18px;\n  }\n"])), function (props) {
-  return props.theme.fontFamily;
-}, function (props) {
+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  svg {\n    line-height: 18px;\n  }\n"])), function (props) {
   return props.disabled ? "cursor: not-allowed;" : "cursor: pointer;";
 }, function (props) {
   return props.disabled ? "transparent" : props.theme.enabledSelectionIndicatorActionBackgroundColor;
@@ -662,9 +616,11 @@ var SelectedOption = _styledComponents["default"].span(_templateObject10 || (_te
   return props.theme.valueFontWeight;
 });
 
-var ValueInput = _styledComponents["default"].input(_templateObject11 || (_templateObject11 = (0, _taggedTemplateLiteral2["default"])(["\n  display: none;\n"])));
+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(_templateObject12 || (_templateObject12 = (0, _taggedTemplateLiteral2["default"])(["\n  grid-area: 1 / 1 / 1 / 1;\n  height: calc(2.5rem - 2px);\n  background: none;\n  border: none;\n  outline: none;\n  padding: 0 0.5rem;\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: 1.5em;\n"])), function (props) {
+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) {
   return props.disabled ? props.theme.disabledColor : props.theme.valueFontColor;
 }, function (props) {
   return props.theme.fontFamily;
@@ -676,21 +632,21 @@ var SearchInput = _styledComponents["default"].input(_templateObject12 || (_temp
   return props.theme.valueFontWeight;
 });
 
-var ErrorIcon = _styledComponents["default"].span(_templateObject13 || (_templateObject13 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-wrap: wrap;\n  align-content: center;\n  padding: 3px;\n  height: 18px;\n  width: 18px;\n  margin-left: 0.25rem;\n  pointer-events: none;\n  color: ", ";\n\n  svg {\n    line-height: 18px;\n    font-size: 1.25rem;\n  }\n"])), function (props) {
+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  svg {\n    line-height: 18px;\n    font-size: 1.25rem;\n  }\n"])), function (props) {
   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  line-height: 1.5em;\n  margin-top: 0.25rem;\n"])), function (props) {
+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) {
   return props.theme.errorMessageColor;
 }, function (props) {
   return props.theme.fontFamily;
 });
 
-var CollapseIndicator = _styledComponents["default"].span(_templateObject15 || (_templateObject15 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-wrap: wrap;\n  align-content: center;\n  height: 16px;\n  width: 16px;\n  padding: 4px;\n  margin-left: 0.25rem;\n  color: ", ";\n"])), function (props) {
+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) {
   return props.disabled ? props.theme.disabledColor : props.theme.collapseIndicatorColor;
 });
 
-var ClearSearchAction = _styledComponents["default"].button(_templateObject16 || (_templateObject16 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-wrap: wrap;\n  align-content: center;\n  height: 24px;\n  width: 24px;\n  font-size: 1rem;\n  font-family: ", ";\n  border: 1px solid transparent;\n  border-radius: 2px;\n  padding: 3px;\n  margin-left: 0.25rem;\n  background-color: ", ";\n  color: ", ";\n\n  cursor: pointer;\n  &:hover {\n    background-color: ", ";\n    color: ", ";\n  }\n  &:active {\n    background-color: ", ";\n    color: ", ";\n  }\n  svg {\n    line-height: 18px;\n  }\n"])), function (props) {
+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  svg {\n    line-height: 18px;\n  }\n"])), function (props) {
   return props.theme.fontFamily;
 }, function (props) {
   return props.theme.actionBackgroundColor;
@@ -706,35 +662,5 @@ var ClearSearchAction = _styledComponents["default"].button(_templateObject16 ||
   return props.theme.activeActionIconColor;
 });
 
-var OptionsList = _styledComponents["default"].ul(_templateObject17 || (_templateObject17 = (0, _taggedTemplateLiteral2["default"])(["\n  position: absolute;\n  z-index: 1;\n  max-height: 304px;\n  overflow-y: auto;\n  top: calc(100% + 4px);\n  left: 0;\n  margin: 0;\n  padding: 0.25rem 0;\n  width: 100%;\n  background-color: ", ";\n  border: 1px solid ", ";\n  border-radius: 0.25rem;\n  box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1);\n  cursor: default;\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n"])), function (props) {
-  return props.theme.listDialogBackgroundColor;
-}, function (props) {
-  return props.theme.listDialogBorderColor;
-}, function (props) {
-  return props.theme.listOptionFontColor;
-}, function (props) {
-  return props.theme.fontFamily;
-}, function (props) {
-  return props.theme.listOptionFontSize;
-}, function (props) {
-  return props.theme.listOptionFontStyle;
-}, function (props) {
-  return props.theme.listOptionFontWeight;
-});
-
-var OptionsSystemMessage = _styledComponents["default"].span(_templateObject18 || (_templateObject18 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  padding: 4px 16px;\n  color: ", ";\n  font-size: 0.875rem;\n  line-height: 1.715em;\n"])), function (props) {
-  return props.theme.systemMessageFontColor;
-});
-
-var NoMatchesFoundIcon = _styledComponents["default"].span(_templateObject19 || (_templateObject19 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-wrap: wrap;\n  align-content: center;\n  height: 16px;\n  width: 16px;\n  padding: 4px;\n  margin-right: 0.25rem;\n"])));
-
-var GroupList = _styledComponents["default"].ul(_templateObject20 || (_templateObject20 = (0, _taggedTemplateLiteral2["default"])(["\n  padding: 0;\n"])));
-
-var GroupLabel = _styledComponents["default"].li(_templateObject21 || (_templateObject21 = (0, _taggedTemplateLiteral2["default"])(["\n  padding: 4px 16px;\n  font-weight: ", ";\n  line-height: 1.715em;\n"])), function (props) {
-  return props.theme.listGroupLabelFontWeight;
-});
-
-var 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;