Revert "Track alignmentgroups in fullLayout._alignmentOpts by trace type"

This reverts commit e8bd5db.

Author: my-tien

src/traces/bar/cross_trace_calc.js

@@ -334,9 +334,8 @@ function setOffsetAndWidth(gd, pa, sieve, opts) {
         barWidth = barWidthPlusGap * (1 - (opts.groupgap || 0));
         offsetFromCenter = -barWidth / 2;
     } else { // collect groups and calculate values in loop below
-        var firstTrace = calcTraces[0][0].trace;
-        var groupId = getAxisGroup(fullLayout, pa._id) + firstTrace.orientation;
-        alignmentGroups = fullLayout._alignmentOpts[firstTrace.type][groupId] || {};
+        var groupId = getAxisGroup(fullLayout, pa._id) + calcTraces[0][0].trace.orientation;
+        alignmentGroups = fullLayout._alignmentOpts[groupId] || {};
     }
 
     for(var i = 0; i < nTraces; i++) {

src/traces/box/cross_trace_calc.js

@@ -100,14 +100,11 @@ function setPositionOffset(traceType, gd, boxList, posAxis) {
         } else {
             dPos = dPos0;
 
-            var groupId = getAxisGroup(fullLayout, posAxis._id) + trace.orientation;
-            if(fullLayout._alignmentOpts[traceType] === undefined) {
-                fullLayout._alignmentOpts[traceType] = {};
-            }
-            var alignmentGroups = fullLayout._alignmentOpts[traceType][groupId] || {};
-            var alignmentGroupOpts = alignmentGroups[trace.alignmentgroup] || {};
-            var nOffsetGroups = Object.keys(alignmentGroupOpts.offsetGroups || {}).length;
             if(group) {
+                var groupId = getAxisGroup(fullLayout, posAxis._id) + trace.orientation;
+                var alignmentGroups = fullLayout._alignmentOpts[groupId] || {};
+                var alignmentGroupOpts = alignmentGroups[trace.alignmentgroup] || {};
+                var nOffsetGroups = Object.keys(alignmentGroupOpts.offsetGroups || {}).length;
                 var num = nOffsetGroups || numTotal;
                 var shift = nOffsetGroups ? trace._offsetIndex : t.num;
 

src/traces/histogram/cross_trace_defaults.js

@@ -116,10 +116,8 @@ module.exports = function crossTraceDefaults(fullData, fullLayout) {
             }
         }
     }
-    var alignmentOpts = {};
-    if(fullLayout._alignmentOpts.histogram !== undefined) {
-        alignmentOpts = fullLayout._alignmentOpts.histogram || {};
-    }
+
+    var alignmentOpts = fullLayout._alignmentOpts || {};
 
     // Look for traces that "have to match", that is:
     // - 1d histogram traces on the same subplot with same orientation under barmode:stack,
@@ -138,7 +136,7 @@ module.exports = function crossTraceDefaults(fullData, fullLayout) {
             if(fullLayout.barmode === 'group' && traceOut.alignmentgroup) {
                 var pa = traceOut[binDir + 'axis'];
                 var aGroupId = getAxisGroup(fullLayout, pa) + traceOut.orientation;
-                if((alignmentOpts.histogram[aGroupId] || {})[traceOut.alignmentgroup]) {
+                if((alignmentOpts[aGroupId] || {})[traceOut.alignmentgroup]) {
                     groupName = aGroupId;
                 }
             }

src/traces/scatter/grouping_defaults.js

@@ -8,12 +8,7 @@ module.exports = function handleGroupingDefaults(traceIn, traceOut, fullLayout,
     var posAxId = traceOut[{v: 'x', h: 'y'}[orientation] + 'axis'];
     var groupId = getAxisGroup(fullLayout, posAxId) + orientation;
 
-    var allAlignmentOpts = fullLayout._alignmentOpts || {};
-    if(allAlignmentOpts[traceOut.type] === undefined) {
-        allAlignmentOpts[traceOut.type] = {};
-    }
-    var alignmentOpts = allAlignmentOpts[traceOut.type];
-
+    var alignmentOpts = fullLayout._alignmentOpts || {};
     var alignmentgroup = coerce('alignmentgroup');
 
     var alignmentGroups = alignmentOpts[groupId];