Fix inserting line separator without previous formats (#11859)

WordPress · Nov 14, 2018 · 56d09e5 · 56d09e5
1 parent 5757ec7
commit 56d09e5
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/packages/rich-text/src/insert-line-separator.js b/packages/rich-text/src/insert-line-separator.js
@@ -24,10 +24,11 @@ export function insertLineSeparator(
 ) {
 	const beforeText = getTextContent( value ).slice( 0, startIndex );
 	const previousLineSeparatorIndex = beforeText.lastIndexOf( LINE_SEPARATOR );
+	const previousLineSeparatorFormats = value.formats[ previousLineSeparatorIndex ];
 	let formats = [ , ];
 
-	if ( previousLineSeparatorIndex !== -1 ) {
-		formats = [ value.formats[ previousLineSeparatorIndex ] ];
+	if ( previousLineSeparatorFormats ) {
+		formats = [ previousLineSeparatorFormats ];
 	}
 
 	const valueToInsert = {

diff --git a/packages/rich-text/src/test/insert-line-separator.js b/packages/rich-text/src/test/insert-line-separator.js
@@ -54,7 +54,7 @@ describe( 'insertLineSeparator', () => {
 		expect( getSparseArrayLength( result.formats ) ).toBe( 0 );
 	} );
 
-	it( 'should insert line separator in nested item', () => {
+	it( 'should insert line separator with previous line separator formats', () => {
 		const value = {
 			formats: [ , , , [ ol ], , ],
 			text: `1${ LINE_SEPARATOR }2${ LINE_SEPARATOR }a`,
@@ -73,4 +73,24 @@ describe( 'insertLineSeparator', () => {
 		expect( result ).toEqual( expected );
 		expect( getSparseArrayLength( result.formats ) ).toBe( 2 );
 	} );
+
+	it( 'should insert line separator without formats if previous line separator did not have any', () => {
+		const value = {
+			formats: [ , , , , , ],
+			text: `1${ LINE_SEPARATOR }2${ LINE_SEPARATOR }a`,
+			start: 5,
+			end: 5,
+		};
+		const expected = {
+			formats: [ , , , , , , ],
+			text: `1${ LINE_SEPARATOR }2${ LINE_SEPARATOR }a${ LINE_SEPARATOR }`,
+			start: 6,
+			end: 6,
+		};
+		const result = insertLineSeparator( deepFreeze( value ) );
+
+		expect( result ).not.toBe( value );
+		expect( result ).toEqual( expected );
+		expect( getSparseArrayLength( result.formats ) ).toBe( 0 );
+	} );
 } );