Fix applying formats on multiline values without wrapper tags (#11500)

WordPress · Nov 6, 2018 · 62c4f80 · 62c4f80
1 parent c444f24
commit 62c4f80
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 1 deletion.
diff --git a/packages/rich-text/src/test/__snapshots__/to-dom.js.snap b/packages/rich-text/src/test/__snapshots__/to-dom.js.snap
@@ -301,6 +301,22 @@ exports[`recordToDom should handle selection before br 1`] = `
 </body>
 `;
 
+exports[`recordToDom should ignore formats at line separator 1`] = `
+<body>
+  <p>
+    <em>
+      one
+    </em>
+  </p>
+  <p>
+    <em>
+      two
+    </em>
+    
+  </p>
+</body>
+`;
+
 exports[`recordToDom should ignore line breaks to format HTML 1`] = `
 <body>
   

diff --git a/packages/rich-text/src/test/create.js b/packages/rich-text/src/test/create.js
@@ -32,6 +32,10 @@ describe( 'create', () => {
 		createRange,
 		record,
 	} ) => {
+		if ( html === undefined ) {
+			return;
+		}
+
 		it( description, () => {
 			const element = createElement( document, html );
 			const range = createRange( element );

diff --git a/packages/rich-text/src/test/helpers/index.js b/packages/rich-text/src/test/helpers/index.js
@@ -530,6 +530,16 @@ export const spec = [
 			text: '',
 		},
 	},
+	{
+		description: 'should ignore formats at line separator',
+		multilineTag: 'p',
+		startPath: [],
+		endPath: [],
+		record: {
+			formats: [ [ em ], [ em ], [ em ], [ em ], [ em ], [ em ], [ em ] ],
+			text: 'one\u2028two',
+		},
+	},
 	{
 		description: 'should remove br with settings',
 		settings: {

diff --git a/packages/rich-text/src/to-tree.js b/packages/rich-text/src/to-tree.js
@@ -45,7 +45,7 @@ function fromFormat( { type, attributes, object } ) {
 export function toTree( {
 	value,
 	multilineTag,
-	multilineWrapperTags,
+	multilineWrapperTags = [],
 	createEmpty,
 	append,
 	getLastChild,
-Original file line number
+Diff line change
@@ Expand Up @@
     </body>
     `;
+    exports[`recordToDom should ignore formats at line separator 1`] = `
+    <body>
+      <p>
+        <em>
+          one
+        </em>
+      </p>
+      <p>
+        <em>
+          two
+        </em>
+      </p>
+    </body>
+    `;
     exports[`recordToDom should ignore line breaks to format HTML 1`] = `
     <body>
@@ Expand Down @@