fix logic

woocommerce · May 16, 2023 · 4a41c32 · 4a41c32
1 parent 670893e
commit 4a41c32
Showing 1 changed file with 19 additions and 17 deletions.
diff --git a/assets/js/blocks/product-query/variations/product-query.tsx b/assets/js/blocks/product-query/variations/product-query.tsx
@@ -65,20 +65,16 @@ const registerProductsBlock = ( attributes: QueryBlockAttributes ) => {
 };
 
 if ( isWpVersion( '6.1', '>=' ) ) {
-	const store = select( 'core/edit-site' );
-
-	if ( isSiteEditorPage( store ) ) {
-		let currentTemplateId: string | undefined;
-
-		subscribe( () => {
-			const previousTemplateId = currentTemplateId;
-
-			currentTemplateId = store?.getEditedPostId();
-
-			if ( previousTemplateId === currentTemplateId ) {
-				return;
-			}
+	let currentTemplateId: string | undefined;
+	subscribe( () => {
+		const previousTemplateId = currentTemplateId;
+		const store = select( 'core/edit-site' );
+		currentTemplateId = store?.getEditedPostId();
+		if ( previousTemplateId === currentTemplateId ) {
+			return;
+		}
 
+		if ( isSiteEditorPage( store ) ) {
 			const queryAttributes = {
 				...QUERY_DEFAULT_ATTRIBUTES,
 				query: {
@@ -91,8 +87,14 @@ if ( isWpVersion( '6.1', '>=' ) ) {
 			unregisterBlockVariation( QUERY_LOOP_ID, VARIATION_NAME );
 
 			registerProductsBlock( queryAttributes );
-		} );
-	} else {
-		registerProductsBlock( QUERY_DEFAULT_ATTRIBUTES );
-	}
+		}
+	}, 'core/edit-site' );
+
+	let isBlockRegistered = false;
+	subscribe( () => {
+		if ( ! isBlockRegistered ) {
+			isBlockRegistered = true;
+			registerProductsBlock( QUERY_DEFAULT_ATTRIBUTES );
+		}
+	}, 'core/edit-post' );
 }