Move arrowheadsize under marker

Author: degzhaus

src/traces/quiver/attributes.js

@@ -7,6 +7,7 @@ var axisHoverFormat = require('../../plots/cartesian/axis_format_attributes').ax
 var extendFlat = require('../../lib/extend').extendFlat;
 var colorScaleAttrs = require('../../components/colorscale/attributes');
 var dash = require('../../components/drawing/attributes').dash;
+var annotationAttrs = require('../../components/annotations/attributes');
 
 var attrs = {
     x: {
@@ -79,26 +80,6 @@ var attrs = {
     uhoverformat: axisHoverFormat('u', 'noDate'),
     vhoverformat: axisHoverFormat('v', 'noDate'),
 
-    // Arrowhead sizing, consistent with annotations API naming
-    arrowsize: {
-        valType: 'number',
-        min: 0.3,
-        dflt: 1,
-        editType: 'calc',
-        description: [
-            'Scales the size of the arrow head relative to a base size.',
-            'Higher values produce larger heads.'
-        ].join(' ')
-    },
-    // Back-compat alias
-    arrow_scale: {
-        valType: 'number',
-        min: 0,
-        max: 1,
-        editType: 'calc',
-        description: 'Deprecated alias for `arrowsize`-based sizing. Prefer using `arrowsize`.'
-    },
-
     // Text and labels
     text: {
         valType: 'data_array',
@@ -125,9 +106,16 @@ var attrs = {
         description: 'Sets the text font.'
     }),
 
-    // Marker: color, colorscale, and line styling for arrows
+    // Marker: color, colorscale, arrowhead sizing, and line styling for arrows
     marker: extendFlat(
         {
+            arrowsize: extendFlat({}, annotationAttrs.arrowsize, {
+                editType: 'calc',
+                description: [
+                    'Sets the size of the arrow head relative to `marker.line.width`.',
+                    'A value of 1 (default) gives a head about 3x as wide as the line.'
+                ].join(' ')
+            }),
             line: {
                 width: {
                     valType: 'number',

src/traces/quiver/defaults.js

@@ -36,8 +36,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     coerce('anchor');
 
     // Arrow styling
-    coerce('arrowsize');
-    coerce('arrow_scale'); // back-compat alias
+    coerce('marker.arrowsize');
     coerce('hoverdistance');
 
     // Line styling under marker.line

src/traces/quiver/plot.js

@@ -102,9 +102,10 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
         var pxPerY = Math.abs(ya.c2p(cdi.y + 1) - ya.c2p(cdi.y));
         var scaleRatio = (pxPerX && pxPerY) ? (pxPerY / pxPerX) : 1;
         var baseHeadScale = 0.2;
-        var arrowScale = (trace.arrowsize !== undefined)
-            ? (baseHeadScale * trace.arrowsize)
-            : (trace.arrow_scale !== undefined ? trace.arrow_scale : baseHeadScale);
+        var markerArrowsize = (trace.marker || {}).arrowsize;
+        var arrowScale = (markerArrowsize !== undefined)
+            ? (baseHeadScale * markerArrowsize)
+            : baseHeadScale;
         // Fixed arrowhead wedge angle (radians).
         // Arrow direction is fully determined by u,v (see barbAng below);
         // this constant only controls the opening of the head.

test/image/mocks/quiver_arrow-styling.json

@@ -9,10 +9,10 @@
       "v": [1, 1, 1],
       "sizemode": "scaled",
       "sizeref": 0.5,
-      "arrowsize": 0.5,
       "anchor": "tail",
       "marker": {
         "color": "red",
+        "arrowsize": 0.5,
         "line": {"width": 1}
       }
     },
@@ -25,10 +25,10 @@
       "v": [1, 1, 1],
       "sizemode": "scaled",
       "sizeref": 0.5,
-      "arrowsize": 1.0,
       "anchor": "tail",
       "marker": {
         "color": "blue",
+        "arrowsize": 1.0,
         "line": {"width": 2}
       }
     },
@@ -41,10 +41,10 @@
       "v": [1, 1, 1],
       "sizemode": "scaled",
       "sizeref": 0.5,
-      "arrowsize": 2.0,
       "anchor": "tail",
       "marker": {
         "color": "green",
+        "arrowsize": 2.0,
         "line": {"width": 3}
       }
     }