Fix raw matcher

WordPress · Dec 20, 2023 · 3b20769 · 3b20769
1 parent dba904b
commit 3b20769
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/packages/blocks/README.md b/packages/blocks/README.md
@@ -97,6 +97,7 @@ _Parameters_
 -   _blockTypeOrName_ `string|Object`: Block type or name.
 -   _innerHTML_ `string|Node`: Raw block content.
 -   _attributes_ `?Object`: Known block attributes (from delimiters).
+-   _innerDom_ `?Node`: Raw block content parsed into DOM.
 
 _Returns_
 

diff --git a/packages/blocks/src/api/parser/get-block-attributes.js b/packages/blocks/src/api/parser/get-block-attributes.js
@@ -286,16 +286,16 @@ export function parseWithAttributeSchema( innerHTML, attributeSchema ) {
  * @param {string|Object} blockTypeOrName Block type or name.
  * @param {string|Node}   innerHTML       Raw block content.
  * @param {?Object}       attributes      Known block attributes (from delimiters).
- *
+ * @param {?Node}         innerDom        Raw block content parsed into DOM.
  * @return {Object} All block attributes.
  */
 export function getBlockAttributes(
 	blockTypeOrName,
 	innerHTML,
-	attributes = {}
+	attributes = {},
+	innerDom
 ) {
-	const doc =
-		typeof innerHTML === 'string' ? parseHtml( innerHTML ) : innerHTML;
+	const doc = innerDom ? innerDom : parseHtml( innerHTML );
 	const blockType = normalizeBlockType( blockTypeOrName );
 
 	const blockAttributes = Object.fromEntries(

diff --git a/packages/blocks/src/api/parser/index.js b/packages/blocks/src/api/parser/index.js
@@ -233,8 +233,9 @@ export function parseRawBlock( rawBlock, options ) {
 		normalizedBlock.blockName,
 		getBlockAttributes(
 			blockType,
-			normalizedBlock.innerDom,
-			normalizedBlock.attrs
+			normalizedBlock.innerHTML,
+			normalizedBlock.attrs,
+			normalizedBlock.innerDom
 		),
 		parsedInnerBlocks
 	);