consider modes of other traces as well (scattermode, funnelmode,... )

Author: my-tien

src/traces/box/defaults.js

@@ -303,9 +303,7 @@ function crossTraceDefaults(fullData, fullLayout) {
 
         if(traceType === 'box' || traceType === 'violin') {
             traceIn = traceOut._input;
-            if(fullLayout[traceType + 'mode'] === 'group') {
-                handleGroupingDefaults(traceIn, traceOut, fullLayout, coerce);
-            }
+            handleGroupingDefaults(traceIn, traceOut, fullLayout, coerce, fullLayout[traceType + 'mode']);
         }
     }
 }

src/traces/funnel/defaults.js

@@ -77,13 +77,10 @@ function crossTraceDefaults(fullData, fullLayout) {
         return Lib.coerce(traceOut._input, traceOut, attributes, attr);
     }
 
-    if(fullLayout.funnelmode === 'group') {
-        for(var i = 0; i < fullData.length; i++) {
-            traceOut = fullData[i];
-            traceIn = traceOut._input;
-
-            handleGroupingDefaults(traceIn, traceOut, fullLayout, coerce);
-        }
+    for(var i = 0; i < fullData.length; i++) {
+        traceOut = fullData[i];
+        traceIn = traceOut._input;
+        handleGroupingDefaults(traceIn, traceOut, fullLayout, coerce, fullLayout.funnelmode);
     }
 }
 

src/traces/scatter/cross_trace_defaults.js

@@ -12,14 +12,12 @@ module.exports = function crossTraceDefaults(fullData, fullLayout) {
         return Lib.coerce(traceOut._input, traceOut, attributes, attr);
     }
 
-    if(fullLayout.scattermode === 'group') {
-        for(i = 0; i < fullData.length; i++) {
-            traceOut = fullData[i];
+    for(i = 0; i < fullData.length; i++) {
+        traceOut = fullData[i];
 
-            if(traceOut.type === 'scatter') {
-                traceIn = traceOut._input;
-                handleGroupingDefaults(traceIn, traceOut, fullLayout, coerce);
-            }
+        if(traceOut.type === 'scatter') {
+            traceIn = traceOut._input;
+            handleGroupingDefaults(traceIn, traceOut, fullLayout, coerce, fullLayout.scattermode);
         }
     }
 

src/traces/scatter/grouping_defaults.js

@@ -31,8 +31,7 @@ module.exports = function handleGroupingDefaults(traceIn, traceOut, fullLayout,
     var offsetGroupOpts = offsetGroups[offsetgroup];
     // in barmode 'group', traces without offsetgroup receive their own offsetgroup
     // in other barmodes, traces without offsetgroup are assigned to the same offset group
-    var isBarTrace = traceOut.type === 'bar' || traceOut.type === 'waterfall';
-    if((isBarTrace && barmode !== 'group') || offsetgroup) {
+    if(barmode !== 'group' || offsetgroup) {
         if(!offsetGroupOpts) {
             offsetGroupOpts = offsetGroups[offsetgroup] = {
                 offsetIndex: Object.keys(offsetGroups).length

src/traces/waterfall/defaults.js

@@ -86,13 +86,11 @@ function crossTraceDefaults(fullData, fullLayout) {
         return Lib.coerce(traceOut._input, traceOut, attributes, attr);
     }
 
-    if(fullLayout.waterfallmode === 'group') {
-        for(var i = 0; i < fullData.length; i++) {
-            traceOut = fullData[i];
-            traceIn = traceOut._input;
+    for(var i = 0; i < fullData.length; i++) {
+        traceOut = fullData[i];
+        traceIn = traceOut._input;
 
-            handleGroupingDefaults(traceIn, traceOut, fullLayout, coerce);
-        }
+        handleGroupingDefaults(traceIn, traceOut, fullLayout, coerce, fullLayout.waterfallmode);
     }
 }