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 "insert before/after" not showing for blocks in site editor #62530

Merged
merged 2 commits into from
Jun 14, 2024
+2 −6
Merged

Fix "insert before/after" not showing for blocks in site editor #62530

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f343d7
Fix insert before & after not showing for blocks in templates
kevin940726 Jun 13, 2024
ce14a1c
Use block editing mode
kevin940726 Jun 13, 2024
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
6 changes: 1 addition & 5 deletions packages/block-editor/src/components/block-actions/index.js
View file
Original file line number Diff line number Diff line change
@@ -31,12 +31,10 @@ export default function BlockActions( {
getDirectInsertBlock,
canMoveBlocks,
canRemoveBlocks,
getBlockEditingMode,
} = select( blockEditorStore );

const blocks = getBlocksByClientId( clientIds );
const rootClientId = getBlockRootClientId( clientIds[ 0 ] );
const rootBlockEditingMode = getBlockEditingMode( rootClientId );
const canInsertDefaultBlock = canInsertBlockType(
getDefaultBlockName(),
rootClientId
@@ -48,9 +46,7 @@ export default function BlockActions( {
return {
canMove: canMoveBlocks( clientIds, rootClientId ),
canRemove: canRemoveBlocks( clientIds, rootClientId ),
canInsertBlock:
( canInsertDefaultBlock || !! directInsertBlock ) &&
rootBlockEditingMode === 'default',
canInsertBlock: canInsertDefaultBlock || !! directInsertBlock,
canCopyStyles: blocks.every( ( block ) => {
return (
!! block &&
2 changes: 1 addition & 1 deletion packages/block-editor/src/components/block-settings-menu/block-settings-dropdown.js
View file
Original file line number Diff line number Diff line change
@@ -256,7 +256,7 @@ export function BlockSettingsDropdown( {
{ __( 'Duplicate' ) }
</MenuItem>
) }
{ canInsertBlock && (
{ canInsertBlock && ! isContentOnly && (
<>
<MenuItem
onClick={ pipe(

Unchanged files with check annotations Beta

View file
packages/e2e-test-utils-playwright/src/admin/visit-site-editor.ts
// Wait for the canvas loader to appear first, so that the locator that
// waits for the hidden state doesn't resolve prematurely.
await canvasLoader.waitFor( { state: 'visible' } );

Check failure on line 57 in packages/e2e-test-utils-playwright/src/admin/visit-site-editor.ts

GitHub Actions / Playwright - 8

[firefox] › editor/blocks/navigation-frontend-interactivity.spec.js:378:3 › Navigation block - Frontend interactivity › Submenus (Arrow setting) (@firefox 

  1) [firefox] › editor/blocks/navigation-frontend-interactivity.spec.js:378:3 › Navigation block - Frontend interactivity › Submenus (Arrow setting) (@Firefox, @WebKit) › submenu click on the arrow interactions 
    TimeoutError: locator.waitFor: Timeout 10000ms exceeded.
    Call log:
      - waiting for locator('.edit-site-canvas-loader, .edit-site-canvas-spinner') to be visible


       at ../../../packages/e2e-test-utils-playwright/src/admin/visit-site-editor.ts:57

      55 | 		// Wait for the canvas loader to appear first, so that the locator that
      56 | 		// waits for the hidden state doesn't resolve prematurely.
    > 57 | 		await canvasLoader.waitFor( { state: 'visible' } );
         | 		                   ^
      58 | 		await canvasLoader.waitFor( {
      59 | 			state: 'hidden',
      60 | 			// Bigger timeout is needed for larger entities, like the Large Post

        at Admin.visitSiteEditor (/home/runner/work/gutenberg/gutenberg/packages/e2e-test-utils-playwright/src/admin/visit-site-editor.ts:57:22)
        at /home/runner/work/gutenberg/gutenberg/test/e2e/specs/editor/blocks/navigation-frontend-interactivity.spec.js:353:4
await canvasLoader.waitFor( {
state: 'hidden',
// Bigger timeout is needed for larger entities, like the Large Post