Rich text: fix soft line break in caption on enter (#23622)

* Rich text: fix soft line break in caption on enter * Add e2e test
WordPress · Jul 2, 2020 · 5a228b9 · 5a228b9
1 parent 49003cb
commit 5a228b9
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 8 deletions.
diff --git a/packages/block-editor/src/components/rich-text/index.js b/packages/block-editor/src/components/rich-text/index.js
@@ -365,18 +365,20 @@ function RichTextWrapper(
  } else {
  onChange( insertLineSeparator( value ) );
  }
- } else if ( shiftKey || ( ! canSplit && ! onSplitAtEnd ) ) {
- if ( ! disableLineBreaks ) {
- onChange( insert( value, '\n' ) );
- }
- } else if ( onSplitAtEnd && ! canSplit ) {
+ } else {
  const { text, start, end } = value;
+ const canSplitAtEnd =
+ onSplitAtEnd && start === end && end === text.length;
 
- if ( start === end && end === text.length ) {
+ if ( shiftKey || ( ! canSplit && ! canSplitAtEnd ) ) {
+ if ( ! disableLineBreaks ) {
+ onChange( insert( value, '\n' ) );
+ }
+ } else if ( ! canSplit && canSplitAtEnd ) {
  onSplitAtEnd();
+ } else if ( canSplit ) {
+ splitValue( value );
  }
- } else if ( canSplit ) {
- splitValue( value );
  }
  },
  [

diff --git a/packages/e2e-tests/specs/editor/blocks/image.test.js b/packages/e2e-tests/specs/editor/blocks/image.test.js
@@ -98,4 +98,16 @@ describe( 'Image', () => {
  await page.evaluate( () => document.activeElement.innerHTML )
  ).toBe( '12' );
  } );
+
+ it( 'should allow soft line breaks in caption', async () => {
+ await insertBlock( 'Image' );
+ await upload( '.wp-block-image input[type="file"]' );
+ await page.keyboard.type( '12' );
+ await page.keyboard.press( 'ArrowLeft' );
+ await page.keyboard.press( 'Enter' );
+
+ expect(
+ await page.evaluate( () => document.activeElement.innerHTML )
+ ).toBe( '1<br data-rich-text-line-break="true">2' );
+ } );
 } );