From 2270ee94576c371198a1147fa20281091269adda Mon Sep 17 00:00:00 2001 From: Riad Benguella Date: Fri, 19 Nov 2021 15:10:02 +0100 Subject: [PATCH 1/7] Always show the block appender when its parent is selected --- .../components/block-list-appender/index.js | 26 ++++--------------- .../default-block-appender/index.js | 19 +++----------- .../inner-blocks/default-block-appender.js | 9 ++----- 3 files changed, 11 insertions(+), 43 deletions(-) diff --git a/packages/block-editor/src/components/block-list-appender/index.js b/packages/block-editor/src/components/block-list-appender/index.js index 6acd954a5797b..c9d114fef0c7c 100644 --- a/packages/block-editor/src/components/block-list-appender/index.js +++ b/packages/block-editor/src/components/block-list-appender/index.js @@ -1,7 +1,6 @@ /** * External dependencies */ -import { last } from 'lodash'; import classnames from 'classnames'; /** @@ -18,7 +17,6 @@ import ButtonBlockAppender from '../button-block-appender'; import { store as blockEditorStore } from '../../store'; function BlockListAppender( { - blockClientIds, rootClientId, canInsertDefaultBlock, isLocked, @@ -36,30 +34,18 @@ function BlockListAppender( { // Prefer custom render prop if provided. appender = ; } else { - const isDocumentAppender = ! rootClientId; - const isParentSelected = selectedBlockClientId === rootClientId; - const isAnotherDefaultAppenderAlreadyDisplayed = - selectedBlockClientId && - ! blockClientIds.includes( selectedBlockClientId ); + const isParentSelected = + selectedBlockClientId === rootClientId || + ( ! rootClientId && ! selectedBlockClientId ); - if ( - ! isDocumentAppender && - ! isParentSelected && - ( ! selectedBlockClientId || - isAnotherDefaultAppenderAlreadyDisplayed ) - ) { + if ( ! isParentSelected ) { return null; } if ( canInsertDefaultBlock ) { // Render the default block appender when renderAppender has not been // provided and the context supports use of the default appender. - appender = ( - - ); + appender = ; } else { // Fallback in the case no renderAppender has been provided and the // default block can't be inserted. @@ -103,7 +89,6 @@ function BlockListAppender( { export default withSelect( ( select, { rootClientId } ) => { const { - getBlockOrder, canInsertBlockType, getTemplateLock, getSelectedBlockClientId, @@ -111,7 +96,6 @@ export default withSelect( ( select, { rootClientId } ) => { return { isLocked: !! getTemplateLock( rootClientId ), - blockClientIds: getBlockOrder( rootClientId ), canInsertDefaultBlock: canInsertBlockType( getDefaultBlockName(), rootClientId diff --git a/packages/block-editor/src/components/default-block-appender/index.js b/packages/block-editor/src/components/default-block-appender/index.js index 16ead162ce11f..7795590320671 100644 --- a/packages/block-editor/src/components/default-block-appender/index.js +++ b/packages/block-editor/src/components/default-block-appender/index.js @@ -8,7 +8,6 @@ import classnames from 'classnames'; */ import { __ } from '@wordpress/i18n'; import { compose } from '@wordpress/compose'; -import { getDefaultBlockName } from '@wordpress/blocks'; import { decodeEntities } from '@wordpress/html-entities'; import { withSelect, withDispatch } from '@wordpress/data'; @@ -26,13 +25,12 @@ export const ZWNBSP = '\ufeff'; export function DefaultBlockAppender( { isLocked, - isVisible, onAppend, showPrompt, placeholder, rootClientId, } ) { - if ( isLocked || ! isVisible ) { + if ( isLocked ) { return null; } @@ -77,23 +75,14 @@ export function DefaultBlockAppender( { export default compose( withSelect( ( select, ownProps ) => { - const { - getBlockCount, - getBlockName, - isBlockValid, - getSettings, - getTemplateLock, - } = select( blockEditorStore ); + const { getBlockCount, getSettings, getTemplateLock } = select( + blockEditorStore + ); const isEmpty = ! getBlockCount( ownProps.rootClientId ); - const isLastBlockDefault = - getBlockName( ownProps.lastBlockClientId ) === - getDefaultBlockName(); - const isLastBlockValid = isBlockValid( ownProps.lastBlockClientId ); const { bodyPlaceholder } = getSettings(); return { - isVisible: isEmpty || ! isLastBlockDefault || ! isLastBlockValid, showPrompt: isEmpty, isLocked: !! getTemplateLock( ownProps.rootClientId ), placeholder: bodyPlaceholder, diff --git a/packages/block-editor/src/components/inner-blocks/default-block-appender.js b/packages/block-editor/src/components/inner-blocks/default-block-appender.js index 86b66ec97c524..b6fc392cdcaef 100644 --- a/packages/block-editor/src/components/inner-blocks/default-block-appender.js +++ b/packages/block-editor/src/components/inner-blocks/default-block-appender.js @@ -16,13 +16,8 @@ import BaseDefaultBlockAppender from '../default-block-appender'; import withClientId from './with-client-id'; import { store as blockEditorStore } from '../../store'; -export const DefaultBlockAppender = ( { clientId, lastBlockClientId } ) => { - return ( - - ); +export const DefaultBlockAppender = ( { clientId } ) => { + return ; }; export default compose( [ From 8f90864ca56d29744b6ee7935157d7f8409e4bb2 Mon Sep 17 00:00:00 2001 From: Riad Benguella Date: Tue, 23 Nov 2021 09:20:39 +0100 Subject: [PATCH 2/7] Remove useCanvasClickRedirect --- .../default-block-appender/index.js | 7 --- .../default-block-appender/style.scss | 4 ++ packages/block-editor/src/components/index.js | 1 - .../use-canvas-click-redirect/index.js | 57 ------------------- .../src/components/visual-editor/index.js | 2 - 5 files changed, 4 insertions(+), 67 deletions(-) delete mode 100644 packages/block-editor/src/components/use-canvas-click-redirect/index.js diff --git a/packages/block-editor/src/components/default-block-appender/index.js b/packages/block-editor/src/components/default-block-appender/index.js index 7795590320671..9baddab1023a8 100644 --- a/packages/block-editor/src/components/default-block-appender/index.js +++ b/packages/block-editor/src/components/default-block-appender/index.js @@ -46,13 +46,6 @@ export function DefaultBlockAppender( { >

{ - function onMouseDown( event ) { - // Only handle clicks on the canvas, not the content. - if ( event.target !== node ) { - return; - } - - const focusableNodes = focus.focusable.find( node ); - const target = findLast( focusableNodes, isTabbableTextField ); - - if ( ! target ) { - return; - } - - const { bottom } = target.getBoundingClientRect(); - - // Ensure the click is below the last block. - if ( event.clientY < bottom ) { - return; - } - - placeCaretAtHorizontalEdge( target, true ); - event.preventDefault(); - } - - node.addEventListener( 'mousedown', onMouseDown ); - - return () => { - node.addEventListener( 'mousedown', onMouseDown ); - }; - }, [] ); -} diff --git a/packages/edit-post/src/components/visual-editor/index.js b/packages/edit-post/src/components/visual-editor/index.js index 777443c5f6fae..df88856372652 100644 --- a/packages/edit-post/src/components/visual-editor/index.js +++ b/packages/edit-post/src/components/visual-editor/index.js @@ -22,7 +22,6 @@ import { __unstableUseTypingObserver as useTypingObserver, __unstableBlockSettingsMenuFirstItem, __experimentalUseResizeCanvas as useResizeCanvas, - __unstableUseCanvasClickRedirect as useCanvasClickRedirect, __unstableEditorStyles as EditorStyles, useSetting, __experimentalLayoutStyle as LayoutStyle, @@ -153,7 +152,6 @@ export default function VisualEditor( { styles } ) { const contentRef = useMergeRefs( [ ref, useClipboardHandler(), - useCanvasClickRedirect(), useTypewriter(), useTypingObserver(), useBlockSelectionClearer(), From 9fa421a97f92191caa5a1bc1e80020b8282388eb Mon Sep 17 00:00:00 2001 From: Riad Benguella Date: Tue, 23 Nov 2021 09:33:58 +0100 Subject: [PATCH 3/7] Fix unit tests --- .../test/__snapshots__/index.js.snap | 6 ------ .../default-block-appender/test/index.js | 16 +++------------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/packages/block-editor/src/components/default-block-appender/test/__snapshots__/index.js.snap b/packages/block-editor/src/components/default-block-appender/test/__snapshots__/index.js.snap index f32bf7fde4086..943390e4e230d 100644 --- a/packages/block-editor/src/components/default-block-appender/test/__snapshots__/index.js.snap +++ b/packages/block-editor/src/components/default-block-appender/test/__snapshots__/index.js.snap @@ -8,7 +8,6 @@ exports[`DefaultBlockAppender should append a default block when input focused 1

Type / to choose a block @@ -44,10 +42,8 @@ exports[`DefaultBlockAppender should match snapshot 1`] = `

Type / to choose a block @@ -68,10 +64,8 @@ exports[`DefaultBlockAppender should optionally show without prompt 1`] = `

 diff --git a/packages/block-editor/src/components/default-block-appender/test/index.js b/packages/block-editor/src/components/default-block-appender/test/index.js index 31b44f355c6ae..d90cf9ef284e3 100644 --- a/packages/block-editor/src/components/default-block-appender/test/index.js +++ b/packages/block-editor/src/components/default-block-appender/test/index.js @@ -14,16 +14,10 @@ describe( 'DefaultBlockAppender', () => { expect( onAppend ).toHaveBeenCalledWith(); }; - it( 'should render nothing if not visible', () => { - const wrapper = shallow( ); - - expect( wrapper.type() ).toBe( null ); - } ); - it( 'should match snapshot', () => { const onAppend = jest.fn(); const wrapper = shallow( - + ); expect( wrapper ).toMatchSnapshot(); @@ -32,7 +26,7 @@ describe( 'DefaultBlockAppender', () => { it( 'should append a default block when input focused', () => { const onAppend = jest.fn(); const wrapper = shallow( - + ); wrapper.find( 'p' ).simulate( 'focus' ); @@ -45,11 +39,7 @@ describe( 'DefaultBlockAppender', () => { it( 'should optionally show without prompt', () => { const onAppend = jest.fn(); const wrapper = shallow( - + ); const input = wrapper.find( 'p' ); From 69e5edd62ce5c882bb5431590534ce534e3a1c88 Mon Sep 17 00:00:00 2001 From: Riad Benguella Date: Tue, 23 Nov 2021 10:34:06 +0100 Subject: [PATCH 4/7] Fix e2e tests --- .../src/components/default-block-appender/index.js | 10 ++++++++-- packages/e2e-test-utils/src/click-block-appender.js | 4 ++++ .../specs/editor/blocks/preformatted.test.js | 3 ++- .../specs/editor/plugins/custom-post-types.test.js | 7 ++++--- .../specs/editor/various/inserting-blocks.test.js | 6 +++++- .../editor/various/keyboard-navigable-blocks.test.js | 6 ++++++ .../specs/editor/various/navigable-toolbar.test.js | 4 ++-- .../e2e-tests/specs/editor/various/preview.test.js | 1 + .../specs/editor/various/writing-flow.test.js | 12 ++++++++---- 9 files changed, 40 insertions(+), 13 deletions(-) diff --git a/packages/block-editor/src/components/default-block-appender/index.js b/packages/block-editor/src/components/default-block-appender/index.js index 9baddab1023a8..ae8910ffcbe16 100644 --- a/packages/block-editor/src/components/default-block-appender/index.js +++ b/packages/block-editor/src/components/default-block-appender/index.js @@ -10,6 +10,7 @@ import { __ } from '@wordpress/i18n'; import { compose } from '@wordpress/compose'; import { decodeEntities } from '@wordpress/html-entities'; import { withSelect, withDispatch } from '@wordpress/data'; +import { ENTER, SPACE } from '@wordpress/keycodes'; /** * Internal dependencies @@ -49,10 +50,15 @@ export function DefaultBlockAppender( { // We want this element to be styled as a paragraph by themes. // eslint-disable-next-line jsx-a11y/no-noninteractive-element-to-interactive-role role="button" - aria-label={ __( 'Add block' ) } + aria-label={ __( 'Add default block' ) } // A wrapping container for this one already has the wp-block className. className="block-editor-default-block-appender__content" - onFocus={ onAppend } + onKeyDown={ ( event ) => { + if ( ENTER === event.keyCode || SPACE === event.keyCode ) { + onAppend(); + } + } } + onClick={ () => onAppend() } > { showPrompt ? value : ZWNBSP }

diff --git a/packages/e2e-test-utils/src/click-block-appender.js b/packages/e2e-test-utils/src/click-block-appender.js index 26e8b9162dcb4..ac133c073ded3 100644 --- a/packages/e2e-test-utils/src/click-block-appender.js +++ b/packages/e2e-test-utils/src/click-block-appender.js @@ -2,6 +2,10 @@ * Clicks the default block appender. */ export async function clickBlockAppender() { + // The block appender is only visible when there's no selection. + await page.evaluate( () => + window.wp.data.dispatch( 'core/block-editor' ).clearSelectedBlock() + ); const appender = await page.waitForSelector( '.block-editor-default-block-appender__content' ); diff --git a/packages/e2e-tests/specs/editor/blocks/preformatted.test.js b/packages/e2e-tests/specs/editor/blocks/preformatted.test.js index 7d0fb6abf0891..492b1d5b6c112 100644 --- a/packages/e2e-tests/specs/editor/blocks/preformatted.test.js +++ b/packages/e2e-tests/specs/editor/blocks/preformatted.test.js @@ -7,6 +7,7 @@ import { getEditedPostContent, createNewPost, insertBlock, + clickBlockAppender, } from '@wordpress/e2e-test-utils'; describe( 'Preformatted', () => { @@ -39,7 +40,7 @@ describe( 'Preformatted', () => { await page.keyboard.press( 'Enter' ); await page.keyboard.type( '2' ); await page.keyboard.press( 'Enter' ); - await page.keyboard.press( 'ArrowDown' ); + await clickBlockAppender(); await page.keyboard.type( '3' ); await page.keyboard.press( 'ArrowLeft' ); await page.keyboard.press( 'Backspace' ); diff --git a/packages/e2e-tests/specs/editor/plugins/custom-post-types.test.js b/packages/e2e-tests/specs/editor/plugins/custom-post-types.test.js index 0a874ac6ba8de..51f6420fd8b4e 100644 --- a/packages/e2e-tests/specs/editor/plugins/custom-post-types.test.js +++ b/packages/e2e-tests/specs/editor/plugins/custom-post-types.test.js @@ -7,6 +7,7 @@ import { deactivatePlugin, publishPost, findSidebarPanelWithTitle, + clickBlockAppender, } from '@wordpress/e2e-test-utils'; const openPageAttributesPanel = async () => { @@ -40,7 +41,7 @@ describe( 'Test Custom Post Types', () => { // Create a parent post. await createNewPost( { postType: 'hierar-no-title' } ); - await page.click( '.block-editor-writing-flow' ); + await clickBlockAppender(); await page.keyboard.type( 'Parent Post' ); await publishPost(); // Create a post that is a child of the previously created post. @@ -55,7 +56,7 @@ describe( 'Test Custom Post Types', () => { ( element ) => element.textContent ); await optionToSelect.click(); - await page.click( '.block-editor-writing-flow' ); + await clickBlockAppender(); await page.keyboard.type( 'Child Post' ); await publishPost(); // Reload the child post and verify it is still correctly selected as a child post. @@ -72,7 +73,7 @@ describe( 'Test Custom Post Types', () => { } ); it( 'should create a cpt with a legacy block in its template without WSOD', async () => { await createNewPost( { postType: 'leg_block_in_tpl' } ); - await page.click( '.block-editor-writing-flow' ); + await clickBlockAppender(); await page.keyboard.type( 'Hello there' ); await page.waitForSelector( '[data-type="core/embed"]' ); await publishPost(); diff --git a/packages/e2e-tests/specs/editor/various/inserting-blocks.test.js b/packages/e2e-tests/specs/editor/various/inserting-blocks.test.js index 7367a7f086b0f..396fdd43bc1fb 100644 --- a/packages/e2e-tests/specs/editor/various/inserting-blocks.test.js +++ b/packages/e2e-tests/specs/editor/various/inserting-blocks.test.js @@ -173,7 +173,7 @@ describe( 'Inserting blocks', () => { // Check for regression of https://github.com/WordPress/gutenberg/issues/9583 it( 'should not allow transfer of focus outside of the block-insertion menu once open', async () => { // Enter the default block and click the inserter toggle button to the left of it. - await page.keyboard.press( 'ArrowDown' ); + await page.keyboard.press( 'Enter' ); await showBlockToolbar(); await page.click( '.block-editor-block-list__empty-block-inserter .block-editor-inserter__toggle' @@ -243,6 +243,10 @@ describe( 'Inserting blocks', () => { ); expect( selectedButtonBlocks.length ).toBe( 1 ); + // The block appender is only visible when there's no selection. + await page.evaluate( () => + window.wp.data.dispatch( 'core/block-editor' ).clearSelectedBlock() + ); // Specifically click the root container appender. await page.click( '.block-editor-block-list__layout.is-root-container > .block-list-appender .block-editor-inserter__toggle' diff --git a/packages/e2e-tests/specs/editor/various/keyboard-navigable-blocks.test.js b/packages/e2e-tests/specs/editor/various/keyboard-navigable-blocks.test.js index 2c4f50b4bc1f9..101761a89c452 100644 --- a/packages/e2e-tests/specs/editor/various/keyboard-navigable-blocks.test.js +++ b/packages/e2e-tests/specs/editor/various/keyboard-navigable-blocks.test.js @@ -155,6 +155,12 @@ describe( 'Order of block keyboard navigation', () => { .focus(); } ); + await pressKeyWithModifier( 'shift', 'Tab' ); + await expect( await getActiveLabel() ).toBe( 'Add block' ); + + await pressKeyWithModifier( 'shift', 'Tab' ); + await expect( await getActiveLabel() ).toBe( 'Add default block' ); + await pressKeyWithModifier( 'shift', 'Tab' ); await expect( await getActiveLabel() ).toBe( 'Paragraph Block. Row 2. 1' diff --git a/packages/e2e-tests/specs/editor/various/navigable-toolbar.test.js b/packages/e2e-tests/specs/editor/various/navigable-toolbar.test.js index 5a0c79151b277..9330c77c462fc 100644 --- a/packages/e2e-tests/specs/editor/various/navigable-toolbar.test.js +++ b/packages/e2e-tests/specs/editor/various/navigable-toolbar.test.js @@ -31,8 +31,8 @@ describe.each( [ it( 'navigates in and out of toolbar by keyboard (Alt+F10, Escape)', async () => { // Assumes new post focus starts in title. Create first new - // block by ArrowDown. - await page.keyboard.press( 'ArrowDown' ); + // block by Enter. + await page.keyboard.press( 'Enter' ); // [TEMPORARY]: A new paragraph is not technically a block yet // until starting to type within it. diff --git a/packages/e2e-tests/specs/editor/various/preview.test.js b/packages/e2e-tests/specs/editor/various/preview.test.js index 1e23b4bf99161..ef035d135cc7b 100644 --- a/packages/e2e-tests/specs/editor/various/preview.test.js +++ b/packages/e2e-tests/specs/editor/various/preview.test.js @@ -269,6 +269,7 @@ describe( 'Preview with Custom Fields enabled', () => { // Add an initial title and content. await editorPage.type( '.editor-post-title__input', 'title 1' ); await editorPage.keyboard.press( 'Tab' ); + await editorPage.keyboard.press( 'Enter' ); await editorPage.keyboard.type( 'content 1' ); // Publish the post and then close the publish panel. diff --git a/packages/e2e-tests/specs/editor/various/writing-flow.test.js b/packages/e2e-tests/specs/editor/various/writing-flow.test.js index 39c72c866e9d4..918a97218463c 100644 --- a/packages/e2e-tests/specs/editor/various/writing-flow.test.js +++ b/packages/e2e-tests/specs/editor/various/writing-flow.test.js @@ -45,9 +45,11 @@ const addParagraphsAndColumnsDemo = async () => { await page.keyboard.press( 'Enter' ); // Insert paragraph. await page.keyboard.type( '2nd col' ); // If this text is too long, it may wrap to a new line and cause test failure. That's why we're using "2nd" instead of "Second" here. - // Arrow down from last of layouts exits nested context to default - // appender of root level. - await page.keyboard.press( 'ArrowDown' ); + await page.keyboard.press( 'Escape' ); // Enter navigation mode + await page.keyboard.press( 'ArrowLeft' ); // move to the column block + await page.keyboard.press( 'ArrowLeft' ); // move to the columns block + await page.keyboard.press( 'Enter' ); // Enter edit mode with the columns block selected + await page.keyboard.press( 'Enter' ); // Creates a paragraph after the columns block. await page.keyboard.type( 'Second paragraph' ); }; @@ -289,6 +291,8 @@ describe( 'Writing Flow', () => { // See: https://github.com/WordPress/gutenberg/issues/9626 await insertBlock( 'Shortcode' ); + await insertBlock( 'Paragraph' ); + await await page.click( '.wp-block-shortcode' ); // Should remain in title upon ArrowRight: await page.keyboard.press( 'ArrowRight' ); @@ -304,7 +308,7 @@ describe( 'Writing Flow', () => { ); expect( isInShortcodeBlock ).toBe( true ); - // Should navigate into blocks list upon ArrowDown: + // Should navigate to the next block. await page.keyboard.press( 'ArrowDown' ); const isInParagraphBlock = await page.evaluate( () => !! document.activeElement.closest( '.wp-block-paragraph' ) From 786f0d2f57116bf706a68f02e52cde5b9b6f8740 Mon Sep 17 00:00:00 2001 From: Riad Benguella Date: Tue, 23 Nov 2021 13:00:24 +0100 Subject: [PATCH 5/7] Fix unit tests --- .../test/__snapshots__/index.js.snap | 27 +++++++------------ .../default-block-appender/test/index.js | 2 +- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/packages/block-editor/src/components/default-block-appender/test/__snapshots__/index.js.snap b/packages/block-editor/src/components/default-block-appender/test/__snapshots__/index.js.snap index 943390e4e230d..1a3958ece1923 100644 --- a/packages/block-editor/src/components/default-block-appender/test/__snapshots__/index.js.snap +++ b/packages/block-editor/src/components/default-block-appender/test/__snapshots__/index.js.snap @@ -6,21 +6,10 @@ exports[`DefaultBlockAppender should append a default block when input focused 1 data-root-client-id="" >

@@ -40,9 +29,10 @@ exports[`DefaultBlockAppender should match snapshot 1`] = ` data-root-client-id="" >

@@ -62,9 +52,10 @@ exports[`DefaultBlockAppender should optionally show without prompt 1`] = ` data-root-client-id="" >

diff --git a/packages/block-editor/src/components/default-block-appender/test/index.js b/packages/block-editor/src/components/default-block-appender/test/index.js index d90cf9ef284e3..b14463d335163 100644 --- a/packages/block-editor/src/components/default-block-appender/test/index.js +++ b/packages/block-editor/src/components/default-block-appender/test/index.js @@ -29,7 +29,7 @@ describe( 'DefaultBlockAppender', () => { ); - wrapper.find( 'p' ).simulate( 'focus' ); + wrapper.find( 'p' ).simulate( 'click' ); expect( wrapper ).toMatchSnapshot(); From c4f0c0767673e2ab2e6ad772c9ed7d958a2efce9 Mon Sep 17 00:00:00 2001 From: Riad Benguella Date: Wed, 24 Nov 2021 09:52:11 +0100 Subject: [PATCH 6/7] Create block on focus on the empty post placeholder --- .../src/components/default-block-appender/index.js | 5 +++++ .../default-block-appender/test/__snapshots__/index.js.snap | 3 +++ 2 files changed, 8 insertions(+) diff --git a/packages/block-editor/src/components/default-block-appender/index.js b/packages/block-editor/src/components/default-block-appender/index.js index ae8910ffcbe16..814bb10e205dd 100644 --- a/packages/block-editor/src/components/default-block-appender/index.js +++ b/packages/block-editor/src/components/default-block-appender/index.js @@ -59,6 +59,11 @@ export function DefaultBlockAppender( { } } } onClick={ () => onAppend() } + onFocus={ () => { + if ( showPrompt ) { + onAppend(); + } + } } > { showPrompt ? value : ZWNBSP }

diff --git a/packages/block-editor/src/components/default-block-appender/test/__snapshots__/index.js.snap b/packages/block-editor/src/components/default-block-appender/test/__snapshots__/index.js.snap index 1a3958ece1923..344bb95ea044b 100644 --- a/packages/block-editor/src/components/default-block-appender/test/__snapshots__/index.js.snap +++ b/packages/block-editor/src/components/default-block-appender/test/__snapshots__/index.js.snap @@ -9,6 +9,7 @@ exports[`DefaultBlockAppender should append a default block when input focused 1 aria-label="Add default block" className="block-editor-default-block-appender__content" onClick={[Function]} + onFocus={[Function]} onKeyDown={[Function]} role="button" tabIndex="0" @@ -32,6 +33,7 @@ exports[`DefaultBlockAppender should match snapshot 1`] = ` aria-label="Add default block" className="block-editor-default-block-appender__content" onClick={[Function]} + onFocus={[Function]} onKeyDown={[Function]} role="button" tabIndex="0" @@ -55,6 +57,7 @@ exports[`DefaultBlockAppender should optionally show without prompt 1`] = ` aria-label="Add default block" className="block-editor-default-block-appender__content" onClick={[Function]} + onFocus={[Function]} onKeyDown={[Function]} role="button" tabIndex="0" From e5f40410b1668ce3bd009a8b4729cbf3e4975401 Mon Sep 17 00:00:00 2001 From: Riad Benguella Date: Wed, 24 Nov 2021 10:32:44 +0100 Subject: [PATCH 7/7] Fix e2e tests --- packages/e2e-tests/specs/editor/various/preview.test.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/e2e-tests/specs/editor/various/preview.test.js b/packages/e2e-tests/specs/editor/various/preview.test.js index ef035d135cc7b..1e23b4bf99161 100644 --- a/packages/e2e-tests/specs/editor/various/preview.test.js +++ b/packages/e2e-tests/specs/editor/various/preview.test.js @@ -269,7 +269,6 @@ describe( 'Preview with Custom Fields enabled', () => { // Add an initial title and content. await editorPage.type( '.editor-post-title__input', 'title 1' ); await editorPage.keyboard.press( 'Tab' ); - await editorPage.keyboard.press( 'Enter' ); await editorPage.keyboard.type( 'content 1' ); // Publish the post and then close the publish panel.