Fixed #7226, zooming was not possible when softMin and softMax we…

…re set.
highcharts · Dec 7, 2017 · 6e21acc · 6e21acc
1 parent 72d67bf
commit 6e21acc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/js/parts/Axis.js b/js/parts/Axis.js
@@ -2973,10 +2973,10 @@ H.extend(Axis.prototype, /** @lends Highcharts.Axis.prototype */{
 		}
 
 		// Handle options for floor, ceiling, softMin and softMax (#6359)
-		if (isNumber(options.softMin)) {
+		if (isNumber(options.softMin) && !isNumber(axis.userMin)) {
 			axis.min = Math.min(axis.min, options.softMin);
 		}
-		if (isNumber(options.softMax)) {
+		if (isNumber(options.softMax) && !isNumber(axis.userMax)) {
 			axis.max = Math.max(axis.max, options.softMax);
 		}
 		if (isNumber(options.floor)) {

diff --git a/samples/unit-tests/axis/softmin-softmax/demo.js b/samples/unit-tests/axis/softmin-softmax/demo.js
@@ -60,6 +60,20 @@ QUnit.test('softMin and softMax', function (assert) {
         'Soft max, exceeded'
     );
 
+
+    // Zoom in
+    chart.yAxis[0].setExtremes(50, 100);
+    assert.strictEqual(
+        chart.yAxis[0].min,
+        50,
+        'Soft min should allow zoom'
+    );
+    assert.strictEqual(
+        chart.yAxis[0].max,
+        100,
+        'Soft max should allow zoom'
+    );
+
 });
 
 QUnit.test('softMax combined with ceiling (#6359)', function (assert) {