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

Site Editor: Fix navigation on mobile web #59014

Merged
merged 3 commits into from
Feb 15, 2024
Merged

Site Editor: Fix navigation on mobile web #59014

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
a1550f2
Site Editor: Fix navigation on mobile web
youknowriad Feb 14, 2024
8fb4f09
Hide patterns sidebar on mobile
youknowriad Feb 15, 2024
9ca090e
Fix the styles route
youknowriad Feb 15, 2024
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
77 changes: 47 additions & 30 deletions packages/edit-site/src/components/layout/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,47 +251,64 @@ export default function Layout() {
The NavigableRegion must always be rendered and not use
`inert` otherwise `useNavigateRegions` will fail.
*/ }
<NavigableRegion
ariaLabel={ __( 'Navigation' ) }
className="edit-site-layout__sidebar-region"
>
<AnimatePresence>
{ canvasMode === 'view' && (
<motion.div
initial={ { opacity: 0 } }
animate={ { opacity: 1 } }
exit={ { opacity: 0 } }
transition={ {
type: 'tween',
duration:
// Disable transition in mobile to emulate a full page transition.
disableMotion || isMobileViewport
? 0
: ANIMATION_DURATION,
ease: 'easeOut',
} }
className="edit-site-layout__sidebar"
>
<Sidebar />
</motion.div>
) }
</AnimatePresence>
</NavigableRegion>
{ ( ! isMobileViewport ||
( isMobileViewport && ! areas.mobile ) ) && (
Copy link
Contributor

Choose a reason for hiding this comment

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

Based on the above comment, shouldn't we render NavigableRegion?

<NavigableRegion
ariaLabel={ __( 'Navigation' ) }
className="edit-site-layout__sidebar-region"
>
<AnimatePresence>
{ canvasMode === 'view' && (
<motion.div
initial={ { opacity: 0 } }
animate={ { opacity: 1 } }
exit={ { opacity: 0 } }
transition={ {
type: 'tween',
duration:
// Disable transition in mobile to emulate a full page transition.
disableMotion ||
isMobileViewport
? 0
: ANIMATION_DURATION,
ease: 'easeOut',
} }
className="edit-site-layout__sidebar"
>
<Sidebar />
</motion.div>
) }
</AnimatePresence>
</NavigableRegion>
) }

<SavePanel />

