djhtmx 1.2.2__tar.gz → 1.2.4__tar.gz

{djhtmx-1.2.2 → djhtmx-1.2.4}/CHANGELOG.md

@@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.2.3] - 2025-10-09
+
+### Fixed
+- Fixed OOB tag to use component ID directly instead of context 'id' key for more consistent behavior
+
+### Changed
+- Refactored context merging logic in Repository.render() for better code clarity
+- Removed CSRF meta tags
+
 ## [1.2.2] - 2025-10-06
 
 ### Fixed

{djhtmx-1.2.2 → djhtmx-1.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: djhtmx
-Version: 1.2.2
+Version: 1.2.4
 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 → djhtmx-1.2.4}/src/djhtmx/__init__.py

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

{djhtmx-1.2.2 → djhtmx-1.2.4}/src/djhtmx/command_queue.py

@@ -124,12 +124,12 @@ class CommandQueue:
         match command:
             case Execute():
                 return 0, "", 0
+            case Destroy(component_id):
+                return 1, component_id, 0
             case Signal(_, timestamp):
-                return 1, "", timestamp
-            case Emit(_, timestamp):
                 return 2, "", timestamp
-            case Destroy():
-                return 3, "", 0
+            case Emit(_, timestamp):
+                return 3, "", timestamp
             case SkipRender():
                 return 4, "", 0
             case BuildAndRender(_, _, _, _, timestamp):

{djhtmx-1.2.2 → djhtmx-1.2.4}/src/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-1.2.2 → djhtmx-1.2.4}/src/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-1.2.2 → djhtmx-1.2.4}/src/djhtmx/templatetags/htmx.py

@@ -138,7 +138,8 @@ 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)))
+    component_id = component.id if (component := context.get("this")) else None
+    id = "-".join(filter(None, (component_id, suffix)))
     return format_html_attrs({"id": id, "hx-swap-oob": "true" if oob else None})