Skip to content

Group: Fix click-first state #43513

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
jasmussen merged 3 commits into from
Aug 26, 2022
Merged

Group: Fix click-first state #43513

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
f1cfce2
Group: Fix click-first state
jasmussen Aug 23, 2022
7c433bd
Try fix for block insertion tests.
tellthemachines Aug 25, 2022
b26ff02
Move the code to the Button Block Appender component.
jasmussen Aug 25, 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
25 changes: 25 additions & 0 deletions packages/block-editor/src/components/button-block-appender/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,28 @@
color: $black;
}
}

// When the appender shows up in empty container blocks, such as Group and Columns, add an extra click state.
.block-list-appender:only-child {
.is-layout-constrained.block-editor-block-list__block:not(.is-selected) > &,
.is-layout-flow.block-editor-block-list__block:not(.is-selected) > & {
pointer-events: none;

&::after {
content: "";
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
border: $border-width dashed currentColor;
opacity: 0.4;
border-radius: $radius-block-ui;
pointer-events: none;
}

.block-editor-inserter {
visibility: hidden;
}
}
}
25 changes: 0 additions & 25 deletions packages/block-library/src/group/editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,28 +53,3 @@
pointer-events: all;
}
}

// Show an unselected empty group button as a dashed outline instead of the appender button.
// This effectively adds a selectable-to-delete state.
.is-layout-flow.block-editor-block-list__block:not(.is-selected) {
> .block-list-appender:only-child {
pointer-events: none;

&::after {
content: "";
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
border: $border-width dashed currentColor;
opacity: 0.4;
border-radius: $radius-block-ui;
pointer-events: none;
}

.block-editor-inserter {
visibility: hidden;
}
}
}
4 changes: 4 additions & 0 deletions packages/e2e-tests/specs/editor/various/inserting-blocks.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,8 @@ describe( 'Inserting blocks', () => {
await insertBlock( 'Group' );
await insertBlock( 'Paragraph' );
await page.keyboard.type( 'Paragraph after group' );
// Click the Group first to make the appender inside it clickable.
await page.click( '[data-type="core/group"]' );
await page.click( '[data-type="core/group"] [aria-label="Add block"]' );
const browseAll = await page.waitForXPath(
'//button[text()="Browse all"]'
Expand All @@ -295,6 +297,8 @@ describe( 'Inserting blocks', () => {
await insertBlock( 'Group' );
await insertBlock( 'Paragraph' );
await page.keyboard.type( 'Text' );
// Click the Group first to make the appender inside it clickable.
await page.click( '[data-type="core/group"]' );
await page.click( '[data-type="core/group"] [aria-label="Add block"]' );
await page.waitForSelector( INSERTER_SEARCH_SELECTOR );
await page.focus( INSERTER_SEARCH_SELECTOR );
Expand Down