Changeset 59072 for trunk/src/wp-includes/blocks/categories.php

Timestamp:

09/20/2024 01:53:52 AM (15 months ago)

Author:

noisysocks

Message:

Editor: Update packages for 6.7 Beta 1.

Syncs @wordpress/* packages to the wp-6.7 npm tag.

Fixes #61906.
Props peterwilsoncc, gziolo, kevin940726.

File:

• trunk/src/wp-includes/blocks/categories.php (modified) (5 diffs)

trunk/src/wp-includes/blocks/categories.php

@@ -10 +10 @@
  *
  * @since 5.0.0
+ * @since 6.7.0 Enable client-side rendering if enhancedPagination context is true.
  *
- * @param array $attributes The block attributes.
+ * @param array    $attributes The block attributes.
+ * @param string   $content    Block default content.
+ * @param WP_Block $block      Block instance.
  *
  * @return string Returns the categories list/dropdown markup.
  */
-function render_block_core_categories( $attributes ) {
+function render_block_core_categories( $attributes, $content, $block ) {
     static $block_id = 0;
     ++$block_id;
+
+    $taxonomy = get_taxonomy( $attributes['taxonomy'] );
 
     $args = array(
@@ -24 +29 @@
         'orderby'      => 'name',
         'show_count'   => ! empty( $attributes['showPostCounts'] ),
+        'taxonomy'     => $attributes['taxonomy'],
         'title_li'     => '',
         'hide_empty'   => empty( $attributes['showEmpty'] ),
@@ -34 +40 @@
         $id                       = 'wp-block-categories-' . $block_id;
         $args['id']               = $id;
-        $args['show_option_none'] = __( 'Select Category' );
-        $wrapper_markup           = '<div %1$s><label class="screen-reader-text" for="' . esc_attr( $id ) . '">' . __( 'Categories' ) . '</label>%2$s</div>';
-        $items_markup             = wp_dropdown_categories( $args );
-        $type                     = 'dropdown';
+        $args['name']             = $taxonomy->query_var;
+        $args['value_field']      = 'slug';
+        $args['show_option_none'] = sprintf(
+            /* translators: %s: taxonomy's singular name */
+            __( 'Select %s' ),
+            $taxonomy->labels->singular_name
+        );
+
+        $show_label     = empty( $attributes['showLabel'] ) ? ' screen-reader-text' : '';
+        $default_label  = $taxonomy->label;
+        $label_text     = ! empty( $attributes['label'] ) ? $attributes['label'] : $default_label;
+        $wrapper_markup = '<div %1$s><label class="wp-block-categories__label' . $show_label . '" for="' . esc_attr( $id ) . '">' . $label_text . '</label>%2$s</div>';
+        $items_markup   = wp_dropdown_categories( $args );
+        $type           = 'dropdown';
 
         if ( ! is_admin() ) {
@@ -49 +65 @@
         }
     } else {
+        $args['show_option_none'] = $taxonomy->labels->no_terms;
+
         $wrapper_markup = '<ul %1$s>%2$s</ul>';
         $items_markup   = wp_list_categories( $args );
         $type           = 'list';
+
+        if ( ! empty( $block->context['enhancedPagination'] ) ) {
+            $p = new WP_HTML_Tag_Processor( $items_markup );
+            while ( $p->next_tag( 'a' ) ) {
+                $p->set_attribute( 'data-wp-on--click', 'core/query::actions.navigate' );
+            }
+            $items_markup = $p->get_updated_html();
+        }
     }
 
@@ -79 +105 @@
         var dropdown = document.getElementById( '<?php echo esc_js( $dropdown_id ); ?>' );
         function onCatChange() {
-            if ( dropdown.options[ dropdown.selectedIndex ].value > 0 ) {
-                location.href = "<?php echo esc_url( home_url() ); ?>/?cat=" + dropdown.options[ dropdown.selectedIndex ].value;
+            if ( dropdown.options[ dropdown.selectedIndex ].value !== -1 ) {
+                location.href = "<?php echo esc_url( home_url() ); ?>/?" + dropdown.name + '=' + dropdown.options[ dropdown.selectedIndex ].value;
             }
         }