@patternfly/react-core 6.2.0-prerelease.27 → 6.2.0-prerelease.29

package/helpers/package.json

@@ -1 +1 @@
-{"name":"@patternfly/react-core-helpers","main":"../dist/js/helpers/index.js","module":"../dist/esm/helpers/index.js","typings":"../dist/esm/helpers/index.d.ts","version":"6.2.0-prerelease.26","private":true}
+{"name":"@patternfly/react-core-helpers","main":"../dist/js/helpers/index.js","module":"../dist/esm/helpers/index.js","typings":"../dist/esm/helpers/index.d.ts","version":"6.2.0-prerelease.28","private":true}

package/layouts/package.json

@@ -1 +1 @@
-{"name":"@patternfly/react-core-layouts","main":"../dist/js/layouts/index.js","module":"../dist/esm/layouts/index.js","typings":"../dist/esm/layouts/index.d.ts","version":"6.2.0-prerelease.26","private":true}
+{"name":"@patternfly/react-core-layouts","main":"../dist/js/layouts/index.js","module":"../dist/esm/layouts/index.js","typings":"../dist/esm/layouts/index.d.ts","version":"6.2.0-prerelease.28","private":true}

package/next/package.json

@@ -1 +1 @@
-{"name":"@patternfly/react-core-next","main":"../dist/js/next/index.js","module":"../dist/esm/next/index.js","typings":"../dist/esm/next/index.d.ts","version":"6.2.0-prerelease.26","private":true}
+{"name":"@patternfly/react-core-next","main":"../dist/js/next/index.js","module":"../dist/esm/next/index.js","typings":"../dist/esm/next/index.d.ts","version":"6.2.0-prerelease.28","private":true}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patternfly/react-core",
-  "version": "6.2.0-prerelease.27",
+  "version": "6.2.0-prerelease.29",
   "description": "This library provides a set of common React components for use with the PatternFly reference implementation.",
   "main": "dist/js/index.js",
   "module": "dist/esm/index.js",
@@ -46,15 +46,15 @@
     "subpaths": "node ../../scripts/exportSubpaths.mjs --config subpaths.config.json"
   },
   "dependencies": {
-    "@patternfly/react-icons": "^6.2.0-prerelease.8",
-    "@patternfly/react-styles": "^6.2.0-prerelease.7",
-    "@patternfly/react-tokens": "^6.2.0-prerelease.7",
+    "@patternfly/react-icons": "^6.2.0-prerelease.9",
+    "@patternfly/react-styles": "^6.2.0-prerelease.8",
+    "@patternfly/react-tokens": "^6.2.0-prerelease.8",
     "focus-trap": "7.6.4",
     "react-dropzone": "^14.3.5",
     "tslib": "^2.8.1"
   },
   "devDependencies": {
-    "@patternfly/patternfly": "6.2.0-prerelease.14",
+    "@patternfly/patternfly": "6.2.0-prerelease.15",
     "case-anything": "^3.1.2",
     "css": "^3.0.0",
     "fs-extra": "^11.3.0"
@@ -63,5 +63,5 @@
     "react": "^17 || ^18",
     "react-dom": "^17 || ^18"
   },
-  "gitHead": "fb25d761a922d5ae5f893997cb647fa445bb88c9"
+  "gitHead": "7f8e1030e3f727b3ec1d720bf8df35164a63cc4d"
 }

package/src/components/Menu/MenuItem.tsx

@@ -147,6 +147,8 @@ const MenuItemBase: React.FunctionComponent<MenuItemProps> = ({
   const flyoutContext = React.useContext(FlyoutContext);
   const [flyoutXDirection, setFlyoutXDirection] = React.useState(flyoutContext.direction);
   const ref = React.useRef<HTMLLIElement>(undefined);
+  const privateRef = React.useRef(undefined);
+  const innerComponentRef = innerRef || privateRef;
   const flyoutVisible = ref === flyoutRef;
 
   const hasFlyout = flyoutMenu !== undefined;
@@ -351,7 +353,7 @@ const MenuItemBase: React.FunctionComponent<MenuItemProps> = ({
             {...(!hasCheckbox && { disabled: isDisabled, 'aria-label': ariaLabel })}
             {...(!hasCheckbox && !flyoutMenu && { role: isSelectMenu ? 'option' : 'menuitem' })}
             {...(!hasCheckbox && !flyoutMenu && isSelectMenu && { 'aria-selected': getIsSelected() })}
-            ref={innerRef}
+            ref={innerComponentRef}
             {...(!hasCheckbox && {
               onClick: (event: React.KeyboardEvent | React.MouseEvent) => {
                 if (!isAriaDisabled) {
@@ -433,31 +435,34 @@ const MenuItemBase: React.FunctionComponent<MenuItemProps> = ({
   );
 
   return (
-    <li
-      className={css(
-        styles.menuListItem,
-        isDisabled && styles.modifiers.disabled,
-        isAriaDisabled && styles.modifiers.ariaDisabled,
-        _isOnPath && styles.modifiers.currentPath,
-        isLoadButton && styles.modifiers.load,
-        isLoading && styles.modifiers.loading,
-        isFocused && 'pf-m-focus',
-        isDanger && styles.modifiers.danger,
-        className
-      )}
-      onMouseOver={() => {
-        if (!isAriaDisabled) {
-          onMouseOver();
-        }
-      }}
-      {...(flyoutMenu && !isAriaDisabled && { onKeyDown: handleFlyout })}
-      ref={ref}
-      role={!hasCheckbox ? 'none' : 'menuitem'}
-      {...(hasCheckbox && { 'aria-label': ariaLabel })}
-      {...props}
-    >
-      {tooltipProps ? <Tooltip {...tooltipProps}>{renderItem}</Tooltip> : renderItem}
-    </li>
+    <>
+      <li
+        className={css(
+          styles.menuListItem,
+          isDisabled && styles.modifiers.disabled,
+          isAriaDisabled && styles.modifiers.ariaDisabled,
+          _isOnPath && styles.modifiers.currentPath,
+          isLoadButton && styles.modifiers.load,
+          isLoading && styles.modifiers.loading,
+          isFocused && 'pf-m-focus',
+          isDanger && styles.modifiers.danger,
+          className
+        )}
+        onMouseOver={() => {
+          if (!isAriaDisabled) {
+            onMouseOver();
+          }
+        }}
+        {...(flyoutMenu && !isAriaDisabled && { onKeyDown: handleFlyout })}
+        ref={ref}
+        role={!hasCheckbox ? 'none' : 'menuitem'}
+        {...(hasCheckbox && { 'aria-label': ariaLabel })}
+        {...props}
+      >
+        {renderItem}
+      </li>
+      {tooltipProps && <Tooltip {...tooltipProps} triggerRef={innerComponentRef as any} />}
+    </>
   );
 };