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

Fix: template editor header area is difficult to navigate with screenreaders #32938

Merged
merged 1 commit into from
Jun 25, 2021
Merged

Fix: template editor header area is difficult to navigate with screenreaders #32938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions packages/edit-post/src/components/header/header-toolbar/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import { store as keyboardShortcutsStore } from '@wordpress/keyboard-shortcuts';
/**
* Internal dependencies
*/
import TemplateTitle from '../template-title';
import { store as editPostStore } from '../../../store';

const preventDefault = ( event ) => {
Expand Down Expand Up @@ -164,8 +163,6 @@ function HeaderToolbar() {
</>
) }
</div>

<TemplateTitle />
</NavigableToolbar>
);
}
Expand Down
2 changes: 2 additions & 0 deletions packages/edit-post/src/components/header/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import PostPublishButtonOrToggle from './post-publish-button-or-toggle';
import { default as DevicePreview } from '../device-preview';
import MainDashboardButton from './main-dashboard-button';
import { store as editPostStore } from '../../store';
import TemplateTitle from './template-title';

function Header( { setEntitiesSavedStatesCallback } ) {
const {
Expand Down Expand Up @@ -59,6 +60,7 @@ function Header( { setEntitiesSavedStatesCallback } ) {
</MainDashboardButton.Slot>
<div className="edit-post-header__toolbar">
<HeaderToolbar />
<TemplateTitle />
</div>
<div className="edit-post-header__settings">
{ ! isPublishSidebarOpened && (
Expand Down
97 changes: 44 additions & 53 deletions packages/edit-post/src/components/header/template-title/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/
import { __, sprintf } from '@wordpress/i18n';
import { useSelect, useDispatch } from '@wordpress/data';
import { Dropdown, ToolbarItem, Button } from '@wordpress/components';
import { Dropdown, Button } from '@wordpress/components';
import { chevronDown } from '@wordpress/icons';

/**
Expand Down Expand Up @@ -47,59 +47,50 @@ function TemplateTitle() {
}

return (
<ToolbarItem>
{ ( toolbarItemHTMLProps ) => {
return (
<Dropdown
className="edit-post-template-top-area"
position="bottom center"
contentClassName="edit-post-template-top-area__popover"
renderToggle={ ( { onToggle } ) => (
<>
<Button
{ ...toolbarItemHTMLProps }
className="edit-post-template-post-title"
isLink
showTooltip
label={ sprintf(
/* translators: %s: Title of the referring post, e.g: "Hello World!" */
__( 'Edit %s' ),
title
) }
onClick={ () => {
clearSelectedBlock();
setIsEditingTemplate( false );
} }
>
{ title }
</Button>
<Button
{ ...toolbarItemHTMLProps }
className="edit-post-template-title"
isLink
icon={ chevronDown }
showTooltip
onClick={ onToggle }
label={ __( 'Template Options' ) }
>
{ templateTitle }
</Button>
</>
<div className="edit-post-template-top-area">
<Button
className="edit-post-template-post-title"
isLink
showTooltip
label={ sprintf(
/* translators: %s: Title of the referring post, e.g: "Hello World!" */
__( 'Edit %s' ),
title
) }
onClick={ () => {
clearSelectedBlock();
setIsEditingTemplate( false );
} }
>
{ title }
</Button>
<Dropdown
position="bottom center"
contentClassName="edit-post-template-top-area__popover"
renderToggle={ ( { onToggle } ) => (
<Button
className="edit-post-template-title"
isLink
icon={ chevronDown }
showTooltip
onClick={ onToggle }
label={ __( 'Template Options' ) }
>
{ templateTitle }
</Button>
) }
renderContent={ () => (
<>
{ template.has_theme_file ? (
<TemplateDescription />
) : (
<EditTemplateTitle />
) }
renderContent={ () => (
<>
{ template.has_theme_file ? (
<TemplateDescription />
) : (
<EditTemplateTitle />
) }
<DeleteTemplate />
</>
) }
/>
);
} }
</ToolbarItem>
<DeleteTemplate />
</>
) }
/>
</div>
);
}

Expand Down