Changeset 52161 for trunk/src/wp-includes/blocks

Timestamp:

11/15/2021 12:47:22 PM (5 years ago)

Author:

noisysocks

Message:

Update @wordpress packages

Update packages to include these bug fixes from Gutenberg:

• Navigation: Fix click-button size, submenu directions, scrollbars.
• Group - Fix overzealous regex when restoring inner containers
• Babel Preset: Update Babel packages to 7.16 version
• theme.json: adds a setting property that enables some other ones
• Polish metabox container.
• Fix submenu justification and spacer orientation.
• Fix Gutenberg 11.8.2 in WordPress trunk
• Strip meta tags from pasted links in Chromium
• Hide visilibility and status for navigation posts
• Navigation: Refactor and simplify setup state.
• Nav block menu switcher - decode HTML entities and utilise accessible markup pattern
• Rename fse_navigation_area to wp_navigation_area
• theme.json: adds a setting property that enables some other ones
• Revert "theme.json: adds a setting property that enables some other ones"
• Skip flaky image block test
• WordPress/gutenberg@3c935c4
• React to any errors coming up in gutenberg_migrate_menu_to_navigation_post
• Return wp error from wp_insert_post
• Fix not transforming logical assignments for packages

See #54337.

Location:

trunk/src/wp-includes/blocks

Files:

• calendar.php (modified) (1 diff)
• navigation.php (modified) (3 diffs)

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

@@ -108 +108 @@
 }
 
-// We only want to register these functions and actions when
-// we are on single sites. On multi sites we use `post_count` option.
-if ( ! is_multisite() ) {
-        /**
-         * Handler for updating the has published posts flag when a post is deleted.
-         *
-         * @param int $post_id Deleted post ID.
-         */
-        function block_core_calendar_update_has_published_post_on_delete( $post_id ) {
-                $post = get_post( $post_id );
-
-                if ( ! $post || 'publish' !== $post->post_status || 'post' !== $post->post_type ) {
-                        return;
-                }
-
-                block_core_calendar_update_has_published_posts();
+/**
+ * Handler for updating the has published posts flag when a post is deleted.
+ *
+ * @param int $post_id Deleted post ID.
+ */
+function block_core_calendar_update_has_published_post_on_delete( $post_id ) {
+        if ( is_multisite() ) {
+                return;
         }
 
-        /**
-         * Handler for updating the has published posts flag when a post status changes.
-         *
-         * @param string  $new_status The status the post is changing to.
-         * @param string  $old_status The status the post is changing from.
-         * @param WP_Post $post       Post object.
-         */
-        function block_core_calendar_update_has_published_post_on_transition_post_status( $new_status, $old_status, $post ) {
-                if ( $new_status === $old_status ) {
-                        return;
-                }
+        $post = get_post( $post_id );
 
-                if ( 'post' !== get_post_type( $post ) ) {
-                        return;
-                }
-
-                if ( 'publish' !== $new_status && 'publish' !== $old_status ) {
-                        return;
-                }
-
-                block_core_calendar_update_has_published_posts();
+        if ( ! $post || 'publish' !== $post->post_status || 'post' !== $post->post_type ) {
+                return;
         }
 
-        add_action( 'delete_post', 'block_core_calendar_update_has_published_post_on_delete' );
-        add_action( 'transition_post_status', 'block_core_calendar_update_has_published_post_on_transition_post_status', 10, 3 );
+        block_core_calendar_update_has_published_posts();
 }
+
+/**
+ * Handler for updating the has published posts flag when a post status changes.
+ *
+ * @param string  $new_status The status the post is changing to.
+ * @param string  $old_status The status the post is changing from.
+ * @param WP_Post $post       Post object.
+ */
+function block_core_calendar_update_has_published_post_on_transition_post_status( $new_status, $old_status, $post ) {
+        if ( is_multisite() ) {
+                return;
+        }
+
+        if ( $new_status === $old_status ) {
+                return;
+        }
+
+        if ( 'post' !== get_post_type( $post ) ) {
+                return;
+        }
+
+        if ( 'publish' !== $new_status && 'publish' !== $old_status ) {
+                return;
+        }
+
+        block_core_calendar_update_has_published_posts();
+}
+
+add_action( 'delete_post', 'block_core_calendar_update_has_published_post_on_delete' );
+add_action( 'transition_post_status', 'block_core_calendar_update_has_published_post_on_transition_post_status', 10, 3 );

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

@@ -148 +148 @@
         if ( ! empty( $block->context['navigationArea'] ) ) {
                 $area    = $block->context['navigationArea'];
-                $mapping = get_option( 'fse_navigation_areas', array() );
+                $mapping = get_option( 'wp_navigation_areas', array() );
                 if ( ! empty( $mapping[ $area ] ) ) {
                         $attributes['navigationMenuId'] = $mapping[ $area ];
@@ -180 +180 @@
                 return '';
         }
+
+        // Restore legacy classnames for submenu positioning.
+        $layout_class = '';
+        if ( isset( $attributes['layout']['justifyContent'] ) ) {
+                if ( 'right' === $attributes['layout']['justifyContent'] ) {
+                        $layout_class .= 'items-justified-right';
+                } elseif ( 'space-between' === $attributes['layout']['justifyContent'] ) {
+                        $layout_class .= 'items-justified-space-between';
+                }
+        }
+
         $colors     = block_core_navigation_build_css_colors( $attributes );
         $font_sizes = block_core_navigation_build_css_font_sizes( $attributes );
@@ -185 +196 @@
                 $colors['css_classes'],
                 $font_sizes['css_classes'],
-                $is_responsive_menu ? array( 'is-responsive' ) : array()
+                $is_responsive_menu ? array( 'is-responsive' ) : array(),
+                $layout_class ? array( $layout_class ) : array()
         );