Further fixes for elements added / changed

This possibly fixes chartjs#11365.
joshkel · Nov 28, 2023 · 42577a0 · 42577a0
1 parent b3a42e3
commit 42577a0
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 5 deletions.
diff --git a/src/plugins/plugin.tooltip.js b/src/plugins/plugin.tooltip.js
@@ -1183,7 +1183,10 @@ export class Tooltip extends Element {
     if (!inChartArea) {
       // Let user control the active elements outside chartArea. Eg. using Legend.
       // But make sure that active elements are still valid.
-      return lastActive.filter(i => this.chart.data.datasets[i.datasetIndex]);
+      return lastActive.filter(i =>
+        this.chart.data.datasets[i.datasetIndex] &&
+        this.chart.getDatasetMeta(i.datasetIndex).controller.getParsed(i.index) !== undefined
+      );
     }
 
     // Find Active Elements for tooltips

diff --git a/test/specs/plugin.tooltip.tests.js b/test/specs/plugin.tooltip.tests.js
@@ -1667,7 +1667,7 @@ describe('Plugin.Tooltip', function() {
     });
   });
 
-  it('should tolerate datasets removed or added on events outside chartArea', async function() {
+  it('should tolerate datasets removed on events outside chartArea', async function() {
     const dataset1 = {
       label: 'Dataset 1',
       data: [10, 20, 30],
@@ -1692,9 +1692,9 @@ describe('Plugin.Tooltip', function() {
       }
     });
 
-    var meta = chart.getDatasetMeta(0);
-    var point = meta.data[1];
-    var expectedPoints = [jasmine.objectContaining({datasetIndex: 0, index: 1}), jasmine.objectContaining({datasetIndex: 1, index: 1})];
+    const meta = chart.getDatasetMeta(0);
+    const point = meta.data[1];
+    const expectedPoints = [jasmine.objectContaining({datasetIndex: 0, index: 1}), jasmine.objectContaining({datasetIndex: 1, index: 1})];
 
     await jasmine.triggerMouseEvent(chart, 'mousemove', point);
     await jasmine.triggerMouseEvent(chart, 'mousemove', {x: chart.chartArea.left - 5, y: point.y});
@@ -1709,6 +1709,49 @@ describe('Plugin.Tooltip', function() {
     expect(chart.tooltip.getActiveElements()).toEqual([expectedPoints[0]]);
   });
 
+  it('should tolerate elements removed on events outside chartArea', async function() {
+    const dataset1 = {
+      label: 'Dataset 1',
+      data: [10, 20, 30],
+    };
+    const dataset2 = {
+      label: 'Dataset 2',
+      data: [10, 25, 35],
+    };
+    const chart = window.acquireChart({
+      type: 'line',
+      data: {
+        datasets: [dataset1, dataset2],
+        labels: ['Point 1', 'Point 2', 'Point 3']
+      },
+      options: {
+        plugins: {
+          tooltip: {
+            mode: 'index',
+            intersect: false
+          }
+        }
+      }
+    });
+
+    const meta = chart.getDatasetMeta(0);
+    const point = meta.data[1];
+    const expectedPoints = [jasmine.objectContaining({datasetIndex: 0, index: 1}), jasmine.objectContaining({datasetIndex: 1, index: 1})];
+
+    await jasmine.triggerMouseEvent(chart, 'mousemove', point);
+    await jasmine.triggerMouseEvent(chart, 'mousemove', {x: chart.chartArea.left - 5, y: point.y});
+
+    expect(chart.tooltip.getActiveElements()).toEqual(expectedPoints);
+
+    dataset1.data = dataset1.data.slice(0, 1);
+    chart.data.datasets = [dataset1];
+    chart.update();
+
+    await jasmine.triggerMouseEvent(chart, 'mousemove', {x: 2, y: 1});
+
+    expect(chart.tooltip.getActiveElements()).toEqual([]);
+  });
+
   describe('events', function() {
     it('should not be called on events not in plugin events array', async function() {
       var chart = window.acquireChart({