<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[13422] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins-2024: wporg-plugins-2024: Fix the category subnav selection when viewing all.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/13422">13422</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/13422","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dufresnesteven</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-04-01 06:28:02 +0000 (Mon, 01 Apr 2024)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>wporg-plugins-2024: Fix the category subnav selection when viewing all. </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgplugins2024incblockconfigphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins-2024/inc/block-config.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgplugins2024jsbuildblocksarchivepagerenderphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins-2024/js/build/blocks/archive-page/render.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgplugins2024jsbuildblocksfrontpagerenderphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins-2024/js/build/blocks/front-page/render.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgplugins2024srcblocksarchivepagerenderphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins-2024/src/blocks/archive-page/render.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgplugins2024srcblocksfrontpagerenderphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins-2024/src/blocks/front-page/render.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgplugins2024incblockconfigphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins-2024/inc/block-config.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins-2024/inc/block-config.php 2024-04-01 03:24:42 UTC (rev 13421)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins-2024/inc/block-config.php 2024-04-01 06:28:02 UTC (rev 13422)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,11 +12,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wporg_query_total_label', __NAMESPACE__ . '\wporg_query_total_label', 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'render_block_core/search', __NAMESPACE__ . '\filter_search_block' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'render_block_core/site-title', __NAMESPACE__ . '\filter_site_title_block' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_filter( 'render_block_core/navigation', __NAMESPACE__ . '\filter_navigation_block', 10, 2 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Provide a list of local navigation menus.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function add_site_navigation_menus( $menus ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $items = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'plugins' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,16 +33,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'section-bar' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'All', 'wporg-plugins' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'url' => home_url( '/' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'url' => is_search() ? get_search_link() : home_url( '/' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Community', 'wporg-plugins' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'url' => home_url( '?plugin_business_model=community' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'url' => is_search() ? esc_url( get_search_link() . '?plugin_business_model=community' ) : home_url( '?plugin_business_model=community' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'term' => get_term_by( 'slug', 'community', 'plugin_business_model' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Commercial', 'wporg-plugins' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'url' => home_url( '?plugin_business_model=commercial' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'url' => is_search() ? esc_url( get_search_link() . '?plugin_business_model=commercial' ) : home_url( '?plugin_business_model=commercial' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'term' => get_term_by( 'slug', 'commercial', 'plugin_business_model' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -223,3 +225,36 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $block_content;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Filter the navigation to add the current item indicator when no business model is selected.
+ *
+ * @param string $block_content
+ * @param array $block
+ * @return string
+ */
+function filter_navigation_block( $block_content, $block ) {
+ global $wp_query;
+
+ // We only want to apply this to our "All", "Community", "Commercial" menu.
+ if ( ! isset( $block['attrs']['menuSlug'] ) || $block['attrs']['menuSlug'] !== 'section-bar' ) {
+ return $block_content;
+ }
+
+ // If we have a business model selected, the navigation block will select appropriately.
+ if ( ! isset( $wp_query ) || isset( $wp_query->query['plugin_business_model'] ) ) {
+ return $block_content;
+ }
+
+ $tag_processor = new \WP_HTML_Tag_Processor( $block_content );
+
+ 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 $block_content;
+}
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgplugins2024jsbuildblocksarchivepagerenderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins-2024/js/build/blocks/archive-page/render.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins-2024/js/build/blocks/archive-page/render.php 2024-04-01 03:24:42 UTC (rev 13421)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins-2024/js/build/blocks/archive-page/render.php 2024-04-01 06:28:02 UTC (rev 13422)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,9 +12,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // TODO: There's no block for this.
</span><span class="cx" style="display: block; padding: 0 10px"> $archive_description = get_the_archive_description();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$menu = '<!-- wp:navigation {"menuSlug":"section-bar","ariaLabel":"'. esc_attr( 'Category menu', 'wporg-plugins' ) .'","overlayMenu":"never","layout":{"type":"flex","orientation":"horizontal","justifyContent":"left","flexWrap":"nowrap"},"fontSize":"small","className":"is-style-button-list"} /-->';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> echo do_blocks( <<<BLOCKS
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <!-- wp:navigation {"menuSlug":"section-bar","className":"is-style-button-list","fontSize":"small"} /-->
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <!-- wp:group {"style":{"spacing":{"margin":{"bottom":"var:preset|spacing|40"}}}} -->
+ <div class="wp-block-group" style="margin-bottom:var(--wp--preset--spacing--40)">
+ $menu
+ </div><!-- /wp:group -->
+ BLOCKS
+);
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+echo do_blocks( <<<BLOCKS
</ins><span class="cx" style="display: block; padding: 0 10px"> <!-- wp:query-title {"type":"archive","fontFamily":"inter"} /-->
</span><span class="cx" style="display: block; padding: 0 10px"> {$archive_description}
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgplugins2024jsbuildblocksfrontpagerenderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins-2024/js/build/blocks/front-page/render.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins-2024/js/build/blocks/front-page/render.php 2024-04-01 03:24:42 UTC (rev 13421)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins-2024/js/build/blocks/front-page/render.php 2024-04-01 06:28:02 UTC (rev 13422)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,8 +19,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'after_title' => '</h2>',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-echo do_blocks(
- '<!-- wp:navigation {"menuSlug":"section-bar","className":"is-style-button-list","fontSize":"small"} /-->'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$menu = '<!-- wp:navigation {"menuSlug":"section-bar","ariaLabel":"'. esc_attr( 'Category menu', 'wporg-plugins' ) .'","overlayMenu":"never","layout":{"type":"flex","orientation":"horizontal","justifyContent":"left","flexWrap":"nowrap"},"fontSize":"small","className":"is-style-button-list"} /-->';
+
+echo do_blocks( <<<BLOCKS
+ <!-- wp:group {"style":{"spacing":{"margin":{"bottom":"var:preset|spacing|40"}}}} -->
+ <div class="wp-block-group" style="margin-bottom:var(--wp--preset--spacing--40)">
+ $menu
+ </div><!-- /wp:group -->
+ BLOCKS
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgplugins2024srcblocksarchivepagerenderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins-2024/src/blocks/archive-page/render.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins-2024/src/blocks/archive-page/render.php 2024-04-01 03:24:42 UTC (rev 13421)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins-2024/src/blocks/archive-page/render.php 2024-04-01 06:28:02 UTC (rev 13422)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,9 +12,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // TODO: There's no block for this.
</span><span class="cx" style="display: block; padding: 0 10px"> $archive_description = get_the_archive_description();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$menu = '<!-- wp:navigation {"menuSlug":"section-bar","ariaLabel":"'. esc_attr( 'Category menu', 'wporg-plugins' ) .'","overlayMenu":"never","layout":{"type":"flex","orientation":"horizontal","justifyContent":"left","flexWrap":"nowrap"},"fontSize":"small","className":"is-style-button-list"} /-->';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> echo do_blocks( <<<BLOCKS
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <!-- wp:navigation {"menuSlug":"section-bar","className":"is-style-button-list","fontSize":"small"} /-->
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <!-- wp:group {"style":{"spacing":{"margin":{"bottom":"var:preset|spacing|20"}}}} -->
+ <div class="wp-block-group" style="margin-bottom:var(--wp--preset--spacing--20)">
+ $menu
+ </div><!-- /wp:group -->
+ BLOCKS
+);
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+echo do_blocks( <<<BLOCKS
</ins><span class="cx" style="display: block; padding: 0 10px"> <!-- wp:query-title {"type":"archive","fontFamily":"inter"} /-->
</span><span class="cx" style="display: block; padding: 0 10px"> {$archive_description}
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgplugins2024srcblocksfrontpagerenderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins-2024/src/blocks/front-page/render.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins-2024/src/blocks/front-page/render.php 2024-04-01 03:24:42 UTC (rev 13421)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins-2024/src/blocks/front-page/render.php 2024-04-01 06:28:02 UTC (rev 13422)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,8 +19,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'after_title' => '</h2>',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-echo do_blocks(
- '<!-- wp:navigation {"menuSlug":"section-bar","className":"is-style-button-list","fontSize":"small"} /-->'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$menu = '<!-- wp:navigation {"menuSlug":"section-bar","ariaLabel":"'. esc_attr( 'Category menu', 'wporg-plugins' ) .'","overlayMenu":"never","layout":{"type":"flex","orientation":"horizontal","justifyContent":"left","flexWrap":"nowrap"},"fontSize":"small","className":"is-style-button-list"} /-->';
+
+echo do_blocks( <<<BLOCKS
+ <!-- wp:group {"style":{"spacing":{"margin":{"bottom":"var:preset|spacing|40"}}}} -->
+ <div class="wp-block-group" style="margin-bottom:var(--wp--preset--spacing--40)">
+ $menu
+ </div><!-- /wp:group -->
+ BLOCKS
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span></span></pre>
</div>
</div>
</body>
</html>