Changeset 46111

Timestamp:

09/14/2019 06:20:58 PM (5 years ago)

Author:

jorgefilipecosta

Message:

Block Editor: Backport block styles server functions from block editor.

This commit backports the block styles functionality added to the block editor in ​https://github.com/WordPress/gutenberg/pull/16356.

Props: youknowriad, aduth, swissspidy.
Fixes #48039.

Location:

trunk/src

Files:

• wp-includes/blocks.php (modified) (1 diff)
• wp-includes/class-wp-block-styles-registry.php (added)
• wp-includes/default-filters.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)
• wp-settings.php (modified) (1 diff)

trunk/src/wp-includes/blocks.php

@@ -357 +357 @@
     return has_blocks( $content ) ? 1 : 0;
 }
+
+/**
+ * Registers a new block style.
+ *
+ * @since 5.3.0
+ *
+ * @param string $block_name       Block type name including namespace.
+ * @param array  $style_properties Array containing the properties of the style name, label, style (name of the stylesheet to be enqueued), inline_style (string containing the CSS to be added).
+ *
+ * @return boolean True if the block style was registered with success and false otherwise.
+ */
+function register_block_style( $block_name, $style_properties ) {
+    return WP_Block_Styles_Registry::get_instance()->register( $block_name, $style_properties );
+}
+
+/**
+ * Unregisters a block style.
+ *
+ * @since 5.3.0
+ *
+ * @param string $block_name       Block type name including namespace.
+ * @param array  $block_style_name Block style name.
+ *
+ * @return boolean True if the block style was unregistered with success and false otherwise.
+ */
+function unregister_block_style( $block_name, $block_style_name ) {
+    return WP_Block_Styles_Registry::get_instance()->unregister( $block_name, $block_style_name );
+}

trunk/src/wp-includes/default-filters.php

@@ -502 +502 @@
 add_filter( 'print_scripts_array', 'wp_prototype_before_jquery' );
 add_filter( 'customize_controls_print_styles', 'wp_resource_hints', 1 );
+add_action( 'enqueue_block_assets', 'enqueue_block_styles_assets', 30 );
+add_action( 'enqueue_block_editor_assets', 'enqueue_editor_block_styles_assets' );
 
 add_action( 'wp_default_styles', 'wp_default_styles' );

trunk/src/wp-includes/script-loader.php

@@ -2781 +2781 @@
     }
 }
+
+/**
+ * Function responsible for enqueuing the styles required for block styles functionality on the editor and on the frontend.
+ *
+ * @since 5.3.0
+ */
+function enqueue_block_styles_assets() {
+    $block_styles = WP_Block_Styles_Registry::get_instance()->get_all_registered();
+
+    foreach ( $block_styles as $styles ) {
+        foreach ( $styles as $style_properties ) {
+            if ( isset( $style_properties['style_handle'] ) ) {
+                wp_enqueue_style( $style_properties['style_handle'] );
+            }
+            if ( isset( $style_properties['inline_style'] ) ) {
+                wp_add_inline_style( 'wp-block-library', $style_properties['inline_style'] );
+            }
+        }
+    }
+}
+
+/**
+ * Function responsible for enqueuing the assets required for block styles functionality on the editor.
+ *
+ * @since 5.3.0
+ */
+function enqueue_editor_block_styles_assets() {
+    $block_styles = WP_Block_Styles_Registry::get_instance()->get_all_registered();
+
+    $register_script_lines = array( '( function() {' );
+    foreach ( $block_styles as $block_name => $styles ) {
+        foreach ( $styles as $style_properties ) {
+            $register_script_lines[] = sprintf(
+                '   wp.blocks.registerBlockStyle( \'%s\', %s );',
+                $block_name,
+                wp_json_encode(
+                    array(
+                        'name'  => $style_properties['name'],
+                        'label' => $style_properties['label'],
+                    )
+                )
+            );
+        }
+    }
+    $register_script_lines[] = '} )();';
+    $inline_script           = implode( "\n", $register_script_lines );
+
+    wp_register_script( 'wp-block-styles', false, array( 'wp-blocks' ), true, true );
+    wp_add_inline_script( 'wp-block-styles', $inline_script );
+    wp_enqueue_script( 'wp-block-styles' );
+}

trunk/src/wp-settings.php

@@ -257 +257 @@
 require( ABSPATH . WPINC . '/rest-api/search/class-wp-rest-post-search-handler.php' );
 require( ABSPATH . WPINC . '/class-wp-block-type.php' );
+require( ABSPATH . WPINC . '/class-wp-block-styles-registry.php' );
 require( ABSPATH . WPINC . '/class-wp-block-type-registry.php' );
 require( ABSPATH . WPINC . '/class-wp-block-parser.php' );