@patternfly/react-core 4.266.3 → 4.267.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patternfly/react-core",
-  "version": "4.266.3",
+  "version": "4.267.1",
   "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",
@@ -51,16 +51,16 @@
     "generate": "node scripts/copyStyles.js"
   },
   "dependencies": {
-    "@patternfly/react-icons": "^4.93.2",
-    "@patternfly/react-styles": "^4.92.2",
-    "@patternfly/react-tokens": "^4.94.2",
+    "@patternfly/react-icons": "^4.93.3",
+    "@patternfly/react-styles": "^4.92.3",
+    "@patternfly/react-tokens": "^4.94.3",
     "focus-trap": "6.9.2",
     "react-dropzone": "9.0.0",
     "tippy.js": "5.1.2",
     "tslib": "^2.0.0"
   },
   "devDependencies": {
-    "@patternfly/patternfly": "4.222.3",
+    "@patternfly/patternfly": "4.222.4",
     "@rollup/plugin-commonjs": "^21.0.0",
     "@rollup/plugin-node-resolve": "^15.0.1",
     "@rollup/plugin-replace": "^3.0.0",
@@ -77,5 +77,5 @@
     "react": "^16.8 || ^17 || ^18",
     "react-dom": "^16.8 || ^17 || ^18"
   },
-  "gitHead": "8b3c9550659c5433b24f71d7af75028a8508da00"
+  "gitHead": "67e1ec39d3b8a95bd7e2092bb1c1b788a66ffe5f"
 }

package/src/components/Menu/Menu.tsx

