mirrors/django-components
1
0
Fork 0
mirror of https://github.com/django-components/django-components.git synced 2025-09-26 15:39:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Component name as variable

Browse source 
I have removed the exception raising when a variable without quotes is given, and keep the variable name until the render function where I'm resolving it if it's a String (which means it's a variable, not a component) then I'm moving the slot parts which relies on the component from __init__ to render after getting the component.
This commit is contained in:
AIT ALI EL HOSAYN 2022-07-12 13:44:16 +01:00 • committed by Emil Stenström
parent d3d3c83c8a
commit bfd55f9fbe
1 changed files with 25 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

35
django_components/templatetags/component_tags.py
View file

@ -204,12 +204,8 @@ class ComponentNode(Node):
self.context_args = context_args or [] self.context_args = context_args or []
self.context_kwargs = context_kwargs or {} self.context_kwargs = context_kwargs or {}
self.component, self.isolated_context = component, isolated_context self.component, self.isolated_context = component, isolated_context
self.slots = slots
# Group slot notes by name and concatenate their nodelists
self.component.slots = defaultdict(NodeList)
for slot in slots or []:
self.component.slots[slot.name].extend(slot.nodelist)
self.should_render_dependencies = is_dependency_middleware_active()
def __repr__(self): def __repr__(self):
return "<Component Node: %s. Contents: %r>" % ( return "<Component Node: %s. Contents: %r>" % (
@ -218,6 +214,20 @@ class ComponentNode(Node):
) )
def render(self, context): def render(self, context):
if type(self.component) == str:
try:
component_name = template.Variable(self.component).resolve(context)
component_class = registry.get(component_name)
self.component = component_class(component_name)
except:
raise TemplateSyntaxError(
f"Component name is not defined or not registred: {self.component}"
)
# Group slot notes by name and concatenate their nodelists
self.component.slots = defaultdict(NodeList)
for slot in self.slots or []:
self.component.slots[slot.name].extend(slot.nodelist)
self.should_render_dependencies = is_dependency_middleware_active()
self.component.outer_context = context.flatten() self.component.outer_context = context.flatten()
# Resolve FilterExpressions and Variables that were passed as args to the component, then call component's # Resolve FilterExpressions and Variables that were passed as args to the component, then call component's
@ -250,7 +260,7 @@ class ComponentNode(Node):
return rendered_component return rendered_component
@register.tag("component_block") @register.tag(name="component_block")
def do_component_block(parser, token): def do_component_block(parser, token):
""" """
To give the component access to the template context: To give the component access to the template context:
@ -267,11 +277,9 @@ def do_component_block(parser, token):
bits = token.split_contents() bits = token.split_contents()
bits, isolated_context = check_for_isolated_context_keyword(bits) bits, isolated_context = check_for_isolated_context_keyword(bits)
component, context_args, context_kwargs = parse_component_with_args( component, context_args, context_kwargs = parse_component_with_args(
parser, bits, "component_block" parser, bits, "component_block"
) )
return ComponentNode( return ComponentNode(
component, component,
context_args, context_args,
@ -338,7 +346,6 @@ def parse_component_with_args(parser, bits, tag_name):
kwonly=[], kwonly=[],
kwonly_defaults=None, kwonly_defaults=None,
) )
assert ( assert (
tag_name == tag_args[0].token tag_name == tag_args[0].token
), "Internal error: Expected tag_name to be {}, but it was {}".format( ), "Internal error: Expected tag_name to be {}, but it was {}".format(
@ -360,12 +367,12 @@ def parse_component_with_args(parser, bits, tag_name):
"Call the '%s' tag with a component name as the first parameter" "Call the '%s' tag with a component name as the first parameter"
% tag_name % tag_name
) )
if not is_wrapped_in_quotes(component_name): if not is_wrapped_in_quotes(component_name):
raise TemplateSyntaxError( # raise TemplateSyntaxError(
"Component name '%s' should be in quotes" % component_name # "Component name '%s' should be in quotes" % component_name
) # )
component = component_name
else:
trimmed_component_name = component_name[1:-1] trimmed_component_name = component_name[1:-1]
component_class = registry.get(trimmed_component_name) component_class = registry.get(trimmed_component_name)
component = component_class(trimmed_component_name) component = component_class(trimmed_component_name)