cx 24.10.4 → 24.10.6

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) {
@@ -270,7 +310,7 @@ var Axis = /*#__PURE__*/ (function (_BoundedObject) {
 		return instance.calculator;
 	};
 	_proto.reportData = function reportData(context, instance) {};
-	_proto.renderTicksAndLabels = function renderTicksAndLabels(context, instance, valueFormatter) {
+	_proto.renderTicksAndLabels = function renderTicksAndLabels(context, instance, valueFormatter, minLabelDistance) {
 		var _this = this;
 		if (this.hidden) return false;
 		var data = instance.data,
@@ -279,14 +319,15 @@ var Axis = /*#__PURE__*/ (function (_BoundedObject) {
 		var bounds = data.bounds;
 		var CSS = this.CSS,
 			baseClass = this.baseClass;
-		var size = calculator.findTickSize(this.minLabelDistance);
+		var size = calculator.findTickSize(minLabelDistance);
 		var labelClass = CSS.expand(CSS.element(baseClass, "label"), data.labelClass);
 		var offsetClass = CSS.element(baseClass, "label-offset");
 		var x1,
 			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;
@@ -312,23 +353,23 @@ var Axis = /*#__PURE__*/ (function (_BoundedObject) {
 			);
 		}
 		var t = [];
-		if (size > 0 && !data.hideLabels) {
+		if (!!size && !data.hideLabels) {
 			var ticks = calculator.getTicks([size]);
 			ticks.forEach(function (serie, si) {
 				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;
@@ -4239,7 +4298,7 @@ var NumericAxis = /*#__PURE__*/ (function (_Axis) {
 			{
 				className: data.classNames,
 				style: data.style,
-				children: this.renderTicksAndLabels(context, instance, formatter),
+				children: this.renderTicksAndLabels(context, instance, formatter, this.minLabelDistance),
 			},
 			key,
 		);
@@ -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,28 +4813,35 @@ 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;
 })();
 
+var _TimeAxis$prototype$m;
 Format$1.registerFactory("yearOrMonth", function (format) {
 	var year = Format$1.parse("datetime;yyyy");
 	var month = Format$1.parse("datetime;MMM");
@@ -4787,8 +4871,13 @@ var TimeAxis = /*#__PURE__*/ (function (_Axis) {
 		if (this.labelDx == "auto") this.labelDx = this.vertical ? 0 : "5px";
 		if (this.deadZone) {
 			this.lowerDeadZone = this.deadZone;
-			this.upperDeadZone = this.deadZone;
+			pperDeadZone = this.deadZone;
 		}
+		this.minLabelDistanceFormatOverride = _extends(
+			{},
+			this.minLabelDistanceFormatOverrideDefaults,
+			this.minLabelDistanceFormatOverride,
+		);
 		_Axis.prototype.init.call(this);
 	};
 	_proto.declareData = function declareData() {
@@ -4824,14 +4913,16 @@ var TimeAxis = /*#__PURE__*/ (function (_Axis) {
 			max,
 			this.snapToTicks,
 			this.tickDivisions,
-			this.minTickDistance,
-			this.minLabelDistance,
+			Math.max(1, this.minTickDistance),
+			Math.max(1, this.minLabelDistance),
 			normalized,
 			inverted,
 			this.minTickUnit,
 			lowerDeadZone,
 			upperDeadZone,
 			this.decode,
+			this.useLabelDistanceFormatOverrides ? this.minLabelDistanceFormatOverride : {},
+			this.format,
 		);
 	};
 	_proto.render = function render(context, instance, key) {
@@ -4840,14 +4931,15 @@ var TimeAxis = /*#__PURE__*/ (function (_Axis) {
 			calculator = instance.calculator;
 		cached.axis = calculator.hash();
 		if (!data.bounds.valid()) return null;
-		var format = this.format || calculator.getFormat();
+		var format = calculator.resolvedFormat;
+		var minLabelDistance = calculator.resolvedMinLabelDistance;
 		var formatter = Format$1.parse(format);
 		return /*#__PURE__*/ jsx(
 			"g",
 			{
 				className: data.classNames,
 				style: data.style,
-				children: this.renderTicksAndLabels(context, instance, formatter),
+				children: this.renderTicksAndLabels(context, instance, formatter, minLabelDistance),
 			},
 			key,
 		);
@@ -4873,11 +4965,21 @@ TimeAxis.prototype.tickDivisions = {
 		[10, 50, 100],
 	],
 };
+var TimeFormats = {
+	fullDateAndTime: "datetime;yyyy MMM dd HH mm ss n",
+	shortMonthDate: "datetime;yyyy MMM dd",
+};
 TimeAxis.prototype.snapToTicks = 0;
 TimeAxis.prototype.tickSize = 15;
 TimeAxis.prototype.minLabelDistance = 60;
 TimeAxis.prototype.minTickDistance = 60;
 TimeAxis.prototype.minTickUnit = "second";
+TimeAxis.prototype.useLabelDistanceFormatOverrides = false;
+TimeAxis.prototype.minLabelDistanceFormatOverrideDefaults =
+	((_TimeAxis$prototype$m = {}),
+	(_TimeAxis$prototype$m[TimeFormats.fullDateAndTime] = 150),
+	(_TimeAxis$prototype$m[TimeFormats.shortMonthDate] = 90),
+	_TimeAxis$prototype$m);
 function monthNumber(date) {
 	return date.getFullYear() * 12 + date.getMonth() + (date.getDate() - 1) / 31;
 }
@@ -4909,6 +5011,8 @@ var TimeScale = /*#__PURE__*/ (function () {
 		lowerDeadZone,
 		upperDeadZone,
 		decode,
+		minLabelDistanceFormatOverride,
+		format,
 	) {
 		this.dateCache = {};
 		this.min = min != null ? this.decodeValue(min) : null;
@@ -4929,6 +5033,8 @@ var TimeScale = /*#__PURE__*/ (function () {
 		delete this.maxValuePadded;
 		this.stacks = {};
 		this.decode = decode;
+		this.minLabelDistanceFormatOverride = minLabelDistanceFormatOverride;
+		this.format = format;
 	};
 	_proto2.decodeValue = function decodeValue(date) {
 		if (date instanceof Date) return date.getTime();
@@ -4947,22 +5053,22 @@ var TimeScale = /*#__PURE__*/ (function () {
 	_proto2.encodeValue = function encodeValue(v) {
 		return new Date(v).toISOString();
 	};
-	_proto2.getFormat = function getFormat() {
-		switch (this.tickMeasure) {
+	_proto2.getFormat = function getFormat(unit, scale) {
+		switch (unit) {
 			case "year":
 				return "datetime;yyyy";
 			case "month":
-				if (new Date(this.scale.min).getFullYear() != new Date(this.scale.max).getFullYear()) return "yearOrMonth";
+				if (new Date(scale.min).getFullYear() != new Date(scale.max).getFullYear()) return "yearOrMonth";
 				return "datetime;yyyy MMM";
 			case "week":
 				return "datetime;MMMdd";
 			case "day":
 				if (
-					new Date(this.scale.min).getFullYear() != new Date(this.scale.max).getFullYear() ||
-					new Date(this.scale.min).getMonth() != new Date(this.scale.max).getMonth()
+					new Date(scale.min).getFullYear() != new Date(scale.max).getFullYear() ||
+					new Date(scale.min).getMonth() != new Date(scale.max).getMonth()
 				)
 					return "monthOrDay";
-				return "datetime;yyyy MMM dd";
+				return TimeFormats.shortMonthDate;
 			case "hour":
 				return "datetime;HH mm n";
 			case "minute":
@@ -4970,7 +5076,7 @@ var TimeScale = /*#__PURE__*/ (function () {
 			case "second":
 				return "datetime;mm ss";
 			default:
-				return "datetime;yyyy MMM dd HH mm ss n";
+				return TimeFormats.fullDateAndTime;
 		}
 	};
 	_proto2.map = function map(v, offset) {
@@ -5041,27 +5147,28 @@ var TimeScale = /*#__PURE__*/ (function () {
 			else this.max = this.normalized ? 1 : 100;
 		}
 		this.origin = this.inverted ? this.b : this.a;
-		this.scale = this.getScale();
 		this.calculateTicks();
+		if (this.scale == null) {
+			this.scale = this.getScale();
+		}
 	};
 	_proto2.getTimezoneOffset = function getTimezoneOffset(date) {
 		return date.getTimezoneOffset() * 60 * 1000;
 	};
-	_proto2.getScale = function getScale(tickSizes, measure) {
+	_proto2.getScale = function getScale(tickSize, measure) {
 		var min = this.min,
 			max = this.max,
 			upperDeadZone = this.upperDeadZone,
 			lowerDeadZone = this.lowerDeadZone;
 		var smin = min;
 		var smax = max;
-		if (isNumber(this.snapToTicks) && measure && tickSizes && 0 <= this.snapToTicks && tickSizes.length > 0) {
-			var tickSize = tickSizes[Math.min(tickSizes.length - 1, this.snapToTicks)];
+		if (tickSize) {
 			var minDate = new Date(min);
 			var maxDate = new Date(max);
 			switch (measure) {
 				case "second":
 				case "minute":
-				case "hours":
+				case "hour":
 				case "day":
 				default:
 					var minOffset = this.getTimezoneOffset(minDate);
@@ -5145,8 +5252,9 @@ var TimeScale = /*#__PURE__*/ (function () {
 	};
 	_proto2.findTickSize = function findTickSize(minPxDist) {
 		var _this2 = this;
-		return this.tickSizes.find(function (a) {
-			return a * Math.abs(_this2.scale.factor) >= minPxDist;
+		return this.tickSizes.find(function (_ref) {
+			var size = _ref.size;
+			return size * Math.abs(_this2.scale.factor) >= minPxDist;
 		});
 	};
 	_proto2.getTickSizes = function getTickSizes() {
@@ -5155,7 +5263,7 @@ var TimeScale = /*#__PURE__*/ (function () {
 	_proto2.calculateTicks = function calculateTicks() {
 		var _this3 = this;
 		var minReached = false;
-		var _loop = function _loop() {
+		var _loop = function _loop(unit) {
 				if (!minReached) {
 					if (unit == _this3.minTickUnit) minReached = true;
 					else return 0; // continue
@@ -5168,73 +5276,147 @@ var TimeScale = /*#__PURE__*/ (function () {
 					(_this3$tickSizes = _this3.tickSizes).push.apply(
 						_this3$tickSizes,
 						divisions[0].map(function (s) {
-							return s * unitSize;
+							return {
+								size: s * unitSize,
+								measure: unit,
+							};
 						}),
 					);
-					return 0; // continue
+					return 1; // break
 				}
 				var bestLabelDistance = Infinity;
+				var bestMinLabelDistance = _this3.minLabelDistance;
 				var bestTicks = [];
-				var bestScale = _this3.scale;
+				var bestScale = null;
+				var bestFormat = null;
 				_this3.tickMeasure = unit;
-				var _loop2 = function _loop2() {
-					var divs = divisions[i];
-					var tickSizes = divs.map(function (s) {
-						return s * unitSize;
-					});
-					var scale = _this3.getScale(tickSizes, unit);
-					tickSizes.forEach(function (size, level) {
-						var tickDistance = size * Math.abs(scale.factor);
-						if (tickDistance >= _this3.minTickDistance && tickDistance < bestLabelDistance) {
+				for (var _i = 0; _i < divisions.length; _i++) {
+					var _divs = divisions[_i];
+					for (var _d = 0; _d < _divs.length; _d++) {
+						var _this3$format, _this3$minLabelDistan;
+						//if (useSnapToTicks && d < Math.min(divs.length - 1, this.snapToTicks)) continue;
+						var _tickSize2 = _divs[_d] * unitSize;
+						var scale = _this3.getScale(null, unit);
+						var format = (_this3$format = _this3.format) != null ? _this3$format : _this3.getFormat(unit, scale);
+						var minLabelDistance =
+							(_this3$minLabelDistan = _this3.minLabelDistanceFormatOverride[format]) != null
+								? _this3$minLabelDistan
+								: _this3.minLabelDistance;
+						var labelDistance = _tickSize2 * Math.abs(scale.factor);
+						if (labelDistance >= minLabelDistance && labelDistance < bestLabelDistance) {
 							bestScale = scale;
-							bestTicks = tickSizes;
-							bestLabelDistance = tickDistance;
+							bestTicks = _divs.map(function (s) {
+								return s * unitSize;
+							});
+							bestLabelDistance = labelDistance;
+							bestFormat = format;
+							bestMinLabelDistance = minLabelDistance;
 						}
-					});
-				};
-				for (var i = 0; i < divisions.length; i++) {
-					_loop2();
+					}
 				}
 				_this3.scale = bestScale;
-				_this3.tickSizes = bestTicks.filter(function (ts) {
-					return ts * Math.abs(bestScale.factor) >= _this3.minTickDistance;
-				});
+				_this3.tickSizes = bestTicks
+					.filter(function (ts) {
+						return ts * Math.abs(bestScale.factor) >= _this3.minTickDistance;
+					})
+					.map(function (size) {
+						return {
+							size: size,
+							measure: _this3.tickMeasure,
+						};
+					});
+				_this3.resolvedFormat = bestFormat;
+				_this3.resolvedMinLabelDistance = bestMinLabelDistance;
 			},
 			_ret;
 		for (var unit in miliSeconds) {
-			_ret = _loop();
+			_ret = _loop(unit);
 			if (_ret === 0) continue;
+			if (_ret === 1) break;
+		}
+		var lowerTickUnit = null;
+		switch (this.tickMeasure) {
+			case "year":
+				lowerTickUnit = "month";
+				break;
+			case "month":
+				lowerTickUnit = "day";
+				break;
+			case "week":
+				lowerTickUnit = "day";
+				break;
+			case "day":
+				lowerTickUnit = "hour";
+				break;
+			case "hour":
+				lowerTickUnit = "minute";
+				break;
+			case "minute":
+				lowerTickUnit = "second";
+				break;
+		}
+		if (lowerTickUnit != null && this.scale) {
+			var bestMinorTickSize = Infinity;
+			var divisions = this.tickDivisions[lowerTickUnit];
+			var unitSize = miliSeconds[lowerTickUnit];
+			for (var i = 0; i < divisions.length; i++) {
+				var divs = divisions[i];
+				for (var d = 0; d < divs.length; d++) {
+					var tickSize = divs[d] * unitSize;
+					if (tickSize * Math.abs(this.scale.factor) >= this.minTickDistance && tickSize < bestMinorTickSize) {
+						bestMinorTickSize = tickSize;
+					}
+				}
+			}
+			if (bestMinorTickSize != Infinity) {
+				this.tickSizes.unshift({
+					size: bestMinorTickSize,
+					measure: lowerTickUnit,
+				});
+				if (this.tickSizes.length > 1) {
+					var labelStep = this.tickSizes[1].size;
+					var lowerScale = this.getScale(null, lowerTickUnit);
+					if (lowerScale.max - lowerScale.min >= labelStep) this.scale = lowerScale;
+				}
+			}
+		}
+		if (isNumber(this.snapToTicks) && this.snapToTicks >= 0) {
+			var _tickSize = this.tickSizes[Math.min(this.tickSizes.length - 1, this.snapToTicks)];
+			this.scale = this.getScale(_tickSize.size, _tickSize.measure);
 		}
 	};
 	_proto2.getTicks = function getTicks(tickSizes) {
 		var _this4 = this;
-		return tickSizes.map(function (size) {
+		return tickSizes.map(function (_ref2) {
+			var size = _ref2.size,
+				measure = _ref2.measure;
 			var result = [],
 				start,
 				end,
 				minDate,
 				maxDate;
-			if (_this4.tickMeasure == "year") {
+			if (measure == "year") {
 				size /= miliSeconds.year;
 				minDate = new Date(_this4.scale.min - _this4.scale.minPadding);
 				maxDate = new Date(_this4.scale.max + _this4.scale.maxPadding);
 				start = Math.ceil(yearNumber(minDate) / size) * size;
 				end = Math.floor(yearNumber(maxDate) / size) * size;
 				for (var i = start; i <= end; i += size) result.push(new Date(i, 0, 1).getTime());
-			} else if (_this4.tickMeasure == "month") {
+			} else if (measure == "month") {
 				size /= miliSeconds.month;
 				minDate = new Date(_this4.scale.min - _this4.scale.minPadding);
 				maxDate = new Date(_this4.scale.max + _this4.scale.maxPadding);
 				start = Math.ceil(monthNumber(minDate) / size) * size;
 				end = Math.floor(monthNumber(maxDate) / size) * size;
-				for (var _i = start; _i <= end; _i += size) result.push(new Date(Math.floor(_i / 12), _i % 12, 1).getTime());
-			} else if (_this4.tickMeasure == "day" || _this4.tickMeasure == "week") {
-				var multiplier = _this4.tickMeasure == "week" ? 7 : 1;
+				for (var _i2 = start; _i2 <= end; _i2 += size)
+					result.push(new Date(Math.floor(_i2 / 12), _i2 % 12, 1).getTime());
+			} else if (measure == "day" || measure == "week") {
+				var multiplier = measure == "week" ? 7 : 1;
 				size /= miliSeconds.day;
 				minDate = new Date(_this4.scale.min - _this4.scale.minPadding);
 				maxDate = new Date(_this4.scale.max + _this4.scale.maxPadding);
 				var date = zeroTime(minDate);
-				if (_this4.tickMeasure == "week") {
+				if (measure == "week") {
 					//start on monday
 					while (date.getDay() != 1) {
 						date.setDate(date.getDate() + 1);