Handle inextensible dataset.data array (#6060)

chartjs · Feb 11, 2019 · ef507e1 · ef507e1
1 parent 2f874fd
commit ef507e1
Show file tree

Hide file tree

Showing 2 changed files with 83 additions and 1 deletion.
diff --git a/src/core/core.datasetController.js b/src/core/core.datasetController.js
@@ -225,7 +225,9 @@ helpers.extend(DatasetController.prototype, {
 				unlistenArrayEvents(me._data, me);
 			}
 
-			listenArrayEvents(data, me);
+			if (data && Object.isExtensible(data)) {
+				listenArrayEvents(data, me);
+			}
 			me._data = data;
 		}
 

diff --git a/test/specs/core.datasetController.tests.js b/test/specs/core.datasetController.tests.js
@@ -38,6 +38,86 @@ describe('Chart.DatasetController', function() {
 		});
 	});
 
+	describe('inextensible data', function() {
+		it('should handle a frozen data object', function() {
+			function createChart() {
+				var data = Object.freeze([0, 1, 2, 3, 4, 5]);
+				expect(Object.isExtensible(data)).toBeFalsy();
+
+				var chart = acquireChart({
+					type: 'line',
+					data: {
+						datasets: [{
+							data: data
+						}]
+					}
+				});
+
+				var dataset = chart.data.datasets[0];
+				dataset.data = Object.freeze([5, 4, 3, 2, 1, 0]);
+				expect(Object.isExtensible(dataset.data)).toBeFalsy();
+				chart.update();
+
+				// Tests that the unlisten path also works for frozen objects
+				chart.destroy();
+			}
+
+			expect(createChart).not.toThrow();
+		});
+
+		it('should handle a sealed data object', function() {
+			function createChart() {
+				var data = Object.seal([0, 1, 2, 3, 4, 5]);
+				expect(Object.isExtensible(data)).toBeFalsy();
+
+				var chart = acquireChart({
+					type: 'line',
+					data: {
+						datasets: [{
+							data: data
+						}]
+					}
+				});
+
+				var dataset = chart.data.datasets[0];
+				dataset.data = Object.seal([5, 4, 3, 2, 1, 0]);
+				expect(Object.isExtensible(dataset.data)).toBeFalsy();
+				chart.update();
+
+				// Tests that the unlisten path also works for frozen objects
+				chart.destroy();
+			}
+
+			expect(createChart).not.toThrow();
+		});
+
+		it('should handle an unextendable data object', function() {
+			function createChart() {
+				var data = Object.preventExtensions([0, 1, 2, 3, 4, 5]);
+				expect(Object.isExtensible(data)).toBeFalsy();
+
+				var chart = acquireChart({
+					type: 'line',
+					data: {
+						datasets: [{
+							data: data
+						}]
+					}
+				});
+
+				var dataset = chart.data.datasets[0];
+				dataset.data = Object.preventExtensions([5, 4, 3, 2, 1, 0]);
+				expect(Object.isExtensible(dataset.data)).toBeFalsy();
+				chart.update();
+
+				// Tests that the unlisten path also works for frozen objects
+				chart.destroy();
+			}
+
+			expect(createChart).not.toThrow();
+		});
+	});
+
 	it('should synchronize metadata when data are inserted or removed', function() {
 		var data = [0, 1, 2, 3, 4, 5];
 		var chart = acquireChart({