@dxc-technology/halstack-react 12.0.2 → 12.2.0

package/contextual-menu/ContextualMenu.js

@@ -10,11 +10,12 @@ var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/hel
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
-var _styledComponents = _interopRequireDefault(require("styled-components"));
+var _styledComponents = _interopRequireWildcard(require("styled-components"));
 var _coreTokens = _interopRequireDefault(require("../common/coreTokens"));
 var _Divider = _interopRequireDefault(require("../divider/Divider"));
 var _Inset = _interopRequireDefault(require("../inset/Inset"));
 var _MenuItem = _interopRequireDefault(require("./MenuItem"));
+var _useTheme = _interopRequireDefault(require("../useTheme"));
 var _templateObject, _templateObject2, _templateObject3;
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
@@ -48,15 +49,20 @@ var DxcContextualMenu = function DxcContextualMenu(_ref) {
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     selectedItemId = _useState2[0],
     setSelectedItemId = _useState2[1];
+  var contextualMenuRef = (0, _react.useRef)(null);
   var itemsWithId = (0, _react.useMemo)(function () {
     return addIdToItems(items);
   }, [items]);
+  var colorsTheme = (0, _useTheme["default"])();
   var renderSection = function renderSection(section, currentSectionIndex, length) {
     return /*#__PURE__*/_react["default"].createElement(_react.Fragment, {
       key: "section-".concat(currentSectionIndex)
     }, /*#__PURE__*/_react["default"].createElement("li", {
-      role: "group"
-    }, section.title != null && /*#__PURE__*/_react["default"].createElement(Title, null, section.title), /*#__PURE__*/_react["default"].createElement(SectionList, null, section.items.map(function (item, index) {
+      role: "group",
+      "aria-labelledby": section.title
+    }, section.title != null && /*#__PURE__*/_react["default"].createElement(Title, {
+      id: section.title
+    }, section.title), /*#__PURE__*/_react["default"].createElement(SectionList, null, section.items.map(function (item, index) {
       return /*#__PURE__*/_react["default"].createElement(_MenuItem["default"], {
         item: item,
         key: "".concat(item.label, "-").concat(index)
@@ -68,8 +74,26 @@ var DxcContextualMenu = function DxcContextualMenu(_ref) {
       color: "lightGrey"
     })));
   };
-  return /*#__PURE__*/_react["default"].createElement(ContextualMenu, {
-    role: "menu"
+  var _useState3 = (0, _react.useState)(true),
+    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
+    firstUpdate = _useState4[0],
+    setFirstUpdate = _useState4[1];
+  (0, _react.useLayoutEffect)(function () {
+    if (selectedItemId !== -1 && firstUpdate) {
+      var _contextualMenuEl$scr;
+      var contextualMenuEl = contextualMenuRef === null || contextualMenuRef === void 0 ? void 0 : contextualMenuRef.current;
+      var selectedItemEl = contextualMenuEl === null || contextualMenuEl === void 0 ? void 0 : contextualMenuEl.querySelector("[aria-selected='true']");
+      contextualMenuEl === null || contextualMenuEl === void 0 ? void 0 : (_contextualMenuEl$scr = contextualMenuEl.scrollTo) === null || _contextualMenuEl$scr === void 0 ? void 0 : _contextualMenuEl$scr.call(contextualMenuEl, {
+        top: (selectedItemEl === null || selectedItemEl === void 0 ? void 0 : selectedItemEl.offsetTop) - (contextualMenuEl === null || contextualMenuEl === void 0 ? void 0 : contextualMenuEl.clientHeight) / 2
+      });
+      setFirstUpdate(false);
+    }
+  }, [firstUpdate, selectedItemId]);
+  return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
+    theme: colorsTheme.contextualMenu
+  }, /*#__PURE__*/_react["default"].createElement(ContextualMenu, {
+    role: "menu",
+    ref: contextualMenuRef
   }, /*#__PURE__*/_react["default"].createElement(ContextualMenuContext.Provider, {
     value: {
       selectedItemId: selectedItemId,
@@ -80,9 +104,33 @@ var DxcContextualMenu = function DxcContextualMenu(_ref) {
       item: item,
       key: "".concat(item.label, "-").concat(index)
     });
-  })));
+  }))));
 };
-var ContextualMenu = _styledComponents["default"].ul(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\n  margin: 0;\n  border: 1px solid ", ";\n  border-radius: 0.25rem;\n  padding: ", " ", ";\n  display: grid;\n  gap: ", ";\n  min-width: 248px;\n  max-height: 100%;\n  background-color: ", ";\n  overflow-y: auto;\n  &::-webkit-scrollbar {\n    width: 8px;\n    height: 8px;\n  }\n  &::-webkit-scrollbar-thumb {\n    background-color: ", ";\n    border-radius: 0.25rem;\n  }\n  &::-webkit-scrollbar-track {\n    background-color: ", ";\n    border-radius: 0.25rem;\n  }\n"])), _coreTokens["default"].color_grey_200, _coreTokens["default"].spacing_16, _coreTokens["default"].spacing_8, _coreTokens["default"].spacing_4, _coreTokens["default"].color_white, _coreTokens["default"].color_grey_700, _coreTokens["default"].color_grey_300);
+var ContextualMenu = _styledComponents["default"].ul(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\n  margin: 0;\n  border: 1px solid ", ";\n  border-radius: 0.25rem;\n  padding: ", " ", ";\n  display: grid;\n  gap: ", ";\n  min-width: 248px;\n  max-height: 100%;\n  background-color: ", ";\n  overflow-y: auto;\n  &::-webkit-scrollbar {\n    width: 8px;\n    height: 8px;\n  }\n  &::-webkit-scrollbar-thumb {\n    background-color: ", ";\n    border-radius: 0.25rem;\n  }\n  &::-webkit-scrollbar-track {\n    background-color: ", ";\n    border-radius: 0.25rem;\n  }\n"])), function (_ref2) {
+  var theme = _ref2.theme;
+  return theme.borderColor;
+}, _coreTokens["default"].spacing_16, _coreTokens["default"].spacing_8, _coreTokens["default"].spacing_4, function (_ref3) {
+  var theme = _ref3.theme;
+  return theme.backgroundColor;
+}, _coreTokens["default"].color_grey_700, _coreTokens["default"].color_grey_300);
 var SectionList = _styledComponents["default"].ul(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  list-style: none;\n  margin: 0;\n  padding: 0;\n  display: grid;\n  gap: ", ";\n"])), _coreTokens["default"].spacing_4);
-var Title = _styledComponents["default"].span(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  margin: 0 0 ", " 0;\n  padding: ", ";\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-weight: ", ";\n  line-height: 24px;\n"])), _coreTokens["default"].spacing_4, _coreTokens["default"].spacing_4, _coreTokens["default"].color_grey_900, _coreTokens["default"].type_sans, _coreTokens["default"].type_scale_03, _coreTokens["default"].type_semibold);
+var Title = _styledComponents["default"].h2(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  margin: 0 0 ", " 0;\n  padding: ", ";\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: ", ";\n"])), _coreTokens["default"].spacing_4, _coreTokens["default"].spacing_4, function (_ref4) {
+  var theme = _ref4.theme;
+  return theme.sectionTitleFontColor;
+}, function (_ref5) {
+  var theme = _ref5.theme;
+  return theme.fontFamily;
+}, function (_ref6) {
+  var theme = _ref6.theme;
+  return theme.sectionTitleFontSize;
+}, function (_ref7) {
+  var theme = _ref7.theme;
+  return theme.sectionTitleFontStyle;
+}, function (_ref8) {
+  var theme = _ref8.theme;
+  return theme.sectionTitleFontWeight;
+}, function (_ref9) {
+  var theme = _ref9.theme;
+  return theme.sectionTitleLineHeight;
+});
 var _default = exports["default"] = DxcContextualMenu;

package/contextual-menu/ContextualMenu.stories.tsx

@@ -4,10 +4,11 @@ import DxcContextualMenu, { ContextualMenuContext } from "./ContextualMenu";
 import DxcContainer from "../container/Container";
 import SingleItem from "./SingleItem";
 import ExampleContainer from "../../.storybook/components/ExampleContainer";
-import { userEvent, within } from "@storybook/testing-library";
 import DxcBadge from "../badge/Badge";
 import { disabledRules } from "../../test/accessibility/rules/specific/contextual-menu/disabledRules";
 import preview from "../../.storybook/preview";
+import { ThemeProvider } from "styled-components";
+import useTheme from "../useTheme";
 
 export default {
   title: "Contextual Menu",
@@ -29,7 +30,7 @@ const items = [{ label: "Item 1" }, { label: "Item 2" }, { label: "Item 3" }, {
 
 const sections = [
   {
-    title: "Team repositories",
+    title: "Section title",
     items: [{ label: "Approved locations" }, { label: "Approved locations" }, { label: "Approved locations" }],
   },
   {
@@ -54,7 +55,7 @@ const groupItems = [
                 icon: "bookmark",
                 badge: <DxcBadge color="purple" label="Experimental" />,
               },
-              { label: "Selected Item 3" },
+              { label: "Selected Item 3", selectedByDefault: true },
             ],
           },
         ],
@@ -77,7 +78,7 @@ const itemsWithIcon = [
   {
     label: "Item 1",
     icon: (
-      <svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24">
+      <svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24" fill="currentColor">
         <path d="M200-120v-640q0-33 23.5-56.5T280-840h400q33 0 56.5 23.5T760-760v640L480-240 200-120Zm80-122 200-86 200 86v-518H280v518Zm0-518h400-400Z" />
       </svg>
     ),
@@ -114,7 +115,7 @@ const sectionsWithScroll = [
       { label: "Approved locations" },
       { label: "Approved locations" },
       { label: "Approved locations" },
-      { label: "Approved locations" },
+      { label: "Approved locations", selectedByDefault: true },
     ],
   },
 ];
@@ -124,7 +125,7 @@ const itemsWithTruncatedText = [
     label: "Item with a very long label that should be truncated",
     badge: <DxcBadge color="green" label="New" />,
     icon: (
-      <svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24">
+      <svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24" fill="currentColor">
         <path d="M200-120v-640q0-33 23.5-56.5T280-840h400q33 0 56.5 23.5T760-760v640L480-240 200-120Zm80-122 200-86 200 86v-518H280v518Zm0-518h400-400Z" />
       </svg>
     ),
@@ -135,7 +136,7 @@ const itemsWithTruncatedText = [
   },
 ];
 
-const ContextualMenu = () => (
+export const Chromatic = () => (
   <>
     <Title title="Default" theme="light" level={3} />
     <ExampleContainer>
@@ -171,7 +172,7 @@ const ContextualMenu = () => (
         <DxcContextualMenu items={itemsWithTruncatedText} />
       </DxcContainer>
     </ExampleContainer>
-    <Title title="With scroll" theme="light" level={3} />
+    <Title title="With auto-scroll" theme="light" level={3} />
     <ExampleContainer>
       <DxcContainer height="300px" width="300px">
         <DxcContextualMenu items={sectionsWithScroll} />
@@ -186,47 +187,45 @@ const ContextualMenu = () => (
   </>
 );
 
-export const Chromatic = ContextualMenu.bind({});
-Chromatic.play = async ({ canvasElement }) => {
-  const canvas = within(canvasElement);
-  await userEvent.click(canvas.getByText("Grouped Item 1"));
-  await userEvent.click(canvas.getByText("Grouped Item 2"));
-  await userEvent.click(canvas.getByText("Selected Item 3"));
-};
+export const SingleItemStates = () => {
+  const colorsTheme = useTheme();
 
-export const SingleItemStates = () => (
-  <DxcContainer width="300px">
-    <ContextualMenuContext.Provider value={{ selectedItemId: -1, setSelectedItemId: () => {} }}>
-      <Title title="Default" theme="light" level={3} />
-      <ExampleContainer>
-        <SingleItem {...items[0]} id={0} depthLevel={0} />
-      </ExampleContainer>
-      <Title title="Focus" theme="light" level={3} />
-      <ExampleContainer pseudoState="pseudo-focus">
-        <SingleItem {...items[0]} id={0} depthLevel={0} />
-      </ExampleContainer>
-      <Title title="Hover" theme="light" level={3} />
-      <ExampleContainer pseudoState="pseudo-hover">
-        <SingleItem {...items[0]} id={0} depthLevel={0} />
-      </ExampleContainer>
-      <Title title="Active" theme="light" level={3} />
-      <ExampleContainer pseudoState="pseudo-active">
-        <SingleItem {...items[0]} id={0} depthLevel={0} />
-      </ExampleContainer>
-    </ContextualMenuContext.Provider>
-    <ContextualMenuContext.Provider value={{ selectedItemId: 0, setSelectedItemId: () => {} }}>
-      <Title title="Selected" theme="light" level={3} />
-      <ExampleContainer>
-        <SingleItem {...items[0]} id={0} depthLevel={0} />
-      </ExampleContainer>
-      <Title title="Selected hover" theme="light" level={3} />
-      <ExampleContainer pseudoState="pseudo-hover">
-        <SingleItem {...items[0]} id={0} depthLevel={0} />
-      </ExampleContainer>
-      <Title title="Selected active" theme="light" level={3} />
-      <ExampleContainer pseudoState="pseudo-active">
-        <SingleItem {...items[0]} id={0} depthLevel={0} />
-      </ExampleContainer>
-    </ContextualMenuContext.Provider>
-  </DxcContainer>
-);
+  return (
+    <ThemeProvider theme={colorsTheme.contextualMenu}>
+      <DxcContainer width="300px">
+        <ContextualMenuContext.Provider value={{ selectedItemId: -1, setSelectedItemId: () => {} }}>
+          <Title title="Default" theme="light" level={3} />
+          <ExampleContainer>
+            <SingleItem {...items[0]} id={0} depthLevel={0} />
+          </ExampleContainer>
+          <Title title="Focus" theme="light" level={3} />
+          <ExampleContainer pseudoState="pseudo-focus">
+            <SingleItem {...items[0]} id={0} depthLevel={0} />
+          </ExampleContainer>
+          <Title title="Hover" theme="light" level={3} />
+          <ExampleContainer pseudoState="pseudo-hover">
+            <SingleItem {...items[0]} id={0} depthLevel={0} />
+          </ExampleContainer>
+          <Title title="Active" theme="light" level={3} />
+          <ExampleContainer pseudoState="pseudo-active">
+            <SingleItem {...items[0]} id={0} depthLevel={0} />
+          </ExampleContainer>
+        </ContextualMenuContext.Provider>
+        <ContextualMenuContext.Provider value={{ selectedItemId: 0, setSelectedItemId: () => {} }}>
+          <Title title="Selected" theme="light" level={3} />
+          <ExampleContainer>
+            <SingleItem {...items[0]} id={0} depthLevel={0} />
+          </ExampleContainer>
+          <Title title="Selected hover" theme="light" level={3} />
+          <ExampleContainer pseudoState="pseudo-hover">
+            <SingleItem {...items[0]} id={0} depthLevel={0} />
+          </ExampleContainer>
+          <Title title="Selected active" theme="light" level={3} />
+          <ExampleContainer pseudoState="pseudo-active">
+            <SingleItem {...items[0]} id={0} depthLevel={0} />
+          </ExampleContainer>
+        </ContextualMenuContext.Provider>
+      </DxcContainer>
+    </ThemeProvider>
+  );
+};

package/contextual-menu/ContextualMenu.test.js

@@ -60,144 +60,186 @@ var groups = [{
   label: "Item 8"
 }];
 describe("Contextual menu component tests", function () {
-  test("Default - Renders with correct aria attributes", function () {
-    var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ContextualMenu["default"], {
-        items: items
-      })),
-      getAllByRole = _render.getAllByRole,
-      getByRole = _render.getByRole;
-    expect(getAllByRole("menuitem").length).toBe(4);
-    var actions = getAllByRole("button");
-    expect(actions[0].getAttribute("aria-selected")).toBeTruthy();
-    expect(getByRole("menu")).toBeTruthy();
-  });
-  test("Group - Group items collapse when clicked", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-    var _render2, queryByText, getByText, getAllByRole, group1;
+  test("Single - Renders with correct aria attributes", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+    var _render, getAllByRole, getByRole, actions;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ContextualMenu["default"], {
+          _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ContextualMenu["default"], {
+            items: items
+          })), getAllByRole = _render.getAllByRole, getByRole = _render.getByRole;
+          expect(getAllByRole("menuitem").length).toBe(4);
+          actions = getAllByRole("button");
+          _context.next = 5;
+          return _userEvent["default"].click(actions[0]);
+        case 5:
+          expect(actions[0].getAttribute("aria-selected")).toBeTruthy();
+          expect(getByRole("menu")).toBeTruthy();
+        case 7:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })));
+  test("Single - An item can appear as selected by default by using the attribute selectedByDefault", function () {
+    var test = [{
+      label: "Tested item",
+      selectedByDefault: true
+    }];
+    var _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ContextualMenu["default"], {
+        items: test
+      })),
+      getByRole = _render2.getByRole;
+    var item = getByRole("button");
+    expect(item.getAttribute("aria-selected")).toBeTruthy();
+  });
+  test("Group - Group items collapse when clicked", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+    var _render3, queryByText, getByText;
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ContextualMenu["default"], {
             items: groups
-          })), queryByText = _render2.queryByText, getByText = _render2.getByText, getAllByRole = _render2.getAllByRole;
-          group1 = getAllByRole("button")[0];
-          _context.next = 4;
+          })), queryByText = _render3.queryByText, getByText = _render3.getByText;
+          _context2.next = 3;
           return _userEvent["default"].click(getByText("Grouped Item 1"));
