1.5.0 - Testing FSE block template parts

webmandesign · Nov 9, 2022 · 98833d3 · 98833d3
1 parent de28c9c
commit 98833d3
Show file tree

Hide file tree

Showing 11 changed files with 93 additions and 13 deletions.
diff --git a/assets/css/editor-style-classic-rtl.css b/assets/css/editor-style-classic-rtl.css
diff --git a/assets/css/editor-style-classic.css b/assets/css/editor-style-classic.css
diff --git a/assets/css/global-rtl.css b/assets/css/global-rtl.css
diff --git a/assets/css/global.css b/assets/css/global.css
diff --git a/assets/scss/global/wp/_alignment.scss b/assets/scss/global/wp/_alignment.scss
@@ -105,7 +105,7 @@
 		margin-right: 0;
 	}
 
-	.has-background.has-background & {
+	.alignfull.has-background & {
 		width: auto;
 		margin-left: calc( -1 * var(--body_padding) );
 		margin-right: calc( -1 * var(--body_padding) );

diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,16 @@
 # Michelle Changelog
 
+## 1.5.0, 20221110
+
+### Fixed
+- WordPress 6.1 compatibility
+
+### File updates
+	changelog.md
+	readme.txt
+	style.css
+
+
 ## 1.4.0, 20221102
 
 ### Fixed

diff --git a/includes/Content/Block_Area.php b/includes/Content/Block_Area.php
@@ -6,7 +6,7 @@
  * @copyright  WebMan Design, Oliver Juhas
  *
  * @since    1.0.6
- * @version  1.3.0
+ * @version  1.5.0
  */
 
 namespace WebManDesign\Michelle\Content;
@@ -21,7 +21,8 @@ class Block_Area implements Component_Interface {
 	/**
 	 * Initialization.
 	 *
-	 * @since  1.0.6
+	 * @since    1.0.6
+	 * @version  1.5.0
 	 *
 	 * @return  void
 	 */
@@ -31,12 +32,71 @@ public static function init() {
 
 			// Actions
 
+				add_action( 'after_setup_theme', __CLASS__ . '::after_setup_theme' );
+
 				add_action( 'michelle/content/404', __CLASS__ . '::error_404' );
 
 				add_action( 'tha_footer_top', __CLASS__ . '::footer' );
 
 	} // /init
 
+	/**
+	 * After setup theme.
+	 *
+	 * @since  1.5.0
+	 *
+	 * @return  void
+	 */
+	public static function after_setup_theme() {
+
+		// Processing
+
+			add_theme_support( 'block-template-parts' );
+
+	} // /after_setup_theme
+
+	/**
+	 * Gets WordPress 6.1+ block template part content.
+	 *
+	 * This is basically WordPress' `block_template_part()` function adapted
+	 * for our purpose - to return content instead of echoing it.
+	 *
+	 * @since  1.5.0
+	 *
+	 * @param  string $part  Name of block template part found in `parts` folder.
+	 *
+	 * @return  string
+	 */
+	public static function get_template_part_content( string $part = '' ): string {
+
+		// Requirements check
+
+			if (
+				empty( $part )
+				|| ! function_exists( 'block_template_part' )
+			) {
+				return '';
+			}
+
+
+		// Variables
+
+			$template_part = get_block_template( get_stylesheet() . '//' . $part, 'wp_template_part' );
+
+			if (
+				! $template_part
+				|| empty( $template_part->content )
+			) {
+				return '';
+			}
+
+
+		// Output
+
+			return trim( (string) do_blocks( $template_part->content ) );
+
+	} // /get_template_part_content
+
 	/**
 	 * Get block area post type key.
 	 *
@@ -63,31 +123,40 @@ public static function get_post_type(): string {
 	 * Site footer content.
 	 *
 	 * @since    1.0.0
-	 * @version  1.3.0
+	 * @version  1.5.0
 	 *
 	 * @return  void
 	 */
 	public static function footer() {
 
 		// Output
 
-			get_template_part( 'templates/parts/block/area/footer' );
+			if ( ! empty( self::get_template_part_content( 'footer' ) ) ) {
+				remove_action( 'tha_footer_bottom', 'WebManDesign\Michelle\Footer\Component::site_info', 100 );
+				block_template_part( 'footer' );
+			} else {
+				get_template_part( 'templates/parts/block/area/footer' );
+			}
 
 	} // /footer
 
 	/**
 	 * Error 404 page content.
 	 *
 	 * @since    1.0.6
-	 * @version  1.3.0
+	 * @version  1.5.0
 	 *
 	 * @return  void
 	 */
 	public static function error_404() {
 
 		// Output
 
-			get_template_part( 'templates/parts/block/area/404' );
+			if ( ! empty( self::get_template_part_content( 'error-404' ) ) ) {
+				block_template_part( 'error-404' );
+			} else {
+				get_template_part( 'templates/parts/block/area/404' );
+			}
 
 	} // /error_404
 

diff --git a/parts/error-404.html b/parts/error-404.html
diff --git a/parts/footer.html b/parts/footer.html
diff --git a/readme.txt b/readme.txt
@@ -35,7 +35,7 @@ Please see `changelog.md` file.
 
 == Upgrade Notice ==
 
-= 1.4.0 =
+= 1.5.0 =
 Fixing WordPress 6.1 compatibility.
 
 

diff --git a/style.css b/style.css
@@ -3,7 +3,7 @@ Theme Name:    Michelle
 Theme URI:     https://www.webmandesign.eu/portfolio/michelle-wordpress-theme/
 Author:        WebMan Design
 Author URI:    https://www.webmandesign.eu/
-Version:       1.4.0
+Version:       1.5.0
 Text Domain:   michelle
 Domain Path:   /languages
 License:       GPL-3.0-or-later