djhtmx 1.2.7__tar.gz → 1.2.9__tar.gz

{djhtmx-1.2.7 → djhtmx-1.2.9}/CHANGELOG.md

@@ -7,6 +7,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.2.9] - 2026-01-07
+
+### Added
+- **ScrollIntoView Command**: New command that scrolls elements into view with configurable behavior (`auto`, `smooth`, `instant`) and block alignment (`start`, `center`, `end`, `nearest`). Includes WebSocket and HTTP trigger support with strict Python typing via Literal types.
+
+### Changed
+- **Import Error Handling**: Import errors during HTMX module autodiscovery are no longer suppressed. This change improves error visibility and helps catch import issues in user code earlier. Previously, import errors were silently caught, which could hide configuration or dependency problems.
+- Refactored `django.js` to use modern JavaScript patterns (for...of loops, const declarations) for improved code quality and maintainability
+
+## [1.2.8] - 2026-01-06
+
+### Added
+- Added idiomorph extension (idiomorph-ext.min.js) for HTMX 2.0.4
+
 ## [1.2.7] - 2026-01-05
 
 ### Changed

{djhtmx-1.2.7 → djhtmx-1.2.9}/PKG-INFO

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

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

{djhtmx-1.2.7 → djhtmx-1.2.9}/src/djhtmx/command_queue.py

@@ -16,6 +16,7 @@ from .component import (
     Open,
     Redirect,
     Render,
+    ScrollIntoView,
     Signal,
     SkipRender,
 )
@@ -86,6 +87,7 @@ class CommandQueue:
                     | Emit()
                     | SkipRender()
                     | Focus()
+                    | ScrollIntoView()
                     | Redirect()
                     | DispatchDOMEvent()
                     | Open()
@@ -139,7 +141,15 @@ class CommandQueue:
                     return 6, component.id, timestamp
                 else:
                     return 7, component.id, timestamp
-            case Focus() | Redirect() | DispatchDOMEvent() | Open() | ReplaceURL() | PushURL():
+            case (
+                Focus()
+                | ScrollIntoView()
+                | Redirect()
+                | DispatchDOMEvent()
+                | Open()
+                | ReplaceURL()
+                | PushURL()
+            ):
                 return 8, "", 0
             case _ as unreachable:
                 assert_never(unreachable)

{djhtmx-1.2.7 → djhtmx-1.2.9}/src/djhtmx/component.py

@@ -89,6 +89,16 @@ class Focus:
     command: Literal["focus"] = "focus"
 
 
+@dataclass(slots=True)
+class ScrollIntoView:
+    "Scrolls the browser element that matches `selector` into view"
+
+    selector: str
+    behavior: Literal["auto", "smooth", "instant"] = "smooth"
+    block: Literal["start", "center", "end", "nearest"] = "center"
+    command: Literal["scroll_into_view"] = "scroll_into_view"
+
+
 @dataclass(slots=True)
 class Execute:
     component_id: str
@@ -126,34 +136,62 @@ class BuildAndRender:
 
     @classmethod
     def append(
-        cls, target_: str, component_: type[HtmxComponent], parent_id: str | None = None, **state
+        cls,
+        target_: str,
+        component_: type[HtmxComponent],
+        parent_id: str | None = None,
+        **state,
     ):
         return cls(
-            component=component_, state=state, oob=f"beforeend: {target_}", parent_id=parent_id
+            component=component_,
+            state=state,
+            oob=f"beforeend: {target_}",
+            parent_id=parent_id,
         )
 
     @classmethod
     def prepend(
-        cls, target_: str, component_: type[HtmxComponent], parent_id: str | None = None, **state
+        cls,
+        target_: str,
+        component_: type[HtmxComponent],
+        parent_id: str | None = None,
+        **state,
     ):
         return cls(
-            component=component_, state=state, oob=f"afterbegin: {target_}", parent_id=parent_id
+            component=component_,
+            state=state,
+            oob=f"afterbegin: {target_}",
+            parent_id=parent_id,
         )
 
     @classmethod
     def after(
-        cls, target_: str, component_: type[HtmxComponent], parent_id: str | None = None, **state
+        cls,
+        target_: str,
+        component_: type[HtmxComponent],
+        parent_id: str | None = None,
+        **state,
     ):
         return cls(
-            component=component_, state=state, oob=f"afterend: {target_}", parent_id=parent_id
+            component=component_,
+            state=state,
+            oob=f"afterend: {target_}",
+            parent_id=parent_id,
         )
 
     @classmethod
     def before(
-        cls, target_: str, component_: type[HtmxComponent], parent_id: str | None = None, **state
+        cls,
+        target_: str,
+        component_: type[HtmxComponent],
+        parent_id: str | None = None,
+        **state,
     ):
         return cls(
-            component=component_, state=state, oob=f"beforebegin: {target_}", parent_id=parent_id
+            component=component_,
+            state=state,
+            oob=f"beforebegin: {target_}",
+            parent_id=parent_id,
         )
 
     @classmethod
