carbon-react 110.2.4 → 110.4.1

package/lib/components/i18n-provider/i18n-provider.component.js

@@ -3,14 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.default = exports.I18nProvider = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _merge = _interopRequireDefault(require("lodash/merge"));
-
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
+var _merge = _interopRequireDefault(require("lodash/merge"));
+
 var _i18nContext = _interopRequireDefault(require("../../__internal__/i18n-context"));
 
 var _enGb = _interopRequireDefault(require("../../locales/en-gb"));
@@ -22,88 +22,108 @@ const I18nProvider = ({
   children
 }) => locale ? /*#__PURE__*/_react.default.createElement(_i18nContext.default.Provider, {
   value: (0, _merge.default)({}, _enGb.default, locale)
-}, children) : children;
+}, children) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, children);
 
-I18nProvider.defaultProps = {
-  locale: undefined
-};
+exports.I18nProvider = I18nProvider;
 I18nProvider.propTypes = {
-  locale: _propTypes.default.shape({
-    locale: _propTypes.default.func,
-    actions: _propTypes.default.shape({
-      edit: _propTypes.default.func,
-      delete: _propTypes.default.func,
-      reset: _propTypes.default.func
-    }),
-    actionPopover: _propTypes.default.shape({
-      ariaLabel: _propTypes.default.func
-    }),
-    batchSelection: _propTypes.default.shape({
-      selected: _propTypes.default.func
-    }),
-    confirm: _propTypes.default.shape({
-      no: _propTypes.default.func,
-      yes: _propTypes.default.func
-    }),
-    date: _propTypes.default.shape({
-      dateFnsLocale: _propTypes.default.func
-    }),
-    errors: _propTypes.default.shape({
-      messages: _propTypes.default.shape({
-        formSummary: _propTypes.default.func
-      })
-    }),
-    message: _propTypes.default.shape({
-      closeButtonAriaLabel: _propTypes.default.func
-    }),
-    numeralDate: _propTypes.default.shape({
-      validation: _propTypes.default.shape({
-        day: _propTypes.default.func,
-        month: _propTypes.default.func,
-        year: _propTypes.default.func
-      })
-    }),
-    pager: _propTypes.default.shape({
-      show: _propTypes.default.func,
-      records: _propTypes.default.func,
-      first: _propTypes.default.func,
-      last: _propTypes.default.func,
-      next: _propTypes.default.func,
-      previous: _propTypes.default.func,
-      pageX: _propTypes.default.func,
-      ofY: _propTypes.default.func
-    }),
-    select: _propTypes.default.shape({
-      actionButtonText: _propTypes.default.func,
-      placeholder: _propTypes.default.func,
-      noResultsForTerm: _propTypes.default.func
-    }),
-    switch: _propTypes.default.shape({
-      on: _propTypes.default.func,
-      off: _propTypes.default.func
-    }),
-    table: _propTypes.default.shape({
-      noData: _propTypes.default.func
-    }),
-    textEditor: _propTypes.default.shape({
-      tooltipMessages: _propTypes.default.shape({
-        bold: _propTypes.default.func,
-        italic: _propTypes.default.func,
-        bulletList: _propTypes.default.func,
-        numberList: _propTypes.default.func
-      }),
-      ariaLabels: _propTypes.default.shape({
-        bold: _propTypes.default.func,
-        italic: _propTypes.default.func,
-        bulletList: _propTypes.default.func,
-        numberList: _propTypes.default.func
-      })
-    }),
-    titleSelect: _propTypes.default.shape({
-      deselect: _propTypes.default.func
+  "children": _propTypes.default.node,
+  "locale": _propTypes.default.shape({
+    "actionPopover": _propTypes.default.shape({
+      "ariaLabel": _propTypes.default.func.isRequired
+    }),
+    "actions": _propTypes.default.shape({
+      "delete": _propTypes.default.func.isRequired,
+      "edit": _propTypes.default.func.isRequired
+    }),
+    "batchSelection": _propTypes.default.shape({
+      "selected": _propTypes.default.func.isRequired
+    }),
+    "confirm": _propTypes.default.shape({
+      "no": _propTypes.default.func.isRequired,
+      "yes": _propTypes.default.func.isRequired
+    }),
+    "date": _propTypes.default.shape({
+      "dateFnsLocale": _propTypes.default.func.isRequired
+    }),
+    "dialog": _propTypes.default.shape({
+      "ariaLabels": _propTypes.default.shape({
+        "close": _propTypes.default.func.isRequired
+      }).isRequired
+    }),
+    "dialogFullScreen": _propTypes.default.shape({
+      "ariaLabels": _propTypes.default.shape({
+        "close": _propTypes.default.func.isRequired
+      }).isRequired
+    }),
+    "errors": _propTypes.default.shape({
+      "messages": _propTypes.default.shape({
+        "formSummary": _propTypes.default.func.isRequired
+      }).isRequired
+    }),
+    "heading": _propTypes.default.shape({
+      "backLinkAriaLabel": _propTypes.default.func.isRequired
+    }),
+    "link": _propTypes.default.shape({
+      "skipLinkLabel": _propTypes.default.func.isRequired
+    }),
+    "locale": _propTypes.default.func,
+    "message": _propTypes.default.shape({
+      "closeButtonAriaLabel": _propTypes.default.func.isRequired
+    }),
+    "numeralDate": _propTypes.default.shape({
+      "validation": _propTypes.default.shape({
+        "day": _propTypes.default.func.isRequired,
+        "month": _propTypes.default.func.isRequired,
+        "year": _propTypes.default.func.isRequired
+      }).isRequired
+    }),
+    "pager": _propTypes.default.shape({
+      "first": _propTypes.default.func.isRequired,
+      "last": _propTypes.default.func.isRequired,
+      "next": _propTypes.default.func.isRequired,
+      "ofY": _propTypes.default.func.isRequired,
+      "pageX": _propTypes.default.func.isRequired,
+      "previous": _propTypes.default.func.isRequired,
+      "records": _propTypes.default.func.isRequired,
+      "show": _propTypes.default.func.isRequired
+    }),
+    "select": _propTypes.default.shape({
+      "actionButtonText": _propTypes.default.func.isRequired,
+      "noResultsForTerm": _propTypes.default.func.isRequired,
+      "placeholder": _propTypes.default.func.isRequired
+    }),
+    "sidebar": _propTypes.default.shape({
+      "ariaLabels": _propTypes.default.shape({
+        "close": _propTypes.default.func.isRequired
+      }).isRequired
+    }),
+    "switch": _propTypes.default.shape({
+      "off": _propTypes.default.func.isRequired,
+      "on": _propTypes.default.func.isRequired
+    }),
+    "textEditor": _propTypes.default.shape({
+      "ariaLabels": _propTypes.default.shape({
+        "bold": _propTypes.default.func.isRequired,
+        "bulletList": _propTypes.default.func.isRequired,
+        "italic": _propTypes.default.func.isRequired,
+        "numberList": _propTypes.default.func.isRequired
+      }).isRequired,
+      "tooltipMessages": _propTypes.default.shape({
+        "bold": _propTypes.default.func.isRequired,
+        "bulletList": _propTypes.default.func.isRequired,
+        "italic": _propTypes.default.func.isRequired,
+        "numberList": _propTypes.default.func.isRequired
+      }).isRequired
+    }),
+    "tileSelect": _propTypes.default.shape({
+      "deselect": _propTypes.default.func.isRequired
+    }),
+    "toast": _propTypes.default.shape({
+      "ariaLabels": _propTypes.default.shape({
+        "close": _propTypes.default.func.isRequired
+      }).isRequired
     })
-  }),
-  children: _propTypes.default.node.isRequired
+  })
 };
 var _default = I18nProvider;
 exports.default = _default;

package/lib/components/i18n-provider/index.d.ts

@@ -1 +1,2 @@
-export { default } from "./i18n-provider";
+export { default } from "./i18n-provider.component";
+export type { I18nProviderProps } from "./i18n-provider.component";

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

@@ -66,7 +66,13 @@ const Submenu = /*#__PURE__*/_react.default.forwardRef(({
 
   const formattedChildren = _react.default.Children.map(children, child => {
     if (child.type === _scrollableBlock.default) {
-      return [...child.props.children];
+      const blockChildren = [...child.props.children];
+
+      if (child.props.parent) {
+        blockChildren.unshift( /*#__PURE__*/_react.default.createElement(_menuItem2.default, null, child.props.parent));
+      }
+
+      return blockChildren;
     }
 
     return child;
@@ -75,6 +81,19 @@ const Submenu = /*#__PURE__*/_react.default.forwardRef(({
   const arrayOfFormattedChildren = _react.default.Children.toArray(formattedChildren);
 
   const numberOfChildren = (0, _react.useMemo)(() => _react.default.Children.count(formattedChildren), [formattedChildren]);
+  const blockIndex = (0, _react.useMemo)(() => {
+    var _childrenArray$index;
+
+    const childrenArray = _react.default.Children.toArray(children);
+
+    let index = childrenArray.findIndex(item => item.type === _scrollableBlock.default);
+
+    if ((_childrenArray$index = childrenArray[index]) !== null && _childrenArray$index !== void 0 && _childrenArray$index.props.parent) {
+      index += 1;
+    }
+
+    return index;
+  }, [children]);
   const characterTimer = (0, _react.useRef)();
   const startCharacterTimeout = (0, _react.useCallback)(() => {
     characterTimer.current = setTimeout(() => {
@@ -260,7 +279,7 @@ const Submenu = /*#__PURE__*/_react.default.forwardRef(({
         isFocused: submenuFocusIndex === index,
         focusIndex: submenuFocusIndex,
         handleKeyDown,
-        blockIndex: _react.default.Children.toArray(children).findIndex(item => item.type === _scrollableBlock.default)
+        blockIndex
       }
     }, child))));
   }
@@ -293,13 +312,13 @@ const Submenu = /*#__PURE__*/_react.default.forwardRef(({
     submenuDirection: submenuDirection,
     variant: variant,
     menuType: menuContext.menuType,
-    role: "list"
+    role: blockIndex === 0 ? "presentation" : "list"
   }, _react.default.Children.map(children, (child, index) => /*#__PURE__*/_react.default.createElement(_submenu2.default.Provider, {
     value: {
       isFocused: !blockDoubleFocus && submenuFocusIndex === index,
       focusIndex: submenuFocusIndex,
       handleKeyDown,
-      blockIndex: _react.default.Children.toArray(children).findIndex(item => item.type === _scrollableBlock.default),
+      blockIndex,
       updateFocusIndex: setSubmenuFocusIndex,
       itemIndex: child.type === _menuItem2.default ? index : undefined
     }

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

@@ -55,6 +55,7 @@ const MenuItem = ({
   menuOpen,
   onSubmenuOpen,
   onSubmenuClose,
+  overrideColor,
   ...rest
 }) => {
   const menuContext = (0, _react.useContext)(_menu.default);
@@ -121,6 +122,7 @@ const MenuItem = ({
     selected,
     variant,
     onKeyDown: !inFullscreenView ? handleKeyDown : undefined,
+    overrideColor,
     ref
   };
   const clonedChildren = isChildSearch.current ? childrenItems.map(child => /*#__PURE__*/_react.default.cloneElement(child, {
@@ -254,7 +256,10 @@ MenuItem.propTypes = {
   onSubmenuOpen: _propTypes.default.func,
 
   /** Callback triggered when submenu closes. Only valid with submenu prop */
-  onSubmenuClose: _propTypes.default.func
+  onSubmenuClose: _propTypes.default.func,
+
+  /** @ignore @private */
+  overrideColor: _propTypes.default.bool
 };
 var _default = MenuItem;
 exports.default = _default;

package/lib/components/menu/menu-item/menu-item.d.ts

@@ -29,6 +29,10 @@ export interface MenuItemBaseProps extends LayoutProps, FlexboxProps {
   onSubmenuOpen?: () => void;
   /** Callback triggered when submenu closes. Only valid with submenu prop */
   onSubmenuClose?: () => void;
+  /** @ignore @private
+  private prop, used inside ScrollableBlock to ensure the MenuItem's color variant overrides the CSS
+  for other MenuItems inside the block */
+  overrideColor?: boolean;
 }
 
 export interface MenuWithChildren extends MenuItemBaseProps {