djhtmx 1.2.2__py3-none-any.whl → 1.2.3__py3-none-any.whl

djhtmx/__init__.py

@@ -1,4 +1,4 @@
 from .middleware import middleware
 
-__version__ = "1.2.2"
+__version__ = "1.2.3"
 __all__ = ("middleware",)

djhtmx/repo.py

@@ -438,7 +438,7 @@ class Repository:
         ):
             self.session.store(component)
 
-            base_context = {
+            final_context = {
                 "htmx_repo": self,
                 "hx_oob": oob == "true",
                 "this": component,
@@ -446,20 +446,9 @@ class Repository:
 
             if lazy:
                 template = template or component._template_name_lazy
-                base_context |= {"hx_lazy": True} | component._get_lazy_context()
+                final_context |= {"hx_lazy": True} | component._get_lazy_context() | (context or {})
             else:
-                base_context |= component._get_context()
-
-            # If context is provided, it should override the component context
-            if context is not None:
-                # Keep base_context (htmx_repo, hx_oob, this) but let provided context override everything else
-                final_context = {
-                    "htmx_repo": self,
-                    "hx_oob": oob == "true",
-                    "this": component,
-                } | context
-            else:
-                final_context = base_context
+                final_context |= component._get_context() if context is None else context
 
             html = mark_safe(component._get_template(template)(final_context).strip())
 

djhtmx/templates/htmx/headers.html

@@ -1,8 +1,6 @@
 {% load static %}
 
 {% if enabled %}
-  <meta name="django-csrf-header-name" content="{{ CSRF_HEADER_NAME }}" />
-  <meta name="django-csrf-token" content="{{ csrf_token }}" />
   {% for script_url in SCRIPT_URLS %}
     <script defer src="{% static script_url %}"></script>
   {% endfor %}

djhtmx/templatetags/htmx.py

@@ -138,7 +138,12 @@ def hx_tag(context: Context):
 def oob(context: Context, suffix: str):
     oob = context.get("hx_oob")
     context["hx_oob"] = False
-    id = "-".join(filter(None, (context.get("id"), suffix)))
+    if (component := context.get("this")):
+        component_id = component.id
+    else:
+        component_id = None
+
+    id = "-".join(filter(None, (component_id, suffix)))
     return format_html_attrs({"id": id, "hx-swap-oob": "true" if oob else None})
 
 

{djhtmx-1.2.2.dist-info → djhtmx-1.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: djhtmx
-Version: 1.2.2
+Version: 1.2.3
 Summary: Interactive UI Components for Django using HTMX
 Project-URL: Homepage, https://github.com/edelvalle/djhtmx
 Project-URL: Documentation, https://github.com/edelvalle/djhtmx#readme

{djhtmx-1.2.2.dist-info → djhtmx-1.2.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-djhtmx/__init__.py,sha256=l25O4H6NDgkxXNhFUfB5NRdVr6ewp4P6sM4cDCO4YXE,84
+djhtmx/__init__.py,sha256=hbGM57sddqXSUuq33t8onRR9gAZHabW9HMdpyZVjtRA,84
 djhtmx/apps.py,sha256=hAyjzmInEstxLY9k8Qn58LvNlezgQLx5_NqyVL1WwYs,323
 djhtmx/command_queue.py,sha256=kiYbQFPyjnhMSR7KgO1Nu-lWiapnH511P2Pyg-Zrdq4,4862
 djhtmx/commands.py,sha256=UxXbARd4Teetjh_zjvAWgI2KNbvdETH-WrGf4qD9Xr8,1206
@@ -11,7 +11,7 @@ djhtmx/introspection.py,sha256=flVolO6xZiXsxMm876ZCEcWRmVfFsJWpAVmIdfcJNf8,13734
 djhtmx/json.py,sha256=7cjwWIJj7e0dk54INKYZJe6zKkIW7wlsNSlD05cbXfY,1374
 djhtmx/middleware.py,sha256=JuMtv9ZnpungTvQ1qD2Lg6LiFPB3knQlA1ERgH4iGl0,1274
 djhtmx/query.py,sha256=UyjN1jokh4wTwQJxcRwA9f-Zn-A7A4GLToeGrCnPhKA,6674
-djhtmx/repo.py,sha256=KYYhZWomrKB512QBjjb2ThaUWbmq6SZsYvcrl3Z5nGY,22797
+djhtmx/repo.py,sha256=SpJK6KpxK9MraN29RvShaFt3ksifBAkv_gHUrxVkzIQ,22374
 djhtmx/settings.py,sha256=ymFUMvrcXDkYU9KkhPOjRZSQMWz5GcUjlgh07x09-1s,1242
 djhtmx/testing.py,sha256=AdZKsT6sNTsyqSKx6EmfthOIHzSAPkTquheMfg9znbk,8301
 djhtmx/tracing.py,sha256=xkCXb7t_3yCj1PGzmQfHPu9sYQftDKwtALaEbFVnQ1E,1260
@@ -26,11 +26,11 @@ djhtmx/static/htmx/2.0.4/htmx.esm.js,sha256=tHolTyBDgr3AbbT_ajWo1dGJCArqvxKRu55r
 djhtmx/static/htmx/2.0.4/htmx.js,sha256=ywqZv5HDa9054MnUZ3xXnoIC-aWNtfDFnJAIXqDkEnU,165563
 djhtmx/static/htmx/2.0.4/htmx.min.js,sha256=4gndpcgjVHnzFm3vx3UOHbzVpcGAi3eS_C5nM3aPtEc,50917
 djhtmx/static/htmx/2.0.4/ext/ws.js,sha256=HwUYFqEZBvs7Tx0_O0Bi-Dcmg5UOMlbMdkJ2FWeVpDA,14609
-djhtmx/templates/htmx/headers.html,sha256=rBQTBt9rnlxE8lgxN4U7nvzQZNw4JZKS4flD1VXeMx8,297
+djhtmx/templates/htmx/headers.html,sha256=z7r9klwBDXDyjbHrzatZeHDvXB2DaZhgu55CFbbD3d4,159
 djhtmx/templates/htmx/lazy.html,sha256=LfAThtKmFj-lCUZ7JWF_sC1Y6XsIpEz8A3IgWASn-J8,52
 djhtmx/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-djhtmx/templatetags/htmx.py,sha256=HlH7_B9lJoTDoIkYPeEE55OwpBTrrCesE70j1KcRC70,8063
-djhtmx-1.2.2.dist-info/METADATA,sha256=b4XSwBq9PCYhdREgZbH49y7R3WhpoEr2LYroDp5FtAY,32245
-djhtmx-1.2.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-djhtmx-1.2.2.dist-info/licenses/LICENSE,sha256=kCi_iSBUGsRZInQn96w7LXYzjiRjZ8FXl6vP--mFRPk,1085
-djhtmx-1.2.2.dist-info/RECORD,,
+djhtmx/templatetags/htmx.py,sha256=p9y9hZ2mAq7F-9lXTY4pMmOdML7jNOwGwf-eRNdDv4g,8176
+djhtmx-1.2.3.dist-info/METADATA,sha256=i95CIpDVornagEsXtxmri90a86BoT3ywUFcByzNcnhc,32245
+djhtmx-1.2.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+djhtmx-1.2.3.dist-info/licenses/LICENSE,sha256=kCi_iSBUGsRZInQn96w7LXYzjiRjZ8FXl6vP--mFRPk,1085
+djhtmx-1.2.3.dist-info/RECORD,,