@@ -191,6 +229,7 @@ Command = (
     Destroy
     | Redirect
     | Focus
+    | ScrollIntoView
     | DispatchDOMEvent
     | SkipRender
     | BuildAndRender
@@ -249,7 +288,10 @@ def get_template(template: str) -> RenderFunction:  # pragma: no cover
         return cast(RenderFunction, _compose(loader.get_template(template).render, mark_safe))
     else:
         if (render := RENDER_FUNC.get(template)) is None:
-            render = cast(RenderFunction, _compose(loader.get_template(template).render, mark_safe))
+            render = cast(
+                RenderFunction,
+                _compose(loader.get_template(template).render, mark_safe),
+            )
             RENDER_FUNC[template] = render
         return render
 

{djhtmx-1.2.7 → djhtmx-1.2.9}/src/djhtmx/consumer.py

@@ -6,7 +6,7 @@ from pydantic import BaseModel, TypeAdapter
 
 from . import json
 from .commands import PushURL, ReplaceURL, SendHtml
-from .component import Command, Destroy, DispatchDOMEvent, Focus, Open, Redirect
+from .component import Command, Destroy, DispatchDOMEvent, Focus, Open, Redirect, ScrollIntoView
 from .introspection import parse_request_data
 from .repo import Repository
 from .utils import get_params
@@ -58,6 +58,7 @@ class Consumer(AsyncJsonWebsocketConsumer):
                         Destroy()
                         | Redirect()
                         | Focus()
+                        | ScrollIntoView()
                         | DispatchDOMEvent()
                         | PushURL()
                         | Open()

{djhtmx-1.2.7 → djhtmx-1.2.9}/src/djhtmx/repo.py

@@ -35,6 +35,7 @@ from .component import (
     Open,
     Redirect,
     Render,
+    ScrollIntoView,
     Signal,
     SkipRender,
     _get_query_patchers,
@@ -56,7 +57,15 @@ logger = logging.getLogger(__name__)
 
 
 ProcessedCommand = (
-    Destroy | Redirect | Open | Focus | DispatchDOMEvent | SendHtml | PushURL | ReplaceURL
+    Destroy
+    | Redirect
+    | Open
+    | Focus
+    | ScrollIntoView
+    | DispatchDOMEvent
+    | SendHtml
+    | PushURL
+    | ReplaceURL
 )
 
 
@@ -296,6 +305,7 @@ class Repository:
                 | PushURL()
                 | Redirect()
                 | Focus()
+                | ScrollIntoView()
                 | DispatchDOMEvent() as command
             ):
                 commands.processing_component_id = ""

djhtmx-1.2.9/src/djhtmx/static/htmx/2.0.4/ext/idiomorph-ext.min.js

@@ -0,0 +1 @@
+var Idiomorph=function(){"use strict";const e=()=>{};const n={morphStyle:"outerHTML",callbacks:{beforeNodeAdded:e,afterNodeAdded:e,beforeNodeMorphed:e,afterNodeMorphed:e,beforeNodeRemoved:e,afterNodeRemoved:e,beforeAttributeUpdated:e},head:{style:"merge",shouldPreserve:e=>e.getAttribute("im-preserve")==="true",shouldReAppend:e=>e.getAttribute("im-re-append")==="true",shouldRemove:e,afterHeadMorphed:e},restoreFocus:true};function t(t,e,n={}){t=d(t);const r=f(e);const i=c(t,r,n);const o=a(i,()=>{return u(i,t,r,e=>{if(e.morphStyle==="innerHTML"){s(e,t,r);return Array.from(t.childNodes)}else{return l(e,t,r)}})});i.pantry.remove();return o}function l(e,t,n){const r=f(t);s(e,r,n,t,t.nextSibling);return Array.from(r.childNodes)}function a(e,t){if(!e.config.restoreFocus)return t();let n=document.activeElement;if(!(n instanceof HTMLInputElement||n instanceof HTMLTextAreaElement)){return t()}const{id:r,selectionStart:i,selectionEnd:o}=n;const l=t();if(r&&r!==document.activeElement?.getAttribute("id")){n=e.target.querySelector(`[id="${r}"]`);n?.focus()}if(n&&!n.selectionEnd&&o){n.setSelectionRange(i,o)}return l}const s=function(){function e(e,t,n,r=null,i=null){if(t instanceof HTMLTemplateElement&&n instanceof HTMLTemplateElement){t=t.content;n=n.content}r||=t.firstChild;for(const o of n.childNodes){if(r&&r!=i){const a=f(e,o,r,i);if(a){if(a!==r){h(e,r,a)}b(a,o,e);r=a.nextSibling;continue}}if(o instanceof Element){const s=o.getAttribute("id");if(e.persistentIds.has(s)){const u=p(t,s,r,e);b(u,o,e);r=u.nextSibling;continue}}const l=d(t,o,r,e);if(l){r=l.nextSibling}}while(r&&r!=i){const c=r;r=r.nextSibling;m(e,c)}}function d(e,t,n,r){if(r.callbacks.beforeNodeAdded(t)===false)return null;if(r.idMap.has(t)){const i=document.createElement(t.tagName);e.insertBefore(i,n);b(i,t,r);r.callbacks.afterNodeAdded(i);return i}else{const o=document.importNode(t,true);e.insertBefore(o,n);r.callbacks.afterNodeAdded(o);return o}}const f=function(){function e(e,t,n,r){let i=null;let o=t.nextSibling;let l=0;let a=n;while(a&&a!=r){if(u(a,t)){if(s(e,a,t)){return a}if(i===null){if(!e.idMap.has(a)){i=a}}}if(i===null&&o&&u(a,o)){l++;o=o.nextSibling;if(l>=2){i=undefined}}if(e.activeElementAndParents.includes(a))break;a=a.nextSibling}return i||null}function s(e,t,n){let r=e.idMap.get(t);let i=e.idMap.get(n);if(!i||!r)return false;for(const o of r){if(i.has(o)){return true}}return false}function u(e,t){const n=e;const r=t;return n.nodeType===r.nodeType&&n.tagName===r.tagName&&(!n.getAttribute?.("id")||n.getAttribute?.("id")===r.getAttribute?.("id"))}return e}();function m(e,t){if(e.idMap.has(t)){l(e.pantry,t,null)}else{if(e.callbacks.beforeNodeRemoved(t)===false)return;t.parentNode?.removeChild(t);e.callbacks.afterNodeRemoved(t)}}function h(t,e,n){let r=e;while(r&&r!==n){let e=r;r=r.nextSibling;m(t,e)}return r}function p(e,t,n,r){const i=r.target.getAttribute?.("id")===t&&r.target||r.target.querySelector(`[id="${t}"]`)||r.pantry.querySelector(`[id="${t}"]`);o(i,r);l(e,i,n);return i}function o(t,n){const r=t.getAttribute("id");while(t=t.parentNode){let e=n.idMap.get(t);if(e){e.delete(r);if(!e.size){n.idMap.delete(t)}}}}function l(t,n,r){if(t.moveBefore){try{t.moveBefore(n,r)}catch(e){t.insertBefore(n,r)}}else{t.insertBefore(n,r)}}return e}();const b=function(){function e(e,t,n){if(n.ignoreActive&&e===document.activeElement){return null}if(n.callbacks.beforeNodeMorphed(e,t)===false){return e}if(e instanceof HTMLHeadElement&&n.head.ignore){}else if(e instanceof HTMLHeadElement&&n.head.style!=="morph"){m(e,t,n)}else{r(e,t,n);if(!f(e,n)){s(n,e,t)}}n.callbacks.afterNodeMorphed(e,t);return e}function r(e,t,n){let r=t.nodeType;if(r===1){const i=e;const o=t;const l=i.attributes;const a=o.attributes;for(const s of a){if(d(s.name,i,"update",n)){continue}if(i.getAttribute(s.name)!==s.value){i.setAttribute(s.name,s.value)}}for(let e=l.length-1;0<=e;e--){const u=l[e];if(!u)continue;if(!o.hasAttribute(u.name)){if(d(u.name,i,"remove",n)){continue}i.removeAttribute(u.name)}}if(!f(i,n)){c(i,o,n)}}if(r===8||r===3){if(e.nodeValue!==t.nodeValue){e.nodeValue=t.nodeValue}}}function c(n,r,i){if(n instanceof HTMLInputElement&&r instanceof HTMLInputElement&&r.type!=="file"){let e=r.value;let t=n.value;o(n,r,"checked",i);o(n,r,"disabled",i);if(!r.hasAttribute("value")){if(!d("value",n,"remove",i)){n.value="";n.removeAttribute("value")}}else if(t!==e){if(!d("value",n,"update",i)){n.setAttribute("value",e);n.value=e}}}else if(n instanceof HTMLOptionElement&&r instanceof HTMLOptionElement){o(n,r,"selected",i)}else if(n instanceof HTMLTextAreaElement&&r instanceof HTMLTextAreaElement){let e=r.value;let t=n.value;if(d("value",n,"update",i)){return}if(e!==t){n.value=e}if(n.firstChild&&n.firstChild.nodeValue!==e){n.firstChild.nodeValue=e}}}function o(e,t,n,r){const i=t[n],o=e[n];if(i!==o){const l=d(n,e,"update",r);if(!l){e[n]=t[n]}if(i){if(!l){e.setAttribute(n,"")}}else{if(!d(n,e,"remove",r)){e.removeAttribute(n)}}}}function d(e,t,n,r){if(e==="value"&&r.ignoreActiveValue&&t===document.activeElement){return true}return r.callbacks.beforeAttributeUpdated(e,t,n)===false}function f(e,t){return!!t.ignoreActiveValue&&e===document.activeElement&&e!==document.body}return e}();function u(t,e,n,r){if(t.head.block){const i=e.querySelector("head");const o=n.querySelector("head");if(i&&o){const l=m(i,o,t);return Promise.all(l).then(()=>{const e=Object.assign(t,{head:{block:false,ignore:true}});return r(e)})}}return r(t)}function m(e,t,r){let i=[];let o=[];let l=[];let a=[];let s=new Map;for(const n of t.children){s.set(n.outerHTML,n)}for(const c of e.children){let e=s.has(c.outerHTML);let t=r.head.shouldReAppend(c);let n=r.head.shouldPreserve(c);if(e||n){if(t){o.push(c)}else{s.delete(c.outerHTML);l.push(c)}}else{if(r.head.style==="append"){if(t){o.push(c);a.push(c)}}else{if(r.head.shouldRemove(c)!==false){o.push(c)}}}}a.push(...s.values());let u=[];for(const d of a){let n=document.createRange().createContextualFragment(d.outerHTML).firstChild;if(r.callbacks.beforeNodeAdded(n)!==false){if("href"in n&&n.href||"src"in n&&n.src){let t;let e=new Promise(function(e){t=e});n.addEventListener("load",function(){t()});u.push(e)}e.appendChild(n);r.callbacks.afterNodeAdded(n);i.push(n)}}for(const f of o){if(r.callbacks.beforeNodeRemoved(f)!==false){e.removeChild(f);r.callbacks.afterNodeRemoved(f)}}r.head.afterHeadMorphed(e,{added:i,kept:l,removed:o});return u}const c=function(){function e(e,t,n){const{persistentIds:r,idMap:i}=f(e,t);const o=a(n);const l=o.morphStyle||"outerHTML";if(!["innerHTML","outerHTML"].includes(l)){throw`Do not understand how to morph style ${l}`}return{target:e,newContent:t,config:o,morphStyle:l,ignoreActive:o.ignoreActive,ignoreActiveValue:o.ignoreActiveValue,restoreFocus:o.restoreFocus,idMap:i,persistentIds:r,pantry:s(),activeElementAndParents:u(e),callbacks:o.callbacks,head:o.head}}function a(e){let t=Object.assign({},n);Object.assign(t,e);t.callbacks=Object.assign({},n.callbacks,e.callbacks);t.head=Object.assign({},n.head,e.head);return t}function s(){const e=document.createElement("div");e.hidden=true;document.body.insertAdjacentElement("afterend",e);return e}function u(e){let t=[];let n=document.activeElement;if(n?.tagName!=="BODY"&&e.contains(n)){while(n){t.push(n);if(n===e)break;n=n.parentElement}}return t}function c(e){let t=Array.from(e.querySelectorAll("[id]"));if(e.getAttribute?.("id")){t.push(e)}return t}function d(n,e,r,t){for(const i of t){const o=i.getAttribute("id");if(e.has(o)){let t=i;while(t){let e=n.get(t);if(e==null){e=new Set;n.set(t,e)}e.add(o);if(t===r)break;t=t.parentElement}}}}function f(e,t){const n=c(e);const r=c(t);const i=m(n,r);let o=new Map;d(o,i,e,n);const l=t.__idiomorphRoot||t;d(o,i,l,r);return{persistentIds:i,idMap:o}}function m(e,t){let n=new Set;let r=new Map;for(const{id:o,tagName:l}of e){if(r.has(o)){n.add(o)}else{r.set(o,l)}}let i=new Set;for(const{id:o,tagName:l}of t){if(i.has(o)){n.add(o)}else if(r.get(o)===l){i.add(o)}}for(const o of n){i.delete(o)}return i}return e}();const{normalizeElement:d,normalizeParent:f}=function(){const i=new WeakSet;function e(e){if(e instanceof Document){return e.documentElement}else{return e}}function r(e){if(e==null){return document.createElement("div")}else if(typeof e==="string"){return r(l(e))}else if(i.has(e)){return e}else if(e instanceof Node){if(e.parentNode){return new o(e)}else{const t=document.createElement("div");t.append(e);return t}}else{const t=document.createElement("div");for(const n of[...e]){t.append(n)}return t}}class o{constructor(e){this.originalNode=e;this.realParentNode=e.parentNode;this.previousSibling=e.previousSibling;this.nextSibling=e.nextSibling}get childNodes(){const e=[];let t=this.previousSibling?this.previousSibling.nextSibling:this.realParentNode.firstChild;while(t&&t!=this.nextSibling){e.push(t);t=t.nextSibling}return e}querySelectorAll(r){return this.childNodes.reduce((t,e)=>{if(e instanceof Element){if(e.matches(r))t.push(e);const n=e.querySelectorAll(r);for(let e=0;e<n.length;e++){t.push(n[e])}}return t},[])}insertBefore(e,t){return this.realParentNode.insertBefore(e,t)}moveBefore(e,t){return this.realParentNode.moveBefore(e,t)}get __idiomorphRoot(){return this.originalNode}}function l(n){let r=new DOMParser;let e=n.replace(/<svg(\s[^>]*>|>)([\s\S]*?)<\/svg>/gim,"");if(e.match(/<\/html>/)||e.match(/<\/head>/)||e.match(/<\/body>/)){let t=r.parseFromString(n,"text/html");if(e.match(/<\/html>/)){i.add(t);return t}else{let e=t.firstChild;if(e){i.add(e)}return e}}else{let e=r.parseFromString("<body><template>"+n+"</template></body>","text/html");let t=e.body.querySelector("template").content;i.add(t);return t}}return{normalizeElement:e,normalizeParent:r}}();return{morph:t,defaults:n}}();(function(){function i(e){if(e==="morph"||e==="morph:outerHTML"){return{morphStyle:"outerHTML"}}else if(e==="morph:innerHTML"){return{morphStyle:"innerHTML"}}else if(e.startsWith("morph:")){return Function("return ("+e.slice(6)+")")()}}htmx.defineExtension("morph",{isInlineSwap:function(e){let t=i(e);return t?.morphStyle==="outerHTML"||t?.morphStyle==null},handleSwap:function(e,t,n){let r=i(e);if(r){return Idiomorph.morph(t,n.children,r)}}})})();

djhtmx-1.2.9/src/djhtmx/static/htmx/django.js

@@ -0,0 +1,222 @@
+(() => {
+	// WebSocket Management
+	const sentComponents = new Set();
+
+	function sendRemovedComponents(event) {
+		const removedComponents = Array.from(sentComponents).filter(
+			(id) => !document.getElementById(id),
+		);
+		for (const id of removedComponents) {
+			sentComponents.delete(id);
+		}
+		if (removedComponents.length) {
+			event.detail.socketWrapper.send(
+				JSON.stringify({
+					type: "removed",
+					component_ids: removedComponents,
+				}),
+			);
+		}
+	}
+
+	function sendAddedComponents(event) {
+		const states = [];
+		const subscriptions = new Map();
+		const ids = new Set();
+
+		for (const element of Array.from(
+			document.querySelectorAll("[data-hx-state]"),
+		).filter((el) => !sentComponents.has(el.id))) {
+			const hxSubscriptions = element.dataset.hxSubscriptions;
+			if (hxSubscriptions !== undefined) {
+				subscriptions[element.id] = element.dataset.hxSubscriptions;
+			}
+			states.push(element.dataset.hxState);
+			ids.add(element.id);
+		}
+		for (const id of ids) {
+			sentComponents.add(id);
+		}
+
+		if (ids.size) {
+			event.detail.socketWrapper.send(
+				JSON.stringify({
+					type: "added",
+					states,
+					subscriptions,
+				}),
+			);
+		}
+	}
+
+	function removeHtmxIndicator() {
+		// remove indicator
+		for (const el of document.querySelectorAll(".htmx-request")) {
+			el.classList.remove("htmx-request");
+		}
+	}
+
+	document.addEventListener("htmx:wsOpen", (event) => {
+		console.log("OPEN", event);
+		sentComponents.clear();
+		removeHtmxIndicator();
+	});
+
+	document.addEventListener("htmx:wsClose", (event) => {
+		console.log("CLOSE", event);
+		sentComponents.clear();
+		removeHtmxIndicator();
+	});
+
+	document.addEventListener("htmx:wsConfigSend", (event) => {
+		// add indicator
+		const indicatorSelector = event.detail.elt
+			.closest("[hx-indicator]")
+			?.getAttribute("hx-indicator");
+		if (indicatorSelector) {
+			for (const el of document.querySelectorAll(indicatorSelector)) {
+				el.classList.add("htmx-request");
+			}
+		}
+
+		// send current state
+		sendRemovedComponents(event);
+		sendAddedComponents(event);
+
+		// enrich event message
+		event.detail.headers["HX-Component-Id"] =
+			event.detail.elt.closest("[data-hx-state]").id;
+		event.detail.headers["HX-Component-Handler"] =
+			event.detail.elt.getAttribute("ws-send");
+	});
+
+	document.addEventListener("htmx:wsBeforeMessage", (event) => {
+		removeHtmxIndicator();
+
+		// process message
+		if (event.detail.message.startsWith("{")) {
+			const commandData = JSON.parse(event.detail.message);
+			event.preventDefault();
+			const { command } = commandData;
+			switch (command) {
+				case "destroy": {
+					const { component_id } = commandData;
+					document.getElementById(component_id)?.remove();
+					break;
+				}
+				case "focus": {
+					const { selector } = commandData;
+					document.querySelector(selector)?.focus();
+					break;
+				}
+				case "scroll_into_view": {
+					const { selector, behavior = "smooth", block = "center" } = commandData;
+					document.querySelector(selector)?.scrollIntoView({
+						behavior,
+						block,
+					});
+					break;
+				}
+				case "redirect": {
+					const { url } = commandData;
+					location.assign(url);
+					break;
+				}
+				case "dispatch_event": {
+					const { target, detail, buubles, cancelable, composed } = commandData;
+					document.querySelector(target)?.dispatchEvent(
+						new CustomEvent(event, {
+							detail,
+							buubles,
+							cancelable,
+							composed,
+						}),
+					);
+					break;
+				}
+				case "send_state": {
+					const { component_id, state } = commandData;
+					const component = document.getElementById(component_id);
+					if (component) {
+						component.dataset.hxState = state;
+					}
+					break;
+				}
+				case "push_url": {
+					const { url } = commandData;
+					history.pushState({}, document.title, url);
+					break;
+				}
+
+				default:
+					console.error("Can't process command:", event.detail.message);
+					break;
+			}
+		}
+	});
+
+	document.addEventListener("hxDispatchDOMEvent", (event) => {
+		for (const {
+			event: eventName,
+			target,
+			detail,
+			bubbles,
+			cancelable,
+			composed,
+		} of event.detail.value) {
+			const el = document.querySelector(target);
+			if (el) {
+				// This setTimeout basically queues the dispatch of the event
+				// to avoid dispatching events within events handlers.
+				setTimeout(
+					() =>
+						el.dispatchEvent(
+							new CustomEvent(eventName, {
+								detail,
+								bubbles,
+								cancelable,
+								composed,
+							}),
+						),
+					0,
+				);
+			}
+		}
+	});
+
+	document.addEventListener("hxFocus", (event) => {
+		for (const selector of event.detail.value) {
+			document.querySelector(selector).focus();
+		}
+	});
+
+	document.addEventListener("hxScrollIntoView", (event) => {
+		for (const item of event.detail.value) {
+			const selector = typeof item === "string" ? item : item.selector;
+			const behavior = typeof item === "object" ? item.behavior || "smooth" : "smooth";
+			const block = typeof item === "object" ? item.block || "center" : "center";
+			document.querySelector(selector)?.scrollIntoView({
+				behavior,
+				block,
+			});
+		}
+	});
+
+	document.addEventListener("hxOpenURL", (event) => {
+		for (const { url, name, target, rel } of event.detail.value) {
+			const link = document.createElement("a");
+			link.href = url;
+			link.target = target || "_blank";
+			if (name) {
+				link.download = name;
+			}
+			if (rel) {
+				link.rel = rel;
+			}
+			link.click();
+		}
+	});
+})();
+// Local Variables:
+// js-indent-level: 4
+// End:

{djhtmx-1.2.7 → djhtmx-1.2.9}/src/djhtmx/testing.py

@@ -13,7 +13,15 @@ from pygments.lexers import HtmlLexer
 
 from . import json
 from .commands import PushURL, ReplaceURL, SendHtml
-from .component import Destroy, DispatchDOMEvent, Focus, HtmxComponent, Open, Redirect
+from .component import (
+    Destroy,
+    DispatchDOMEvent,
+    Focus,
+    HtmxComponent,
+    Open,
+    Redirect,
+    ScrollIntoView,
+)
 from .introspection import parse_request_data
 from .repo import Repository, Session, signer
 from .utils import get_params
@@ -187,7 +195,7 @@ class Htmx:
                     self.path = parsed_url.path
                     self.query_string = parsed_url.query
 
-                case Focus() | DispatchDOMEvent():
+                case Focus() | ScrollIntoView() | DispatchDOMEvent():
                     pass
 
         if navigate_to_url:

{djhtmx-1.2.7 → djhtmx-1.2.9}/src/djhtmx/urls.py

@@ -11,7 +11,16 @@ from django.utils.html import format_html
 from django.views.decorators.csrf import csrf_exempt
 
 from .commands import PushURL, ReplaceURL, SendHtml
-from .component import REGISTRY, Destroy, DispatchDOMEvent, Focus, Open, Redirect, Triggers
+from .component import (
+    REGISTRY,
+    Destroy,
+    DispatchDOMEvent,
+    Focus,
+    Open,
+    Redirect,
+    ScrollIntoView,
+    Triggers,
+)
 from .consumer import Consumer
 from .introspection import parse_request_data
 from .repo import Repository
@@ -53,6 +62,11 @@ def endpoint(request: HttpRequest, component_name: str, component_id: str, event
                     headers["HX-Redirect"] = url
                 case Focus(selector):
                     triggers.after_settle("hxFocus", selector)
+                case ScrollIntoView(selector, behavior, block):
+                    triggers.after_settle(
+                        "hxScrollIntoView",
+                        {"selector": selector, "behavior": behavior, "block": block},
+                    )
                 case Open(url, name, target, rel):
                     triggers.after_settle(
                         "hxOpenURL",

{djhtmx-1.2.7 → djhtmx-1.2.9}/src/djhtmx/utils.py

@@ -1,5 +1,5 @@
-import contextlib
 import importlib
+import logging
 import pkgutil
 import typing as t
 from urllib.parse import urlparse
@@ -129,17 +129,20 @@ def autodiscover_htmx_modules():
     - htmx.py files (like standard autodiscover_modules("htmx"))
     - All Python files under htmx/ directories in apps (recursively)
     """
-
-    def _import_modules_recursively(module_name):
-        """Recursively import a module and all its submodules."""
-        with contextlib.suppress(ImportError):
-            module = importlib.import_module(module_name)
-
-            # If this is a package, recursively import all modules in it
-            if hasattr(module, "__path__"):
-                for _finder, submodule_name, _is_pkg in pkgutil.iter_modules(module.__path__):
-                    _import_modules_recursively(f"{module_name}.{submodule_name}")
-
     for app_config in apps.get_app_configs():
-        # Import htmx module and all its submodules recursively
-        _import_modules_recursively(f"{app_config.name}.htmx")
+        module_name = f"{app_config.module.__name__}.htmx"
+        try:
+            module = importlib.import_module(module_name)
+        except ImportError:
+            logger.warning("Could not import %s", module_name)
+            continue
+        if hasattr(module, "__path__"):
+            # If it's a package, recursively walk it importing all modules and packages.
+            for info in pkgutil.walk_packages(module.__path__, prefix=module_name + "."):
+                if not info.ispkg:
+                    # `walk_packages` only imports packages, not modules; we need to import them
+                    # all.
+                    importlib.import_module(info.name)
+
+
+logger = logging.getLogger(__name__)

djhtmx-1.2.7/src/djhtmx/static/htmx/django.js

@@ -1,198 +0,0 @@
-(function () {
-    // WebSocket Management
-    let sentComponents = new Set();
-
-    function sendRemovedComponents(event) {
-        let removedComponents = Array.from(sentComponents).filter(
-            (id) => !document.getElementById(id),
-        );
-        removedComponents.forEach((id) => sentComponents.delete(id));
-        if (removedComponents.length) {
-            event.detail.socketWrapper.send(
-                JSON.stringify({
-                    type: "removed",
-                    component_ids: removedComponents,
-                }),
-            );
-        }
-    }
-
-    function sendAddedComponents(event) {
-        let states = [];
-        let subscriptions = new Map();
-        let ids = new Set();
-
-        Array.from(document.querySelectorAll("[data-hx-state]"))
-            .filter((el) => !sentComponents.has(el.id))
-            .forEach((element) => {
-                let hxSubscriptions = element.dataset.hxSubscriptions;
-                if (hxSubscriptions !== undefined) {
-                    subscriptions[element.id] = element.dataset.hxSubscriptions;
-                }
-                states.push(element.dataset.hxState);
-                ids.add(element.id);
-            });
-        ids.forEach((id) => sentComponents.add(id));
-
-        if (ids.size) {
-            event.detail.socketWrapper.send(
-                JSON.stringify({
-                    type: "added",
-                    states,
-                    subscriptions,
-                }),
-            );
-        }
-    }
-
-    function removeHtmxIndicator() {
-        // remove indicator
-        document
-            .querySelectorAll(".htmx-request")
-            .forEach((el) => el.classList.remove("htmx-request"));
-    }
-
-    document.addEventListener("htmx:wsOpen", (event) => {
-        console.log("OPEN", event);
-        sentComponents.clear();
-        removeHtmxIndicator();
-    });
-
-    document.addEventListener("htmx:wsClose", (event) => {
-        console.log("CLOSE", event);
-        sentComponents.clear();
-        removeHtmxIndicator();
-    });
-
-    document.addEventListener("htmx:wsConfigSend", (event) => {
-        // add indicator
-        let indicatorSelector = event.detail.elt
-            .closest("[hx-indicator]")
-            ?.getAttribute("hx-indicator");
-        if (indicatorSelector) {
-            document
-                .querySelectorAll(indicatorSelector)
-                .forEach((el) => el.classList.add("htmx-request"));
-        }
-
-        // send current state
-        sendRemovedComponents(event);
-        sendAddedComponents(event);
-
-        // enrich event message
-        event.detail.headers["HX-Component-Id"] =
-            event.detail.elt.closest("[data-hx-state]").id;
-        event.detail.headers["HX-Component-Handler"] =
-            event.detail.elt.getAttribute("ws-send");
-    });
-
-    document.addEventListener("htmx:wsBeforeMessage", (event) => {
-        removeHtmxIndicator();
-
-        // process message
-        if (event.detail.message.startsWith("{")) {
-            let commandData = JSON.parse(event.detail.message);
-            event.preventDefault();
-            let { command } = commandData;
-            switch (command) {
-                case "destroy": {
-                    let { component_id } = commandData;
-                    document.getElementById(component_id)?.remove();
-                    break;
-                }
-                case "focus": {
-                    let { selector } = commandData;
-                    document.querySelector(selector)?.focus();
-                    break;
-                }
-                case "redirect": {
-                    let { url } = commandData;
-                    location.assign(url);
-                    break;
-                }
-                case "dispatch_event": {
-                    let = { target, detail, buubles, cancelable, composed } =
-                        commandData;
-                    document.querySelector(target)?.dispatchEvent(
-                        new CustomEvent(event, {
-                            detail,
-                            buubles,
-                            cancelable,
-                            composed,
-                        }),
-                    );
-                    break;
-                }
-                case "send_state": {
-                    let { component_id, state } = commandData;
-                    let component = document.getElementById(component_id);
-                    if (component) {
-                        component.dataset.hxState = state;
-                    }
-                    break;
-                }
-                case "push_url": {
-                    let { url } = commandData;
-                    history.pushState({}, document.title, url);
-                    break;
-                }
-
-                default:
-                    console.error(
-                        "Can't process command:",
-                        event.detail.message,
-                    );
-                    break;
-            }
-        }
-    });
-
-    document.addEventListener("hxDispatchDOMEvent", (event) => {
-        event.detail.value.map(
-            ({ event, target, detail, bubbles, cancelable, composed }) => {
-                let el = document.querySelector(target);
-                if (typeof el != "undefined" && el != null) {
-                    // This setTimeout basically queues the dispatch of the event
-                    // to avoid dispatching events within events handlers.
-                    setTimeout(
-                        () =>
-                            el.dispatchEvent(
-                                new CustomEvent(event, {
-                                    detail,
-                                    bubbles,
-                                    cancelable,
-                                    composed,
-                                }),
-                            ),
-                        0,
-                    );
-                }
-            },
-        );
-    });
-
-    document.addEventListener("hxFocus", (event) => {
-        event.detail.value.map((selector) => {
-            document.querySelector(selector).focus();
-        });
-    });
-
-    document.addEventListener("hxOpenURL", (event) => {
-        event.detail.value.map(({ url, name, target, rel }) => {
-            const link = document.createElement('a');
-            link.href = url;
-            link.target = !!target ? target : '_blank';
-            if (name) {
-                link.download = name;
-            }
-            if (rel) {
-                link.rel = rel;
-            }
-            link.click();
-        });
-    });
-
-})();
-// Local Variables:
-// js-indent-level: 4
-// End: