- Added handling to clean delegate events.

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fr0st/query",
-    "version": "3.2.3",
+    "version": "3.2.4",
     "description": "fQuery is a free, open-source DOM manipulation library for JavaScript.",
     "keywords": [
         "dom",
@@ -38,12 +38,12 @@
     "private": false,
     "devDependencies": {
         "@rollup/plugin-node-resolve": "^15.2.3",
-        "eslint": "^8.54.0",
+        "eslint": "^8.56.0",
         "eslint-config-google": "^0.14.0",
         "mocha": "^10.2.0",
-        "puppeteer": "^21.5.2",
-        "rollup": "^4.6.0",
-        "terser": "^5.24.0"
+        "puppeteer": "^21.6.1",
+        "rollup": "^4.9.1",
+        "terser": "^5.26.0"
     },
     "dependencies": {
         "@fr0st/core": "^2.1.3"

src/events/event-factory.js

@@ -75,18 +75,47 @@ export function delegateFactory(node, selector, callback) {
         }
 
         Object.defineProperty(event, 'currentTarget', {
-            value: delegate,
             configurable: true,
+            enumerable: true,
+            value: delegate,
         });
         Object.defineProperty(event, 'delegateTarget', {
-            value: node,
             configurable: true,
+            enumerable: true,
+            value: node,
         });
 
         return callback(event);
     };
 };
 
+/**
+ * Return a wrapped event callback that cleans up delegate events.
+ * @param {HTMLElement|ShadowRoot|Document} node The input node.
+ * @param {function} callback The event callback.
+ * @return {DOM~eventCallback} The cleaned event callback.
+ */
+export function delegateFactoryClean(node, callback) {
+    return (event) => {
+        if (!event.delegateTarget) {
+            return callback(event);
+        }
+
+        Object.defineProperty(event, 'currentTarget', {
+            configurable: true,
+            enumerable: true,
+            value: node,
+        });
+        Object.defineProperty(event, 'delegateTarget', {
+            writable: true,
+        });
+
+        delete event.delegateTarget;
+
+        return callback(event);
+    };
+}
+
 /**
  * Return a wrapped mouse drag event (optionally debounced).
  * @param {DOM~eventCallback} down The callback to execute on mousedown.

src/events/event-handlers.js

@@ -1,4 +1,4 @@
-import { delegateFactory, namespaceFactory, preventFactory, selfDestructFactory } from './event-factory.js';
+import { delegateFactory, delegateFactoryClean, namespaceFactory, preventFactory, selfDestructFactory } from './event-factory.js';
 import { parseNode, parseNodes } from './../filters.js';
 import { eventNamespacedRegExp, parseEvent, parseEvents } from './../helpers.js';
 import { events } from './../vars.js';
@@ -55,6 +55,8 @@ export function addEvent(selector, eventNames, callback, { capture = false, dele
 
             if (delegate) {
                 realCallback = delegateFactory(node, delegate, realCallback);
+            } else {
+                realCallback = delegateFactoryClean(node, realCallback);
             }
 
             realCallback = namespaceFactory(eventName, realCallback);