@dxc-technology/halstack-react 11.0.0 → 12.0.1

package/select/Select.accessibility.test.js

@@ -0,0 +1,228 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _react = _interopRequireDefault(require("react"));
+var _react2 = require("@testing-library/react");
+var _axeHelper = require("../../test/accessibility/axe-helper.js");
+var _Select = _interopRequireDefault(require("./Select"));
+var _Flex = _interopRequireDefault(require("../flex/Flex"));
+var _disabledRules = require("../../test/accessibility/rules/specific/select/disabledRules.js");
+// TODO: REMOVE
+
+var disabledRules = {
+  rules: _disabledRules.disabledRules.reduce(function (rulesObj, rule) {
+    rulesObj[rule] = {
+      enabled: false
+    };
+    return rulesObj;
+  }, {})
+};
+var iconSVG = /*#__PURE__*/_react["default"].createElement("svg", {
+  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("path", {
+  d: "M0,0h24v24H0V0z",
+  fill: "none"
+})), /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("path", {
+  d: "M3,7v2h5v2H4v2h4v2H3v2h5c1.1,0,2-0.9,2-2v-1.5c0-0.83-0.67-1.5-1.5-1.5c0.83,0,1.5-0.67,1.5-1.5V9c0-1.1-0.9-2-2-2H3z M21,11v4c0,1.1-0.9,2-2,2h-5c-1.1,0-2-0.9-2-2V9c0-1.1,0.9-2,2-2h5c1.1,0,2,0.9,2,2h-7v6h5v-2h-2.5v-2H21z"
+}))));
+var group_options = [{
+  label: "Group 001",
+  options: [{
+    label: "Option 001",
+    value: "1"
+  }, {
+    label: "Option 002",
+    value: "2"
+  }, {
+    label: "Option 003",
+    value: "3"
+  }]
+}, {
+  label: "Group 002",
+  options: [{
+    label: "Option 004",
+    value: "4"
+  }, {
+    label: "Option 005",
+    value: "5"
+  }, {
+    label: "Option 006",
+    value: "6"
+  }]
+}, {
+  label: "Group 003",
+  options: [{
+    label: "Option 007",
+    value: "7"
+  }, {
+    label: "Option 008",
+    value: "8"
+  }, {
+    label: "Option 009",
+    value: "9"
+  }]
+}, {
+  label: "Group 004",
+  options: [{
+    label: "Option 010",
+    value: "10"
+  }, {
+    label: "Option 011",
+    value: "11"
+  }, {
+    label: "Option 012",
+    value: "12"
+  }]
+}, {
+  label: "Group 005",
+  options: [{
+    label: "Option 013",
+    value: "13"
+  }, {
+    label: "Option 014",
+    value: "14"
+  }, {
+    label: "Option 015",
+    value: "15"
+  }]
+}];
+var single_options = [{
+  label: "Option 01",
+  value: "1",
+  icon: iconSVG
+}, {
+  label: "Option 02",
+  value: "2",
+  icon: iconSVG
+}, {
+  label: "Option 03",
+  value: "3",
+  icon: iconSVG
+}, {
+  label: "Option 04",
+  value: "4",
+  icon: iconSVG
+}];
+
+// Mocking DOMRect for Radix Primitive Popover
+global.globalThis = global;
+global.DOMRect = {
+  fromRect: function fromRect() {
+    return {
+      top: 0,
+      left: 0,
+      bottom: 0,
+      right: 0,
+      width: 0,
+      height: 0
+    };
+  }
+};
+global.ResizeObserver = /*#__PURE__*/function () {
+  function ResizeObserver() {
+    (0, _classCallCheck2["default"])(this, ResizeObserver);
+  }
+  (0, _createClass2["default"])(ResizeObserver, [{
+    key: "observe",
+    value: function observe() {}
+  }, {
+    key: "unobserve",
+    value: function unobserve() {}
+  }, {
+    key: "disconnect",
+    value: function disconnect() {}
+  }]);
+  return ResizeObserver;
+}();
+describe("Select component accessibility tests", function () {
+  it("Should not have basic accessibility issues", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+    var _render, baseElement, results;
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          // baseElement is needed when using React Portals
+          _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Flex["default"], null, /*#__PURE__*/_react["default"].createElement(_Select["default"], {
+            label: "test-select-label",
+            helperText: "test-select-helper-text",
+            placeholder: "Example text",
+            options: single_options,
+            defaultValue: "1",
+            margin: "medium",
+            name: "Name",
+            size: "medium",
+            searchable: true
+          }), /*#__PURE__*/_react["default"].createElement(_Select["default"], {
+            label: "test-select-label",
+            helperText: "test-select-helper-text",
+            placeholder: "Example text",
+            options: single_options,
+            defaultValue: ["4", "2", "6"],
+            margin: "medium",
+            name: "Name",
+            size: "medium",
+            searchable: true,
+            multiple: true,
+            optional: true
+          }))), baseElement = _render.baseElement;
+          _context.next = 3;
+          return (0, _axeHelper.axe)(baseElement, disabledRules);
+        case 3:
+          results = _context.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })));
+  it("Should not have basic accessibility issues for group mode", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+    var _render2, baseElement, results;
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          // baseElement is needed when using React Portals
+          _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Flex["default"], null, /*#__PURE__*/_react["default"].createElement(_Select["default"], {
+            label: "test-select-label",
+            helperText: "test-select-helper-text",
+            placeholder: "Example text",
+            options: group_options,
+            defaultValue: ["4", "2", "6"],
+            error: "Error",
+            margin: "medium",
+            name: "Name",
+            size: "medium",
+            searchable: true,
+            multiple: true
+          }), /*#__PURE__*/_react["default"].createElement(_Select["default"], {
+            label: "test-select-label",
+            helperText: "test-select-helper-text",
+            placeholder: "Example text",
+            options: group_options,
+            defaultValue: ["4", "2", "6"],
+            margin: "medium",
+            name: "Name",
+            size: "medium",
+            searchable: true,
+            multiple: true,
+            disabled: true
+          }))), baseElement = _render2.baseElement;
+          _context2.next = 3;
+          return (0, _axeHelper.axe)(baseElement, disabledRules);
+        case 3:
+          results = _context2.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  })));
+});

