@dxc-technology/halstack-react 6.0.0 → 6.2.0

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, {
@@ -410,7 +393,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 +401,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, {
@@ -486,7 +469,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>
   </>

package/select/Select.test.js

@@ -306,7 +306,7 @@ var grouped_icon_options = [{
   }]
 }];
 describe("Select component tests", function () {
-  test("Renders with correct label", function () {
+  test("When clicking the label, the focus goes to the select", function () {
     var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Select["default"], {
       label: "test-select-label",
       helperText: "test-select-helper-text",
@@ -317,40 +317,18 @@ describe("Select component tests", function () {
 
     var select = getByRole("combobox");
     var label = getByText("test-select-label");
-    expect(label).toBeTruthy();
 
     _userEvent["default"].click(label);
 
     expect(document.activeElement).toEqual(select);
   });
-  test("Renders with correct helper text and placeholder", function () {
+  test("Renders with correct aria attributes when is in error state", function () {
     var _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Select["default"], {
-      label: "test-select-label",
-      helperText: "test-select-helper-text",
-      placeholder: "Example text"
-    })),
-        getByText = _render2.getByText;
-
-    expect(getByText("test-select-helper-text")).toBeTruthy();
-    expect(getByText("Example text")).toBeTruthy();
-  });
-  test("Renders with correct optional label", function () {
-    var _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Select["default"], {
-      label: "test-select-label",
-      optional: true
-    })),
-        getByText = _render3.getByText;
-
-    expect(getByText("test-select-label")).toBeTruthy();
-    expect(getByText("(Optional)")).toBeTruthy();
-  });
-  test("Renders with error message and correct aria attributes", function () {
-    var _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Select["default"], {
       label: "Error label",
       error: "Error message."
     })),
-        getByText = _render4.getByText,
-        getByRole = _render4.getByRole;
+        getByText = _render2.getByText,
+        getByRole = _render2.getByRole;
 
     var select = getByRole("combobox");
     var errorMessage = getByText("Error message.");
@@ -360,13 +338,13 @@ describe("Select component tests", function () {
     expect(errorMessage.getAttribute("aria-live")).toBe("assertive");
   });
   test("Renders with correct aria attributes", function () {
-    var _render5 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Select["default"], {
+    var _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Select["default"], {
       label: "test-select-label",
       placeholder: "Example",
       options: single_options
     })),
-        getByText = _render5.getByText,
-        getByRole = _render5.getByRole;
+        getByText = _render3.getByText,
+        getByRole = _render3.getByRole;
 
     var select = getByRole("combobox");
     var label = getByText("test-select-label");
@@ -385,17 +363,17 @@ describe("Select component tests", function () {
     expect(list.getAttribute("aria-multiselectable")).toBe("false");
   });
   test("Single selection: Renders with correct default value", function () {
-    var _render6 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Select["default"], {
+    var _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Select["default"], {
       label: "test-select-label",
       name: "test",
       defaultValue: "4",
       options: single_options
     })),
-        getByText = _render6.getByText,
-        getByRole = _render6.getByRole,
-        getAllByRole = _render6.getAllByRole,
-        queryByRole = _render6.queryByRole,
-        container = _render6.container;
+        getByText = _render4.getByText,
+        getByRole = _render4.getByRole,
+        getAllByRole = _render4.getAllByRole,
+        queryByRole = _render4.queryByRole,
+        container = _render4.container;
 
     var select = getByRole("combobox");
     var submitInput = container.querySelector("input[name=\"test\"]");
@@ -413,18 +391,18 @@ describe("Select component tests", function () {
     expect(submitInput.value).toBe("8");
   });
   test("Multiple selection: Renders with correct default value", function () {
-    var _render7 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Select["default"], {
+    var _render5 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Select["default"], {
       label: "test-select-label",
       name: "test",
       defaultValue: ["4", "2", "6"],
       options: single_options,
       multiple: true
     })),
-        getByText = _render7.getByText,
-        getByRole = _render7.getByRole,
-        getAllByRole = _render7.getAllByRole,
-        queryByRole = _render7.queryByRole,
-        container = _render7.container;
+        getByText = _render5.getByText,
+        getByRole = _render5.getByRole,
+        getAllByRole = _render5.getAllByRole,
+        queryByRole = _render5.queryByRole,
+        container = _render5.container;
 
     var select = getByRole("combobox");
     var submitInput = container.querySelector("input[name=\"test\"]");
@@ -443,18 +421,15 @@ describe("Select component tests", function () {
     expect(getByText("Option 02, Option 03, Option 04, Option 06")).toBeTruthy();
     expect(submitInput.value).toBe("4,2,6,3");
   });
-  test("Disabled select - Clear all options action must be shown but not clickable", function () {
-    var _render8 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Select["default"], {
+  test("Disabled select - Cannot gain focus or open the listbox via click", function () {
+    var _render6 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Select["default"], {
       label: "test-select-label",
       value: ["1", "2"],
       options: single_options,
-      disabled: true,
-      searchable: true,
-      multiple: true
+      disabled: true
     })),
-        getByRole = _render8.getByRole,
-        getByText = _render8.getByText,
-        queryByRole = _render8.queryByRole;
+        getByRole = _render6.getByRole,
+        queryByRole = _render6.queryByRole;
 
     var select = getByRole("combobox");
     expect(select.getAttribute("aria-disabled")).toBe("true");
@@ -462,12 +437,49 @@ describe("Select component tests", function () {
     _userEvent["default"].click(select);
 
     expect(queryByRole("listbox")).toBeFalsy();
+    expect(document.activeElement === select).toBeFalsy();
+  });
+  test("Disabled select - Clear all options action must be shown but not clickable", function () {
+    var _render7 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Select["default"], {
+      label: "test-select-label",
+      value: ["1", "2"],
+      options: single_options,
+      disabled: true,
+      searchable: true,
+      multiple: true
+    })),
+        getByRole = _render7.getByRole,
+        getByText = _render7.getByText;
 
     _userEvent["default"].click(getByRole("button"));
 
     expect(getByText("Option 01, Option 02")).toBeTruthy();
   });
-  test("Focused select does not open the listbox", function () {
+  test("Disabled select - Does not call onBlur event", function () {
+    var onBlur = jest.fn();
+
+    var _render8 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Select["default"], {
+      label: "test-select-label",
+      options: single_options,
+      disabled: true,
+      onBlur: onBlur
+    })),
+        getByRole = _render8.getByRole;
+
+    var select = getByRole("combobox");
+
+    _userEvent["default"].click(select);
+
+    _react2.fireEvent.keyDown(getByRole("combobox"), {
+      key: "Tab",
+      code: "Tab",
+      keyCode: 9,
+      charCode: 9
+    });
+
+    expect(onBlur).not.toHaveBeenCalled();
+  });
+  test("Disabled select - When the component gains the focus, the listbox does not open", function () {
     var _render9 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Select["default"], {
       label: "test-select-label",
       value: ["1", "2"],
@@ -484,6 +496,7 @@ describe("Select component tests", function () {
     _react2.fireEvent.focus(select);
 
     expect(queryByRole("listbox")).toBeFalsy();
+    expect(document.activeElement === select).toBeFalsy();
   });
   test("Controlled - Single selection - Not optional constraint", function () {
     var onChange = jest.fn();

package/select/types.d.ts

@@ -6,7 +6,7 @@ declare type Margin = {
     left?: Space;
     right?: Space;
 };
-declare type SVG = React.SVGProps<SVGSVGElement>;
+declare type SVG = React.ReactNode & React.SVGProps<SVGSVGElement>;
 declare type OptionGroup = {
     /**
      * Label of the group to be shown in the select's listbox.
@@ -201,9 +201,7 @@ export declare type ListboxProps = {
     optionalItem: Option;
     searchable: boolean;
     handleOptionOnClick: (option: Option) => void;
-    styles: {
-        width: number;
-    };
+    getSelectWidth: () => number;
 };
 /**
  * Reference to the select component.

package/sidenav/Sidenav.js

@@ -124,12 +124,20 @@ var Group = function Group(_ref4) {
       collapsed = _useState2[0],
       setCollapsed = _useState2[1];
 
+  var selectedGroup = (0, _react.useMemo)(function () {
+    return collapsed ? _react["default"].Children.toArray(children).some(function (child) {
+      var _child$props;
+
+      return (_child$props = child["props"]) === null || _child$props === void 0 ? void 0 : _child$props.selected;
+    }) : false;
+  }, [collapsed, children]);
   return /*#__PURE__*/_react["default"].createElement(SidenavGroup, null, collapsable && title ? /*#__PURE__*/_react["default"].createElement(SidenavGroupTitleButton, {
     role: "button",
     "aria-expanded": !collapsed,
     onClick: function onClick() {
       return setCollapsed(!collapsed);
-    }
+    },
+    selectedGroup: selectedGroup
   }, /*#__PURE__*/_react["default"].createElement(SidenavContent, null, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement(SidenavIcon, {
     src: icon
   }) : icon, title), collapsed ? collapsedIcon : collapsableIcon) : title && /*#__PURE__*/_react["default"].createElement(SidenavGroupTitle, null, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement(SidenavIcon, {
@@ -206,7 +214,7 @@ var SidenavGroupTitle = _styledComponents["default"].span(_templateObject5 || (_
   return props.theme.groupTitleFontSize;
 });
 
-var SidenavGroupTitleButton = _styledComponents["default"].button(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  all: unset;\n  cursor: pointer;\n  justify-content: space-between;\n  box-sizing: border-box;\n  width: 100%;\n\n  font-family: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  font-size: ", ";\n  line-height: 19px;\n\n  display: flex;\n  align-items: center;\n  margin: 0px;\n  padding: 0.5rem 1.2rem;\n  &:focus {\n    outline: 2px solid ", ";\n    outline-offset: -2px;\n  }\n  &:hover {\n    background-color: ", ";\n  }\n  &:active {\n    background-color: ", ";\n  }\n\n  svg {\n    width: 18px;\n    height: auto;\n  }\n"])), function (props) {
+var SidenavGroupTitleButton = _styledComponents["default"].button(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  all: unset;\n  cursor: pointer;\n  justify-content: space-between;\n  box-sizing: border-box;\n  width: 100%;\n\n  font-family: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  font-size: ", ";\n  line-height: 19px;\n\n  display: flex;\n  align-items: center;\n  margin: 0px;\n  padding: 0.5rem 1.2rem;\n  &:focus-visible {\n    outline: 2px solid ", ";\n    outline-offset: -2px;\n  }\n  &:hover {\n    ", "\n  }\n  &:active {\n    background-color: ", ";\n    color: ", ";\n  }\n  ", "\n  svg {\n    width: 18px;\n    height: auto;\n  }\n"])), function (props) {
   return props.theme.groupTitleFontFamily;
 }, function (props) {
   return props.theme.groupTitleFontStyle;
@@ -217,9 +225,13 @@ var SidenavGroupTitleButton = _styledComponents["default"].button(_templateObjec
 }, function (props) {
   return props.theme.linkFocusColor;
 }, function (props) {
-  return props.theme.groupTitleHoverBackgroundColor;
+  return props.selectedGroup ? "color: ".concat(props.theme.groupTitleSelectedHoverFontColor, "; background: ").concat(props.theme.groupTitleSelectedHoverBackgroundColor, ";") : "color: ".concat(props.theme.groupTitleFontColor, "; background: ").concat(props.theme.groupTitleHoverBackgroundColor, ";");
 }, function (props) {
   return props.theme.groupTitleActiveBackgroundColor;
+}, function (props) {
+  return props.theme.groupTitleFontColor;
+}, function (props) {
+  return props.selectedGroup ? "color: ".concat(props.theme.groupTitleSelectedFontColor, "; background: ").concat(props.theme.groupTitleSelectedBackgroundColor, ";") : "color: ".concat(props.theme.groupTitleFontColor, "; background: transparent;");
 });
 
 var SidenavLink = _styledComponents["default"].a(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  letter-spacing: ", ";\n\n  text-transform: ", ";\n  text-decoration: ", ";\n\n  font-family: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  font-size: ", ";\n  line-height: 19px;\n\n  ", "\n\n  display: flex;\n  align-items: center;\n  justify-content: space-between;\n\n  box-shadow: 0 0 0 2px transparent;\n\n  padding: 0.5rem 1.2rem;\n\n  cursor: pointer;\n  svg {\n    width: 16px;\n    margin-right: 0.5rem;\n  }\n\n  &:hover {\n    ", "\n  }\n\n  &:focus {\n    outline: 2px solid ", ";\n    outline-offset: -2px;\n  }\n\n  &:active {\n    color: #ffffff;\n    background: #4d4d4d;\n    outline: 2px solid #0095ff;\n    outline-offset: -2px;\n  }\n"])), function (props) {

package/sidenav/types.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-declare type SVG = React.SVGProps<SVGSVGElement>;
+declare type SVG = React.ReactNode & React.SVGProps<SVGSVGElement>;
 declare type SidenavPropsType = {
     /**
      * The area inside the sidenav. This area can be used to render the content inside the sidenav.