Embrace entity data format instead of augmenting reusable blocks to l…

…egacy data shape
WordPress · Oct 9, 2020 · 8bf36e2 · 8bf36e2
1 parent bc06f59
commit 8bf36e2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/packages/block-editor/src/store/selectors.js b/packages/block-editor/src/store/selectors.js
@@ -1497,7 +1497,7 @@ export const getInserterItems = createSelector(
 				id,
 				name: 'core/block',
 				initialAttributes: { ref: reusableBlock.id },
-				title: reusableBlock.title,
+				title: reusableBlock.title.raw,
 				icon: referencedBlockType
 					? referencedBlockType.icon
 					: templateIcon,
@@ -1688,7 +1688,7 @@ export const __experimentalGetParsedReusableBlock = createSelector(
 			return null;
 		}
 
-		return parse( reusableBlock.content );
+		return parse( reusableBlock.content.raw );
 	},
 	( state ) => [ getReusableBlocks( state ) ]
 );

diff --git a/packages/editor/src/components/provider/index.js b/packages/editor/src/components/provider/index.js
@@ -207,11 +207,7 @@ class EditorProvider extends Component {
 				'titlePlaceholder',
 			] ),
 			mediaUpload: hasUploadPermissions ? mediaUpload : undefined,
-			__experimentalReusableBlocks: reusableBlocks?.map( ( c ) => ( {
-				...c,
-				content: c.content.raw,
-				title: c.title.raw,
-			} ) ),
+			__experimentalReusableBlocks: reusableBlocks,
 			__experimentalFetchLinkSuggestions: partialRight(
 				fetchLinkSuggestions,
 				settings