Skip to content

Fix merged table rendering in Python env #3739

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

Merged
merged 6 commits into from
Oct 2, 2025
Merged

Fix merged table rendering in Python env #3739

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6cd824b
fix python merged table rendering
rmccar Sep 25, 2025
8ffe13e
add comment
rmccar Sep 25, 2025
7bcee47
update quotes
rmccar Sep 25, 2025
c304c9f
fix column titles
rmccar Sep 26, 2025
3960e18
Merge branch 'main' into fix-python-merged-table-rendering
rmccar Sep 30, 2025
c579659
Merge branch 'main' into fix-python-merged-table-rendering
precious-onyenaucheya-ons Oct 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
23 changes: 4 additions & 19 deletions src/components/table/_macro.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,6 @@
{% from "components/button/_macro.njk" import onsButton %}
{% from "components/icon/_macro.njk" import onsIcon %}
{% set variants = params.variants if params.variants %}
{% set hasRowSpan = false %}
{% for row in params.thList %}
{% for th in row.ths %}
{% if th.rowspan %}
{% set hasRowSpan = true %}
{% endif %}
{% endfor %}
{% endfor %}

{% for row in params.trs %}
{% for td in row.tds %}
{% if td.rowspan %}
{% set hasRowSpan = true %}
{% endif %}
{% endfor %}
{% endfor %}

<div class="ons-table-scrollable ons-table-scrollable--on">
<div
Expand All @@ -26,15 +10,16 @@
role="region"
aria-label="{{ params.caption }}. {{ params.ariaLabel | default('Scrollable table') }}"
>
{# Uses multiple loops to set the rowspan class so that it can work in both nunjucks and jinja2 environments due to the scoping rules of each language #}
<table
{% if params.id %}id="{{ params.id }}"{% endif %}
class="ons-table{{ ' ' + params.tableClasses if params.tableClasses else '' }}{% if hasRowSpan %}{{ ' ' }}ons-table--has-rowspan{% endif %}{% if variants %}{% if variants is not string %}{% for variant in variants %}{{ ' ' }}ons-table--{{ variant }}{% endfor %}{% else %}{{ ' ' }}ons-table--{{ variants }}{% endif %}{% endif %}"
class="ons-table{{ ' ' + params.tableClasses if params.tableClasses else '' }}{% for row in params.thList %}{% for th in row.ths %}{% if th.rowspan %}{{ ' ' }}ons-table--has-rowspan{% endif %}{% endfor %}{% endfor %}{% for row in params.trs %}{% for td in row.tds %}{% if td.rowspan %}{{ ' ' }}ons-table--has-rowspan{% endif %}{% endfor %}{% endfor %}{% if variants %}{% if variants is not string %}{% for variant in variants %}{{ ' ' }}ons-table--{{ variant }}{% endfor %}{% else %}{{ ' ' }}ons-table--{{ variants }}{% endif %}{% endif %}"
{% if params.sortBy and 'sortable' in variants %}
data-aria-sort="{{ params.sortBy }}" data-aria-asc="{{ params.ariaAsc }}" data-aria-desc="{{ params.ariaDesc }}"
{% endif %}
>
{% if params.caption %}
<caption class="ons-table__caption{{ " ons-u-vh" if params.hideCaption }}">
<caption class="ons-table__caption{{ ' ons-u-vh' if params.hideCaption }}">
{{ params.caption }}
</caption>
{% endif %}
Expand All @@ -43,7 +28,7 @@
{% if params.thList %}
{% set thGroups = params.thList %}
{% else %}
{% set thGroups = [ { ths: params.ths } ] %}
{% set thGroups = [ { "ths": params.ths } ] %}
{% endif %}
{% for headerCols in thGroups %}
<tr class="ons-table__row">
Expand Down