@dxc-technology/halstack-react 0.0.0-1c4cbc0 → 0.0.0-1d5e7bf

package/select/Listbox.js

@@ -11,7 +11,7 @@ exports["default"] = void 0;
 
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
@@ -37,7 +37,7 @@ var groupsHaveOptions = function groupsHaveOptions(options) {
   }) : true;
 };
 
-var Listbox = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
+var Listbox = function Listbox(_ref) {
   var id = _ref.id,
       currentValue = _ref.currentValue,
       options = _ref.options,
@@ -47,9 +47,11 @@ var Listbox = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
       optional = _ref.optional,
       optionalItem = _ref.optionalItem,
       searchable = _ref.searchable,
-      handleOptionOnClick = _ref.handleOptionOnClick;
+      handleOptionOnClick = _ref.handleOptionOnClick,
+      styles = _ref.styles;
   var colorsTheme = (0, _useTheme["default"])();
   var translatedLabels = (0, _useTranslatedLabels["default"])();
+  var listboxRef = (0, _react.useRef)(null);
   var globalIndex = optional && !multiple ? 0 : -1; // index for options, starting from 0 to options.length -1
 
   var mapOptionFunc = function mapOptionFunc(option, mapIndex) {
@@ -92,6 +94,26 @@ var Listbox = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     }
   };
 
+  (0, _react.useLayoutEffect)(function () {
+    if (currentValue && !multiple) {
+      var _listEl$scrollTo;
+
+      var listEl = listboxRef === null || listboxRef === void 0 ? void 0 : listboxRef.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
+      });
+    }
+  }, [currentValue, multiple]);
+  (0, _react.useLayoutEffect)(function () {
+    var _listboxRef$current, _visualFocusedOptionE;
+
+    var visualFocusedOptionEl = listboxRef === null || listboxRef === void 0 ? void 0 : (_listboxRef$current = listboxRef.current) === null || _listboxRef$current === void 0 ? void 0 : _listboxRef$current.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]);
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.select
   }, /*#__PURE__*/_react["default"].createElement(ListboxContainer, {
@@ -102,10 +124,11 @@ var Listbox = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     onMouseDown: function onMouseDown(event) {
       event.preventDefault();
     },
-    ref: ref,
+    ref: listboxRef,
     role: "listbox",
     "aria-multiselectable": multiple,
-    "aria-orientation": "vertical"
+    "aria-orientation": "vertical",
+    style: styles
   }, searchable && (options.length === 0 || !groupsHaveOptions(options)) ? /*#__PURE__*/_react["default"].createElement(OptionsSystemMessage, null, /*#__PURE__*/_react["default"].createElement(NoMatchesFoundIcon, null, _Icons["default"].searchOff), translatedLabels.select.noMatchesErrorMessage) : optional && !multiple && /*#__PURE__*/_react["default"].createElement(_Option["default"], {
     key: "option-".concat(optionalItem.value),
     id: "option-".concat(0),
@@ -117,9 +140,9 @@ var Listbox = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     isLastOption: lastOptionIndex === 0,
     isSelected: multiple ? currentValue.includes(optionalItem.value) : currentValue === optionalItem.value
   }), options.map(mapOptionFunc)));
-});
+};
 
