cx 25.5.2 → 25.6.1

package/dist/charts.js

@@ -3395,7 +3395,7 @@ var LineGraph = /*#__PURE__*/ (function (_Widget) {
 			if (context.pointReducer && isArray(data.data)) {
 				data.data.forEach(function (p, index) {
 					if (data.area && _this2.y0Field)
-						context.pointReducer(p[_this2.xField], p[_this2.y0Field], data.name, p, data, index);
+						context.pointReducer(p[_this2.xField], p[_this2.y0Field], data.name, p, data.data, index);
 					context.pointReducer(p[_this2.xField], p[_this2.yField], data.name, p, data.data, index);
 				});
 			}
@@ -5517,29 +5517,48 @@ var PointReducer = /*#__PURE__*/ (function (_PureContainer) {
 	}
 	_inheritsLoose(PointReducer, _PureContainer);
 	var _proto = PointReducer.prototype;
-	_proto.explore = function explore(context, instance) {
+	_proto.declareData = function declareData() {
+		var _PureContainer$protot;
+		(_PureContainer$protot = _PureContainer.prototype.declareData).call.apply(
+			_PureContainer$protot,
+			[this].concat(Array.prototype.slice.call(arguments), [
+				{
+					filterParams: {
+						structured: true,
+					},
+				},
+			]),
+		);
+	};
+	_proto.prepareData = function prepareData(context, instance) {
 		var _this = this;
-		var parentPointReducer = context.pointReducer;
-		instance.parentPointTracker = parentPointReducer;
-		if (!instance.pointReducer) {
-			var onMap = this.onMap && instance.getCallback("onMap");
+		_PureContainer.prototype.prepareData.call(this, context, instance);
+		instance.resetAccumulator = function () {
 			var accumulator = {};
-			instance.resetAccumulator = function () {
-				accumulator = {};
-				if (_this.onInitAccumulator) instance.invoke("onInitAccumulator", accumulator, instance);
-			};
-			var pointFilter = null;
-			if (this.onCreatePointFilter) pointFilter = instance.invoke("onCreatePointFilter", instance);
-			instance.pointReducer = function (x, y, name, data, array, index) {
-				if (!pointFilter || pointFilter(x, y, name, data, array, index))
-					onMap(accumulator, x, y, name, data, array, index);
-				if (parentPointReducer) parentPointReducer(x, y, name, data, array, index);
-			};
-			instance.write = function () {
-				if (_this.onReduce) instance.invoke("onReduce", accumulator, instance);
-			};
-		}
+			if (_this.onInitAccumulator) {
+				instance.invoke("onInitAccumulator", accumulator, instance);
+				instance.accumulator = accumulator;
+			}
+		};
+		if (this.onCreatePointFilter)
+			instance.pointFilter = instance.invoke("onCreatePointFilter", instance.data.filterParams, instance);
+	};
+	_proto.explore = function explore(context, instance) {
+		var _this2 = this;
 		instance.resetAccumulator();
+		var parentPointReducer = context.pointReducer;
+		instance.parentPointTracker = parentPointReducer;
+		var pointFilter = instance.pointFilter;
+		var accumulator = instance.accumulator;
+		var onMap = this.onMap && instance.getCallback("onMap");
+		instance.pointReducer = function (x, y, name, data, array, index) {
+			if (!pointFilter || pointFilter(x, y, name, data, array, index))
+				onMap(accumulator, x, y, name, data, array, index);
+			if (parentPointReducer) parentPointReducer(x, y, name, data, array, index);
+		};
+		instance.write = function () {
+			if (_this2.onReduce) instance.invoke("onReduce", accumulator, instance);
+		};
 		context.push("pointReducer", instance.pointReducer);
 		_PureContainer.prototype.explore.call(this, context, instance);
 	};