Skip to content

chore(Tiered List): Refactor tiered list macro to extract duplicated code blocks #5683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Nayab-Gauhar wants to merge 2 commits into
base: main
Choose a base branch
from
+27 −41
Open

chore(Tiered List): Refactor tiered list macro to extract duplicated code blocks #5683

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
154242d
Refactor tiered list macro to extract duplicated code blocks
Nayab-Gauhar Oct 31, 2025
dd780d8
Merge remote-tracking branch 'upstream/main' into patch-3
jmuzina Dec 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 27 additions & 41 deletions templates/_macros/vf_tiered-list.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,24 @@
# list_item_title_[1-25]: title element of each child list item
# list_item_description_[1-25]: description element of each child list item
# cta: CTA block element

{#- Private helper macro for rendering list item separator -#}
{% macro _vf_tiered_list_item_separator() -%}
<div class="grid-row">
<div class="grid-col-6 grid-col-start-large-3">
<hr class="is-muted"/>
</div>
</div>
{%- endmacro %}

{#- Private helper macro for rendering list item content -#}
{% macro _vf_tiered_list_item(title_col_classes, description_col_classes, title_content, description_content) -%}
<div class="grid-row">
<div class="{{ title_col_classes }}">{{ title_content }}</div>
<div class="{{ description_col_classes }}">{{ description_content }}</div>
Comment on lines +25 to +26
Copy link
Member

@jmuzina jmuzina Dec 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpick: can we only add the class attributes here if the class parameters are defined and have length > 0?

</div>
{%- endmacro %}

{% macro vf_tiered_list(
is_description_full_width_on_desktop=true,
is_list_full_width_on_tablet=true) -%}
Expand All @@ -17,16 +35,14 @@
{%- set has_description = description_content|trim|length > 0 -%}
{%- set cta_content = caller('cta') -%}
{%- set has_cta = cta_content|trim|length > 0 -%}

<div class="p-section u-fixed-width">
<hr class="p-rule">
<hr class="p-rule"/>
<div class="p-section--shallow">
{% if has_description == true -%}
{%- if is_description_full_width_on_desktop == true -%}
<div class="u-fixed-width">
{{ title_content }}
</div>

<div class="grid-row">
<div class="grid-col-4 grid-col-start-large-5">
{{ description_content }}
Expand All @@ -37,7 +53,6 @@
<div class="grid-col">
{{ title_content }}
</div>

<div class="grid-col">
{{ description_content }}
</div>
Expand All @@ -49,7 +64,6 @@
</div>
{%- endif %}
</div>

{#-
When there is a CTA, we use shallow spacing to space the list away from the CTA.
When there is no CTA, shallow spacing would combine with the pattern-level p-section padding, which introduces too much space.
Expand All @@ -62,54 +76,26 @@
{%- set has_title_content = list_item_title_content|trim|length > 0 -%}
{%- set list_item_description_content = caller('list_item_description_' + number|string) -%}
{%- set has_description_content = list_item_description_content|trim|length > 0 -%}

{#- Check to see if title/description content exist, since we're
iterating through 25 potential list items -#}
{%- if has_title_content and has_description_content -%}
{#- Skip the first HR -#}
{%- if number != 1 %}
{{ _vf_tiered_list_item_separator() }}
{%- endif -%}
{%- if is_list_full_width_on_tablet == true %}
{#- Skip the first HR -#}
{%- if number != 1 %}
<div class="grid-row">
<div class="grid-col-6 grid-col-start-large-3">
<hr class="is-muted">
</div>
</div>
{%- endif -%}

<div class="grid-row">
<div class="grid-col-2 grid-col-start-large-3">{{ list_item_title_content }}</div>

<div class="grid-col-4">{{ list_item_description_content }}</div>
</div>
{{ _vf_tiered_list_item('grid-col-2 grid-col-start-large-3', 'grid-col-4', list_item_title_content, list_item_description_content) }}
{%- else %}
{#- Skip the first HR -#}
{%- if number != 1 %}
<div class="grid-row">
<div class="grid-col-6 grid-col-start-large-3">
<hr class="is-muted">
</div>
</div>
{%- endif -%}

<div class="grid-row">
<div class="grid-col-medium-2 grid-col-2 grid-col-start-large-3">
{{ list_item_title_content }}
</div>

<div class="grid-col-medium-2 grid-col-4">
{{ list_item_description_content }}
</div>
</div>
{{ _vf_tiered_list_item('grid-col-medium-2 grid-col-2 grid-col-start-large-3', 'grid-col-medium-2 grid-col-4', list_item_title_content, list_item_description_content) }}
{%- endif -%}
{%- endif -%}
{% endfor %}
{%- if has_cta -%}
</div>
{%- endif -%}

{% if has_cta == true -%}
<div class="grid-row">
<hr class="p-rule--muted">
<hr class="p-rule--muted"/>
<div class="grid-col-4 grid-col-start-large-5">
<p>
{{ cta_content }}
Expand All @@ -118,4 +104,4 @@
</div>
{%- endif %}
</div>
{%- endmacro %}
{%- endmacro %}