@dxc-technology/halstack-react 9.0.1 → 10.0.0

package/sidenav/Sidenav.js

@@ -33,56 +33,19 @@ var _Flex = _interopRequireDefault(require("../flex/Flex"));
 
 var _Bleed = _interopRequireDefault(require("../bleed/Bleed"));
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8;
+var _Icons = _interopRequireDefault(require("./Icons"));
 
-var _excluded = ["href", "children", "newWindow", "selected", "icon", "tabIndex", "onClick"];
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7;
+
+var _excluded = ["href", "newWindow", "selected", "icon", "onClick", "tabIndex", "children"];
 
 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 collapsedIcon = /*#__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("path", {
-  d: "M0 0h24v24H0z",
-  fill: "none"
-}), /*#__PURE__*/_react["default"].createElement("path", {
-  d: "M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"
-}));
-
-var collapsableIcon = /*#__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("path", {
-  d: "M0 0h24v24H0z",
-  fill: "none"
-}), /*#__PURE__*/_react["default"].createElement("path", {
-  d: "M12 8l-6 6 1.41 1.41L12 10.83l4.59 4.58L18 14z"
-}));
-
-var externalLinkIcon = /*#__PURE__*/_react["default"].createElement("svg", {
-  xmlns: "http://www.w3.org/2000/svg",
-  height: "24",
-  viewBox: "0 0 24 24",
-  width: "24",
-  fill: "currentColor"
-}, /*#__PURE__*/_react["default"].createElement("path", {
-  d: "M0 0h24v24H0z",
-  fill: "none"
-}), /*#__PURE__*/_react["default"].createElement("path", {
-  d: "M19 19H5V5h7V3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"
-}));
-
 var DxcSidenav = function DxcSidenav(_ref) {
-  var children = _ref.children,
-      title = _ref.title;
+  var title = _ref.title,
+      children = _ref.children;
   var colorsTheme = (0, _useTheme["default"])();
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.sidenav
@@ -91,9 +54,7 @@ var DxcSidenav = function DxcSidenav(_ref) {
   }, title, /*#__PURE__*/_react["default"].createElement(_Flex["default"], {
     direction: "column",
     gap: "1rem"
-  }, _react["default"].Children.map(children, function (child, index) {
-    return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, child, index !== _react["default"].Children.count(children) - 1 && /*#__PURE__*/_react["default"].createElement(Divider, null));
-  })))));
+  }, children))));
 };
 
 var Title = function Title(_ref2) {
@@ -105,58 +66,63 @@ var Title = function Title(_ref2) {
 
 var Section = function Section(_ref3) {
   var children = _ref3.children;
-  return /*#__PURE__*/_react["default"].createElement(_Bleed["default"], {
+  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_Bleed["default"], {
     horizontal: "1rem"
   }, /*#__PURE__*/_react["default"].createElement(_Flex["default"], {
     direction: "column"
-  }, children));
+  }, children)), /*#__PURE__*/_react["default"].createElement(Divider, null));
 };
 
