From 6b7546954f06063b0967169ff628010853be16f9 Mon Sep 17 00:00:00 2001 From: George Mamadashvili Date: Wed, 23 Jul 2025 15:42:14 +0400 Subject: [PATCH 1/3] Block Editor: Update conditions for displaying the empty block inserter --- .../src/components/block-tools/use-show-block-tools.js | 2 +- .../src/components/inserter/hooks/use-insertion-point.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/block-editor/src/components/block-tools/use-show-block-tools.js b/packages/block-editor/src/components/block-tools/use-show-block-tools.js index 0b36786f54d5cf..533d1ffde4d108 100644 --- a/packages/block-editor/src/components/block-tools/use-show-block-tools.js +++ b/packages/block-editor/src/components/block-tools/use-show-block-tools.js @@ -36,7 +36,7 @@ export function useShowBlockTools() { const hasSelectedBlock = !! clientId && !! block; const isEmptyDefaultBlock = hasSelectedBlock && - isUnmodifiedDefaultBlock( block ) && + isUnmodifiedDefaultBlock( block, 'content' ) && getBlockMode( clientId ) !== 'html'; const _showEmptyBlockSideInserter = clientId && diff --git a/packages/block-editor/src/components/inserter/hooks/use-insertion-point.js b/packages/block-editor/src/components/inserter/hooks/use-insertion-point.js index de814152c620b0..8e2deccb9ade66 100644 --- a/packages/block-editor/src/components/inserter/hooks/use-insertion-point.js +++ b/packages/block-editor/src/components/inserter/hooks/use-insertion-point.js @@ -151,7 +151,7 @@ function useInsertionPoint( { if ( ! isAppender && selectedBlock && - isUnmodifiedDefaultBlock( selectedBlock ) + isUnmodifiedDefaultBlock( selectedBlock, 'content' ) ) { replaceBlocks( selectedBlock.clientId, From 956371bdc45f12ae0754724c49766fe02bc21049 Mon Sep 17 00:00:00 2001 From: George Mamadashvili Date: Tue, 29 Jul 2025 12:21:58 +0400 Subject: [PATCH 2/3] Fix the Cover block unit tests --- packages/block-library/src/cover/test/edit.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/block-library/src/cover/test/edit.js b/packages/block-library/src/cover/test/edit.js index 16695f53f67466..9e5437fea61b72 100644 --- a/packages/block-library/src/cover/test/edit.js +++ b/packages/block-library/src/cover/test/edit.js @@ -51,11 +51,7 @@ async function createAndSelectBlock() { name: 'Black', } ) ); - await userEvent.click( - screen.getByRole( 'button', { - name: 'Select parent block: Cover', - } ) - ); + await selectBlock( 'Block: Cover' ); } describe( 'Cover block', () => { From 9a3328d4381fc338513ba6ac933e6e471d73f8da Mon Sep 17 00:00:00 2001 From: George Mamadashvili Date: Tue, 5 Aug 2025 07:17:20 +0400 Subject: [PATCH 3/3] Improve post-type locking e2e tests --- .../editor/plugins/post-type-locking.spec.js | 36 ++++++++----------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/test/e2e/specs/editor/plugins/post-type-locking.spec.js b/test/e2e/specs/editor/plugins/post-type-locking.spec.js index ff02d18c51464b..68cbdfb89f4537 100644 --- a/test/e2e/specs/editor/plugins/post-type-locking.spec.js +++ b/test/e2e/specs/editor/plugins/post-type-locking.spec.js @@ -50,7 +50,8 @@ test.describe( 'Post-type locking', () => { name: 'Empty block', } ) .first() - .click(); + .fill( 'p1' ); + await editor.showBlockToolbar(); await expect( page @@ -166,18 +167,15 @@ test.describe( 'Post-type locking', () => { ).toBeHidden(); } ); - test( 'should allow blocks to be moved', async ( { editor, page } ) => { + test( 'should allow blocks to be moved', async ( { editor } ) => { await editor.canvas .getByRole( 'document', { name: 'Empty block', } ) .first() - .click(); + .fill( 'p1' ); - await page - .getByRole( 'toolbar', { name: 'Block tools' } ) - .getByRole( 'button', { name: 'Move up' } ) - .click(); + await editor.clickBlockToolbarButton( 'Move up' ); await expect.poll( editor.getBlocks ).toMatchObject( [ { @@ -248,18 +246,15 @@ test.describe( 'Post-type locking', () => { ] ); } ); - test( 'should allow blocks to be moved', async ( { editor, page } ) => { + test( 'should allow blocks to be moved', async ( { editor } ) => { await editor.canvas .getByRole( 'document', { name: 'Empty block', } ) .first() - .click(); + .fill( 'p1' ); - await page - .getByRole( 'toolbar', { name: 'Block tools' } ) - .getByRole( 'button', { name: 'Move up' } ) - .click(); + await editor.clickBlockToolbarButton( 'Move up' ); await expect.poll( editor.getBlocks ).toMatchObject( [ { @@ -304,18 +299,15 @@ test.describe( 'Post-type locking', () => { ] ); } ); - test( 'should allow blocks to be moved', async ( { editor, page } ) => { + test( 'should allow blocks to be moved', async ( { editor } ) => { await editor.canvas .getByRole( 'document', { name: 'Empty block', } ) .last() - .click(); + .fill( 'p1' ); - await page - .getByRole( 'toolbar', { name: 'Block tools' } ) - .getByRole( 'button', { name: 'Move up' } ) - .click(); + await editor.clickBlockToolbarButton( 'Move up' ); await expect.poll( editor.getBlocks ).toMatchObject( [ { @@ -409,7 +401,8 @@ test.describe( 'Post-type locking', () => { name: 'Empty block', } ) .last() - .click(); + .fill( 'p1' ); + await editor.showBlockToolbar(); await expect( page @@ -453,7 +446,8 @@ test.describe( 'Post-type locking', () => { name: 'Empty block', } ) .last() - .click(); + .fill( 'p1' ); + await editor.showBlockToolbar(); await expect( page