making a dedicated scrollspy unique id that will help differentiate d…

…ifferent instances of the same nav for scrollspy.
stellarwp · Dec 16, 2024 · 5f36e66 · 5f36e66
1 parent 975fdec
commit 5f36e66
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 12 deletions.
diff --git a/includes/assets/js/kb-navigation-block.min.js b/includes/assets/js/kb-navigation-block.min.js
diff --git a/includes/blocks/class-kadence-blocks-navigation-block.php b/includes/blocks/class-kadence-blocks-navigation-block.php
@@ -408,15 +408,19 @@ public function build_html( $attributes, $unique_id, $content, $block_instance )
 
 		$name = ! empty( $attributes['name'] ) ? $attributes['name'] : '';
 
-		$wrapper_attributes = get_block_wrapper_attributes(
-			array(
-				'class'      => implode( ' ', $wrapper_classes ),
-				'aria-label' => $name,
-				'data-scroll-spy' => $nav_attributes['enableScrollSpy'],
-				'data-scroll-spy-offset' => $nav_attributes['scrollSpyOffsetManual'] ? $nav_attributes['scrollSpyOffset'] : false,
-			)
+		$wrapper_attribute_items = array(
+			'class'      => implode( ' ', $wrapper_classes ),
+			'aria-label' => $name,
+			'data-scroll-spy' => $nav_attributes['enableScrollSpy'],
 		);
 
+		if ( $nav_attributes['enableScrollSpy'] ) {
+			$wrapper_attribute_items['data-scroll-spy-offset'] = $nav_attributes['scrollSpyOffsetManual'] ? $nav_attributes['scrollSpyOffset'] : false;
+			$wrapper_attribute_items['data-scroll-spy-id'] = uniqid(); 
+		}
+
+		$wrapper_attributes = get_block_wrapper_attributes( $wrapper_attribute_items );
+
 		// Navigation Attributes.
 		$navigation_classes = array();
 

diff --git a/kadence-blocks.php b/kadence-blocks.php
@@ -5,7 +5,7 @@
  * Description: Advanced Page Building Blocks for Gutenberg. Create custom column layouts, backgrounds, dual buttons, icons etc.
  * Author: Kadence WP
  * Author URI: https://www.kadencewp.com
- * Version: 3.4.1
+ * Version: 3.4.2
  * Requires PHP: 7.4
  * Text Domain: kadence-blocks
  * License: GPL2+
@@ -20,7 +20,7 @@
 }
 define( 'KADENCE_BLOCKS_PATH', realpath( plugin_dir_path( __FILE__ ) ) . DIRECTORY_SEPARATOR );
 define( 'KADENCE_BLOCKS_URL', plugin_dir_url( __FILE__ ) );
-define( 'KADENCE_BLOCKS_VERSION', '3.4.1' );
+define( 'KADENCE_BLOCKS_VERSION', '3.4.2' );
 
 require_once plugin_dir_path( __FILE__ ) . 'vendor/vendor-prefixed/autoload.php';
 require_once plugin_dir_path( __FILE__ ) . 'vendor/autoload.php';

diff --git a/readme.txt b/readme.txt
@@ -4,7 +4,7 @@ Tags: gutenberg, blocks, page builder, editor, gutenberg blocks
 Donate link: https://www.kadencewp.com/about-us/
 Requires at least: 6.4
 Tested up to: 6.7.1
-Stable tag: 3.4.1
+Stable tag: 3.4.2
 Requires PHP: 7.4
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -174,6 +174,10 @@ Please report security bugs found in the Kadence Blocks plugin's source code thr
 
 == Changelog ==
 
+= 3.4.2 =
+Release Date: tba
+* Add: Features for activating nav links with hash anchor links on the page
+
 = 3.4.1 =
 Release Date: December 12th 2024
 * Update: allowing splide slider options to be translated.

diff --git a/src/assets/js/kb-navigation-block.js b/src/assets/js/kb-navigation-block.js
@@ -459,8 +459,9 @@
 					//here, we'll assume we're in a header block and look for the containing row height
 					var offsetTarget = scrollSpyTarget.closest('.wp-block-kadence-header-row');
 				}
+				const scrollSpyId = scrollSpyTarget.dataset?.scrollSpyId;
 				// Initialize Gumshoe
-				new Gumshoe('.' + scrollSpyTarget.classList[0] + ' .kb-navigation a', {
+				new Gumshoe('.wp-block-kadence-navigation[data-scroll-spy-id="' + scrollSpyId + '"] .kb-navigation a', {
 					nested: true,
 					nestedClass: 'current-menu-ancestor',
 					navClass: 'current-menu-item',