@domql/event 2.5.168 → 2.5.169

package/dist/cjs/on.js

@@ -27,24 +27,30 @@ __export(on_exports, {
 });
 module.exports = __toCommonJS(on_exports);
 var import_utils = require("@domql/utils");
+const getOnOrPropsEvent = (param, element) => {
+  var _a, _b;
+  const onEvent = (_a = element.on) == null ? void 0 : _a[param];
+  const onPropEvent = (_b = element.props) == null ? void 0 : _b["on" + param.slice(0, 1).toUpperCase() + param.slice(1)];
+  return onEvent || onPropEvent;
+};
 const applyEvent = (param, element, state, 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 appliedFunction = getOnOrPropsEvent(param, element);
+  if (appliedFunction) {
     const { state, context } = element;
-    return applyEvent(element.on[param] || ((_a = element.props) == null ? void 0 : _a[param]), element, state, context, options);
+    return applyEvent(appliedFunction, element, state, context, options);
   }
 };
 const applyEventUpdate = (param, updatedObj, element, state, 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 appliedFunction = getOnOrPropsEvent(param, element);
+  if (appliedFunction) {
     const { state, context } = element;
-    return applyEventUpdate(element.on[param] || ((_a = element.props) == null ? void 0 : _a[param]), updatedObj, element, state, context, options);
+    return applyEventUpdate(appliedFunction, updatedObj, element, state, context, options);
   }
 };
 const applyAnimationFrame = (element, options) => {
@@ -57,12 +63,11 @@ 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 === "done" || param === "create" || param === "complete" || param === "frame" || param === "update")
       continue;
-    const appliedFunction = element.on[param] || ((_a = element.props) == null ? void 0 : _a[param]);
+    const appliedFunction = getOnOrPropsEvent(param, element);
     if ((0, import_utils.isFunction)(appliedFunction)) {
       node.addEventListener(param, (event) => {
         const { state, context } = element;

package/on.js

@@ -2,14 +2,21 @@
 
 import { isFunction } from '@domql/utils'
 
+const getOnOrPropsEvent = (param, element) => {
+  const onEvent = element.on?.[param]
+  const onPropEvent = element.props?.['on' + param.slice(0, 1).toUpperCase() + param.slice(1)]
+  return onEvent || onPropEvent
+}
+
 export const applyEvent = (param, element, state, 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 appliedFunction = getOnOrPropsEvent(param, element)
+  if (appliedFunction) {
     const { state, context } = element
-    return applyEvent(element.on[param] || element.props?.[param], element, state, context, options)
+    return applyEvent(appliedFunction, element, state, context, options)
   }
 }
 
@@ -18,9 +25,10 @@ export const applyEventUpdate = (param, updatedObj, element, state, context, opt
 }
 
 export const triggerEventOnUpdate = (param, updatedObj, element, options) => {
-  if (element.on && isFunction(element.on[param])) {
+  const appliedFunction = getOnOrPropsEvent(param, element)
+  if (appliedFunction) {
     const { state, context } = element
-    return applyEventUpdate(element.on[param] || element.props?.[param], updatedObj, element, state, context, options)
+    return applyEventUpdate(appliedFunction, updatedObj, element, state, context, options)
   }
 }
 
@@ -54,7 +62,7 @@ export const applyEventsOnNode = (element, options) => {
       param === 'update'
     ) continue
 
-    const appliedFunction = element.on[param] || element.props?.[param]
+    const appliedFunction = getOnOrPropsEvent(param, element)
     if (isFunction(appliedFunction)) {
       node.addEventListener(param, event => {
         const { state, context } = element

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/event",
-  "version": "2.5.168",
+  "version": "2.5.169",
   "license": "MIT",
   "type": "module",
   "module": "dist/esm/index.js",
@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "@domql/report": "^2.5.162",
-    "@domql/utils": "^2.5.168"
+    "@domql/utils": "^2.5.169"
   },
-  "gitHead": "6c935c3d1ff70096bb532e9c5426ffc5af0677dc"
+  "gitHead": "ae523f95551eac614ee00baf3c425cb6c4271a2c"
 }