From 93e8121face4c1cf41b7b567de0fee0319877435 Mon Sep 17 00:00:00 2001
From: girishpanchal30 <girish@krishaweb.com>
Date: Mon, 1 Jul 2024 16:27:53 +0530
Subject: [PATCH 1/3] fix: duplicate id issue with secondary nav menu

---
 header-footer-grid/Core/Components/SecondNav.php    | 13 ++++++++++++-
 .../components/component-nav-secondary.php          |  4 ++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/header-footer-grid/Core/Components/SecondNav.php b/header-footer-grid/Core/Components/SecondNav.php
index 5bd348c790..8ce9e6d600 100644
--- a/header-footer-grid/Core/Components/SecondNav.php
+++ b/header-footer-grid/Core/Components/SecondNav.php
@@ -32,6 +32,16 @@ class SecondNav extends Abstract_Component {
 	const ITEM_HEIGHT         = 'item_height';
 	const SPACING             = 'spacing';
 
+	/**
+	 * Secondary nav number
+	 *
+	 * @since   3.8.7
+	 * @access  private
+	 *
+	 * @var int $secondary_nav_num
+	 */
+	private $secondary_nav_num = 0;
+
 	/**
 	 * Nav constructor.
 	 *
@@ -306,8 +316,9 @@ public function add_settings() {
 	 * @access  public
 	 */
 	public function render_component() {
+		$this->secondary_nav_num++;
 		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', '', array( 'nav_num' => $this->secondary_nav_num ) );
 		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
index 051e38b84d..6fbb86b8d4 100644
--- a/header-footer-grid/templates/components/component-nav-secondary.php
+++ b/header-footer-grid/templates/components/component-nav-secondary.php
@@ -18,7 +18,7 @@
 	$container_classes[] = $style;
 	$container_classes[] = 'm-style';
 }
-
+$nav_num = ! empty( $args['nav_num'] ) ? (int) $args['nav_num'] : 0;
 ?>
 <div class="nv-top-bar">
 	<div role="navigation" class="menu-content <?php echo esc_attr( join( ' ', $container_classes ) ); ?>"
@@ -28,7 +28,7 @@
 			array(
 				'theme_location' => 'top-bar',
 				'menu_class'     => 'nav-ul',
-				'menu_id'        => 'secondary-menu',
+				'menu_id'        => $nav_num > 1 ? "secondary-menu_$nav_num" : 'secondary-menu',
 				'container'      => 'ul',
 				'depth'          => - 1,
 				'fallback_cb'    => '__return_false',

From b65a9bf73e7921af18a605e8c6c6525388b590da Mon Sep 17 00:00:00 2001
From: girishpanchal30 <girish@krishaweb.com>
Date: Tue, 2 Jul 2024 15:14:30 +0530
Subject: [PATCH 2/3] fix: create a unique id based on components

---
 header-footer-grid/Core/Components/SecondNav.php    | 13 +------------
 .../components/component-nav-secondary.php          |  5 +++--
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/header-footer-grid/Core/Components/SecondNav.php b/header-footer-grid/Core/Components/SecondNav.php
index 8ce9e6d600..5bd348c790 100644
--- a/header-footer-grid/Core/Components/SecondNav.php
+++ b/header-footer-grid/Core/Components/SecondNav.php
@@ -32,16 +32,6 @@ class SecondNav extends Abstract_Component {
 	const ITEM_HEIGHT         = 'item_height';
 	const SPACING             = 'spacing';
 
-	/**
-	 * Secondary nav number
-	 *
-	 * @since   3.8.7
-	 * @access  private
-	 *
-	 * @var int $secondary_nav_num
-	 */
-	private $secondary_nav_num = 0;
-
 	/**
 	 * Nav constructor.
 	 *
@@ -316,9 +306,8 @@ public function add_settings() {
 	 * @access  public
 	 */
 	public function render_component() {
-		$this->secondary_nav_num++;
 		do_action( 'neve_before_render_nav', $this->get_id() );
-		Main::get_instance()->load( 'components/component-nav-secondary', '', array( 'nav_num' => $this->secondary_nav_num ) );
+		Main::get_instance()->load( 'components/component-nav-secondary' );
 		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
index 6fbb86b8d4..a43b5bd1de 100644
--- a/header-footer-grid/templates/components/component-nav-secondary.php
+++ b/header-footer-grid/templates/components/component-nav-secondary.php
@@ -10,6 +10,7 @@
 namespace HFG;
 
 use HFG\Core\Components\SecondNav;
+use HFG\Core\Builder\Header as HeaderBuilder;
 
 $style = component_setting( SecondNav::STYLE_ID );
 
@@ -18,7 +19,7 @@
 	$container_classes[] = $style;
 	$container_classes[] = 'm-style';
 }
-$nav_num = ! empty( $args['nav_num'] ) ? (int) $args['nav_num'] : 0;
+$menu_id = SecondNav::COMPONENT_ID . '-' . 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 +29,7 @@
 			array(
 				'theme_location' => 'top-bar',
 				'menu_class'     => 'nav-ul',
-				'menu_id'        => $nav_num > 1 ? "secondary-menu_$nav_num" : 'secondary-menu',
+				'menu_id'        => $menu_id,
 				'container'      => 'ul',
 				'depth'          => - 1,
 				'fallback_cb'    => '__return_false',

From 5e821df0a0f4b8ef2da60bbfba2dc7829ad35fe4 Mon Sep 17 00:00:00 2001
From: girishpanchal30 <girish@krishaweb.com>
Date: Thu, 4 Jul 2024 10:49:01 +0530
Subject: [PATCH 3/3] fix: add device name in unique id

---
 header-footer-grid/Core/Components/SecondNav.php           | 2 +-
 .../templates/components/component-nav-secondary.php       | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/header-footer-grid/Core/Components/SecondNav.php b/header-footer-grid/Core/Components/SecondNav.php
index 5bd348c790..a318ce3d6d 100644
--- 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
index a43b5bd1de..65187545a1 100644
--- a/header-footer-grid/templates/components/component-nav-secondary.php
+++ b/header-footer-grid/templates/components/component-nav-secondary.php
@@ -12,14 +12,15 @@
 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 . '-' . current_row( HeaderBuilder::BUILDER_NAME );
+$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 ) ); ?>"