fix and 🔒 selectionrevision with groupby

alexcjohnson · alexcjohnson · commit 090231bce09a · 2018-11-13T13:42:35.000-05:00
diff --git a/src/plots/cartesian/select.js b/src/plots/cartesian/select.js
@@ -680,8 +680,8 @@ function updateSelectedState(gd, searchTraces, eventData) {
 
         for(i = 0; i < searchTraces.length; i++) {
             trace = searchTraces[i].cd[0].trace;
-            trace.selectedpoints = [];
-            trace._input.selectedpoints = [];
+            trace._input.selectedpoints = trace._fullInput.selectedpoints = [];
+            if(trace._fullInput !== trace) trace.selectedpoints = [];
         }
 
         for(i = 0; i < pts.length; i++) {
@@ -691,10 +691,14 @@ function updateSelectedState(gd, searchTraces, eventData) {
 
             if(pt.pointIndices) {
                 [].push.apply(data.selectedpoints, pt.pointIndices);
-                [].push.apply(fullData.selectedpoints, pt.pointIndices);
+                if(trace._fullInput !== trace) {
+                    [].push.apply(fullData.selectedpoints, pt.pointIndices);
+                }
             } else {
                 data.selectedpoints.push(pt.pointIndex);
-                fullData.selectedpoints.push(pt.pointIndex);
+                if(trace._fullInput !== trace) {
+                    fullData.selectedpoints.push(pt.pointIndex);
+                }
             }
         }
     }
@@ -703,6 +707,9 @@ function updateSelectedState(gd, searchTraces, eventData) {
             trace = searchTraces[i].cd[0].trace;
             delete trace.selectedpoints;
             delete trace._input.selectedpoints;
+            if(trace._fullInput !== trace) {
+                delete trace._fullInput.selectedpoints;
+            }
         }
     }
 
diff --git a/test/jasmine/tests/plot_api_react_test.js b/test/jasmine/tests/plot_api_react_test.js
@@ -1418,6 +1418,47 @@ describe('Plotly.react and uirevision attributes', function() {
         _run(fig, editSelection, checkNoSelection, checkSelection).then(done);
     });
 
+    it('preserves selectedpoints using selectedrevision (groupby case)', function(done) {
+        function fig(mainRev, selectionRev) {
+            return {
+                data: [{
+                    x: [1, 2, 3, 1, 2, 3, 1, 2, 3],
+                    y: [1, 1, 1, 2, 2, 2, 3, 3, 3],
+                    mode: 'markers',
+                    marker: {size: 20},
+                    transforms: [{
+                        type: 'groupby',
+                        groups: [1, 2, 3, 2, 3, 1, 3, 1, 2]
+                    }]
+                }],
+                layout: {
+                    uirevision: mainRev,
+                    selectionrevision: selectionRev,
+                    dragmode: 'select',
+                    width: 400,
+                    height: 400,
+                    margin: {l: 100, t: 100, r: 100, b: 100}
+                }
+            };
+        }
+
+        function editSelection() {
+            // drag across the upper right quadrant, so we'll select
+            // curve 0 point 1 and curve 1 point 2
+            return drag(document.querySelector('.nsewdrag'),
+                148, 148, '', 150, 102);
+        }
+
+        var checkNoSelection = checkState([{selectedpoints: undefined}]);
+        // the funny point order here is from the grouping:
+        // points 5 & 7 come first as they're in group 1
+        // point 8 is next, in group 2
+        // point 4 is last, in group 3
+        var checkSelection = checkState([{selectedpoints: [[5, 7, 8, 4]]}]);
+
+        _run(fig, editSelection, checkNoSelection, checkSelection).then(done);
+    });
+
     it('preserves polar view changes using polar.uirevision', function(done) {
         // polar you can control either at the subplot or the axis level
         function fig(mainRev, polarRev) {

Original file line number	Diff line number	Diff line change
`@@ -680,8 +680,8 @@ function updateSelectedState(gd, searchTraces, eventData) {`
`680`	`680`
`681`	`681`	`for(i = 0; i < searchTraces.length; i++) {`
`682`	`682`	`trace = searchTraces[i].cd[0].trace;`
`683`		`- trace.selectedpoints = [];`
`684`		`- trace._input.selectedpoints = [];`
	`683`	`+ trace._input.selectedpoints = trace._fullInput.selectedpoints = [];`
	`684`	`+ if(trace._fullInput !== trace) trace.selectedpoints = [];`
`685`	`685`	`}`
`686`	`686`
`687`	`687`	`for(i = 0; i < pts.length; i++) {`
`@@ -691,10 +691,14 @@ function updateSelectedState(gd, searchTraces, eventData) {`
`691`	`691`
`692`	`692`	`if(pt.pointIndices) {`
`693`	`693`	`[].push.apply(data.selectedpoints, pt.pointIndices);`
`694`		`- [].push.apply(fullData.selectedpoints, pt.pointIndices);`
	`694`	`+ if(trace._fullInput !== trace) {`
	`695`	`+ [].push.apply(fullData.selectedpoints, pt.pointIndices);`
	`696`	`+ }`
`695`	`697`	`} else {`
`696`	`698`	`data.selectedpoints.push(pt.pointIndex);`
`697`		`- fullData.selectedpoints.push(pt.pointIndex);`
	`699`	`+ if(trace._fullInput !== trace) {`
	`700`	`+ fullData.selectedpoints.push(pt.pointIndex);`
	`701`	`+ }`
`698`	`702`	`}`
`699`	`703`	`}`
`700`	`704`	`}`
`@@ -703,6 +707,9 @@ function updateSelectedState(gd, searchTraces, eventData) {`
`703`	`707`	`trace = searchTraces[i].cd[0].trace;`
`704`	`708`	`delete trace.selectedpoints;`
`705`	`709`	`delete trace._input.selectedpoints;`
	`710`	`+ if(trace._fullInput !== trace) {`
	`711`	`+ delete trace._fullInput.selectedpoints;`
	`712`	`+ }`
`706`	`713`	`}`
`707`	`714`	`}`
`708`	`715`