@dxc-technology/halstack-react 12.0.1 → 12.1.0

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;

package/contextual-menu/ItemAction.js

@@ -12,23 +12,21 @@ var _react = _interopRequireDefault(require("react"));
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 var _coreTokens = _interopRequireDefault(require("../common/coreTokens"));
 var _Icon = _interopRequireDefault(require("../icon/Icon"));
-var _templateObject, _templateObject2, _templateObject3;
-var _excluded = ["badge", "collapseIcon", "icon", "label", "depthLevel", "selected"];
+var _templateObject, _templateObject2, _templateObject3, _templateObject4;
+var _excluded = ["badge", "collapseIcon", "icon", "label", "depthLevel"];
 var ItemAction = function ItemAction(_ref) {
   var badge = _ref.badge,
     collapseIcon = _ref.collapseIcon,
     icon = _ref.icon,
     label = _ref.label,
     depthLevel = _ref.depthLevel,
-    selected = _ref.selected,
     props = (0, _objectWithoutProperties2["default"])(_ref, _excluded);
   var modifiedBadge = badge && /*#__PURE__*/_react["default"].cloneElement(badge, {
     size: "small"
   });
   return /*#__PURE__*/_react["default"].createElement(Action, (0, _extends2["default"])({
-    depthLevel: depthLevel,
-    selected: selected
-  }, props), /*#__PURE__*/_react["default"].createElement(Label, null, collapseIcon, icon && depthLevel === 0 && (typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
+    depthLevel: depthLevel
+  }, props), /*#__PURE__*/_react["default"].createElement(Label, null, collapseIcon, icon && depthLevel === 0 && /*#__PURE__*/_react["default"].createElement(Icon, null, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
     icon: icon
   }) : icon), /*#__PURE__*/_react["default"].createElement(Text, {
     onMouseEnter: function onMouseEnter(event) {
@@ -37,7 +35,7 @@ var ItemAction = function ItemAction(_ref) {
     }
   }, label)), modifiedBadge);
 };
