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

Update navigation sidebar responsiveness #36638

Merged
merged 3 commits into from Nov 23, 2021
Merged

Update navigation sidebar responsiveness #36638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
688df44
Close and open the nav sidebar in the list page
talldan Nov 19, 2021
84e0c78
Remove superflouous prop
talldan Nov 22, 2021
0bd0fab
Tidy up effect
talldan Nov 22, 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
6 changes: 1 addition & 5 deletions packages/edit-site/src/components/editor/index.js
View file
Open in desktop
Expand Up @@ -219,11 +219,7 @@ function Editor( { initialSettings, onError } ) {
<ComplementaryArea.Slot scope="core/edit-site" />
)
}
drawer={
<NavigationSidebar
defaultIsOpen={ false }
/>
}
drawer={ <NavigationSidebar /> }
header={
<Header
openEntitiesSavedStates={
Expand Down
4 changes: 1 addition & 3 deletions packages/edit-site/src/components/list/index.js
View file
Open in desktop
Expand Up @@ -5,7 +5,6 @@ import { store as coreStore } from '@wordpress/core-data';
import { useSelect } from '@wordpress/data';
import { InterfaceSkeleton } from '@wordpress/interface';
import { __, sprintf } from '@wordpress/i18n';
import { useViewportMatch } from '@wordpress/compose';
import { store as keyboardShortcutsStore } from '@wordpress/keyboard-shortcuts';

/**
Expand All @@ -18,7 +17,6 @@ import Table from './table';

export default function List( { templateType } ) {
useRegisterShortcuts();
const isDesktopViewport = useViewportMatch( 'medium' );

const { previousShortcut, nextShortcut } = useSelect( ( select ) => {
return {
Expand Down Expand Up @@ -64,8 +62,8 @@ export default function List( { templateType } ) {
header={ <Header templateType={ templateType } /> }
drawer={
<NavigationSidebar
defaultIsOpen={ isDesktopViewport }
activeTemplateType={ templateType }
isDefaultOpen
/>
}
content={
Expand Down
22 changes: 19 additions & 3 deletions packages/edit-site/src/components/navigation-sidebar/index.js
View file
Open in desktop
@@ -1,8 +1,9 @@
/**
* WordPress dependencies
*/
import { useState } from '@wordpress/element';
import { useEffect, useState } from '@wordpress/element';
import { createSlotFill } from '@wordpress/components';
import { useViewportMatch } from '@wordpress/compose';

/**
* Internal dependencies
Expand All @@ -16,10 +17,25 @@ export const {
} = createSlotFill( 'EditSiteNavigationPanelPreview' );

export default function NavigationSidebar( {
defaultIsOpen = false,
isDefaultOpen = false,
activeTemplateType,
} ) {
const [ isNavigationOpen, setIsNavigationOpen ] = useState( defaultIsOpen );
const isDesktopViewport = useViewportMatch( 'medium' );
const [ isNavigationOpen, setIsNavigationOpen ] = useState(
isDefaultOpen && isDesktopViewport
);

useEffect( () => {
// When transitioning to desktop open the navigation if `isDefaultOpen` is true.
if ( isDefaultOpen && isDesktopViewport ) {
setIsNavigationOpen( true );
}

// When transitioning to mobile/tablet, close the navigation.
if ( ! isDesktopViewport ) {
setIsNavigationOpen( false );
}
}, [ isDefaultOpen, isDesktopViewport ] );

return (
<>
Expand Down