fix regression

woocommerce · May 10, 2023 · b986324 · b986324
1 parent 4737fdb
commit b986324
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 9 deletions.
diff --git a/assets/js/blocks/classic-template/archive-product.ts b/assets/js/blocks/classic-template/archive-product.ts
@@ -101,12 +101,14 @@ const getButtonLabel = () =>
 const onClickCallback = ( {
 	clientId,
 	attributes,
-	blocks,
+	getBlocks,
 	replaceBlock,
 	selectBlock,
 }: OnClickCallbackParameter ) => {
 	replaceBlock( clientId, getBlockifiedTemplate( attributes ) );
 
+	const blocks = getBlocks();
+
 	const groupBlock = blocks.find(
 		( block ) =>
 			block.name === 'core/group' &&
@@ -124,12 +126,14 @@ const onClickCallback = ( {
 const onClickCallbackWithTermDescription = ( {
 	clientId,
 	attributes,
-	blocks,
+	getBlocks,
 	replaceBlock,
 	selectBlock,
 }: OnClickCallbackParameter ) => {
 	replaceBlock( clientId, getBlockifiedTemplate( attributes, true ) );
 
+	const blocks = getBlocks();
+
 	const groupBlock = blocks.find(
 		( block ) =>
 			block.name === 'core/group' &&

diff --git a/assets/js/blocks/classic-template/index.tsx b/assets/js/blocks/classic-template/index.tsx
@@ -83,9 +83,9 @@ const Edit = ( {
 	const { replaceBlock, selectBlock, replaceBlocks } =
 		useDispatch( blockEditorStore );
 
-	const { blocks, editedPostId } = useSelect( ( sel ) => {
+	const { getBlocks, editedPostId } = useSelect( ( sel ) => {
 		return {
-			blocks: sel( blockEditorStore ).getBlocks(),
+			getBlocks: sel( blockEditorStore ).getBlocks,
 			editedPostId: sel( 'core/edit-site' ).getEditedPostId(),
 		};
 	}, [] );
@@ -100,7 +100,11 @@ const Edit = ( {
 
 	const { createInfoNotice } = useDispatch( noticesStore );
 
-	const clientIds = useMemo( () => pickBlockClientIds( blocks ), [ blocks ] );
+	const blocks = getBlocks();
+
+	const clientIds = useMemo( () => {
+		pickBlockClientIds( blocks );
+	}, [ blocks ] );
 
 	const blockProps = useBlockProps();
 	const templateDetails = getTemplateDetailsBySlug(
@@ -155,7 +159,7 @@ const Edit = ( {
 									onClick={ () => {
 										onClickCallback( {
 											clientId,
-											blocks,
+											getBlocks,
 											attributes,
 											replaceBlock,
 											selectBlock,

diff --git a/assets/js/blocks/classic-template/product-search-results.ts b/assets/js/blocks/classic-template/product-search-results.ts
@@ -145,12 +145,14 @@ const getDescription = ( templateTitle: string, canConvert: boolean ) => {
 const onClickCallback = ( {
 	clientId,
 	attributes,
-	blocks,
+	getBlocks,
 	replaceBlock,
 	selectBlock,
 }: OnClickCallbackParameter ) => {
 	replaceBlock( clientId, getBlockifiedTemplate( attributes ) );
 
+	const blocks = getBlocks();
+
 	const groupBlock = blocks.find(
 		( block ) =>
 			block.name === 'core/group' &&

diff --git a/assets/js/blocks/classic-template/single-product.ts b/assets/js/blocks/classic-template/single-product.ts
@@ -92,12 +92,13 @@ const getButtonLabel = () =>
 
 const onClickCallback = ( {
 	clientId,
-	blocks,
+	getBlocks,
 	replaceBlock,
 	selectBlock,
 }: OnClickCallbackParameter ) => {
 	replaceBlock( clientId, getBlockifiedTemplate() );
 
+	const blocks = getBlocks();
 	const groupBlock = blocks.find(
 		( block ) =>
 			block.name === 'core/group' &&

diff --git a/assets/js/blocks/classic-template/types.ts b/assets/js/blocks/classic-template/types.ts
@@ -12,7 +12,7 @@ export type InheritedAttributes = {
 export type OnClickCallbackParameter = {
 	clientId: string;
 	attributes: Record< string, unknown >;
-	blocks: BlockInstance[];
+	getBlocks: () => BlockInstance[];
 	replaceBlock: ( clientId: string, blocks: BlockInstance[] ) => void;
 	selectBlock: ( clientId: string ) => void;
 };