@fictjs/runtime 0.0.3 → 0.0.4

package/README.md

@@ -1,6 +1,6 @@
 # @fictjs/runtime
 
-![Node CI](https://github.com/fictjs/fict/workflows/Node%20CI/badge.svg)
+![Node CI](https://github.com/fictjs/fict/workflows/CI/badge.svg)
 ![npm](https://img.shields.io/npm/v/fict.svg)
 ![license](https://img.shields.io/npm/l/fict)
 

package/dist/index.cjs

@@ -1840,6 +1840,27 @@ function isReactive(value) {
 function unwrap2(value) {
   return isReactive(value) ? value() : value;
 }
+function callEventHandler(handler, event, node, data) {
+  if (!handler) return;
+  const context = node ?? event.currentTarget ?? void 0;
+  const invoke = (fn) => {
+    if (typeof fn === "function") {
+      const result = data === void 0 ? fn.call(context, event) : fn.call(context, data, event);
+      if (typeof result === "function" && result !== fn) {
+        if (data === void 0) {
+          result.call(context, event);
+        } else {
+          result.call(context, data, event);
+        }
+      } else if (result && typeof result.handleEvent === "function") {
+        result.handleEvent.call(result, event);
+      }
+    } else if (fn && typeof fn.handleEvent === "function") {
+      fn.handleEvent.call(fn, event);
+    }
+  };
+  invoke(handler);
+}
 var PRIMITIVE_PROXY = Symbol("fict:primitive-proxy");
 var PRIMITIVE_PROXY_RAW_VALUE = Symbol("fict:primitive-proxy:raw-value");
 function unwrapPrimitive(value) {
@@ -2353,14 +2374,10 @@ function globalEventHandler(e) {
       const hasData = rawData !== void 0;
       const resolvedNodeData = hasData ? resolveData(rawData) : void 0;
       if (typeof handler === "function") {
-        if (hasData) {
-          handler.call(node, resolvedNodeData, e);
-        } else {
-          handler.call(node, e);
-        }
+        callEventHandler(handler, e, node, hasData ? resolvedNodeData : void 0);
       } else if (Array.isArray(handler)) {
         const tupleData = resolveData(handler[1]);
-        handler[0].call(node, tupleData, e);
+        callEventHandler(handler[0], e, node, tupleData);
       }
       if (e.cancelBubble) return false;
     }
@@ -2424,23 +2441,15 @@ function bindEvent(el, eventName, handler, options2) {
   if (DelegatedEvents.has(eventName) && !options2) {
     const key = `$$${eventName}`;
     delegateEvents([eventName]);
-    const createWrapped = (resolve) => {
-      const wrapped2 = function(...args) {
-        try {
-          const fn = resolve();
-          if (typeof fn === "function") {
-            return fn.apply(this, args);
-          } else if (fn && typeof fn.handleEvent === "function") {
-            return fn.handleEvent.apply(fn, args);
-          }
-        } catch (err) {
-          handleError(err, { source: "event", eventName }, rootRef);
-        }
-      };
-      return wrapped2;
-    };
     const resolveHandler = isReactive(handler) ? handler : () => handler;
-    el[key] = createWrapped(resolveHandler);
+    el[key] = function(...args) {
+      try {
+        const fn = resolveHandler();
+        callEventHandler(fn, args[0], el);
+      } catch (err) {
+        handleError(err, { source: "event", eventName }, rootRef);
+      }
+    };
     return () => {
       el[key] = void 0;
     };
@@ -2449,13 +2458,7 @@ function bindEvent(el, eventName, handler, options2) {
   const wrapped = (event) => {
     try {
       const resolved = getHandler();
-      if (typeof resolved === "function") {
-        ;
-        resolved(event);
-      } else if (resolved && typeof resolved.handleEvent === "function") {
-        ;
-        resolved.handleEvent(event);
-      }
+      callEventHandler(resolved, event, el);
     } catch (err) {
       if (handleError(err, { source: "event", eventName }, rootRef)) {
         return;
@@ -4164,6 +4167,7 @@ exports.bindProperty = bindProperty;
 exports.bindRef = bindRef;
 exports.bindStyle = bindStyle;
 exports.bindText = bindText;
+exports.callEventHandler = callEventHandler;
 exports.classList = classList;
 exports.clearDelegatedEvents = clearDelegatedEvents;
 exports.createAttributeBinding = createAttributeBinding;