Replace all navigation-id with router-region

Author: DAreRodz

plugins/woocommerce-blocks/assets/js/blocks/product-collection/frontend.tsx

@@ -52,7 +52,7 @@ function scrollToFirstProductIfNotVisible( wcNavigationId?: string ) {
 		return;
 	}
 
-	const productSelector = `[data-wc-navigation-id=${ wcNavigationId }] .wc-block-product-template .wc-block-product`;
+	const productSelector = `[data-wc-router-region=${ wcNavigationId }] .wc-block-product-template .wc-block-product`;
 	const product = document.querySelector( productSelector );
 	if ( product ) {
 		const rect = product.getBoundingClientRect();
@@ -95,10 +95,10 @@ const productCollectionStore = {
 			const ctx = getContext< ProductCollectionStoreContext >();
 			const { ref } = getElement();
 			const wcNavigationId = (
-				ref?.closest( '[data-wc-navigation-id]' ) as HTMLDivElement
+				ref?.closest( '[data-wc-router-region]' ) as HTMLDivElement
 			 )?.dataset?.wcNavigationId;
 			const isDisabled = (
-				ref?.closest( '[data-wc-navigation-id]' ) as HTMLDivElement
+				ref?.closest( '[data-wc-router-region]' ) as HTMLDivElement
 			 )?.dataset.wcNavigationDisabled;
 
 			if ( isDisabled ) {
@@ -150,7 +150,7 @@ const productCollectionStore = {
 			const { ref } = getElement();
 
 			const isDisabled = (
-				ref?.closest( '[data-wc-navigation-id]' ) as HTMLDivElement
+				ref?.closest( '[data-wc-router-region]' ) as HTMLDivElement
 			 )?.dataset.wcNavigationDisabled;
 
 			if ( isDisabled ) {
@@ -173,7 +173,7 @@ const productCollectionStore = {
 		*prefetch() {
 			const { ref } = getElement();
 			const isDisabled = (
-				ref?.closest( '[data-wc-navigation-id]' ) as HTMLDivElement
+				ref?.closest( '[data-wc-router-region]' ) as HTMLDivElement
 			 )?.dataset.wcNavigationDisabled;
 
 			if ( isDisabled ) {

plugins/woocommerce/src/Blocks/BlockTypes/ProductCollection.php

@@ -294,10 +294,10 @@ private function add_rendering_callback( $block_content, $collection ) {
 	private function enable_client_side_navigation( $block_content ) {
 		$p = new \WP_HTML_Tag_Processor( $block_content );
 
-		// Add `data-wc-navigation-id to the product collection block.
+		// Add `data-wc-router-region to the product collection block.
 		if ( $this->is_next_tag_product_collection( $p ) ) {
 			$p->set_attribute(
-				'data-wc-navigation-id',
+				'data-wc-router-region',
 				'wc-product-collection-' . $this->parsed_block['attrs']['queryId']
 			);
 			$current_context = json_decode( $p->get_attribute( 'data-wc-context' ) ?? '{}', true );

plugins/woocommerce/src/Blocks/BlockTypes/ProductFilter.php

@@ -121,7 +121,7 @@ protected function render( $attributes, $content, $block ) {
 		);
 
 		if ( ! isset( $block->context['queryId'] ) ) {
-			$attributes_data['data-wc-navigation-id'] = $this->generate_navigation_id( $block );
+			$attributes_data['data-wc-router-region'] = $this->generate_navigation_id( $block );
 		}
 
 		$tags = new WP_HTML_Tag_Processor( $content );

plugins/woocommerce/src/Blocks/BlockTypes/ProductResultsCount.php

@@ -59,7 +59,7 @@ protected function render( $attributes, $content, $block ) {
 		$p->set_attribute( 'class', implode( ' ', $classes ) );
 		$p->set_attribute( 'style', $parsed_style_attributes['styles'] );
 		$p->set_attribute(
-			'data-wc-navigation-id',
+			'data-wc-router-region',
 			'wc-product-results-count-' . ( isset( $block->context['queryId'] ) ? $block->context['queryId'] : 0 )
 		);