update scatterternary for Plotly.react

Author: alexcjohnson

src/traces/scatterternary/calc.js

@@ -20,34 +20,35 @@ var dataArrays = ['a', 'b', 'c'];
 var arraysToFill = {a: ['b', 'c'], b: ['a', 'c'], c: ['a', 'b']};
 
 module.exports = function calc(gd, trace) {
-    var ternary = gd._fullLayout[trace.subplot],
-        displaySum = ternary.sum,
-        normSum = trace.sum || displaySum;
+    var ternary = gd._fullLayout[trace.subplot];
+    var displaySum = ternary.sum;
+    var normSum = trace.sum || displaySum;
+    var arrays = {a: trace.a, b: trace.b, c: trace.c};
 
     var i, j, dataArray, newArray, fillArray1, fillArray2;
 
     // fill in one missing component
     for(i = 0; i < dataArrays.length; i++) {
         dataArray = dataArrays[i];
-        if(trace[dataArray]) continue;
+        if(arrays[dataArray]) continue;
 
-        fillArray1 = trace[arraysToFill[dataArray][0]];
-        fillArray2 = trace[arraysToFill[dataArray][1]];
+        fillArray1 = arrays[arraysToFill[dataArray][0]];
+        fillArray2 = arrays[arraysToFill[dataArray][1]];
         newArray = new Array(fillArray1.length);
         for(j = 0; j < fillArray1.length; j++) {
             newArray[j] = normSum - fillArray1[j] - fillArray2[j];
         }
-        trace[dataArray] = newArray;
+        arrays[dataArray] = newArray;
     }
 
     // make the calcdata array
-    var serieslen = trace.a.length;
+    var serieslen = trace._length;
     var cd = new Array(serieslen);
     var a, b, c, norm, x, y;
     for(i = 0; i < serieslen; i++) {
-        a = trace.a[i];
-        b = trace.b[i];
-        c = trace.c[i];
+        a = arrays.a[i];
+        b = arrays.b[i];
+        c = arrays.c[i];
         if(isNumeric(a) && isNumeric(b) && isNumeric(c)) {
             a = +a;
             b = +b;

src/traces/scatterternary/defaults.js

@@ -55,10 +55,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
         return;
     }
 
-    // cut all data arrays down to same length
-    if(a && len < a.length) traceOut.a = a.slice(0, len);
-    if(b && len < b.length) traceOut.b = b.slice(0, len);
-    if(c && len < c.length) traceOut.c = c.slice(0, len);
+    traceOut._length = len;
 
     coerce('sum');
 

test/jasmine/tests/scatterternary_test.js

@@ -101,20 +101,23 @@ describe('scatterternary defaults', function() {
         expect(traceOut.visible).toBe(false);
     });
 
-    it('should truncate data arrays to the same length (\'c\' is shortest case)', function() {
+    it('should not truncate data arrays to the same length (\'c\' is shortest case)', function() {
+        // this is handled at the calc step now via _length.
         traceIn = {
             a: [1, 2, 3],
             b: [1, 2],
             c: [1]
         };
 
         supplyDefaults(traceIn, traceOut, defaultColor, layout);
-        expect(traceOut.a).toEqual([1]);
-        expect(traceOut.b).toEqual([1]);
+        expect(traceOut.a).toEqual([1, 2, 3]);
+        expect(traceOut.b).toEqual([1, 2]);
         expect(traceOut.c).toEqual([1]);
+        expect(traceOut._length).toBe(1);
     });
 
-    it('should truncate data arrays to the same length (\'a\' is shortest case)', function() {
+    it('should not truncate data arrays to the same length (\'a\' is shortest case)', function() {
+        // this is handled at the calc step now via _length.
         traceIn = {
             a: [1],
             b: [1, 2, 3],
@@ -123,21 +126,24 @@ describe('scatterternary defaults', function() {
 
         supplyDefaults(traceIn, traceOut, defaultColor, layout);
         expect(traceOut.a).toEqual([1]);
-        expect(traceOut.b).toEqual([1]);
-        expect(traceOut.c).toEqual([1]);
+        expect(traceOut.b).toEqual([1, 2, 3]);
+        expect(traceOut.c).toEqual([1, 2]);
+        expect(traceOut._length).toBe(1);
     });
 
-    it('should truncate data arrays to the same length (\'a\' is shortest case)', function() {
+    it('should not truncate data arrays to the same length (\'a\' is shortest case)', function() {
+        // this is handled at the calc step now via _length.
         traceIn = {
             a: [1, 2],
             b: [1],
             c: [1, 2, 3]
         };
 
         supplyDefaults(traceIn, traceOut, defaultColor, layout);
-        expect(traceOut.a).toEqual([1]);
+        expect(traceOut.a).toEqual([1, 2]);
         expect(traceOut.b).toEqual([1]);
-        expect(traceOut.c).toEqual([1]);
+        expect(traceOut.c).toEqual([1, 2, 3]);
+        expect(traceOut._length).toBe(1);
     });
 
     it('should include \'name\' in \'hoverinfo\' default if multi trace graph', function() {
@@ -218,32 +224,39 @@ describe('scatterternary calc', function() {
 
         trace = {
             subplot: 'ternary',
-            sum: 1
+            sum: 1,
+            _length: 3
         };
     });
 
+    function get(cd, component) {
+        return cd.map(function(v) {
+            return v[component];
+        });
+    }
+
     it('should fill in missing component (case \'c\')', function() {
         trace.a = [0.1, 0.3, 0.6];
         trace.b = [0.3, 0.6, 0.1];
 
-        calc(gd, trace);
-        expect(trace.c).toBeCloseToArray([0.6, 0.1, 0.3]);
+        cd = calc(gd, trace);
+        expect(get(cd, 'c')).toBeCloseToArray([0.6, 0.1, 0.3]);
     });
 
     it('should fill in missing component (case \'b\')', function() {
         trace.a = [0.1, 0.3, 0.6];
         trace.c = [0.1, 0.3, 0.2];
 
-        calc(gd, trace);
-        expect(trace.b).toBeCloseToArray([0.8, 0.4, 0.2]);
+        cd = calc(gd, trace);
+        expect(get(cd, 'b')).toBeCloseToArray([0.8, 0.4, 0.2]);
     });
 
     it('should fill in missing component (case \'a\')', function() {
         trace.b = [0.1, 0.3, 0.6];
         trace.c = [0.8, 0.4, 0.1];
 
-        calc(gd, trace);
-        expect(trace.a).toBeCloseToArray([0.1, 0.3, 0.3]);
+        cd = calc(gd, trace);
+        expect(get(cd, 'a')).toBeCloseToArray([0.1, 0.3, 0.3]);
     });
 
     it('should skip over non-numeric values', function() {