{ areas.content && canvasMode !== 'edit' && (
{ isMobileViewport && areas.mobile && (
<div
className="edit-site-layout__area"
className="edit-site-layout__mobile"
style={ {
maxWidth: widths?.content,
} }
>
{ areas.content }
{ areas.mobile }
</div>
) }

{ areas.preview && (
{ ! isMobileViewport &&
areas.content &&
canvasMode !== 'edit' && (
<div
className="edit-site-layout__area"
style={ {
maxWidth: widths?.content,
} }
>
{ areas.content }
</div>
) }

{ ! isMobileViewport && areas.preview && (
<div className="edit-site-layout__canvas-container">
{ canvasResizer }
{ !! canvasSize.width && (
Expand Down
33 changes: 31 additions & 2 deletions packages/edit-site/src/components/layout/router.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,21 @@ const { useLocation } = unlock( routerPrivateApis );
export default function useLayoutAreas() {
const isSiteEditorLoading = useIsSiteEditorLoading();
const { params } = useLocation();
const { postType, postId, path, layout, isCustom } = params ?? {};
const { postType, postId, path, layout, isCustom, canvas } = params ?? {};

// Note: Since "sidebar" is not yet supported here,
// returning undefined from "mobile" means show the sidebar.

// Regular page
if ( path === '/page' ) {
return {
areas: {
content: undefined,
preview: <Editor isLoading={ isSiteEditorLoading } />,
mobile:
canvas === 'edit' ? (
<Editor isLoading={ isSiteEditorLoading } />
) : undefined,
},
widths: {
content: undefined,
Expand Down Expand Up @@ -63,6 +71,10 @@ export default function useLayoutAreas() {
return {
areas: {
preview: <Editor isLoading={ isSiteEditorLoading } />,
mobile:
canvas === 'edit' ? (
<Editor isLoading={ isSiteEditorLoading } />
) : undefined,
},
};
}
Expand All @@ -79,6 +91,11 @@ export default function useLayoutAreas() {
preview: isListLayout && (
<Editor isLoading={ isSiteEditorLoading } />
),
mobile: (
<PageTemplatesTemplateParts
postType={ TEMPLATE_POST_TYPE }
/>
),
},
widths: {
content: isListLayout ? 380 : undefined,
Expand All @@ -98,6 +115,11 @@ export default function useLayoutAreas() {
preview: isListLayout && (
<Editor isLoading={ isSiteEditorLoading } />
),
mobile: (
<PageTemplatesTemplateParts
postType={ TEMPLATE_PART_POST_TYPE }
/>
),
},
widths: {
content: isListLayout ? 380 : undefined,
Expand All @@ -110,12 +132,19 @@ export default function useLayoutAreas() {
return {
areas: {
content: <PagePatterns />,
mobile: <PagePatterns />,
},
};
}

// Fallback shows the home page preview
return {
areas: { preview: <Editor isLoading={ isSiteEditorLoading } /> },
areas: {
preview: <Editor isLoading={ isSiteEditorLoading } />,
mobile:
canvas === 'edit' ? (
<Editor isLoading={ isSiteEditorLoading } />
) : undefined,
},
};
}
7 changes: 7 additions & 0 deletions packages/edit-site/src/components/layout/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,12 @@
flex-direction: column;
}

.edit-site-layout__mobile {
position: relative;
width: 100%;
z-index: z-index(".edit-site-layout__canvas-container");
}

.edit-site-layout__canvas-container {
position: relative;
flex-grow: 1;
Expand Down Expand Up @@ -147,6 +153,7 @@
}

// This shouldn't be necessary (we should have a way to say that a skeletton is relative
.edit-site-layout__mobile .interface-interface-skeleton,
.edit-site-layout__canvas .interface-interface-skeleton,
.edit-site-template-pages-preview .interface-interface-skeleton {
position: relative !important;
Expand Down
6 changes: 6 additions & 0 deletions packages/edit-site/src/components/page-patterns/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@
}

.edit-site-page-patterns-dataviews {
margin-top: 60px;

@include break-medium {
margin-top: 0;
}

.page-patterns-preview-field {
display: flex;
flex-direction: column;
Expand Down
16 changes: 10 additions & 6 deletions packages/edit-site/src/components/sidebar-navigation-screen-pages/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { decodeEntities } from '@wordpress/html-entities';
import { privateApis as routerPrivateApis } from '@wordpress/router';
import { layout, page, home, verse, plus } from '@wordpress/icons';
import { useSelect } from '@wordpress/data';
import { useViewportMatch } from '@wordpress/compose';

/**
* Internal dependencies
Expand Down Expand Up @@ -42,6 +43,7 @@ const PageItem = ( { postType = 'page', postId, ...props } ) => {
};

export default function SidebarNavigationScreenPages() {
const isMobileViewport = useViewportMatch( 'medium', '<' );
const { records: pages, isResolving: isLoadingPages } = useEntityRecords(
'postType',
'page',
Expand Down Expand Up @@ -220,12 +222,14 @@ export default function SidebarNavigationScreenPages() {
</Truncate>
</PageItem>
) ) }
<SidebarNavigationItem
className="edit-site-sidebar-navigation-screen-pages__see-all"
{ ...pagesLink }
>
{ __( 'Manage all pages' ) }
</SidebarNavigationItem>
{ ! isMobileViewport && (
<SidebarNavigationItem
className="edit-site-sidebar-navigation-screen-pages__see-all"
{ ...pagesLink }
>
{ __( 'Manage all pages' ) }
</SidebarNavigationItem>
) }
</VStack>
}
/>
Expand Down
10 changes: 7 additions & 3 deletions packages/edit-site/src/components/sidebar/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
__experimentalNavigatorScreen as NavigatorScreen,
} from '@wordpress/components';
import { privateApis as routerPrivateApis } from '@wordpress/router';
import { useViewportMatch } from '@wordpress/compose';

/**
* Internal dependencies
Expand Down Expand Up @@ -50,6 +51,7 @@ function SidebarScreenWrapper( { className, ...props } ) {

function SidebarScreens() {
useSyncPathWithURL();
const isMobileViewport = useViewportMatch( 'medium', '<' );

return (
<>
Expand Down Expand Up @@ -77,9 +79,11 @@ function SidebarScreens() {
<SidebarScreenWrapper path="/:postType(wp_template)">
<SidebarNavigationScreenTemplates />
</SidebarScreenWrapper>
<SidebarScreenWrapper path="/patterns">
<SidebarNavigationScreenPatterns />
</SidebarScreenWrapper>
{ ! isMobileViewport && (
<SidebarScreenWrapper path="/patterns">
<SidebarNavigationScreenPatterns />
</SidebarScreenWrapper>
) }
<SidebarScreenWrapper path="/:postType(wp_template|wp_template_part)/all">
<SidebarNavigationScreenTemplatesBrowse />
</SidebarScreenWrapper>
Expand Down
Loading