-        case 4:
+        case 3:
           expect(getByText("Item 1")).toBeTruthy();
           expect(getByText("Grouped Item 2")).toBeTruthy();
-          _context.next = 8;
+          _context2.next = 7;
           return _userEvent["default"].click(getByText("Grouped Item 2"));
-        case 8:
+        case 7:
           expect(getByText("Item 2")).toBeTruthy();
           expect(getByText("Item 3")).toBeTruthy();
-          _context.next = 12;
+          _context2.next = 11;
           return _userEvent["default"].click(getByText("Grouped Item 1"));
-        case 12:
+        case 11:
           expect(queryByText("Item 1")).toBeFalsy();
           expect(queryByText("Item 2")).toBeFalsy();
           expect(queryByText("Item 3")).toBeFalsy();
-        case 15:
+        case 14:
         case "end":
-          return _context.stop();
+          return _context2.stop();
       }
-    }, _callee);
+    }, _callee2);
   })));
-  test("Group - Renders with correct aria attributes", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-    var _render3, getByText, getAllByRole, group1, actions;
-    return _regenerator["default"].wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
+  test("Group - Renders with correct aria attributes", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+    var _render4, getAllByRole, group1, optionToBeClicked;
+    return _regenerator["default"].wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ContextualMenu["default"], {
+          _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ContextualMenu["default"], {
             items: groups
-          })), getByText = _render3.getByText, getAllByRole = _render3.getAllByRole;
+          })), getAllByRole = _render4.getAllByRole;
           group1 = getAllByRole("button")[0];
