@amcharts/amcharts5 5.1.9 → 5.1.12

package/.internal/charts/xy/axes/ValueAxis.js

@@ -58,6 +58,12 @@ var ValueAxis = /** @class */ (function (_super) {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(_this, "_minLogAdjusted", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 1
+        });
         return _this;
     }
     /**
@@ -122,8 +128,9 @@ var ValueAxis = /** @class */ (function (_super) {
                 }
             }
             //if (this._dirtyExtremes || this.isPrivateDirty("width") || this.isPrivateDirty("height") || this.isDirty("min") || this.isDirty("max") || this.isDirty("extraMin") || this.isDirty("extraMax") || this.isDirty("logarithmic") || this.isDirty("treatZeroAs") || this.isDirty("baseValue") || this.isDirty("strictMinMax") || this.isDirty("maxPrecision")) {
-            if (this._sizeDirty || this._dirtyExtremes || this._valuesDirty || this.isPrivateDirty("width") || this.isPrivateDirty("height") || this.isDirty("min") || this.isDirty("max") || this.isDirty("extraMin") || this.isDirty("extraMax") || this.isDirty("logarithmic") || this.isDirty("treatZeroAs") || this.isDirty("baseValue") || this.isDirty("strictMinMax") || this.isDirty("maxPrecision") || this.isDirty("numberFormat")) {
+            if (this._sizeDirty || this._dirtyExtremes || this._valuesDirty || this.isPrivateDirty("width") || this.isPrivateDirty("height") || this.isDirty("min") || this.isDirty("max") || this.isDirty("extraMin") || this.isDirty("extraMax") || this.isDirty("logarithmic") || this.isDirty("treatZeroAs") || this.isDirty("baseValue") || this.isDirty("strictMinMax") || this.isDirty("strictMinMaxSelection") || this.isDirty("maxPrecision") || this.isDirty("numberFormat")) {
                 this._getMinMax();
+                this.ghostLabel.set("text", "");
                 this._dirtyExtremes = false;
             }
             if (this._dirtySelectionExtremes && !this._isPanning) {
@@ -177,8 +184,26 @@ var ValueAxis = /** @class */ (function (_super) {
                 var selectionMax = this.getPrivate("selectionMax") + step;
                 var value = selectionMin - step;
                 var i = 0;
+                var differencePower = 1;
+                var minLog = min;
                 if (logarithmic) {
-                    value = selectionMin;
+                    value = this._minLogAdjusted;
+                    if (value < selectionMin) {
+                        while (value < selectionMin) {
+                            value += step;
+                        }
+                    }
+                    minLog = value;
+                    if (minLog <= 0) {
+                        minLog = 1;
+                        if (step < 1) {
+                            minLog = step;
+                        }
+                    }
+                    differencePower = Math.log(selectionMax - step) * Math.LOG10E - Math.log(minLog) * Math.LOG10E;
+                    if (differencePower > 2) {
+                        value = Math.pow(10, Math.log(minLog) * Math.LOG10E - 1);
+                    }
                 }
                 while (value < selectionMax) {
                     var dataItem = void 0;
@@ -204,9 +229,8 @@ var ValueAxis = /** @class */ (function (_super) {
                         value += step;
                     }
                     else {
-                        var differencePower = Math.log(max) * Math.LOG10E - Math.log(min) * Math.LOG10E;
-                        if (differencePower > 1) {
-                            value = Math.pow(10, Math.log(min) * Math.LOG10E + i);
+                        if (differencePower > 2) {
+                            value = Math.pow(10, Math.log(minLog) * Math.LOG10E + i);
                         }
                         else {
                             value += step;
@@ -626,8 +650,17 @@ var ValueAxis = /** @class */ (function (_super) {
             var maxDefined = this.get("max");
             var extraMin = this.get("extraMin", 0);
             var extraMax = this.get("extraMax", 0);
+            if (this.get("logarithmic")) {
+                if (this.get("extraMin") == null) {
+                    extraMin = 0.1;
+                }
+                if (this.get("extraMax") == null) {
+                    extraMax = 0.2;
+                }
+            }
             var gridCount = this.get("renderer").gridCount();
-            var strictMinMax = this.get("strictMinMax", false);
+            var selectionStrictMinMax = this.get("strictMinMaxSelection");
+            var strictMinMax = this.get("strictMinMax");
             if ($type.isNumber(min) && $type.isNumber(max)) {
                 var selectionMin_1 = max;
                 var selectionMax_1 = min;
@@ -703,11 +736,13 @@ var ValueAxis = /** @class */ (function (_super) {
                     selectionMin_1 = minMaxStep2.min;
                     selectionMax_1 = minMaxStep2.max;
                 }
+                var selectionMinReal = selectionMin_1;
+                var selectionMaxReal = selectionMax_1;
+                selectionMin_1 -= (selectionMax_1 - selectionMin_1) * extraMin;
+                selectionMax_1 += (selectionMax_1 - selectionMin_1) * extraMax;
                 var minMaxStep = this._adjustMinMax(selectionMin_1, selectionMax_1, gridCount);
                 selectionMin_1 = minMaxStep.min;
                 selectionMax_1 = minMaxStep.max;
-                selectionMin_1 -= (selectionMax_1 - selectionMin_1) * extraMin;
-                selectionMax_1 += (selectionMax_1 - selectionMin_1) * extraMax;
                 selectionMin_1 = $math.fitToRange(selectionMin_1, min, max);
                 selectionMax_1 = $math.fitToRange(selectionMax_1, min, max);
                 // do it for the second time !important			
@@ -730,6 +765,18 @@ var ValueAxis = /** @class */ (function (_super) {
                         selectionMax_1 = Math.min(selectionMax_1, maxDefined);
                     }
                 }
+                if (selectionStrictMinMax) {
+                    selectionMin_1 = selectionMinReal - (selectionMax_1 - selectionMin_1) * extraMin;
+                    selectionMax_1 = selectionMaxReal + (selectionMax_1 - selectionMin_1) * extraMax;
+                }
+                if (this.get("logarithmic")) {
+                    if (selectionMin_1 < min) {
+                        selectionMin_1 = min;
+                    }
+                    if (selectionMax_1 > max) {
+                        selectionMax_1 = max;
+                    }
+                }
                 var start = this.valueToFinalPosition(selectionMin_1);
                 var end = this.valueToFinalPosition(selectionMax_1);
                 this.setPrivateRaw("selectionMinFinal", selectionMin_1);
@@ -751,6 +798,14 @@ var ValueAxis = /** @class */ (function (_super) {
             var max = -Infinity;
             var extraMin = this.get("extraMin", 0);
             var extraMax = this.get("extraMax", 0);
+            if (this.get("logarithmic")) {
+                if (this.get("extraMin") == null) {
+                    extraMin = 0.1;
+                }
+                if (this.get("extraMax") == null) {
+                    extraMax = 0.2;
+                }
+            }
             var minDiff = Infinity;
             $array.each(this.series, function (series) {
                 if (!series.get("ignoreMinMax")) {
@@ -816,6 +871,8 @@ var ValueAxis = /** @class */ (function (_super) {
             if (min === Infinity || max === -Infinity) {
                 return;
             }
+            var initialMin = min;
+            var initialMax = max;
             // adapter
             var minAdapted = this.adapters.fold("min", min);
             var maxAdapted = this.adapters.fold("max", max);
@@ -848,9 +905,24 @@ var ValueAxis = /** @class */ (function (_super) {
             // add extras
             min -= (max - min) * extraMin;
             max += (max - min) * extraMax;
+            if (this.get("logarithmic")) {
+                // don't let min go below 0 if real min is >= 0
+                if (min < 0 && initialMin >= 0) {
+                    min = 0;
+                }
+                // don't let max go above 0 if real max is <= 0
+                if (max > 0 && initialMax <= 0) {
+                    max = 0;
+                }
+            }
             this._minReal = min;
             this._maxReal = max;
-            var strict = this.get("strictMinMax");
+            var strictMinMax = this.get("strictMinMax");
+            var strictMinMaxSelection = this.get("strictMinMaxSelection", false);
+            if (strictMinMaxSelection) {
+                strictMinMax = strictMinMaxSelection;
+            }
+            var strict = strictMinMax;
             if ($type.isNumber(maxDefined)) {
                 strict = true;
             }
@@ -863,7 +935,7 @@ var ValueAxis = /** @class */ (function (_super) {
             min = minMaxStep.min;
             max = minMaxStep.max;
             // return min max if strict
-            if (this.get("strictMinMax")) {
+            if (strictMinMax) {
                 if ($type.isNumber(minDefined)) {
                     min = minDefined;
                 }
@@ -901,6 +973,14 @@ var ValueAxis = /** @class */ (function (_super) {
                 max = minMaxStep.max;
             }
             this.setPrivateRaw("maxZoomFactor", (max - min) / minDiff * this.get("maxZoomFactor", 100));
+            if (this.get("logarithmic")) {
+                this._minLogAdjusted = min;
+                min = this._minReal;
+                max = this._maxReal;
+                if (min <= 0) {
+                    min = initialMin;
+                }
+            }
             if ($type.isNumber(min) && $type.isNumber(max)) {
                 if (this.getPrivate("minFinal") !== min || this.getPrivate("maxFinal") !== max) {
                     this.setPrivate("minFinal", min);
@@ -918,7 +998,6 @@ var ValueAxis = /** @class */ (function (_super) {
         configurable: true,
         writable: true,
         value: function (min, max, gridCount, strictMode) {
-            var logarithmic = this.get("logarithmic");
             // will fail if 0
             if (gridCount <= 1) {
                 gridCount = 1;
@@ -941,51 +1020,24 @@ var ValueAxis = /** @class */ (function (_super) {
             if (strictMode) {
                 extra = 0;
             }
-            if (!logarithmic) {
-                // round down min
-                if (strictMode) {
-                    min = Math.floor(min / power) * power;
-                    // round up max
-                    max = Math.ceil(max / power) * power;
-                }
-                else {
-                    min = Math.ceil(min / power) * power - extra;
-                    // round up max
-                    max = Math.floor(max / power) * power + extra;
-                }
-                // don't let min go below 0 if real min is >= 0
-                if (min < 0 && initialMin >= 0) {
-                    min = 0;
-                }
-                // don't let max go above 0 if real max is <= 0
-                if (max > 0 && initialMax <= 0) {
-                    max = 0;
-                }
+            // round down min
+            if (strictMode) {
+                min = Math.floor(min / power) * power;
+                // round up max
+                max = Math.ceil(max / power) * power;
             }
-            // logarithmic
             else {
-                if (min <= 0) {
-                    //throw Error("Logarithmic value axis can not have values <= 0.");
-                    min = this.get("baseValue", 0);
-                }
-                if (min === Infinity) {
-                    min = 1;
-                }
-                if (max === -Infinity) {
-                    max = 10;
-                }
-                min = Math.pow(10, Math.floor(Math.log(Math.abs(min)) * Math.LOG10E));
-                max = Math.pow(10, Math.ceil(Math.log(Math.abs(max)) * Math.LOG10E));
-                if (this.get("strictMinMax")) {
-                    var minDefined = this.get("min");
-                    var maxDefined = this.get("max");
-                    if ($type.isNumber(minDefined) && minDefined > 0) {
-                        min = minDefined;
-                    }
-                    if ($type.isNumber(maxDefined) && maxDefined > 0) {
-                        max = maxDefined;
-                    }
-                }
+                min = Math.ceil(min / power) * power - extra;
+                // round up max
+                max = Math.floor(max / power) * power + extra;
+            }
+            // don't let min go below 0 if real min is >= 0
+            if (min < 0 && initialMin >= 0) {
+                min = 0;
+            }
+            // don't let max go above 0 if real max is <= 0
+            if (max > 0 && initialMax <= 0) {
+                max = 0;
             }
             exponent = Math.log(Math.abs(difference)) * Math.LOG10E;
             power = Math.pow(10, Math.floor(exponent));
@@ -1018,27 +1070,25 @@ var ValueAxis = /** @class */ (function (_super) {
                 // round step
                 step = $math.round(step, decCount);
             }
-            if (!logarithmic) {
-                // final min and max
-                var minCount = Math.floor(min / step);
-                min = $math.round(step * minCount, decCount);
-                var maxCount = void 0;
-                if (!strictMode) {
-                    maxCount = Math.ceil(max / step);
-                }
-                else {
-                    maxCount = Math.floor(max / step);
-                }
-                if (maxCount === minCount) {
-                    maxCount++;
-                }
-                max = $math.round(step * maxCount, decCount);
-                if (max < initialMax) {
-                    max = max + step;
-                }
-                if (min > initialMin) {
-                    min = min - step;
-                }
+            // final min and max
+            var minCount = Math.floor(min / step);
+            min = $math.round(step * minCount, decCount);
+            var maxCount;
+            if (!strictMode) {
+                maxCount = Math.ceil(max / step);
+            }
+            else {
+                maxCount = Math.floor(max / step);
+            }
+            if (maxCount === minCount) {
+                maxCount++;
+            }
+            max = $math.round(step * maxCount, decCount);
+            if (max < initialMax) {
+                max = max + step;
+            }
+            if (min > initialMin) {
+                min = min - step;
             }
             step = this.fixSmallStep(step);
             return { min: min, max: max, step: step };