Skip to content
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

Refactor timeline macro for compatibility with Jinja2 templates #3180

Merged
merged 10 commits into from
Sep 6, 2024
Merged

Refactor timeline macro for compatibility with Jinja2 templates #3180

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
30e2475
Removed .push method
SriHV May 7, 2024
8d2d89c
Changed items name
SriHV May 8, 2024
931d445
Removing conflicts
SriHV May 8, 2024
7a7d7f5
changes as per comments
SriHV May 9, 2024
e0cbe41
changes as per comments
SriHV May 9, 2024
1d284fc
Changing indentation
SriHV May 10, 2024
d297876
Update src/components/timeline/example-timeline.njk
SriHV May 10, 2024
19141b9
Merge branch 'main' into fix/3171/refactor-timeline-to-suit-Jinja2
alessioventuriniAND May 17, 2024
03c48ae
Merge to main
SriHV Jun 17, 2024
ce199e1
Merge main into branch
SriHV Jul 10, 2024
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
10 changes: 5 additions & 5 deletions src/components/timeline/_macro-options.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
| Name | Type | Required | Description |
| -------- | ---------------------- | -------- | -------------------------------------------------------------------------------------------------------------------- |
| classes | string | false | Classes to add to the component |
| titleTag | string | false | The HTML heading tag to wrap the title text in for it’s correct semantic order on the page. Will default to an `h2`. |
| items | array`<TimelineItems>` | true | An array of [timeline items](#timelineitems) |
| Name | Type | Required | Description |
| -------------- | ---------------------- | -------- | -------------------------------------------------------------------------------------------------------------------- |
| classes | string | false | Classes to add to the component |
| titleTag | string | false | The HTML heading tag to wrap the title text in for it’s correct semantic order on the page. Will default to an `h2`. |
| items_timeline | array`<TimelineItems>` | true | An array of [timeline items](#timelineitems) |

rmccar marked this conversation as resolved.
Show resolved Hide resolved
## TimelineItems

Expand Down
2 changes: 1 addition & 1 deletion src/components/timeline/_macro.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<div class="ons-timeline{{ ' ' + params.classes if params.classes else '' }}">
{% set titleTag = params.titleTag | default("h2") %}
{% for item in params.items %}
{% for item in params.items_timeline %}
<div class="ons-timeline__item">
<{{ titleTag }} class="ons-timeline__heading">{{ item.heading }}</{{ titleTag }}>
{% if item.itemsList %}
Expand Down
2 changes: 1 addition & 1 deletion src/components/timeline/_macro.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import axe from '../../tests/helpers/axe';
import { renderComponent, templateFaker } from '../../tests/helpers/rendering';

const EXAMPLE_TIMELINE = {
items: [
items_timeline: [
{
heading: 'January 2020',
content: 'Timeline entry 1',
Expand Down
2 changes: 1 addition & 1 deletion src/components/timeline/example-timeline.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{{
onsTimeline({
"items": [
"items_timeline": [
{
"heading": 'September to October 2020',
"itemsList": [
Expand Down
Loading