fix #1466

inc2734 · Feb 7, 2025 · 9561649 · 9561649
1 parent 5b0274c
commit 9561649
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 15 deletions.
diff --git a/Framework/Helper.php b/Framework/Helper.php
@@ -3,7 +3,7 @@
  * @package snow-monkey
  * @author inc2734
  * @license GPL-2.0+
- * @version 25.4.6
+ * @version 28.0.0
  */
 
 namespace Framework;
@@ -416,18 +416,27 @@ public static function get_header_classes() {
 	 * @return boolean
 	 */
 	public static function has_drop_nav() {
-		$return = false;
+		$has_global_nav  = has_nav_menu( 'global-nav' );
+		$has_drop_nav    = has_nav_menu( 'drop-nav' );
+		$should_drop_nav = false;
 
-		if ( has_nav_menu( 'global-nav' ) ) {
-			$has_drop_nav       = in_array( get_theme_mod( 'header-position' ), array( '', 'overlay' ), true );
-			$has_drop_nav_on_pc = in_array( get_theme_mod( 'header-position-lg' ), array( '', 'overlay' ), true );
+		if ( $has_global_nav ) {
+			$should_drop_nav       = in_array( get_theme_mod( 'header-position' ), array( '', 'overlay' ), true );
+			$should_drop_nav_on_pc = in_array( get_theme_mod( 'header-position-lg' ), array( '', 'overlay' ), true );
 
-			if ( $has_drop_nav || $has_drop_nav_on_pc ) {
-				$return = true;
+			if ( $should_drop_nav || $should_drop_nav_on_pc ) {
+				$should_drop_nav = true;
 			}
 		}
 
-		return apply_filters( 'snow_monkey_has_drop_nav', $return );
+		// If you have global-nav, you don't need drop-nav.
+		// If you don't have global-nav, drop-nav is required.
+		$should_drop_nav = apply_filters( 'snow_monkey_has_drop_nav', $should_drop_nav );
+		if ( $has_global_nav || $has_drop_nav ) {
+			return $should_drop_nav;
+		}
+
+		return false;
 	}
 
 	/**

diff --git a/src/js/drop-nav.js b/src/js/drop-nav.js
@@ -37,9 +37,8 @@ document.addEventListener(
 	() => {
 		const header = getHeader();
 		const dropNavWrapper = getDropNavWrapper();
-		const gnav = document.querySelector( '[data-has-global-nav="true"] .p-global-nav' );
 
-		if ( ! header || ! dropNavWrapper || ! gnav ) {
+		if ( ! header || ! dropNavWrapper ) {
 			return;
 		}
 

diff --git a/template-parts/nav/global.php b/template-parts/nav/global.php
@@ -3,18 +3,14 @@
  * @package snow-monkey
  * @author inc2734
  * @license GPL-2.0+
- * @version 19.0.0-beta1
+ * @version 28.0.0
  *
  * renamed: template-parts/global-nav.php
  */
 
 use Inc2734\WP_Basis\App\Walker\Navbar;
 use Framework\Helper;
 
-if ( ! has_nav_menu( 'global-nav' ) ) {
-	return;
-}
-
 $args = wp_parse_args(
 	// phpcs:disable VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
 	$args,
@@ -27,6 +23,10 @@
 	)
 );
 
+if ( ! has_nav_menu( 'global-nav' ) && 'snow-monkey/nav/drop' !== $args['_context'] ) {
+	return;
+}
+
 $classes   = array();
 $classes[] = 'p-global-nav';
 if ( $args['_vertical'] ) {