Paste: preserve empty table cells (#14137)

WordPress · Mar 6, 2019 · 4394bc0 · 4394bc0
1 parent e4fcb0f
commit 4394bc0
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/packages/block-library/src/table/index.js b/packages/block-library/src/table/index.js
@@ -18,11 +18,14 @@ import edit from './edit';
 
 const tableContentPasteSchema = {
 	tr: {
+		allowEmpty: true,
 		children: {
 			th: {
+				allowEmpty: true,
 				children: getPhrasingContentSchema(),
 			},
 			td: {
+				allowEmpty: true,
 				children: getPhrasingContentSchema(),
 			},
 		},
@@ -33,12 +36,15 @@ const tablePasteSchema = {
 	table: {
 		children: {
 			thead: {
+				allowEmpty: true,
 				children: tableContentPasteSchema,
 			},
 			tfoot: {
+				allowEmpty: true,
 				children: tableContentPasteSchema,
 			},
 			tbody: {
+				allowEmpty: true,
 				children: tableContentPasteSchema,
 			},
 		},

diff --git a/packages/blocks/src/api/raw-handling/utils.js b/packages/blocks/src/api/raw-handling/utils.js
@@ -185,11 +185,17 @@ function cleanNodeList( nodeList, doc, schema, inline ) {
 			( ! schema[ tag ].isMatch || schema[ tag ].isMatch( node ) )
 		) {
 			if ( node.nodeType === ELEMENT_NODE ) {
-				const { attributes = [], classes = [], children, require = [] } = schema[ tag ];
+				const {
+					attributes = [],
+					classes = [],
+					children,
+					require = [],
+					allowEmpty,
+				} = schema[ tag ];
 
 				// If the node is empty and it's supposed to have children,
 				// remove the node.
-				if ( isEmpty( node ) && children ) {
+				if ( children && ! allowEmpty && isEmpty( node ) ) {
 					remove( node );
 					return;
 				}

diff --git a/test/integration/fixtures/markdown-in.txt b/test/integration/fixtures/markdown-in.txt
@@ -23,6 +23,10 @@ First Header | Second Header
 Content from cell 1 | Content from cell 2
 Content in the first column | Content in the second column
 
+|   |   |
+|---|---|
+|   | Table with empty cells. |
+
 ## Quote
 
 > First

diff --git a/test/integration/fixtures/markdown-out.html b/test/integration/fixtures/markdown-out.html
@@ -31,6 +31,10 @@ <h2>Table</h2>
 <table class="wp-block-table"><thead><tr><th>First Header</th><th>Second Header</th></tr></thead><tbody><tr><td>Content from cell 1</td><td>Content from cell 2</td></tr><tr><td>Content in the first column</td><td>Content in the second column</td></tr></tbody></table>
 <!-- /wp:table -->
 
+<!-- wp:table -->
+<table class="wp-block-table"><thead><tr><th></th><th></th></tr></thead><tbody><tr><td></td><td>Table with empty cells.</td></tr></tbody></table>
+<!-- /wp:table -->
+
 <!-- wp:heading -->
 <h2>Quote</h2>
 <!-- /wp:heading -->