+var GroupContext = /*#__PURE__*/_react["default"].createContext(null);
+
 var Group = function Group(_ref4) {
-  var children = _ref4.children,
-      title = _ref4.title,
+  var title = _ref4.title,
       _ref4$collapsable = _ref4.collapsable,
       collapsable = _ref4$collapsable === void 0 ? false : _ref4$collapsable,
-      icon = _ref4.icon;
+      icon = _ref4.icon,
+      children = _ref4.children;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
       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;
+  var _useState3 = (0, _react.useState)(false),
+      _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
+      isSelected = _useState4[0],
+      changeIsSelected = _useState4[1];
 
-      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",
+  return /*#__PURE__*/_react["default"].createElement(GroupContext.Provider, {
+    value: changeIsSelected
+  }, /*#__PURE__*/_react["default"].createElement(SidenavGroup, null, collapsable && title ? /*#__PURE__*/_react["default"].createElement(SidenavGroupTitleButton, {
     "aria-expanded": !collapsed,
     onClick: function onClick() {
       return setCollapsed(!collapsed);
     },
-    selectedGroup: selectedGroup
-  }, /*#__PURE__*/_react["default"].createElement(SidenavContent, null, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement("img", {
+    selectedGroup: collapsed && isSelected
+  }, /*#__PURE__*/_react["default"].createElement(_Flex["default"], {
+    alignItems: "center",
+    gap: "0.5rem"
+  }, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement("img", {
     src: icon
-  }) : icon, title), collapsed ? collapsedIcon : collapsableIcon) : title && /*#__PURE__*/_react["default"].createElement(SidenavGroupTitle, null, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement("img", {
+  }) : icon, title), collapsed ? _Icons["default"].collapsedIcon : _Icons["default"].collapsableIcon) : title && /*#__PURE__*/_react["default"].createElement(SidenavGroupTitle, null, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement("img", {
     src: icon
-  }) : icon, title), !collapsed && children);
+  }) : icon, title), !collapsed && children));
 };
 
 var Link = /*#__PURE__*/(0, _react.forwardRef)(function (_ref5, ref) {
   var href = _ref5.href,
-      children = _ref5.children,
       _ref5$newWindow = _ref5.newWindow,
       newWindow = _ref5$newWindow === void 0 ? false : _ref5$newWindow,
       _ref5$selected = _ref5.selected,
       selected = _ref5$selected === void 0 ? false : _ref5$selected,
       icon = _ref5.icon,
+      onClick = _ref5.onClick,
       _ref5$tabIndex = _ref5.tabIndex,
       tabIndex = _ref5$tabIndex === void 0 ? 0 : _ref5$tabIndex,
-      onClick = _ref5.onClick,
+      children = _ref5.children,
       otherProps = (0, _objectWithoutProperties2["default"])(_ref5, _excluded);
+  var changeIsGroupSelected = (0, _react.useContext)(GroupContext);
   var setIsSidenavVisibleResponsive = (0, _SidenavContext.useResponsiveSidenavVisibility)();
 
   var handleClick = function handleClick($event) {
@@ -164,6 +130,11 @@ var Link = /*#__PURE__*/(0, _react.forwardRef)(function (_ref5, ref) {
     setIsSidenavVisibleResponsive === null || setIsSidenavVisibleResponsive === void 0 ? void 0 : setIsSidenavVisibleResponsive(false);
   };
 
+  (0, _react.useEffect)(function () {
+    changeIsGroupSelected === null || changeIsGroupSelected === void 0 ? void 0 : changeIsGroupSelected(function (isGroupSelected) {
+      return !isGroupSelected ? selected : isGroupSelected;
+    });
+  }, [selected, changeIsGroupSelected]);
   return /*#__PURE__*/_react["default"].createElement(SidenavLink, (0, _extends2["default"])({
     selected: selected,
     href: href ? href : undefined,
@@ -171,20 +142,23 @@ var Link = /*#__PURE__*/(0, _react.forwardRef)(function (_ref5, ref) {
     ref: ref,
     tabIndex: tabIndex,
     onClick: handleClick
-  }, otherProps), /*#__PURE__*/_react["default"].createElement(SidenavContent, null, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement("img", {
+  }, otherProps), /*#__PURE__*/_react["default"].createElement(_Flex["default"], {
+    alignItems: "center",
+    gap: "0.5rem"
+  }, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement("img", {
     src: icon
-  }) : icon, children), newWindow && externalLinkIcon);
+  }) : icon, children), newWindow && _Icons["default"].externalLinkIcon);
 });
 
-var SidenavContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: column;\n  background-color: ", ";\n  box-sizing: border-box;\n  width: 280px;\n  @media (max-width: ", "rem) {\n    width: 100vw;\n  }\n\n  height: 100%;\n  padding: 2rem 1rem;\n\n  overflow-y: auto;\n  overflow-x: hidden;\n  ::-webkit-scrollbar {\n    width: 2px;\n  }\n  ::-webkit-scrollbar-track {\n    background-color: ", ";\n    border-radius: 3px;\n  }\n  ::-webkit-scrollbar-thumb {\n    background-color: ", ";\n    border-radius: 3px;\n  }\n"])), function (props) {
+var SidenavContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\n  display: flex;\n  flex-direction: column;\n  width: 280px;\n  @media (max-width: ", "rem) {\n    width: 100vw;\n  }\n  padding: 2rem 1rem;\n  background-color: ", ";\n\n  overflow-y: auto;\n  overflow-x: hidden;\n  ::-webkit-scrollbar {\n    width: 2px;\n  }\n  ::-webkit-scrollbar-track {\n    background-color: ", ";\n    border-radius: 3px;\n  }\n  ::-webkit-scrollbar-thumb {\n    background-color: ", ";\n    border-radius: 3px;\n  }\n"])), _variables.responsiveSizes.medium, function (props) {
   return props.theme.backgroundColor;
-}, _variables.responsiveSizes.medium, function (props) {
+}, function (props) {
   return props.theme.scrollBarTrackColor;
 }, function (props) {
   return props.theme.scrollBarThumbColor;
 });
 
