remove _expandedIndex use index instead of _expandedIndex

Author: archmoj

src/components/legend/draw.js

@@ -484,7 +484,7 @@ function clickOrDoubleClick(gd, legend, legendItem, numClicks, evt) {
         event: evt,
         node: legendItem.node(),
         curveNumber: trace.index,
-        expandedIndex: trace._expandedIndex,
+        expandedIndex: trace.index,
         data: gd.data,
         layout: gd.layout,
         frames: gd._transitionData._frames,

src/components/selections/select.js

@@ -597,8 +597,8 @@ function newPointNumTester(pointSelectionDef) {
         ymax: 0,
         pts: [],
         contains: function(pt, omitFirstEdge, pointNumber, searchInfo) {
-            var idxWantedTrace = pointSelectionDef.searchInfo.cd[0].trace._expandedIndex;
-            var idxActualTrace = searchInfo.cd[0].trace._expandedIndex;
+            var idxWantedTrace = pointSelectionDef.searchInfo.cd[0].trace.index;
+            var idxActualTrace = searchInfo.cd[0].trace.index;
             return idxActualTrace === idxWantedTrace &&
               pointNumber === pointSelectionDef.pointNumber;
         },
@@ -844,7 +844,7 @@ function extractClickedPtInfo(hoverData, searchTraces) {
 
     for(i = 0; i < searchTraces.length; i++) {
         searchInfo = searchTraces[i];
-        if(hoverDatum.fullData._expandedIndex === searchInfo.cd[0].trace._expandedIndex) {
+        if(hoverDatum.fullData.index === searchInfo.cd[0].trace.index) {
             // Special case for box (and violin)
             if(hoverDatum.hoverOnBox === true) {
                 break;

src/plots/cartesian/layout_defaults.js

@@ -143,7 +143,7 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
 
     function newAxLayoutOut() {
         var traces = ax2traces[axName] || [];
-        axLayoutOut._traceIndices = traces.map(function(t) { return t._expandedIndex; });
+        axLayoutOut._traceIndices = traces.map(function(t) { return t.index; });
         axLayoutOut._annIndices = [];
         axLayoutOut._shapeIndices = [];
         axLayoutOut._selectionIndices = [];

src/plots/geo/layout_defaults.js

@@ -21,7 +21,7 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
 
 function handleGeoDefaults(geoLayoutIn, geoLayoutOut, coerce, opts) {
     var subplotData = getSubplotData(opts.fullData, 'geo', opts.id);
-    var traceIndices = subplotData.map(function(t) { return t._expandedIndex; });
+    var traceIndices = subplotData.map(function(t) { return t.index; });
 
     var resolution = coerce('resolution');
     var scope = coerce('scope');

src/plots/plots.js

@@ -1088,11 +1088,7 @@ plots.supplyDataDefaults = function(dataIn, dataOut, layout, fullLayout) {
 
         fullTrace.index = i;
         fullTrace._input = trace;
-        fullTrace._expandedIndex = cnt;
-
-        // add identify refs for consistency with transformed traces
         fullTrace._fullInput = fullTrace;
-        fullTrace._expandedInput = fullTrace;
 
         pushModule(fullTrace);
 

src/plots/polar/layout_defaults.js

@@ -48,7 +48,7 @@ function handleDefaults(contIn, contOut, coerce, opts) {
         var axOut = Template.newContainer(contOut, axName);
         axOut._id = axOut._name = axName;
         axOut._attr = opts.id + '.' + axName;
-        axOut._traceIndices = subplotData.map(function(t) { return t._expandedIndex; });
+        axOut._traceIndices = subplotData.map(function(t) { return t.index; });
 
         var dataAttr = constants.axisName2dataArray[axName];
         var axType = handleAxisTypeDefaults(axIn, axOut, coerceAxis, subplotData, dataAttr, opts);

src/plots/smith/layout_defaults.js

@@ -48,7 +48,7 @@ function handleDefaults(contIn, contOut, coerce, opts) {
         var axOut = Template.newContainer(contOut, axName);
         axOut._id = axOut._name = axName;
         axOut._attr = opts.id + '.' + axName;
-        axOut._traceIndices = subplotData.map(function(t) { return t._expandedIndex; });
+        axOut._traceIndices = subplotData.map(function(t) { return t.index; });
 
         var visible = coerceAxis('visible');
 

src/traces/scatter/calc.js

@@ -36,7 +36,7 @@ function calc(gd, trace) {
     var yAttr = 'y';
     var posAttr;
     if(stackGroupOpts) {
-        Lib.pushUnique(stackGroupOpts.traceIndices, trace._expandedIndex);
+        Lib.pushUnique(stackGroupOpts.traceIndices, trace.index);
         isV = stackGroupOpts.orientation === 'v';
 
         // size, like we use for bar

test/jasmine/tests/plots_test.js

@@ -131,17 +131,11 @@ describe('Test Plots', function() {
             expect(gd._fullData[0].index).toEqual(0);
             expect(gd._fullData[1].index).toEqual(1);
 
-            expect(gd._fullData[0]._expandedIndex).toEqual(0);
-            expect(gd._fullData[1]._expandedIndex).toEqual(1);
-
             expect(gd._fullData[0]._input).toBe(trace0);
             expect(gd._fullData[1]._input).toBe(trace1);
 
             expect(gd._fullData[0]._fullInput).toBe(gd._fullData[0]);
             expect(gd._fullData[1]._fullInput).toBe(gd._fullData[1]);
-
-            expect(gd._fullData[0]._expandedInput).toBe(gd._fullData[0]);
-            expect(gd._fullData[1]._expandedInput).toBe(gd._fullData[1]);
         });
 
         function testSanitizeMarginsHasBeenCalledOnlyOnce(gd) {