Changeset 12356

Timestamp:

01/04/2023 06:31:00 AM (4 years ago)

Author:

tellyworth

Message:

Plugin Directory: better child block handling in validator.

Fixes #6465.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-block-plugin-checker.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-block-plugin-checker.php

@@ -453 +453 @@
                         'data' => $data,
                 );
+        }
+
+        /**
+         * Determine whether a block is top-level or a child block.
+         *
+         * @param object $block The block in question.
+         *
+         * @return bool True if the block is top-level; false if it is a child block that can only be used within other blocks in the plugin.
+         */
+        public function is_top_level_block( $block ) {
+                $ancestors = $block->parent ?? [];
+                $ancestors = array_merge( $ancestors, $block->ancestor ?? [] );
+
+                // If it has no parent or ancestor blocks, it's top-level.
+                if ( empty( $ancestors ) ) {
+                        return true;
+                }
+
+                foreach ( $ancestors as $ancestor_block_name ) {
+                        // If it has an ancestor outside of this plugin, like `core/column`, then it's also top-level.
+                        if ( ! isset( $this->blocks[ $ancestor_block_name ] ) ) {
+                                return true;
+                        }
+                }
+
+                return false;   
         }
 
@@ -792 +818 @@
                 $top_level_blocks = array_filter(
                         $this->blocks,
-                        function( $block ) {
-                                return ! isset( $block->parent ) || is_null( $block->parent );
-                        }
+                        array( $this, 'is_top_level_block' )
                 );