Ticket #8474: 8474.patch

src/bp-core/bp-core-template-loader.php

@@ -453 +453 @@
          */
         $templates = apply_filters( "bp_get_{$type}_template", $templates );
 
-        // Filter possible templates, try to match one, and set any BuddyPress theme
-        // compat properties so they can be cross-checked later.
+        /*
+         * Filter possible templates, try to match one, and set any BuddyPress theme
+         * compat properties so they can be cross-checked later.
+         */
         $templates = bp_set_theme_compat_templates( $templates );
         $template  = bp_locate_template( $templates );
-        $template  = bp_set_theme_compat_template( $template );
+
+        /*
+         * The current theme is using the WordPress Full Site Editing feature.
+         * BuddyPress then needs to use the WordPress template canvas to retrieve the community content.
+         */
+        if ( current_theme_supports( 'block-templates' ) && $template === get_theme_file_path( 'index.php' ) ) {
+                $template = ABSPATH . WPINC . '/template-canvas.php';
+        }
+
+        $template = bp_set_theme_compat_template( $template );
 
         /**
          * Filters the path to a template file.

src/bp-templates/bp-nouveau/buddypress-functions.php

@@ -176 +176 @@
                 // We need to neutralize the BuddyPress core "bp_core_render_message()" once it has been added.
                 add_action( 'bp_actions', array( $this, 'neutralize_core_template_notices' ), 6 );
 
-                // Scripts.
-                add_action( 'bp_enqueue_scripts', array( $this, 'register_scripts' ), 2 ); // Register theme JS.
+                // Scripts & Styles.
+                $registration_params = array(
+                        'hook'     => 'bp_enqueue_scripts',
+                        'priority' => 2,
+                );
+
+                /*
+                 * The WordPress Full Site Editing feature needs Scripts
+                 * and Styles to be registered earlier.
+                 */
+                if ( current_theme_supports( 'block-templates' ) ) {
+                        $registration_params['hook']     = 'bp_init';
+                        $registration_params['priority'] = 20;
+                }
+
+                // Register theme JS.
+                add_action( $registration_params['hook'], array( $this, 'register_scripts' ), $registration_params['priority'] );
+
+                // Enqueue theme CSS.
+                add_action( 'bp_enqueue_scripts', array( $this, 'enqueue_styles' ) );
+
+                // Enqueue theme JS.
+                add_action( 'bp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
+
+                // Enqueue theme script localization.
+                add_filter( 'bp_enqueue_scripts', array( $this, 'localize_scripts' ) );
                 remove_action( 'bp_enqueue_scripts', 'bp_core_confirmation_js' );
-                add_action( 'bp_enqueue_scripts', array( $this, 'enqueue_styles' ) ); // Enqueue theme CSS.
-                add_action( 'bp_enqueue_scripts', array( $this, 'enqueue_scripts' ) ); // Enqueue theme JS.
-                add_filter( 'bp_enqueue_scripts', array( $this, 'localize_scripts' ) ); // Enqueue theme script localization.
 
                 // Body no-js class.
                 add_filter( 'body_class', array( $this, 'add_nojs_body_class' ), 20, 1 );

src/bp-templates/bp-nouveau/includes/customizer.php

@@ -3 +3 @@
  * Code to hook into the WP Customizer
  *
  * @since 3.0.0
- * @version 3.1.0
+ * @version 10.0.0
  */
 
 /**
@@ -21 +21 @@
         require_once( trailingslashit( bp_nouveau()->includes_dir ) . 'customizer-controls.php' );
         $wp_customize->register_control_type( 'BP_Nouveau_Nav_Customize_Control' );
         $bp_nouveau_options = bp_nouveau_get_appearance_settings();
+        $layout_widths      = bp_nouveau_get_theme_layout_widths();
 
         $wp_customize->add_panel( 'bp_nouveau_panel', array(
                 'description' => __( 'Customize the appearance of BuddyPress Nouveau Template pack.', 'buddypress' ),
@@ -202 +203 @@
                 ),
         ) );
 
-        if ( current_theme_supports( 'align-wide' ) ) {
+        if ( $layout_widths ) {
                 $settings['bp_nouveau_appearance[global_alignment]'] = array(
                         'index'             => 'global_alignment',
                         'capability'        => 'bp_moderate',
@@ -306 +307 @@
          */
         $controls = apply_filters( 'bp_nouveau_customizer_controls', $controls );
 
-        if ( current_theme_supports( 'align-wide' ) ) {
+        if ( $layout_widths ) {
                 $controls['global_alignment'] = array(
                         'label'      => __( 'Select the BuddyPress container width for your site.', 'buddypress' ),
                         'section'    => 'bp_nouveau_general_settings',
                         'settings'   => 'bp_nouveau_appearance[global_alignment]',
                         'type'       => 'select',
-                        'choices'    => array(
-                                'alignnone' => __( 'Default width', 'buddypress' ),
-                                'alignwide' => __( 'Wide width', 'buddypress' ),
-                                'alignfull' => __( 'Full width', 'buddypress' ),
-                        ),
+                        'choices'    => $layout_widths,
                 );
         }
 

src/bp-templates/bp-nouveau/includes/functions.php

@@ -3 +3 @@
  * Common functions
  *
  * @since 3.0.0
- * @version 9.0.0
+ * @version 10.0.0
  */
 
 // Exit if accessed directly.
@@ -1639 +1639 @@
 
         return $widget_content;
 }
+
+/**
+ * Retuns the theme layout available widths.
+ *
+ * @since 10.0.0
+ *
+ * @return array The available theme layout widths.
+ */
+function bp_nouveau_get_theme_layout_widths() {
+        $layout_widths = array();
+
+        if ( current_theme_supports( 'align-wide' ) ) {
+                $layout_widths = array(
+                        'alignnone' => __( 'Default width', 'buddypress' ),
+                        'alignwide' => __( 'Wide width', 'buddypress' ),
+                        'alignfull' => __( 'Full width', 'buddypress' ),
+                );
+        }
+
+        if ( bp_is_running_wp( '5.9-alpha-20211112.120915' ) ) {
+                $theme_layouts = wp_get_global_settings( array( 'layout' ) );
+
+                if ( isset( $theme_layouts['wideSize'] ) && $theme_layouts['wideSize'] ) {
+                        $layout_widths = array(
+                                'alignnone' => __( 'Content width', 'buddypress' ),
+                                'alignwide' => __( 'Wide width', 'buddypress' ),
+                        );
+                }
+        }
+
+        /**
+         * Filter here to edit the available theme layout widths.
+         *
+         * @since 10.0.0
+         *
+         * @param array $layout_widths The available theme layout widths.
+         */
+        return apply_filters( 'bp_nouveau_get_theme_layout_widths', $layout_widths );
+}

src/bp-templates/bp-nouveau/includes/template-tags.php

@@ -3 +3 @@
  * Common template tags
  *
  * @since 3.0.0
- * @version 8.0.0
+ * @version 10.0.0
  */
 
 // Exit if accessed directly.
@@ -1529 +1529 @@
                         }
                 }
 
-                $global_alignment = bp_nouveau_get_temporary_setting( 'global_alignment', bp_nouveau_get_appearance_settings( 'global_alignment' ) );
-                if ( $global_alignment && 'alignnone' !== $global_alignment && current_theme_supports( 'align-wide' ) ) {
+                $global_alignment  = bp_nouveau_get_temporary_setting( 'global_alignment', bp_nouveau_get_appearance_settings( 'global_alignment' ) );
+                $layout_widths     = bp_nouveau_get_theme_layout_widths();
+
+                if ( $global_alignment && 'alignnone' !== $global_alignment && $layout_widths ) {
                         $classes[] = $global_alignment;
                 }