-          _context2.next = 4;
+          _context3.next = 4;
           return _userEvent["default"].click(group1);
         case 4:
           expect(group1.getAttribute("aria-expanded")).toBeTruthy();
           expect(group1.getAttribute("aria-controls")).toBe(getAllByRole("list")[0].id);
-          _context2.next = 8;
-          return _userEvent["default"].click(getByText("Grouped Item 2"));
+          _context3.next = 8;
+          return _userEvent["default"].click(getAllByRole("button")[2]);
         case 8:
-          _context2.next = 10;
-          return _userEvent["default"].click(getByText("Grouped Item 3"));
+          _context3.next = 10;
+          return _userEvent["default"].click(getAllByRole("button")[6]);
         case 10:
           expect(getAllByRole("menuitem").length).toBe(10);
-          actions = getAllByRole("button");
-          expect(actions[4].getAttribute("aria-selected")).toBeTruthy();
-        case 13:
+          optionToBeClicked = getAllByRole("button")[4];
+          _context3.next = 14;
+          return _userEvent["default"].click(optionToBeClicked);
+        case 14:
+          expect(optionToBeClicked.getAttribute("aria-selected")).toBeTruthy();
+        case 15:
         case "end":
-          return _context2.stop();
+          return _context3.stop();
       }
-    }, _callee2);
+    }, _callee3);
   })));
