Skip to content
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

Jump to bottom

Add icons to navigation sidebar items #36893

Merged
merged 7 commits into from Nov 26, 2021
Merged

Add icons to navigation sidebar items #36893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
85362fc
Add icons to navigation sidebar items
talldan Nov 26, 2021
a1bd14e
Add storybook example
talldan Nov 26, 2021
ca055a8
Move icon into main item file and add margin
talldan Nov 26, 2021
41b26f6
Target first child
talldan Nov 26, 2021
fc92d10
Use first-of-type
talldan Nov 26, 2021
6cc99fa
Switch to using the sybmolFilled icon for template parts
talldan Nov 26, 2021
f6a45c5
Add another wrapper to replace fragile class
talldan Nov 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 10 additions & 3 deletions packages/components/src/navigation/item/index.js
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@ import { isRTL } from '@wordpress/i18n';
*/
import Button from '../../button';
import { useNavigationContext } from '../context';
import { ItemUI } from '../styles/navigation-styles';
import { ItemUI, ItemIconUI } from '../styles/navigation-styles';
import NavigationItemBaseContent from './base-content';
import NavigationItemBase from './base';

Expand All @@ -29,6 +29,7 @@ export default function NavigationItem( props ) {
navigateToMenu,
onClick = noop,
title,
icon,
hideIfTargetMenuEmpty,
isText,
...restProps
Expand Down Expand Up @@ -62,7 +63,7 @@ export default function NavigationItem( props ) {

onClick( event );
};
const icon = isRTL() ? chevronLeft : chevronRight;
const navigationIcon = isRTL() ? chevronLeft : chevronRight;
const baseProps = children ? props : { ...props, onClick: undefined };
const itemProps = isText
? restProps
Expand All @@ -72,12 +73,18 @@ export default function NavigationItem( props ) {
<NavigationItemBase { ...baseProps } className={ classes }>
{ children || (
<ItemUI { ...itemProps }>
{ icon && (
<ItemIconUI>
<Icon icon={ icon } />
</ItemIconUI>
) }

<NavigationItemBaseContent
title={ title }
badge={ badge }
/>

{ navigateToMenu && <Icon icon={ icon } /> }
{ navigateToMenu && <Icon icon={ navigationIcon } /> }
</ItemUI>
) }
</NavigationItemBase>
Expand Down
3 changes: 2 additions & 1 deletion packages/components/src/navigation/stories/more-examples.js
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@
* WordPress dependencies
*/
import { useEffect, useState } from '@wordpress/element';
import { Icon, wordpress } from '@wordpress/icons';
import { Icon, wordpress, home } from '@wordpress/icons';

/**
* Internal dependencies
Expand Down Expand Up @@ -33,6 +33,7 @@ export function MoreExamplesStory() {
</NavigationGroup>
<NavigationGroup title="Items with Unusual Features">
<NavigationItem
icon={ home }
item="item-sub-menu"
navigateToMenu="sub-menu"
title="Sub-Menu with Custom Back Label"
Expand Down
5 changes: 5 additions & 0 deletions packages/components/src/navigation/styles/navigation-styles.js
View file
Open in desktop
Expand Up @@ -184,6 +184,11 @@ export const ItemUI = styled.div`
opacity: 0.7;
`;

export const ItemIconUI = styled.span`
display: flex;
margin-right: ${ space( 2 ) };
`;

export const ItemBadgeUI = styled.span`
margin-left: ${ () => ( isRTL() ? '0' : space( 2 ) ) };
margin-right: ${ () => ( isRTL() ? space( 2 ) : '0' ) };
Expand Down
8 changes: 8 additions & 0 deletions packages/edit-site/src/components/navigation-sidebar/navigation-panel/index.js
View file
Open in desktop
Expand Up @@ -20,6 +20,11 @@ import { __ } from '@wordpress/i18n';
import { ESCAPE } from '@wordpress/keycodes';
import { decodeEntities } from '@wordpress/html-entities';
import { addQueryArgs } from '@wordpress/url';
import {
home as siteIcon,
layout as templateIcon,
symbolFilled as templatePartIcon,
} from '@wordpress/icons';

/**
* Internal dependencies
Expand Down Expand Up @@ -87,6 +92,7 @@ const NavigationPanel = ( {
<NavigationMenu>
<NavigationGroup title={ __( 'Editor' ) }>
<NavigationItem
icon={ siteIcon }
title={ __( 'Site' ) }
item={ SITE_EDITOR_KEY }
href={ addQueryArgs( window.location.href, {
Expand All @@ -95,6 +101,7 @@ const NavigationPanel = ( {
} ) }
/>
<NavigationItem
icon={ templateIcon }
title={ __( 'Templates' ) }
item="wp_template"
href={ addQueryArgs( window.location.href, {
Expand All @@ -103,6 +110,7 @@ const NavigationPanel = ( {
} ) }
/>
<NavigationItem
icon={ templatePartIcon }
title={ __( 'Template Parts' ) }
item="wp_template_part"
href={ addQueryArgs( window.location.href, {
Expand Down