Blocks: Short-circuit validation for identical markup (#22506)

WordPress · May 21, 2020 · ec9ced4 · ec9ced4
1 parent db55195
commit ec9ced4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/packages/blocks/src/api/test/validation.js b/packages/blocks/src/api/test/validation.js
@@ -458,6 +458,15 @@ describe( 'validation', () => {
 	} );
 
 	describe( 'isEquivalentHTML()', () => {
+		it( 'should return true for identical markup', () => {
+			const isEquivalent = isEquivalentHTML(
+				'<div>Hello <span class="b">World!</span></div>',
+				'<div>Hello <span class="b">World!</span></div>'
+			);
+
+			expect( isEquivalent ).toBe( true );
+		} );
+
 		it( 'should return false for effectively inequivalent html', () => {
 			const isEquivalent = isEquivalentHTML(
 				'<div>Hello <span class="b">World!</span></div>',

diff --git a/packages/blocks/src/api/validation/index.js b/packages/blocks/src/api/validation/index.js
@@ -575,6 +575,11 @@ export function isClosedByToken( currentToken, nextToken ) {
  * @return {boolean} Whether HTML strings are equivalent.
  */
 export function isEquivalentHTML( actual, expected, logger = createLogger() ) {
+	// Short-circuit if markup is identical.
+	if ( actual === expected ) {
+		return true;
+	}
+
 	// Tokenize input content and reserialized save content
 	const [ actualTokens, expectedTokens ] = [
 		actual,