Changeset 56055 for trunk/src/wp-includes/class-wp-theme-json.php

Timestamp:

06/27/2023 07:23:04 AM (2 years ago)

Author:

isabel_brison

Message:

Editor: stabilise layout and refactor definitions.

Marks the layout support stable and moves layout definitions from theme.json into wp-includes/block-supports/layout.php.

Props andrewserong, poena, ramonopoly, peterwilsoncc.
Fixes #58550.

File:

• trunk/src/wp-includes/class-wp-theme-json.php (modified) (4 diffs)

trunk/src/wp-includes/class-wp-theme-json.php

@@ -339 +339 @@
      * @since 6.2.0 Added `dimensions.minHeight`, 'shadow.presets', 'shadow.defaultPresets',
      *              `position.fixed` and `position.sticky`.
-     * @since 6.3.0 Added support for `typography.textColumns`.
+     * @since 6.3.0 Added support for `typography.textColumns`, removed `layout.definitions`.
      *
      * @var array
@@ -375 +375 @@
         'layout'                        => array(
             'contentSize' => null,
-            'definitions' => null,
             'wideSize'    => null,
         ),
@@ -1278 +1277 @@
         if ( isset( $block_metadata['name'] ) ) {
             $block_type = WP_Block_Type_Registry::get_instance()->get_registered( $block_metadata['name'] );
-            if ( ! block_has_support( $block_type, array( '__experimentalLayout' ), false ) ) {
+            if ( ! block_has_support( $block_type, array( 'layout' ), false ) && ! block_has_support( $block_type, array( '__experimentalLayout' ), false ) ) {
                 return $block_rules;
             }
@@ -1287 +1286 @@
         $has_fallback_gap_support = ! $has_block_gap_support; // This setting isn't useful yet: it exists as a placeholder for a future explicit fallback gap styles support.
         $node                     = _wp_array_get( $this->theme_json, $block_metadata['path'], array() );
-        $layout_definitions       = _wp_array_get( $this->theme_json, array( 'settings', 'layout', 'definitions' ), array() );
+        $layout_definitions       = wp_get_layout_definitions();
         $layout_selector_pattern  = '/^[a-zA-Z0-9\-\.\ *+>:\(\)]*$/'; // Allow alphanumeric classnames, spaces, wildcard, sibling, child combinator and pseudo class selectors.