cx 24.10.4 → 24.10.5

package/dist/charts.js

@@ -37,6 +37,32 @@ import {
 	getCursorPos,
 } from "cx/widgets";
 
+function _arrayLikeToArray(r, a) {
+	(null == a || a > r.length) && (a = r.length);
+	for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e];
+	return n;
+}
+function _createForOfIteratorHelperLoose(r, e) {
+	var t = ("undefined" != typeof Symbol && r[Symbol.iterator]) || r["@@iterator"];
+	if (t) return (t = t.call(r)).next.bind(t);
+	if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e) {
+		t && (r = t);
+		var o = 0;
+		return function () {
+			return o >= r.length
+				? {
+						done: !0,
+					}
+				: {
+						done: !1,
+						value: r[o++],
+					};
+		};
+	}
+	throw new TypeError(
+		"Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.",
+	);
+}
 function _extends() {
 	return (
 		(_extends = Object.assign
@@ -64,6 +90,20 @@ function _setPrototypeOf(t, e) {
 		_setPrototypeOf(t, e)
 	);
 }
+function _unsupportedIterableToArray(r, a) {
+	if (r) {
+		if ("string" == typeof r) return _arrayLikeToArray(r, a);
+		var t = {}.toString.call(r).slice(8, -1);
+		return (
+			"Object" === t && r.constructor && (t = r.constructor.name),
+			"Map" === t || "Set" === t
+				? Array.from(r)
+				: "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t)
+					? _arrayLikeToArray(r, a)
+					: void 0
+		);
+	}
+}
 
 var Rect = /*#__PURE__*/ (function () {
 	function Rect(config) {
@@ -286,7 +326,8 @@ var Axis = /*#__PURE__*/ (function (_BoundedObject) {
 			y1,
 			x2,
 			y2,
-			tickSize = this.tickSize;
+			tickSize = this.tickSize,
+			tickOffset = this.tickOffset;
 		if (this.vertical) {
 			x1 = x2 = this.secondary ? bounds.r : bounds.l;
 			y1 = bounds.b;
@@ -318,17 +359,17 @@ var Axis = /*#__PURE__*/ (function (_BoundedObject) {
 				serie.forEach(function (v, i) {
 					var s = calculator.map(v);
 					if (_this.secondary) {
-						x1 = _this.vertical ? bounds.r : s;
-						y1 = _this.vertical ? s : bounds.t;
-						x2 = _this.vertical ? bounds.r + tickSize : s;
-						y2 = _this.vertical ? s : bounds.t - tickSize;
+						x1 = _this.vertical ? bounds.r + tickOffset : s;
+						y1 = _this.vertical ? s : bounds.t - tickOffset;
+						x2 = _this.vertical ? bounds.r + tickOffset + tickSize : s;
+						y2 = _this.vertical ? s : bounds.t - tickOffset - tickSize;
 					} else {
-						x1 = _this.vertical ? bounds.l : s;
-						y1 = _this.vertical ? s : bounds.b;
-						x2 = _this.vertical ? bounds.l - tickSize : s;
-						y2 = _this.vertical ? s : bounds.b + tickSize;
+						x1 = _this.vertical ? bounds.l - tickOffset : s;
+						y1 = _this.vertical ? s : bounds.b + tickOffset;
+						x2 = _this.vertical ? bounds.l - tickOffset - tickSize : s;
+						y2 = _this.vertical ? s : bounds.b + tickOffset + tickSize;
 					}
-					t.push("M " + x1 + " " + y1 + " L " + x2 + " " + y2);
+					if (!_this.useGridlineTicks) t.push("M " + x1 + " " + y1 + " L " + x2 + " " + y2);
 					var x, y;
 					var labelOffset =
 						_this.alternateLabelOffset != null && i % 2 == 1 ? _this.alternateLabelOffset : _this.labelOffset;
@@ -366,6 +407,23 @@ var Axis = /*#__PURE__*/ (function (_BoundedObject) {
 			});
 		}
 		if (!data.hideTicks) {
+			if (this.useGridlineTicks) {
+				var gridlines = calculator.mapGridlines();
+				gridlines.forEach(function (s, i) {
+					if (_this.secondary) {
+						x1 = _this.vertical ? bounds.r + tickOffset : s;
+						y1 = _this.vertical ? s : bounds.t - tickOffset;
+						x2 = _this.vertical ? bounds.r + tickOffset + tickSize : s;
+						y2 = _this.vertical ? s : bounds.t - tickOffset - tickSize;
+					} else {
+						x1 = _this.vertical ? bounds.l - tickOffset : s;
+						y1 = _this.vertical ? s : bounds.b + tickOffset;
+						x2 = _this.vertical ? bounds.l - tickOffset - tickSize : s;
+						y2 = _this.vertical ? s : bounds.b + tickOffset + tickSize;
+					}
+					t.push("M " + x1 + " " + y1 + " L " + x2 + " " + y2);
+				});
+			}
 			res[1] = /*#__PURE__*/ jsx(
 				"path",
 				{
@@ -466,6 +524,7 @@ Axis.prototype.hideLabels = false;
 Axis.prototype.hideTicks = false;
 Axis.prototype.hideLine = false;
 Axis.prototype.tickSize = 3;
+Axis.prototype.tickOffset = 0;
 Axis.prototype.minTickDistance = 25;
 Axis.prototype.minLabelDistanceVertical = 40;
 Axis.prototype.minLabelDistanceHorizontal = 50;
@@ -4566,7 +4625,7 @@ var CategoryAxis = /*#__PURE__*/ (function (_Axis) {
 			inverted = _instance$data.inverted,
 			uniform = _instance$data.uniform,
 			minSize = _instance$data.minSize;
-		instance.calculator.reset(inverted, uniform, values, names, minSize);
+		instance.calculator.reset(inverted, uniform, values, names, minSize, this.minTickDistance, this.minLabelDistance);
 	};
 	_proto.reportData = function reportData(context, instance) {
 		instance.set("categoryCount", instance.calculator.valueList.length);
@@ -4601,11 +4660,14 @@ CategoryAxis.prototype.labelAnchor = "auto";
 CategoryAxis.prototype.labelDx = "auto";
 CategoryAxis.prototype.labelDy = "auto";
 CategoryAxis.prototype.minSize = 1;
+CategoryAxis.prototype.minLabelDistanceHorizontal = 0;
+CategoryAxis.prototype.minLabelDistanceVertical = 0;
+CategoryAxis.prototype.minTickDistance = 0;
 Axis.alias("category", CategoryAxis);
 var CategoryScale = /*#__PURE__*/ (function () {
 	function CategoryScale() {}
 	var _proto2 = CategoryScale.prototype;
-	_proto2.reset = function reset(inverted, uniform, values, names, minSize) {
+	_proto2.reset = function reset(inverted, uniform, values, names, minSize, minTickDistance, minLabelDistance) {
 		var _this = this;
 		this.padding = 0.5;
 		delete this.min;
@@ -4619,6 +4681,8 @@ var CategoryScale = /*#__PURE__*/ (function () {
 		this.uniform = uniform;
 		this.valueStacks = {};
 		this.names = {};
+		this.minTickDistance = minTickDistance;
+		this.minLabelDistance = minLabelDistance;
 		if (values) {
 			if (isArray(values))
 				values.forEach(function (v) {
@@ -4666,6 +4730,19 @@ var CategoryScale = /*#__PURE__*/ (function () {
 			this.factor = (sign * (this.b - this.a)) / (this.max - this.min + 2 * this.padding);
 			this.origin = (this.a * (1 + sign)) / 2 + (this.b * (1 - sign)) / 2; //a || b
 		}
+		this.tickSizes = [];
+		var tickMultiplier = [1, 2, 5];
+		var absFactor = Math.abs(this.factor);
+		for (var base = 1; base < 10000 && this.tickSizes.length < 2; base *= 10) {
+			for (var _iterator = _createForOfIteratorHelperLoose(tickMultiplier), _step; !(_step = _iterator()).done; ) {
+				var m = _step.value;
+				if (base * m * absFactor >= this.minTickDistance && this.tickSizes.length == 0) this.tickSizes.push(base * m);
+				if (base * m * absFactor >= this.minLabelDistance) {
+					this.tickSizes.push(base * m);
+					break;
+				}
+			}
+		}
 	};
 	_proto2.hash = function hash() {
 		return {
@@ -4736,24 +4813,30 @@ var CategoryScale = /*#__PURE__*/ (function () {
 		return this.valueList[index];
 	};
 	_proto2.findTickSize = function findTickSize(minPxDist) {
+		for (var _iterator2 = _createForOfIteratorHelperLoose(this.tickSizes), _step2; !(_step2 = _iterator2()).done; ) {
+			var tickSize = _step2.value;
+			if (tickSize * Math.abs(this.factor) >= minPxDist) return tickSize;
+		}
 		return 1;
 	};
 	_proto2.getTickSizes = function getTickSizes() {
-		return [1];
+		return this.tickSizes;
 	};
 	_proto2.getTicks = function getTicks(tickSizes) {
 		var _this2 = this;
 		return tickSizes.map(function (size) {
-			return _this2.valueList;
+			return _this2.valueList.filter(function (_, i) {
+				return i % size == 0;
+			});
 		});
 	};
 	_proto2.mapGridlines = function mapGridlines() {
-		var _this3 = this;
-		return Array.from({
-			length: this.valueList.length + 1,
-		}).map(function (_, index) {
-			return _this3.origin + (index - 0.5 - _this3.min + _this3.padding) * _this3.factor;
-		});
+		var result = [];
+		if (this.tickSizes.length == 0) return result;
+		var step = this.tickSizes[0];
+		for (var index = this.min; index <= this.max + 1; index += step)
+			result.push(this.origin + (index - 0.5 - this.min + this.padding) * this.factor);
+		return result;
 	};
 	return CategoryScale;
 })();