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

Accessibility: Show open button when the sidebar is closed and tabbingg out of the content #19726

Merged
merged 1 commit into from
Feb 4, 2020
Merged

Accessibility: Show open button when the sidebar is closed and tabbingg out of the content #19726

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
25 changes: 21 additions & 4 deletions packages/edit-post/src/components/editor-regions/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,27 @@ html {
}

.edit-post-editor-regions__sidebar {
display: none;

@include break-medium() {
display: block;
z-index: z-index(".edit-post-editor-regions__sidebar");
position: fixed !important; // Need to override the default relative positionning
top: -9999em;
bottom: auto;
left: auto;
right: 0;
width: $sidebar-width;

&:focus {
top: auto;
bottom: 0;
}
}
}

.is-sidebar-opened .edit-post-editor-regions__sidebar {
display: block;
width: auto; // Keep the sidebar width flexible.
flex-shrink: 0;
position: absolute;
Expand All @@ -84,10 +105,6 @@ html {
left: 0;
background: $white;

&:empty {
display: none;
}

// On Mobile the header is fixed to keep HTML as scrollable.
@include break-medium() {
overflow: auto;
Expand Down
36 changes: 31 additions & 5 deletions packages/edit-post/src/components/layout/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,11 @@ import WelcomeGuide from '../welcome-guide';

function Layout() {
const isMobileViewport = useViewportMatch( 'small', '<' );
const { closePublishSidebar, togglePublishSidebar } = useDispatch(
'core/edit-post'
);
const {
closePublishSidebar,
openGeneralSidebar,
togglePublishSidebar,
} = useDispatch( 'core/edit-post' );
const {
mode,
isRichEditingEnabled,
Expand All @@ -66,6 +68,7 @@ function Layout() {
hasFixedToolbar,
previousShortcut,
nextShortcut,
hasBlockSelected,
} = useSelect( ( select ) => {
return {
hasFixedToolbar: select( 'core/edit-post' ).isFeatureActive(
Expand Down Expand Up @@ -93,6 +96,9 @@ function Layout() {
nextShortcut: select(
'core/keyboard-shortcuts'
).getAllShortcutRawKeyCombinations( 'core/edit-post/next-region' ),
hasBlockSelected: select(
'core/block-editor'
).getBlockSelectionStart(),
};
}, [] );
const showPageTemplatePicker = __experimentalUsePageTemplatePickerVisible();
Expand All @@ -103,6 +109,10 @@ function Layout() {
'has-fixed-toolbar': hasFixedToolbar,
'has-metaboxes': hasActiveMetaboxes,
} );
const openSidebarPanel = () =>
openGeneralSidebar(
hasBlockSelected ? 'edit-post/block' : 'edit-post/document'
);

return (
<>
Expand All @@ -120,6 +130,22 @@ function Layout() {
sidebar={
! publishSidebarOpened && (
<>
{ ! sidebarIsOpened && (
<div className="edit-post-layout__toogle-sidebar-panel">
<Button
isSecondary
className="edit-post-layout__toogle-sidebar-panel-button"
onClick={ openSidebarPanel }
aria-expanded={ false }
>
{ hasBlockSelected
? __( 'Open block settings' )
: __(
'Open document settings'
) }
</Button>
</div>
) }
<SettingsSidebar />
<Sidebar.Slot />
</>
Expand Down Expand Up @@ -165,10 +191,10 @@ function Layout() {
}
/>
) : (
<div className="edit-post-toggle-publish-panel">
<div className="edit-post-layout__toogle-publish-panel">
<Button
isSecondary
className="edit-post-toggle-publish-panel__button"
className="edit-post-layout__toogle-publish-panel-button"
onClick={ togglePublishSidebar }
aria-expanded={ false }
>
Expand Down
44 changes: 23 additions & 21 deletions packages/edit-post/src/components/layout/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,31 +61,33 @@
justify-content: center;
}

.edit-post-toggle-publish-panel {
.edit-post-layout__toogle-publish-panel,
.edit-post-layout__toogle-sidebar-panel {
background-color: $white;
padding: 10px 10px 10px 0;
}

.edit-post-toggle-publish-panel__button {
width: auto;
height: auto;
display: block;
font-size: 14px;
font-weight: 600;
margin: 0 0 0 auto;
padding: 15px 23px 14px;
line-height: normal;
text-decoration: none;
outline: none;
background: #f1f1f1;
color: theme(secondary);
.edit-post-layout__toogle-publish-panel-button,
.edit-post-layout__toogle-sidebar-panel-button {
width: auto;
height: auto;
display: block;
font-size: 14px;
font-weight: 600;
margin: 0 0 0 auto;
padding: 15px 23px 14px;
line-height: normal;
text-decoration: none;
outline: none;
background: #f1f1f1;
color: theme(secondary);

&:focus {
position: fixed;
top: auto;
right: 10px;
bottom: 10px;
left: auto;
}
&:focus {
position: fixed;
top: auto;
right: 10px;
bottom: 10px;
left: auto;
}
}

Expand Down