carbon-react 106.6.3 → 106.6.6

package/lib/components/heading/heading.component.js

@@ -56,14 +56,7 @@ let Heading = /*#__PURE__*/function (_React$Component) {
 
   _createClass(Heading, [{
     key: "help",
-    get:
-    /**
-     * Returns the help component.
-     *
-     * @method help
-     * @return {Object} JSX
-     */
-    function () {
+    get: function () {
       if (!this.props.help && !this.props.helpLink) {
         return null;
       }
@@ -75,13 +68,6 @@ let Heading = /*#__PURE__*/function (_React$Component) {
         ariaLabel: this.props.helpAriaLabel
       }, this.props.help);
     }
-    /**
-     * Returns the back button.
-     *
-     * @method back
-     * @return {Object} JSX
-     */
-
   }, {
     key: "back",
     get: function () {
@@ -110,13 +96,6 @@ let Heading = /*#__PURE__*/function (_React$Component) {
         divider: this.props.divider
       }));
     }
-    /**
-     * Returns the subheader.
-     *
-     * @method subheader
-     * @return {Object} JSX
-     */
-
   }, {
     key: "subheader",
     get: function () {
@@ -131,25 +110,11 @@ let Heading = /*#__PURE__*/function (_React$Component) {
         hasSeparator: this.props.separator
       }, this.props.subheader);
     }
-    /**
-     * Returns the separator if enabled and needed.
-     *
-     * @method separator
-     * @return {Object} JSX
-     */
-
   }, {
     key: "separator",
     get: function () {
       return this.props.separator ? /*#__PURE__*/_react.default.createElement(_heading.StyledSeparator, null) : null;
     }
-    /**
-     * Returns the separator if enabled and needed.
-     *
-     * @method divider
-     * @return {Object} JSX
-     */
-
   }, {
     key: "divider",
     get: function () {
@@ -157,13 +122,6 @@ let Heading = /*#__PURE__*/function (_React$Component) {
         "data-element": "divider"
       }) : null;
     }
-    /**
-     * Returns pills if provided
-     *
-     * @method pills
-     * @return {Object} JSX
-     */
-
   }, {
     key: "pills",
     get: function () {
@@ -171,11 +129,6 @@ let Heading = /*#__PURE__*/function (_React$Component) {
         "data-element": "pills"
       }, this.props.pills) : null;
     }
