Skip to content

Move the edit button in the site editor sidebar to a contextual widget #46700

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

Merged
youknowriad merged 10 commits into from
Dec 23, 2022
Merged

Move the edit button in the site editor sidebar to a contextual widget #46700

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
eb1a2a0
Move the edit button in the site editor sidebar to a contextual widget
youknowriad Dec 21, 2022
e8777cf
Fix sidebar scrolling
youknowriad Dec 21, 2022
8ddd68e
Do not hide the inserter in the header
youknowriad Dec 21, 2022
dc7de38
Small fix
youknowriad Dec 21, 2022
94781da
Update hub shadow
jameskoster Dec 21, 2022
6a66f6e
Resize the edit button
youknowriad Dec 22, 2022
66e464c
Restore the sidebar width
youknowriad Dec 22, 2022
c1c5452
Restore the top bar animation
youknowriad Dec 22, 2022
be0def0
Speeding up the hub animation
youknowriad Dec 22, 2022
4bd75d2
Fix z-index and e2e tests
youknowriad Dec 23, 2022
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
Prev Previous commit
Next Next commit
Restore the top bar animation
  • Loading branch information
@youknowriad
youknowriad committed Dec 22, 2022
commit c1c5452dea8736aa600c091a75c40ab34b5d62c5
37 changes: 28 additions & 9 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 @@ -180,15 +180,34 @@ export default function Layout( { onError } ) {
) }
</motion.div>

{ isEditorPage &&
( canvasMode === 'edit' || isMobileCanvasVisible ) && (
<NavigableRegion
className="edit-site-layout__header"
ariaLabel={ __( 'Editor top bar' ) }
>
{ canvasMode === 'edit' && <Header /> }
</NavigableRegion>
) }
<AnimatePresence initial={ false }>
{ isEditorPage &&
( canvasMode === 'edit' || isMobileCanvasVisible ) && (
<NavigableRegion
className="edit-site-layout__header"
ariaLabel={ __( 'Editor top bar' ) }
as={ motion.div }
animate={ {
y: 0,
} }
initial={ {
y: '-100%',
} }
exit={ {
y: '-100%',
} }
transition={ {
type: 'tween',
duration: disableMotion
? 0
: ANIMATION_DURATION,
ease: 'easeOut',
} }
>
{ canvasMode === 'edit' && <Header /> }
</NavigableRegion>
) }
</AnimatePresence>

<div className="edit-site-layout__content">
<AnimatePresence initial={ false }>
Expand Down
9 changes: 8 additions & 1 deletion 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 @@ -14,7 +14,7 @@ $hub-height: $grid-unit-20 * 2 + $button-size;
left: $canvas-padding;
width: calc(100vw - #{$canvas-padding * 2});
height: $hub-height;
z-index: 2;
z-index: 3;

background: $black;
padding: $grid-unit-20;
Expand Down Expand Up @@ -60,6 +60,13 @@ $hub-height: $grid-unit-20 * 2 + $button-size;
.edit-site-layout__header {
height: $header-height;
display: flex;
z-index: 2;

// This is only necessary for the exit animation
.edit-site-layout:not(.is-full-canvas) & {
position: fixed;
width: 100vw;
}
}

.edit-site-layout__content {
Expand Down