-var Action = _styledComponents["default"].button(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  border: none;\n  border-radius: 4px;\n  width: 100%;\n  padding: ", ";\n  box-shadow: inset 0 0 0 2px transparent;\n  display: flex;\n  align-items: center;\n  justify-content: space-between;\n  gap: ", ";\n  ", ";\n  cursor: pointer;\n  overflow: hidden;\n\n  &:hover {\n    ", ";\n  }\n  &:active {\n    ", ";\n  }\n  &:focus {\n    outline: 2px solid ", ";\n    outline-offset: -1px;\n  }\n  span::before {\n    display: flex;\n    font-size: 16px;\n  }\n  svg {\n    height: 16px;\n    width: 16px;\n  }\n"])), function (props) {
+var Action = _styledComponents["default"].button(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  border: none;\n  border-radius: 4px;\n  width: 100%;\n  padding: ", ";\n  box-shadow: inset 0 0 0 2px transparent;\n  display: flex;\n  align-items: center;\n  justify-content: space-between;\n  gap: ", ";\n  ", ";\n  cursor: pointer;\n  overflow: hidden;\n\n  &:hover {\n    ", ";\n  }\n  &:active {\n    ", ";\n  }\n  &:focus {\n    outline: 2px solid ", ";\n    outline-offset: -1px;\n  }\n"])), function (props) {
   return "".concat(_coreTokens["default"].spacing_4, " ").concat(_coreTokens["default"].spacing_8, " ").concat(_coreTokens["default"].spacing_4, " ", "\n    calc(".concat(_coreTokens["default"].spacing_8, " + (").concat(_coreTokens["default"].spacing_24, " * ").concat(props.depthLevel, "))\n  "), ";");
 }, _coreTokens["default"].spacing_16, function (props) {
   return props.selected ? "background-color: ".concat(_coreTokens["default"].color_purple_100, "; font-weight: ").concat(_coreTokens["default"].type_semibold, ";") : "background-color: ".concat(_coreTokens["default"].color_transparent);
@@ -46,6 +44,7 @@ var Action = _styledComponents["default"].button(_templateObject || (_templateOb
 }, function (props) {
   return props.selected ? "background-color: ".concat(_coreTokens["default"].color_purple_200, ";") : "background-color: ".concat(_coreTokens["default"].color_grey_100, ";");
 }, _coreTokens["default"].color_blue_600);
-var Label = _styledComponents["default"].span(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  gap: ", ";\n  overflow: hidden;\n"])), _coreTokens["default"].spacing_8);
-var Text = _styledComponents["default"].span(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  line-height: 24px;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  overflow: hidden;\n"])), _coreTokens["default"].color_grey_900, _coreTokens["default"].type_sans, _coreTokens["default"].type_scale_02);
+var Icon = _styledComponents["default"].span(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  font-size: 16px;\n\n  svg {\n    height: 16px;\n    width: 16px;\n  }\n"])));
+var Label = _styledComponents["default"].span(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  gap: ", ";\n  overflow: hidden;\n"])), _coreTokens["default"].spacing_8);
+var Text = _styledComponents["default"].span(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  line-height: 24px;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  overflow: hidden;\n"])), _coreTokens["default"].color_grey_900, _coreTokens["default"].type_sans, _coreTokens["default"].type_scale_02);
 var _default = exports["default"] = ItemAction;

package/contextual-menu/SingleItem.d.ts

@@ -1,4 +1,4 @@
 import React from "react";
 import { SingleItemProps } from "./types";
-declare const SingleItem: ({ badge, icon, id, label, depthLevel, onSelect }: SingleItemProps) => React.JSX.Element;
+declare const SingleItem: ({ id, onSelect, selectedByDefault, ...props }: SingleItemProps) => React.JSX.Element;
 export default SingleItem;

package/contextual-menu/SingleItem.js

@@ -6,18 +6,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
 var _ContextualMenu = require("./ContextualMenu");
 var _ItemAction = _interopRequireDefault(require("./ItemAction"));
+var _excluded = ["id", "onSelect", "selectedByDefault"];
 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; }
 var SingleItem = function SingleItem(_ref) {
-  var badge = _ref.badge,
-    icon = _ref.icon,
-    id = _ref.id,
-    label = _ref.label,
-    depthLevel = _ref.depthLevel,
-    onSelect = _ref.onSelect;
+  var id = _ref.id,
+    onSelect = _ref.onSelect,
+    selectedByDefault = _ref.selectedByDefault,
+    props = (0, _objectWithoutProperties2["default"])(_ref, _excluded);
   var _useContext = (0, _react.useContext)(_ContextualMenu.ContextualMenuContext),
     selectedItemId = _useContext.selectedItemId,
     setSelectedItemId = _useContext.setSelectedItemId;
@@ -25,14 +26,13 @@ var SingleItem = function SingleItem(_ref) {
     setSelectedItemId(id);
     onSelect === null || onSelect === void 0 ? void 0 : onSelect();
   };
-  return /*#__PURE__*/_react["default"].createElement(_ItemAction["default"], {
-    "aria-selected": selectedItemId === id,
-    badge: badge,
-    icon: icon,
-    label: label,
-    depthLevel: depthLevel,
+  (0, _react.useEffect)(function () {
+    if (selectedItemId === -1 && selectedByDefault) setSelectedItemId(id);
+  }, [selectedItemId, selectedByDefault, id]);
+  return /*#__PURE__*/_react["default"].createElement(_ItemAction["default"], (0, _extends2["default"])({
+    "aria-selected": selectedItemId === -1 ? selectedByDefault : selectedItemId === id,
     onClick: handleClick,
-    selected: selectedItemId === id
-  });
+    selected: selectedItemId === -1 ? selectedByDefault : selectedItemId === id
+  }, props));
 };
 var _default = exports["default"] = SingleItem;

package/contextual-menu/types.d.ts

@@ -1,16 +1,16 @@
 import React from "react";
 type SVG = React.ReactNode & React.SVGProps<SVGSVGElement>;
-type Item = {
+type CommonItemProps = {
     badge?: React.ReactElement;
     icon?: string | SVG;
     label: string;
+};
+type Item = CommonItemProps & {
     onSelect?: () => void;
+    selectedByDefault?: boolean;
 };
-type GroupItem = {
-    badge?: React.ReactElement;
-    icon?: string | SVG;
+type GroupItem = CommonItemProps & {
     items: (Item | GroupItem)[];
-    label: string;
 };
 type Section = {
     items: (Item | GroupItem)[];
@@ -45,9 +45,12 @@ type MenuItemProps = {
     item: ItemWithId | GroupItemWithId;
     depthLevel?: number;
 };
-type ItemActionProps = React.ButtonHTMLAttributes<HTMLButtonElement> & Item & {
+type ItemActionProps = React.ButtonHTMLAttributes<HTMLButtonElement> & {
+    badge?: Item["badge"];
     collapseIcon?: React.ReactNode;
     depthLevel: number;
+    icon?: Item["icon"];
+    label: Item["label"];
     selected: boolean;
 };
 type ContextualMenuContextProps = {

package/date-input/Calendar.js

@@ -11,8 +11,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireWildcard(require("react"));
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 var _useTranslatedLabels = _interopRequireDefault(require("../useTranslatedLabels"));
-var _Flex = _interopRequireDefault(require("../flex/Flex"));
-var _templateObject, _templateObject2, _templateObject3, _templateObject4;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
 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; }
 var getDays = function getDays(innerDate) {
@@ -49,12 +48,20 @@ var getDateToFocus = function getDateToFocus(selectedDate, innerDate, today) {
 var isDaySelected = function isDaySelected(date, selectedDate) {
   return (selectedDate === null || selectedDate === void 0 ? void 0 : selectedDate.get("month")) === date.month && (selectedDate === null || selectedDate === void 0 ? void 0 : selectedDate.get("year")) === date.year && (selectedDate === null || selectedDate === void 0 ? void 0 : selectedDate.get("date")) === date.day;
 };
+var divideDaysIntoWeeks = function divideDaysIntoWeeks(data, weekSize) {
+  return Array.from({
+    length: Math.ceil(data.length / weekSize)
+  }, function (_, rowIndex) {
+    return data.slice(rowIndex * weekSize, (rowIndex + 1) * weekSize);
+  });
+};
 var Calendar = function Calendar(_ref) {
   var selectedDate = _ref.selectedDate,
     innerDate = _ref.innerDate,
     onInnerDateChange = _ref.onInnerDateChange,
     onDaySelect = _ref.onDaySelect,
     today = _ref.today;
+  var id = (0, _react.useId)();
   var _useState = (0, _react.useState)(getDateToFocus(selectedDate, innerDate, today)),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     dateToFocus = _useState2[0],
@@ -88,7 +95,7 @@ var Calendar = function Calendar(_ref) {
   (0, _react.useEffect)(function () {
     if (isFocusable) {
       var _document$getElementB;
-      (_document$getElementB = document.getElementById("day_".concat(dateToFocus.get("date"), "_month").concat(dateToFocus.get("month")))) === null || _document$getElementB === void 0 ? void 0 : _document$getElementB.focus();
+      (_document$getElementB = document.getElementById("".concat(id, "_day_").concat(dateToFocus.get("date"), "_month").concat(dateToFocus.get("month")))) === null || _document$getElementB === void 0 ? void 0 : _document$getElementB.focus();
       setIsFocusable(false);
     }
   }, [dateToFocus, isFocusable]);
@@ -146,33 +153,40 @@ var Calendar = function Calendar(_ref) {
         break;
     }
   };
-  return /*#__PURE__*/_react["default"].createElement(CalendarContainer, null, /*#__PURE__*/_react["default"].createElement(_Flex["default"], {
-    alignItems: "center",
-    justifyContent: "space-between"
+  return /*#__PURE__*/_react["default"].createElement(CalendarContainer, {
+    role: "grid"
+  }, /*#__PURE__*/_react["default"].createElement(CalendarHeaderRow, {
+    role: "row"
   }, weekDays.map(function (weekDay) {
     return /*#__PURE__*/_react["default"].createElement(WeekHeaderCell, {
-      key: weekDay
+      key: weekDay,
+      role: "columnheader"
     }, weekDay);
-  })), /*#__PURE__*/_react["default"].createElement(DayCellsContainer, {
-    onBlur: handleOnBlur
-  }, dayCells.map(function (date, index) {
-    return /*#__PURE__*/_react["default"].createElement(DayCell, {
-      onKeyDown: function onKeyDown(event) {
-        return handleDayKeyboardEvent(event, date);
-      },
-      "aria-label": date.day,
-      id: "day_".concat(date.day, "_month").concat(date.month),
-      key: "day_".concat(index),
-      onClick: function onClick() {
-        return onDateClickHandler(date);
-      },
-      selected: isDaySelected(date, selectedDate),
-      actualMonth: date.month === innerDate.get("month"),
-      autoFocus: date.day === dateToFocus.get("date") && date.month === dateToFocus.get("month"),
-      "aria-selected": isDaySelected(date, selectedDate),
-      tabIndex: date.day === dateToFocus.get("date") && date.month === dateToFocus.get("month") ? 0 : -1,
-      isCurrentDay: today.get("date") === date.day && today.get("month") === innerDate.get("month") && today.get("month") === date.month && today.get("year") === innerDate.get("year")
-    }, date.day);
+  })), /*#__PURE__*/_react["default"].createElement(MonthContainer, {
+    onBlur: handleOnBlur,
+    role: "rowgroup"
+  }, divideDaysIntoWeeks(dayCells, weekDays.length).map(function (week, rowIndex) {
+    return /*#__PURE__*/_react["default"].createElement(WeekContainer, {
+      key: "".concat(id, "_week_").concat(rowIndex),
+      role: "row"
+    }, week.map(function (date, index) {
+      return /*#__PURE__*/_react["default"].createElement(DayCellButton, {
+        id: "".concat(id, "_day_").concat(date.day, "_month").concat(date.month),
+        role: "gridcell",
+        "aria-selected": isDaySelected(date, selectedDate),
+        onKeyDown: function onKeyDown(event) {
+          return handleDayKeyboardEvent(event, date);
+        },
+        onClick: function onClick() {
+          return onDateClickHandler(date);
+        },
+        selected: isDaySelected(date, selectedDate),
+        actualMonth: date.month === innerDate.get("month"),
+        autoFocus: date.day === dateToFocus.get("date") && date.month === dateToFocus.get("month"),
+        tabIndex: date.day === dateToFocus.get("date") && date.month === dateToFocus.get("month") ? 0 : -1,
+        isCurrentDay: today.get("date") === date.day && today.get("month") === innerDate.get("month") && today.get("month") === date.month && today.get("year") === innerDate.get("year")
+      }, date.day);
+    }));
   })));
 };
 var CalendarContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\n  display: flex;\n  flex-direction: column;\n  justify-content: center;\n  padding: 0px 8px 8px 8px;\n  width: 292px;\n  font-family: ", ";\n  font-size: ", ";\n  color: ", ";\n  font-weight: ", ";\n"])), function (props) {
@@ -184,9 +198,11 @@ var CalendarContainer = _styledComponents["default"].div(_templateObject || (_te
 }, function (props) {
   return props.theme.dateInput.pickerFontWeight;
 });
-var WeekHeaderCell = _styledComponents["default"].span(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  width: 36px;\n  height: 36px;\n"])));
-var DayCellsContainer = _styledComponents["default"].div(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\n  display: flex;\n  gap: 4px;\n  flex-wrap: wrap;\n  justify-content: space-between;\n"])));
-var DayCell = _styledComponents["default"].button(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  justify-content: center;\n  align-items: center;\n  width: 36px;\n  height: 36px;\n  padding: 0;\n  border: none;\n  border-radius: 50%;\n  cursor: pointer;\n  font-family: ", ";\n  font-size: ", ";\n  color: ", ";\n  font-weight: ", ";\n\n  &:focus {\n    outline: ", " solid 2px;\n  }\n  &:hover {\n    background-color: ", ";\n    color: ", ";\n  }\n  &:active {\n    background-color: ", ";\n    color: ", ";\n  }\n\n  ", "\n  background-color: ", ";\n  color: ", ";\n"])), function (props) {
+var CalendarHeaderRow = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: row;\n  flex-wrap: nowrap;\n  justify-content: space-between;\n  align-items: center;\n"])));
+var WeekHeaderCell = _styledComponents["default"].span(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  width: 36px;\n  height: 36px;\n"])));
+var MonthContainer = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\n  display: flex;\n  gap: 4px;\n  flex-direction: column;\n  justify-content: space-between;\n"])));
+var WeekContainer = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\n  display: flex;\n  gap: 4px;\n  justify-content: space-between;\n"])));
+var DayCellButton = _styledComponents["default"].button(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  justify-content: center;\n  align-items: center;\n  width: 36px;\n  height: 36px;\n  padding: 0;\n  border: none;\n  border-radius: 50%;\n  cursor: pointer;\n  font-family: ", ";\n  font-size: ", ";\n  color: ", ";\n  font-weight: ", ";\n\n  &:focus {\n    outline: ", " solid 2px;\n  }\n  &:hover {\n    background-color: ", ";\n    color: ", ";\n  }\n  &:active {\n    background-color: ", ";\n    color: ", ";\n  }\n\n  ", "\n  background-color: ", ";\n  color: ", ";\n"])), function (props) {
   return props.theme.dateInput.pickerFontFamily;
 }, function (props) {
   return props.theme.dateInput.pickerFontSize;

package/date-input/DateInput.accessibility.test.js

@@ -10,17 +10,6 @@ var _react2 = require("@testing-library/react");
 var _axeHelper = require("../../test/accessibility/axe-helper.js");
 var _DateInput = _interopRequireDefault(require("./DateInput"));
 var _disabledRules = require("../../test/accessibility/rules/specific/date-input/disabledRules.js");
-// TODO: REMOVE
-
-var disabledRules = {
-  rules: _disabledRules.disabledRules.reduce(function (rulesObj, rule) {
-    rulesObj[rule] = {
-      enabled: false
-    };
-    return rulesObj;
-  }, {})
-};
-
 // Mocking DOMRect for Radix Primitive Popover
 global.globalThis = global;
 global.DOMRect = {
@@ -41,7 +30,7 @@ global.ResizeObserver = /*#__PURE__*/function () {
   function ResizeObserver() {
     (0, _classCallCheck2["default"])(this, ResizeObserver);
   }
-  (0, _createClass2["default"])(ResizeObserver, [{
+  return (0, _createClass2["default"])(ResizeObserver, [{
     key: "observe",
     value: function observe() {}
   }, {
@@ -51,8 +40,18 @@ global.ResizeObserver = /*#__PURE__*/function () {
     key: "disconnect",
     value: function disconnect() {}
   }]);
-  return ResizeObserver;
 }();
+
+// TODO: REMOVE
+
+var disabledRules = {
+  rules: _disabledRules.disabledRules.reduce(function (rulesObj, rule) {
+    rulesObj[rule] = {
+      enabled: false
+    };
+    return rulesObj;
+  }, {})
+};
 describe("DateInput component accessibility tests", function () {
   it("Should not have basic accessibility issues", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
     var _render, baseElement, results;