@@ -71,6 +71,7 @@ export interface MenuState {
   transitionMoveTarget: HTMLElement;
   flyoutRef: React.Ref<HTMLLIElement> | null;
   disableHover: boolean;
+  currentDrilldownMenuId: string;
 }
 
 class MenuBase extends React.Component<MenuProps, MenuState> {
@@ -98,7 +99,8 @@ class MenuBase extends React.Component<MenuProps, MenuState> {
     searchInputValue: '',
     transitionMoveTarget: null,
     flyoutRef: null,
-    disableHover: false
+    disableHover: false,
+    currentDrilldownMenuId: this.props.id
   };
 
   allowTabFirstItem() {
@@ -155,9 +157,19 @@ class MenuBase extends React.Component<MenuProps, MenuState> {
       this.setState({ transitionMoveTarget: null });
     } else {
       const nextMenu = current.querySelector('#' + this.props.activeMenu) || current || null;
-      const nextTarget = Array.from(nextMenu.getElementsByTagName('UL')[0].children).filter(
+      const nextMenuChildren = Array.from(nextMenu.getElementsByTagName('UL')[0].children);
+
+      if (!this.state.currentDrilldownMenuId || nextMenu.id !== this.state.currentDrilldownMenuId) {
+        this.setState({ currentDrilldownMenuId: nextMenu.id });
+      } else {
+        // if the drilldown transition ends on the same menu, do not focus the first item
+        return;
+      }
+
+      const nextTarget = nextMenuChildren.filter(
         el => !(el.classList.contains('pf-m-disabled') || el.classList.contains('pf-c-divider'))
       )[0].firstChild;
+
       (nextTarget as HTMLElement).focus();
       (nextTarget as HTMLElement).tabIndex = 0;
     }
@@ -284,12 +296,16 @@ class MenuBase extends React.Component<MenuProps, MenuState> {
             additionalKeyHandler={this.handleExtraKeys}
             createNavigableElements={this.createNavigableElements}
             isActiveElement={(element: Element) =>
-              document.activeElement.closest('li') === element ||
+              document.activeElement.closest('li') === element || // if element is a basic MenuItem
               document.activeElement.parentElement === element ||
+              document.activeElement.closest('.pf-c-menu__search') === element || // if element is a MenuInput
               (document.activeElement.closest('ol') && document.activeElement.closest('ol').firstChild === element)
             }
             getFocusableElement={(navigableElement: Element) =>
-              navigableElement.querySelector('input') || (navigableElement.firstChild as Element)
+              (navigableElement.tagName === 'DIV' && navigableElement.querySelector('input')) || // for MenuInput
+              ((navigableElement.firstChild as Element).tagName === 'LABEL' &&
+                navigableElement.querySelector('input')) || // for MenuItem checkboxes
+              (navigableElement.firstChild as Element)
             }
             noHorizontalArrowHandling={
               document.activeElement &&

package/src/components/Menu/examples/Menu.md

@@ -105,6 +105,11 @@ To render an initially drilled in menu, the `menuDrilledIn`, `drilldownPath`, an
 ```ts file="MenuWithDrilldownBreadcrumbs.tsx" isBeta
 ```
 
+### With drilldown and inline filter
+
+```ts file="MenuFilterDrilldown.tsx"
+```
+
 ### Scrollable
 
 ```ts file="MenuScrollable.tsx"

package/src/components/Menu/examples/MenuFilterDrilldown.tsx

@@ -0,0 +1,123 @@
+import React from 'react';
+import {
+  Menu,
+  MenuContent,
+  MenuList,
+  MenuItem,
+  Divider,
+  DrilldownMenu,
+  MenuInput,
+  SearchInput
+} from '@patternfly/react-core';
+
+export const MenuWithDrilldown: React.FunctionComponent = () => {
+  const [menuDrilledIn, setMenuDrilledIn] = React.useState<string[]>([]);
+  const [drilldownPath, setDrilldownPath] = React.useState<string[]>([]);
+  const [menuHeights, setMenuHeights] = React.useState<any>({});
+  const [activeMenu, setActiveMenu] = React.useState<string>('filter_drilldown-rootMenu');
+
+  const drillIn = (fromMenuId: string, toMenuId: string, pathId: string) => {
+    setMenuDrilledIn([...menuDrilledIn, fromMenuId]);
+    setDrilldownPath([...drilldownPath, pathId]);
+    setActiveMenu(toMenuId);
+  };
+
+  const drillOut = (toMenuId: string) => {
+    const menuDrilledInSansLast = menuDrilledIn.slice(0, menuDrilledIn.length - 1);
+    const pathSansLast = drilldownPath.slice(0, drilldownPath.length - 1);
+    setMenuDrilledIn(menuDrilledInSansLast);
+    setDrilldownPath(pathSansLast);
+    setActiveMenu(toMenuId);
+  };
+
+  const setHeight = (menuId: string, height: number) => {
+    if (
+      menuHeights[menuId] === undefined ||
+      (menuId !== 'filter_drilldown-rootMenu' && menuHeights[menuId] !== height)
+    ) {
+      setMenuHeights({ ...menuHeights, [menuId]: height });
+    }
+  };
+
+  const searchRef = React.createRef<HTMLInputElement>();
+  const [startInput, setStartInput] = React.useState('');
+
+  const handleStartTextInputChange = (value: string) => {
+    setStartInput(value);
+    searchRef?.current?.focus();
+  };
+
+  const startDrillItems = [
+    {
+      item: 'Application grouping',
+      rest: { description: 'Description text' }
+    },
+    { item: 'Labels' },
+    { item: 'Annotations' },
+    { item: 'Count' },
+    { item: 'Count 2' },
+    { item: 'Count 3' },
+    { item: 'Other' }
+  ];
+
+  const mapped = startDrillItems
+    .filter(opt => !startInput || opt.item.toLowerCase().includes(startInput.toString().toLowerCase()))
+    .map((opt, index) => (
+      <MenuItem key={opt.item} itemId={index} {...opt.rest}>
+        {opt.item}
+      </MenuItem>
+    ));
+  if (startInput && mapped.length === 0) {
+    mapped.push(
+      <MenuItem isDisabled key="no result">
+        No results found
+      </MenuItem>
+    );
+  }
+
+  return (
+    <Menu
+      id="filter_drilldown-rootMenu"
+      containsDrilldown
+      drilldownItemPath={drilldownPath}
+      drilledInMenus={menuDrilledIn}
+      activeMenu={activeMenu}
+      onDrillIn={drillIn}
+      onDrillOut={drillOut}
+      onGetMenuHeight={setHeight}
+    >
+      <MenuContent menuHeight={`${menuHeights[activeMenu]}px`}>
+        <MenuList>
+          <MenuItem
+            itemId="filter_group:start_rollout"
+            direction="down"
+            drilldownMenu={
+              <DrilldownMenu id="filter_drilldown-drilldownMenuStart">
+                <MenuItem itemId="filter_group:start_rollout_breadcrumb" direction="up">
+                  Start rollout
+                </MenuItem>
+                <Divider component="li" />
+                <MenuInput>
+                  <SearchInput
+                    ref={searchRef}
+                    value={startInput}
+                    aria-label="Filter menu items"
+                    type="search"
+                    onChange={value => handleStartTextInputChange(value)}
+                  />
+                </MenuInput>
+                <Divider component="li" />
+                {mapped}
+              </DrilldownMenu>
+            }
+          >
+            Start rollout
+          </MenuItem>
+          <MenuItem itemId="item-a">Item B</MenuItem>
+          <MenuItem itemId="item-b">Item C</MenuItem>
+          <MenuItem itemId="item-c">Item D</MenuItem>
+        </MenuList>
+      </MenuContent>
+    </Menu>
+  );
+};