From 47349d62a9b85e2f9b56952f96d928fdecd0a249 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabien=20Cl=C3=A9ment?= <15911-goz@users.noreply.drupalcode.org> Date: Thu, 13 Feb 2025 09:28:47 +0000 Subject: [PATCH] Issue #3506389: Follow default_value defined in JSON schema into twig --- components/accordion_group/accordion_group.twig | 2 +- components/grid_row/grid_row.twig | 2 +- components/grid_row_1/grid_row_1.twig | 2 +- components/grid_row_2/grid_row_2.twig | 2 +- components/grid_row_3/grid_row_3.twig | 2 +- components/grid_row_4/grid_row_4.twig | 2 +- components/tile/tile.twig | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/components/accordion_group/accordion_group.twig b/components/accordion_group/accordion_group.twig index db91b06..67d52d7 100644 --- a/components/accordion_group/accordion_group.twig +++ b/components/accordion_group/accordion_group.twig @@ -1,5 +1,5 @@ {% if accordions %} - {% if not grouped %} + {% if grouped is defined and not grouped %} {% set attributes = attributes.setAttribute('data-fr-group', 'false') %} {% endif %} diff --git a/components/grid_row/grid_row.twig b/components/grid_row/grid_row.twig index 8f1677c..d4f9665 100644 --- a/components/grid_row/grid_row.twig +++ b/components/grid_row/grid_row.twig @@ -1,6 +1,6 @@ {% set attributes = attributes.addClass([ 'fr-grid-row', - with_gutters ? 'fr-grid-row--gutters', + with_gutters is not defined or with_gutters ? 'fr-grid-row--gutters', horizontal_align ? 'fr-grid-row--' ~ horizontal_align, vertical_align ? 'fr-grid-row--' ~ vertical_align, ]) %} diff --git a/components/grid_row_1/grid_row_1.twig b/components/grid_row_1/grid_row_1.twig index f2c7e5b..46aba1e 100644 --- a/components/grid_row_1/grid_row_1.twig +++ b/components/grid_row_1/grid_row_1.twig @@ -1,6 +1,6 @@ {% set attributes = attributes.addClass([ 'fr-grid-row', - with_gutters ? 'fr-grid-row--gutters', + with_gutters is not defined or with_gutters ? 'fr-grid-row--gutters', horizontal_align ? 'fr-grid-row--' ~ horizontal_align, vertical_align ? 'fr-grid-row--' ~ vertical_align, ]) %} diff --git a/components/grid_row_2/grid_row_2.twig b/components/grid_row_2/grid_row_2.twig index 7096608..210d23e 100644 --- a/components/grid_row_2/grid_row_2.twig +++ b/components/grid_row_2/grid_row_2.twig @@ -1,6 +1,6 @@ {% set attributes = attributes.addClass([ 'fr-grid-row', - with_gutters ? 'fr-grid-row--gutters', + with_gutters is not defined or with_gutters ? 'fr-grid-row--gutters', horizontal_align ? 'fr-grid-row--' ~ horizontal_align, vertical_align ? 'fr-grid-row--' ~ vertical_align, ]) %} diff --git a/components/grid_row_3/grid_row_3.twig b/components/grid_row_3/grid_row_3.twig index 07ceb1a..49241f3 100644 --- a/components/grid_row_3/grid_row_3.twig +++ b/components/grid_row_3/grid_row_3.twig @@ -1,6 +1,6 @@ {% set attributes = attributes.addClass([ 'fr-grid-row', - with_gutters ? 'fr-grid-row--gutters', + with_gutters is not defined or with_gutters ? 'fr-grid-row--gutters', horizontal_align ? 'fr-grid-row--' ~ horizontal_align, vertical_align ? 'fr-grid-row--' ~ vertical_align, ]) %} diff --git a/components/grid_row_4/grid_row_4.twig b/components/grid_row_4/grid_row_4.twig index efdebab..38f63fb 100644 --- a/components/grid_row_4/grid_row_4.twig +++ b/components/grid_row_4/grid_row_4.twig @@ -1,6 +1,6 @@ {% set attributes = attributes.addClass([ 'fr-grid-row', - with_gutters ? 'fr-grid-row--gutters', + with_gutters is not defined or with_gutters ? 'fr-grid-row--gutters', horizontal_align ? 'fr-grid-row--' ~ horizontal_align, vertical_align ? 'fr-grid-row--' ~ vertical_align, ]) %} diff --git a/components/tile/tile.twig b/components/tile/tile.twig index 24b986e..802274e 100644 --- a/components/tile/tile.twig +++ b/components/tile/tile.twig @@ -19,11 +19,11 @@ {% set attributes = attributes.addClass('fr-tile--shadow') %} {% endif %} -{% if not icon %} +{% if icon is defined and not icon %} {% set attributes = attributes.addClass('fr-tile--no-icon') %} {% endif %} -{% if not border %} +{% if border is defined and not border %} {% set attributes = attributes.addClass('fr-tile--no-border') %} {% endif %} -- GitLab