-  test("Group - Collapsed groups render as selected when containing a selected item", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
-    var _render4, getAllByRole, group1, group2, item;
-    return _regenerator["default"].wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
+  test("Group - A grouped item, selected by default, must be visible (expanded group) in the first render of the component", function () {
+    var test = [{
+      label: "Grouped item",
+      items: [{
+        label: "Tested item",
+        selectedByDefault: true
+      }]
+    }];
+    var _render5 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ContextualMenu["default"], {
+        items: test
+      })),
+      getByText = _render5.getByText,
+      getAllByRole = _render5.getAllByRole;
+    expect(getByText("Tested item")).toBeTruthy();
+    expect(getAllByRole("button")[1].getAttribute("aria-selected")).toBeTruthy();
+  });
+  test("Group - Collapsed groups render as selected when containing a selected item", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
+    var _render6, getAllByRole, group1, group2, item;
+    return _regenerator["default"].wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
         case 0:
-          _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ContextualMenu["default"], {
+          _render6 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ContextualMenu["default"], {
             items: groups
-          })), getAllByRole = _render4.getAllByRole;
+          })), getAllByRole = _render6.getAllByRole;
           group1 = getAllByRole("button")[0];
-          _context3.next = 4;
+          _context4.next = 4;
           return _userEvent["default"].click(group1);
         case 4:
           group2 = getAllByRole("button")[2];