-    /**
-     * @method render
-     * @return {Object} JSX
-     */
-
   }, {
     key: "render",
     value: function render() {

package/lib/components/link/link.component.js

@@ -106,11 +106,7 @@ const Link = /*#__PURE__*/_react.default.forwardRef(({
       type = "button";
     }
 
-    return /*#__PURE__*/_react.default.createElement(type, { ...componentProps,
-      ...(type === "button" && {
-        role: "link"
-      })
-    }, /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, renderLinkIcon(), /*#__PURE__*/_react.default.createElement(_link.StyledContent, null, isSkipLink ? l.link.skipLinkLabel() : children), renderLinkIcon("right")));
+    return /*#__PURE__*/_react.default.createElement(type, componentProps, /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, renderLinkIcon(), /*#__PURE__*/_react.default.createElement(_link.StyledContent, null, isSkipLink ? l.link.skipLinkLabel() : children), renderLinkIcon("right")));
   };
 
   return /*#__PURE__*/_react.default.createElement(_link.StyledLink, _extends({

package/lib/components/menu/__internal__/spec-helper/index.js

@@ -20,7 +20,8 @@ const events = {
 };
 
 const openSubmenu = wrapper => {
-  const menuItem = wrapper.find('[data-component="submenu-wrapper"]').find("a");
+  const menuWrapper = wrapper.find('[data-component="submenu-wrapper"]');
+  const menuItem = menuWrapper.exists("a") ? menuWrapper.find("a") : menuWrapper.find("button");
   menuItem.getDOMNode().focus();
   (0, _testUtils.act)(() => {
     wrapper.find(_menuItem.default).at(0).props().onKeyDown(events.space);

package/lib/components/menu/__internal__/submenu/submenu.component.js

@@ -50,6 +50,7 @@ const Submenu = /*#__PURE__*/_react.default.forwardRef(({
   asPassiveItem,
   onSubmenuOpen,
   onSubmenuClose,
+  onClick,
   ...rest
 }, ref) => {
   const [blockDoubleFocus, setBlockDoubleFocus] = (0, _react.useState)(false);
@@ -214,6 +215,17 @@ const Submenu = /*#__PURE__*/_react.default.forwardRef(({
       closeSubmenu();
     }
   }, [closeSubmenu]);
+
+  const handleClick = event => {
+    if (clickToOpen) {
+      openSubmenu();
+    }
+
+    if (onClick) {
+      onClick(event);
+    }
+  };
+
   (0, _react.useEffect)(() => {
     if (characterString !== "") {
       const nextIndex = (0, _keyboardNavigation.characterNavigation)(characterString, _react.default.Children.toArray(formattedChildren), submenuFocusIndex);
@@ -267,7 +279,6 @@ const Submenu = /*#__PURE__*/_react.default.forwardRef(({
     "data-component": "submenu-wrapper",
     onMouseOver: !clickToOpen ? () => openSubmenu() : undefined,
     onMouseLeave: () => closeSubmenu(),
-    onClick: clickToOpen ? () => openSubmenu() : undefined,
     ref: submenuRef,
     isSubmenuOpen: submenuOpen
   }, /*#__PURE__*/_react.default.createElement(_menuItem.default, _extends({}, rest, {
@@ -282,14 +293,17 @@ const Submenu = /*#__PURE__*/_react.default.forwardRef(({
     hasSubmenu: true,
     showDropdownArrow: showDropdownArrow,
     onKeyDown: handleKeyDown,
+    onClick: handleClick,
     clickToOpen: clickToOpen,
     href: href,
-    maxWidth: maxWidth
+    maxWidth: maxWidth,
+    "aria-expanded": submenuOpen
   }), title), submenuOpen && /*#__PURE__*/_react.default.createElement(_submenu.StyledSubmenu, {
     "data-component": "submenu",
     submenuDirection: submenuDirection,
     variant: variant,
-    menuType: menuContext.menuType
+    menuType: menuContext.menuType,
+    role: "list"
   }, _react.default.Children.map(children, (child, index) => /*#__PURE__*/_react.default.createElement(_submenu2.default.Provider, {
     value: {
       isFocused: !blockDoubleFocus && submenuFocusIndex === index,
@@ -347,7 +361,10 @@ Submenu.propTypes = {
   onSubmenuOpen: _propTypes.default.func,
 
   /** Callback triggered when submenu closes. Only valid with submenu prop */
-  onSubmenuClose: _propTypes.default.func
+  onSubmenuClose: _propTypes.default.func,
+
+  /** Callback triggered when the top-level menu item is clicked */
+  onClick: _propTypes.default.func
 };
 var _default = Submenu;
 exports.default = _default;

package/lib/components/menu/menu.component.js

@@ -61,7 +61,8 @@ const Menu = ({
     "data-component": "menu",
     menuType: menuType
   }, rest, {
-    ref: ref
+    ref: ref,
+    role: "list"
   }), _react.default.Children.map(children, (child, index) => {
     const isFocused = focusedItemIndex === index;
     return /*#__PURE__*/_react.default.createElement(_menu2.default.Provider, {

package/lib/components/menu/scrollable-block/scrollable-block.component.js

@@ -47,12 +47,14 @@ const ScrollableBlock = ({
   return /*#__PURE__*/_react.default.createElement(_scrollableBlock.default, _extends({
     "data-component": "submenu-scrollable-block",
     menuType: menuContext.menuType,
-    variant: variant
+    variant: variant,
+    role: "presentation"
   }, rest), /*#__PURE__*/_react.default.createElement(_box.default, {
     overflowY: "scroll",
     scrollVariant: scrollVariants[menuContext.menuType],
     height: height,
-    p: 0
+    p: 0,
+    role: "presentation"
   }, _react.default.Children.map(children, (child, index) => {
     let isFocused = false;
     const blockItemFocused = focusIndex >= blockIndex;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carbon-react",
-  "version": "106.6.3",
+  "version": "106.6.6",
   "description": "A library of reusable React components for easily building user interfaces.",
   "engineStrict": true,
   "engines": {

package/esm/components/button-bar/button-bar.d.ts

@@ -1,24 +0,0 @@
-import Button from "components/button/button";
-import IconButton from "components/icon-button";
-import { SpaceProps } from "styled-system";
-
-type ButtonBarChild =
-  | typeof Button
-  | typeof IconButton
-  | boolean
-  | null
-  | undefined;
-
-export interface ButtonBarProps extends SpaceProps {
-  children: ButtonBarChild | ButtonBarChild[];
-  /** Apply fullWidth style to the button bar */
-  fullWidth?: boolean;
-  /** Defines an Icon position for buttons: "before" | "after" */
-  iconPosition?: "before" | "after";
-  /** Assigns a size to the buttons: "small" | "medium" | "large" */
-  size?: "small" | "medium" | "large";
-}
-
-declare function ButtonBar(props: ButtonBarProps): JSX.Element;
-
-export default ButtonBar;

package/lib/components/button-bar/button-bar.d.ts

@@ -1,24 +0,0 @@
-import Button from "components/button/button";
-import IconButton from "components/icon-button";
-import { SpaceProps } from "styled-system";
-
-type ButtonBarChild =
-  | typeof Button
-  | typeof IconButton
-  | boolean
-  | null
-  | undefined;
-
-export interface ButtonBarProps extends SpaceProps {
-  children: ButtonBarChild | ButtonBarChild[];
-  /** Apply fullWidth style to the button bar */
-  fullWidth?: boolean;
-  /** Defines an Icon position for buttons: "before" | "after" */
-  iconPosition?: "before" | "after";
-  /** Assigns a size to the buttons: "small" | "medium" | "large" */
-  size?: "small" | "medium" | "large";
-}
-
-declare function ButtonBar(props: ButtonBarProps): JSX.Element;
-
-export default ButtonBar;