haori 0.4.11 → 0.4.13

package/dist/haori.es.js

@@ -31,11 +31,11 @@ const C = class C {
 C.devMode = !1;
 let L = C;
 const z = "embedded";
-function rt(R) {
-  return R === "embedded" || R === "demo";
+function rt(P) {
+  return P === "embedded" || P === "demo";
 }
-function it(R) {
-  return R === null ? null : rt(R) ? R : z;
+function it(P) {
+  return P === null ? null : rt(P) ? P : z;
 }
 const k = class k {
   /**
@@ -504,7 +504,7 @@ class A {
           n.appendChild(e), n.reset(), r.insertBefore(e, s);
         }
       }
-    }), await P.evaluateAll(t);
+    }), await R.evaluateAll(t);
   }
   /**
    * data-each によって生成された複製（テンプレート以外）を削除します。
@@ -1404,7 +1404,7 @@ class x extends w {
       "month",
       "time",
       "week"
-    ], this.children = [], this.attributeMap = /* @__PURE__ */ new Map(), this.bindingData = null, this.bindingDataCache = null, this.visible = !0, this.display = null, this.template = null, this.listKey = null, this.value = null, this.skipMutationAttributes = !1, this.skipChangeValue = !1, this.syncValue(), t.getAttributeNames().forEach((e) => {
+    ], this.children = [], this.attributeMap = /* @__PURE__ */ new Map(), this.bindingData = null, this.bindingDataCache = null, this.visible = !0, this.display = null, this.displayPriority = null, this.template = null, this.listKey = null, this.value = null, this.skipMutationAttributes = !1, this.skipChangeValue = !1, this.syncValue(), t.getAttributeNames().forEach((e) => {
       const r = t.getAttribute(e);
       if (r !== null && !this.attributeMap.has(e)) {
         const s = new U(e, r);
@@ -1470,13 +1470,13 @@ class x extends w {
     }), this.children.forEach((e) => {
       const r = e.clone();
       t.getTarget().appendChild(r.getTarget()), t.pushChild(r);
-    }), t.mounted = !1, t.bindingData = this.bindingData, t.clearBindingDataCache(), t.visible = !0, t.display = this.display, t.template = this.template, t.normalizeClonedVisibilityState(), t;
+    }), t.mounted = !1, t.bindingData = this.bindingData, t.clearBindingDataCache(), t.visible = !0, t.display = this.display, t.displayPriority = this.displayPriority, t.template = this.template, t.normalizeClonedVisibilityState(), t;
   }
   /**
    * clone 時に runtime の hidden 状態だけを落とします。
    */
   normalizeClonedVisibilityState() {
-    (this.visible === !1 || this.getTarget().style.display === "none" || this.getTarget().hasAttribute(`${u.prefix}if-false`)) && (this.visible = !0, this.display = "", this.getTarget().style.display = "", this.getTarget().removeAttribute(`${u.prefix}if-false`)), this.children.forEach((t) => {
+    (this.visible === !1 || this.getTarget().style.display === "none" || this.getTarget().hasAttribute(`${u.prefix}if-false`)) && (this.visible = !0, this.display = null, this.displayPriority = null, this.getTarget().style.removeProperty("display"), this.getTarget().removeAttribute(`${u.prefix}if-false`)), this.children.forEach((t) => {
       t instanceof x && t.normalizeClonedVisibilityState();
     });
   }
@@ -1941,7 +1941,11 @@ class x extends w {
    * @returns エレメントの非表示のPromise
    */
   hide() {
-    return this.visible = !1, this.display = this.getTarget().style.display, this.getTarget().style.display = "none", this.getTarget().setAttribute(`${u.prefix}if-false`, ""), Promise.resolve();
+    if (!this.visible)
+      return Promise.resolve();
+    this.visible = !1;
+    const t = this.getTarget();
+    return this.display = t.style.getPropertyValue("display"), this.displayPriority = t.style.getPropertyPriority("display"), t.style.setProperty("display", "none", "important"), t.setAttribute(`${u.prefix}if-false`, ""), Promise.resolve();
   }
   /**
    * エレメントを表示します。
@@ -1949,7 +1953,14 @@ class x extends w {
    * @return エレメントの表示のPromise
    */
   show() {
-    return this.getTarget().style.display = this.display ?? "", this.getTarget().removeAttribute(`${u.prefix}if-false`), this.visible = !0, Promise.resolve();
+    if (this.visible)
+      return Promise.resolve();
+    const t = this.getTarget();
+    return this.display === null || this.display === "" ? t.style.removeProperty("display") : t.style.setProperty(
+      "display",
+      this.display,
+      this.displayPriority ?? ""
+    ), this.display = null, this.displayPriority = null, t.removeAttribute(`${u.prefix}if-false`), this.visible = !0, Promise.resolve();
   }
   /**
    * 指定した属性名を持つ最も近い親要素を返します。
@@ -2425,17 +2436,17 @@ function W() {
   ) ? t : X;
 }
 const lt = /* @__PURE__ */ new Set(["GET", "HEAD", "OPTIONS"]);
-function ut(R) {
-  return lt.has(R.toUpperCase());
+function ut(P) {
+  return lt.has(P.toUpperCase());
 }
-function ct(R, t) {
+function ct(P, t) {
   for (const [e, r] of Object.entries(t))
-    r !== void 0 && (r === null ? R.append(e, "") : Array.isArray(r) ? r.forEach((s) => {
-      R.append(e, String(s));
-    }) : typeof r == "object" || typeof r == "function" ? R.append(e, JSON.stringify(r)) : R.append(e, String(r)));
+    r !== void 0 && (r === null ? P.append(e, "") : Array.isArray(r) ? r.forEach((s) => {
+      P.append(e, String(s));
+    }) : typeof r == "object" || typeof r == "function" ? P.append(e, JSON.stringify(r)) : P.append(e, String(r)));
 }
-function ht(R, t) {
-  const e = new URL(R, window.location.href), r = new URLSearchParams(e.search);
+function ht(P, t) {
+  const e = new URL(P, window.location.href), r = new URLSearchParams(e.search);
   return ct(r, t), e.search = r.toString(), e.toString();
 }
 const c = class c {
@@ -2551,12 +2562,12 @@ const c = class c {
     if (typeof s != "string" || r === null)
       return null;
     const n = r.trim();
-    return c.SINGLE_PLACEHOLDER_REGEX.test(n) ? P.parseDataBind(s) : n.startsWith("{") || n.startsWith("[") ? P.parseDataBind(
+    return c.SINGLE_PLACEHOLDER_REGEX.test(n) ? R.parseDataBind(s) : n.startsWith("{") || n.startsWith("[") ? R.parseDataBind(
       c.resolveDataJsonString(
         r,
         t.getBindingData()
       )
-    ) : P.parseDataBind(
+    ) : R.parseDataBind(
       c.resolveDataParamString(r, t.getBindingData())
     );
   }
@@ -2632,7 +2643,7 @@ ${h}
           h
         );
         try {
-          i.headers = P.parseDataBind(d);
+          i.headers = R.parseDataBind(d);
         } catch (b) {
           f.error("Haori", `Invalid fetch headers: ${b}`);
         }
@@ -2648,7 +2659,7 @@ ${h}
           h
         );
         try {
-          i.headers = P.parseDataBind(d);
+          i.headers = R.parseDataBind(d);
         } catch (b) {
           f.error("Haori", `Invalid fetch headers: ${b}`);
         }
@@ -3008,7 +3019,7 @@ ${d}
           JSON.stringify(n)
         );
         const m = l.getBindingData();
-        Object.assign(m, n), await P.setBindingData(p, m);
+        Object.assign(m, n), await R.setBindingData(p, m);
       }
       const a = i ? n : {}, o = new Response(JSON.stringify(a), {
         headers: { "Content-Type": "application/json" }
@@ -3248,7 +3259,7 @@ ${d}
             );
           } else
             i[a] = r;
-          s.push(P.setBindingData(n.getTarget(), i));
+          s.push(R.setBindingData(n.getTarget(), i));
         });
       else {
         if (typeof r == "string")
@@ -3261,7 +3272,7 @@ ${d}
             r
           );
           s.push(
-            P.setBindingData(
+            R.setBindingData(
               n.getTarget(),
               i
             )
@@ -3296,7 +3307,7 @@ ${d}
         ...s.getBindingData(),
         ...e
       };
-      return P.setBindingData(s.getTarget(), n);
+      return R.setBindingData(s.getTarget(), n);
     });
     return Promise.all(r).then(() => {
     });
@@ -3361,7 +3372,7 @@ ${d}
     const e = [], r = t.clone();
     return e.push(
       t.getParent().insertAfter(r, t)
-    ), e.push(P.evaluateAll(r)), e.push(A.reset(r)), Promise.all(e).then(() => {
+    ), e.push(R.evaluateAll(r)), e.push(A.reset(r)), Promise.all(e).then(() => {
     });
   }
   /**
@@ -4003,7 +4014,7 @@ g.ATTRIBUTE_ALIAS_SUFFIX = "attr-", g.PRIORITY_ATTRIBUTE_SUFFIXES = ["bind", "if
   "import",
   "url-param"
 ], g.ATTRIBUTE_PLACEHOLDER_REGEX = /\{\{\{[\s\S]+?\}\}\}|\{\{[\s\S]+?\}\}/;
-let P = g;
+let R = g;
 const Y = class Y {
   /**
    * コンストラクタ。
@@ -4039,7 +4050,7 @@ const Y = class Y {
    * @param type イベントタイプ（'click', 'change', 'load'など）
    */
   delegate(t, e) {
-    const r = this.getElementFromTarget(t.target);
+    const r = this.getElementFromTarget(t.target, e);
     if (!r)
       return;
     const s = w.get(r);
@@ -4051,10 +4062,36 @@ const Y = class Y {
    * イベントのターゲットから HTMLElement を取得します。
    *
    * @param target イベントのターゲット
+   * @param type イベントタイプ。click の場合のみ祖先委譲を行う
    * @returns HTMLElement または null
    */
-  getElementFromTarget(t) {
-    return t ? t instanceof HTMLElement ? t : t instanceof Node ? t.parentElement : null : null;
+  getElementFromTarget(t, e) {
+    if (!t)
+      return null;
+    if (t instanceof HTMLElement)
+      return e === "click" ? this.findClickableElement(t) : t;
+    if (t instanceof Node) {
+      const r = t.parentElement;
+      return r ? e === "click" ? this.findClickableElement(r) : r : null;
+    }
+    return null;
+  }
+  /**
+   * data-click-* 属性を持つ最も近い祖先要素を返します。
+   *
+   * @param element 探索開始要素
+   * @returns 処理対象要素。見つからない場合は null
+   */
+  findClickableElement(t) {
+    let e = t;
+    for (; e; ) {
+      if (e.getAttributeNames().some(
+        (r) => r.startsWith("data-click-")
+      ))
+        return e;
+      e = e.parentElement;
+    }
+    return null;
   }
 };
 Y.HISTORY_STATE_KEY = "__haoriHistoryState__";
@@ -4185,8 +4222,8 @@ const H = class H {
       return;
     H._initialized = !0;
     const t = await Promise.allSettled([
-      P.scan(document.head),
-      P.scan(document.body)
+      R.scan(document.head),
+      R.scan(document.body)
     ]), [e, r] = t;
     e.status !== "fulfilled" && f.error("[Haori]", "Failed to build head fragment:", e.reason), r.status !== "fulfilled" && f.error("[Haori]", "Failed to build body fragment:", r.reason), await F.wait(), document.body.setAttribute("data-haori-ready", ""), H.observe(document.head), H.observe(document.body), new Q().start(), $.syncTree(document.body);
   }
@@ -4208,12 +4245,12 @@ const H = class H {
                 s.attributeName
               );
               const n = s.target;
-              if (s.attributeName && P.isAliasedAttributeReflection(
+              if (s.attributeName && R.isAliasedAttributeReflection(
                 n,
                 s.attributeName
               ))
                 break;
-              P.setAttribute(
+              R.setAttribute(
                 n,
                 s.attributeName,
                 n.getAttribute(s.attributeName),
@@ -4228,9 +4265,9 @@ const H = class H {
                 Array.from(s.removedNodes).map((n) => n.nodeName),
                 Array.from(s.addedNodes).map((n) => n.nodeName)
               ), Array.from(s.removedNodes).forEach((n) => {
-                $.cleanupTree(n), P.removeNode(n);
+                $.cleanupTree(n), R.removeNode(n);
               }), Array.from(s.addedNodes).forEach((n) => {
-                n.parentElement instanceof HTMLElement && (P.addNode(n.parentElement, n), $.syncTree(n));
+                n.parentElement instanceof HTMLElement && (R.addNode(n.parentElement, n), $.syncTree(n));
               });
               break;
             }
@@ -4240,7 +4277,7 @@ const H = class H {
                 "Character data changed:",
                 s.target,
                 s.target.textContent
-              ), s.target instanceof Text || s.target instanceof Comment ? P.changeText(s.target, s.target.textContent) : f.warn(
+              ), s.target instanceof Text || s.target instanceof Comment ? R.changeText(s.target, s.target.textContent) : f.warn(
                 "[Haori]",
                 "Unsupported character data type:",
                 s.target
@@ -4265,9 +4302,9 @@ const H = class H {
 H._initialized = !1;
 let q = H;
 document.readyState === "loading" ? document.addEventListener("DOMContentLoaded", q.init) : q.init();
-const pt = "0.4.11";
+const pt = "0.4.13";
 export {
-  P as Core,
+  R as Core,
   u as Env,
   A as Form,
   w as Fragment,