Remove dataset while hovered (#8181)

chartjs · Dec 16, 2020 · f191f2f · f191f2f
1 parent 5e22f56
commit f191f2f
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/core/core.controller.js b/src/core/core.controller.js
@@ -725,7 +725,7 @@ class Chart {
 				hidden: null,			// See isDatasetVisible() comment
 				xAxisID: null,
 				yAxisID: null,
-				order: dataset.order || 0,
+				order: dataset && dataset.order || 0,
 				index: datasetIndex,
 				_dataset: dataset,
 				_parsed: [],
@@ -808,7 +808,7 @@ class Chart {
 		const me = this;
 		const meta = me._metasets && me._metasets[datasetIndex];
 
-		if (meta) {
+		if (meta && meta.controller) {
 			meta.controller._destroy();
 			delete me._metasets[datasetIndex];
 		}
@@ -933,8 +933,9 @@ class Chart {
 
 		for (i = 0, ilen = items.length; i < ilen; ++i) {
 			item = items[i];
-			if (item) {
-				this.getDatasetMeta(item.datasetIndex).controller[prefix + 'HoverStyle'](item.element, item.datasetIndex, item.index);
+			const controller = item && this.getDatasetMeta(item.datasetIndex).controller;
+			if (controller) {
+				controller[prefix + 'HoverStyle'](item.element, item.datasetIndex, item.index);
 			}
 		}
 	}