Merge branch 'plotly:master' into first_poc_tickmode_sync

Author: filipesantiagoAM

draftlogs/6351_add.md

@@ -0,0 +1 @@
+ - Add `marker.cornerradius` attribute to `treemap` trace [[#6351](https://github.com/plotly/plotly.js/pull/6351)]

draftlogs/6381_add.md

@@ -0,0 +1,2 @@
+ - Introduce group attributes for `scatter` trace i.e. `alignmentgroup`, `offsetgroup`, `scattermode` and `scattergap` [[#6381](https://github.com/plotly/plotly.js/pull/6381)],
+   this feature was anonymously sponsored: thank you to our sponsor!

draftlogs/6414_fix.md

@@ -0,0 +1 @@
+ - Fix auto `backoff` when marker symbols and sizes are arrays [[#6414](https://github.com/plotly/plotly.js/pull/6414)]

src/components/drawing/index.js

@@ -1203,7 +1203,13 @@ function applyBackoff(pt, start) {
             if(trace.type === 'scatter') endI--; // Why we need this hack?
 
             var endMarker = end.marker;
-            b = endMarker ? drawing.symbolBackOffs[drawing.symbolNumber(endMarker.symbol)] * endMarker.size : 0;
+            var endMarkerSymbol = endMarker.symbol;
+            if(Lib.isArrayOrTypedArray(endMarkerSymbol)) endMarkerSymbol = endMarkerSymbol[endI];
+
+            var endMarkerSize = endMarker.size;
+            if(Lib.isArrayOrTypedArray(endMarkerSize)) endMarkerSize = endMarkerSize[endI];
+
+            b = endMarker ? drawing.symbolBackOffs[drawing.symbolNumber(endMarkerSymbol)] * endMarkerSize : 0;
             b += drawing.getMarkerStandoff(d[endI], trace) || 0;
         }
 

src/plots/plots.js

@@ -14,6 +14,7 @@ var BADNUM = require('../constants/numerical').BADNUM;
 
 var axisIDs = require('./cartesian/axis_ids');
 var clearOutline = require('../components/shapes/handle_outline').clearOutline;
+var scatterAttrs = require('../traces/scatter/layout_attributes');
 
 var animationAttrs = require('./animation_attributes');
 var frameAttrs = require('./frame_attributes');
@@ -1566,6 +1567,8 @@ plots.supplyLayoutGlobalDefaults = function(layoutIn, layoutOut, formatObj) {
         'fx',
         'supplyLayoutGlobalDefaults'
     )(layoutIn, layoutOut, coerce);
+
+    Lib.coerce(layoutIn, layoutOut, scatterAttrs, 'scattermode');
 };
 
 function getComputedSize(attr) {

src/traces/bar/attributes.js

@@ -196,27 +196,8 @@ module.exports = {
 
     marker: marker,
 
-    offsetgroup: {
-        valType: 'string',
-        dflt: '',
-        editType: 'calc',
-        description: [
-            'Set several traces linked to the same position axis',
-            'or matching axes to the same',
-            'offsetgroup where bars of the same position coordinate will line up.'
-        ].join(' ')
-    },
-    alignmentgroup: {
-        valType: 'string',
-        dflt: '',
-        editType: 'calc',
-        description: [
-            'Set several traces linked to the same position axis',
-            'or matching axes to the same',
-            'alignmentgroup. This controls whether bars compute their positional',
-            'range dependently or independently.'
-        ].join(' ')
-    },
+    offsetgroup: scatterAttrs.offsetgroup,
+    alignmentgroup: scatterAttrs.alignmentgroup,
 
     selected: {
         marker: {

src/traces/bar/cross_trace_calc.js

@@ -441,7 +441,14 @@ function setBarCenterAndWidth(pa, sieve) {
 
             // store the actual bar width and position, for use by hover
             var width = calcBar.w = barwidthIsArray ? barwidth[j] : barwidth;
-            calcBar[pLetter] = calcBar.p + (poffsetIsArray ? poffset[j] : poffset) + width / 2;
+
+            if(calcBar.p === undefined) {
+                calcBar.p = calcBar[pLetter];
+                calcBar['orig_' + pLetter] = calcBar[pLetter];
+            }
+
+            var delta = (poffsetIsArray ? poffset[j] : poffset) + width / 2;
+            calcBar[pLetter] = calcBar.p + delta;
         }
     }
 }
@@ -498,13 +505,17 @@ function setBaseAndTop(sa, sieve) {
     for(var i = 0; i < calcTraces.length; i++) {
         var calcTrace = calcTraces[i];
         var fullTrace = calcTrace[0].trace;
+        var isScatter = fullTrace.type === 'scatter';
+        var isVertical = fullTrace.orientation === 'v';
         var pts = [];
         var tozero = false;
 
         for(var j = 0; j < calcTrace.length; j++) {
             var bar = calcTrace[j];
-            var base = bar.b;
-            var top = base + bar.s;
+            var base = isScatter ? 0 : bar.b;
+            var top = isScatter ? (
+                isVertical ? bar.y : bar.x
+            ) : base + bar.s;
 
             bar[sLetter] = top;
             pts.push(top);

src/traces/bar/defaults.js

@@ -7,7 +7,7 @@ var Registry = require('../../registry');
 var handleXYDefaults = require('../scatter/xy_defaults');
 var handlePeriodDefaults = require('../scatter/period_defaults');
 var handleStyleDefaults = require('./style_defaults');
-var getAxisGroup = require('../../plots/cartesian/constraints').getAxisGroup;
+var handleGroupingDefaults = require('../scatter/grouping_defaults');
 var attributes = require('./attributes');
 
 var coerceFont = Lib.coerceFont;
@@ -58,45 +58,6 @@ function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
     Lib.coerceSelectionMarkerOpacity(traceOut, coerce);
 }
 
-function handleGroupingDefaults(traceIn, traceOut, fullLayout, coerce) {
-    var orientation = traceOut.orientation;
-    // N.B. grouping is done across all trace types that support it
-    var posAxId = traceOut[{v: 'x', h: 'y'}[orientation] + 'axis'];
-    var groupId = getAxisGroup(fullLayout, posAxId) + orientation;
-
-    var alignmentOpts = fullLayout._alignmentOpts || {};
-    var alignmentgroup = coerce('alignmentgroup');
-
-    var alignmentGroups = alignmentOpts[groupId];
-    if(!alignmentGroups) alignmentGroups = alignmentOpts[groupId] = {};
-
-    var alignmentGroupOpts = alignmentGroups[alignmentgroup];
-
-    if(alignmentGroupOpts) {
-        alignmentGroupOpts.traces.push(traceOut);
-    } else {
-        alignmentGroupOpts = alignmentGroups[alignmentgroup] = {
-            traces: [traceOut],
-            alignmentIndex: Object.keys(alignmentGroups).length,
-            offsetGroups: {}
-        };
-    }
-
-    var offsetgroup = coerce('offsetgroup');
-    var offsetGroups = alignmentGroupOpts.offsetGroups;
-    var offsetGroupOpts = offsetGroups[offsetgroup];
-
-    if(offsetgroup) {
-        if(!offsetGroupOpts) {
-            offsetGroupOpts = offsetGroups[offsetgroup] = {
-                offsetIndex: Object.keys(offsetGroups).length
-            };
-        }
-
-        traceOut._offsetIndex = offsetGroupOpts.offsetIndex;
-    }
-}
-
 function crossTraceDefaults(fullData, fullLayout) {
     var traceIn, traceOut;
 
@@ -172,6 +133,5 @@ function handleText(traceIn, traceOut, layout, coerce, textposition, opts) {
 module.exports = {
     supplyDefaults: supplyDefaults,
     crossTraceDefaults: crossTraceDefaults,
-    handleGroupingDefaults: handleGroupingDefaults,
     handleText: handleText
 };

src/traces/bar/sieve.js

@@ -3,7 +3,6 @@
 module.exports = Sieve;
 
 var distinctVals = require('../../lib').distinctVals;
-var BADNUM = require('../../constants/numerical').BADNUM;
 
 /**
  * Helper class to sieve data from traces into bins
@@ -27,12 +26,18 @@ function Sieve(traces, opts) {
     // for single-bin histograms - see histogram/calc
     var width1 = Infinity;
 
+    var axLetter = opts.posAxis._id.charAt(0);
+
     var positions = [];
     for(var i = 0; i < traces.length; i++) {
         var trace = traces[i];
         for(var j = 0; j < trace.length; j++) {
             var bar = trace[j];
-            if(bar.p !== BADNUM) positions.push(bar.p);
+            var pos = bar.p;
+            if(pos === undefined) {
+                pos = bar[axLetter];
+            }
+            if(pos !== undefined) positions.push(pos);
         }
         if(trace[0] && trace[0].width1) {
             width1 = Math.min(trace[0].width1, width1);

src/traces/box/defaults.js

@@ -4,7 +4,7 @@ var Lib = require('../../lib');
 var Registry = require('../../registry');
 var Color = require('../../components/color');
 var handlePeriodDefaults = require('../scatter/period_defaults');
-var handleGroupingDefaults = require('../bar/defaults').handleGroupingDefaults;
+var handleGroupingDefaults = require('../scatter/grouping_defaults');
 var autoType = require('../../plots/cartesian/axis_autotype');
 var attributes = require('./attributes');