generator-chisel 2.2.1 → 2.2.2

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 <!-- INSERT-NEW-ENTRIES-HERE -->
 
+## <small>2.2.2 (2025-11-07)</small>
+
+- blocks adjustments, new patterns, fixes, block mods ([19f038f](https://github.com/xfiveco/generator-chisel/commit/19f038f))
+
 ## <small>2.2.1 (2025-11-05)</small>
 
 - fixes and defaults adjustments, improvements ([8d0ceca](https://github.com/xfiveco/generator-chisel/commit/8d0ceca))

package/lib/commands/create/creators/app/chisel-starter-theme/assets/images/chisel.svg

@@ -0,0 +1,9 @@
+<svg width="168" height="48" viewBox="0 0 168 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M38.6943 4.53418C38.2917 4.73999 37.9766 5.04969 37.7646 5.41406C37.1328 6.50071 36.7955 8.05967 35.6777 8.63086L35.0029 8.97559C20.158 16.5585 18.4387 13.1768 3.59375 20.7598L8.06348 29.5537C22.9084 21.9708 21.1892 18.5878 36.0342 11.0049L36.709 10.6602C37.8268 10.0893 39.283 10.733 40.5312 10.8594C40.9501 10.9017 41.3861 10.8279 41.7891 10.6221L47.8799 7.51074V48H0.308594L9.18457 43.4658C9.58753 43.26 9.90321 42.9505 10.1152 42.5859C10.7471 41.4992 11.0842 39.9402 12.2021 39.3691L12.877 39.0244C27.7219 31.4415 29.4412 34.8232 44.2861 27.2402L39.8164 18.4463C24.9715 26.0292 26.6905 29.4122 11.8457 36.9951L11.1709 37.3398C10.0529 37.9109 8.59607 37.2669 7.34766 37.1406C6.92896 37.0983 6.49365 37.1722 6.09082 37.3779L0 40.4883V0H47.5713L38.6943 4.53418ZM7.85254 24.1221L8.72559 27.5107L5.63086 21.4229L7.85254 24.1221ZM42.249 26.5771L40.0264 23.8779L39.1543 20.4893L42.249 26.5771Z" fill="#DD2424"/>
+<path d="M117.469 2.86829C122.503 2.86829 126.584 6.93546 126.584 11.9868V15.5854H120.021V11.9868C120.021 10.5725 118.879 9.42588 117.469 9.42588C116.06 9.42588 114.917 10.5725 114.917 11.9868C114.918 16.4082 116.93 18.8032 119.791 21.6734C122.757 24.6503 126.584 28.7273 126.584 36.016C126.583 41.0666 122.502 45.1317 117.469 45.1317C112.436 45.1317 108.356 41.0666 108.355 36.016V32.4146H114.917V36.016C114.918 37.4296 116.06 38.577 117.469 38.577C118.878 38.577 120.02 37.4296 120.021 36.016C120.021 31.5942 118.008 29.1997 115.148 26.3295C112.182 23.3527 108.355 19.2755 108.355 11.9868C108.355 6.93547 112.435 2.86829 117.469 2.86829Z" fill="#050A18"/>
+<path d="M82.5425 20.7073H87.6466V3.16098H94.209V44.839H87.6466V27.2927H82.5425V44.839H75.9801V3.16098H82.5425V20.7073Z" fill="#050A18"/>
+<path d="M104.563 44.839H98.0007V3.16098H104.563V44.839Z" fill="#050A18"/>
+<path d="M156.333 38.2683H168V44.839H149.771V3.16098H156.333V38.2683Z" fill="#050A18"/>
+<path d="M63.949 2.86801C68.9827 2.86801 73.0634 6.96297 73.0634 12.0144V15.5839H66.501V12.0144C66.501 10.6 65.3584 9.45338 63.949 9.45338C62.5395 9.45338 61.3969 10.6 61.3969 12.0144V35.9856C61.3978 37.3992 62.5401 38.5466 63.949 38.5466C65.3578 38.5466 66.5001 37.3992 66.501 35.9856V32.4132H73.0634V35.9856C73.0625 41.0362 68.9822 45.132 63.949 45.132C58.9157 45.132 54.8354 41.0362 54.8345 35.9856V12.0144C54.8354 6.96376 58.9157 2.86801 63.949 2.86801Z" fill="#050A18"/>
+<path d="M147.729 9.73171H136.063V20.7073H146.271V27.2927H136.063V38.2683H147.729V44.839H129.5V3.16098H147.729V9.73171Z" fill="#050A18"/>
+</svg>

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

@@ -159,9 +159,9 @@ final class ThemeHelpers {
 			$logo_data = wp_get_attachment_image_src( $logo_id, 'medium' );
 		} else {
 			$logo_data = array(
-				ImageHelpers::get_image_url( 'chisel.png' ),
-				84,
-				84,
+				ImageHelpers::get_image_url( 'chisel.svg' ),
+				200,
+				60,
 				0,
 			);
 		}

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

@@ -30,9 +30,9 @@ final class WoocommerceHelpers {
 			return;
 		}
 
-		global $product;
+		if ( $post->post_type === 'product' ) {
+			global $product;
 
-		if ( is_woocommerce() ) {
 			$product = wc_get_product( $post->ID );
 		}
 	}

package/lib/commands/create/creators/app/chisel-starter-theme/inc/Plugins/Woocommerce.php

@@ -61,6 +61,8 @@ final class Woocommerce implements InstanceInterface, HooksInterface {
 		add_action( 'woocommerce_before_shop_loop', array( $this, 'before_shop_loop_div_close' ), 31 );
 
 		add_action( 'customize_register', array( $this, 'modify_customizer' ), 20 );
+
+		add_action( 'pre_get_posts', array( $this, 'pre_get_posts' ) );
 	}
 
 	/**
@@ -143,6 +145,19 @@ final class Woocommerce implements InstanceInterface, HooksInterface {
 		}
 	}
 
+	/**
+	 * Set woocommerce query to get orderby setting from customizer so that is consistent with ajax queries.
+	 *
+	 * @param \WP_Query $query
+	 *
+	 * @return void
+	 */
+	public function pre_get_posts( \WP_Query $query ): void {
+		if ( ! is_admin() && $query->is_main_query() && ( is_shop() || is_product_category() || is_product_tag() ) ) {
+			$query->set( 'orderby', get_option( 'woocommerce_default_catalog_orderby', 'menu_order' ) );
+		}
+	}
+
 	/**
 	 * Register woocommerce sidebars.
 	 *

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

@@ -32,14 +32,18 @@ final class AjaxEndpoints {
 
 		$response = '';
 
-		$posts = Timber::get_posts(
-			array(
-				'post_type'      => $post_type,
-				'posts_per_page' => $per_page,
-				'paged'          => $page,
-			)
+		$args = array(
+			'post_type'      => $post_type,
+			'posts_per_page' => $per_page,
+			'paged'          => $page,
 		);
 
+		$posts = Timber::get_posts( $args )->to_array();
+
+		if ( $post_type === 'product' ) {
+			$args['orderby'] = get_option( 'woocommerce_default_catalog_orderby', 'menu_order' );
+		}
+
 		$templates = array( 'components/' . $post_type . '-item.twig', 'components/post-item.twig' );
 
 		if ( $post_type === 'product' ) {
@@ -50,6 +54,8 @@ final class AjaxEndpoints {
 			foreach ( $posts as $post ) {
 				$response .= Timber::compile( $templates, array( 'post' => $post ), CacheHelpers::expiry() );
 			}
+		} else {
+			$response = Timber::compile( 'components/no-results.twig' );
 		}
 
 		return $this->success( $response );

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

@@ -77,10 +77,18 @@ final class Blocks implements InstanceInterface, HooksInterface {
 	public function set_properties(): void {
 		$this->blocks_category           = 'chisel-blocks';
 		$this->block_patterns_categories = array(
-			'cta' => array(
+			'cta'      => array(
 				'label'       => __( 'Call to Action', 'chisel' ),
 				'description' => __( 'Call to Action Sections.', 'chisel' ),
 			),
+			'features' => array(
+				'label'       => __( 'Features', 'chisel' ),
+				'description' => __( 'Features Sections.', 'chisel' ),
+			),
+			'hero'     => array(
+				'label'       => __( 'Hero', 'chisel' ),
+				'description' => __( 'Hero Sections.', 'chisel' ),
+			),
 		);
 	}
 

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

@@ -111,7 +111,7 @@ final class Components {
 			$sidebar_name = 'chisel-sidebar-' . $sidebar_id;
 		} elseif ( is_singular( 'post' ) ) {
 			$sidebar_name = 'chisel-sidebar-blog';
-		} elseif ( function_exists( 'is_shop' ) && is_shop() ) {
+		} elseif ( function_exists( 'is_shop' ) && ( is_shop() || is_product_category() || is_product_tag() ) ) {
 			$sidebar_name = 'chisel-sidebar-woocommerce';
 		}
 
@@ -123,7 +123,7 @@ final class Components {
 			return self::$sidebar[ $sidebar_name ];
 		}
 
-		$sidebar_content = Timber::get_widgets( $sidebar_name );
+		$sidebar_content = apply_filters( 'chisel_sidebar_content', Timber::get_widgets( $sidebar_name ), $sidebar_name );
 
 		self::$sidebar[ $sidebar_name ] = array(
 			'id'      => $sidebar_id,

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

@@ -1,12 +1,10 @@
 <?php
 /**
- * Title: Call to Action
- * Slug: chisel/cta
+ * Title: Call to Action 01
+ * Slug: chisel/cta-01
  * Categories: chisel-patterns/cta
- * Description: A CTA section pattern
+ * Description: A CTA section pattern 01
  * Keywords: cta
- * Post Types: post, page
- * Template Types: post, page
  *
  * @package Chisel
  */

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

@@ -0,0 +1,42 @@
+<?php
+/**
+ * Title: Features 01
+ * Slug: chisel/features-01
+ * Categories: chisel-patterns/features
+ * Description: Features pattern 01
+ * Keywords: features
+ *
+ * @package Chisel
+ */
+
+?>
+
+<!-- wp:media-text {"mediaSizeSlug":"large","className":"u-no-margin-bottom","backgroundColor":"grey-100","disableBottomMargin":true} -->
+<div class="wp-block-media-text is-stacked-on-mobile u-no-margin-bottom has-grey-100-background-color has-background"><figure class="wp-block-media-text__media"></figure><div class="wp-block-media-text__content"><!-- wp:heading {"level":3} -->
+<h3 class="wp-block-heading">Feature 1</h3>
+<!-- /wp:heading -->
+
+<!-- wp:paragraph -->
+<p>Feature description</p>
+<!-- /wp:paragraph --></div></div>
+<!-- /wp:media-text -->
+
+<!-- wp:media-text {"mediaPosition":"right","mediaSizeSlug":"large","className":"u-no-margin-bottom","backgroundColor":"grey-100","disableBottomMargin":true} -->
+<div class="wp-block-media-text has-media-on-the-right is-stacked-on-mobile u-no-margin-bottom has-grey-100-background-color has-background"><div class="wp-block-media-text__content"><!-- wp:heading {"level":3} -->
+<h3 class="wp-block-heading">Feature 2</h3>
+<!-- /wp:heading -->
+
+<!-- wp:paragraph -->
+<p>Feature description</p>
+<!-- /wp:paragraph --></div><figure class="wp-block-media-text__media"></figure></div>
+<!-- /wp:media-text -->
+
+<!-- wp:media-text {"mediaSizeSlug":"large","backgroundColor":"grey-100"} -->
+<div class="wp-block-media-text is-stacked-on-mobile has-grey-100-background-color has-background"><figure class="wp-block-media-text__media"></figure><div class="wp-block-media-text__content"><!-- wp:heading {"level":3} -->
+<h3 class="wp-block-heading">Feature 3</h3>
+<!-- /wp:heading -->
+
+<!-- wp:paragraph -->
+<p>Feature description</p>
+<!-- /wp:paragraph --></div></div>
+<!-- /wp:media-text -->

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

@@ -0,0 +1,48 @@
+<?php
+/**
+ * Title: Hero 01
+ * Slug: chisel/hero-01
+ * Categories: chisel-patterns/hero
+ * Description: A hero section pattern 01
+ * Keywords: hero, banner
+ *
+ * @package Chisel
+ */
+
+?>
+
+<!-- wp:cover {"overlayColor":"foreground","isUserOverlayColor":true,"align":"full","layout":{"type":"constrained","contentSize":"848px","wideSize":"1072px"}} -->
+<div class="wp-block-cover alignfull"><span aria-hidden="true" class="wp-block-cover__background has-foreground-background-color has-background-dim-100 has-background-dim"></span><div class="wp-block-cover__inner-container"><!-- wp:spacer {"height":"auto","className":"is-style-big"} -->
+<div style="height:auto" aria-hidden="true" class="wp-block-spacer is-style-big"></div>
+<!-- /wp:spacer -->
+
+<!-- wp:spacer {"height":"auto","className":"is-style-large"} -->
+<div style="height:auto" aria-hidden="true" class="wp-block-spacer is-style-large"></div>
+<!-- /wp:spacer -->
+
+<!-- wp:heading {"textAlign":"center","level":1} -->
+<h1 class="wp-block-heading has-text-align-center">A modern development framework for WordPress</h1>
+<!-- /wp:heading -->
+
+<!-- wp:paragraph {"align":"center","placeholder":"Write title…","fontSize":"large"} -->
+<p class="has-text-align-center has-large-font-size">Craft <strong>fast</strong> and <strong>easy to maintain</strong> WordPress websites. Use the <strong>power</strong> and <strong>simplicity</strong> of Timber and Twig. Make your CSS <strong>scalable</strong> and <strong>maintainable</strong> with ITCSS. Get rid of tedious manual tasks with Chisel's <strong>modern development workflow</strong>.</p>
+<!-- /wp:paragraph -->
+
+<!-- wp:spacer {"height":"auto","className":"is-style-large"} -->
+<div style="height:auto" aria-hidden="true" class="wp-block-spacer is-style-large"></div>
+<!-- /wp:spacer -->
+
+<!-- wp:buttons {"layout":{"type":"flex","justifyContent":"center"}} -->
+<div class="wp-block-buttons"><!-- wp:button {"className":"is-style-primary has-icon has-icon-arrow-right","buttonIcon":"arrow-right"} -->
+<div class="wp-block-button is-style-primary has-icon has-icon-arrow-right"><a class="wp-block-button__link wp-element-button" href="#">Get started</a></div>
+<!-- /wp:button -->
+
+<!-- wp:button {"className":"-right is-style-primary-outline"} -->
+<div class="wp-block-button -right is-style-primary-outline"><a class="wp-block-button__link wp-element-button">Learn more</a></div>
+<!-- /wp:button --></div>
+<!-- /wp:buttons -->
+
+<!-- wp:spacer {"height":"auto","className":"is-style-big"} -->
+<div style="height:auto" aria-hidden="true" class="wp-block-spacer is-style-big"></div>
+<!-- /wp:spacer --></div></div>
+<!-- /wp:cover -->

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

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

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

@@ -1,3 +1,4 @@
+import './mods/core';
 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/core.js

@@ -0,0 +1,57 @@
+import { __ } from '@wordpress/i18n';
+import { addFilter } from '@wordpress/hooks';
+import { createHigherOrderComponent } from '@wordpress/compose';
+import { InspectorControls } from '@wordpress/blockEditor';
+import { PanelBody, ToggleControl } from '@wordpress/components';
+import { Fragment } from '@wordpress/element';
+
+addFilter('blocks.registerBlockType', 'chisel/add-no-margin-attribute', (settings) => {
+  if (typeof settings.attributes !== 'undefined') {
+    settings.attributes = {
+      ...settings.attributes,
+      disableBottomMargin: {
+        type: 'boolean',
+        default: false,
+      },
+    };
+  }
+  return settings;
+});
+
+const addNoMarginToggle = createHigherOrderComponent((BlockEdit) => {
+  return (props) => {
+    const { attributes, setAttributes, isSelected } = props;
+    const { disableBottomMargin = false, className = '' } = attributes;
+
+    const onToggle = (checked) => {
+      let newClassName = className.replace(/\bu-no-margin-bottom\b/, '').trim();
+      if (checked) {
+        newClassName = `${newClassName} u-no-margin-bottom`.trim();
+      }
+      setAttributes({
+        disableBottomMargin: checked,
+        className: newClassName,
+      });
+    };
+
+    return (
+      <Fragment>
+        <BlockEdit {...props} />
+        {isSelected && (
+          <InspectorControls>
+            <PanelBody title={__('Spacing', 'chisel')}>
+              <ToggleControl
+                label={__('Disable bottom spacing', 'chisel')}
+                help={__('Removes the bottom spacing', 'chisel')}
+                checked={!!disableBottomMargin}
+                onChange={onToggle}
+              />
+            </PanelBody>
+          </InspectorControls>
+        )}
+      </Fragment>
+    );
+  };
+}, 'addNoMarginToggle');
+
+addFilter('editor.BlockEdit', 'chisel/add-no-margin-toggle', addNoMarginToggle);

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

@@ -0,0 +1,14 @@
+@use '~design' as *;
+
+.wp-block-group-is-layout-constrained {
+  > :where(:not(.alignleft):not(.alignright):not(.alignfull)) {
+    max-width: get-layout-size('content');
+    margin-left: auto !important;
+    margin-right: auto !important;
+    padding-inline: get-padding('normal');
+  }
+}
+
+:where(.wp-block-group.has-background.alignfull) {
+  padding: get-padding('small') 0;
+}

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

@@ -15,6 +15,12 @@
     }
   }
 
+  &.has-background {
+    > .wp-block-media-text__content {
+      padding: 0 get-padding('big');
+    }
+  }
+
   @include bp-down(medium) {
     &.is-stacked-on-mobile {
       grid-template-columns: 100% !important;

package/lib/commands/create/creators/app/chisel-starter-theme/src/styles/utilities/_spacing.scss

@@ -0,0 +1,3 @@
+.u-no-margin-bottom {
+  margin-bottom: 0;
+}

package/lib/commands/create/creators/app/chisel-starter-theme/src/styles/woo/_product-item.scss

@@ -16,6 +16,10 @@
 
   margin-bottom: get-margin('normal');
   text-align: center;
+
+  &:hover img {
+    transform: scale(1.05);
+  }
 }
 
 .c-product-item__image {

package/lib/commands/create/creators/app/chisel-starter-theme/style.chisel-tpl.css

@@ -3,7 +3,7 @@
  * Theme URI: https://www.getchisel.co/
  * Author: <%= app.author %>
  * Description: Chisel Wordpress Starter Theme based on Timber library.
- * Version: 2.2.1
+ * Version: 2.2.2
  * License: GNU General Public License v2 or later
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
  * Tags: chisel, custom, starter, theme, WordPress

package/lib/commands/create/creators/app/chisel-starter-theme/views/components/no-results.twig

@@ -0,0 +1 @@
+<h2>{{ __('No posts found', 'chisel') }}</h2>

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

@@ -20,7 +20,7 @@ In order to covert back to a grid, add the following classes to the c-posts-item
               {% include ['components/' ~ post.post_type ~ '-item.twig', 'components/post-item.twig'] with {post: post} only %}
             {% endfor %}
           {% else %}
-            <h2>{{ __('No posts found', 'chisel') }}</h2>
+            {% include 'components/no-results.twig' %}
           {% endif %}
         </div>
 

package/lib/commands/create/creators/app/chisel-starter-theme/views/woocommerce/linked-products.twig

@@ -6,7 +6,7 @@
   {% endif %}
 
   <div class="{{ bem('o-layout__item', (sidebar.content ? '8' : '12') ~ '-large') }}">
-    <div class="c-product-linked__items {{ grid_classnames }}">
+    <div class="c-product-linked__items {{ grid_classnames|default(bem('o-grid', 'cols-1', 'cols-2-small', 'cols-3-medium')) }}">
       {% for post in linked_products %}
         {% include "woocommerce/content-product.twig" with {post: post} %}
       {% endfor %}

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

@@ -1,5 +1,5 @@
 module.exports = {
   'chisel-scripts': '2.0.0-2.0.0-alpha.8.1',
   'chisel-shared-utils': '2.0.0-alpha.1',
-  'generator-chisel': '2.2.1',
+  'generator-chisel': '2.2.2',
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-chisel",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "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": "c13cecf654e0d17ffb2f2d25b8bc5e6628f7eaa3"
+  "gitHead": "cf2dafab46be1d1598354db3420c3deb35ecd0bb"
 }