Add option to remove taxonomy query from query block attributes (WordPress#734)

Author: TremiDkhar

includes/create-theme/theme-templates.php

@@ -320,9 +320,9 @@ private static function eliminate_environment_specific_content_from_block( $bloc
 			}
 		}
 
-		// remove taxQuery attribute from query blocks
-		if ( 'core/query' === $block['blockName'] ) {
-			if ( isset( $block['attrs']['query']['taxQuery'] ) ) {
+		// (optionally) remove taxQuery attribute from query blocks
+		if ( 'core/query' === $block['blockName'] && isset( $block['attrs']['query']['taxQuery'] ) ) {
+			if ( ! $options || ( array_key_exists( 'removeTaxQuery', $options ) && $options['removeTaxQuery'] ) ) {
 				unset( $block['attrs']['query']['taxQuery'] );
 			}
 		}

src/editor-sidebar/save-panel.js

@@ -39,6 +39,7 @@ export const SaveThemePanel = () => {
 			removeNavRefs: _preference?.removeNavRefs ?? false,
 			localizeText: _preference?.localizeText ?? false,
 			localizeImages: _preference?.localizeImages ?? false,
+			removeTaxQuery: _preference?.removeTaxQuery ?? false,
 		};
 	}, [] );
 
@@ -221,6 +222,24 @@ export const SaveThemePanel = () => {
 					}
 					onChange={ () => handleTogglePreference( 'removeNavRefs' ) }
 				/>
+				<CheckboxControl
+					__nextHasNoMarginBottom
+					label={ __(
+						'Remove Taxonomy Query',
+						'create-block-theme'
+					) }
+					help={ __(
+						'Remove the taxonomy query from the query loop block attributes.',
+						'create-block-theme'
+					) }
+					disabled={
+						! preference.saveTemplates && ! preference.savePatterns
+					}
+					checked={ preference.removeTaxQuery }
+					onChange={ () =>
+						handleTogglePreference( 'removeTaxQuery' )
+					}
+				/>
 				<Button
 					variant="primary"
 					icon={ archive }