make gap unsettable when zsmooth is not false

Author: Calvin Fernandez

src/traces/heatmap/defaults.js

@@ -29,9 +29,14 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     }
 
     coerce('text');
-    coerce('xgap');
-    coerce('ygap');
-    coerce('zsmooth');
+
+    var zsmooth = coerce('zsmooth');
+    if(zsmooth === false) {
+        // ensure that xgap and ygap are coerced only when zsmooth allows them to have an effect.
+        coerce('xgap');
+        coerce('ygap');
+    }
+
     coerce('connectgaps', hasColumns(traceOut) && (traceOut.zsmooth !== false));
 
     colorscaleDefaults(traceIn, traceOut, layout, coerce, {prefix: '', cLetter: 'z'});

src/traces/histogram2d/defaults.js

@@ -23,9 +23,12 @@ module.exports = function supplyDefaults(traceIn, traceOut, layout) {
 
     handleSampleDefaults(traceIn, traceOut, coerce);
 
-    coerce('zsmooth');
-    coerce('xgap');
-    coerce('ygap');
+    var zsmooth = coerce('zsmooth');
+    if(zsmooth === false) {
+        // ensure that xgap and ygap are coerced only when zsmooth allows them to have an effect.
+        coerce('xgap');
+        coerce('ygap');
+    }
 
     colorscaleDefaults(
         traceIn, traceOut, layout, coerce, {prefix: '', cLetter: 'z'}

test/jasmine/tests/heatmap_test.js

@@ -111,6 +111,20 @@ describe('heatmap supplyDefaults', function() {
         expect(traceOut.xgap).toBe(10);
         expect(traceOut.ygap).toBe(0);
     });
+
+    it('should not coerce gap if zsmooth is set', function() {
+        traceIn = {
+            xgap: 10,
+            zsmooth: 'best',
+            type: 'heatmap',
+            z: [[1, 2], [3, 4]]
+        };
+
+        supplyDefaults(traceIn, traceOut, defaultColor, layout);
+        expect(traceOut.xgap).toBe(undefined);
+        expect(traceOut.ygap).toBe(undefined);
+    });
+
 });
 
 describe('heatmap convertColumnXYZ', function() {

test/jasmine/tests/histogram2d_test.js

@@ -43,6 +43,17 @@ describe('Test histogram2d', function() {
             expect(traceOut.ygap).toBe(5);
         });
 
+        it('shouldnt coerce gap when zsmooth is set', function() {
+            traceIn = {
+                xgap: 10,
+                ygap: 5,
+                zsmooth: 'best'
+            };
+            supplyDefaults(traceIn, traceOut, {});
+            expect(traceOut.xgap).toBe(undefined);
+            expect(traceOut.ygap).toBe(undefined);
+        });
+
     });
 
 });