Changeset 50776

Timestamp:

04/21/2021 05:10:56 AM (3 years ago)

Author:

gziolo

Message:

Editor: Abstract block editor configuration

There are several WordPress hooks defined on the server that depend on $post object that isn’t present on the new screens like edit site, edit widgets, or edit navigation. This patch deprecates existing filters and introduces replacements that are context-aware.

Props azaozz, andraganescu, jeremyfelt, nosolosw, youknowriad.
See #52920.

Location:

trunk

Files:

• src/wp-admin/edit-form-blocks.php (modified) (10 diffs)
• src/wp-admin/includes/post.php (modified) (1 diff)
• src/wp-includes/block-editor.php (added)
• src/wp-settings.php (modified) (1 diff)
• tests/phpunit/tests/blocks/block-editor.php (added)

trunk/src/wp-admin/edit-form-blocks.php

@@ -23 +23 @@
  */
 global $post_type, $post_type_object, $post, $title, $editor_styles, $wp_meta_boxes;
+
+$editor_name = 'post-editor';
 
 // Flag that we're loading the block editor.
@@ -57 +59 @@
 );
 
+
 /**
  * Preload common data by specifying an array of REST API paths that will be preloaded.
@@ -136 +139 @@
 );
 
-
-/*
- * Initialize the editor.
- */
-
-$align_wide         = get_theme_support( 'align-wide' );
-$color_palette      = current( (array) get_theme_support( 'editor-color-palette' ) );
-$font_sizes         = current( (array) get_theme_support( 'editor-font-sizes' ) );
-$gradient_presets   = current( (array) get_theme_support( 'editor-gradient-presets' ) );
-$custom_line_height = get_theme_support( 'custom-line-height' );
-$custom_units       = get_theme_support( 'custom-units' );
-$custom_spacing     = get_theme_support( 'custom-spacing' );
-
-/**
- * Filters the allowed block types for the editor, defaulting to true (all
- * block types supported).
- *
- * @since 5.0.0
- *
- * @param bool|array $allowed_block_types Array of block type slugs, or
- *                                        boolean to enable/disable all.
- * @param WP_Post    $post                The post resource data.
- */
-$allowed_block_types = apply_filters( 'allowed_block_types', true, $post );
-
 /*
  * Get all available templates for the post/page attributes meta-box.
@@ -175 +153 @@
     $available_templates
 ) : $available_templates;
-
-// Media settings.
-$max_upload_size = wp_max_upload_size();
-if ( ! $max_upload_size ) {
-    $max_upload_size = 0;
-}
 
 // Editor Styles.
@@ -209 +181 @@
 }
 
-// Image sizes.
-
-/** This filter is documented in wp-admin/includes/media.php */
-$image_size_names = apply_filters(
-    'image_size_names_choose',
-    array(
-        'thumbnail' => __( 'Thumbnail' ),
-        'medium'    => __( 'Medium' ),
-        'large'     => __( 'Large' ),
-        'full'      => __( 'Full Size' ),
-    )
-);
-
-$available_image_sizes = array();
-foreach ( $image_size_names as $image_size_slug => $image_size_name ) {
-    $available_image_sizes[] = array(
-        'slug' => $image_size_slug,
-        'name' => $image_size_name,
-    );
-}
-
-$default_size       = get_option( 'image_default_size', 'large' );
-$image_default_size = in_array( $default_size, array_keys( $image_size_names ), true ) ? $image_default_size : 'large';
-
-$image_dimensions = array();
-$all_sizes        = wp_get_registered_image_subsizes();
-foreach ( $available_image_sizes as $size ) {
-    $key = $size['slug'];
-    if ( isset( $all_sizes[ $key ] ) ) {
-        $image_dimensions[ $key ] = $all_sizes[ $key ];
-    }
-}
-
 // Lock settings.
 $user_id = wp_check_post_lock( $post->ID );
