From 0fb955c55fef6a7a11517b9e8950f6aebbd6ab13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89tienne=20T=C3=A9treault-Pinard?= <etienne@plot.ly>
Date: Wed, 25 Sep 2019 12:27:15 -0400
Subject: [PATCH] fix #4203 - fix `line.width` attr declaration in *contour
 traces

- unset dflt in contour `line.width`, explain default logic in description
- reuse contour `line` declaration in contourcarpet
- set hard dflt in histogram2dcontour `line.width` declaration,
  as histogram2dcontour trace only support level-style contours
  at the moment.
---
 src/traces/contour/attributes.js            | 14 ++++++++++---
 src/traces/contourcarpet/attributes.js      | 23 ++++++---------------
 src/traces/histogram2dcontour/attributes.js | 11 +++++++++-
 3 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/src/traces/contour/attributes.js b/src/traces/contour/attributes.js
index 507b45d1c86..b8bc81a025f 100644
--- a/src/traces/contour/attributes.js
+++ b/src/traces/contour/attributes.js
@@ -239,9 +239,17 @@ module.exports = extendFlat({
                 'Has no effect if `contours.coloring` is set to *lines*.'
             ].join(' ')
         }),
-        width: extendFlat({}, scatterLineAttrs.width, {
-            editType: 'style+colorbars'
-        }),
+        width: {
+            valType: 'number',
+            min: 0,
+            role: 'style',
+            editType: 'style+colorbars',
+            description: [
+                'Sets the contour line width in (in px)',
+                'Defaults to *0.5* when `contours.type` is *levels*.',
+                'Defaults to *2* when `contour.type` is *constraint*.'
+            ].join(' ')
+        },
         dash: dash,
         smoothing: extendFlat({}, scatterLineAttrs.smoothing, {
             description: [
diff --git a/src/traces/contourcarpet/attributes.js b/src/traces/contourcarpet/attributes.js
index d2d28b86aef..db2d560ea6e 100644
--- a/src/traces/contourcarpet/attributes.js
+++ b/src/traces/contourcarpet/attributes.js
@@ -10,13 +10,11 @@
 
 var heatmapAttrs = require('../heatmap/attributes');
 var contourAttrs = require('../contour/attributes');
-var contourContourAttrs = contourAttrs.contours;
-var scatterAttrs = require('../scatter/attributes');
 var colorScaleAttrs = require('../../components/colorscale/attributes');
 
 var extendFlat = require('../../lib/extend').extendFlat;
 
-var scatterLineAttrs = scatterAttrs.line;
+var contourContourAttrs = contourAttrs.contours;
 
 module.exports = extendFlat({
     carpet: {
@@ -75,22 +73,13 @@ module.exports = extendFlat({
     },
 
     line: {
-        color: extendFlat({}, scatterLineAttrs.color, {
-            description: [
-                'Sets the color of the contour level.',
-                'Has no if `contours.coloring` is set to *lines*.'
-            ].join(' ')
-        }),
-        width: scatterLineAttrs.width,
-        dash: scatterLineAttrs.dash,
-        smoothing: extendFlat({}, scatterLineAttrs.smoothing, {
-            description: [
-                'Sets the amount of smoothing for the contour lines,',
-                'where *0* corresponds to no smoothing.'
-            ].join(' ')
-        }),
+        color: contourAttrs.line.color,
+        width: contourAttrs.line.width,
+        dash: contourAttrs.line.dash,
+        smoothing: contourAttrs.line.smoothing,
         editType: 'plot'
     },
+
     transforms: undefined
 },
 
diff --git a/src/traces/histogram2dcontour/attributes.js b/src/traces/histogram2dcontour/attributes.js
index 1133f9c32bb..a78ff71c975 100644
--- a/src/traces/histogram2dcontour/attributes.js
+++ b/src/traces/histogram2dcontour/attributes.js
@@ -36,7 +36,16 @@ module.exports = extendFlat({
     autocontour: contourAttrs.autocontour,
     ncontours: contourAttrs.ncontours,
     contours: contourAttrs.contours,
-    line: contourAttrs.line,
+    line: {
+        color: contourAttrs.line.color,
+        width: extendFlat({}, contourAttrs.line.width, {
+            dflt: 0.5,
+            description: 'Sets the contour line width in (in px)'
+        }),
+        dash: contourAttrs.line.dash,
+        smoothing: contourAttrs.line.smoothing,
+        editType: 'plot'
+    },
     zhoverformat: histogram2dAttrs.zhoverformat,
     hovertemplate: histogram2dAttrs.hovertemplate
 },