Ticket #49615: 49615-core-blocks.diff

src/wp-includes/blocks/index.php

@@ -65 +65 @@
         }
 }
 add_action( 'init', 'register_core_block_types_from_metadata' );
+
+/**
+  * Given a registered block type settings array, assigns default attributes
+  * based on the block supports configuration. It mirrors the same behavior
+  * applied on the client using `blocks.registerBlockType` filter.
+  *
+  * @since 5.5.0
+  *
+  * @param array $args Block type settings.
+  * @return array      Block type settings with default attributes applied.
+  */
+function register_block_type_add_default_attributes( $args ) {
+        // This check accounts for a special case when `attributes` is not set
+        // or the value provided is invalid.
+        if ( ! isset( $args['attributes'] ) || ! is_array( $args['attributes'] ) ) {
+                return $args;
+        }
+
+        $attributes = $args['attributes'];
+        $supports   = isset( $args['supports'] ) ? $args['supports'] : array();
+
+        if ( ! empty( $supports['align'] ) && empty( $attributes['align']['type'] ) ) {
+                $args['attributes']['align'] = array(
+                        'type' => 'string',
+                );
+        }
+
+        if ( ! empty( $supports['anchor'] ) && empty( $attributes['anchor']['type'] ) ) {
+                $args['attributes']['anchor'] = array(
+                        'type'      => 'string',
+                        'source'    => 'attribute',
+                        'attribute' => 'id',
+                        'selector'  => '*',
+                );
+        }
+
+        if (
+                ( ! isset( $supports['customClassName'] ) || false !== $supports['customClassName'] ) &&
+                empty( $attributes['className']['type'] )
+        ) {
+                $args['attributes']['className'] = array(
+                        'type' => 'string',
+                );
+        }
+
+        return $args;
+}
+add_filter( 'register_block_type_args', 'register_block_type_add_default_attributes' );

tests/phpunit/tests/blocks/block.php

@@ -74 +74 @@
                                         'default' => 10,
                                 ),
                         ),
+                        'supports'   => array(
+                                'customClassName' => false,
+                        ),
                 );
                 $this->registry->register( 'core/example', $block_type_settings );
 

tests/phpunit/tests/blocks/register.php

@@ -294 +294 @@
                 $this->assertEqualSets( array( 'alert', 'message' ), $result->keywords );
                 $this->assertEquals(
                         array(
-                                'message' => array(
+                                'message'   => array(
                                         'type'     => 'string',
                                         'source'   => 'html',
                                         'selector' => '.message',
                                 ),
+                                'align'     => array(
+                                        'type' => 'string',
+                                ),
+                                'className' => array(
+                                        'type' => 'string',
+                                ),
                         ),
                         $result->attributes
                 );
@@ -398 +404 @@
                 $block_type = $registry->get_registered( 'core/test-filtered' );
                 $this->assertEquals( 'boolean', $block_type->attributes['core/test-filtered']['type'] );
         }
+
+        /**
+         * @ticket 49615
+         */
+        function test_register_add_default_attributes_filter() {
+                $block_name = 'core/test-attributes';
+                register_block_type(
+                        $block_name,
+                        array(
+                                'attributes' => array(),
+                                'supports'   => array(
+                                        'align'  => true,
+                                        'anchor' => true,
+                                ),
+                        )
+                );
+
+                $registry   = WP_Block_Type_Registry::get_instance();
+                $block_type = $registry->get_registered( $block_name );
+                $this->assertEquals(
+                        array(
+                                'align'     => array(
+                                        'type' => 'string',
+                                ),
+                                'anchor'    => array(
+                                        'type'      => 'string',
+                                        'source'    => 'attribute',
+                                        'attribute' => 'id',
+                                        'selector'  => '*',
+                                ),
+                                'className' => array(
+                                        'type' => 'string',
+                                ),
+                        ),
+                        $block_type->attributes
+                );
+        }
+
 }