Skip to content

Allow adding class to a template tag div #10

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 13 commits into from
Sep 9, 2021
Merged

Allow adding class to a template tag div #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
33b5a37
rename view.html -> component.html
Archmonger Sep 7, 2021
d4776fe
remove pinned twisted version
Archmonger Sep 7, 2021
766ca41
add class as a component param
Archmonger Sep 7, 2021
bbf3948
black format
Archmonger Sep 7, 2021
396b85b
Revert "remove pinned twisted version"
Archmonger Sep 8, 2021
99dd61c
Revert "Revert "remove pinned twisted version""
Archmonger Sep 8, 2021
adf4917
add classes to test cases
Archmonger Sep 8, 2021
510929c
test downgrading django
Archmonger Sep 9, 2021
965dbe7
test downgrading idom
Archmonger Sep 9, 2021
3f4ae66
Revert "test downgrading django"
Archmonger Sep 9, 2021
83303b0
test idom 0.32.0
Archmonger Sep 9, 2021
2595d2e
pin idom to 0.31
Archmonger Sep 9, 2021
bbdde51
Merge remote-tracking branch 'upstream/main' into template-tag-features
Archmonger Sep 9, 2021
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
5 changes: 1 addition & 4 deletions requirements/test-env.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
django
selenium

# required due issue with channels:
# https://github.com/django/channels/issues/1639#issuecomment-817994671
twisted<21
twisted
2 changes: 1 addition & 1 deletion src/django_idom/templates/idom/view.html → ...django_idom/templates/idom/component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% load static %}
<div id="{{ idom_mount_uuid }}"></div>
<div id="{{ idom_mount_uuid }}" class="{{ class }}"></div>
<script type="module" crossorigin="anonymous">
import { mountViewToElement } from "{% static 'js/django-idom-client.js' %}";
const mountPoint = document.getElementById("{{ idom_mount_uuid }}");
Expand Down
4 changes: 3 additions & 1 deletion src/django_idom/templatetags/idom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,15 @@
register = template.Library()


@register.inclusion_tag("idom/view.html")
@register.inclusion_tag("idom/component.html")
def idom_component(_component_id_, **kwargs):
_register_component(_component_id_)

class_ = kwargs.pop("class", "")
json_kwargs = json.dumps(kwargs, separators=(",", ":"))

return {
"class": class_,
"idom_websocket_url": IDOM_WEBSOCKET_URL,
"idom_web_modules_url": IDOM_WEB_MODULES_URL,
"idom_mount_uuid": uuid4().hex,
Expand Down
8 changes: 4 additions & 4 deletions tests/test_app/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@

<body>
<h1>IDOM Test Page</h1>
<div>{% idom_component "test_app.components.HelloWorld" %}</div>
<div>{% idom_component "test_app.components.Button" %}</div>
<div>{% idom_component "test_app.components.ParametrizedComponent" x=123 y=456 %}</div>
<div>{% idom_component "test_app.components.SimpleBarChart" %}</div>
<div>{% idom_component "test_app.components.HelloWorld" class="hello-world" %}</div>
<div>{% idom_component "test_app.components.Button" class="button" %}</div>
<div>{% idom_component "test_app.components.ParametrizedComponent" class="parametarized-component" x=123 y=456 %}</div>
<div>{% idom_component "test_app.components.SimpleBarChart" class="simple-bar-chart" %}</div>
</body>
</html>