-var SidenavTitle = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  font-size: ", ";\n  line-height: 27px;\n  display: flex;\n  align-items: center;\n  color: ", ";\n  text-transform: ", ";\n  letter-spacing: ", ";\n  padding: 0.5rem 1.2rem;\n\n  svg {\n    margin-right: 0.5rem;\n  }\n"])), function (props) {
+var SidenavTitle = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  padding: 0.5rem 1.2rem;\n  font-family: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  font-size: ", ";\n  color: ", ";\n  letter-spacing: ", ";\n  text-transform: ", ";\n"])), function (props) {
   return props.theme.titleFontFamily;
 }, function (props) {
   return props.theme.titleFontStyle;
@@ -194,17 +168,17 @@ var SidenavTitle = _styledComponents["default"].div(_templateObject2 || (_templa
   return props.theme.titleFontSize;
 }, function (props) {
   return props.theme.titleFontColor;
-}, function (props) {
-  return props.theme.titleFontTextTransform;
 }, function (props) {
   return props.theme.titleFontLetterSpacing;
+}, function (props) {
+  return props.theme.titleFontTextTransform;
 });
 
-var Divider = _styledComponents["default"].div(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  width: 100%;\n  height: 1px;\n  background-color: #999999;\n"])));
+var Divider = _styledComponents["default"].div(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  width: 100%;\n  height: 1px;\n  background-color: #999999;\n\n  &:last-child {\n    display: none;\n  }\n"])));
 
-var SidenavGroup = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  width: 100%;\n  a {\n    padding: 0.5rem 1.2rem 0.5rem 2.25rem;\n  }\n"])));
+var SidenavGroup = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  a {\n    padding: 0.5rem 1.2rem 0.5rem 2.25rem;\n  }\n"])));
 
-var SidenavGroupTitle = _styledComponents["default"].span(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\n  display: flex;\n  align-items: center;\n  gap: 0.5rem;\n  width: 100%;\n  padding: 0.5rem 1.2rem;\n  font-family: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  font-size: ", ";\n  line-height: 18px;\n\n  img,\n  svg {\n    height: 16px;\n    width: 16px;\n  }\n"])), function (props) {
+var SidenavGroupTitle = _styledComponents["default"].span(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\n  display: flex;\n  align-items: center;\n  gap: 0.5rem;\n  padding: 0.5rem 1.2rem;\n  font-family: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  font-size: ", ";\n\n  img,\n  svg {\n    height: 16px;\n    width: 16px;\n  }\n"])), function (props) {
   return props.theme.groupTitleFontFamily;
 }, function (props) {
   return props.theme.groupTitleFontStyle;
@@ -214,7 +188,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  box-sizing: border-box;\n  display: flex;\n  align-items: center;\n  justify-content: space-between;\n  width: 100%;\n  padding: 0.5rem 1.2rem;\n\n  font-family: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  font-size: ", ";\n  line-height: 19px;\n\n  cursor: pointer;\n\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\n  svg {\n    height: 16px;\n    width: 16px;\n  }\n"])), function (props) {
+var SidenavGroupTitleButton = _styledComponents["default"].button(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  all: unset;\n  box-sizing: border-box;\n  display: flex;\n  align-items: center;\n  justify-content: space-between;\n  width: 100%;\n  padding: 0.5rem 1.2rem;\n  font-family: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  font-size: ", ";\n  cursor: pointer;\n\n  ", "\n\n  &:focus, &:focus-visible {\n    outline: 2px solid ", ";\n    outline-offset: -2px;\n  }\n  &:hover {\n    ", "\n  }\n  &:active {\n    color: #fff;\n    background-color: ", ";\n  }\n\n  img,\n  svg {\n    height: 16px;\n    width: 16px;\n  }\n"])), function (props) {
   return props.theme.groupTitleFontFamily;
 }, function (props) {
   return props.theme.groupTitleFontStyle;
@@ -223,24 +197,16 @@ var SidenavGroupTitleButton = _styledComponents["default"].button(_templateObjec
 }, function (props) {
   return props.theme.groupTitleFontSize;
 }, function (props) {
-  return props.theme.linkFocusColor;
-}, function (props) {
-  return props.selectedGroup ? "color: ".concat(props.theme.groupTitleSelectedHoverFontColor, "; background: ").concat(props.theme.groupTitleSelectedHoverBackgroundColor, ";") : "color: ".concat(props.theme.groupTitleFontColor, "; background: ").concat(props.theme.groupTitleHoverBackgroundColor, ";");
+  return props.selectedGroup ? "color: ".concat(props.theme.groupTitleSelectedFontColor, "; background-color: ").concat(props.theme.groupTitleSelectedBackgroundColor, ";") : "color: ".concat(props.theme.groupTitleFontColor, "; background-color: transparent;");
 }, function (props) {
-  return props.theme.groupTitleActiveBackgroundColor;
+  return props.theme.linkFocusColor;
 }, function (props) {
-  return props.theme.groupTitleFontColor;
+  return props.selectedGroup ? "color: ".concat(props.theme.groupTitleSelectedHoverFontColor, "; background-color: ").concat(props.theme.groupTitleSelectedHoverBackgroundColor, ";") : "color: ".concat(props.theme.groupTitleFontColor, "; background-color: ").concat(props.theme.groupTitleHoverBackgroundColor, ";");
 }, function (props) {
-  return props.selectedGroup ? "color: ".concat(props.theme.groupTitleSelectedFontColor, "; background: ").concat(props.theme.groupTitleSelectedBackgroundColor, ";") : "color: ".concat(props.theme.groupTitleFontColor, "; background: transparent;");
+  return props.selectedGroup ? "#333" : props.theme.groupTitleActiveBackgroundColor;
 });
 
-var SidenavLink = _styledComponents["default"].a(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  justify-content: space-between;\n  gap: 0.5rem;\n  padding: 0.5rem 1.2rem;\n  box-shadow: 0 0 0 2px transparent;\n  letter-spacing: ", ";\n  text-transform: ", ";\n  text-decoration: ", ";\n  font-family: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  font-size: ", ";\n  line-height: 19px;\n\n  ", "\n\n  cursor: pointer;\n\n  &:hover {\n    ", "\n  }\n  &:focus {\n    outline: 2px solid ", ";\n    outline-offset: -2px;\n  }\n  &:active {\n    color: #ffffff;\n    background: #4d4d4d;\n    outline: 2px solid #0095ff;\n    outline-offset: -2px;\n  }\n\n  svg {\n    height: 16px;\n    width: 16px;\n  }\n"])), function (props) {
-  return props.theme.linkFontLetterSpacing;
-}, function (props) {
-  return props.theme.linkFontTextTransform;
-}, function (props) {
-  return props.theme.linkTextDecoration;
-}, function (props) {
+var SidenavLink = _styledComponents["default"].a(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  justify-content: space-between;\n  gap: 0.5rem;\n  padding: 0.5rem 1.2rem;\n  box-shadow: 0 0 0 2px transparent;\n  font-family: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  font-size: ", ";\n  letter-spacing: ", ";\n  text-transform: ", ";\n  text-decoration: ", ";\n  cursor: pointer;\n\n  ", "\n\n  &:focus, &:focus-visible {\n    outline: 2px solid ", ";\n    outline-offset: -2px;\n  }\n  &:hover {\n    ", "\n  }\n  &:active {\n    color: #fff;\n    background-color: ", ";\n    outline: 2px solid #0095ff;\n    outline-offset: -2px;\n  }\n\n  img,\n  svg {\n    height: 16px;\n    width: 16px;\n  }\n"])), function (props) {
   return props.theme.linkFontFamily;
 }, function (props) {
   return props.theme.linkFontStyle;
@@ -249,15 +215,21 @@ var SidenavLink = _styledComponents["default"].a(_templateObject7 || (_templateO
 }, function (props) {
   return props.theme.linkFontSize;
 }, function (props) {
-  return props.selected ? "color: ".concat(props.theme.linkSelectedFontColor, "; background: ").concat(props.theme.linkSelectedBackgroundColor, ";") : "color: ".concat(props.theme.linkFontColor, "; background: transparent;");
+  return props.theme.linkFontLetterSpacing;
 }, function (props) {
-  return props.selected ? "color: ".concat(props.theme.linkSelectedHoverFontColor, "; background: ").concat(props.theme.linkSelectedHoverBackgroundColor, ";") : "color: ".concat(props.theme.linkFontColor, "; background: ").concat(props.theme.linkHoverBackgroundColor, ";");
+  return props.theme.linkFontTextTransform;
+}, function (props) {
+  return props.theme.linkTextDecoration;
+}, function (props) {
+  return props.selected ? "color: ".concat(props.theme.linkSelectedFontColor, "; background-color: ").concat(props.theme.linkSelectedBackgroundColor, ";") : "color: ".concat(props.theme.linkFontColor, "; background-color: transparent;");
 }, function (props) {
   return props.theme.linkFocusColor;
+}, function (props) {
+  return props.selected ? "color: ".concat(props.theme.linkSelectedHoverFontColor, "; background-color: ").concat(props.theme.linkSelectedHoverBackgroundColor, ";") : "color: ".concat(props.theme.linkFontColor, "; background-color: ").concat(props.theme.linkHoverBackgroundColor, ";");
+}, function (props) {
+  return props.selected ? "#333" : "#4d4d4d";
 });
 
-var SidenavContent = _styledComponents["default"].span(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  gap: 0.5rem;\n\n  img,\n  svg {\n    height: 16px;\n    width: 16px;\n  }\n"])));
-
 DxcSidenav.Section = Section;
 DxcSidenav.Group = Group;
 DxcSidenav.Link = Link;

package/sidenav/Sidenav.stories.tsx

@@ -1,5 +1,7 @@
 import React from "react";
 import DxcSidenav from "./Sidenav";
+import DxcSelect from "../select/Select";
+import DxcInset from "../inset/Inset";
 import Title from "../../.storybook/components/Title";
 import ExampleContainer from "../../.storybook/components/ExampleContainer";
 import { userEvent, within } from "@storybook/testing-library";
@@ -150,13 +152,13 @@ export const Chromatic = () => (
   </>
 );
 
-const CollapsedGroup = () => (
+const CollapsedGroupSidenav = () => (
   <>
     <ExampleContainer>
-      <Title title="Default sidenav" theme="light" level={4} />
+      <Title title="Collapsed group with a selected link" theme="light" level={4} />
       <DxcSidenav title={<DxcSidenav.Title>Dxc technology</DxcSidenav.Title>}>
         <DxcSidenav.Section>
-          <DxcSidenav.Group collapsable={true} title="Collapsable Group" icon={iconSVG}>
+          <DxcSidenav.Group collapsable={true} title="Collapsed Group" icon={iconSVG}>
             <DxcSidenav.Link>Group Link</DxcSidenav.Link>
             <DxcSidenav.Link>Group Link</DxcSidenav.Link>
             <DxcSidenav.Link>Group Link</DxcSidenav.Link>
@@ -164,11 +166,11 @@ const CollapsedGroup = () => (
           </DxcSidenav.Group>
         </DxcSidenav.Section>
         <DxcSidenav.Section>
-          <DxcSidenav.Group collapsable={true} title="Collapsable Group">
-            <DxcSidenav.Link selected>Group Link</DxcSidenav.Link>
+          <DxcSidenav.Group collapsable={true} title="Collapsed Group">
             <DxcSidenav.Link>Group Link</DxcSidenav.Link>
+            <DxcSidenav.Link selected>Group Link</DxcSidenav.Link>
           </DxcSidenav.Group>
-          <DxcSidenav.Group collapsable={false} title="Section Group">
+          <DxcSidenav.Group collapsable={true} title="Section Group">
             <DxcSidenav.Link>Group Link</DxcSidenav.Link>
             <DxcSidenav.Link>Group Link</DxcSidenav.Link>
             <DxcSidenav.Link>Group Link</DxcSidenav.Link>
@@ -179,14 +181,14 @@ const CollapsedGroup = () => (
   </>
 );
 
-const HoverSidenav = () => (
+const HoveredGroupSidenav = () => (
   <ExampleContainer pseudoState="pseudo-hover">
-    <Title title="Default sidenav" theme="light" level={4} />
+    <Title title="Hover state for groups (selected and not)" theme="light" level={4} />
     <DxcSidenav title={<DxcSidenav.Title>Dxc technology</DxcSidenav.Title>}>
       <DxcSidenav.Section>
         <DxcSidenav.Link>Single Link</DxcSidenav.Link>
         <DxcSidenav.Link>Single Link</DxcSidenav.Link>
-        <DxcSidenav.Group collapsable={true} title="Collapsable Group">
+        <DxcSidenav.Group collapsable={true} title="Collapsed Group">
           <DxcSidenav.Link selected>Group Link</DxcSidenav.Link>
           <DxcSidenav.Link>Group Link</DxcSidenav.Link>
           <DxcSidenav.Link>Group Link</DxcSidenav.Link>
@@ -200,13 +202,12 @@ const HoverSidenav = () => (
         </DxcSidenav.Group>
         <DxcSidenav.Link>Single Link</DxcSidenav.Link>
         <DxcSidenav.Link>Single Link</DxcSidenav.Link>
-        <DxcSidenav.Group collapsable={true} title="Collapsable Group">
+        <DxcSidenav.Group collapsable={true} title="Collapsed Group">
           <DxcSidenav.Link>Group Link</DxcSidenav.Link>
           <DxcSidenav.Link>Group Link</DxcSidenav.Link>
           <DxcSidenav.Link>Group Link</DxcSidenav.Link>
         </DxcSidenav.Group>
-
-        <DxcSidenav.Group collapsable={true} title="Collapsable Group">
+        <DxcSidenav.Group collapsable={true} title="Collapsed Group">
           <DxcSidenav.Link>Group Link</DxcSidenav.Link>
           <DxcSidenav.Link>Group Link</DxcSidenav.Link>
           <DxcSidenav.Link>Group Link</DxcSidenav.Link>
@@ -216,67 +217,66 @@ const HoverSidenav = () => (
   </ExampleContainer>
 );
 
-const HoverSidenavOpinionated = () => (
-  <ExampleContainer pseudoState="pseudo-hover">
-    <Title title="Default sidenav" theme="light" level={4} />
-    <HalstackProvider theme={opinionatedTheme}>
-      <DxcSidenav title={<DxcSidenav.Title>Dxc technology</DxcSidenav.Title>}>
-        <DxcSidenav.Section>
-          <DxcSidenav.Link>Single Link</DxcSidenav.Link>
-          <DxcSidenav.Link>Single Link</DxcSidenav.Link>
-          <DxcSidenav.Group collapsable={true} title="Collapsable Group">
-            <DxcSidenav.Link selected>Group Link</DxcSidenav.Link>
-            <DxcSidenav.Link>Group Link</DxcSidenav.Link>
-            <DxcSidenav.Link>Group Link</DxcSidenav.Link>
-            <DxcSidenav.Link>Group Link</DxcSidenav.Link>
-          </DxcSidenav.Group>
-        </DxcSidenav.Section>
-        <DxcSidenav.Section>
-          <DxcSidenav.Group collapsable={true} title="Not Collapsed Group">
-            <DxcSidenav.Link selected>Group Link</DxcSidenav.Link>
-            <DxcSidenav.Link>Group Link</DxcSidenav.Link>
-          </DxcSidenav.Group>
-          <DxcSidenav.Link>Single Link</DxcSidenav.Link>
-          <DxcSidenav.Link>Single Link</DxcSidenav.Link>
-          <DxcSidenav.Group collapsable={true} title="Collapsable Group">
-            <DxcSidenav.Link>Group Link</DxcSidenav.Link>
-            <DxcSidenav.Link>Group Link</DxcSidenav.Link>
-            <DxcSidenav.Link>Group Link</DxcSidenav.Link>
-          </DxcSidenav.Group>
-          <DxcSidenav.Group collapsable={true} title="Collapsable Group">
-            <DxcSidenav.Link>Group Link</DxcSidenav.Link>
-            <DxcSidenav.Link>Group Link</DxcSidenav.Link>
-            <DxcSidenav.Link>Group Link</DxcSidenav.Link>
-          </DxcSidenav.Group>
-        </DxcSidenav.Section>
-      </DxcSidenav>
-    </HalstackProvider>
+const ActiveGroupSidenav = () => (
+  <ExampleContainer pseudoState="pseudo-active">
+    <Title title="Active state for groups (selected and not)" theme="light" level={4} />
+    <DxcSidenav title={<DxcSidenav.Title>Dxc technology</DxcSidenav.Title>}>
+      <DxcSidenav.Section>
+        <DxcInset space="1rem">
+          <DxcSelect
+            defaultValue="1"
+            options={[
+              { label: "v1.0.0", value: "1" },
+              { label: "v2.0.0", value: "2" },
+              { label: "v3.0.0", value: "3" },
+              { label: "v4.0.0", value: "4" },
+            ]}
+            size="fillParent"
+          />
+        </DxcInset>
+      </DxcSidenav.Section>
+      <DxcSidenav.Section>
+        <DxcSidenav.Group collapsable={true} title="Collapsed Group">
+          <DxcSidenav.Link selected>Group Link</DxcSidenav.Link>
+          <DxcSidenav.Link>Group Link</DxcSidenav.Link>
+          <DxcSidenav.Link>Group Link</DxcSidenav.Link>
+          <DxcSidenav.Link>Group Link</DxcSidenav.Link>
+        </DxcSidenav.Group>
+      </DxcSidenav.Section>
+      <DxcSidenav.Section>
+        <DxcSidenav.Group collapsable={true} title="Not Collapsed Group">
+          <DxcSidenav.Link selected>Group Link</DxcSidenav.Link>
+          <DxcSidenav.Link>Group Link</DxcSidenav.Link>
+        </DxcSidenav.Group>
+        <DxcSidenav.Link>Single Link</DxcSidenav.Link>
+        <DxcSidenav.Link>Single Link</DxcSidenav.Link>
+      </DxcSidenav.Section>
+    </DxcSidenav>
   </ExampleContainer>
 );
 
-export const CollapseGroup = CollapsedGroup.bind({});
-CollapseGroup.play = async ({ canvasElement }) => {
+export const CollapsableGroup = CollapsedGroupSidenav.bind({});
+CollapsableGroup.play = async ({ canvasElement }) => {
   const canvas = within(canvasElement);
-  const collapsableGroups = canvas.getAllByText("Collapsable Group");
+  const collapsableGroups = canvas.getAllByText("Collapsed Group");
   collapsableGroups.forEach((group) => {
     userEvent.click(group);
   });
 };
 
-export const CollapseHoverGroup = HoverSidenav.bind({});
-CollapseHoverGroup.play = async ({ canvasElement }) => {
+export const CollapsedHoverGroup = HoveredGroupSidenav.bind({});
+CollapsedHoverGroup.play = async ({ canvasElement }) => {
   const canvas = within(canvasElement);
-  const collapsableGroups = canvas.getAllByText("Collapsable Group");
+  const collapsableGroups = canvas.getAllByText("Collapsed Group");
   collapsableGroups.forEach((group) => {
     userEvent.click(group);
   });
+  await new Promise((resolve) => setTimeout(resolve, 1000));
 };
 
-export const CollapseHoverGroupOpinionated = HoverSidenavOpinionated.bind({});
-CollapseHoverGroupOpinionated.play = async ({ canvasElement }) => {
+export const CollapsedActiveGroup = ActiveGroupSidenav.bind({});
+CollapsedActiveGroup.play = async ({ canvasElement }) => {
   const canvas = within(canvasElement);
-  const collapsableGroups = canvas.getAllByText("Collapsable Group");
-  collapsableGroups.forEach((group) => {
-    userEvent.click(group);
-  });
-};
+  const collapsableGroups = canvas.getAllByText("Collapsed Group");
+  userEvent.click(collapsableGroups[0]);
+};

package/sidenav/types.d.ts

@@ -1,14 +1,14 @@
 /// <reference types="react" />
 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.
-     */
-    children: React.ReactNode;
     /**
      * The area assigned to render the sidenav title. It is highly recommended to use the sidenav title.
      */
     title?: React.ReactNode;
+    /**
+     * The area inside the sidenav. This area can be used to render the content inside the sidenav.
+     */
+    children: React.ReactNode;
 };
 export declare type SidenavTitlePropsType = {
     /**
@@ -23,28 +23,25 @@ export declare type SidenavSectionPropsType = {
     children: React.ReactNode;
 };
 export declare type SidenavGroupPropsType = {
-    /**
-     * The area inside the sidenav group. This area can be used to render sidenav links.
-     */
-    children: React.ReactNode;
     /**
      * The title of the sidenav group.
      */
     title?: string;
     /**
-     * If true the sidenav group title will be considered a button and the group will be collapsable.
+     * If true, the sidenav group will be a button that will allow you to collapse the links contained within it.
+     * In addition, if it's collapsed and contains the currently selected link, the group title will also be marked as selected.
      */
     collapsable?: boolean;
     /**
      * The icon to be displayed next to the title of the group.
      */
     icon?: string | SVG;
-};
-export declare type SidenavLinkPropsType = {
     /**
-     * Value of the tabindex.
+     * The area inside the sidenav group. This area can be used to render sidenav links.
      */
-    tabIndex?: number;
+    children: React.ReactNode;
+};
+export declare type SidenavLinkPropsType = {
     /**
      * Page to be opened when the user clicks on the link.
      */
@@ -58,16 +55,22 @@ export declare type SidenavLinkPropsType = {
      */
     icon?: string | SVG;
     /**
-     * If true, the link will be marked as selected. This can also affect the group if it is closed to indicate that one of its links is selected.
+     * If true, the link will be marked as selected. Moreover, in that same case,
+     * if it is contained within a collapsed group, and consequently, the currently selected link is not visible,
+     * the group title will appear as selected too.
      */
     selected?: boolean;
     /**
-     * The area inside the sidenav link.
+     * This function will be called when the user clicks the link and the event will be passed to this function.
      */
-    children: string;
+    onClick?: ($event: React.MouseEvent<HTMLAnchorElement>) => void;
     /**
-     * This function will be called when the user clicks the link.
+     * Value of the tabindex.
+     */
+    tabIndex?: number;
+    /**
+     * The area inside the sidenav link.
      */
-    onClick?: ($event: any) => void;
+    children: React.ReactNode;
 };
 export default SidenavPropsType;

package/tabs/Tab.js

@@ -42,7 +42,6 @@ var Tab = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     type: "button",
     tabIndex: tabIndex,
     disabled: tab.isDisabled,
-    "aria-disabled": tab.isDisabled,
     "aria-selected": active,
     hasLabelAndIcon: hasLabelAndIcon,
     iconPosition: iconPosition,
@@ -82,7 +81,7 @@ var Tab = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   })));
 });
 
-var TabContainer = _styledComponents["default"].button(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  text-transform: ", ";\n  overflow: hidden;\n  flex-shrink: 0;\n  border: 0;\n  cursor: pointer;\n  display: inline-flex;\n  align-items: center;\n  user-select: none;\n  vertical-align: middle;\n  justify-content: center;\n  min-width: 90px;\n  max-width: 360px;\n  padding: ", ";\n  height: ", ";\n  min-height: ", ";\n  background-color: ", ";\n\n  &:hover {\n    background-color: ", ";\n  }\n  &:active {\n    background-color: ", ";\n  }\n  &:focus {\n    outline: ", " solid 1px;\n    outline-offset: -1px;\n  }\n  svg {\n    color: ", ";\n  }\n\n  &[aria-selected=\"true\"] {\n    background-color: ", ";\n    svg {\n      color: ", ";\n    }\n    opacity: 1;\n  }\n\n  &[aria-disabled=\"true\"] {\n    background-color: ", " !important;\n    cursor: not-allowed !important;\n    pointer-events: all;\n    font-style: ", ";\n    svg {\n      color: ", ";\n    }\n    outline: none !important;\n    > div {\n      opacity: 0.5;\n    }\n  }\n"])), function (props) {
+var TabContainer = _styledComponents["default"].button(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  text-transform: ", ";\n  overflow: hidden;\n  flex-shrink: 0;\n  border: 0;\n  cursor: pointer;\n  display: inline-flex;\n  align-items: center;\n  user-select: none;\n  vertical-align: middle;\n  justify-content: center;\n  min-width: 90px;\n  max-width: 360px;\n  padding: ", ";\n  height: ", ";\n  min-height: ", ";\n  background-color: ", ";\n\n  &:hover {\n    background-color: ", ";\n  }\n  &:active {\n    background-color: ", ";\n  }\n  &:focus {\n    outline: ", " solid 1px;\n    outline-offset: -1px;\n  }\n  svg {\n    color: ", ";\n  }\n\n  &[aria-selected=\"true\"] {\n    background-color: ", ";\n    svg {\n      color: ", ";\n    }\n    opacity: 1;\n  }\n\n  &:disabled {\n    background-color: ", " !important;\n    cursor: not-allowed !important;\n    pointer-events: all;\n    font-style: ", ";\n    outline: none !important;\n\n    svg {\n      color: ", ";\n    }\n    > div {\n      opacity: 0.5;\n    }\n  }\n"])), function (props) {
   return props.theme.fontTextTransform;
 }, function (props) {
   return (!props.hasLabelAndIcon || props.hasLabelAndIcon && props.iconPosition !== "top") && "12px 16px" || "8px 16px";