Fix plugin event filtering of renamed events (#9613)

chartjs · Sep 4, 2021 · 50ad163 · 50ad163
1 parent 8d68b11
commit 50ad163
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -61,7 +61,7 @@
     "@vuepress/plugin-html-redirect": "^0.1.2",
     "chartjs-adapter-luxon": "^1.0.0",
     "chartjs-adapter-moment": "^1.0.0",
-    "chartjs-test-utils": "^0.3.0",
+    "chartjs-test-utils": "^0.3.1",
     "concurrently": "^6.0.1",
     "coveralls": "^3.1.0",
     "cross-env": "^7.0.3",

diff --git a/src/core/core.controller.js b/src/core/core.controller.js
@@ -1067,7 +1067,7 @@ class Chart {
   _eventHandler(e, replay) {
     const me = this;
     const args = {event: e, replay, cancelable: true};
-    const eventFilter = (plugin) => (plugin.options.events || this.options.events).includes(e.type);
+    const eventFilter = (plugin) => (plugin.options.events || this.options.events).includes(e.native.type);
 
     if (me.notifyPlugins('beforeEvent', args, eventFilter) === false) {
       return;

diff --git a/test/specs/core.plugin.tests.js b/test/specs/core.plugin.tests.js
@@ -398,10 +398,10 @@ describe('Chart.plugins', function() {
       const results = [];
       const chart = window.acquireChart({
         options: {
-          events: ['mousemove', 'test', 'test2'],
+          events: ['mousemove', 'test', 'test2', 'pointerleave'],
           plugins: {
             testPlugin: {
-              events: ['test']
+              events: ['test', 'pointerleave']
             }
           }
         },
@@ -418,7 +418,8 @@ describe('Chart.plugins', function() {
       await jasmine.triggerMouseEvent(chart, 'mousemove', {x: 0, y: 0});
       await jasmine.triggerMouseEvent(chart, 'test', {x: 0, y: 0});
       await jasmine.triggerMouseEvent(chart, 'test2', {x: 0, y: 0});
-      expect(results).toEqual(['beforetest', 'aftertest']);
+      await jasmine.triggerMouseEvent(chart, 'pointerleave', {x: 0, y: 0});
+      expect(results).toEqual(['beforetest', 'aftertest', 'beforemouseout', 'aftermouseout']);
     });
   });
 });