mirrors/django-components
1
0
Fork 0
mirror of https://github.com/django-components/django-components.git synced 2025-10-05 19:50:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix: various fixes for inject/provide and html_attrs (#541)

Browse source 
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This commit is contained in:
Juro Oravec 2024-07-08 10:25:38 +02:00 • committed by GitHub
parent 23d91218bd
commit 2684b41c07
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 106 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/django_components/component.py
View file

@ -10,7 +10,7 @@ from django.template.context import Context
from django.template.exceptions import TemplateSyntaxError
from django.template.loader import get_template
from django.template.loader_tags import BLOCK_CONTEXT_KEY
from django.utils.html import escape
from django.utils.html import conditional_escape
from django.utils.safestring import SafeString, mark_safe
from django.views import View
@ -337,6 +337,7 @@ class Component(View, metaclass=ComponentMeta):
return comp._render(context, args, kwargs, slots, escape_slots_content)
# This is the internal entrypoint for the render function
def _render(
self,
context: Union[Dict[str, Any], Context] = None,
@ -344,6 +345,19 @@ class Component(View, metaclass=ComponentMeta):
kwargs: Optional[Dict[str, Any]] = None,
slots: Optional[Mapping[SlotName, SlotContent]] = None,
escape_slots_content: bool = True,
) -> str:
try:
return self._render_impl(context, args, kwargs, slots, escape_slots_content)
except Exception as err:
raise type(err)(f"An error occured while rendering component '{self.name}':\n{repr(err)}") from err
def _render_impl(
self,
context: Union[Dict[str, Any], Context] = None,
args: Optional[Union[List, Tuple]] = None,
kwargs: Optional[Dict[str, Any]] = None,
slots: Optional[Mapping[SlotName, SlotContent]] = None,
escape_slots_content: bool = True,
) -> str:
# Allow to provide no args/kwargs
args = args or []
@ -441,13 +455,13 @@ class Component(View, metaclass=ComponentMeta):
for slot_name, content in slots_data.items():
if isinstance(content, (str, SafeString)):
content_func = _nodelist_to_slot_render_func(
NodeList([TextNode(escape(content) if escape_content else content)])
NodeList([TextNode(conditional_escape(content) if escape_content else content)])
)
else:
def content_func(ctx: Context, kwargs: Dict[str, Any], slot_ref: SlotRef) -> SlotRenderedContent:
rendered = content(ctx, kwargs, slot_ref)
return escape(rendered) if escape_content else rendered
return conditional_escape(rendered) if escape_content else rendered
slot_fills[slot_name] = FillContent(
content_func=content_func,