Nest line options under marker.line

degzhaus · degzhaus · commit f79bca8cc7ca · 2026-03-09T12:22:02.000-07:00
diff --git a/src/traces/quiver/attributes.js b/src/traces/quiver/attributes.js
@@ -4,10 +4,9 @@ var baseAttrs = require('../../plots/attributes');
 var hovertemplateAttrs = require('../../plots/template_attributes').hovertemplateAttrs;
 var fontAttrs = require('../../plots/font_attributes');
 var axisHoverFormat = require('../../plots/cartesian/axis_format_attributes').axisHoverFormat;
-var dash = require('../../components/drawing/attributes').dash;
-
 var extendFlat = require('../../lib/extend').extendFlat;
 var colorScaleAttrs = require('../../components/colorscale/attributes');
+var dash = require('../../components/drawing/attributes').dash;
 
 var attrs = {
     x: {
@@ -100,54 +99,6 @@ var attrs = {
         description: 'Deprecated alias for `arrowsize`-based sizing. Prefer using `arrowsize`.'
     },
 
-    // Line styling for arrows
-    line: {
-        color: {
-            valType: 'color',
-            dflt: '#000',
-            editType: 'style',
-            description: 'Sets the color of the arrow lines.'
-        },
-        width: {
-            valType: 'number',
-            min: 0,
-            dflt: 1,
-            editType: 'style',
-            description: 'Sets the width (in px) of the arrow lines.'
-        },
-        dash: dash,
-        shape: {
-            valType: 'enumerated',
-            values: ['linear', 'spline', 'hv', 'vh', 'hvh', 'vhv'],
-            dflt: 'linear',
-            editType: 'plot',
-            description: 'Determines the line shape.'
-        },
-        smoothing: {
-            valType: 'number',
-            min: 0,
-            max: 1.3,
-            dflt: 1,
-            editType: 'plot',
-            description: 'Has an effect only if `shape` is set to *spline*. Sets the amount of smoothing.'
-        },
-        simplify: {
-            valType: 'boolean',
-            dflt: true,
-            editType: 'plot',
-            description: 'Simplifies lines by removing nearly-overlapping points.'
-        },
-        editType: 'style'
-    },
-
-    // Alias consistent with annotations; maps to line.width
-    arrowwidth: {
-        valType: 'number',
-        min: 0.1,
-        editType: 'style',
-        description: 'Sets the width (in px) of the arrow line (alias of `line.width`).'
-    },
-
     // Text and labels
     text: {
         valType: 'data_array',
@@ -174,9 +125,20 @@ var attrs = {
         description: 'Sets the text font.'
     }),
 
-    // Marker (for colorscale-based coloring of arrows)
+    // Marker: color, colorscale, and line styling for arrows
     marker: extendFlat(
         {
+            line: {
+                width: {
+                    valType: 'number',
+                    min: 0,
+                    dflt: 1,
+                    editType: 'style',
+                    description: 'Sets the width (in px) of the arrow lines.'
+                },
+                dash: dash,
+                editType: 'style'
+            },
             editType: 'calc'
         },
         colorScaleAttrs('marker', {
diff --git a/src/traces/quiver/defaults.js b/src/traces/quiver/defaults.js
@@ -38,22 +38,11 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     // Arrow styling
     coerce('arrowsize');
     coerce('arrow_scale'); // back-compat alias
-    coerce('arrowwidth');
     coerce('hoverdistance');
 
-    // Line styling - use coerce for proper validation
-    coerce('line.color', defaultColor);
-    // If arrowwidth is set, use it as line.width default
-    var arrowwidth = traceOut.arrowwidth;
-    if(arrowwidth !== undefined) {
-        coerce('line.width', arrowwidth);
-    } else {
-        coerce('line.width');
-    }
-    coerce('line.dash');
-    coerce('line.shape');
-    coerce('line.smoothing');
-    coerce('line.simplify');
+    // Line styling under marker.line
+    coerce('marker.line.width');
+    coerce('marker.line.dash');
 
     // Text
     coerce('text');
@@ -71,13 +60,22 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     // Ensure traceOut.marker exists before colorscaleDefaults, which captures
     // a reference to it via npMaybe at the start of its execution.
     if(!traceOut.marker) traceOut.marker = {};
-    coerce('marker.color');
+    coerce('marker.color', defaultColor);
     var withColorscale = hasColorscale(traceIn, 'marker') || (traceIn.marker || {}).coloraxis;
     traceOut._hasColorscale = !!withColorscale;
     if(withColorscale) {
         colorscaleDefaults(traceIn, traceOut, layout, coerce, { prefix: 'marker.', cLetter: 'c' });
     }
 
+    // Provide trace.line for compat with shared code (legend, getTraceColor)
+    var markerLine = traceOut.marker.line || {};
+    var mc = traceOut.marker.color;
+    traceOut.line = {
+        width: markerLine.width,
+        color: Lib.isArrayOrTypedArray(mc) ? defaultColor : mc,
+        dash: markerLine.dash
+    };
+
     // Selection styling
     coerce('selected.line.color');
     coerce('selected.line.width');
diff --git a/src/traces/quiver/plot.js b/src/traces/quiver/plot.js
@@ -173,11 +173,13 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
     });
 
     // Apply styling using Plotly's standard styling system
-    Drawing.lineGroupStyle(lineSegments, trace.line && trace.line.width, trace.line && trace.line.color, trace.line && trace.line.dash);
+    var marker = trace.marker || {};
+    var markerLine = marker.line || {};
+    var lineColor = Lib.isArrayOrTypedArray(marker.color) ? undefined : marker.color;
+    Drawing.lineGroupStyle(lineSegments, markerLine.width, lineColor, markerLine.dash);
 
     // If colorscale present, color arrows by marker.color or magnitude |(u,v)|
     if(trace._hasColorscale) {
-        var marker = trace.marker || {};
         var colorFunc = Colorscale.makeColorScaleFuncFromTrace(marker);
         lineSegments.style('stroke', function(cdi) {
             var markerColor = marker.color;
diff --git a/src/traces/quiver/style.js b/src/traces/quiver/style.js
@@ -1,6 +1,7 @@
 'use strict';
 
 var d3 = require('@plotly/d3');
+var Lib = require('../../lib');
 
 var Drawing = require('../../components/drawing');
 var Color = require('../../components/color');
@@ -11,16 +12,20 @@ function style(gd) {
 
     s.each(function(d) {
         var trace = d[0].trace;
-        var line = trace.line || {};
+        var marker = trace.marker || {};
+        var markerLine = marker.line || {};
+        var lineColor = Lib.isArrayOrTypedArray(marker.color) ? undefined : marker.color;
 
         d3.select(this).selectAll('path.js-line')
-            .call(Drawing.lineGroupStyle, line.width, line.color, line.dash);
+            .call(Drawing.lineGroupStyle, markerLine.width, lineColor, markerLine.dash);
     });
 }
 
 function styleOnSelect(gd, cd, sel) {
     var trace = cd[0].trace;
-    var line = trace.line || {};
+    var marker = trace.marker || {};
+    var markerLine = marker.line || {};
+    var lineColor = Lib.isArrayOrTypedArray(marker.color) ? undefined : marker.color;
 
     if(!sel) return;
 
@@ -34,24 +39,24 @@ function styleOnSelect(gd, cd, sel) {
             var path = d3.select(this);
 
             if(d.selected) {
-                var sc = selectedLine.color || line.color;
-                var sw = selectedLine.width !== undefined ? selectedLine.width : line.width;
-                Drawing.lineGroupStyle(path, sw, sc, line.dash);
+                var sc = selectedLine.color || lineColor;
+                var sw = selectedLine.width !== undefined ? selectedLine.width : markerLine.width;
+                Drawing.lineGroupStyle(path, sw, sc, markerLine.dash);
             } else {
                 var uc = unselectedLine.color;
                 var uw = unselectedLine.width;
                 if(!uc) {
-                    uc = line.color ? Color.addOpacity(line.color, DESELECTDIM) : undefined;
+                    uc = lineColor ? Color.addOpacity(lineColor, DESELECTDIM) : undefined;
                 }
-                if(uw === undefined) uw = line.width;
-                Drawing.lineGroupStyle(path, uw, uc, line.dash);
+                if(uw === undefined) uw = markerLine.width;
+                Drawing.lineGroupStyle(path, uw, uc, markerLine.dash);
             }
         });
 
         Drawing.selectedTextStyle(sel.selectAll('text'), trace);
     } else {
         sel.selectAll('path.js-line')
-            .call(Drawing.lineGroupStyle, line.width, line.color, line.dash);
+            .call(Drawing.lineGroupStyle, markerLine.width, lineColor, markerLine.dash);
         Drawing.textPointStyle(sel.selectAll('text'), trace, gd);
     }
 }
diff --git a/test/image/mocks/quiver_anchor.json b/test/image/mocks/quiver_anchor.json
@@ -10,9 +10,9 @@
       "sizemode": "scaled",
       "sizeref": 0.5,
       "anchor": "tail",
-      "line": {
+      "marker": {
         "color": "red",
-        "width": 2
+        "line": {"width": 2}
       },
       "xaxis": "x",
       "yaxis": "y"
@@ -27,9 +27,9 @@
       "sizemode": "scaled",
       "sizeref": 0.5,
       "anchor": "tip",
-      "line": {
+      "marker": {
         "color": "blue",
-        "width": 2
+        "line": {"width": 2}
       },
       "xaxis": "x2",
       "yaxis": "y2"
@@ -44,9 +44,9 @@
       "sizemode": "scaled",
       "sizeref": 0.5,
       "anchor": "center",
-      "line": {
+      "marker": {
         "color": "green",
-        "width": 2
+        "line": {"width": 2}
       },
       "xaxis": "x3",
       "yaxis": "y3"
diff --git a/test/image/mocks/quiver_arrow-styling.json b/test/image/mocks/quiver_arrow-styling.json
@@ -11,9 +11,9 @@
       "sizeref": 0.5,
       "arrowsize": 0.5,
       "anchor": "tail",
-      "line": {
+      "marker": {
         "color": "red",
-        "width": 1
+        "line": {"width": 1}
       }
     },
     {
@@ -27,9 +27,9 @@
       "sizeref": 0.5,
       "arrowsize": 1.0,
       "anchor": "tail",
-      "line": {
+      "marker": {
         "color": "blue",
-        "width": 2
+        "line": {"width": 2}
       }
     },
     {
@@ -43,9 +43,9 @@
       "sizeref": 0.5,
       "arrowsize": 2.0,
       "anchor": "tail",
-      "line": {
+      "marker": {
         "color": "green",
-        "width": 3
+        "line": {"width": 3}
       }
     }
   ],
diff --git a/test/image/mocks/quiver_categorical.json b/test/image/mocks/quiver_categorical.json
@@ -9,8 +9,8 @@
       "sizemode": "scaled",
       "sizeref": 0.5,
       "anchor": "tail",
-      "line": {
-        "width": 2
+      "marker": {
+        "line": {"width": 2}
       }
     }
   ],
diff --git a/test/image/mocks/quiver_colorscale.json b/test/image/mocks/quiver_colorscale.json
@@ -14,10 +14,8 @@
         "showscale": true,
         "colorbar": {
           "title": {"text": "Magnitude"}
-        }
-      },
-      "line": {
-        "width": 2
+        },
+        "line": {"width": 2}
       }
     }
   ],
diff --git a/test/image/mocks/quiver_custom-colorscale.json b/test/image/mocks/quiver_custom-colorscale.json
@@ -17,14 +17,12 @@
         "colorbar": {
           "title": {"text": "Custom Field"},
           "x": 1.02
-        }
+        },
+        "line": {"width": 2}
       },
       "sizemode": "scaled",
       "sizeref": 0.25,
-      "anchor": "tail",
-      "line": {
-        "width": 2
-      }
+      "anchor": "tail"
     }
   ],
   "layout": {
diff --git a/test/image/mocks/quiver_multi-trace.json b/test/image/mocks/quiver_multi-trace.json
@@ -10,9 +10,9 @@
       "sizemode": "scaled",
       "sizeref": 0.4,
       "anchor": "tail",
-      "line": {
+      "marker": {
         "color": "red",
-        "width": 2
+        "line": {"width": 2}
       }
     },
     {
@@ -25,9 +25,9 @@
       "sizemode": "scaled",
       "sizeref": 0.4,
       "anchor": "tail",
-      "line": {
+      "marker": {
         "color": "blue",
-        "width": 2
+        "line": {"width": 2}
       }
     }
   ],
diff --git a/test/image/mocks/quiver_simple.json b/test/image/mocks/quiver_simple.json
@@ -12,8 +12,8 @@
       "sizemode": "scaled",
       "sizeref": 0.5,
       "anchor": "tail",
-      "line": {
-        "width": 2
+      "marker": {
+        "line": {"width": 2}
       }
     }
   ],