@@ -290 +229 @@
 
 $editor_settings = array(
-    'alignWide'                            => $align_wide,
     'availableTemplates'                   => $available_templates,
-    'allowedBlockTypes'                    => $allowed_block_types,
-    'disableCustomColors'                  => get_theme_support( 'disable-custom-colors' ),
-    'disableCustomFontSizes'               => get_theme_support( 'disable-custom-font-sizes' ),
-    'disableCustomGradients'               => get_theme_support( 'disable-custom-gradients' ),
     'disablePostFormats'                   => ! current_theme_supports( 'post-formats' ),
     /** This filter is documented in wp-admin/edit-form-advanced.php */
     'titlePlaceholder'                     => apply_filters( 'enter_title_here', __( 'Add title' ), $post ),
     'bodyPlaceholder'                      => $body_placeholder,
-    'isRTL'                                => is_rtl(),
     'autosaveInterval'                     => AUTOSAVE_INTERVAL,
-    'maxUploadFileSize'                    => $max_upload_size,
-    'allowedMimeTypes'                     => get_allowed_mime_types(),
     'styles'                               => $styles,
-    'imageSizes'                           => $available_image_sizes,
-    'imageDefaultSize'                     => $image_default_size,
-    'imageDimensions'                      => $image_dimensions,
     'richEditingEnabled'                   => user_can_richedit(),
     'postLock'                             => $lock_details,
@@ -321 +249 @@
     // field so that we're not always loading its assets.
     'enableCustomFields'                   => (bool) get_user_meta( get_current_user_id(), 'enable_custom_fields', true ),
-    'enableCustomLineHeight'               => $custom_line_height,
-    'enableCustomUnits'                    => $custom_units,
-    'enableCustomSpacing'                  => $custom_spacing,
 );
 
@@ -337 +262 @@
 }
 
-if ( false !== $color_palette ) {
-    $editor_settings['colors'] = $color_palette;
-}
-
-if ( false !== $font_sizes ) {
-    $editor_settings['fontSizes'] = $font_sizes;
-}
-
-if ( false !== $gradient_presets ) {
-    $editor_settings['gradients'] = $gradient_presets;
-}
-
 if ( ! empty( $post_type_object->template ) ) {
     $editor_settings['template']     = $post_type_object->template;
@@ -373 +286 @@
 wp_enqueue_editor();
 
-
 /**
  * Styles
@@ -401 +313 @@
 }
 
-/**
- * Filters the settings to pass to the block editor.
- *
- * @since 5.0.0
- *
- * @param array   $editor_settings Default editor settings.
- * @param WP_Post $post            Post being edited.
- */
-$editor_settings = apply_filters( 'block_editor_settings', $editor_settings, $post );
+$editor_settings = get_block_editor_settings( $editor_name, $editor_settings );
 
 $init_script = <<<JS

trunk/src/wp-admin/includes/post.php

@@ -2182 +2182 @@
 
 /**
- * Returns all the block categories that will be shown in the block editor.
- *
- * @since 5.0.0
- *
- * @param WP_Post $post Post object.
- * @return array[] Array of block categories.
- */
-function get_block_categories( $post ) {
-    $default_categories = array(
-        array(
-            'slug'  => 'text',
-            'title' => _x( 'Text', 'block category' ),
-            'icon'  => null,
-        ),
-        array(
-            'slug'  => 'media',
-            'title' => _x( 'Media', 'block category' ),
-            'icon'  => null,
-        ),
-        array(
-            'slug'  => 'design',
-            'title' => _x( 'Design', 'block category' ),
-            'icon'  => null,
-        ),
-        array(
-            'slug'  => 'widgets',
-            'title' => _x( 'Widgets', 'block category' ),
-            'icon'  => null,
-        ),
-        array(
-            'slug'  => 'theme',
-            'title' => _x( 'Theme', 'block category' ),
-            'icon'  => null,
-        ),
-        array(
-            'slug'  => 'embed',
-            'title' => _x( 'Embeds', 'block category' ),
-            'icon'  => null,
-        ),
-        array(
-            'slug'  => 'reusable',
-            'title' => _x( 'Reusable Blocks', 'block category' ),
-            'icon'  => null,
-        ),
-    );
-
-    /**
-     * Filters the default array of block categories.
-     *
-     * @since 5.0.0
-     *
-     * @param array[] $default_categories Array of block categories.
-     * @param WP_Post $post               Post being loaded.
-     */
-    return apply_filters( 'block_categories', $default_categories, $post );
-}
-
-/**
  * Prepares server-registered blocks for the block editor.
  *

trunk/src/wp-settings.php

@@ -295 +295 @@
 require ABSPATH . WPINC . '/blocks.php';
 require ABSPATH . WPINC . '/blocks/index.php';
+require ABSPATH . WPINC . '/block-editor.php';
 require ABSPATH . WPINC . '/block-patterns.php';
 require ABSPATH . WPINC . '/class-wp-block-supports.php';