Changeset 13145

Timestamp:

11/13/2021 02:33:37 PM (3 years ago)

Author:

imath

Message:

WP FSE Compat: make sure BuddyPress templates are loaded on front-end

Adapt the BuddyPress Theme Compat API so that it uses the WordPress block template canvas when the active theme supports block templates. You can now test BuddyPress inside Twenty Twenty-Two: the next WordPress default theme!

Improves the BP Nouveau Template Pack introducing a new function bp_nouveau_get_theme_layout_widths() to get the theme layout available widths and use the wider one by default.

See #8474

Location:

trunk/src

Files:

• bp-core/bp-core-template-loader.php (modified) (1 diff)
• bp-templates/bp-nouveau/buddypress-functions.php (modified) (1 diff)
• bp-templates/bp-nouveau/includes/customizer.php (modified) (5 diffs)
• bp-templates/bp-nouveau/includes/functions.php (modified) (2 diffs)
• bp-templates/bp-nouveau/includes/template-tags.php (modified) (2 diffs)

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

@@ -454 +454 @@
     $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 );
 
     /**

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

@@ -177 +177 @@
         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.

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

@@ -4 +4 @@
  *
  * @since 3.0.0
- * @version 3.1.0
+ * @version 10.0.0
  */
 
@@ -22 +22 @@
     $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(
@@ -203 +204 @@
     ) );
 
-    if ( current_theme_supports( 'align-wide' ) ) {
+    if ( $layout_widths ) {
         $settings['bp_nouveau_appearance[global_alignment]'] = array(
             'index'             => 'global_alignment',
@@ -307 +308 @@
     $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' ),
@@ -313 +314 @@
             '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,
         );
     }

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

@@ -4 +4 @@
  *
  * @since 3.0.0
- * @version 9.0.0
+ * @version 10.0.0
  */
 
@@ -1640 +1640 @@
     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' ),
+        );
+    }
+
+    // `wp_get_global_settings()` has been introduced in WordPress 5.9
+    if ( function_exists( 'wp_get_global_settings' ) ) {
+        $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 );
+}

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

@@ -4 +4 @@
  *
  * @since 3.0.0
- * @version 8.0.0
+ * @version 10.0.0
  */
 
@@ -1530 +1530 @@
         }
 
-        $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;
         }