carbon-react 111.8.2 → 111.8.3

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

@@ -39,6 +39,7 @@ const Menu = ({
   ...rest
 }) => {
   const [focusedItemIndex, setFocusedItemIndex] = (0, _react.useState)(undefined);
+  const [openSubmenuIndex, setOpenSubmenuIndex] = (0, _react.useState)(null);
   const ref = (0, _react.useRef)();
   const handleKeyDown = (0, _react.useCallback)(event => {
     const newIndex = (0, _keyboardNavigation.menuKeyboardNavigation)(event, _react.default.Children.toArray(children));
@@ -63,17 +64,26 @@ const Menu = ({
   }, rest, {
     ref: ref,
     role: "list"
-  }), _react.default.Children.map(children, (child, index) => {
+  }), /*#__PURE__*/_react.default.createElement(_menu2.default.Provider, {
+    value: {
+      menuType,
+      handleKeyDown,
+      inMenu: true,
+      openSubmenuIndex,
+      setOpenSubmenuIndex
+    }
+  }, _react.default.Children.map(children, (child, index) => {
     const isFocused = focusedItemIndex === index;
-    return /*#__PURE__*/_react.default.createElement(_menu2.default.Provider, {
-      value: {
-        menuType,
-        handleKeyDown: ev => handleKeyDown(ev, index),
+
+    if ( /*#__PURE__*/_react.default.isValidElement(child) && child.type.displayName === "MenuItem" && child.props.submenu) {
+      return /*#__PURE__*/_react.default.cloneElement(child, {
         isFocused,
-        inMenu: true
-      }
-    }, child);
-  }));
+        indexInMenu: index
+      });
+    }
+
+    return child;
+  })));
 };
 
 Menu.propTypes = {

package/lib/components/menu/menu.context.d.ts

@@ -1,6 +1,8 @@
 declare var _default: React.Context<{
     menuType: string;
     inMenu: boolean;
+    openSubmenuIndex: null;
+    setOpenSubmenuIndex: () => void;
 }>;
 export default _default;
 import React from "react";

package/lib/components/menu/menu.context.js

@@ -11,7 +11,11 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 var _default = /*#__PURE__*/_react.default.createContext({
   menuType: "light",
-  inMenu: false
+  inMenu: false,
+  openSubmenuIndex: null,
+  setOpenSubmenuIndex:
+  /* istanbul ignore next */
+  () => {}
 });
 
 exports.default = _default;

package/lib/components/show-edit-pod/show-edit-pod.style.js

@@ -7,7 +7,7 @@ exports.default = void 0;
 
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 
-var _formStyle = require("../form/form.style.js");
+var _form = require("../form/form.style");
 
 var _podStyle = require("../pod/pod.style.js");
 
@@ -16,7 +16,7 @@ var _pod = _interopRequireDefault(require("../pod"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const StyledPod = (0, _styledComponents.default)(_pod.default)`
-  ${_formStyle.StyledFormFooter} {
+  ${_form.StyledFormFooter} {
     margin-top: 24px;
   }
 

package/lib/locales/en-gb.js

@@ -48,7 +48,7 @@ const enGB = {
         const isErrorPlural = isSingular(errors) && !warnings ? "is" : "are";
         const isWarningPlural = isSingular(warnings) ? "is" : "are";
 
-        if (errors && warnings && type === "warnings") {
+        if (errors && warnings && type === "warning") {
           return ["and", `${warnings} ${warningPlural}`];
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carbon-react",
-  "version": "111.8.2",
+  "version": "111.8.3",
   "description": "A library of reusable React components for easily building user interfaces.",
   "files": [
     "lib",

package/esm/components/form/__internal__/form-summary.d.ts

@@ -1,16 +0,0 @@
-import * as React from "react";
-
-export interface FormSummaryProps {
-  /** Child elements */
-  children?: React.ReactNode;
-  /** The total number of errors present in the form */
-  errors?: number;
-  /** The total number of warnings present in the form */
-  warnings?: number;
-  /** Applies full width styling */
-  fullWidth?: boolean;
-}
-
-declare function FormSummary(props: FormSummaryProps): JSX.Element;
-
-export default FormSummary;

package/esm/components/form/form.d.ts

@@ -1,35 +0,0 @@
-import * as React from "react";
-import { SpaceProps } from "styled-system";
-
-export interface FormProps extends SpaceProps {
-  /** Alignment of buttons */
-  buttonAlignment?: "left" | "right";
-  /** Child elements */
-  children?: React.ReactNode;
-  /** The total number of errors present in the form */
-  errorCount?: number;
-  /** Spacing between form fields, given number will be multiplied by base spacing unit (8) */
-  fieldSpacing?: 0 | 1 | 2 | 3 | 4 | 5 | 7;
-  /** Additional buttons rendered on the left side of the save button */
-  leftSideButtons?: React.ReactNode;
-  /** Disable HTML5 validation */
-  noValidate?: boolean;
-  /** Callback passed to the form element */
-  onSubmit?: (event: React.FormEvent<HTMLFormElement>) => any;
-  /** Additional buttons rendered on the right side of the save button */
-  rightSideButtons?: React.ReactNode;
-  /** Save button to be rendered */
-  saveButton?: React.ReactNode;
-  /** Enables the sticky footer. */
-  stickyFooter?: boolean;
-  /** The total number of warnings present in the form */
-  warningCount?: number;
-  /** Height of the form (any valid CSS value) */
-  height?: string;
-  /** Applies styling for full width buttons. Please note that you will still need to pass the `fullWidth` prop to the button you compose */
-  fullWidthButtons?: boolean;
-}
-
-declare function Form(props: FormProps): JSX.Element;
-
-export default Form;

package/lib/components/form/__internal__/form-summary.d.ts

@@ -1,16 +0,0 @@
-import * as React from "react";
-
-export interface FormSummaryProps {
-  /** Child elements */
-  children?: React.ReactNode;
-  /** The total number of errors present in the form */
-  errors?: number;
-  /** The total number of warnings present in the form */
-  warnings?: number;
-  /** Applies full width styling */
-  fullWidth?: boolean;
-}
-
-declare function FormSummary(props: FormSummaryProps): JSX.Element;
-
-export default FormSummary;

package/lib/components/form/form.d.ts

@@ -1,35 +0,0 @@
-import * as React from "react";
-import { SpaceProps } from "styled-system";
-
-export interface FormProps extends SpaceProps {
-  /** Alignment of buttons */
-  buttonAlignment?: "left" | "right";
-  /** Child elements */
-  children?: React.ReactNode;
-  /** The total number of errors present in the form */
-  errorCount?: number;
-  /** Spacing between form fields, given number will be multiplied by base spacing unit (8) */
-  fieldSpacing?: 0 | 1 | 2 | 3 | 4 | 5 | 7;
-  /** Additional buttons rendered on the left side of the save button */
-  leftSideButtons?: React.ReactNode;
-  /** Disable HTML5 validation */
-  noValidate?: boolean;
-  /** Callback passed to the form element */
-  onSubmit?: (event: React.FormEvent<HTMLFormElement>) => any;
-  /** Additional buttons rendered on the right side of the save button */
-  rightSideButtons?: React.ReactNode;
-  /** Save button to be rendered */
-  saveButton?: React.ReactNode;
-  /** Enables the sticky footer. */
-  stickyFooter?: boolean;
-  /** The total number of warnings present in the form */
-  warningCount?: number;
-  /** Height of the form (any valid CSS value) */
-  height?: string;
-  /** Applies styling for full width buttons. Please note that you will still need to pass the `fullWidth` prop to the button you compose */
-  fullWidthButtons?: boolean;
-}
-
-declare function Form(props: FormProps): JSX.Element;
-
-export default Form;