All base theme templates is now checks for block variables definition.

Niklan · May 19, 2022 · 56ae6d6 · 56ae6d6
1 parent 1f940d2
commit 56ae6d6
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 - Rename variables `title_classes` to `classes` in `page-title.html.twig`.
 - Fixed `menu.html.twig` which didn't reset `attributes` for submenu which leads to duplicated classes and wrong BEM structure.
+- All base theme templates is now checks for `block` variables definition. This allows to override its value in extended templates without need to rewrite whole template just for it.
 
 ### Starter theme
 

diff --git a/templates/content/comment/comment.html.twig b/templates/content/comment/comment.html.twig
@@ -1,5 +1,5 @@
 {%
-  set block = bem_block([
+  set block = block ?? bem_block([
     comment.getEntityTypeId(),
     comment.bundle() != comment.getEntityTypeId() ? comment.bundle(),
     view_mode != 'default' ? view_mode,

diff --git a/templates/content/commerce-product/commerce-product.html.twig b/templates/content/commerce-product/commerce-product.html.twig
@@ -1,5 +1,5 @@
 {%
-  set block = bem_block([
+  set block = block ?? bem_block([
     product_entity.getEntityTypeId(),
     product_entity.bundle(),
     view_mode != 'default' ? view_mode,

diff --git a/templates/content/media/media.html.twig b/templates/content/media/media.html.twig
@@ -1,5 +1,5 @@
 {%
-  set block = bem_block([
+  set block = block ?? bem_block([
     media.getEntityTypeId(),
     media.bundle() != media.getEntityTypeId() ? media.bundle(),
     view_mode != 'default' ? view_mode,

diff --git a/templates/content/node/node.html.twig b/templates/content/node/node.html.twig
@@ -1,5 +1,5 @@
 {%
-  set block = bem_block([
+  set block = block ?? bem_block([
     node.entityTypeId(),
     node.bundle(),
     view_mode != 'default' ? view_mode,

diff --git a/templates/content/paragraph/paragraph.html.twig b/templates/content/paragraph/paragraph.html.twig
@@ -1,5 +1,5 @@
 {%
-  set block = bem_block([
+  set block = block ?? bem_block([
     paragraph.entityTypeId(),
     paragraph.bundle() != paragraph.entityTypeId() ? paragraph.bundle(),
     view_mode != 'default' ? view_mode,

diff --git a/templates/content/taxonomy-term/taxonomy-term.html.twig b/templates/content/taxonomy-term/taxonomy-term.html.twig
@@ -1,5 +1,5 @@
 {%
-  set block = bem_block([
+  set block = block ?? bem_block([
     term.entityTypeId(),
     term.bundle() != term.entityTypeId() ? term.bundle(),
     view_mode != 'default' ? view_mode,

diff --git a/templates/content/user/user.html.twig b/templates/content/user/user.html.twig
@@ -1,5 +1,5 @@
 {%
-  set block = bem_block([
+  set block = block ?? bem_block([
     user.entityTypeId(),
     user.bundle() != user.entityTypeId() ? user.bundle(),
     view_mode != 'default' ? view_mode,

diff --git a/templates/views/views-view.html.twig b/templates/views/views-view.html.twig
@@ -1,4 +1,4 @@
-{% set block = css_name ? css_name : 'views' %}
+{% set block = block ?? css_name ? css_name : 'views' %}
 {%
   set modifiers = [
     block == 'views' ? id,