Make sure no div elements get in the content of quotes. (#16072)

* Make sure no div elements get in the content. * Remove tags in content.
WordPress · Jun 10, 2019 · e9e3565 · e9e3565
1 parent 4d08cc5
commit e9e3565
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/packages/block-editor/src/components/rich-text/index.native.js b/packages/block-editor/src/components/rich-text/index.native.js
@@ -299,6 +299,12 @@ export class RichText extends Component {
 				result = this.removeRootTag( element, result );
 			} );
 		}
+
+		if ( this.props.tagsToEliminate ) {
+			this.props.tagsToEliminate.forEach( ( element ) => {
+				result = this.removeTag( element, result );
+			} );
+		}
 		return result;
 	}
 
@@ -307,6 +313,11 @@ export class RichText extends Component {
 		const closingTagRegexp = RegExp( '</' + tag + '>$', 'gim' );
 		return html.replace( openingTagRegexp, '' ).replace( closingTagRegexp, '' );
 	}
+	removeTag( tag, html ) {
+		const openingTagRegexp = RegExp( '<' + tag + '>', 'gim' );
+		const closingTagRegexp = RegExp( '</' + tag + '>', 'gim' );
+		return html.replace( openingTagRegexp, '' ).replace( closingTagRegexp, '' );
+	}
 
 	/*
 	 * Handles any case where the content of the AztecRN instance has changed

diff --git a/packages/components/src/primitives/block-quotation/index.native.js b/packages/components/src/primitives/block-quotation/index.native.js
@@ -16,6 +16,9 @@ export const BlockQuotation = ( props ) => {
 		if ( child && child.props.identifier === 'citation' ) {
 			return cloneElement( child, { style: styles.wpBlockQuoteCitation } );
 		}
+		if ( child && child.props.identifier === 'value' ) {
+			return cloneElement( child, { tagsToEliminate: [ 'div' ] } );
+		}
 		return child;
 	} );
 	return (