-var ListboxContainer = _styledComponents["default"].ul(_templateObject || (_templateObject = (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) {
+var ListboxContainer = _styledComponents["default"].ul(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\n  max-height: 304px;\n  overflow-y: auto;\n  margin: 0;\n  padding: 0.25rem 0;\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;

package/select/Select.js

@@ -35,6 +35,8 @@ 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;
 
 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); }
@@ -55,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) {
@@ -130,6 +136,10 @@ var getSelectedOption = function getSelectedOption(value, options, multiple, opt
   };
 };
 
+var notOptionalCheck = function notOptionalCheck(value, multiple, optional) {
+  return !optional && (multiple ? value.length === 0 : value === "");
+};
+
 var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
   var _selectedOption$label;
 
@@ -187,9 +197,13 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
       isOpen = _useState10[0],
       changeIsOpen = _useState10[1];
 
-  var selectContainerRef = (0, _react.useRef)(null);
+  var _useState11 = (0, _react.useState)(null),
+      _useState12 = (0, _slicedToArray2["default"])(_useState11, 2),
+      listboxStyles = _useState12[0],
+      setListboxStyles = _useState12[1];
+
+  var selectRef = (0, _react.useRef)(null);
   var selectSearchInputRef = (0, _react.useRef)(null);
-  var selectOptionsListRef = (0, _react.useRef)(null);
   var colorsTheme = (0, _useTheme["default"])();
   var translatedLabels = (0, _useTranslatedLabels["default"])();
   var optionalItem = {
@@ -209,20 +223,8 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
       selectedOption = _useMemo.selectedOption,
       singleSelectionIndex = _useMemo.singleSelectionIndex;
 
-  var notOptionalCheck = function notOptionalCheck(value) {
-    return !optional && value === "";
-  };
-
-  var notOptionalMultipleCheck = function notOptionalMultipleCheck(value) {
-    return !optional && value.length === 0;
-  };
-
-  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() {
@@ -233,27 +235,21 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
   };
 
   var handleSelectChangeValue = function handleSelectChangeValue(newOption) {
+    var newValue;
+
     if (multiple) {
-      var res = [];
-      if ((value !== null && value !== void 0 ? value : innerValue).includes(newOption.value)) res = (value !== null && value !== void 0 ? value : innerValue).filter(function (optionVal) {
+      if ((value !== null && value !== void 0 ? value : innerValue).includes(newOption.value)) newValue = (value !== null && value !== void 0 ? value : innerValue).filter(function (optionVal) {
         return optionVal !== newOption.value;
-      });else res = [].concat((0, _toConsumableArray2["default"])(value !== null && value !== void 0 ? value : innerValue), [newOption.value]);
-      value !== null && value !== void 0 ? value : setInnerValue(res);
-      if (notOptionalMultipleCheck(res)) onChange === null || onChange === void 0 ? void 0 : onChange({
-        value: res,
-        error: translatedLabels.formFields.requiredValueErrorMessage
-      });else onChange === null || onChange === void 0 ? void 0 : onChange({
-        value: res
-      });
-    } 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: translatedLabels.formFields.requiredValueErrorMessage
-      });else onChange === null || onChange === void 0 ? void 0 : onChange({
-        value: newOption.value
-      });
-    }
+      });else newValue = [].concat((0, _toConsumableArray2["default"])(value !== null && value !== void 0 ? value : 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() {
@@ -274,11 +270,12 @@ 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,
+      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
-      });else onBlur === null || onBlur === void 0 ? void 0 : onBlur({
-        value: value !== null && value !== void 0 ? value : innerValue
+      }) : onBlur === null || onBlur === void 0 ? void 0 : onBlur({
+        value: currentValue
       });
     }
   };
@@ -368,26 +365,23 @@ 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"
+
+  var handleListboxResize = function handleListboxResize() {
+    var _selectRef$current;
+
+    var rect = selectRef === null || selectRef === void 0 ? void 0 : (_selectRef$current = selectRef.current) === null || _selectRef$current === void 0 ? void 0 : _selectRef$current.getBoundingClientRect();
+    setListboxStyles({
+      width: rect === null || rect === void 0 ? void 0 : rect.width
     });
-  }, [visualFocusIndex]);
+  };
+
+  (0, _react.useEffect)(function () {
+    handleListboxResize();
+    window.addEventListener("resize", handleListboxResize);
+    return function () {
+      window.removeEventListener("resize", handleListboxResize);
+    };
+  }, [setListboxStyles]);
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.select
   }, /*#__PURE__*/_react["default"].createElement(SelectContainer, {
@@ -398,12 +392,16 @@ 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, 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
+  }, /*#__PURE__*/_react["default"].createElement(Select, {
     id: selectId,
     disabled: disabled,
     error: error,
@@ -411,14 +409,14 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     onClick: handleSelectOnClick,
     onFocus: handleSelectOnFocus,
     onKeyDown: handleSelectOnKeyDown,
-    ref: selectContainerRef,
+    ref: selectRef,
     tabIndex: 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-errormessage": error ? errorId : undefined,
@@ -467,7 +465,17 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     "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(_Listbox["default"], {
+  }, 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();
+    },
+    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,
@@ -478,8 +486,8 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     optionalItem: optionalItem,
     searchable: searchable,
     handleOptionOnClick: handleOptionOnClick,
-    ref: selectOptionsListRef
-  })), !disabled && typeof error === "string" && /*#__PURE__*/_react["default"].createElement(Error, {
+    styles: listboxStyles
+  }))), !disabled && typeof error === "string" && /*#__PURE__*/_react["default"].createElement(Error, {
     id: errorId,
     "aria-live": error ? "assertive" : "off"
   }, error)));
@@ -578,9 +586,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;

package/select/Select.stories.tsx

@@ -1,12 +1,11 @@
 import React from "react";
