Merge pull request #629 from tomusborne/tweak/prevent-dropdown-arrow-…

…click Tweak: Add CSS to prevent dropdown arrow click
tomusborne · Jul 25, 2024 · 234fefe · 234fefe
2 parents fe3d935 + 2385d0a
commit 234fefe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/inc/css-output.php b/inc/css-output.php
@@ -245,6 +245,11 @@ function generate_base_css() {
 
 			$css->set_selector( '.dropdown-click .sfHover > a > .dropdown-menu-toggle > .gp-icon svg' );
 			$css->add_property( 'transform', 'rotate(180deg)' );
+
+			if ( 'click' === generate_get_option( 'nav_dropdown_type' ) ) {
+				$css->set_selector( '.menu-item-has-children  .dropdown-menu-toggle[role="presentation"]' );
+				$css->add_property( 'pointer-events', 'none' );
+			}
 		}
 
 		$css->set_selector( ':root' );

diff --git a/inc/structure/navigation.php b/inc/structure/navigation.php
@@ -368,7 +368,6 @@ function generate_dropdown_icon_to_menu_link( $title, $item, $args, $depth ) {
 		$role        = 'presentation';
 		$tabindex    = '';
 		$aria_label  = '';
-		$style       = '';
 
 		if ( 'click-arrow' === generate_get_option( 'nav_dropdown_type' ) ) {
 			$role = 'button';
@@ -379,10 +378,6 @@ function generate_dropdown_icon_to_menu_link( $title, $item, $args, $depth ) {
 			);
 		}
 
-		if ( 'click' === generate_get_option( 'nav_dropdown_type' ) ) {
-			$style = ' style="pointer-events: none;"';
-		}
-
 		if ( isset( $args->container_class ) && 'main-nav' === $args->container_class ) {
 			foreach ( $item->classes as $value ) {
 				if ( 'menu-item-has-children' === $value ) {
@@ -427,7 +422,7 @@ function generate_dropdown_icon_to_menu_link( $title, $item, $args, $depth ) {
 					}
 
 					$icon = generate_get_svg_icon( 'arrow' . $arrow_direction );
-					$title = $title . '<span role="' . $role . '" class="dropdown-menu-toggle"' . $tabindex . $aria_label . $style . '>' . $icon . '</span>';
+					$title = $title . '<span role="' . $role . '" class="dropdown-menu-toggle"' . $tabindex . $aria_label . '>' . $icon . '</span>';
 				}
 			}
 		}