From 9044b8d85d64da83d1334862f9f06f9d591b7dde Mon Sep 17 00:00:00 2001
From: Bruce Martin <bruce@chanzuckerberg.com>
Date: Thu, 11 Apr 2019 12:47:38 -0700
Subject: [PATCH] fix color-by regression in toggle (#705)

* fix color-by regression in toggle

* fix incorrect field reference
---
 client/src/reducers/colors.js | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/client/src/reducers/colors.js b/client/src/reducers/colors.js
index e54552c7..96a1fdcd 100644
--- a/client/src/reducers/colors.js
+++ b/client/src/reducers/colors.js
@@ -55,11 +55,11 @@ const ColorsReducer = (
       const { world } = prevSharedState;
 
       /* toggle between this mode and reset */
-      const colorMode = action.type !== state.colorMode ? action.type : null;
-      const colorAccessor =
-        action.colorAccessor !== state.colorAccessor && colorMode !== null
-          ? action.colorAccessor
-          : null;
+      const resetCurrent =
+        action.type === state.colorMode &&
+        action.colorAccessor === state.colorAccessor;
+      const colorMode = !resetCurrent ? action.type : null;
+      const colorAccessor = !resetCurrent ? action.colorAccessor : null;
 
       const { rgb, scale } = createColors(world, colorMode, colorAccessor);
       return {
@@ -75,11 +75,10 @@ const ColorsReducer = (
       const { world } = prevSharedState;
 
       /* toggle between this mode and reset */
-      const colorMode = action.type !== state.colorMode ? action.type : null;
-      const colorAccessor =
-        action.gene !== state.colorAccessor && coorMode !== null
-          ? action.gene
-          : null;
+      const resetCurrent =
+        action.type === state.colorMode && action.gene === state.colorAccessor;
+      const colorMode = !resetCurrent ? action.type : null;
+      const colorAccessor = !resetCurrent ? action.gene : null;
 
       const { rgb, scale } = createColors(world, colorMode, colorAccessor);
       return {