From 1fe2761d89056306f85e1657bce059aa87abbc6c Mon Sep 17 00:00:00 2001
From: boygirl <lauren.eastridge@formidable.com>
Date: Mon, 16 Apr 2018 18:06:17 -0700
Subject: [PATCH 1/2] only set null on previously selected data instead of all

---
 .../containers/selection-helpers.js           | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/components/containers/selection-helpers.js b/src/components/containers/selection-helpers.js
index 1d23d9dc..8eebb1da 100644
--- a/src/components/containers/selection-helpers.js
+++ b/src/components/containers/selection-helpers.js
@@ -69,12 +69,11 @@ const SelectionHelpers = {
   // eslint-disable-next-line complexity, max-statements
   onMouseDown(evt, targetProps) {
     evt.preventDefault();
-    const { activateSelectedData, allowSelection, polar } = targetProps;
+    const { activateSelectedData, allowSelection, polar, selectedData } = targetProps;
     if (!allowSelection) {
       return {};
     }
     const dimension = targetProps.selectionDimension;
-    const datasets = targetProps.datasets || [];
     const { x, y } = Selection.getSVGEventCoordinates(evt);
     const x1 = polar || dimension !== "y" ? x : Selection.getDomainCoordinates(targetProps).x[0];
     const y1 = polar || dimension !== "x" ? y : Selection.getDomainCoordinates(targetProps).y[0];
@@ -86,12 +85,15 @@ const SelectionHelpers = {
       targetProps.onSelectionCleared(defaults({}, mutatedProps, targetProps));
     }
     const parentMutation = [{ target: "parent", mutation: () => mutatedProps }];
-    const dataMutation = activateSelectedData ? [{
-      target: "data",
-      childName: targetProps.children || datasets.length ? "all" : undefined,
-      eventKey: "all",
-      mutation: () => null
-    }] : [];
+    const dataMutation = selectedData && activateSelectedData ?
+      selectedData.map((d) => {
+        return {
+          childName: d.childName, eventKey: d.eventKey, target: "data",
+          mutation: () => {
+            return null;
+          }
+        };
+      }) : [];
 
     return parentMutation.concat(...dataMutation);
   },
@@ -100,7 +102,7 @@ const SelectionHelpers = {
     const { allowSelection, select, polar } = targetProps;
     const dimension = targetProps.selectionDimension;
     if (!allowSelection || !select) {
-      return {};
+      return null;
     } else {
       const { x, y } = Selection.getSVGEventCoordinates(evt);
       const x2 = polar || dimension !== "y" ? x : Selection.getDomainCoordinates(targetProps).x[1];
@@ -117,7 +119,7 @@ const SelectionHelpers = {
   onMouseUp(evt, targetProps) {
     const { activateSelectedData, allowSelection, x2, y2 } = targetProps;
     if (!allowSelection) {
-      return {};
+      return null;
     }
     if (!x2 || !y2) {
       return [{
@@ -130,7 +132,9 @@ const SelectionHelpers = {
     const datasets = this.getDatasets(targetProps);
     const bounds = Selection.getBounds(targetProps);
     const selectedData = this.filterDatasets(targetProps, datasets, bounds);
-    const mutatedProps = { datasets, select: false, x1: null, x2: null, y1: null, y2: null };
+    const mutatedProps = {
+      selectedData, datasets, select: false, x1: null, x2: null, y1: null, y2: null
+    };
     const callbackMutation = selectedData && isFunction(targetProps.onSelection) ?
       targetProps.onSelection(selectedData, bounds, defaults({}, mutatedProps, targetProps)) : {};
     const parentMutation = [{

From 4e4dd135fc220ca5ce80b9476a98fd7a00298d98 Mon Sep 17 00:00:00 2001
From: boygirl <lauren.eastridge@formidable.com>
Date: Mon, 16 Apr 2018 20:01:31 -0700
Subject: [PATCH 2/2] lint

---
 src/components/containers/selection-helpers.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/components/containers/selection-helpers.js b/src/components/containers/selection-helpers.js
index 8eebb1da..3a10a79e 100644
--- a/src/components/containers/selection-helpers.js
+++ b/src/components/containers/selection-helpers.js
@@ -88,10 +88,7 @@ const SelectionHelpers = {
     const dataMutation = selectedData && activateSelectedData ?
       selectedData.map((d) => {
         return {
-          childName: d.childName, eventKey: d.eventKey, target: "data",
-          mutation: () => {
-            return null;
-          }
+          childName: d.childName, eventKey: d.eventKey, target: "data", mutation: () => null
         };
       }) : [];