cx 23.5.2 → 23.6.0

package/dist/charts.js

@@ -272,7 +272,7 @@ var Axis = /*#__PURE__*/ (function (_BoundedObject) {
 		if (isUndefined(this.minLabelDistance))
 			this.minLabelDistance = this.vertical ? this.minLabelDistanceVertical : this.minLabelDistanceHorizontal;
 		if (this.labelLineCountDyFactor == "auto")
-			this.labelLineCountDyFactor = this.vertical ? -0.5 : this.secondary ? -1 : 0;
+			this.labelLineCountDyFactor = this.vertical ? -this.labelLineHeight / 2 : this.secondary ? -1 : 0;
 		this.lineStyle = parseStyle(this.lineStyle);
 		this.tickStyle = parseStyle(this.tickStyle);
 		this.labelStyle = parseStyle(this.labelStyle);
@@ -301,6 +301,11 @@ var Axis = /*#__PURE__*/ (function (_BoundedObject) {
 			].concat(Array.prototype.slice.call(arguments))
 		);
 	};
+	_proto.prepareData = function prepareData(context, instance) {
+		_BoundedObject.prototype.prepareData.call(this, context, instance);
+		if (this.onCreateLabelFormatter)
+			instance.labelFormatter = instance.invoke("onCreateLabelFormatter", context, instance);
+	};
 	_proto.report = function report(context, instance) {
 		return instance.calculator;
 	};
@@ -308,7 +313,8 @@ var Axis = /*#__PURE__*/ (function (_BoundedObject) {
 		var _this = this;
 		if (this.hidden) return false;
 		var data = instance.data,
-			calculator = instance.calculator;
+			calculator = instance.calculator,
+			labelFormatter = instance.labelFormatter;
 		var bounds = data.bounds;
 		var CSS = this.CSS,
 			baseClass = this.baseClass;
@@ -371,6 +377,8 @@ var Axis = /*#__PURE__*/ (function (_BoundedObject) {
 						y = _this.vertical ? s : bounds.b + _this.labelOffset;
 					}
 					var transform = data.labelRotation ? "rotate(" + data.labelRotation + " " + x + " " + y + ")" : null;
+					var formattedValue = valueFormatter(v);
+					var lines = labelFormatter ? labelFormatter(formattedValue, v) : _this.wrapLines(formattedValue);
 					res.push(
 						/*#__PURE__*/ jsx(
 							"text",
@@ -379,10 +387,9 @@ var Axis = /*#__PURE__*/ (function (_BoundedObject) {
 								style: data.labelStyle,
 								x: x,
 								y: y,
-								dx: _this.labelDx,
 								textAnchor: data.labelAnchor,
 								transform: transform,
-								children: _this.wrapLines(valueFormatter(v), x, _this.labelDy, offsetClass),
+								children: _this.renderLabels(lines, x, _this.labelDy, _this.labelDx, offsetClass),
 							},
 							"label-" + si + "-" + i
 						)
@@ -403,13 +410,13 @@ var Axis = /*#__PURE__*/ (function (_BoundedObject) {
 		}
 		return res;
 	};
-	_proto.wrapLines = function wrapLines(str, x, dy, offsetClass) {
+	_proto.wrapLines = function wrapLines(str) {
 		if (!this.labelWrap || typeof str != "string")
-			return /*#__PURE__*/ jsx("tspan", {
-				x: x,
-				dy: dy,
-				children: str,
-			});
+			return [
+				{
+					text: str,
+				},
+			];
 		var parts = str.split(" ");
 		if (parts.length == 0) return null;
 		var lines = [];
@@ -418,20 +425,23 @@ var Axis = /*#__PURE__*/ (function (_BoundedObject) {
 			if (!line) line = parts[i];
 			else if (parts[i].length + line.length < this.labelMaxLineLength) line += " " + parts[i];
 			else {
-				lines.push(line);
+				lines.push({
+					text: line,
+				});
 				line = parts[i];
 			}
 		}
-		lines.push(line);
-		if (lines.length == 1)
-			return /*#__PURE__*/ jsx("tspan", {
-				x: x,
-				dy: dy,
-				children: str,
-			});
+		lines.push({
+			text: line,
+		});
+		return lines;
+	};
+	_proto.renderLabels = function renderLabels(lines, x, dy, dx, offsetClass) {
+		var _this2 = this;
 		var offset = this.labelLineCountDyFactor * (lines.length - 1);
-		var result = [
-			dy != null &&
+		var result = [];
+		if (lines.length > 1 && dy != null) {
+			result.push(
 				/*#__PURE__*/ jsx(
 					"tspan",
 					{
@@ -440,16 +450,20 @@ var Axis = /*#__PURE__*/ (function (_BoundedObject) {
 						children: "_",
 					},
 					-2
-				),
-		];
+				)
+			);
+		}
 		lines.forEach(function (p, i) {
 			result.push(
 				/*#__PURE__*/ jsx(
 					"tspan",
 					{
-						dy: (i == 0 ? offset : 1) + "em",
+						dy: lines.length > 1 ? (i == 0 ? offset : _this2.labelLineHeight) + "em" : dy,
 						x: x,
-						children: p,
+						style: p.style,
+						className: p.className,
+						dx: dx,
+						children: p.text,
 					},
 					i
 				)
@@ -494,6 +508,7 @@ Axis.prototype.labelDx = "auto";
 Axis.prototype.labelDy = "auto";
 Axis.prototype.labelWrap = false;
 Axis.prototype.labelLineCountDyFactor = "auto";
+Axis.prototype.labelLineHeight = 1;
 Axis.prototype.labelMaxLineLength = 10;
 Axis.namespace = "ui.svg.chart.axis";