Navigation Component: Search Control in Menu Titles

packages/components/src/navigation/README.md

@@ -101,6 +101,13 @@ A callback to handle clicking on the back button. If this prop is provided then
 
 Optional className for the `NavigationMenu` component.
 
+### hasSearch
+
+- Type: `boolean`
+- Required: No
+
+Enable the search feature on the menu title.
+
 ### `menu`
 
 - Type: `string`
@@ -109,19 +116,33 @@ Optional className for the `NavigationMenu` component.
 
 The unique identifier of the menu. The root menu can omit this, and it will default to "root"; all other menus need to specify it.
 
+### onSearch
+
+- Type: `function`
+- Required: No
+
+When `hasSearch` is active, this function handles the search input's `onChange` event, making it controlled from the outside. It requires setting the `search` prop as well.
+
 ### `parentMenu`
 
 - Type: `string`
 - Required: No
 
 The parent menu slug; used by nested menus to indicate their parent menu.
 
+### search
+
+- Type: `string`
+- Required: No
+
+When `hasSearch` is active and `onSearch` is provided, this controls the value of the search input. Required when the `onSearch` prop is provided.
+
 ### `title`
 
 - Type: `string`
 - Required: No
 
-The menu title.
+The menu title. It's also the field used by the menu search function. 
 
 ## Navigation Group Props
 
@@ -169,7 +190,7 @@ If provided, renders `a` instead of `button`.
 ### `item`
 
 - Type: `string`
-- Required: Yes
+- Required: No
 
 The unique identifier of the item.
 

packages/components/src/navigation/group/context.js

@@ -0,0 +1,9 @@
+/**
+ * WordPress dependencies
+ */
+import { createContext, useContext } from '@wordpress/element';
+
+export const NavigationGroupContext = createContext( { group: undefined } );
+
+export const useNavigationGroupContext = () =>
+ useContext( NavigationGroupContext );

packages/components/src/navigation/group/index.js

@@ -2,35 +2,57 @@
  * External dependencies
  */
 import classnames from 'classnames';
+import { find, uniqueId } from 'lodash';
+
+/**
+ * WordPress dependencies
+ */
+import { useState } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
+import { NavigationGroupContext } from './context';
 import { GroupTitleUI } from '../styles/navigation-styles';