diff --git a/test/image/mocks/quiver_sizemode.json b/test/image/mocks/quiver_sizemode.json
diff --git a/test/image/mocks/quiver_wind.json b/test/image/mocks/quiver_wind.json
diff --git a/test/image/mocks/quiver_zero-vectors.json b/test/image/mocks/quiver_zero-vectors.json
diff --git a/test/jasmine/tests/quiver_test.js b/test/jasmine/tests/quiver_test.js
diff --git a/test/plot-schema.json b/test/plot-schema.json

Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,9 @@`
`11`	`11`	`"sizeref": 0.5,`
`12`	`12`	`"arrowsize": 0.5,`
`13`	`13`	`"anchor": "tail",`
`14`		`- "line": {`
	`14`	`+ "marker": {`
`15`	`15`	`"color": "red",`
`16`		`- "width": 1`
	`16`	`+ "line": {"width": 1}`
`17`	`17`	`}`
`18`	`18`	`},`
`19`	`19`	`{`
`@@ -27,9 +27,9 @@`
`27`	`27`	`"sizeref": 0.5,`
`28`	`28`	`"arrowsize": 1.0,`
`29`	`29`	`"anchor": "tail",`
`30`		`- "line": {`
	`30`	`+ "marker": {`
`31`	`31`	`"color": "blue",`
`32`		`- "width": 2`
	`32`	`+ "line": {"width": 2}`
`33`	`33`	`}`
`34`	`34`	`},`
`35`	`35`	`{`
`@@ -43,9 +43,9 @@`
`43`	`43`	`"sizeref": 0.5,`
`44`	`44`	`"arrowsize": 2.0,`
`45`	`45`	`"anchor": "tail",`
`46`		`- "line": {`
	`46`	`+ "marker": {`
`47`	`47`	`"color": "green",`
`48`		`- "width": 3`
	`48`	`+ "line": {"width": 3}`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`	`],`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@`
`9`	`9`	`"sizemode": "scaled",`
`10`	`10`	`"sizeref": 0.5,`
`11`	`11`	`"anchor": "tail",`
`12`		`- "line": {`
`13`		`- "width": 2`
	`12`	`+ "marker": {`
	`13`	`+ "line": {"width": 2}`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`	`],`
Original file line number	Diff line number	Diff line change
`@@ -14,10 +14,8 @@`
`14`	`14`	`"showscale": true,`
`15`	`15`	`"colorbar": {`
`16`	`16`	`"title": {"text": "Magnitude"}`
`17`		`- }`
`18`		`- },`
`19`		`- "line": {`
`20`		`- "width": 2`
	`17`	`+ },`
	`18`	`+ "line": {"width": 2}`
`21`	`19`	`}`
`22`	`20`	`}`
`23`	`21`	`],`
Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,9 @@`
`10`	`10`	`"sizemode": "scaled",`
`11`	`11`	`"sizeref": 0.4,`
`12`	`12`	`"anchor": "tail",`
`13`		`- "line": {`
	`13`	`+ "marker": {`
`14`	`14`	`"color": "red",`
`15`		`- "width": 2`
	`15`	`+ "line": {"width": 2}`
`16`	`16`	`}`
`17`	`17`	`},`
`18`	`18`	`{`
`@@ -25,9 +25,9 @@`
`25`	`25`	`"sizemode": "scaled",`
`26`	`26`	`"sizeref": 0.4,`
`27`	`27`	`"anchor": "tail",`
`28`		`- "line": {`
	`28`	`+ "marker": {`
`29`	`29`	`"color": "blue",`
`30`		`- "width": 2`
	`30`	`+ "line": {"width": 2}`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`	`],`