Changeset 50929 for trunk/src/wp-includes/block-supports/border.php

Timestamp:

05/19/2021 03:07:55 PM (4 years ago)

Author:

gziolo

Message:

Editor: Update WordPress packages published for Gutenberg 10.6

It contains several changes in addition to regular update to WordPress packages:

• All newly exposed blocks are now registered on the server.
• Dutone block support was added.
• Border block support was updated.
• New shared function construct_wp_query_args was added for the family of Query blocks - it might need some further work.

Props youknowriad.
See #52991.

File:

• trunk/src/wp-includes/block-supports/border.php (modified) (6 diffs)

trunk/src/wp-includes/block-supports/border.php

@@ -19 +19 @@
     // Determine if any border related features are supported.
     $has_border_support       = block_has_support( $block_type, array( '__experimentalBorder' ) );
-    $has_border_color_support = block_has_support( $block_type, array( '__experimentalBorder', 'color' ) );
+    $has_border_color_support = wp_has_border_feature_support( $block_type, 'color' );
 
     // Setup attributes and styles within that if needed.
@@ -61 +61 @@
     // Border radius.
     if (
-        block_has_support( $block_type, array( '__experimentalBorder', 'radius' ) ) &&
+        wp_has_border_feature_support( $block_type, 'radius' ) &&
         isset( $block_attributes['style']['border']['radius'] )
     ) {
@@ -70 +70 @@
     // Border style.
     if (
-        block_has_support( $block_type, array( '__experimentalBorder', 'style' ) ) &&
+        wp_has_border_feature_support( $block_type, 'style' ) &&
         isset( $block_attributes['style']['border']['style'] )
     ) {
@@ -79 +79 @@
     // Border width.
     if (
-        block_has_support( $block_type, array( '__experimentalBorder', 'width' ) ) &&
+        wp_has_border_feature_support( $block_type, 'width' ) &&
         isset( $block_attributes['style']['border']['width'] )
     ) {
@@ -87 +87 @@
 
     // Border color.
-    if ( block_has_support( $block_type, array( '__experimentalBorder', 'color' ) ) ) {
+    if ( wp_has_border_feature_support( $block_type, 'color' ) ) {
         $has_named_border_color  = array_key_exists( 'borderColor', $block_attributes );
         $has_custom_border_color = isset( $block_attributes['style']['border']['color'] );
@@ -136 +136 @@
 }
 
+/**
+ * Checks whether the current block type supports the border feature requested.
+ *
+ * If the `__experimentalBorder` support flag is a boolean `true` all border
+ * support features are available. Otherwise, the specific feature's support
+ * flag nested under `experimentalBorder` must be enabled for the feature
+ * to be opted into.
+ *
+ * @since 5.8.0
+ * @access private
+ *
+ * @param WP_Block_Type $block_type Block type to check for support.
+ * @param string        $feature    Name of the feature to check support for.
+ * @param mixed         $default    Fallback value for feature support, defaults to false.
+ *
+ * @return boolean Whether or not the feature is supported.
+ */
+function wp_has_border_feature_support( $block_type, $feature, $default = false ) {
+    // Check if all border support features have been opted into via `"__experimentalBorder": true`.
+    if (
+        property_exists( $block_type, 'supports' ) &&
+        ( true === _wp_array_get( $block_type->supports, array( '__experimentalBorder' ), $default ) )
+    ) {
+        return true;
+    }
+
+    // Check if the specific feature has been opted into individually
+    // via nested flag under `__experimentalBorder`.
+    return block_has_support( $block_type, array( '__experimentalBorder', $feature ), $default );
+}
+
 // Register the block support.
 WP_Block_Supports::get_instance()->register(