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

Fix fixed block toolbar positioning #49990

Merged
merged 2 commits into from
Apr 21, 2023
Merged

Fix fixed block toolbar positioning #49990

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eddd536
use editor-left mixin to fix and simplify fixed toolbar positioning
draganescu Apr 21, 2023
373d49d
Fix comment
draganescu Apr 21, 2023
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
111 changes: 23 additions & 88 deletions packages/block-editor/src/components/block-tools/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@
* Block Toolbar when contextual.
*/

// base left position for the toolbar when fixed
draganescu marked this conversation as resolved.
Show resolved Hide resolved
@include editor-left(".block-editor-block-contextual-toolbar.is-fixed");

.block-editor-block-contextual-toolbar {
// Block UI appearance.
display: inline-flex;
Expand All @@ -104,7 +107,6 @@
&.is-fixed {
position: sticky;
top: 0;
left: 0;
z-index: z-index(".block-editor-block-popover");
display: block;
width: 100%;
Expand All @@ -121,14 +123,15 @@

// on desktop and tablet viewports the toolbar is fixed
// on top of interface header

@include break-medium() {
&.is-fixed {

// leave room for block inserter
margin-left: $grid-unit-80;
// position on top of interface header
position: fixed;
top: $grid-unit-50 - 2;
// leave room for block inserter
left: $grid-unit-80 + $grid-unit-40;
top: $admin-bar-height + $grid-unit;
// Don't fill up when empty
min-height: initial;
// remove the border
Expand All @@ -137,15 +140,17 @@
display: flex;

&.is-collapsed {
left: $grid-unit-10 * 32;
width: initial;
margin-left: $grid-unit-80 * 3 + $grid-unit-30;
}

.is-fullscreen-mode & {
top: $grid-unit - 2;
// leave room for block inserter
left: $grid-unit-80 + $grid-unit-70;
margin-left: $grid-unit-80 + $grid-unit-70;
top: $grid-unit;
&.is-collapsed {
left: $grid-unit-10 * 35;
width: initial;
margin-left: $grid-unit-80 * 4 + $grid-unit-30;
}
}

Expand Down Expand Up @@ -183,16 +188,21 @@
}

.show-icon-labels & {
left: $grid-unit-80 + $grid-unit-50;

margin-left: $grid-unit-80;

&.is-collapsed {
left: $grid-unit-10 * 56;
margin-left: $grid-unit-80 * 6;
}

.is-fullscreen-mode & {
left: $grid-unit-80 + $grid-unit-80;
margin-left: $grid-unit-80 + $grid-unit-80;
&.is-collapsed {
margin-left: $grid-unit-80 * 7;
}
}


.block-editor-block-parent-selector .block-editor-block-parent-selector__button::after {
left: 0;
}
Expand Down Expand Up @@ -250,35 +260,7 @@
// except for the inserter on the left
@include break-medium() {
&.is-fixed {

Copy link
Contributor

Choose a reason for hiding this comment

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

So much red. Glorious.

Copy link
Contributor Author

@draganescu draganescu Apr 21, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

This was so painful to write I almost felt sorry ahahhaha

Copy link
Contributor

Choose a reason for hiding this comment

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

For what it's worth, this behavior feels pretty solid now, and knowing the mixin has been used for the main editor window for years now should also boost confidence here, IMO. In fact, I hope to mock up a version of this for mobile next week :)

left: 28 * $grid-unit;
width: calc(100% - #{28 * $grid-unit});

&.is-collapsed {
// when collapsed minimize area
width: initial;
left: $grid-unit * 48;
}

// collapsed wp admin sidebar when not in full screen mode
.auto-fold & {
left: $grid-unit-80 + $grid-unit-40;
width: calc(100% - #{$grid-unit-80 + $grid-unit-40});

&.is-collapsed {
left: $grid-unit * 32;
}
}

.is-fullscreen-mode & {
width: calc(100% - #{$grid-unit-80 + $grid-unit-70});
left: $grid-unit-80 + $grid-unit-70;
&.is-collapsed {
left: $grid-unit * 36;
// when collapsed minimize area
width: initial;
}
}
width: 100%;
}
}

Expand All @@ -287,54 +269,7 @@
// for the block inserter the publish button
@include break-large() {
&.is-fixed {

.auto-fold & {
// Don't fill the whole header, minimize area
width: initial;

// leave room for block inserter and the dashboard navigation
left: $grid-unit-80 + $grid-unit-40 + ( $grid-unit-80 * 2 );

&.is-collapsed {
// when collapsed minimize area
width: initial;
left: $grid-unit * 48;
}

}

// collapsed wp admin sidebar when not in full screen mode
.auto-fold.folded & {
width: initial;
left: $grid-unit-80 + $grid-unit-40;

&.is-collapsed {
// when collapsed minimize area
width: initial;
left: $grid-unit * 32;
}

}

.auto-fold.is-fullscreen-mode & {
// Don't fill the whole header, minimize area
width: initial;
left: $grid-unit-80 + $grid-unit-70;

&.is-collapsed {
// when collapsed minimize area
width: initial;
left: $grid-unit * 36;
}
}

.auto-fold.is-fullscreen-mode .show-icon-labels & {
left: $grid-unit-80 * 2;
&.is-collapsed {
left: $grid-unit * 48;
}
}

width: initial;
}
}

Expand Down