Skip to content

Navigation Screen: Consolidate menu name and switcher #34786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mamaduka merged 9 commits into from
Sep 14, 2021
Merged

Navigation Screen: Consolidate menu name and switcher #34786

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0763561
Navigation Screen: Consolidate menu name and switcher
Mamaduka Sep 13, 2021
e92f0e4
Update E2E test selectors
Mamaduka Sep 13, 2021
e33412f
Use MenuSwitcher
Mamaduka Sep 13, 2021
d61d102
Update dropdown z-index styles
Mamaduka Sep 13, 2021
b032fa8
Style menu switcher's new button
Mamaduka Sep 14, 2021
5c2d4e8
Hide top level 'New menu' button on small screens
Mamaduka Sep 14, 2021
16e81a6
Render minimal header when menu isn't selected
Mamaduka Sep 14, 2021
eaa2d91
Add explaining comment for menu item group style reset
Mamaduka Sep 14, 2021
ad7d906
Try better name for file and component
Mamaduka Sep 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use MenuSwitcher
  • Loading branch information
@Mamaduka
Mamaduka committed Sep 14, 2021
commit e33412f8f93f1a221046b9a04975149c9d02f700
31 changes: 10 additions & 21 deletions packages/edit-navigation/src/components/header/actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
/**
* WordPress dependencies
*/
import { sprintf, __ } from '@wordpress/i18n';
import { __ } from '@wordpress/i18n';
import {
DropdownMenu,
MenuGroup,
MenuItemsChoice,
__experimentalText as Text,
} from '@wordpress/components';
import { chevronDown } from '@wordpress/icons';
Expand All @@ -15,6 +13,7 @@ import { decodeEntities } from '@wordpress/html-entities';
/**
* Internal dependencies
*/
import MenuSwitcher from '../menu-switcher';
import { useMenuEntityProp, useSelectedMenuId } from '../../hooks';

export default function HeaderActions( { menus, isLoading } ) {
Expand Down Expand Up @@ -65,24 +64,14 @@ export default function HeaderActions( { menus, isLoading } ) {
} }
>
{ ( { onClose } ) => (
<MenuGroup>
<MenuItemsChoice
value={ selectedMenuId }
choices={ menus.map( ( { id, name } ) => ( {
value: id,
label: decodeEntities( name ),
'aria-label': sprintf(
/* translators: %s: The name of a menu. */
__( "Switch to '%s'" ),
name
),
} ) ) }
onSelect={ ( value ) => {
setSelectedMenuId( value );
onClose();
} }
/>
</MenuGroup>
<MenuSwitcher
menus={ menus }
selectedMenuId={ selectedMenuId }
onSelectMenu={ ( menuId ) => {
setSelectedMenuId( menuId );
onClose();
} }
/>
) }
</DropdownMenu>
</div>
Expand Down
5 changes: 4 additions & 1 deletion packages/edit-navigation/src/components/menu-switcher/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,10 @@ export default function MenuSwitcher( {
/>
</MenuGroup>
<MenuGroup hideSeparator>
<MenuItem variant="primary" onClick={ openModal }>
<MenuItem
className="edit-navigation-menu-switcher__new-button"
onClick={ openModal }
>
{ __( 'Create a new menu' ) }
</MenuItem>
{ isModalVisible && (
Expand Down