fix: remove implict state toggling for spatial underlay in favor of e…

…xplict state setting
chanzuckerberg · Apr 3, 2024 · 85cc506 · 85cc506
1 parent ffd7281
commit 85cc506
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/client/src/components/embedding/index.tsx b/client/src/components/embedding/index.tsx
@@ -46,9 +46,13 @@ class Embedding extends React.PureComponent<{}, EmbeddingState> {
     track(EVENTS.EXPLORER_LAYOUT_CHOICE_CHANGE_ITEM_CLICKED);
 
     dispatch(actions.layoutChoiceAction(e.currentTarget.value));
-    if (imageUnderlay && e.target.value !== globals.spatialEmbeddingKeyword) {
+    if (
+      imageUnderlay &&
+      !e.target.value.includes(globals.spatialEmbeddingKeyword)
+    ) {
       dispatch({
         type: "toggle image underlay",
+        toggle: false,
       });
     }
   };

diff --git a/client/src/components/menubar/index.tsx b/client/src/components/menubar/index.tsx
@@ -106,6 +106,7 @@ class MenuBar extends React.PureComponent<{}, State> {
     if (currentConditionMet) {
       dispatch({
         type: "toggle image underlay",
+        toggle: true,
       });
     }
   }
@@ -123,6 +124,7 @@ class MenuBar extends React.PureComponent<{}, State> {
     if (!prevConditionMet && currentConditionMet) {
       dispatch({
         type: "toggle image underlay",
+        toggle: true,
       });
     }
   }
@@ -438,6 +440,7 @@ class MenuBar extends React.PureComponent<{}, State> {
                     onClick={() => {
                       dispatch({
                         type: "toggle image underlay",
+                        toggle: !imageUnderlay,
                       });
                     }}
                   />

diff --git a/client/src/reducers/controls.ts b/client/src/reducers/controls.ts
@@ -457,7 +457,7 @@ const Controls = (
     case "toggle image underlay": {
       return {
         ...state,
-        imageUnderlay: !state.imageUnderlay,
+        imageUnderlay: action.data.toggle,
       };
     }
     case "request uns metadata started":