pywebview-htmx 0.1.0__tar.gz → 0.2.1__tar.gz

{pywebview_htmx-0.1.0 → pywebview_htmx-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pywebview-htmx
-Version: 0.1.0
+Version: 0.2.1
 Summary: HTMX-style declarative UI bindings for PyWebview apps
 Author-Email: "B.T. Franklin" <brandon.franklin@gmail.com>
 License: MIT License

{pywebview_htmx-0.1.0 → pywebview_htmx-0.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pywebview-htmx"
-version = "0.1.0"
+dynamic = []
 description = "HTMX-style declarative UI bindings for PyWebview apps"
 authors = [
     { name = "B.T. Franklin", email = "brandon.franklin@gmail.com" },
@@ -21,6 +21,7 @@ classifiers = [
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Topic :: Internet :: WWW/HTTP",
 ]
+version = "0.2.1"
 
 [project.license]
 file = "LICENSE"
@@ -34,6 +35,9 @@ build-backend = "pdm.backend"
 [tool.pdm]
 distribution = true
 
+[tool.pdm.version]
+source = "scm"
+
 [tool.pdm.build]
 package-dir = "src"
 includes = [

{pywebview_htmx-0.1.0 → pywebview_htmx-0.2.1}/src/pywebview_htmx/runtime.py

@@ -6,7 +6,10 @@ from typing import Any
 
 import webview
 
-_SCRIPT_TAG_RE = re.compile(r"<script[^>]*\bdata-pywebview-htmx\b", re.IGNORECASE)
+_SCRIPT_TAG_RE = re.compile(
+    r"<script[^>]*\bdata-pywebview-htmx\s*=\s*(?:[\"']true[\"']|true\b)",
+    re.IGNORECASE,
+)
 _THEME_TAG_RE = re.compile(
     r"<style[^>]*\bdata-pywebview-theme\s*=\s*[\"'](?P<name>[^\"']+)[\"'][^>]*>.*?</style>",
     re.IGNORECASE | re.DOTALL,

{pywebview_htmx-0.1.0 → pywebview_htmx-0.2.1}/src/pywebview_htmx/static/runtime.js

@@ -94,6 +94,10 @@
     return state;
   }
 
+  function shouldPreventDefault(eventName) {
+    return eventName === "submit";
+  }
+
   function processPyWebviewHtmxNodes(root = document) {
     if (!root || typeof root.querySelectorAll !== "function") {
       return;
@@ -119,7 +123,7 @@
       }
 
       element.addEventListener(eventName, async (event) => {
-        if (event.cancelable) {
+        if (shouldPreventDefault(eventName) && event.cancelable) {
           event.preventDefault();
         }
 
@@ -163,7 +167,11 @@
           }
 
           const processRoot = pySwap(target, response, swapStyle);
-          triggerEvent(target, "py:afterSwap", { response, requestId });
+          const afterSwapTarget =
+            swapStyle === "outerHTML"
+              ? (targetSelector ? $(targetSelector) || processRoot : processRoot)
+              : target;
+          triggerEvent(afterSwapTarget, "py:afterSwap", { response, requestId });
           processPyWebviewHtmxNodes(processRoot);
 
           if (config.settleDelay > 0) {

{pywebview_htmx-0.1.0 → pywebview_htmx-0.2.1}/src/pywebview_htmx/static/themes/base.css

@@ -156,6 +156,12 @@ body {
   filter: brightness(1.06);
 }
 
+.pyh-btn:active,
+.btn:active {
+  transform: translateY(1px);
+  filter: brightness(0.95);
+}
+
 .pyh-btn-primary,
 .btn-primary {
   background: var(--pyh-btn-primary-bg);
@@ -299,8 +305,7 @@ body {
 }
 
 .py-waiting {
-  opacity: 0.55;
-  filter: saturate(0.7);
+  opacity: 0.88;
   pointer-events: none;
 }
 

{pywebview_htmx-0.1.0 → pywebview_htmx-0.2.1}/tests/test_js_contract_request_and_swap.py

@@ -11,7 +11,15 @@ def _assert_fragments_present(js_compact: str, fragments: tuple[str, ...]) -> No
 
 
 JS_BEHAVIOR_FRAGMENTS: list[tuple[int, tuple[str, ...]]] = [
-    (73, ("if (event.cancelable)", "event.preventDefault();")),
+    (
+        73,
+        (
+            'function shouldPreventDefault(eventName)',
+            'return eventName === "submit";',
+            "if (shouldPreventDefault(eventName) && event.cancelable)",
+            "event.preventDefault();",
+        ),
+    ),
     (74, ("let state = requestState.get(element);", "if (!state) {")),
     (75, ("lastIssued: 0", "state.lastIssued = requestId;")),
     (76, ("inFlightCount: 0", "state.inFlightCount += 1;")),
@@ -27,7 +35,14 @@ JS_BEHAVIOR_FRAGMENTS: list[tuple[int, tuple[str, ...]]] = [
     (86, ("if (requestId !== state.lastIssued) { return; }",)),
     (87, ("const processRoot = pySwap(target, response, swapStyle);",)),
     (88, ("processPyWebviewHtmxNodes(processRoot);",)),
-    (89, ('triggerEvent(target, "py:afterSwap"',)),
+    (
+        89,
+        (
+            "const afterSwapTarget =",
+            'swapStyle === "outerHTML"',
+            'triggerEvent(afterSwapTarget, "py:afterSwap"',
+        ),
+    ),
     (90, ("if (config.settleDelay > 0)", "await delay(config.settleDelay);")),
     (91, ('triggerEvent(element, "py:error"', "requestId")),
     (92, ("state.inFlightCount = Math.max(0, state.inFlightCount - 1);",)),

{pywebview_htmx-0.1.0 → pywebview_htmx-0.2.1}/tests/test_python_injection.py

@@ -90,6 +90,13 @@ def test_non_script_data_marker_does_not_block_injection() -> None:
     assert result.count(SCRIPT_MARKER) == 1
 
 
+def test_script_with_false_marker_does_not_block_injection() -> None:
+    html = '<html><body><script data-pywebview-htmx="false"></script></body></html>'
+    result = inject_runtime(html)
+    assert result != html
+    assert result.count(SCRIPT_MARKER) == 1
+
+
 def test_empty_html_input_gets_injected_script() -> None:
     result = inject_runtime("")
     assert MARKER in result