[WIP] Try: Add sticky position support for the Group block

.github/CODEOWNERS

@@ -132,10 +132,10 @@
 /lib                                                                 @timothybjacobs @spacedmonkey
 /lib/global-styles.php                                               @timothybjabocs @spacedmonkey @oandregal
 /lib/class-wp-rest-block-editor-settings-controller.php              @timothybjacobs @spacedmonkey @geriux @antonis
-/lib/compat/wordpress-5.9/theme.json                                                      @timothybjabocs @spacedmonkey @oandregal
 /lib/compat/wordpress-5.9/theme-i18n.json                                                 @timothybjabocs @spacedmonkey @oandregal
 /lib/compat/wordpress-5.9/class-wp-theme-json-gutenberg.php          @timothybjabocs @spacedmonkey @oandregal
 /lib/compat/wordpress-5.9/class-wp-theme-json-resolver-gutenberg.php @timothybjabocs @spacedmonkey @oandregal
+/lib/compat/wordpress-6.0/theme.json                                                      @timothybjabocs @spacedmonkey @oandregal
 /lib/full-site-editing                                               @janw-me
 /phpunit/class-wp-theme-json-test.php                                @oandregal
 

lib/block-supports/layout.php

@@ -138,8 +138,8 @@ function gutenberg_render_layout_support_flag( $block_content, $block ) {
 		return $block_content;
 	}
 
-	$block_gap             = wp_get_global_settings( array( 'spacing', 'blockGap' ) );
-	$default_layout        = wp_get_global_settings( array( 'layout' ) );
+	$block_gap             = gutenberg_get_global_settings( array( 'spacing', 'blockGap' ) );
+	$default_layout        = gutenberg_get_global_settings( array( 'layout' ) );
 	$has_block_gap_support = isset( $block_gap ) ? null !== $block_gap : false;
 	$default_block_layout  = _wp_array_get( $block_type->supports, array( '__experimentalLayout', 'default' ), array() );
 	$used_layout           = isset( $block['attrs']['layout'] ) ? $block['attrs']['layout'] : $default_block_layout;

lib/compat/wordpress-5.9/class-wp-theme-json-resolver-gutenberg.php

@@ -119,7 +119,7 @@ public static function get_core_data() {
 			return static::$core;
 		}
 
-		$config       = static::read_json_file( __DIR__ . '/theme.json' );
+		$config       = static::read_json_file( __DIR__ . '/../wordpress-6.0/theme.json' );
 		$config       = static::translate( $config );
 		static::$core = new WP_Theme_JSON_Gutenberg( $config, 'default' );
 

lib/compat/wordpress-5.9/get-global-styles-and-settings.php

@@ -5,150 +5,133 @@
  * @package gutenberg
  */
 
