Changeset 13451

Timestamp:

04/04/2024 02:56:19 AM (4 months ago)

Author:

dufresnesteven

Message:

wporg-plugins-2024: Manually set category current item for browse/tag views.

File:

• sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins-2024/inc/block-config.php (modified) (4 diffs)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins-2024/inc/block-config.php

@@ -19 +19 @@
  */
 function add_site_navigation_menus( $menus ) {
-    
+    global $wp;
+
+    $url = 'https://' . $_SERVER['HTTP_HOST'] . parse_url( $_SERVER['REQUEST_URI'], PHP_URL_PATH );
+
     $items = array(
         'plugins' => array(
@@ -38 +41 @@
             array(
                 'label' => __( 'Community', 'wporg-plugins' ),
-                'url'   => is_search() ? esc_url( get_search_link() . '?plugin_business_model=community' ) :  home_url( '?plugin_business_model=community' ),
+                'url'   => is_search() ? esc_url( get_search_link() . '?plugin_business_model=community' ) :   '?plugin_business_model=community' ),
                 'term'  => get_term_by( 'slug', 'community', 'plugin_business_model' ),
             ),
             array(
                 'label' => __( 'Commercial', 'wporg-plugins' ),
-                'url'   =>  is_search() ? esc_url( get_search_link() . '?plugin_business_model=commercial' ) : home_url( '?plugin_business_model=commercial' ),
+                'url'   =>  '?plugin_business_model=commercial' ),
                 'term'  => get_term_by( 'slug', 'commercial', 'plugin_business_model' ),
             ),
@@ -247 +250 @@
     }
 
-    // If we have a business model selected, the navigation block will select appropriately.
-    if ( ! isset( $wp_query ) || isset( $wp_query->query['plugin_business_model'] ) ) {
+    if ( get_query_var( 'plugin_business_model' ) ) {
+
+        // The menu doesn't select properly if viewing /tags/ or /browse/. 
+        if ( get_query_var( 'browse' ) || get_query_var( 'plugin_tags' ) ) {
+            $tags = new \WP_HTML_Tag_Processor( $block_content );
+            
+            while ( $tags->next_tag( 'li' ) ) {
+                $tags->set_bookmark( 'parent-li' );
+                $tags->next_tag( 'a' );
+
+                if ( 'https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] === $tags->get_attribute( 'href' ) ) {
+                    $tags->seek( 'parent-li' );
+                    $tags->add_class( 'current-menu-item' );
+                    break;
+                }
+            }
+
+            return $tags->get_updated_html();
+        }
+
         return $block_content;
     }
@@ -254 +275 @@
     $tag_processor = new \WP_HTML_Tag_Processor( $block_content );
 
-    if ( $tag_processor->next_tag( 'ul' )) {
+    // Find the first li item and select it.
+    if ( $tag_processor->next_tag( 'ul' ) ) {
         if ( $tag_processor->next_tag( 'li' ) ) {
             $tag_processor->add_class( 'current-menu-item' );
-        }
-
-        return $tag_processor->get_updated_html();
+
+            return $tag_processor->get_updated_html();
+        
     }