Skip to content

Commit

Permalink
add hint to show template part move (#52395)
Browse files Browse the repository at this point in the history
  • Loading branch information
SaxonF authored Jul 7, 2023
1 parent bf8023a commit d222006
Show file tree
Hide file tree
Showing 3 changed files with 94 additions and 40 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import SidebarNavigationItem from '../sidebar-navigation-item';
import { SidebarNavigationItemGlobalStyles } from '../sidebar-navigation-screen-global-styles';
import { unlock } from '../../lock-unlock';
import { store as editSiteStore } from '../../store';
import TemplatePartHint from './template-part-hint';

export default function SidebarNavigationScreenMain() {
const { location } = useNavigator();
Expand All @@ -42,46 +43,49 @@ export default function SidebarNavigationScreenMain() {
'Customize the appearance of your website using the block editor.'
) }
content={
<ItemGroup>
<NavigatorButton
as={ SidebarNavigationItem }
path="/navigation"
withChevron
icon={ navigation }
>
{ __( 'Navigation' ) }
</NavigatorButton>
<SidebarNavigationItemGlobalStyles
withChevron
icon={ styles }
>
{ __( 'Styles' ) }
</SidebarNavigationItemGlobalStyles>
<NavigatorButton
as={ SidebarNavigationItem }
path="/page"
withChevron
icon={ page }
>
{ __( 'Pages' ) }
</NavigatorButton>
<NavigatorButton
as={ SidebarNavigationItem }
path="/wp_template"
withChevron
icon={ layout }
>
{ __( 'Templates' ) }
</NavigatorButton>
<NavigatorButton
as={ SidebarNavigationItem }
path="/patterns"
withChevron
icon={ symbol }
>
{ __( 'Patterns' ) }
</NavigatorButton>
</ItemGroup>
<>
<ItemGroup>
<NavigatorButton
as={ SidebarNavigationItem }
path="/navigation"
withChevron
icon={ navigation }
>
{ __( 'Navigation' ) }
</NavigatorButton>
<SidebarNavigationItemGlobalStyles
withChevron
icon={ styles }
>
{ __( 'Styles' ) }
</SidebarNavigationItemGlobalStyles>
<NavigatorButton
as={ SidebarNavigationItem }
path="/page"
withChevron
icon={ page }
>
{ __( 'Pages' ) }
</NavigatorButton>
<NavigatorButton
as={ SidebarNavigationItem }
path="/wp_template"
withChevron
icon={ layout }
>
{ __( 'Templates' ) }
</NavigatorButton>
<NavigatorButton
as={ SidebarNavigationItem }
path="/patterns"
withChevron
icon={ symbol }
>
{ __( 'Patterns' ) }
</NavigatorButton>
</ItemGroup>
<TemplatePartHint />
</>
}
/>
);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/**
* WordPress dependencies
*/
import { Notice } from '@wordpress/components';
import { useDispatch, useSelect } from '@wordpress/data';
import { __ } from '@wordpress/i18n';
import { store as preferencesStore } from '@wordpress/preferences';

const PREFERENCE_NAME = 'isTemplatePartMoveHintVisible';

export default function TemplatePartHint() {
const showTemplatePartHint = useSelect(
( select ) =>
select( preferencesStore ).get( 'core', PREFERENCE_NAME ) ?? true,
[]
);

const { set: setPreference } = useDispatch( preferencesStore );
if ( ! showTemplatePartHint ) {
return null;
}

return (
<Notice
politeness="polite"
className="edit-site-sidebar__notice"
onRemove={ () => {
setPreference( 'core', PREFERENCE_NAME, false );
} }
>
{ __(
'Looking for template parts? You can now find them in the new "Patterns" page.'
) }
</Notice>
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,20 @@
border-top: 1px solid $gray-800;
}

.edit-site-sidebar__notice {
background: $gray-800;
color: $gray-300;
margin: $grid-unit-30 0;
&.is-dismissible {
padding-right: $grid-unit-10;
}
.components-notice__dismiss:not(:disabled):not([aria-disabled="true"]):focus,
.components-notice__dismiss:not(:disabled):not([aria-disabled="true"]):not(.is-secondary):active,
.components-notice__dismiss:not(:disabled):not([aria-disabled="true"]):not(.is-secondary):hover {
color: $gray-100;
}
}

/* In general style overrides are discouraged.
* This is a temporary solution to override the InputControl component's styles.
* The `Theme` component will potentially be the more appropriate approach
Expand Down

1 comment on commit d222006

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Flaky tests detected in d222006.
Some tests passed with failed attempts. The failures may not be related to this commit but are still reported for visibility. See the documentation for more information.

🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/5481827114
📝 Reported issues:

Please sign in to comment.