React finance precursor

src/plot_api/plot_api.js

@@ -2429,8 +2429,14 @@ function diffData(gd, oldFullData, newFullData, immutable) {
         gd: gd
     };
 
+
+    var seenUIDs = {};
+
     for(i = 0; i < oldFullData.length; i++) {
-        trace = newFullData[i];
+        trace = newFullData[i]._fullInput;
+        if(seenUIDs[trace.uid]) continue;
+        seenUIDs[trace.uid] = 1;
+
         diffOpts.autoranged = trace.xaxis ? (
             Axes.getFromId(gd, trace.xaxis).autorange ||
             Axes.getFromId(gd, trace.yaxis).autorange

src/plots/plots.js

@@ -380,7 +380,7 @@ plots.supplyDefaults = function(gd) {
         if(_module.cleanData) _module.cleanData(newFullData);
     }
 
-    if(oldFullData.length === newData.length) {
+    if(oldFullData.length === newFullData.length) {
         for(i = 0; i < newFullData.length; i++) {
             relinkPrivateKeys(newFullData[i], oldFullData[i]);
         }

src/traces/carpet/calc.js

@@ -52,8 +52,8 @@ module.exports = function calc(gd, trace) {
     trace.setScale();
 
     // Convert cartesian-space x/y coordinates to screen space pixel coordinates:
-    t.xp = trace.xp = map2dArray(trace.xp, x, xa.c2p);
-    t.yp = trace.yp = map2dArray(trace.yp, y, ya.c2p);
+    t.xp = trace._xp = map2dArray(trace._xp, x, xa.c2p);
+    t.yp = trace._yp = map2dArray(trace._yp, y, ya.c2p);
 
     // This is a rather expensive scan. Nothing guarantees monotonicity,
     // so we need to scan through all data to get proper ranges:
@@ -88,7 +88,7 @@ module.exports = function calc(gd, trace) {
 
     // Tabulate points for the four segments that bound the axes so that we can
     // map to pixel coordinates in the plot function and create a clip rect:
-    t.clipsegments = calcClipPath(trace.xctrl, trace.yctrl, aax, bax);
+    t.clipsegments = calcClipPath(trace._xctrl, trace._yctrl, aax, bax);
 
     t.x = x;
     t.y = y;

src/traces/carpet/calc_gridlines.js

@@ -30,8 +30,8 @@ module.exports = function calcGridlines(trace, cd, axisLetter, crossAxisLetter)
         axis.tickvals = data.slice();
     }
 
-    var xcp = trace.xctrl;
-    var ycp = trace.yctrl;
+    var xcp = trace._xctrl;
+    var ycp = trace._yctrl;
     var nea = xcp[0].length;
     var neb = xcp.length;
     var na = trace.a.length;

src/traces/carpet/set_convert.js

@@ -72,18 +72,18 @@ module.exports = function setConvert(trace) {
         // an expanded basis of control points. Note in particular that it overwrites the existing
         // basis without creating a new array since that would potentially thrash the garbage
         // collector.
-        var result = computeControlPoints(trace.xctrl, trace.yctrl, x, y, aax.smoothing, bax.smoothing);
-        trace.xctrl = result[0];
-        trace.yctrl = result[1];
+        var result = computeControlPoints(trace._xctrl, trace._yctrl, x, y, aax.smoothing, bax.smoothing);
+        trace._xctrl = result[0];
+        trace._yctrl = result[1];
 
         // This step is the second step in the process, but it's somewhat simpler. It just unrolls
         // some logic since it would be unnecessarily expensive to compute both interpolations
         // nearly identically but separately and to include a bunch of linear vs. bicubic logic in
         // every single call.
-        trace.evalxy = createSplineEvaluator([trace.xctrl, trace.yctrl], na, nb, aax.smoothing, bax.smoothing);
+        trace.evalxy = createSplineEvaluator([trace._xctrl, trace._yctrl], na, nb, aax.smoothing, bax.smoothing);
 
-        trace.dxydi = createIDerivativeEvaluator([trace.xctrl, trace.yctrl], aax.smoothing, bax.smoothing);
-        trace.dxydj = createJDerivativeEvaluator([trace.xctrl, trace.yctrl], aax.smoothing, bax.smoothing);
+        trace.dxydi = createIDerivativeEvaluator([trace._xctrl, trace._yctrl], aax.smoothing, bax.smoothing);
+        trace.dxydj = createJDerivativeEvaluator([trace._xctrl, trace._yctrl], aax.smoothing, bax.smoothing);
     };
 
     /*

src/traces/contour/empty_pathinfo.js

@@ -21,7 +21,7 @@ module.exports = function emptyPathinfo(contours, plotinfo, cd0) {
     var pathinfo = [];
     var end = endPlus(contoursFinal);
 
-    var carpet = cd0.trace.carpetTrace;
+    var carpet = cd0.trace._carpetTrace;
 
     var basePathinfo = carpet ? {
         // store axes so we can convert to px

src/traces/contourcarpet/calc.js

@@ -24,7 +24,7 @@ var setContours = require('../contour/set_contours');
 // though a few things inside heatmap calc still look for
 // contour maps, because the makeBoundArray calls are too entangled
 module.exports = function calc(gd, trace) {
-    var carpet = trace.carpetTrace = lookupCarpet(gd, trace);
+    var carpet = trace._carpetTrace = lookupCarpet(gd, trace);
     if(!carpet || !carpet.visible || carpet.visible === 'legendonly') return;
 
     if(!trace.a || !trace.b) {
@@ -54,7 +54,7 @@ module.exports = function calc(gd, trace) {
 function heatmappishCalc(gd, trace) {
     // prepare the raw data
     // run makeCalcdata on x and y even for heatmaps, in case of category mappings
-    var carpet = trace.carpetTrace;
+    var carpet = trace._carpetTrace;
     var aax = carpet.aaxis;
     var bax = carpet.baxis;
     var a,

src/traces/contourcarpet/plot.js

@@ -35,7 +35,7 @@ module.exports = function plot(gd, plotinfo, cdcontours) {
 function plotOne(gd, plotinfo, cd) {
     var trace = cd[0].trace;
 
-    var carpet = trace.carpetTrace = lookupCarpet(gd, trace);
+    var carpet = trace._carpetTrace = lookupCarpet(gd, trace);
     var carpetcd = gd.calcdata[carpet.index][0];
 
     if(!carpet.visible || carpet.visible === 'legendonly') return;

src/traces/heatmap/convert_column_xyz.js

@@ -13,10 +13,6 @@ var Lib = require('../../lib');
 var BADNUM = require('../../constants/numerical').BADNUM;
 
 module.exports = function convertColumnData(trace, ax1, ax2, var1Name, var2Name, arrayVarNames) {
-    var1Name = var1Name || 'x';
-    var2Name = var2Name || 'y';
-    arrayVarNames = arrayVarNames || ['z'];
-
     var col1 = trace[var1Name].slice(),
         col2 = trace[var2Name].slice(),
         textCol = trace.text,

src/traces/scattercarpet/calc.js

@@ -18,7 +18,7 @@ var calcMarkerSize = require('../scatter/calc').calcMarkerSize;
 var lookupCarpet = require('../carpet/lookup_carpetid');
 
 module.exports = function calc(gd, trace) {
-    var carpet = trace.carpetTrace = lookupCarpet(gd, trace);
+    var carpet = trace._carpetTrace = lookupCarpet(gd, trace);
     if(!carpet || !carpet.visible || carpet.visible === 'legendonly') return;
     var i;
 

src/traces/table/calc.js

@@ -10,6 +10,8 @@
 
 var wrap = require('../../lib/gup').wrap;
 
-module.exports = function calc(gd, trace) {
-    return wrap(trace);
+module.exports = function calc() {
+    // we don't actually need to include the trace here, since that will be added
+    // by Plots.doCalcdata, and that's all we actually need later.
+    return wrap({});
 };

test/jasmine/tests/heatmap_test.js

@@ -181,7 +181,7 @@ describe('heatmap convertColumnXYZ', function() {
             z: [1, 2, 3, 4, 5, 6]
         };
 
-        convertColumnXYZ(trace, xa, ya);
+        convertColumnXYZ(trace, xa, ya, 'x', 'y', ['z']);
         expect(trace.x).toEqual([1, 2]);
         expect(trace.y).toEqual([1, 2, 3]);
         expect(trace.z).toEqual([[1, 4], [2, 5], [3, 6]]);
@@ -194,7 +194,7 @@ describe('heatmap convertColumnXYZ', function() {
             z: [1, 2, 4, 5, 6]
         };
 
-        convertColumnXYZ(trace, xa, ya);
+        convertColumnXYZ(trace, xa, ya, 'x', 'y', ['z']);
         expect(trace.x).toEqual([1, 2]);
         expect(trace.y).toEqual([1, 2, 3]);
         expect(trace.z).toEqual([[1, 4], [2, 5], [, 6]]);
@@ -207,7 +207,7 @@ describe('heatmap convertColumnXYZ', function() {
             z: [1, null, 4, 5, 6]
         };
 
-        convertColumnXYZ(trace, xa, ya);
+        convertColumnXYZ(trace, xa, ya, 'x', 'y', ['z']);
         expect(trace.x).toEqual([1, 2]);
         expect(trace.y).toEqual([1, 2, 3]);
         expect(trace.z).toEqual([[1, 4], [null, 5], [, 6]]);
@@ -221,7 +221,7 @@ describe('heatmap convertColumnXYZ', function() {
             text: ['a', 'b', 'c', 'd', 'e', 'f', 'g']
         };
 
-        convertColumnXYZ(trace, xa, ya);
+        convertColumnXYZ(trace, xa, ya, 'x', 'y', ['z']);
         expect(trace.text).toEqual([['a', 'd'], ['b', 'e'], ['c', 'f']]);
     });
 
@@ -253,7 +253,7 @@ describe('heatmap convertColumnXYZ', function() {
             ]
         };
 
-        convertColumnXYZ(trace, xa, ya);
+        convertColumnXYZ(trace, xa, ya, 'x', 'y', ['z']);
         expect(trace.x).toEqual(
             [-88596, -65484, -42372, -19260, 3852, 26964, 50076, 73188]);
         expect(trace.y).toEqual(
@@ -282,7 +282,7 @@ describe('heatmap convertColumnXYZ', function() {
             z: [0, 50, 100, 50, null, 255, 100, 510, 1010]
         };
 
-        convertColumnXYZ(trace, xa, ya);
+        convertColumnXYZ(trace, xa, ya, 'x', 'y', ['z']);
 
         expect(trace.x).toEqual([0, 5, 10]);
         expect(trace.y).toEqual([0, 5, 10]);