django-components 0.62__tar.gz → 0.63__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {django_components-0.62/src/django_components.egg-info → django_components-0.63}/PKG-INFO +1 -1
- {django_components-0.62 → django_components-0.63}/setup.py +1 -1
- {django_components-0.62 → django_components-0.63}/src/django_components/component.py +11 -8
- {django_components-0.62 → django_components-0.63/src/django_components.egg-info}/PKG-INFO +1 -1
- {django_components-0.62 → django_components-0.63}/LICENSE +0 -0
- {django_components-0.62 → django_components-0.63}/README.md +0 -0
- {django_components-0.62 → django_components-0.63}/pyproject.toml +0 -0
- {django_components-0.62 → django_components-0.63}/setup.cfg +0 -0
- {django_components-0.62 → django_components-0.63}/src/django_components/__init__.py +0 -0
- {django_components-0.62 → django_components-0.63}/src/django_components/app_settings.py +0 -0
- {django_components-0.62 → django_components-0.63}/src/django_components/apps.py +0 -0
- {django_components-0.62 → django_components-0.63}/src/django_components/component_registry.py +0 -0
- {django_components-0.62 → django_components-0.63}/src/django_components/logger.py +0 -0
- {django_components-0.62 → django_components-0.63}/src/django_components/management/__init__.py +0 -0
- {django_components-0.62 → django_components-0.63}/src/django_components/management/commands/__init__.py +0 -0
- {django_components-0.62 → django_components-0.63}/src/django_components/management/commands/startcomponent.py +0 -0
- {django_components-0.62 → django_components-0.63}/src/django_components/management/commands/upgradecomponent.py +0 -0
- {django_components-0.62 → django_components-0.63}/src/django_components/middleware.py +0 -0
- {django_components-0.62 → django_components-0.63}/src/django_components/py.typed +0 -0
- {django_components-0.62 → django_components-0.63}/src/django_components/safer_staticfiles/__init__.py +0 -0
- {django_components-0.62 → django_components-0.63}/src/django_components/safer_staticfiles/apps.py +0 -0
- {django_components-0.62 → django_components-0.63}/src/django_components/template_loader.py +0 -0
- {django_components-0.62 → django_components-0.63}/src/django_components/templatetags/__init__.py +0 -0
- {django_components-0.62 → django_components-0.63}/src/django_components/templatetags/component_tags.py +0 -0
- {django_components-0.62 → django_components-0.63}/src/django_components/types.py +0 -0
- {django_components-0.62 → django_components-0.63}/src/django_components/utils.py +0 -0
- {django_components-0.62 → django_components-0.63}/src/django_components.egg-info/SOURCES.txt +0 -0
- {django_components-0.62 → django_components-0.63}/src/django_components.egg-info/dependency_links.txt +0 -0
- {django_components-0.62 → django_components-0.63}/src/django_components.egg-info/requires.txt +0 -0
- {django_components-0.62 → django_components-0.63}/src/django_components.egg-info/top_level.txt +0 -0
- {django_components-0.62 → django_components-0.63}/tests/test_autodiscover.py +0 -0
- {django_components-0.62 → django_components-0.63}/tests/test_component.py +0 -0
- {django_components-0.62 → django_components-0.63}/tests/test_component_as_view.py +0 -0
- {django_components-0.62 → django_components-0.63}/tests/test_context.py +0 -0
- {django_components-0.62 → django_components-0.63}/tests/test_dependency_rendering.py +0 -0
- {django_components-0.62 → django_components-0.63}/tests/test_registry.py +0 -0
- {django_components-0.62 → django_components-0.63}/tests/test_settings.py +0 -0
- {django_components-0.62 → django_components-0.63}/tests/test_startcomponent_command.py +0 -0
- {django_components-0.62 → django_components-0.63}/tests/test_templatetags.py +0 -0
- {django_components-0.62 → django_components-0.63}/tests/testutils.py +0 -0
|
@@ -262,14 +262,18 @@ class Component(View, metaclass=SimplifiedInterfaceMediaDefiningClass):
|
|
|
262
262
|
slots_data: Optional[Dict[SlotName, str]] = None,
|
|
263
263
|
escape_slots_content: bool = True,
|
|
264
264
|
) -> str:
|
|
265
|
-
|
|
265
|
+
# NOTE: This if/else is important to avoid nested Contexts,
|
|
266
|
+
# See https://github.com/EmilStenstrom/django-components/issues/414
|
|
267
|
+
context = context_data if isinstance(context_data, Context) else Context(context_data)
|
|
266
268
|
template = self.get_template(context)
|
|
267
269
|
|
|
268
270
|
if slots_data:
|
|
269
271
|
self._fill_slots(slots_data, escape_slots_content)
|
|
270
272
|
|
|
271
|
-
|
|
272
|
-
|
|
273
|
+
prev_filled_slots_context: Optional[FilledSlotsContext] = context.get(FILLED_SLOTS_CONTENT_CONTEXT_KEY)
|
|
274
|
+
updated_filled_slots_context = self._process_template_and_update_filled_slot_context(
|
|
275
|
+
template,
|
|
276
|
+
prev_filled_slots_context,
|
|
273
277
|
)
|
|
274
278
|
with context.update({FILLED_SLOTS_CONTENT_CONTEXT_KEY: updated_filled_slots_context}):
|
|
275
279
|
return template.render(context)
|
|
@@ -305,8 +309,8 @@ class Component(View, metaclass=SimplifiedInterfaceMediaDefiningClass):
|
|
|
305
309
|
|
|
306
310
|
def _process_template_and_update_filled_slot_context(
|
|
307
311
|
self,
|
|
308
|
-
context: Context,
|
|
309
312
|
template: Template,
|
|
313
|
+
slots_context: Optional[FilledSlotsContext],
|
|
310
314
|
) -> FilledSlotsContext:
|
|
311
315
|
if isinstance(self.fill_content, NodeList):
|
|
312
316
|
default_fill_content = (self.fill_content, None)
|
|
@@ -401,8 +405,7 @@ class Component(View, metaclass=SimplifiedInterfaceMediaDefiningClass):
|
|
|
401
405
|
for slot_name, content_data in slot_name2fill_content.items()
|
|
402
406
|
if content_data # Slots whose content is None (i.e. unfilled) are dropped.
|
|
403
407
|
}
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
except KeyError:
|
|
408
|
+
if slots_context is not None:
|
|
409
|
+
return slots_context.new_child(filled_slots_map)
|
|
410
|
+
else:
|
|
408
411
|
return ChainMap(filled_slots_map)
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{django_components-0.62 → django_components-0.63}/src/django_components/component_registry.py
RENAMED
|
File without changes
|
|
File without changes
|
{django_components-0.62 → django_components-0.63}/src/django_components/management/__init__.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{django_components-0.62 → django_components-0.63}/src/django_components/safer_staticfiles/apps.py
RENAMED
|
File without changes
|
|
File without changes
|
{django_components-0.62 → django_components-0.63}/src/django_components/templatetags/__init__.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{django_components-0.62 → django_components-0.63}/src/django_components.egg-info/SOURCES.txt
RENAMED
|
File without changes
|
|
File without changes
|
{django_components-0.62 → django_components-0.63}/src/django_components.egg-info/requires.txt
RENAMED
|
File without changes
|
{django_components-0.62 → django_components-0.63}/src/django_components.egg-info/top_level.txt
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|