-          _context3.next = 7;
+          _context4.next = 7;
           return _userEvent["default"].click(group2);
         case 7:
           item = getAllByRole("button")[3];
-          _context3.next = 10;
+          _context4.next = 10;
           return _userEvent["default"].click(item);
         case 10:
           expect(item.getAttribute("aria-selected")).toBeTruthy();
           expect(group1.getAttribute("aria-selected")).toBe("false");
           expect(group2.getAttribute("aria-selected")).toBe("false");
-          _context3.next = 15;
+          _context4.next = 15;
           return _userEvent["default"].click(group2);
         case 15:
           expect(group2.getAttribute("aria-selected")).toBe("true");
-          _context3.next = 18;
+          _context4.next = 18;
           return _userEvent["default"].click(group1);
         case 18:
           expect(group1.getAttribute("aria-selected")).toBe("true");
         case 19:
         case "end":
-          return _context3.stop();
+          return _context4.stop();
       }
-    }, _callee3);
+    }, _callee4);
   })));
-  test("Sections - Renders with correct aria attributes", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
-    var _render5, getAllByRole, actions;
-    return _regenerator["default"].wrap(function _callee4$(_context4) {
-      while (1) switch (_context4.prev = _context4.next) {
+  test("Sections - Renders with correct aria attributes", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
+    var _render7, getAllByRole, actions, section;
+    return _regenerator["default"].wrap(function _callee5$(_context5) {
+      while (1) switch (_context5.prev = _context5.next) {
         case 0:
-          _render5 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ContextualMenu["default"], {
+          _render7 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ContextualMenu["default"], {
             items: sections
-          })), getAllByRole = _render5.getAllByRole;
+          })), getAllByRole = _render7.getAllByRole;
           expect(getAllByRole("menuitem").length).toBe(6);
           actions = getAllByRole("button");
-          _context4.next = 5;
+          _context5.next = 5;
           return _userEvent["default"].click(actions[0]);
         case 5:
           expect(actions[0].getAttribute("aria-selected")).toBeTruthy();
           expect(getAllByRole("group").length).toBe(2);
-        case 7:
+          section = getAllByRole("group")[0];
+          expect(section.getAttribute("aria-labelledby")).toBe("Team repositories");
+        case 9:
         case "end":
-          return _context4.stop();
+          return _context5.stop();
       }
-    }, _callee4);
+    }, _callee5);
   })));
   test("The onSelect event from each item is called correctly", function () {
     var test = [{
       label: "Tested item",
       onSelect: jest.fn()
     }];
-    var _render6 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ContextualMenu["default"], {
+    var _render8 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ContextualMenu["default"], {
         items: test
       })),
-      getByRole = _render6.getByRole;
+      getByRole = _render8.getByRole;
     var item = getByRole("button");
     _react2.fireEvent.click(item);
     expect(test[0].onSelect).toHaveBeenCalled();

package/contextual-menu/GroupItem.js

@@ -23,26 +23,26 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 var isGroupSelected = function isGroupSelected(items, selectedItemId) {
   return items.some(function (item) {
-    return "id" in item ? item.id === selectedItemId : isGroupSelected(item.items, selectedItemId);
+    if ("items" in item) return isGroupSelected(item.items, selectedItemId);else if (selectedItemId !== -1) return item.id === selectedItemId;else return item.selectedByDefault;
   });
 };
 var GroupItem = function GroupItem(_ref) {
   var items = _ref.items,
     props = (0, _objectWithoutProperties2["default"])(_ref, _excluded);
   var groupMenuId = "group-menu-".concat(props.label);
-  var _useState = (0, _react.useState)(false),
+  var _useContext = (0, _react.useContext)(_ContextualMenu.ContextualMenuContext),
+    selectedItemId = _useContext.selectedItemId;
+  var groupSelected = (0, _react.useMemo)(function () {
+    return isGroupSelected(items, selectedItemId);
+  }, [items, selectedItemId]);
+  var _useState = (0, _react.useState)(groupSelected && selectedItemId === -1 ? true : false),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     isOpen = _useState2[0],
     setIsOpen = _useState2[1];
-  var _useContext = (0, _react.useContext)(_ContextualMenu.ContextualMenuContext),
-    selectedItemId = _useContext.selectedItemId;
-  var selected = (0, _react.useMemo)(function () {
-    return !isOpen && isGroupSelected(items, selectedItemId);
-  }, [isOpen, items, selectedItemId]);
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_ItemAction["default"], (0, _extends2["default"])({
     "aria-controls": groupMenuId,
     "aria-expanded": isOpen ? true : undefined,
-    "aria-selected": selected,
+    "aria-selected": groupSelected && !isOpen,
     collapseIcon: isOpen ? /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
       icon: "filled_expand_less"
     }) : /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
@@ -53,7 +53,7 @@ var GroupItem = function GroupItem(_ref) {
         return !isOpen;
       });
     },
-    selected: selected
+    selected: groupSelected && !isOpen
   }, props)), isOpen && /*#__PURE__*/_react["default"].createElement(ItemsList, {
     id: groupMenuId
   }, items.map(function (item) {

package/contextual-menu/ItemAction.d.ts

@@ -1,4 +1,4 @@
 import React from "react";
 import { ItemActionProps } from "./types";
-declare const ItemAction: ({ badge, collapseIcon, icon, label, depthLevel, selected, ...props }: ItemActionProps) => React.JSX.Element;
+declare const ItemAction: ({ badge, collapseIcon, icon, label, depthLevel, ...props }: ItemActionProps) => React.JSX.Element;
 export default ItemAction;