Merge pull request #4259 from Codeinwp/fix/4256

Fixed duplicate id issue with secondary nav menu
Codeinwp · Jul 11, 2024 · 519535f · 519535f
2 parents aff526c + 5e821df
commit 519535f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/header-footer-grid/Core/Components/SecondNav.php b/header-footer-grid/Core/Components/SecondNav.php
@@ -307,7 +307,7 @@ public function add_settings() {
 	 */
 	public function render_component() {
 		do_action( 'neve_before_render_nav', $this->get_id() );
-		Main::get_instance()->load( 'components/component-nav-secondary' );
+		Main::get_instance()->load( 'components/component-nav-secondary', '', $this->args );
 		do_action( 'neve_after_render_nav', $this->get_id() );
 	}
 

diff --git a/header-footer-grid/templates/components/component-nav-secondary.php b/header-footer-grid/templates/components/component-nav-secondary.php
@@ -10,15 +10,17 @@
 namespace HFG;
 
 use HFG\Core\Components\SecondNav;
+use HFG\Core\Builder\Header as HeaderBuilder;
 
-$style = component_setting( SecondNav::STYLE_ID );
-
+$style             = component_setting( SecondNav::STYLE_ID );
+$device_class      = isset( $args ) && ! empty( $args ) ? $args['device'] : '';
 $container_classes = [ 'nav-menu-secondary' ];
+
 if ( $style !== 'style-plain' ) {
 	$container_classes[] = $style;
 	$container_classes[] = 'm-style';
 }
-
+$menu_id = SecondNav::COMPONENT_ID . '-' . $device_class . '-' . current_row( HeaderBuilder::BUILDER_NAME );
 ?>
 <div class="nv-top-bar">
 	<div role="navigation" class="menu-content <?php echo esc_attr( join( ' ', $container_classes ) ); ?>"
@@ -28,7 +30,7 @@
 			array(
 				'theme_location' => 'top-bar',
 				'menu_class'     => 'nav-ul',
-				'menu_id'        => 'secondary-menu',
+				'menu_id'        => $menu_id,
 				'container'      => 'ul',
 				'depth'          => - 1,
 				'fallback_cb'    => '__return_false',