Skip to content

Fix content loss when ungrouping template parts or reusable blocks #37280

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 3 commits into from
Dec 13, 2021
Merged

Fix content loss when ungrouping template parts or reusable blocks #37280

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
a6c38b0
Fix content loss when ungrouping template parts or reusable blocks
youknowriad Dec 10, 2021
67f118f
Fix typos
youknowriad Dec 10, 2021
581cd4a
add e2e test
ntsekouras Dec 13, 2021
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
11 changes: 8 additions & 3 deletions packages/block-editor/src/store/reducer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,9 +369,14 @@ const withBlockTree = ( reducer ) => ( state = {}, action ) => {
...omit(
newState.tree,
action.replacedClientIds.concat(
action.replacedClientIds.map(
( clientId ) => 'controlled||' + clientId
)
// Controlled inner blocks are only removed
// if the block doesn't move to another position
// otherwise their content will be lost.
action.replacedClientIds
.filter( ( clientId ) => ! subTree[ clientId ] )
.map(
( clientId ) => 'controlled||' + clientId
)
)
),
...subTree,
Expand Down
46 changes: 46 additions & 0 deletions packages/e2e-tests/specs/editor/various/block-grouping.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,52 @@ describe( 'Block Grouping', () => {
);
expect( ungroupButtons ).toHaveLength( 0 );
} );
it( 'should group and ungroup a controlled block properly', async () => {
const getParagraphText = async () => {
const paragraphInReusableSelector =
'.block-editor-block-list__block[data-type="core/block"] p';
await page.waitForSelector( paragraphInReusableSelector );
return page.$eval(
paragraphInReusableSelector,
( element ) => element.innerText
);
};

const paragraphText = 'hi';
const reusableBlockNameInputSelector =
'.reusable-blocks-menu-items__convert-modal .components-text-control__input';
await insertBlock( 'Paragraph' );
await page.keyboard.type( paragraphText );

await clickBlockToolbarButton( 'Options' );
await clickMenuItem( 'Add to Reusable blocks' );
const nameInput = await page.waitForSelector(
reusableBlockNameInputSelector
);
await nameInput.click();
await page.keyboard.type( 'Block' );
await page.keyboard.press( 'Enter' );

// Wait for creation to finish
await page.waitForXPath(
'//*[contains(@class, "components-snackbar")]/*[text()="Reusable block created."]'
);
// Group
await clickBlockToolbarButton( 'Options' );
await clickMenuItem( 'Group' );

let group = await page.$$( '[data-type="core/group"]' );
expect( group ).toHaveLength( 1 );
// Make sure the paragraph in reusable block exists.
expect( await getParagraphText() ).toMatch( paragraphText );

await clickBlockToolbarButton( 'Options' );
await clickMenuItem( 'Ungroup' );
group = await page.$$( '[data-type="core/group"]' );
expect( group ).toHaveLength( 0 );
// Make sure the paragraph in reusable block exists.
expect( await getParagraphText() ).toEqual( paragraphText );
} );
} );

describe( 'Grouping Block availability', () => {
Expand Down