@carbon/react 1.107.0 → 1.107.1

package/es/components/OverflowMenu/OverflowMenu.js

@@ -12,15 +12,13 @@ import { setupGetInstanceId } from "../../tools/setupGetInstanceId.js";
 import { noopFn } from "../../internal/noopFn.js";
 import { deprecate } from "../../prop-types/deprecate.js";
 import { deprecateValuesWithin } from "../../prop-types/deprecateValuesWithin.js";
-import { isComponentElement } from "../../internal/utils.js";
 import { mapPopoverAlign } from "../../tools/mapPopoverAlign.js";
 import { IconButton } from "../IconButton/index.js";
 import { mergeRefs } from "../../tools/mergeRefs.js";
-import OverflowMenuItem from "../OverflowMenuItem/OverflowMenuItem.js";
 import { DIRECTION_BOTTOM, FloatingMenu } from "../../internal/FloatingMenu.js";
 import { useOutsideClick } from "../../internal/useOutsideClick.js";
 import classNames from "classnames";
-import React, { Children, cloneElement, forwardRef, useCallback, useContext, useEffect, useRef, useState } from "react";
+import React, { Children, cloneElement, forwardRef, isValidElement, useCallback, useContext, useEffect, useRef, useState } from "react";
 import PropTypes from "prop-types";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { OverflowMenuVertical } from "@carbon/icons-react";
@@ -224,14 +222,17 @@ const OverflowMenu = forwardRef(({ align, ["aria-label"]: ariaLabel = null, aria
 	});
 	const overflowMenuIconClasses = classNames(`${prefix}--overflow-menu__icon`, iconClass);
 	const childrenWithProps = Children.toArray(children).map((child, index) => {
-		if (isComponentElement(child, OverflowMenuItem)) return cloneElement(child, {
-			closeMenu: child.props.closeMenu || closeMenuAndFocus,
-			handleOverflowMenuItemFocus,
-			ref: (el) => {
-				menuItemRefs.current[index] = el;
-			},
-			index
-		});
+		if (isValidElement(child)) {
+			const childElement = child;
+			return cloneElement(childElement, {
+				closeMenu: childElement.props.closeMenu || closeMenuAndFocus,
+				handleOverflowMenuItemFocus,
+				ref: (el) => {
+					menuItemRefs.current[index] = el;
+				},
+				index
+			});
+		}
 		return null;
 	});
 	const wrappedMenuBody = /* @__PURE__ */ jsx(FloatingMenu, {

package/lib/components/OverflowMenu/OverflowMenu.js

@@ -13,11 +13,9 @@ const require_setupGetInstanceId = require("../../tools/setupGetInstanceId.js");
 const require_noopFn = require("../../internal/noopFn.js");
 const require_deprecate = require("../../prop-types/deprecate.js");
 const require_deprecateValuesWithin = require("../../prop-types/deprecateValuesWithin.js");
-const require_utils = require("../../internal/utils.js");
 const require_mapPopoverAlign = require("../../tools/mapPopoverAlign.js");
 const require_index = require("../IconButton/index.js");
 const require_mergeRefs = require("../../tools/mergeRefs.js");
-const require_OverflowMenuItem = require("../OverflowMenuItem/OverflowMenuItem.js");
 const require_FloatingMenu = require("../../internal/FloatingMenu.js");
 const require_useOutsideClick = require("../../internal/useOutsideClick.js");
 let classnames = require("classnames");
@@ -229,14 +227,17 @@ const OverflowMenu = (0, react.forwardRef)(({ align, ["aria-label"]: ariaLabel =
 	});
 	const overflowMenuIconClasses = (0, classnames.default)(`${prefix}--overflow-menu__icon`, iconClass);
 	const childrenWithProps = react.Children.toArray(children).map((child, index) => {
-		if (require_utils.isComponentElement(child, require_OverflowMenuItem.default)) return (0, react.cloneElement)(child, {
-			closeMenu: child.props.closeMenu || closeMenuAndFocus,
-			handleOverflowMenuItemFocus,
-			ref: (el) => {
-				menuItemRefs.current[index] = el;
-			},
-			index
-		});
+		if ((0, react.isValidElement)(child)) {
+			const childElement = child;
+			return (0, react.cloneElement)(childElement, {
+				closeMenu: childElement.props.closeMenu || closeMenuAndFocus,
+				handleOverflowMenuItemFocus,
+				ref: (el) => {
+					menuItemRefs.current[index] = el;
+				},
+				index
+			});
+		}
 		return null;
 	});
 	const wrappedMenuBody = /* @__PURE__ */ (0, react_jsx_runtime.jsx)(require_FloatingMenu.FloatingMenu, {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/react",
   "description": "React components for the Carbon Design System",
-  "version": "1.107.0",
+  "version": "1.107.1",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -125,5 +125,5 @@
     "**/*.scss",
     "**/*.css"
   ],
-  "gitHead": "13c5c427ad4413aea5184a0a593e6452bc163e4a"
+  "gitHead": "80f5039e553e19f4b540f914c35b8c3eaa8e41d3"
 }