-
 import { userEvent, within, waitFor } from "@storybook/testing-library";
-import { fireEvent } from "@testing-library/react";
-
 import Title from "../../.storybook/components/Title";
 import ExampleContainer from "../../.storybook/components/ExampleContainer";
-
 import DxcSelect from "./Select";
+import Listbox from "./Listbox";
+import DxcButton from "../button/Button";
+import DxcCheckbox from "../checkbox/Checkbox";
 
 export default {
   title: "Select",
@@ -340,7 +339,7 @@ const Select = () => (
       <DxcSelect label="Label" options={single_options} multiple defaultValue={["1", "2", "3", "4"]} />
       <Title title="Value with ellipsis" theme="light" level={4} />
       <DxcSelect label="Label" options={optionsWithEllipsisMedium} defaultValue="1" size="medium" />
-      <Title title="Option with ellipsis" theme="light" level={4} />
+      <Title title="Options with ellipsis" theme="light" level={4} />
       <DxcSelect
         label="Label"
         placeholder="Choose an option"
@@ -351,16 +350,103 @@ const Select = () => (
     </ExampleContainer>
   </>
 );
-export const Chromatic = Select.bind({});
-Chromatic.play = async ({ canvasElement }) => {
-  const canvas = within(canvasElement);
-  await userEvent.click(canvas.getAllByRole("combobox")[24]);
-};
-const DefaultSelect = () => (
-  <ExampleContainer expanded>
-    <Title title="Default select" theme="light" level={4} />
-    <DxcSelect label="Select label" options={single_options} optional placeholder="Choose an option" />
-  </ExampleContainer>
+const SelectListbox = () => (
+  <>
+    <Title title="Listbox" theme="light" level={2} />
+    <Title title="Default with opened listbox" theme="light" level={3} />
+    <ExampleContainer>
+      <div style={{ display: "flex", gap: "30px", flexDirection: "column", marginBottom: "80px" }}>
+        <DxcSelect label="Label" options={single_options} optional placeholder="Choose an option" />
+        <DxcCheckbox
+          label="You understand the selection and give your consent"
+          onChange={() => {}}
+          labelPosition="after"
+        />
+        <DxcButton label="Submit" onClick={() => {}} size="medium" />
+      </div>
+    </ExampleContainer>
+    <Title title="Listbox option states" theme="light" level={3} />
+    <ExampleContainer pseudoState="pseudo-hover">
+      <Title title="Hovered option" theme="light" level={4} />
+      <Listbox
+        id="x"
+        currentValue=""
+        options={one_option}
+        visualFocusIndex={-1}
+        lastOptionIndex={0}
+        multiple={false}
+        optional={false}
+        optionalItem={{ label: "Empty", value: "" }}
+        searchable={false}
+        handleOptionOnClick={() => {}}
+        styles={{ width: 360 }}
+      />
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-active">
+      <Title title="Active option" theme="light" level={4} />
+      <Listbox
+        id="x"
+        currentValue=""
+        options={one_option}
+        visualFocusIndex={-1}
+        lastOptionIndex={0}
+        multiple={false}
+        optional={false}
+        optionalItem={{ label: "Empty", value: "" }}
+        searchable={false}
+        handleOptionOnClick={() => {}}
+        styles={{ width: 360 }}
+      />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Focused option" theme="light" level={4} />
+      <Listbox
+        id="x"
+        currentValue=""
+        options={one_option}
+        visualFocusIndex={0}
+        lastOptionIndex={0}
+        multiple={false}
+        optional={false}
+        optionalItem={{ label: "Empty", value: "" }}
+        searchable={false}
+        handleOptionOnClick={() => {}}
+        styles={{ width: 360 }}
+      />
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-hover">
+      <Title title="Hovered selected option" theme="light" level={4} />
+      <Listbox
+        id="x"
+        currentValue="1"
+        options={single_options}
+        visualFocusIndex={-1}
+        lastOptionIndex={3}
+        multiple={false}
+        optional={false}
+        optionalItem={{ label: "Empty", value: "" }}
+        searchable={false}
+        handleOptionOnClick={() => {}}
+        styles={{ width: 360 }}
+      />
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-active">
+      <Title title="Active selected option" theme="light" level={4} />
+      <Listbox
+        id="x"
+        currentValue="2"
+        options={single_options}
+        visualFocusIndex={0}
+        lastOptionIndex={3}
+        multiple={false}
+        optional={false}
+        optionalItem={{ label: "Empty", value: "" }}
+        searchable={false}
+        handleOptionOnClick={() => {}}
+        styles={{ width: 360 }}
+      />
+    </ExampleContainer>
+  </>
 );
 const SearchableSelect = () => (
   <ExampleContainer expanded>
@@ -368,7 +454,7 @@ const SearchableSelect = () => (
     <DxcSelect label="Select Label" searchable options={single_options} placeholder="Choose an option" />
   </ExampleContainer>
 );
-const SearchableWithValue = () => (
+const SearchValue = () => (
   <ExampleContainer expanded>
     <Title title="Searchable select with value" theme="light" level={4} />
     <DxcSelect
@@ -380,7 +466,6 @@ const SearchableWithValue = () => (
     />
   </ExampleContainer>
 );
-
 const MultipleSelect = () => (
   <>
     <ExampleContainer expanded>
@@ -443,36 +528,7 @@ const MultipleGroupedOptionsSelectWithIcons = () => (
     />
   </ExampleContainer>
 );
-const OnlyOneOptionHovered = () => (
-  <ExampleContainer pseudoState="pseudo-hover" expanded>
-    <Title title="Hovered Option" theme="light" level={4} />
-    <DxcSelect label="Hovered" options={one_option} placeholder="Choose an option" />
-  </ExampleContainer>
-);
-const OnlyOneOptionFocused = () => (
-  <ExampleContainer pseudoState="pseudo-focus" expanded>
-    <Title title="Focused Option" theme="light" level={4} />
-    <DxcSelect label="Focused" options={one_option} placeholder="Choose an option" />
-  </ExampleContainer>
-);
-const OnlyOneOptionActived = () => (
-  <ExampleContainer pseudoState="pseudo-active" expanded>
-    <Title title="Actived Option" theme="light" level={4} />
-    <DxcSelect label="Actived" options={one_option} placeholder="Choose an option" />
-  </ExampleContainer>
-);
-const SelectedOptionHovered = () => (
-  <ExampleContainer pseudoState="pseudo-hover" expanded>
-    <Title title="Hovered Selected Option" theme="light" level={4} />
-    <DxcSelect label="Hovered" defaultValue="1" options={one_option} placeholder="Choose an option" />
-  </ExampleContainer>
-);
-const SelectedOptionActived = () => (
-  <ExampleContainer pseudoState="pseudo-active" expanded>
-    <Title title="Actived Selected Option" theme="light" level={4} />
-    <DxcSelect label="Actived" defaultValue="1" options={one_option} placeholder="Choose an option" />
-  </ExampleContainer>
-);
+
 const MultipleSearchable = () => (
   <ExampleContainer expanded>
     <Title title="Searchable multiple select with value" theme="light" level={4} />
@@ -486,12 +542,20 @@ const MultipleSearchable = () => (
     />
   </ExampleContainer>
 );
-export const OptionsDisplayed = DefaultSelect.bind({});
-OptionsDisplayed.play = async ({ canvasElement }) => {
+
+export const Chromatic = Select.bind({});
+Chromatic.play = async ({ canvasElement }) => {
+  const canvas = within(canvasElement);
+  await userEvent.click(canvas.getAllByRole("combobox")[24]);
+};
+
+export const ListboxStates = SelectListbox.bind({});
+ListboxStates.play = async ({ canvasElement }) => {
   const canvas = within(canvasElement);
   const select = canvas.getByRole("combobox");
   await userEvent.click(select);
 };
+
 export const Searchable = SearchableSelect.bind({});
 Searchable.play = async ({ canvasElement }) => {
   const canvas = within(canvasElement);
@@ -500,14 +564,15 @@ Searchable.play = async ({ canvasElement }) => {
     userEvent.type(canvas.getByRole("combobox"), "r");
   });
 };
-export const SelectSearchableWithValue = SearchableWithValue.bind({});
-SelectSearchableWithValue.play = async ({ canvasElement }) => {
+
+export const SearchableWithValue = SearchValue.bind({});
+SearchableWithValue.play = async ({ canvasElement }) => {
   const canvas = within(canvasElement);
   await userEvent.click(canvas.getByRole("combobox"));
 };
 
-export const SelectMultipleSearchableWithValue = MultipleSearchable.bind({});
-SelectMultipleSearchableWithValue.play = async ({ canvasElement }) => {
+export const MultipleSearchableWithValue = MultipleSearchable.bind({});
+MultipleSearchableWithValue.play = async ({ canvasElement }) => {
   const canvas = within(canvasElement);
   await userEvent.click(canvas.getAllByRole("combobox")[0]);
 };
@@ -519,75 +584,42 @@ GroupOptionsDisplayed.play = async ({ canvasElement }) => {
   await userEvent.click(select);
 };
 
-export const SelectMultipleOptionsDisplayed = MultipleSelect.bind({});
-SelectMultipleOptionsDisplayed.play = async ({ canvasElement }) => {
+export const MultipleOptionsDisplayed = MultipleSelect.bind({});
+MultipleOptionsDisplayed.play = async ({ canvasElement }) => {
   const canvas = within(canvasElement);
   await userEvent.click(canvas.getAllByRole("combobox")[0]);
 };
 
-export const SelectMultipleGroupedOptionsDisplayed = MultipleGroupedOptionsSelect.bind({});
-SelectMultipleGroupedOptionsDisplayed.play = async ({ canvasElement }) => {
-  const canvas = within(canvasElement);
-  const select = canvas.getByRole("combobox");
-  await userEvent.click(select);
-};
-export const SelectWithIconsDisplayed = SelectWithIcons.bind({});
-SelectWithIconsDisplayed.play = async ({ canvasElement }) => {
+export const MultipleGroupedOptionsDisplayed = MultipleGroupedOptionsSelect.bind({});
+MultipleGroupedOptionsDisplayed.play = async ({ canvasElement }) => {
   const canvas = within(canvasElement);
   const select = canvas.getByRole("combobox");
   await userEvent.click(select);
 };
 
-export const SelectWithRescaledIconsDisplayed = RescaledIcons.bind({});
-SelectWithRescaledIconsDisplayed.play = async ({ canvasElement }) => {
-  const canvas = within(canvasElement);
-  const select = canvas.getByRole("combobox");
-  await userEvent.click(select);
-};
-export const SelectMultipleWithIconsDisplayed = SelectMultipleWithIcons.bind({});
-SelectMultipleWithIconsDisplayed.play = async ({ canvasElement }) => {
+export const WithIconsDisplayed = SelectWithIcons.bind({});
+WithIconsDisplayed.play = async ({ canvasElement }) => {
   const canvas = within(canvasElement);
   const select = canvas.getByRole("combobox");
   await userEvent.click(select);
 };
 
-export const SelectMultipleGroupedWithIconsDisplayed = MultipleGroupedOptionsSelectWithIcons.bind({});
-SelectMultipleGroupedWithIconsDisplayed.play = async ({ canvasElement }) => {
+export const WithRescaledIconsDisplayed = RescaledIcons.bind({});
+WithRescaledIconsDisplayed.play = async ({ canvasElement }) => {
   const canvas = within(canvasElement);
   const select = canvas.getByRole("combobox");
   await userEvent.click(select);
 };
 
-export const OptionHovered = OnlyOneOptionHovered.bind({});
-OptionHovered.play = async ({ canvasElement }) => {
+export const MultipleWithIconsDisplayed = SelectMultipleWithIcons.bind({});
+MultipleWithIconsDisplayed.play = async ({ canvasElement }) => {
   const canvas = within(canvasElement);
   const select = canvas.getByRole("combobox");
   await userEvent.click(select);
 };
 
-export const OptionFocused = OnlyOneOptionFocused.bind({});
-OptionFocused.play = async ({ canvasElement }) => {
-  const canvas = within(canvasElement);
-  const select = canvas.getByRole("combobox");
-  await userEvent.click(select);
-  await waitFor(async () => {
-    fireEvent.keyDown(select, { key: "ArrowDown", code: "ArrowDown", keyCode: 40, charCode: 40 });
-  });
-};
-export const OptionActived = OnlyOneOptionActived.bind({});
-OptionActived.play = async ({ canvasElement }) => {
-  const canvas = within(canvasElement);
-  const select = canvas.getByRole("combobox");
-  await userEvent.click(select);
-};
-export const OptionSelectedHovered = SelectedOptionHovered.bind({});
-OptionSelectedHovered.play = async ({ canvasElement }) => {
-  const canvas = within(canvasElement);
-  const select = canvas.getByRole("combobox");
-  await userEvent.click(select);
-};
-export const OptionSelectedActived = SelectedOptionActived.bind({});
-OptionSelectedActived.play = async ({ canvasElement }) => {
+export const MultipleGroupedWithIconsDisplayed = MultipleGroupedOptionsSelectWithIcons.bind({});
+MultipleGroupedWithIconsDisplayed.play = async ({ canvasElement }) => {
   const canvas = within(canvasElement);
   const select = canvas.getByRole("combobox");
   await userEvent.click(select);