-if ( ! function_exists( 'wp_get_global_settings' ) ) {
-	/**
-	 * Function to get the settings resulting of merging core, theme, and user data.
-	 *
-	 * @param array $path    Path to the specific setting to retrieve. Optional.
-	 *                       If empty, will return all settings.
-	 * @param array $context {
-	 *     Metadata to know where to retrieve the $path from. Optional.
-	 *
-	 *     @type string $block_name Which block to retrieve the settings from.
-	 *                              If empty, it'll return the settings for the global context.
-	 *     @type string $origin     Which origin to take data from.
-	 *                              Valid values are 'all' (core, theme, and user) or 'base' (core and theme).
-	 *                              If empty or unknown, 'all' is used.
-	 * }
-	 *
-	 * @return array The settings to retrieve.
-	 */
-	function wp_get_global_settings( $path = array(), $context = array() ) {
-		if ( ! empty( $context['block_name'] ) ) {
-			$path = array_merge( array( 'blocks', $context['block_name'] ), $path );
-		}
-
-		$origin = 'custom';
-		if ( isset( $context['origin'] ) && 'base' === $context['origin'] ) {
-			$origin = 'theme';
-		}
-
-		$settings = WP_Theme_JSON_Resolver_Gutenberg::get_merged_data( $origin )->get_settings();
-
-		return _wp_array_get( $settings, $path, $settings );
+/**
+ * Function to get the settings resulting of merging core, theme, and user data.
+ *
+ * @param array $path    Path to the specific setting to retrieve. Optional.
+ *                       If empty, will return all settings.
+ * @param array $context {
+ *     Metadata to know where to retrieve the $path from. Optional.
+ *
+ *     @type string $block_name Which block to retrieve the settings from.
+ *                              If empty, it'll return the settings for the global context.
+ *     @type string $origin     Which origin to take data from.
+ *                              Valid values are 'all' (core, theme, and user) or 'base' (core and theme).
+ *                              If empty or unknown, 'all' is used.
+ * }
+ *
+ * @return array The settings to retrieve.
+ */
+function gutenberg_get_global_settings( $path = array(), $context = array() ) {
+	if ( ! empty( $context['block_name'] ) ) {
+		$path = array_merge( array( 'blocks', $context['block_name'] ), $path );
+	}
+	$origin = 'custom';
+	if ( isset( $context['origin'] ) && 'base' === $context['origin'] ) {
+		$origin = 'theme';
 	}
+	$settings = WP_Theme_JSON_Resolver_Gutenberg::get_merged_data( $origin )->get_settings();
+	return _wp_array_get( $settings, $path, $settings );
 }
 
-if ( ! function_exists( 'wp_get_global_styles' ) ) {
-	/**
-	 * Function to get the styles resulting of merging core, theme, and user data.
-	 *
-	 * @param array $path    Path to the specific style to retrieve. Optional.
-	 *                       If empty, will return all styles.
-	 * @param array $context {
-	 *     Metadata to know where to retrieve the $path from. Optional.
-	 *
-	 *     @type string $block_name Which block to retrieve the styles from.
-	 *                              If empty, it'll return the styles for the global context.
-	 *     @type string $origin     Which origin to take data from.
-	 *                              Valid values are 'all' (core, theme, and user) or 'base' (core and theme).
-	 *                              If empty or unknown, 'all' is used.
-	 * }
-	 *
-	 * @return array The styles to retrieve.
-	 */
-	function wp_get_global_styles( $path = array(), $context = array() ) {
-		if ( ! empty( $context['block_name'] ) ) {
-			$path = array_merge( array( 'blocks', $context['block_name'] ), $path );
-		}
+/**
+ * Function to get the styles resulting of merging core, theme, and user data.
+ *
+ * @param array $path    Path to the specific style to retrieve. Optional.
+ *                       If empty, will return all styles.
+ * @param array $context {
+ *     Metadata to know where to retrieve the $path from. Optional.
+ *
+ *     @type string $block_name Which block to retrieve the styles from.
+ *                              If empty, it'll return the styles for the global context.
+ *     @type string $origin     Which origin to take data from.
+ *                              Valid values are 'all' (core, theme, and user) or 'base' (core and theme).
+ *                              If empty or unknown, 'all' is used.
+ * }
+ *
+ * @return array The styles to retrieve.
+ */
+function gutenberg_get_global_styles( $path = array(), $context = array() ) {
+	if ( ! empty( $context['block_name'] ) ) {
+		$path = array_merge( array( 'blocks', $context['block_name'] ), $path );
+	}
+	$origin = 'custom';
+	if ( isset( $context['origin'] ) && 'base' === $context['origin'] ) {
+		$origin = 'theme';
+	}
+	$styles = WP_Theme_JSON_Resolver_Gutenberg::get_merged_data( $origin )->get_raw_data()['styles'];
+	return _wp_array_get( $styles, $path, $styles );
+}
 
-		$origin = 'custom';
-		if ( isset( $context['origin'] ) && 'base' === $context['origin'] ) {
-			$origin = 'theme';
+/**
+ * Returns the stylesheet resulting of merging core, theme, and user data.
+ *
+ * @param array $types Types of styles to load. Optional.
+ *                     It accepts 'variables', 'styles', 'presets' as values.
+ *                     If empty, it'll load all for themes with theme.json support
+ *                     and only [ 'variables', 'presets' ] for themes without theme.json support.
+ *
+ * @return string Stylesheet.
+ */
+function gutenberg_get_global_stylesheet( $types = array() ) {
+	// Return cached value if it can be used and exists.
+	// It's cached by theme to make sure that theme switching clears the cache.
+	$can_use_cached = (
+		( empty( $types ) ) &&
+		( ! defined( 'WP_DEBUG' ) || ! WP_DEBUG ) &&
+		( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ) &&
+		( ! defined( 'REST_REQUEST' ) || ! REST_REQUEST ) &&
+		! is_admin()
+	);
+	$transient_name = 'gutenberg_global_styles_' . get_stylesheet();
+	if ( $can_use_cached ) {
+		$cached = get_transient( $transient_name );
+		if ( $cached ) {
+			return $cached;
 		}
+	}
+	$tree                = WP_Theme_JSON_Resolver_Gutenberg::get_merged_data();
+	$supports_theme_json = WP_Theme_JSON_Resolver_Gutenberg::theme_has_support();
+	if ( empty( $types ) && ! $supports_theme_json ) {
+		$types = array( 'variables', 'presets' );
+	} elseif ( empty( $types ) ) {
+		$types = array( 'variables', 'styles', 'presets' );
+	}
 
-		$styles = WP_Theme_JSON_Resolver_Gutenberg::get_merged_data( $origin )->get_raw_data()['styles'];
-
-		return _wp_array_get( $styles, $path, $styles );
+	/*
+	 * If variables are part of the stylesheet,
+	 * we add them for all origins (default, theme, user).
+	 * This is so themes without a theme.json still work as before 5.9:
+	 * they can override the default presets.
+	 * See https://core.trac.wordpress.org/ticket/54782
+	 */
+	$styles_variables = '';
+	if ( in_array( 'variables', $types, true ) ) {
+		$styles_variables = $tree->get_stylesheet( array( 'variables' ) );
+		$types            = array_diff( $types, array( 'variables' ) );
 	}
-}
 
-if ( ! function_exists( 'wp_get_global_stylesheet' ) ) {
-	/**
-	 * Returns the stylesheet resulting of merging core, theme, and user data.
-	 *
-	 * @param array $types Types of styles to load. Optional.
-	 *                     It accepts 'variables', 'styles', 'presets' as values.
-	 *                     If empty, it'll load all for themes with theme.json support
-	 *                     and only [ 'variables', 'presets' ] for themes without theme.json support.
+	/*
+	 * For the remaining types (presets, styles), we do consider origins:
 	 *
-	 * @return string Stylesheet.
+	 * - themes without theme.json: only the classes for the presets defined by core
+	 * - themes with theme.json: the presets and styles classes, both from core and the theme
 	 */
-	function wp_get_global_stylesheet( $types = array() ) {
-		// Return cached value if it can be used and exists.
-		// It's cached by theme to make sure that theme switching clears the cache.
-		$can_use_cached = (
-			( empty( $types ) ) &&
-			( ! defined( 'WP_DEBUG' ) || ! WP_DEBUG ) &&
-			( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ) &&
-			( ! defined( 'REST_REQUEST' ) || ! REST_REQUEST ) &&
-			! is_admin()
-		);
-		$transient_name = 'gutenberg_global_styles_' . get_stylesheet();
-		if ( $can_use_cached ) {
-			$cached = get_transient( $transient_name );
-			if ( $cached ) {
-				return $cached;
-			}
-		}
-
-		$tree = WP_Theme_JSON_Resolver::get_merged_data();
-
-		$supports_theme_json = WP_Theme_JSON_Resolver::theme_has_support();
-		if ( empty( $types ) && ! $supports_theme_json ) {
-			$types = array( 'variables', 'presets' );
-		} elseif ( empty( $types ) ) {
-			$types = array( 'variables', 'styles', 'presets' );
-		}
-
-		/*
-		 * If variables are part of the stylesheet,
-		 * we add them for all origins (default, theme, user).
-		 * This is so themes without a theme.json still work as before 5.9:
-		 * they can override the default presets.
-		 * See https://core.trac.wordpress.org/ticket/54782
-		 */
-		$styles_variables = '';
-		if ( in_array( 'variables', $types, true ) ) {
-			$styles_variables = $tree->get_stylesheet( array( 'variables' ) );
-			$types            = array_diff( $types, array( 'variables' ) );
-		}
-
-		/*
-		 * For the remaining types (presets, styles), we do consider origins:
-		 *
-		 * - themes without theme.json: only the classes for the presets defined by core
-		 * - themes with theme.json: the presets and styles classes, both from core and the theme
-		 */
-		$styles_rest = '';
-		if ( ! empty( $types ) ) {
-			$origins = array( 'default', 'theme', 'custom' );
-			if ( ! $supports_theme_json ) {
-				$origins = array( 'default' );
-			}
-			$styles_rest = $tree->get_stylesheet( $types, $origins );
-		}
-
-		$stylesheet = $styles_variables . $styles_rest;
-
-		if ( $can_use_cached ) {
-			// Cache for a minute.
-			// This cache doesn't need to be any longer, we only want to avoid spikes on high-traffic sites.
-			set_transient( $transient_name, $stylesheet, MINUTE_IN_SECONDS );
+	$styles_rest = '';
+	if ( ! empty( $types ) ) {
+		$origins = array( 'default', 'theme', 'custom' );
+		if ( ! $supports_theme_json ) {
+			$origins = array( 'default' );
 		}
-
-		return $stylesheet;
+		$styles_rest = $tree->get_stylesheet( $types, $origins );
+	}
+	$stylesheet = $styles_variables . $styles_rest;
+	if ( $can_use_cached ) {
+		// Cache for a minute.
+		// This cache doesn't need to be any longer, we only want to avoid spikes on high-traffic sites.
+		set_transient( $transient_name, $stylesheet, MINUTE_IN_SECONDS );
 	}
+	return $stylesheet;
 }
 
 if ( ! function_exists( 'wp_get_global_styles_svg_filters' ) ) {

lib/compat/wordpress-5.9/global-styles-css-custom-properties.php

@@ -13,7 +13,7 @@
 	 */
 	function wp_enqueue_global_styles_css_custom_properties() {
 		wp_register_style( 'global-styles-css-custom-properties', false, array(), true, true );
-		wp_add_inline_style( 'global-styles-css-custom-properties', wp_get_global_stylesheet( array( 'variables' ) ) );
+		wp_add_inline_style( 'global-styles-css-custom-properties', gutenberg_get_global_stylesheet( array( 'variables' ) ) );
 		wp_enqueue_style( 'global-styles-css-custom-properties' );
 	}
 	add_filter( 'enqueue_block_editor_assets', 'wp_enqueue_global_styles_css_custom_properties' );

lib/compat/wordpress-5.9/script-loader.php

@@ -28,7 +28,7 @@ function gutenberg_enqueue_global_styles_assets() {
 		return;
 	}
 
-	$stylesheet = wp_get_global_stylesheet();
+	$stylesheet = gutenberg_get_global_stylesheet();
 
 	if ( empty( $stylesheet ) ) {
 		return;