generator-chisel 2.0.0-alpha.5 → 2.0.0-alpha.6

package/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 <!-- INSERT-NEW-ENTRIES-HERE -->
 
+## 2.0.0-alpha.6 (2024-10-07)
+
+- blocks, assets, css adjustments, breadcrumbs, bem fn ([b3460ce](https://github.com/xfiveco/generator-chisel/commit/b3460ce))
+- page title, gravity forms, responsive image, slider fixes ([619789e](https://github.com/xfiveco/generator-chisel/commit/619789e))
+
 ## 2.0.0-alpha.5 (2024-09-27)
 
 - bugs fixes, blocks mods, adjustments ([5a2b460](https://github.com/xfiveco/generator-chisel/commit/5a2b460))

package/lib/commands/create/creators/app/chisel-starter-theme/archive.php

@@ -12,24 +12,13 @@ $templates = array( 'archive.twig', 'index.twig' );
 
 $context = Timber::context();
 
-$context['title'] = 'Archive';
-if ( is_day() ) {
-	$context['title'] = 'Archive: ' . get_the_date( 'D M Y' );
-} elseif ( is_month() ) {
-	$context['title'] = 'Archive: ' . get_the_date( 'M Y' );
-} elseif ( is_year() ) {
-	$context['title'] = 'Archive: ' . get_the_date( 'Y' );
-} elseif ( is_tag() ) {
-	$context['title'] = __( 'Tag: ', 'chisel' ) . ' ' . single_tag_title( '', false );
+if ( is_tag() ) {
 	array_unshift( $templates, 'archive-' . get_queried_object()->slug . '.twig' );
 } elseif ( is_category() ) {
-	$context['title'] = __( 'Category: ', 'chisel' ) . ' ' . single_cat_title( '', false );
 	array_unshift( $templates, 'archive-' . get_queried_object()->slug . '.twig' );
 } elseif ( is_post_type_archive() ) {
-	$context['title'] = post_type_archive_title( '', false );
 	array_unshift( $templates, 'archive-' . get_post_type() . '.twig' );
 } elseif ( is_tax() ) {
-	$context['title'] = single_term_title( '', false );
 	array_unshift( $templates, 'archive-' . get_queried_object()->taxonomy . '.twig' );
 }
 

package/lib/commands/create/creators/app/chisel-starter-theme/author.php

@@ -8,11 +8,7 @@
 use Chisel\ChiselCache;
 use Timber\Timber;
 
-$author = Timber::get_user( get_queried_object_id() );
-
-$context           = Timber::context();
-$context['posts']  = Timber::get_posts();
-$context['author'] = $author;
-$context['title']  = __( 'Author: ', 'chisel' ) . $author->name;
+$context          = Timber::context();
+$context['posts'] = Timber::get_posts();
 
 Timber::render( array( 'author.twig', 'archive.twig' ), $context, ChiselCache::expiry() );

package/lib/commands/create/creators/app/chisel-starter-theme/classes/AcfBlocks.php

@@ -162,7 +162,7 @@ class AcfBlocks extends RegisterBlocks implements Instance {
 
 		// allow to use filters to manipulate the output.
 		$context = apply_filters( 'chisel_timber_acf_blocks_data', $context );
-		$context = apply_filters( 'chisel_timber_acf_blocks_data_' . $slug, $context );
+		$context = apply_filters( 'chisel_timber_acf_blocks_data_' . $block_slug, $context );
 		$context = apply_filters( 'chisel_timber_acf_blocks_data_' . $block['id'], $context );
 
 		$context['wrapper_attributes'] = get_block_wrapper_attributes(

package/lib/commands/create/creators/app/chisel-starter-theme/classes/Assets.php

@@ -16,6 +16,13 @@ class Assets implements Instance {
 	 */
 	protected $frontend_styles = array();
 
+	/**
+	 * Front-end styles to be registered and enqueued in footer.
+	 *
+	 * @var array
+	 */
+	protected $frontend_footer_styles = array();
+
 	/**
 	 * Front-end scripts to be registered and enqueued.
 	 *
@@ -177,6 +184,7 @@ class Assets implements Instance {
 		add_action( 'init', array( $this, 'register_assets' ) );
 
 		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_frontend_assets' ), 99 ); // Higher priority, overwrite plugins if needed.
+		add_action( 'wp_footer', array( $this, 'enqueue_frontend_assets_in_footer' ), 11 ); // Higher priority, overwrite plugins if needed.
 		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_assets' ), 11 );
 		add_action( 'enqueue_block_editor_assets', array( $this, 'enqueue_editor_scripts' ) );
 		add_action( 'login_enqueue_scripts', array( $this, 'enqueue_login_page_assets' ), 99 );
@@ -195,66 +203,78 @@ class Assets implements Instance {
 	 * Register assets.
 	 */
 	public function register_assets() {
-		$this->frontend_styles  = apply_filters( 'chisel_frontend_styles', $this->frontend_styles );
-		$this->frontend_scripts = apply_filters( 'chisel_frontend_scripts', $this->frontend_scripts );
-		$this->login_styles     = apply_filters( 'chisel_login_styles', $this->login_styles );
-		$this->login_scripts    = apply_filters( 'chisel_login_scripts', $this->login_scripts );
-		$this->admin_styles     = apply_filters( 'chisel_admin_styles', $this->admin_styles );
-		$this->admin_scripts    = apply_filters( 'chisel_admin_scripts', $this->admin_scripts );
-		$this->editor_styles    = apply_filters( 'chisel_editor_styles', $this->editor_styles );
-		$this->editor_scripts   = apply_filters( 'chisel_editor_scripts', $this->editor_scripts );
+		if ( ! is_admin() ) {
+			$this->frontend_styles        = apply_filters( 'chisel_frontend_styles', $this->frontend_styles );
+			$this->frontend_footer_styles = apply_filters( 'chisel_frontend_footer_styles', $this->frontend_footer_styles );
+			$this->frontend_scripts       = apply_filters( 'chisel_frontend_scripts', $this->frontend_scripts );
+			$this->login_styles           = apply_filters( 'chisel_login_styles', $this->login_styles );
+			$this->login_scripts          = apply_filters( 'chisel_login_scripts', $this->login_scripts );
+
+			if ( $this->frontend_styles ) {
+				foreach ( $this->frontend_styles as $file_name => $args ) {
+					$this->register_style( self::get_final_handle( $file_name ), $file_name, $args );
+				}
+			}
 
-		if ( $this->frontend_styles ) {
-			foreach ( $this->frontend_styles as $file_name => $args ) {
-				$this->register_style( self::get_final_handle( $file_name ), $file_name, $args );
+			if ( $this->frontend_footer_styles ) {
+				foreach ( $this->frontend_footer_styles as $file_name => $args ) {
+					$this->register_style( self::get_final_handle( $file_name ), $file_name, $args );
+				}
 			}
-		}
 
-		if ( $this->frontend_scripts ) {
-			foreach ( $this->frontend_scripts as $file_name => $args ) {
-				$this->register_script( self::get_final_handle( $file_name ), $file_name, $args );
+			if ( $this->frontend_scripts ) {
+				foreach ( $this->frontend_scripts as $file_name => $args ) {
+					$this->register_script( self::get_final_handle( $file_name ), $file_name, $args );
+				}
 			}
-		}
 
-		if ( $this->login_styles ) {
-			$login_styles_data = array();
+			if ( is_login() ) {
+				if ( $this->login_styles ) {
+					$login_styles_data = array();
 
-			foreach ( $this->login_styles as $file_name => $args ) {
-				$login_styles_data = $this->register_style( self::get_final_handle( $file_name ), $file_name, $args );
-			}
+					foreach ( $this->login_styles as $file_name => $args ) {
+						$login_styles_data = $this->register_style( self::get_final_handle( $file_name ), $file_name, $args );
+					}
 
-			if ( isset( $login_styles_data['ver'] ) ) {
-				wp_register_style( 'global-styles', false, array(), $login_styles_data['ver'] );
-			}
-		}
+					if ( isset( $login_styles_data['ver'] ) ) {
+						wp_register_style( 'global-styles', false, array(), $login_styles_data['ver'] );
+					}
+				}
 
-		if ( $this->login_scripts ) {
-			foreach ( $this->login_scripts as $file_name => $args ) {
-				$this->register_script( self::get_final_handle( $file_name ), $file_name, $args );
+				if ( $this->login_scripts ) {
+					foreach ( $this->login_scripts as $file_name => $args ) {
+						$this->register_script( self::get_final_handle( $file_name ), $file_name, $args );
+					}
+				}
 			}
-		}
-
-		if ( $this->admin_styles ) {
-			foreach ( $this->admin_styles as $file_name => $args ) {
-				$this->register_style( self::get_final_handle( $file_name ), $file_name, $args );
+		} else {
+			$this->admin_styles   = apply_filters( 'chisel_admin_styles', $this->admin_styles );
+			$this->admin_scripts  = apply_filters( 'chisel_admin_scripts', $this->admin_scripts );
+			$this->editor_styles  = apply_filters( 'chisel_editor_styles', $this->editor_styles );
+			$this->editor_scripts = apply_filters( 'chisel_editor_scripts', $this->editor_scripts );
+
+			if ( $this->admin_styles ) {
+				foreach ( $this->admin_styles as $file_name => $args ) {
+					$this->register_style( self::get_final_handle( $file_name ), $file_name, $args );
+				}
 			}
-		}
 
-		if ( $this->admin_scripts ) {
-			foreach ( $this->admin_scripts as $file_name => $args ) {
-				$this->register_script( self::get_final_handle( $file_name ), $file_name, $args );
+			if ( $this->admin_scripts ) {
+				foreach ( $this->admin_scripts as $file_name => $args ) {
+					$this->register_script( self::get_final_handle( $file_name ), $file_name, $args );
+				}
 			}
-		}
 
-		if ( $this->editor_styles ) {
-			foreach ( $this->editor_styles as $file_name => $args ) {
-				$this->register_style( self::get_final_handle( $file_name ), $file_name, $args );
+			if ( $this->editor_styles ) {
+				foreach ( $this->editor_styles as $file_name => $args ) {
+					$this->register_style( self::get_final_handle( $file_name ), $file_name, $args );
+				}
 			}
-		}
 
-		if ( $this->editor_scripts ) {
-			foreach ( $this->editor_scripts as $file_name => $args ) {
-				$this->register_script( self::get_final_handle( $file_name ), $file_name, $args );
+			if ( $this->editor_scripts ) {
+				foreach ( $this->editor_scripts as $file_name => $args ) {
+					$this->register_script( self::get_final_handle( $file_name ), $file_name, $args );
+				}
 			}
 		}
 	}
@@ -293,6 +313,27 @@ class Assets implements Instance {
 		}
 	}
 
+	/**
+	 * Enqueue front-end styles in footer, ie. Gravity Forms custom styles.
+	 */
+	public function enqueue_frontend_assets_in_footer() {
+		$this->frontend_footer_styles = apply_filters( 'chisel_pre_enqueue_frontend_footer_styles', $this->frontend_footer_styles );
+
+		if ( $this->frontend_footer_styles ) {
+			foreach ( $this->frontend_footer_styles as $handle => $args ) {
+				$enqueue_style = apply_filters( 'chisel_enqueue_frontend_footer_style', true, $handle, $args );
+				$style_handle  = self::get_final_handle( $handle );
+
+				if ( $enqueue_style && wp_style_is( $style_handle, 'registered' ) ) {
+					wp_enqueue_style( $style_handle );
+
+					// Enqueue js file for fast refresh of the css file.
+					$this->enqueue_style_js_for_dev( $handle );
+				}
+			}
+		}
+	}
+
 	/**
 	 * Enqueue admin assets.
 	 */

package/lib/commands/create/creators/app/chisel-starter-theme/classes/Blocks.php

@@ -77,6 +77,7 @@ class Blocks extends RegisterBlocks implements Instance {
 
 		add_filter( 'should_load_separate_core_block_assets', array( $this, 'should_load_separate_core_block_assets' ) );
 		add_filter( 'styles_inline_size_limit', array( $this, 'styles_inline_size_limit' ) );
+		add_filter( 'chisel_editor_scripts', array( $this, 'blocks_alignment_data' ) );
 	}
 
 	/**
@@ -215,6 +216,21 @@ class Blocks extends RegisterBlocks implements Instance {
 		return $load;
 	}
 
+	/**
+	 * Set default alignment for blocks.
+	 *
+	 * @param array $editor_scripts_data
+	 *
+	 * @return array
+	 */
+	public function blocks_alignment_data( $editor_scripts_data ) {
+		$editor_scripts_data['editor']['localize']['data']['blocksDefaultAlignment'] = array(
+			'chisel/slider' => 'full',
+		);
+
+		return $editor_scripts_data;
+	}
+
 	/**
 	 * Get block object classnames
 	 *

package/lib/commands/create/creators/app/chisel-starter-theme/classes/Components.php

@@ -86,7 +86,7 @@ class Components {
 			$logo_id = get_theme_mod( 'custom_logo', 0 );
 
 			if ( $logo_id ) {
-				self::$logo_image = Timber::get_image( $logo_id )->responsive();
+				self::$logo_image = Helpers::get_responsive_image( $logo_id );
 			}
 
 			$context['logo_image'] = self::$logo_image;
@@ -172,36 +172,73 @@ class Components {
 	}
 
 	/**
-	 * Get the page or post title html based on the acf field value.
-	 *
-	 * @param int $post_id
+	 * Get the current page title.
 	 *
 	 * @return string|html
 	 */
-	public static function get_the_title( $post_id ) {
-		$context = Timber::context();
+	public static function get_the_title() {
+		$classname   = 'c-title';
+		$the_title   = array();
+		$title_text  = '';
+		$title_class = '';
+
+		if ( self::$the_title !== null ) {
+			return self::$the_title;
+		}
 
-		if ( self::$the_title === null ) {
-			$display = Acf::get_field( 'page_title_display', $post_id ) ?: 'show';
+		if ( is_singular() ) {
+			global $post;
 
-			if ( $display === 'hide' ) {
-				self::$the_title = array();
-			} else {
-				$title   = get_the_title( $post_id );
-				$sr_only = $display === 'hide-visually' ? 'u-sr-only' : '';
+			if ( isset( $post->ID ) ) {
+				$display_title = Acf::get_field( 'page_title_display', $post->ID ) ?: 'show';
 
-				self::$the_title = array(
-					'class' => sprintf( 'c-title %s', $sr_only ),
-					'text'  => esc_html( $title ),
-				);
+				if ( $display_title !== 'hide' ) {
+					$title_text  = get_the_title( $post->ID );
+					$sr_only     = $display_title === 'hide-visually' ? 'u-sr-only' : '';
+					$title_class = sprintf( '%s %s', $classname, $sr_only );
+				}
 			}
+		} elseif ( is_home() ) {
+			$posts_page_id = absint( get_option( 'page_for_posts' ) );
+
+			if ( $posts_page_id ) {
+				$title_text = get_the_title( $posts_page_id );
+			}
+		} elseif ( is_author() ) {
+			$author     = Timber::get_user( get_queried_object_id() );
+			$title_text = __( 'Author: ', 'chisel' ) . $author->name;
+		} elseif ( is_day() ) {
+			$title_text = __( 'Date archive: ', 'chisel' ) . ' ' . get_the_date( 'D M Y' );
+		} elseif ( is_month() ) {
+			$title_text = __( 'Date archive: ', 'chisel' ) . ' ' . get_the_date( 'M Y' );
+		} elseif ( is_year() ) {
+			$title_text = __( 'Date archive: ', 'chisel' ) . ' ' . get_the_date( 'Y' );
+		} elseif ( is_tag() ) {
+			$title_text = __( 'Tag: ', 'chisel' ) . ' ' . single_tag_title( '', false );
+		} elseif ( is_category() ) {
+			$title_text = __( 'Category: ', 'chisel' ) . ' ' . single_cat_title( '', false );
+		} elseif ( is_post_type_archive() ) {
+			$title_text = post_type_archive_title( '', false );
+		} elseif ( is_tax() ) {
+			$title_text = single_term_title( '', false );
+		} elseif ( is_search() ) {
+			$title_text = __( 'Search results for: ', 'chisel' ) . ' ' . get_search_query();
+		} elseif ( is_404() ) {
+			$title_text = __( '404 - Page not found', 'chisel' );
+		}
+
+		if ( $title_text ) {
+			$the_title = array(
+				'text'  => esc_html( $title_text ),
+				'class' => $title_class ? esc_attr( $title_class ) : $classname,
+			);
 		}
 
-		$context['the_title'] = apply_filters( 'chisel_the_title', self::$the_title, $post_id );
+		self::$the_title = apply_filters( 'chisel_the_title', $the_title );
 
 		return Timber::compile(
 			'partials/the-title.twig',
-			$context,
+			array( 'the_title' => self::$the_title ),
 			ChiselCache::expiry()
 		);
 	}

package/lib/commands/create/creators/app/chisel-starter-theme/classes/CustomPostTypes.php

@@ -398,7 +398,7 @@ class CustomPostTypes implements Instance {
 			// 	'singular'      => __( 'Chisel CPT', 'chisel' ),
 			// 	'plural'        => __( 'Chisel CPTs', 'chisel' ),
 			// 	'supports'      => array( 'editor', 'thumbnail', 'excerpt' ),
-			// 	'icon'          => 'location-alt',
+			// 	'menu_icon'     => 'location-alt',
 			// 	'hierarchical'  => true,
 			// 	'public'        => true,
 			// 	'menu_position' => 20,

package/lib/commands/create/creators/app/chisel-starter-theme/classes/ExtendedPost.php

@@ -34,7 +34,7 @@ class ExtendedPost extends TimberPost {
 	 */
 	public function get_thumbnail( $size = 'medium' ) {
 		if ( ! $this->thumbnail_html ) {
-			$this->thumbnail_html = has_post_thumbnail( $this->ID ) ? Timber::get_image( get_post_thumbnail_id( $this->ID ) )->responsive( $size ) : '';
+			$this->thumbnail_html = has_post_thumbnail( $this->ID ) ? Helpers::get_responsive_image( get_post_thumbnail_id( $this->ID ), $size ) : '';
 		}
 
 		return $this->thumbnail_html;

package/lib/commands/create/creators/app/chisel-starter-theme/classes/ExtendedProduct.php

@@ -27,7 +27,7 @@ class ExtendedProduct extends TimberPost {
 	 */
 	public function get_thumbnail( $size = 'woocommerce_thumbnail' ) {
 		if ( ! $this->thumbnail_html ) {
-			$thumbnail_html = has_post_thumbnail( $this->ID ) ? Timber::get_image( get_post_thumbnail_id( $this->ID ) )->responsive( $size ) : '';
+			$thumbnail_html = has_post_thumbnail( $this->ID ) ? Helpers::get_responsive_image( get_post_thumbnail_id( $this->ID ), $size ) : '';
 
 			if ( ! $thumbnail_html ) {
 				$thumbnail_html = wc_placeholder_img( $size );

package/lib/commands/create/creators/app/chisel-starter-theme/classes/GravityForms.php

@@ -38,8 +38,8 @@ class GravityForms implements Instance {
 	 * Register filter hooks.
 	 */
 	public function filter_hooks() {
-		add_filter( 'chisel_frontend_styles', array( $this, 'register_custom_styles' ) );
-		add_filter( 'chisel_enqueue_frontend_style', array( $this, 'enqueue_custom_styles' ), 10, 3 );
+		add_filter( 'chisel_frontend_footer_styles', array( $this, 'register_custom_styles' ) );
+		add_filter( 'chisel_enqueue_frontend_footer_style', array( $this, 'enqueue_custom_styles' ), 10, 3 );
 		add_filter( 'gform_form_theme_slug', array( $this, 'default_form_styles' ), 99, 2 );
 		add_filter( 'gform_plugin_settings_fields', array( $this, 'plugin_settings_fields' ), 99 );
 	}
@@ -116,6 +116,51 @@ class GravityForms implements Instance {
 		return $fields;
 	}
 
+	/**
+	 * Get list of available Gravity Forms. Can be used in acf/load_field filter to populate the select field.
+	 *
+	 * @return array
+	 */
+	public static function forms_list() {
+		if ( ! class_exists( 'GFForms' ) ) {
+			return array();
+		}
+
+		$forms = \GFAPI::get_forms();
+
+		$list = array();
+
+		if ( $forms ) {
+			foreach ( $forms as $form ) {
+				$list[$form['id']] = $form['title'];
+			}
+		}
+
+		return $list;
+	}
+
+	/**
+	 * This function will generate the gravity form for a given id with default parameters. Use if you need to generate ajax fomr outside of blocks.
+	 *
+	 * @param int   $form_id
+	 * @param bool  $display_title
+	 * @param bool  $display_description
+	 * @param bool  $display_inactive
+	 * @param array $field_values
+	 * @param bool  $ajax
+	 * @param int   $tabindex
+	 * @param bool  $_echo
+	 *
+	 * @return mixed
+	 */
+	public static function get_contact_form( $form_id, $display_title = false, $display_description = false, $display_inactive = false, $field_values = null, $ajax = true, $tabindex = 0, $_echo = false ) {
+		if ( function_exists( 'gravity_form' ) ) {
+			return gravity_form( $form_id, $display_title, $display_description, $display_inactive, $field_values, $ajax, $tabindex, $_echo );
+		}
+
+		return null;
+	}
+
 	/**
 	 * Check if Gravity Forms plugin is active.
 	 *

package/lib/commands/create/creators/app/chisel-starter-theme/classes/Helpers.php

@@ -2,6 +2,8 @@
 
 namespace Chisel;
 
+use Timber\Timber;
+
 /**
  * Helper functions.
  *
@@ -115,6 +117,71 @@ class Helpers {
 		return get_template_directory_uri() . $image_path;
 	}
 
+	/**
+	 * Get responsive image html
+	 *
+	 * @param int    $image_id Image ID.
+	 * @param string $image_size Image size.
+	 * @param array  $attrs Image attributes.
+	 *
+	 * @return string|html
+	 */
+	public static function get_responsive_image( $image_id, $image_size = 'medium', $attrs = array() ) {
+		if ( ! $image_id ) {
+			return '';
+		}
+
+		return Timber::get_image( $image_id )->responsive( $image_size, $attrs );
+	}
+
+	/**
+	 * Generate BEM class names with modifiers
+	 *
+	 * @param string $name
+	 * @param mixed  ...$modifiers
+	 *
+	 * @return string
+	 */
+	public static function bem( $name = '', ...$modifiers ) {
+		if ( empty( $name ) || empty( $modifiers ) ) {
+			return '';
+		}
+
+		$classnames = array( $name );
+
+		foreach ( $modifiers as $key => $value ) {
+			if ( is_array( $value ) ) {
+				$values = array_map(
+					function ( $val ) use ( $name, $value ) {
+						return $name . '--' . _wp_to_kebab_case( $val . '-' . $value[ $val ] );
+					},
+					array_keys( $value )
+				);
+
+				$classnames = array_merge( $classnames, $values );
+				continue;
+			}
+
+			if ( $value === false || $value === null || $value === '' ) {
+				continue;
+			}
+
+			if ( is_string( $key ) ) {
+				$classname = $name . '--' . _wp_to_kebab_case( $key );
+
+				if ( ! is_bool( $value ) ) {
+					$classname .= '-' . _wp_to_kebab_case( $value );
+				}
+			} else {
+				$classname = $name . '--' . _wp_to_kebab_case( $value );
+			}
+
+			$classnames[] = $classname;
+		}
+
+		return implode( ' ', $classnames );
+	}
+
 	/**
 	 * Get logo data for the wp login page.
 	 *

package/lib/commands/create/creators/app/chisel-starter-theme/classes/RegisterBlocks.php

@@ -189,7 +189,8 @@ abstract class RegisterBlocks {
 									$block
 								);
 
-								if ( ! in_array( $script, $ignore_scripts, true ) ) {
+								// Register ignored scripts in dev mode in order to watch changes.
+								if ( Assets::is_fast_refresh() || ( ! Assets::is_fast_refresh() && ! in_array( $script, $ignore_scripts, true ) ) ) {
 									wp_register_script(
 										$block_handle,
 										$file_url,

package/lib/commands/create/creators/app/chisel-starter-theme/classes/Site.php

@@ -40,7 +40,6 @@ class Site extends TimberSite implements Instance {
 	 */
 	public function filter_hooks() {
 		add_filter( 'timber/context', array( $this, 'add_to_context' ) );
-		add_filter( 'timber/context', array( $this, 'set_page_title' ) );
 		add_filter( 'timber/post/classmap', array( $this, 'post_classmap' ) );
 		add_filter( 'timber/term/classmap', array( $this, 'term_classmap' ) );
 	}
@@ -56,23 +55,7 @@ class Site extends TimberSite implements Instance {
 		$context['menus']           = Components::get_menus();
 		$context['sidebar']         = Components::get_sidebar();
 		$context['footer_sidebars'] = Components::get_footer_sidebars();
-
-		return $context;
-	}
-
-	/**
-	 * Set the page / post title
-	 *
-	 * @param array $context The context.
-	 *
-	 * @return array
-	 */
-	public function set_page_title( $context ) {
-		global $post;
-
-		if ( isset( $post->post_type ) ) {
-			$context['the_title'] = Components::get_the_title( $post->ID );
-		}
+		$context['the_title']       = Components::get_the_title();
 
 		return $context;
 	}

package/lib/commands/create/creators/app/chisel-starter-theme/classes/Theme.php

@@ -47,11 +47,10 @@ class Theme implements Instance {
 	 * Register action hooks.
 	 */
 	public function action_hooks() {
-		add_action( 'after_setup_theme', array( $this, 'theme_supports' ) );
+		add_action( 'init', array( $this, 'theme_supports' ), 11 );
 		add_action( 'after_setup_theme', array( $this, 'remove_post_supports' ), 99 );
 		add_action( 'init', array( $this, 'register_nav_menus' ) );
 		add_action( 'after_setup_theme', array( $this, 'i18n' ) );
-		add_action( 'wp_head', array( $this, 'set_scrollbar_width_for_css' ) );
 	}
 
 	/**
@@ -145,24 +144,6 @@ class Theme implements Instance {
 		);
 	}
 
-	/**
-	 * Calculate scrollbar width and set it as a CSS variable.
-	 */
-	public function set_scrollbar_width_for_css() {
-		?>
-		<script>
-			function getScrollbarWidth() {
-				return window.innerWidth - document.documentElement.clientWidth;
-			}
-
-			setTimeout(() => {
-				const scrollbarWidth = getScrollbarWidth();
-				document.documentElement.style.setProperty('--scrollbar-width', `${scrollbarWidth}px`);
-			}, 10);
-		</script>
-		<?php
-	}
-
 	/**
 	 * Add custom classes to the body tag.
 	 *

package/lib/commands/create/creators/app/chisel-starter-theme/classes/Twig.php

@@ -65,6 +65,8 @@ class Twig implements Instance {
 		$this->register_function( $twig, 'slider_prepare_params', array( $this, 'slider_prepare_params' ) );
 		$this->register_function( $twig, 'get_responsive_image', array( $this, 'get_responsive_image' ) );
 		$this->register_function( $twig, 'comments_template', array( $this, 'comments_template' ) );
+		$this->register_function( $twig, 'bem', array( $this, 'bem' ) );
+		$this->register_function( $twig, 'breadcrumbs', array( $this, 'breadcrumbs' ) );
 
 		return $twig;
 	}
@@ -106,6 +108,36 @@ class Twig implements Instance {
 		return $twig;
 	}
 
+	/**
+	 * Register a Twig filter.
+	 *
+	 * @param   \Twig_Environment $twig The Twig environment.
+	 * @param   string            $name The name of the function.
+	 * @param   callable          $callback The callback function.
+	 *
+	 * @return \Twig_Environment
+	 */
+	protected function register_filter( $twig, $name, $callback ) {
+		$twig->addFilter( new \Twig\TwigFilter( $name, $callback ) );
+
+		return $twig;
+	}
+
+	/**
+	 * Register a Twig test.
+	 *
+	 * @param   \Twig_Environment $twig The Twig environment.
+	 * @param   string            $name The name of the function.
+	 * @param   callable          $callback The callback function.
+	 *
+	 * @return \Twig_Environment
+	 */
+	protected function register_test( $twig, $name, $callback ) {
+		$twig->addTest( new \Twig\TwigTest( $name, $callback ) );
+
+		return $twig;
+	}
+
 	/**
 	 * Get the navigation menu.
 	 *
@@ -220,11 +252,12 @@ class Twig implements Instance {
 	 *
 	 * @param int    $image_id Image ID.
 	 * @param string $image_size Image size.
+	 * @param array  $attrs Image attributes.
 	 *
-	 * @return string
+	 * @return string|html
 	 */
-	public function get_responsive_image( $image_id, $image_size ) {
-		return Timber::get_image( $image_id )->responsive( $image_size );
+	public function get_responsive_image( $image_id, $image_size = 'medium', $attrs = array() ) {
+		return Helpers::get_responsive_image( $image_id, $image_size, $attrs );
 	}
 
 	/**
@@ -234,6 +267,27 @@ class Twig implements Instance {
 		return Comments::comments_template();
 	}
 
+	/**
+	 * Generate BEM class names with modifiers
+	 *
+	 * @param string $name
+	 * @param mixed  ...$modifiers
+	 *
+	 * @return string
+	 */
+	public function bem( $name = '', ...$modifiers ) {
+		return Helpers::bem( $name, ...$modifiers );
+	}
+
+	/**
+	 * Display breadcrumbs. Requires Yoast plugin.
+	 *
+	 * @return html
+	 */
+	public function breadcrumbs() {
+		return Yoast::breadcrumbs();
+	}
+
 	/**
 	 * Get the instance of the class.
 	 */

package/lib/commands/create/creators/app/chisel-starter-theme/classes/Yoast.php

@@ -37,6 +37,23 @@ class Yoast implements Instance {
 	 */
 	public function filter_hooks() {}
 
+	/**
+	 * Display breadcrumbs.
+	 *
+	 * @return html
+	 */
+	public static function breadcrumbs() {
+		if ( ! self::is_yoast_active() ) {
+			return '';
+		}
+
+		if ( is_front_page() ) {
+			return '';
+		}
+
+		return yoast_breadcrumb( '<div class="c-breadcrumbs">', '</div>', false );
+	}
+
 	/**
 	 * Check if Gravity Forms plugin is active.
 	 *

package/lib/commands/create/creators/app/chisel-starter-theme/index.php

@@ -16,7 +16,6 @@ $context   = Timber::context();
 $templates = array( 'index.twig' );
 
 if ( is_home() ) {
-	$context['title'] = get_the_title();
 	array_unshift( $templates, 'home.twig' );
 }
 

package/lib/commands/create/creators/app/chisel-starter-theme/search.php

@@ -10,6 +10,5 @@ use Timber\Timber;
 
 $context          = Timber::context();
 $context['posts'] = Timber::get_posts();
-$context['title'] = __( 'Search results for: ', 'chisel' ) . get_search_query();
 
 Timber::render( array( 'search.twig', 'archive.twig', 'index.twig' ), $context, ChiselCache::expiry() );

package/lib/commands/create/creators/app/chisel-starter-theme/src/blocks-acf/slider/acf-json/group_66462c70b851f.json

@@ -39,7 +39,7 @@
       "min": 0,
       "max": 0,
       "collapsed": "",
-      "button_label": "Add Row",
+      "button_label": "Add a new slide",
       "rows_per_page": 20,
       "sub_fields": [
         {

package/lib/commands/create/creators/app/chisel-starter-theme/src/blocks-acf/slider/block.json

@@ -3,7 +3,7 @@
   "title": "Slider",
   "description": "Images slider",
   "category": "chisel-blocks",
-  "icon": "carrot",
+  "icon": "slides",
   "apiVersion": 3,
   "keywords": ["slider", "carousel", "images"],
   "textdomain": "chisel",

package/lib/commands/create/creators/app/chisel-starter-theme/src/blocks-acf/slider/slider.twig

@@ -21,6 +21,8 @@
           block_settings: fields.slider_options
         }
       } %}
+    {% else %}
+      {% include 'partials/block-edit-button.twig' with { 'block_name': 'slider' } %}
     {% endif %}
   </div>
 </div>

package/lib/commands/create/creators/app/chisel-starter-theme/src/design/tools/_icon.scss

@@ -1,5 +1,11 @@
-@mixin get-icon($name, $extension: 'svg') {
-  mask: url('../../assets/icons/#{$name}.#{$extension}');
+@mixin get-icon($name, $extension: 'svg', $is-block: false) {
+  $path: '../../';
+
+  @if $is-block {
+    $path: '../../../';
+  }
+
+  mask: url('#{$path}assets/icons/#{$name}.#{$extension}');
   mask-repeat: no-repeat;
   mask-size: contain;
 }

package/lib/commands/create/creators/app/chisel-starter-theme/src/design/tools/_media.scss

@@ -4,3 +4,18 @@
   object-fit: cover;
   object-position: $position;
 }
+
+@mixin background-image($name, $extension: 'svg', $is-block: false, $is-icon: false) {
+  $path: '../../';
+  $folder: 'images';
+
+  @if $is-block {
+    $path: '../../../';
+  }
+
+  @if $is-icon {
+    $folder: 'icons';
+  }
+
+  background-image: url('#{$path}assets/#{$folder}/#{$name}.#{$extension}');
+}

package/lib/commands/create/creators/app/chisel-starter-theme/src/scripts/app.js

@@ -1,7 +1,9 @@
+import scrollbarWidth from './modules/scrollbar-width';
 import MainNav from './modules/main-nav';
 import LoadMore from './modules/load-more';
 import Slider from './modules/slider';
 
+scrollbarWidth();
 new MainNav();
 new LoadMore();
 Slider();

package/lib/commands/create/creators/app/chisel-starter-theme/src/scripts/editor/blocks-mods.js

@@ -1,2 +1,3 @@
 import './mods/core-button';
 import './mods/core-spacer';
+import './mods/blocks-alignment';

package/lib/commands/create/creators/app/chisel-starter-theme/src/scripts/editor/mods/blocks-alignment.js

@@ -0,0 +1,26 @@
+/* global chiselEditorScripts */
+
+import { addFilter } from '@wordpress/hooks';
+import { createHigherOrderComponent } from '@wordpress/compose';
+import { useEffect } from '@wordpress/element';
+
+const chiselBlocksDefaultAlignment = createHigherOrderComponent((BlockEdit) => {
+  return (props) => {
+    const { setAttributes, isSelected, name } = props;
+
+    useEffect(() => {
+      if (isSelected) {
+        const alignment = chiselEditorScripts?.blocksDefaultAlignment?.[name];
+
+        if (alignment) {
+          setAttributes({
+            align: alignment,
+          });
+        }
+      }
+    }, []);
+
+    return <BlockEdit {...props} />;
+  };
+}, 'coreButtonCustomControls');
+addFilter('editor.BlockEdit', 'chisel/button-block', chiselBlocksDefaultAlignment);

package/lib/commands/create/creators/app/chisel-starter-theme/src/scripts/editor/mods/core-button.js

@@ -1,8 +1,8 @@
 import { __ } from '@wordpress/i18n';
 import { addFilter } from '@wordpress/hooks';
 import { createHigherOrderComponent } from '@wordpress/compose';
-import { Fragment } from '@wordpress/element';
-import { PanelBody, SelectControl } from '@wordpress/components';
+import { Fragment, useEffect } from '@wordpress/element';
+import { PanelBody, SelectControl, ToggleControl } from '@wordpress/components';
 import { InspectorControls } from '@wordpress/blockEditor';
 import Utils from '../utils';
 
@@ -35,6 +35,10 @@ const chiselButtonBlockAttributes = (settings, name) => {
           type: 'string',
           default: '',
         },
+        buttonIconPosition: {
+          type: 'boolean',
+          default: false,
+        },
       }),
     });
   }
@@ -45,15 +49,47 @@ addFilter('blocks.registerBlockType', 'chisel/button-block', chiselButtonBlockAt
 
 const chiselButtonCustomControls = createHigherOrderComponent((BlockEdit) => {
   return (props) => {
-    const { attributes, setAttributes, isSelected } = props;
+    const { attributes, setAttributes, isSelected, name } = props;
+
+    if (name !== blockName) {
+      return <BlockEdit {...props} />;
+    }
+
+    let {
+      buttonSize = '',
+      className = '',
+      buttonIcon = '',
+      buttonIconPosition = false,
+    } = attributes;
+
+    useEffect(() => {
+      if (isSelected && className !== '') {
+        const attrs = {};
+        const size = className.match(/is-size-(\w*)/);
+        const icon = className.match(/has-icon-(\w*)/);
+        const iconLeft = className.match('has-icon-left');
 
-    let { buttonSize = '', className = '', buttonIcon = '' } = attributes;
+        if (icon.length) {
+          attrs.buttonIcon = icon[1];
+        }
+
+        if (size.length) {
+          attrs.buttonSize = size[1];
+        }
+
+        if (iconLeft) {
+          attrs.buttonIconPosition = true;
+        }
+
+        setAttributes(attrs);
+      }
+    }, []);
 
     return (
       <Fragment>
         <BlockEdit {...props} />
 
-        {isSelected && props.name === blockName && (
+        {isSelected && (
           <InspectorControls>
             <PanelBody title={__('Button Size', 'lps')}>
               <SelectControl
@@ -94,6 +130,25 @@ const chiselButtonCustomControls = createHigherOrderComponent((BlockEdit) => {
                 }}
               />
             </PanelBody>
+            <PanelBody title={__('Icon Position', 'lps')}>
+              <ToggleControl
+                label={__('Icon on the left', 'chisel')}
+                help={__('By default icons are on the right', 'chisel')}
+                checked={!!buttonIconPosition}
+                onChange={(isLeft) => {
+                  className = className.replace('has-icon-left', '').trim();
+
+                  if (isLeft) {
+                    className += ' has-icon-left';
+                  }
+
+                  setAttributes({
+                    buttonIconPosition: isLeft,
+                    className,
+                  });
+                }}
+              />
+            </PanelBody>
           </InspectorControls>
         )}
       </Fragment>

package/lib/commands/create/creators/app/chisel-starter-theme/src/scripts/modules/scrollbar-width.js

@@ -0,0 +1,8 @@
+const scrollbarWidth = () => {
+  setTimeout(() => {
+    const width = window.innerWidth - document.documentElement.clientWidth;
+    document.documentElement.style.setProperty('--scrollbar-width', `${width}px`);
+  }, 10);
+};
+
+export default scrollbarWidth;

package/lib/commands/create/creators/app/chisel-starter-theme/src/scripts/modules/slider.js

@@ -180,7 +180,12 @@ class Slider {
   /*
    * Set default slider params. This params will only apply to default slider type.
    */
-  defaultSliderParams() {}
+  defaultSliderParams() {
+    this.params = {
+      ...this.params,
+      spaceBetween: 0,
+    };
+  }
 
   /*
    * Create and initialize arrows navigation.

package/lib/commands/create/creators/app/chisel-starter-theme/src/styles/blocks/_core-button.scss

@@ -90,18 +90,37 @@ $_buttons-icons: settings.$buttons-icons;
     @include button-icon;
 
     .wp-block-button__link {
-      &::after {
+      &::after,
+      &::before {
+        display: block;
         width: px-rem(24);
         height: px-rem(24);
         margin-left: px-rem(8);
         content: '';
       }
+
+      &::before {
+        display: none;
+      }
+    }
+
+    &.has-icon-left .wp-block-button__link {
+      &::before {
+        display: block;
+        margin-right: px-rem(8);
+        margin-left: 0;
+      }
+
+      &::after {
+        display: none;
+      }
     }
   }
 
   @each $button-icon in $_buttons-icons {
     &.has-icon-#{$button-icon} .wp-block-button__link {
-      &::after {
+      &::after,
+      &::before {
         @include get-icon($button-icon);
       }
     }

package/lib/commands/create/creators/app/chisel-starter-theme/src/styles/components/_buttons.scss

@@ -87,17 +87,36 @@ $_buttons-icons: settings.$buttons-icons;
 .c-btn.has-icon {
   @include button-icon;
 
-  &::after {
+  &::after,
+  &::before {
+    display: block;
     width: px-rem(24);
     height: px-rem(24);
     margin-left: px-rem(8);
     content: '';
   }
+
+  &::before {
+    display: none;
+  }
+
+  &.has-icon-left {
+    &::before {
+      display: block;
+      margin-right: px-rem(8);
+      margin-left: 0;
+    }
+
+    &::after {
+      display: none;
+    }
+  }
 }
 
 @each $button-icon in $_buttons-icons {
   .c-btn.has-icon-#{$button-icon} {
-    &::after {
+    &::after,
+    &::before {
       @include get-icon($button-icon);
     }
   }

package/lib/commands/create/creators/app/chisel-starter-theme/src/styles/components/_slider.scss

@@ -14,6 +14,7 @@
 
   img {
     @include object-fit-cover;
+    aspect-ratio: 16 / 9;
   }
 }
 
@@ -29,6 +30,9 @@
   transform: translateY(-50%);
 
   .swiper-button {
+    top: 50%;
+    transform: translateY(-50%);
+    margin: 0;
     width: px-rem(48);
     height: px-rem(48);
     appearance: none;
@@ -73,10 +77,19 @@
   border-radius: get-border-radius('tiny');
   transition: get-transition('normal');
   transform: translateX(-50%);
+  line-height: 1;
+  font-size: 0;
 
   &:hover {
     background-color: rgba(255, 255, 255, 100%);
   }
+
+  .swiper-pagination-bullet {
+    width: px-rem(10);
+    height: px-rem(10);
+    background-color: get-color('primary');
+    opacity: 0.3;
+  }
 }
 
 .swiper-pagination.swiper-pagination-horizontal {
@@ -85,13 +98,6 @@
   transform: none !important;
 }
 
-.swiper-pagination-bullet {
-  width: px-rem(10);
-  height: px-rem(10);
-  background-color: get-color('primary');
-  opacity: 0.3;
-}
-
 .swiper-pagination-bullet-active-main,
 .swiper-pagination:not(.swiper-pagination-dots-dynamic) .swiper-pagination-bullet-active {
   background-color: get-color('secondary');

package/lib/commands/create/creators/app/chisel-starter-theme/src/styles/vendor/_breadcrumbs.scss

@@ -0,0 +1,16 @@
+@use '~design' as *;
+@use '../../design/settings/' as *;
+
+.c-breadcrumbs {
+  position: relative;
+  max-width: $full-width;
+  margin-inline: auto;
+  font-size: get-font-size('small');
+
+  span {
+    span {
+      display: inline-block;
+      margin-inline: px-rem(8);
+    }
+  }
+}

package/lib/commands/create/creators/app/chisel-starter-theme/src/styles/wp-editor/_swiper-sliders.scss

@@ -1,6 +1,6 @@
-@use '../components//slider';
+@use '../components/slider';
 
-.o-block {
+.b-slider {
   .swiper {
     opacity: 1;
     transition: get-transition('slow');
@@ -9,4 +9,13 @@
   .swiper-wrapper {
     display: flex;
   }
+
+  .swiper-slide {
+    width: 100%;
+    flex: 1 0 100%;
+
+    &:nth-child(n+2) {
+      display: none;
+    }
+  }
 }

package/lib/commands/create/creators/app/chisel-starter-theme/views/404.twig

@@ -1,7 +1,6 @@
 {% extends "single.twig" %}
 
 {% block inner_content %}
-  <h1>{{ __('404 - Not found', 'chisel') }}</h1>
-  <h2>{{ __('Sorry, we couldn\'t find what you\'re looking for', 'chisel') }}</h2>
+  <h2>{{ __('Sorry, we couldn\'t find what you\'re looking for.', 'chisel') }}</h2>
 {% endblock %}
 

package/lib/commands/create/creators/app/chisel-starter-theme/views/base.twig

@@ -28,6 +28,10 @@
   {% endblock %}
 
   <main id="main" class="o-wrapper">
+    {% block breadcrumbs %}
+      {{ breadcrumbs() }}
+    {% endblock %}
+
     {% block content %}
     {% endblock %}
   </main>

package/lib/commands/create/creators/app/chisel-starter-theme/views/index.twig

@@ -2,9 +2,7 @@
 
 {% block content %}
   <section class="o-wrapper__inner c-blog">
-    {% if title %}
-      <h1>{{ title }}</h1>
-    {% endif %}
+    {{ the_title }}
 
     {% block before_loop %}
     {% endblock %}
@@ -17,7 +15,7 @@
               {% include "components/post-item.twig" with {post: post} %}
             {% endfor %}
           {% else %}
-            <h2>{{ __('No results found', 'chisel') }}</h2>
+            <h2>{{ __('No posts found', 'chisel') }}</h2>
           {% endif %}
         </div>
 

package/lib/commands/create/creators/app/chisel-starter-theme/views/partials/block-edit-button.twig

@@ -0,0 +1,3 @@
+{% if fn('is_admin') %}
+  <button type="button" aria-disabled="false" class="components-button is-secondary is-compact">{{ __('Edit', 'chisel') }} {{ block_name }} {{ __('block', 'chisel') }}</button>
+{% endif %}

package/lib/commands/create/creators/app/chisel-starter-theme/views/partials/the-title.twig

@@ -1 +1,3 @@
-<h1 class="{{ the_title.class }}">{{ the_title.text }}</h1>
+{% if the_title %}
+  <h1 class="{{ the_title.class }}">{{ the_title.text }}</h1>
+{% endif %}

package/lib/commands/create/packages-versions.js

@@ -1,5 +1,5 @@
 module.exports = {
-  'chisel-scripts': '2.0.0-alpha.1',
+  'chisel-scripts': '2.0.0-alpha.2',
   'chisel-shared-utils': '2.0.0-alpha.0',
-  'generator-chisel': '2.0.0-alpha.5',
+  'generator-chisel': '2.0.0-alpha.6',
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-chisel",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.6",
   "description": "A generator for scaffolding front-end and WordPress projects",
   "bin": {
     "chisel": "bin/chisel.js"
@@ -37,5 +37,5 @@
     "tinyqueue": "^2.0.3",
     "update-notifier": "^4.1.0"
   },
-  "gitHead": "f8767b71f2178288d9e37e3a44491b054e2a08ca"
+  "gitHead": "3e570080e27006edf6ae11791aa5e70c5622bf91"
 }

package/lib/commands/create/creators/app/chisel-starter-theme/views/components/page-title.twig

@@ -1,5 +0,0 @@
-{% if title %}
-  <header class="c-page-title">
-    <h1 class="c-page-title__title">{{ title }}</h1>
-  </header>
-{% endif %}