@dxc-technology/halstack-react 0.0.0-ebf4fe2 → 0.0.0-ec06b53

package/select/Listbox.js

@@ -11,6 +11,8 @@ exports["default"] = void 0;
 
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
@@ -48,10 +50,16 @@ var Listbox = function Listbox(_ref) {
       optionalItem = _ref.optionalItem,
       searchable = _ref.searchable,
       handleOptionOnClick = _ref.handleOptionOnClick,
-      styles = _ref.styles;
+      getSelectWidth = _ref.getSelectWidth;
   var colorsTheme = (0, _useTheme["default"])();
   var translatedLabels = (0, _useTranslatedLabels["default"])();
   var listboxRef = (0, _react.useRef)(null);
+
+  var _useState = (0, _react.useState)(null),
+      _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+      styles = _useState2[0],
+      setStyles = _useState2[1];
+
   var globalIndex = optional && !multiple ? 0 : -1; // index for options, starting from 0 to options.length -1
 
   var mapOptionFunc = function mapOptionFunc(option, mapIndex) {
@@ -114,6 +122,22 @@ var Listbox = function Listbox(_ref) {
       inline: "start"
     });
   }, [visualFocusIndex]);
+
+  var handleResize = function handleResize() {
+    setStyles({
+      width: getSelectWidth()
+    });
+  };
+
+  (0, _react.useLayoutEffect)(function () {
+    handleResize();
+  }, [getSelectWidth]);
+  (0, _react.useEffect)(function () {
+    window.addEventListener("resize", handleResize);
+    return function () {
+      window.removeEventListener("resize", handleResize);
+    };
+  }, [getSelectWidth]);
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.select
   }, /*#__PURE__*/_react["default"].createElement(ListboxContainer, {
@@ -127,7 +151,6 @@ var Listbox = function Listbox(_ref) {
     ref: listboxRef,
     role: "listbox",
     "aria-multiselectable": multiple,
-    "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),

package/select/Select.js

@@ -197,11 +197,6 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
       isOpen = _useState10[0],
       changeIsOpen = _useState10[1];
 
-  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 colorsTheme = (0, _useTheme["default"])();
@@ -281,9 +276,9 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
   };
 
   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;
@@ -291,8 +286,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;
@@ -300,15 +295,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;
 
@@ -365,23 +359,12 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     !multiple && closeOptions();
     setSearchValue("");
   }, [handleSelectChangeValue, closeOptions, multiple]);
-
-  var handleListboxResize = function handleListboxResize() {
+  var getSelectWidth = (0, _react.useCallback)(function () {
     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
-    });
-  };
-
-  (0, _react.useEffect)(function () {
-    handleListboxResize();
-    window.addEventListener("resize", handleListboxResize);
-    return function () {
-      window.removeEventListener("resize", handleListboxResize);
-    };
-  }, [setListboxStyles]);
+    return rect === null || rect === void 0 ? void 0 : rect.width;
+  }, []);
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.select
   }, /*#__PURE__*/_react["default"].createElement(SelectContainer, {
@@ -400,7 +383,8 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
   }, helperText), /*#__PURE__*/_react["default"].createElement(Popover.Root, {
     open: isOpen
   }, /*#__PURE__*/_react["default"].createElement(Popover.Trigger, {
-    asChild: true
+    asChild: true,
+    type: undefined
   }, /*#__PURE__*/_react["default"].createElement(Select, {
     id: selectId,
     disabled: disabled,
@@ -410,7 +394,7 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     onFocus: handleSelectOnFocus,
     onKeyDown: handleSelectOnKeyDown,
     ref: selectRef,
-    tabIndex: tabIndex,
+    tabIndex: disabled ? -1 : tabIndex,
     role: "combobox",
     "aria-controls": optionsListId,
     "aria-disabled": disabled,
@@ -418,7 +402,7 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     "aria-haspopup": "listbox",
     "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, {
@@ -435,6 +419,7 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     "aria-label": translatedLabels.select.actionClearSelectionTitle
   }, _Icons["default"].clear)), /*#__PURE__*/_react["default"].createElement(SearchableValueContainer, null, /*#__PURE__*/_react["default"].createElement(ValueInput, {
     name: name,
+    disabled: disabled,
     value: multiple ? (value !== null && value !== void 0 ? value : innerValue).join(",") : value !== null && value !== void 0 ? value : innerValue,
     readOnly: true,
     "aria-hidden": "true"
@@ -486,7 +471,7 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     optionalItem: optionalItem,
     searchable: searchable,
     handleOptionOnClick: handleOptionOnClick,
-    styles: listboxStyles
+    getSelectWidth: getSelectWidth
   }))), !disabled && typeof error === "string" && /*#__PURE__*/_react["default"].createElement(Error, {
     id: errorId,
     "aria-live": error ? "assertive" : "off"

package/select/Select.stories.tsx

@@ -379,7 +379,7 @@ const SelectListbox = () => (
         optionalItem={{ label: "Empty", value: "" }}
         searchable={false}
         handleOptionOnClick={() => {}}
-        styles={{ width: 360 }}
+        getSelectWidth={() => 360}
       />
     </ExampleContainer>
     <ExampleContainer pseudoState="pseudo-active">
@@ -395,7 +395,8 @@ const SelectListbox = () => (
         optionalItem={{ label: "Empty", value: "" }}
         searchable={false}
         handleOptionOnClick={() => {}}
-        styles={{ width: 360 }}
+        getSelectWidth={() => 360}
+
       />
     </ExampleContainer>
     <ExampleContainer>
@@ -411,7 +412,7 @@ const SelectListbox = () => (
         optionalItem={{ label: "Empty", value: "" }}
         searchable={false}
         handleOptionOnClick={() => {}}
-        styles={{ width: 360 }}
+        getSelectWidth={() => 360}
       />
     </ExampleContainer>
     <ExampleContainer pseudoState="pseudo-hover">
@@ -427,7 +428,7 @@ const SelectListbox = () => (
         optionalItem={{ label: "Empty", value: "" }}
         searchable={false}
         handleOptionOnClick={() => {}}
-        styles={{ width: 360 }}
+        getSelectWidth={() => 360}
       />
     </ExampleContainer>
     <ExampleContainer pseudoState="pseudo-active">
@@ -443,7 +444,7 @@ const SelectListbox = () => (
         optionalItem={{ label: "Empty", value: "" }}
         searchable={false}
         handleOptionOnClick={() => {}}
-        styles={{ width: 360 }}
+        getSelectWidth={() => 360}
       />
     </ExampleContainer>
   </>