generator-chisel 2.2.0 → 2.2.1

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 <!-- INSERT-NEW-ENTRIES-HERE -->
 
+## <small>2.2.1 (2025-11-05)</small>
+
+- fixes and defaults adjustments, improvements ([8d0ceca](https://github.com/xfiveco/generator-chisel/commit/8d0ceca))
+- responsive image and get_thumbnail adjustments ([1d5366f](https://github.com/xfiveco/generator-chisel/commit/1d5366f))
+- update theme version ([8f1b860](https://github.com/xfiveco/generator-chisel/commit/8f1b860))
+
 ## 2.2.0 (2025-10-22)
 
 - composer update, min req php 8.2, refactor to modern php ([d55aae0](https://github.com/xfiveco/generator-chisel/commit/d55aae0))

package/README.md

@@ -2,17 +2,7 @@
 
 [![npm](https://img.shields.io/npm/v/generator-chisel)](https://www.npmjs.com/package/generator-chisel)
 
-Chisel is a development framework for creating easy to maintain and fast WordPress websites and front-end templates.
-
-## Learn more
-- [Introduction](https://www.getchisel.co/)
-- [Documentation](https://www.getchisel.co/docs/)
-  - [Installation](https://www.getchisel.co/docs/installation/)
-  - [Project Setup](https://www.getchisel.co/docs/setup/)
-  - [Project Structure](https://www.getchisel.co/docs/structure/)
-  - [Development](https://www.getchisel.co/docs/development/)
-  - [In Simple Terms](https://www.getchisel.co/docs/simple/)
-- [Tutorials](https://www.getchisel.co/tutorials/)
+Chisel is a development framework for creating easy to maintain and fast WordPress websites.
 
 ## License
 Chisel is licensed under [MIT License](LICENSE).

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

@@ -74,7 +74,7 @@ final class BlocksHelpers {
 		$context['post_id']    = $post_id;
 		$context['slug']       = $slug;
 		$context['is_preview'] = $is_preview;
-		$context['fields']     = function_exists( 'get_fields' ) ? get_fields() : array();
+		$context['fields']     = function_exists( 'get_fields' ) ? get_fields( $block['id'] ) : array();
 		$classes               = array_merge(
 			array( $slug ),
 			isset( $block['className'] ) ? array( $block['className'] ) : array(),

package/lib/commands/create/creators/app/chisel-starter-theme/inc/Traits/PageBlocks.php

@@ -2,6 +2,8 @@
 
 namespace Chisel\Traits;
 
+use Timber\Timber;
+
 trait PageBlocks {
 	/**
 	 * Content blocks from current page
@@ -26,8 +28,18 @@ trait PageBlocks {
 
 		$content_blocks_names = array();
 
-		if ( $post instanceof \WP_Post && ! empty( $post->post_content ) && has_blocks( $post->post_content ) ) {
-			$blocks = parse_blocks( $post->post_content );
+		if ( $post instanceof \WP_Post ) {
+			$content = $post->post_content . $this->get_sidebar_content();
+
+			if ( empty( $content ) ) {
+				return $content_blocks_names;
+			}
+
+			if ( ! has_blocks( $content ) ) {
+				return $content_blocks_names;
+			}
+
+			$blocks = parse_blocks( $content );
 
 			if ( is_array( $blocks ) && ! empty( $blocks ) ) {
 				$blocks_names = $this->get_blocks_names( $blocks );
@@ -36,7 +48,7 @@ trait PageBlocks {
 					$blocks_names = array_filter(
 						$blocks_names,
 						function ( string $block_name ) use ( $prefix ): bool {
-							return (bool) strpos( $block_name, $prefix ) !== false;
+							return strpos( $block_name, $prefix ) !== false;
 						}
 					);
 
@@ -89,4 +101,45 @@ trait PageBlocks {
 
 		return $blocks_names;
 	}
+
+	/**
+	 * Get currently active sidebar content in order to parse its blocks.
+	 *
+	 * @return string
+	 */
+	private function get_sidebar_content(): string {
+		$context = Timber::context();
+		$sidebar = $context['sidebar'];
+		$content = '';
+
+		if ( $sidebar ) {
+			$sidebars_widgets = get_option( 'sidebars_widgets', array() );
+
+			if ( ! isset( $sidebars_widgets[ $sidebar['name'] ] ) ) {
+				return '';
+			}
+
+			$sidebar_widgets = $sidebars_widgets[ $sidebar['name'] ];
+
+			if ( empty( $sidebar_widgets ) ) {
+				return '';
+			}
+
+			$sidebars_blocks = get_option( 'widget_block', array() );
+
+			if ( empty( $sidebars_blocks ) ) {
+				return '';
+			}
+
+			foreach ( $sidebar_widgets as $widget_id ) {
+				$block_index = str_replace( 'block-', '', $widget_id );
+
+				if ( isset( $sidebars_blocks[ $block_index ] ) ) {
+					$content .= $sidebars_blocks[ $block_index ]['content'];
+				}
+			}
+		}
+
+		return $content;
+	}
 }

package/lib/commands/create/creators/app/chisel-starter-theme/inc/WP/ChiselImage.php

@@ -20,6 +20,10 @@ class ChiselImage extends TimberImage {
 	 * @return string The responsive <img> HTML.
 	 */
 	public function responsive( string $size = 'medium', array $attrs = array() ): string {
+		if ( isset( $attrs['class'] ) ) {
+			$attrs['class'] .= sprintf( ' wp-image-%s size-%s', absint( $this->ID ), esc_attr( $size ) );
+		}
+
 		return wp_get_attachment_image( $this->ID, $size, false, $attrs );
 	}
 }

package/lib/commands/create/creators/app/chisel-starter-theme/inc/WP/ChiselPost.php

@@ -24,16 +24,17 @@ class ChiselPost extends TimberPost {
 	 * Get the post thumbnail. Returns the thumbnail responsive image html.
 	 *
 	 * @param string $size Thumbnail size.
+	 * @param array  $attrs Image attributes.
 	 *
 	 * @return string Responsive <img> HTML, or empty string.
 	 */
-	public function get_thumbnail( string $size = 'medium' ): string {
+	public function get_thumbnail( string $size = 'medium', array $attrs = array() ): string {
 		if ( $this->thumbnail_html === null ) {
 			$this->thumbnail_html = '';
 
 			if ( has_post_thumbnail( $this->ID ) ) {
 				$thumbnail_id         = get_post_thumbnail_id( $this->ID );
-				$this->thumbnail_html = ImageHelpers::get_responsive_image( $thumbnail_id, $size );
+				$this->thumbnail_html = ImageHelpers::get_responsive_image( $thumbnail_id, $size, $attrs );
 			}
 		}
 

package/lib/commands/create/creators/app/chisel-starter-theme/inc/WP/ChiselProduct.php

@@ -31,16 +31,17 @@ class ChiselProduct extends TimberPost {
 	 * Get the product thumbnail. Returns the thumbnail responsive image html.
 	 *
 	 * @param string $size Thumbnail size.
+	 * @param array  $attrs Image attributes.
 	 *
 	 * @return string Responsive <img> HTML, or empty string.
 	 */
-	public function get_thumbnail( string $size = 'woocommerce_thumbnail' ): string {
+	public function get_thumbnail( string $size = 'woocommerce_thumbnail', array $attrs = array() ): string {
 		$size = apply_filters( 'single_product_archive_thumbnail_size', $size );
 
 		if ( $this->thumbnail_html === null ) {
 			$thumbnail_id = $this->get_thumbnail_id();
 
-			$this->thumbnail_html = $thumbnail_id ? ImageHelpers::get_responsive_image( $thumbnail_id, $size ) : '';
+			$this->thumbnail_html = $thumbnail_id ? ImageHelpers::get_responsive_image( $thumbnail_id, $size, $attrs ) : '';
 		}
 
 		return $this->thumbnail_html;

package/lib/commands/create/creators/app/chisel-starter-theme/inc/WP/ChiselProductCategory.php

@@ -30,16 +30,17 @@ class ChiselProductCategory extends TimberTerm {
 	 * Get the product thumbnail. Returns the thumbnail responsive image html.
 	 *
 	 * @param string $size Thumbnail size.
+	 * @param array  $attrs Image attributes.
 	 *
 	 * @return string Responsive <img> HTML, or empty string.
 	 */
-	public function get_thumbnail( string $size = 'woocommerce_thumbnail' ) {
+	public function get_thumbnail( string $size = 'woocommerce_thumbnail', array $attrs = array() ): string {
 		$size = apply_filters( 'subcategory_archive_thumbnail_size', $size );
 
 		if ( $this->thumbnail_html === null ) {
 			$thumbnail_id = $this->get_thumbnail_id();
 
-			$this->thumbnail_html = $thumbnail_id ? ImageHelpers::get_responsive_image( $thumbnail_id, $size ) : '';
+			$this->thumbnail_html = $thumbnail_id ? ImageHelpers::get_responsive_image( $thumbnail_id, $size, $attrs ) : '';
 		}
 
 		return $this->thumbnail_html;

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

@@ -31,9 +31,9 @@ final class Components {
 	/**
 	 * The sidebar widgets.
 	 *
-	 * @var string
+	 * @var array
 	 */
-	private static string $sidebar = '';
+	private static array $sidebar = array();
 
 	/**
 	 * The footer sidebars.
@@ -102,22 +102,36 @@ final class Components {
 	 *
 	 * @param string $sidebar_id The sidebar id.
 	 *
-	 * @return string
+	 * @return ?array
 	 */
-	public static function get_sidebar( string $sidebar_id = '' ): string {
-		if ( self::$sidebar !== '' ) {
-			return self::$sidebar;
-		}
+	public static function get_sidebar( string $sidebar_id = '' ): ?array {
+		$sidebar_name = null;
 
 		if ( $sidebar_id ) {
-			self::$sidebar = Timber::get_widgets( 'chisel-sidebar-' . $sidebar_id );
+			$sidebar_name = 'chisel-sidebar-' . $sidebar_id;
 		} elseif ( is_singular( 'post' ) ) {
-			self::$sidebar = Timber::get_widgets( 'chisel-sidebar-blog' );
+			$sidebar_name = 'chisel-sidebar-blog';
 		} elseif ( function_exists( 'is_shop' ) && is_shop() ) {
-			self::$sidebar = Timber::get_widgets( 'chisel-sidebar-woocommerce' );
+			$sidebar_name = 'chisel-sidebar-woocommerce';
+		}
+
+		if ( ! $sidebar_name ) {
+			return null;
 		}
 
-		return (string) self::$sidebar;
+		if ( isset( self::$sidebar[ $sidebar_name ] ) ) {
+			return self::$sidebar[ $sidebar_name ];
+		}
+
+		$sidebar_content = Timber::get_widgets( $sidebar_name );
+
+		self::$sidebar[ $sidebar_name ] = array(
+			'id'      => $sidebar_id,
+			'name'    => $sidebar_name,
+			'content' => $sidebar_content,
+		);
+
+		return self::$sidebar[ $sidebar_name ];
 	}
 
 	/**

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

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

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

@@ -60,6 +60,7 @@ final class Site extends TimberSite implements InstanceInterface, HooksInterface
 		$context['logo']            = Components::get_logo();
 		$context['menus']           = Components::get_menus();
 		$context['sidebar']         = Components::get_sidebar();
+		$context['copyright']       = Components::get_sidebar( 'copyright' );
 		$context['footer_sidebars'] = Components::get_footer_sidebars();
 		$context['the_title']       = Components::get_the_title();
 

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

@@ -156,9 +156,9 @@ final class Twig implements InstanceInterface, HooksInterface {
 	 * Get the navigation menu.
 	 *
 	 * @param string $menu_name The menu name.
-	 * @return string
+	 * @return mixed - The menu object or empty string
 	 */
-	public function get_nav_menu( string $menu_name ): string {
+	public function get_nav_menu( string $menu_name ): mixed {
 		$context = Timber::context();
 
 		return $context['menus'][$menu_name] ?? '';

package/lib/commands/create/creators/app/chisel-starter-theme/src/blocks/accordion/style.scss

@@ -23,7 +23,7 @@
   margin: get-margin('small') 0;
   overflow: hidden;
   background-color: get-color('white');
-  border: 1px solid get-color('light-grey');
+  border: 1px solid get-color('grey-100');
   border-radius: get-border-radius('small');
 }
 
@@ -33,7 +33,7 @@
   justify-content: space-between;
   padding: get-padding('small');
   cursor: pointer;
-  background-color: get-color('light-grey');
+  background-color: get-color('grey-100');
 }
 
 .b-accordion__item-title {

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

@@ -10,7 +10,7 @@
   "acf": {
     "mode": "preview",
     "usePostMeta": false,
-    "renderCallback": "\\Chisel\\Helper\\BlocksHelpers::acf_block_render"
+    "renderCallback": "\\Chisel\\Helpers\\BlocksHelpers::acf_block_render"
   },
   "supports": {
     "anchor": true,

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

@@ -1,19 +1,20 @@
 @use 'theme' as *;
 @use 'icon' as *;
 @use 'px-to-rem' as *;
+@use 'colors' as *;
 
 @mixin button() {
   box-sizing: border-box;
   display: inline-flex;
   align-items: center;
-  padding: get-padding('small') get-padding('medium');
+  padding: px-rem(14) px-rem(24);
   font-size: get-font-size('normal');
   font-weight: 400;
-  line-height: get-line-height('normal');
+  line-height: px-rem(24);
   text-decoration: none;
   appearance: none;
   cursor: pointer;
-  border: 1px solid transparent;
+  border: 2px solid transparent;
   border-radius: get-border-radius('little');
   transition: get-transition('normal');
 
@@ -28,21 +29,6 @@
   opacity: 0.5;
 }
 
-@mixin button-icon() {
-  padding-top: px-rem(10);
-  padding-bottom: px-rem(10);
-}
-
-@mixin button-icon-small() {
-  padding-top: px-rem(6);
-  padding-bottom: px-rem(6);
-}
-
-@mixin button-icon-large() {
-  padding-top: px-rem(14);
-  padding-bottom: px-rem(14);
-}
-
 @mixin button-primary() {
   color: get-color('white');
   background-color: get-color('primary');
@@ -51,8 +37,12 @@
 
 @mixin button-primary-hover() {
   color: get-color('white');
-  background-color: get-color('secondary');
-  border-color: get-color('secondary');
+  background-color: get-color('primary-300');
+  border-color: get-color('primary-300');
+}
+
+@mixin button-primary-focus() {
+  outline: 4px solid rgba-color('primary', 50%);
 }
 
 @mixin button-primary-icon() {
@@ -73,6 +63,10 @@
   border-color: get-color('primary');
 }
 
+@mixin button-primary-outline-focus() {
+  outline: 4px solid rgba-color('primary', 50%);
+}
+
 @mixin button-primary-outline-icon() {
   &::after {
     background-color: get-color('primary');
@@ -87,8 +81,8 @@
 
 @mixin button-secondary() {
   color: get-color('white');
-  background-color: get-color('secondary');
-  border-color: get-color('secondary');
+  background-color: get-color('foreground');
+  border-color: get-color('foreground');
 }
 
 @mixin button-secondary-hover() {
@@ -97,74 +91,45 @@
   border-color: get-color('primary');
 }
 
+@mixin button-secondary-focus() {
+  outline: 4px solid rgba-color('primary', 50%);
+}
+
 @mixin button-secondary-outline() {
-  color: get-color('secondary');
+  color: get-color('foreground');
   background-color: transparent;
-  border-color: get-color('secondary');
+  border-color: get-color('foreground');
 }
 
 @mixin button-secondary-outline-hover() {
   color: get-color('white');
-  background-color: get-color('secondary');
-  border-color: get-color('secondary');
+  background-color: get-color('foreground');
+  border-color: get-color('foreground');
 }
 
-@mixin button-secondary-outline-icon() {
-  &::after {
-    background-color: get-color('secondary');
-  }
+@mixin button-secondary-outline-focus() {
+  outline: 4px solid rgba-color('foreground', 50%);
 }
 
-@mixin button-secondary-outline-icon-hover() {
-  &::after {
-    background-color: get-color('white');
-  }
-}
-
-@mixin button-tertiary() {
-  color: get-color('white');
-  background-color: get-color('black');
-  border-color: get-color('black');
-}
-
-@mixin button-tertiary-hover() {
-  color: get-color('white');
-  background-color: get-color('grey');
-  border-color: get-color('grey');
-}
-
-@mixin button-tertiary-outline() {
-  color: get-color('black');
-  background-color: transparent;
-  border-color: get-color('black');
-}
-
-@mixin button-tertiary-outline-hover() {
-  color: get-color('white');
-  background-color: get-color('black');
-  border-color: get-color('black');
-}
-
-@mixin button-tertiary-outline-icon() {
+@mixin button-secondary-outline-icon() {
   &::after {
-    background-color: get-color('black');
+    background-color: get-color('foreground');
   }
 }
 
-@mixin button-tertiary-outline-icon-hover() {
+@mixin button-secondary-outline-icon-hover() {
   &::after {
     background-color: get-color('white');
   }
 }
 
 @mixin button-small() {
-  padding: get-padding('little') get-padding('normal');
+  padding: px-rem(10) px-rem(20);
   font-size: get-font-size('small');
-  line-height: get-line-height('normal');
 }
 
 @mixin button-large() {
-  padding: get-padding('normal') get-padding('large');
+  padding: px-rem(16) px-rem(28);
 }
 
 @mixin button-loading($color: currentColor) {

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

@@ -0,0 +1,5 @@
+@use 'theme' as *;
+
+@function rgba-color($color, $alpha: 50%) {
+  @return rgb(from get-color($color) r g b / $alpha);
+}

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

@@ -23,6 +23,7 @@
 
     mask-repeat: no-repeat;
     mask-size: contain;
+    mask-position: center;
   }
 
   @if map.has-key($o-icon-icons, 'icon-#{$name}') {

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

@@ -1,5 +1,6 @@
 @forward 'breakpoints';
 @forward 'buttons';
+@forward 'colors';
 @forward 'icon';
 @forward 'link';
 @forward 'media';

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

@@ -1,5 +1,6 @@
 @mixin link() {
   text-decoration: underline;
+  text-underline-offset: 4px;
 
   &:hover {
     text-decoration: none;

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

@@ -34,8 +34,7 @@ class ACF {
   }
 
   megaMenuFields() {
-    jQuery(document).on('menu-item-added', (event) => {
-      console.log('menu-item-added', event);
+    jQuery(document).on('menu-item-added', () => {
       this.megaMenuData.submenuFields = document.querySelectorAll(
         this.megaMenuData.submenuFieldsSelector,
       );

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

@@ -6,11 +6,21 @@ class Utils {
       ajax: { url, nonce },
     } = chiselScripts;
 
-    const formData = new FormData();
-
-    Object.entries(ajaxData).forEach(([key, value]) => {
-      formData.append(key, value);
-    });
+    let formData;
+
+    if (ajaxData instanceof FormData) {
+      formData = ajaxData;
+    } else {
+      formData = new FormData();
+
+      Object.entries(ajaxData).forEach(([key, value]) => {
+        if (typeof value === 'object' && value !== null && !['file', 'files'].includes(key)) {
+          formData.append(key, JSON.stringify(value));
+        } else {
+          formData.append(key, value);
+        }
+      });
+    }
 
     const params = {
       method: 'POST',

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

@@ -25,6 +25,10 @@ $_static-icons: settings.$static-icons;
     &:focus {
       @include button-primary-hover;
     }
+
+    &:focus {
+      @include button-primary-focus;
+    }
   }
 
   &.is-style-primary-outline .wp-block-button__link {
@@ -36,6 +40,10 @@ $_static-icons: settings.$static-icons;
       @include button-primary-outline-hover;
       @include button-primary-outline-icon-hover;
     }
+
+    &:focus {
+      @include button-primary-outline-focus;
+    }
   }
 
   &.is-style-secondary .wp-block-button__link {
@@ -45,6 +53,10 @@ $_static-icons: settings.$static-icons;
     &:focus {
       @include button-secondary-hover;
     }
+
+    &:focus {
+      @include button-secondary-focus;
+    }
   }
 
   &.is-style-secondary-outline .wp-block-button__link {
@@ -56,25 +68,9 @@ $_static-icons: settings.$static-icons;
       @include button-secondary-outline-hover;
       @include button-secondary-outline-icon-hover;
     }
-  }
-
-  &.is-style-tertiary .wp-block-button__link {
-    @include button-tertiary;
 
-    &:hover,
     &:focus {
-      @include button-tertiary-hover;
-    }
-  }
-
-  &.is-style-tertiary-outline .wp-block-button__link {
-    @include button-tertiary-outline;
-    @include button-tertiary-outline-icon;
-
-    &:hover,
-    &:focus {
-      @include button-tertiary-outline-hover;
-      @include button-tertiary-outline-icon-hover;
+      @include button-secondary-outline-focus;
     }
   }
 
@@ -97,16 +93,6 @@ $_static-icons: settings.$static-icons;
 
   &.has-icon {
     .wp-block-button__link {
-      @include button-icon;
-
-      &.is-size-small .wp-block-button__link {
-        @include button-icon-small;
-      }
-
-      &.is-size-large .wp-block-button__link {
-        @include button-icon-large;
-      }
-
       &::after,
       &::before {
         display: block;

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

@@ -9,7 +9,7 @@
     padding: get-padding('normal');
     overflow: hidden;
     background-color: get-color('white');
-    border: 1px solid get-color('light-grey');
+    border: 1px solid get-color('grey-100');
     border-radius: get-border-radius('small');
   }