[RichText]: Fix wrong block merging when pressing delete consecutiv…

…ely (#38991) * [RichText]: Fix wrong block merging when pressing `delete` consecutively * add e2e test
WordPress · Feb 23, 2022 · d8440c6 · d8440c6
1 parent b837704
commit d8440c6
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/packages/e2e-tests/specs/editor/various/writing-flow.test.js b/packages/e2e-tests/specs/editor/various/writing-flow.test.js
@@ -449,6 +449,33 @@ describe( 'Writing Flow', () => {
  expect( await getEditedPostContent() ).toMatchSnapshot();
  } );
 
+ it( 'should merge forwards properly on multiple triggers', async () => {
+ await page.keyboard.press( 'Enter' );
+ await page.keyboard.type( '1' );
+ await page.keyboard.press( 'Enter' );
+ await page.keyboard.type( '2' );
+ await page.keyboard.press( 'Enter' );
+ await page.keyboard.type( '3' );
+ await pressKeyTimes( 'ArrowUp', 2 );
+ await pressKeyTimes( 'Delete', 2 );
+ expect( await getEditedPostContent() ).toMatchInlineSnapshot( `
+ "<!-- wp:paragraph -->
+ <p>1</p>
+ <!-- /wp:paragraph -->
+
+ <!-- wp:paragraph -->
+ <p>3</p>
+ <!-- /wp:paragraph -->"
+ ` );
+ await page.keyboard.press( 'Delete' );
+
+ expect( await getEditedPostContent() ).toMatchInlineSnapshot( `
+ "<!-- wp:paragraph -->
+ <p>13</p>
+ <!-- /wp:paragraph -->"
+ ` );
+ } );
+
  it( 'should preserve horizontal position when navigating vertically between blocks', async () => {
  await page.keyboard.press( 'Enter' );
  await page.keyboard.type( 'abc' );

diff --git a/packages/rich-text/src/component/index.js b/packages/rich-text/src/component/index.js
@@ -204,6 +204,7 @@ export function useRichText( {
  useLayoutEffect( () => {
  if ( didMount.current && value !== _value.current ) {
  applyFromProps();
+ forceRender();
  }
  }, [ value ] );