@domql/event 2.5.140 → 2.5.142

package/dist/cjs/on.js

@@ -28,21 +28,23 @@ __export(on_exports, {
 module.exports = __toCommonJS(on_exports);
 var import_utils = require("@domql/utils");
 const applyEvent = (param, element, state, context, options) => {
-  return param.call((context == null ? void 0 : context.window) || window, element, state || element.state, context || element.context, options);
+  return param.call(element, element, state || element.state, context || element.context, options);
 };
 const triggerEventOn = (param, element, options) => {
+  var _a;
   if (element.on && (0, import_utils.isFunction)(element.on[param])) {
     const { state, context } = element;
-    return applyEvent(element.on[param], element, state, context, options);
+    return applyEvent(element.on[param] || ((_a = element.props) == null ? void 0 : _a[param]), element, state, context, options);
   }
 };
 const applyEventUpdate = (param, updatedObj, element, state, context, options) => {
-  return param.call((context == null ? void 0 : context.window) || window, updatedObj, element, state || element.state, context || element.context, options);
+  return param.call(element, updatedObj, element, state || element.state, context || element.context, options);
 };
 const triggerEventOnUpdate = (param, updatedObj, element, options) => {
+  var _a;
   if (element.on && (0, import_utils.isFunction)(element.on[param])) {
     const { state, context } = element;
-    return applyEventUpdate(element.on[param], updatedObj, element, state, context, options);
+    return applyEventUpdate(element.on[param] || ((_a = element.props) == null ? void 0 : _a[param]), updatedObj, element, state, context, options);
   }
 };
 const applyAnimationFrame = (element, options) => {
@@ -55,15 +57,16 @@ const applyAnimationFrame = (element, options) => {
   }
 };
 const applyEventsOnNode = (element, options) => {
+  var _a;
   const { node, on } = element;
   for (const param in on) {
-    if (param === "init" || param === "beforeClassAssign" || param === "render" || param === "renderRouter" || param === "attachNode" || param === "stateInit" || param === "stateCreated" || param === "beforeStateUpdate" || param === "stateUpdate" || param === "beforeUpdate" || param === "frame" || param === "update")
+    if (param === "init" || param === "beforeClassAssign" || param === "render" || param === "renderRouter" || param === "attachNode" || param === "stateInit" || param === "stateCreated" || param === "beforeStateUpdate" || param === "stateUpdate" || param === "beforeUpdate" || param === "done" || param === "create" || param === "complete" || param === "frame" || param === "update")
       continue;
-    const appliedFunction = element.on[param];
+    const appliedFunction = element.on[param] || ((_a = element.props) == null ? void 0 : _a[param]);
     if ((0, import_utils.isFunction)(appliedFunction)) {
       node.addEventListener(param, (event) => {
         const { state, context } = element;
-        appliedFunction.call((context == null ? void 0 : context.window) || window, event, element, state, context, options);
+        appliedFunction.call(element, event, element, state, context, options);
       });
     }
   }

package/on.js

@@ -3,24 +3,24 @@
 import { isFunction } from '@domql/utils'
 
 export const applyEvent = (param, element, state, context, options) => {
-  return param.call(context?.window || window, element, state || element.state, context || element.context, options)
+  return param.call(element, element, state || element.state, context || element.context, options)
 }
 
 export const triggerEventOn = (param, element, options) => {
   if (element.on && isFunction(element.on[param])) {
     const { state, context } = element
-    return applyEvent(element.on[param], element, state, context, options)
+    return applyEvent(element.on[param] || element.props?.[param], element, state, context, options)
   }
 }
 
 export const applyEventUpdate = (param, updatedObj, element, state, context, options) => {
-  return param.call(context?.window || window, updatedObj, element, state || element.state, context || element.context, options)
+  return param.call(element, updatedObj, element, state || element.state, context || element.context, options)
 }
 
 export const triggerEventOnUpdate = (param, updatedObj, element, options) => {
   if (element.on && isFunction(element.on[param])) {
     const { state, context } = element
-    return applyEventUpdate(element.on[param], updatedObj, element, state, context, options)
+    return applyEventUpdate(element.on[param] || element.props?.[param], updatedObj, element, state, context, options)
   }
 }
 
@@ -47,15 +47,18 @@ export const applyEventsOnNode = (element, options) => {
       param === 'beforeStateUpdate' ||
       param === 'stateUpdate' ||
       param === 'beforeUpdate' ||
+      param === 'done' ||
+      param === 'create' ||
+      param === 'complete' ||
       param === 'frame' ||
       param === 'update'
     ) continue
 
-    const appliedFunction = element.on[param]
+    const appliedFunction = element.on[param] || element.props?.[param]
     if (isFunction(appliedFunction)) {
       node.addEventListener(param, event => {
         const { state, context } = element
-        appliedFunction.call(context?.window || window, event, element, state, context, options)
+        appliedFunction.call(element, event, element, state, context, options)
       })
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/event",
-  "version": "2.5.140",
+  "version": "2.5.142",
   "license": "MIT",
   "type": "module",
   "module": "dist/esm/index.js",
@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "@domql/report": "^2.5.0",
-    "@domql/utils": "^2.5.140"
+    "@domql/utils": "^2.5.142"
   },
-  "gitHead": "2fc2e5d07523014581b0747b4201cc6afea32860"
+  "gitHead": "65537c9b9a818948e1835b75a5c8a3e79bffdecd"
 }