package/select/Select.js

@@ -15,21 +15,21 @@ 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 _Icons = _interopRequireDefault(require("./Icons"));
 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; // @ts-nocheck
+var _Icon = _interopRequireDefault(require("../icon/Icon"));
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17;
 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 groupsHaveOptions = function groupsHaveOptions(innerOptions) {
-  return innerOptions[0].hasOwnProperty("options") ? innerOptions[0].options ? innerOptions.some(function (groupOption) {
-    return groupOption.options.length > 0;
-  }) : false : true;
+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 isOptionGroup = function isOptionGroup(option) {
+  return "options" in option && option.options != null;
 };
-var filteredGroupsHaveOptions = function filteredGroupsHaveOptions(filteredOptions) {
-  return filteredOptions !== null && filteredOptions !== void 0 && filteredOptions[0].options ? filteredOptions.some(function (groupOption) {
+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;
@@ -39,7 +39,7 @@ var canOpenOptions = function canOpenOptions(options, disabled) {
 };
 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) {
+    if (isArrayOfOptionGroups(options)) return options.map(function (optionGroup) {
       var group = {
         label: optionGroup.label,
         options: optionGroup.options.filter(function (option) {
@@ -58,7 +58,7 @@ var getLastOptionIndex = function getLastOptionIndex(options, filteredOptions, s
     var _current$options;
     return acc + ((_current$options = current.options) === null || _current$options === void 0 ? void 0 : _current$options.length);
   };
-  if (searchable && filteredOptions.length > 0) filteredOptions[0].options ? last = filteredOptions.reduce(reducer, 0) - 1 : last = filteredOptions.length - 1;else if ((options === null || options === void 0 ? void 0 : options.length) > 0) options[0].options ? last = options.reduce(reducer, 0) - 1 : last = options.length - 1;
+  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) {
@@ -67,11 +67,9 @@ var getSelectedOption = function getSelectedOption(value, options, multiple, opt
   if (multiple) {
     if ((options === null || options === void 0 ? void 0 : options.length) > 0) {
       options.forEach(function (option) {
-        if (option.options) {
-          option.options.forEach(function (singleOption) {
-            if (value.includes(singleOption.value) && Array.isArray(selectedOption)) selectedOption.push(singleOption);
-          });
-        } else if (value.includes(option.value) && Array.isArray(selectedOption)) selectedOption.push(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 {
@@ -81,7 +79,7 @@ var getSelectedOption = function getSelectedOption(value, options, multiple, opt
     } else if ((options === null || options === void 0 ? void 0 : options.length) > 0) {
       var group_index = 0;
       options.some(function (option, index) {
-        if (option.options) {
+        if (isOptionGroup(option)) {
           option.options.some(function (singleOption) {
             if (singleOption.value === value) {
               selectedOption = singleOption;
@@ -103,6 +101,12 @@ var getSelectedOption = function getSelectedOption(value, options, multiple, opt
     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 === "");
 };
@@ -127,7 +131,7 @@ var useWidth = function useWidth(target) {
   return width;
 };
 var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
-  var _ref4, _selectedOption$label;
+  var _ref4;
   var label = _ref.label,
     _ref$name = _ref.name,
     name = _ref$name === void 0 ? "" : _ref$name,
@@ -153,30 +157,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 searchableInputId = "searchable-input-".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 _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)(""),
     _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
-    innerValue = _useState6[0],
-    setInnerValue = _useState6[1];
-  var _useState7 = (0, _react.useState)(""),
+    searchValue = _useState6[0],
+    setSearchValue = _useState6[1];
+  var _useState7 = (0, _react.useState)(-1),
     _useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
-    searchValue = _useState8[0],
-    setSearchValue = _useState8[1];
-  var _useState9 = (0, _react.useState)(-1),
+    visualFocusIndex = _useState8[0],
+    changeVisualFocusIndex = _useState8[1];
+  var _useState9 = (0, _react.useState)(false),
     _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 = _useState10[0],
+    changeIsOpen = _useState10[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 colorsTheme = (0, _useTheme["default"])();
   var translatedLabels = (0, _useTranslatedLabels["default"])();
@@ -231,7 +235,7 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     if (!event.currentTarget.contains(event.relatedTarget)) searchable && selectSearchInputRef.current.focus();
   };
   var handleSelectOnBlur = function handleSelectOnBlur(event) {
-    // focus leaves container (outside, not to childs)
+    // focus leaves container (outside, not to a child)
     if (!event.currentTarget.contains(event.relatedTarget)) {
       closeOptions();
       setSearchValue("");
@@ -265,6 +269,7 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
       case "Esc":
       case "Escape":
         event.preventDefault();
+        isOpen && event.stopPropagation();
         closeOptions();
         setSearchValue("");
         break;
@@ -273,7 +278,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 && filteredGroupsHaveOptions(filteredOptions)) handleSelectChangeValue(optionalItem);else filteredOptions[0].options ? filteredGroupsHaveOptions(filteredOptions) && filteredOptions.some(function (groupOption) {
+              if (optional && !multiple && visualFocusIndex === 0 && groupsHaveOptions(filteredOptions)) handleSelectChangeValue(optionalItem);else isArrayOfOptionGroups(filteredOptions) ? groupsHaveOptions(filteredOptions) && filteredOptions.some(function (groupOption) {
                 var groupLength = accLength + groupOption.options.length;
                 groupLength > visualFocusIndex && handleSelectChangeValue(groupOption.options[visualFocusIndex - accLength]);
                 accLength = groupLength;
@@ -281,7 +286,7 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
               }) : handleSelectChangeValue(filteredOptions[visualFocusIndex - accLength]);
             }
           } else {
-            if (optional && !multiple && visualFocusIndex === 0) handleSelectChangeValue(optionalItem);else options[0].options ? options.some(function (groupOption) {
+            if (optional && !multiple && visualFocusIndex === 0) handleSelectChangeValue(optionalItem);else isArrayOfOptionGroups(options) ? options.some(function (groupOption) {
               var groupLength = accLength + groupOption.options.length;
               groupLength > visualFocusIndex && handleSelectChangeValue(groupOption.options[visualFocusIndex - accLength]);
               accLength = groupLength;
@@ -318,6 +323,11 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     !multiple && closeOptions();
     setSearchValue("");
   }, [handleSelectChangeValue, closeOptions, multiple]);
+  (0, _react.useEffect)(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 = "";
+    }
+  }, [placeholder, selectedOption]);
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.select
   }, /*#__PURE__*/_react["default"].createElement(SelectContainer, {
@@ -330,7 +340,8 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     onClick: function onClick() {
       selectRef.current.focus();
     },
-    helperText: helperText
+    helperText: helperText,
+    htmlFor: searchable ? searchableInputId : undefined
   }, label, " ", optional && /*#__PURE__*/_react["default"].createElement(OptionalLabel, null, translatedLabels.formFields.optionalLabel)), helperText && /*#__PURE__*/_react["default"].createElement(HelperText, {
     disabled: disabled
   }, helperText), /*#__PURE__*/_react["default"].createElement(Popover.Root, {
@@ -370,13 +381,16 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     tabIndex: -1,
     title: translatedLabels.select.actionClearSelectionTitle,
     "aria-label": translatedLabels.select.actionClearSelectionTitle
-  }, _Icons["default"].clear)), /*#__PURE__*/_react["default"].createElement(SearchableValueContainer, null, /*#__PURE__*/_react["default"].createElement(ValueInput, {
+  }, /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
+    icon: "clear"
+  }))), /*#__PURE__*/_react["default"].createElement(SearchableValueContainer, null, /*#__PURE__*/_react["default"].createElement(ValueInput, {
     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,
     readOnly: true,
     "aria-hidden": "true"
   }), searchable && /*#__PURE__*/_react["default"].createElement(SearchInput, {
+    id: searchableInputId,
     value: searchValue,
     disabled: disabled,
     onChange: handleSearchIOnChange,
@@ -384,15 +398,14 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     autoComplete: "nope",
     autoCorrect: "nope",
     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(SelectedOptionLabel, null, Array.isArray(selectedOption) && selectedOption.map(function (option) {
-    return option.label;
-  }).join(", ")), Array.isArray(selectedOption) && selectedOption.length === 0 && placeholder) : /*#__PURE__*/_react["default"].createElement(SelectedOption, {
+  }), (!searchable || searchValue === "") && /*#__PURE__*/_react["default"].createElement(SelectedOption, {
     disabled: disabled,
-    atBackground: !(value !== null && value !== void 0 ? value : innerValue) || searchable && isOpen
-  }, /*#__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, {
+    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"], {
+    icon: "filled_error"
+  })), searchable && searchValue.length > 0 && /*#__PURE__*/_react["default"].createElement(ClearSearchAction, {
     onMouseDown: function onMouseDown(event) {
       // Avoid input to lose focus
       event.preventDefault();
@@ -401,9 +414,13 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     tabIndex: -1,
     title: translatedLabels.select.actionClearSearchTitle,
     "aria-label": translatedLabels.select.actionClearSearchTitle
-  }, _Icons["default"].clear), /*#__PURE__*/_react["default"].createElement(CollapseIndicator, {
+  }, /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
+    icon: "clear"
+  })), /*#__PURE__*/_react["default"].createElement(CollapseIndicator, {
     disabled: disabled
-  }, isOpen ? _Icons["default"].arrowUp : _Icons["default"].arrowDown))), /*#__PURE__*/_react["default"].createElement(Popover.Portal, null, /*#__PURE__*/_react["default"].createElement(Popover.Content, {
+  }, /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
+    icon: isOpen ? "keyboard_arrow_up" : "keyboard_arrow_down"
+  })))), /*#__PURE__*/_react["default"].createElement(Popover.Portal, null, /*#__PURE__*/_react["default"].createElement(Popover.Content, {
     sideOffset: 4,
     style: {
       zIndex: "2147483647"
@@ -432,6 +449,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)));
 });
@@ -457,7 +475,7 @@ var SelectContainer = _styledComponents["default"].div(_templateObject || (_temp
 }, 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) {
+var Label = _styledComponents["default"].label(_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;
@@ -519,7 +537,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  svg {\n    line-height: 18px;\n  }\n"])), 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  font-size:16px;\n"])), function (props) {
   return props.disabled ? "cursor: not-allowed;" : "cursor: pointer;";
 }, function (props) {
   return props.disabled ? "transparent" : props.theme.enabledSelectionIndicatorActionBackgroundColor;
@@ -553,7 +571,7 @@ 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  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  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) {
@@ -564,7 +582,7 @@ var Error = _styledComponents["default"].span(_templateObject15 || (_templateObj
 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(_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) {
+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) {
   return props.theme.actionBackgroundColor;