-import { useNavigationMenuContext } from '../menu/context';
+import { useNavigationContext } from '../context';
 
 export default function NavigationGroup( { children, className, title } ) {
- const { isActive } = useNavigationMenuContext();
+ const [ groupId ] = useState( uniqueId( 'group-' ) );
+ const {
+ navigationTree: { items },
+ } = useNavigationContext();
+
+ const context = { group: groupId };
 
- // Keep the children rendered to make sure inactive items are included in the navigation tree
- if ( ! isActive ) {
- return children;
+ // Keep the children rendered to make sure invisible items are included in the navigation tree.
+ if ( ! find( items, { group: groupId, _isVisible: true } ) ) {
+ return (
+ <NavigationGroupContext.Provider value={ context }>
+ { children }
+ </NavigationGroupContext.Provider>
+ );
  }
 
+ const groupTitleId = `components-navigation__group-title-${ groupId }`;
  const classes = classnames( 'components-navigation__group', className );
 
  return (
- <li className={ classes }>
- { title && (
- <GroupTitleUI
- as="h3"
- className="components-navigation__group-title"
- variant="caption"
- >
- { title }
- </GroupTitleUI>
- ) }
- <ul>{ children }</ul>
- </li>
+ <NavigationGroupContext.Provider value={ context }>
+ <li className={ classes }>
+ { title && (
+ <GroupTitleUI
+ as="h3"
+ className="components-navigation__group-title"
+ id={ groupTitleId }
+ variant="caption"
+ >
+ { title }
+ </GroupTitleUI>
+ ) }
+ <ul aria-labelledby={ groupTitleId } role="group">
+ { children }
+ </ul>
+ </li>
+ </NavigationGroupContext.Provider>
  );
 }

packages/components/src/navigation/item/index.js

@@ -2,21 +2,21 @@
  * External dependencies
  */
 import classnames from 'classnames';
-import { noop } from 'lodash';
+import { noop, uniqueId } from 'lodash';
 
 /**
  * WordPress dependencies
  */
+import { useState } from '@wordpress/element';
 import { Icon, chevronRight } from '@wordpress/icons';
 
 /**
  * Internal dependencies
  */
 import Button from '../../button';
 import { useNavigationContext } from '../context';
-import { ItemBadgeUI, ItemTitleUI, ItemUI } from '../styles/navigation-styles';
 import { useNavigationTreeItem } from './use-navigation-tree-item';
-import { useNavigationMenuContext } from '../menu/context';
+import { ItemBadgeUI, ItemTitleUI, ItemUI } from '../styles/navigation-styles';
 
 export default function NavigationItem( props ) {
  const {
@@ -30,14 +30,17 @@ export default function NavigationItem( props ) {
  title,
  ...restProps
  } = props;
- useNavigationTreeItem( props );
- const { activeItem, setActiveMenu } = useNavigationContext();
- const { isActive } = useNavigationMenuContext();
 
- // If this item is in an inactive menu, then we skip rendering
- // We need to make sure this component gets mounted though
- // To make sure inactive items are included in the navigation tree
- if ( ! isActive ) {
+ const [ itemId ] = useState( uniqueId( 'item-' ) );
+
+ useNavigationTreeItem( itemId, props );
+ const {
+ activeItem,
+ navigationTree,
+ setActiveMenu,
+ } = useNavigationContext();
+
+ if ( ! navigationTree.getItem( itemId )?._isVisible ) {
  return null;
  }
 

packages/components/src/navigation/item/use-navigation-tree-item.js

@@ -7,20 +7,32 @@ import { useEffect } from '@wordpress/element';
  * Internal dependencies
  */
 import { useNavigationContext } from '../context';
+import { useNavigationGroupContext } from '../group/context';
 import { useNavigationMenuContext } from '../menu/context';
+import { normalizedSearch } from '../utils';
 
-export const useNavigationTreeItem = ( props ) => {
+export const useNavigationTreeItem = ( itemId, props ) => {
  const {
+ activeMenu,
  navigationTree: { addItem, removeItem },
  } = useNavigationContext();
- const { menu } = useNavigationMenuContext();
+ const { group } = useNavigationGroupContext();
+ const { menu, search } = useNavigationMenuContext();
 
- const key = props.item;
  useEffect( () => {
- addItem( key, { ...props, menu } );
+ const isMenuActive = activeMenu === menu;
+ const isItemVisible =
+ ! search || normalizedSearch( props.title, search );
+
+ addItem( itemId, {
+ ...props,
+ group,
+ menu,
+ _isVisible: isMenuActive && isItemVisible,
+ } );
 
  return () => {
- removeItem( key );
+ removeItem( itemId );
  };
- }, [] );
+ }, [ activeMenu, search ] );
 };

packages/components/src/navigation/menu/context.js

@@ -5,7 +5,7 @@ import { createContext, useContext } from '@wordpress/element';
 
 export const NavigationMenuContext = createContext( {
  menu: undefined,
- isActive: false,
+ search: '',
 } );
 export const useNavigationMenuContext = () =>
  useContext( NavigationMenuContext );

packages/components/src/navigation/menu/index.js

@@ -3,46 +3,63 @@
  */
 import classnames from 'classnames';
 
+/**
+ * WordPress dependencies
+ */
+import { useState } from '@wordpress/element';
+
 /**
  * Internal dependencies
  */
 import { ROOT_MENU } from '../constants';
-import { useNavigationContext } from '../context';
-import { MenuTitleUI, MenuUI } from '../styles/navigation-styles';
-import NavigationBackButton from '../back-button';
 import { NavigationMenuContext } from './context';
+import { useNavigationContext } from '../context';
 import { useNavigationTreeMenu } from './use-navigation-tree-menu';
+import NavigationBackButton from '../back-button';
+import NavigationMenuTitle from './menu-title';
+import { NavigableMenu } from '../../navigable-container';
+import { MenuUI } from '../styles/navigation-styles';
 
 export default function NavigationMenu( props ) {
  const {
  backButtonLabel,
  children,
  className,
+ hasSearch,
  menu = ROOT_MENU,
+ onSearch: setControlledSearch,
  parentMenu,
+ search: controlledSearch,
  title,
  onBackButtonClick,
  } = props;
+ const [ uncontrolledSearch, setUncontrolledSearch ] = useState( '' );
  useNavigationTreeMenu( props );
  const { activeMenu } = useNavigationContext();
- const isActive = activeMenu === menu;
-
- const classes = classnames( 'components-navigation__menu', className );
 
  const context = {
  menu,
- isActive,
+ search: uncontrolledSearch,
  };
 
- // Keep the children rendered to make sure inactive items are included in the navigation tree
- if ( ! isActive ) {
+ // Keep the children rendered to make sure invisible items are included in the navigation tree
+ if ( activeMenu !== menu ) {
  return (
  <NavigationMenuContext.Provider value={ context }>
  { children }
  </NavigationMenuContext.Provider>
  );
  }
 
+ const isControlledSearch = !! setControlledSearch;
+ const search = isControlledSearch ? controlledSearch : uncontrolledSearch;
+ const onSearch = isControlledSearch
+ ? setControlledSearch
+ : setUncontrolledSearch;
+
+ const menuTitleId = `components-navigation__menu-title-${ menu }`;
+ const classes = classnames( 'components-navigation__menu', className );
+
  return (
  <NavigationMenuContext.Provider value={ context }>
  <MenuUI className={ classes }>
@@ -53,16 +70,17 @@ export default function NavigationMenu( props ) {
  onClick={ onBackButtonClick }
  />
  ) }
- { title && (
- <MenuTitleUI
- as="h2"
- className="components-navigation__menu-title"
- variant="subtitle"
- >
- { title }
- </MenuTitleUI>
- ) }
- <ul>{ children }</ul>
+
+ <NavigationMenuTitle
+ hasSearch={ hasSearch }
+ onSearch={ onSearch }
+ search={ search }
+ title={ title }
+ />
+
+ <NavigableMenu>
+ <ul aria-labelledby={ menuTitleId }>{ children }</ul>
+ </NavigableMenu>
  </MenuUI>
  </NavigationMenuContext.Provider>
  );