@dxc-technology/halstack-react 0.0.0-dcd93c4 → 0.0.0-dcee34a

package/select/Listbox.js

@@ -13,9 +13,7 @@ var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/hel
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _styledComponents = _interopRequireWildcard(require("styled-components"));
-
-var _useTheme = _interopRequireDefault(require("../useTheme"));
+var _styledComponents = _interopRequireDefault(require("styled-components"));
 
 var _useTranslatedLabels = _interopRequireDefault(require("../useTranslatedLabels"));
 
@@ -49,10 +47,9 @@ var Listbox = function Listbox(_ref) {
       searchable = _ref.searchable,
       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 globalIndex = optional && !multiple ? 0 : -1;
 
   var mapOptionFunc = function mapOptionFunc(option, mapIndex) {
     if (option.options) {
@@ -114,9 +111,7 @@ var Listbox = function Listbox(_ref) {
       inline: "start"
     });
   }, [visualFocusIndex]);
-  return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
-    theme: colorsTheme.select
-  }, /*#__PURE__*/_react["default"].createElement(ListboxContainer, {
+  return /*#__PURE__*/_react["default"].createElement(ListboxContainer, {
     id: id,
     onClick: function onClick(event) {
       event.stopPropagation();
@@ -127,7 +122,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),
@@ -139,7 +133,7 @@ var Listbox = function Listbox(_ref) {
     isGroupedOption: false,
     isLastOption: lastOptionIndex === 0,
     isSelected: multiple ? currentValue.includes(optionalItem.value) : currentValue === optionalItem.value
-  }), options.map(mapOptionFunc)));
+  }), options.map(mapOptionFunc));
 };
 
 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) {

package/select/Option.js

@@ -2,8 +2,6 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -13,19 +11,13 @@ var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/hel
 
 var _react = _interopRequireDefault(require("react"));
 
-var _styledComponents = _interopRequireWildcard(require("styled-components"));
-
-var _useTheme = _interopRequireDefault(require("../useTheme"));
+var _styledComponents = _interopRequireDefault(require("styled-components"));
 
 var _Checkbox = _interopRequireDefault(require("../checkbox/Checkbox"));
 
 var _Icons = _interopRequireDefault(require("./Icons"));
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7;
-
-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 || _typeof(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 _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
 
 var Option = function Option(_ref) {
   var id = _ref.id,
@@ -37,10 +29,7 @@ var Option = function Option(_ref) {
       isGroupedOption = _ref$isGroupedOption === void 0 ? false : _ref$isGroupedOption,
       isLastOption = _ref.isLastOption,
       isSelected = _ref.isSelected;
-  var colorsTheme = (0, _useTheme["default"])();
-  return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
-    theme: colorsTheme.select
-  }, /*#__PURE__*/_react["default"].createElement(OptionItem, {
+  return /*#__PURE__*/_react["default"].createElement(OptionItem, {
     id: id,
     onClick: function onClick() {
       _onClick(option);
@@ -62,13 +51,13 @@ var Option = function Option(_ref) {
     grouped: isGroupedOption,
     multiple: multiple,
     role: !(typeof option.icon === "string") ? "img" : undefined
-  }, typeof option.icon === "string" ? /*#__PURE__*/_react["default"].createElement(OptionIconImg, {
+  }, typeof option.icon === "string" ? /*#__PURE__*/_react["default"].createElement("img", {
     src: option.icon
   }) : option.icon), /*#__PURE__*/_react["default"].createElement(OptionContent, {
     grouped: isGroupedOption,
     hasIcon: option.icon ? true : false,
     multiple: multiple
-  }, /*#__PURE__*/_react["default"].createElement(OptionLabel, null, option.label), !multiple && isSelected && /*#__PURE__*/_react["default"].createElement(OptionSelectedIndicator, null, _Icons["default"].selected)))));
+  }, /*#__PURE__*/_react["default"].createElement(OptionLabel, null, option.label), !multiple && isSelected && /*#__PURE__*/_react["default"].createElement(OptionSelectedIndicator, null, _Icons["default"].selected))));
 };
 
 var OptionItem = _styledComponents["default"].li(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  padding: 0 0.5rem;\n  box-shadow: inset 0 0 0 2px transparent;\n  ", "\n  ", ";\n  line-height: 1.715em;\n  cursor: pointer;\n\n  &:hover {\n    ", ";\n  }\n  &:active {\n    ", ";\n  }\n"])), function (props) {
@@ -87,21 +76,19 @@ var StyledOption = _styledComponents["default"].span(_templateObject2 || (_templ
   return props.last || props.visualFocused || props.selected ? "border-bottom: 1px solid transparent" : "border-bottom: 1px solid ".concat(props.theme.listOptionDividerColor);
 });
 
-var OptionIcon = _styledComponents["default"].span(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-wrap: wrap;\n  align-content: center;\n  height: 24px;\n  width: 24px;\n  ", "\n  color: ", ";\n"])), function (props) {
-  return props.grouped && !props.multiple ? "padding-left: 16px;" : "padding-left: 8px;";
+var OptionIcon = _styledComponents["default"].span(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  padding: 0.125rem;\n  margin-left: ", ";\n  color: ", ";\n\n  svg,\n  img {\n    height: 20px;\n    width: 20px;\n  }\n"])), function (props) {
+  return props.grouped && !props.multiple ? "16px" : "8px";
 }, function (props) {
   return props.theme.listOptionIconColor;
 });
 
-var OptionContent = _styledComponents["default"].span(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  justify-content: space-between;\n  width: 100%;\n  overflow: hidden;\n  ", "\n"])), function (props) {
-  return props.grouped && !props.multiple && !props.hasIcon ? "padding-left: 16px;" : "padding-left: 8px;";
+var OptionContent = _styledComponents["default"].span(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  justify-content: space-between;\n  gap: 0.25rem;\n  width: 100%;\n  overflow: hidden;\n  margin-left: ", ";\n"])), function (props) {
+  return props.grouped && !props.multiple && !props.hasIcon ? "16px" : "8px";
 });
 
-var OptionIconImg = _styledComponents["default"].img(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  width: 16px;\n  height: 16px;\n"])));
-
-var OptionLabel = _styledComponents["default"].span(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n"])));
+var OptionLabel = _styledComponents["default"].span(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n"])));
 
-var OptionSelectedIndicator = _styledComponents["default"].span(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  height: 16px;\n  width: 16px;\n  margin-left: 4px;\n  color: ", ";\n"])), function (props) {
+var OptionSelectedIndicator = _styledComponents["default"].span(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  color: ", ";\n\n  svg {\n    width: 16px;\n    height: 16px;\n  }\n"])), function (props) {
   return props.theme.selectedListOptionIconColor;
 });
 

package/select/Select.js

@@ -140,6 +140,28 @@ 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;
 
@@ -169,41 +191,37 @@ 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)(null),
+  var _useState11 = (0, _react.useState)(false),
       _useState12 = (0, _slicedToArray2["default"])(_useState11, 2),
-      listboxStyles = _useState12[0],
-      setListboxStyles = _useState12[1];
+      isOpen = _useState12[0],
+      changeIsOpen = _useState12[1];
 
   var selectRef = (0, _react.useRef)(null);
   var selectSearchInputRef = (0, _react.useRef)(null);
+  var width = useWidth(selectRef.current);
   var colorsTheme = (0, _useTheme["default"])();
   var translatedLabels = (0, _useTranslatedLabels["default"])();
   var optionalItem = {
@@ -281,9 +299,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 +309,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 +318,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 +382,6 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     !multiple && closeOptions();
     setSearchValue("");
   }, [handleSelectChangeValue, closeOptions, multiple]);
-
-  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
-    });
-  };
-
-  (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, {
@@ -400,7 +400,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 +411,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 +419,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 +436,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 +488,9 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     optionalItem: optionalItem,
     searchable: searchable,
     handleOptionOnClick: handleOptionOnClick,
-    styles: listboxStyles
+    styles: {
+      width: width
+    }
   }))), !disabled && typeof error === "string" && /*#__PURE__*/_react["default"].createElement(Error, {
     id: errorId,
     "aria-live": error ? "assertive" : "off"