Merge pull request #2073 from broadinstitute/jb-non-spatial-refcolors

Only use refColorMap in multi-plot context (SCP-5692)
broadinstitute · Jul 8, 2024 · 4694304 · 4694304
2 parents c669aff + 12c39b5
commit 4694304
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/app/javascript/components/explore/ScatterTab.jsx b/app/javascript/components/explore/ScatterTab.jsx
@@ -25,6 +25,7 @@ export default function ScatterTab({
   function updateScatterColor(color) {
     updateExploreParamsWithDefaults({ scatterColor: color }, false)
   }
+  const hasMultipleRefs = exploreParamsWithDefaults?.spatialGroups?.length > 0
 
   // identify any repeat graphs
   const newContextMap = getNewContextMap(scatterParams, plotlyContextMap.current)
@@ -68,6 +69,7 @@ export default function ScatterTab({
               isRefCluster={isRefCluster}
               refClusterRendered={refClusterRendered}
               setRefClusterRendered={setRefClusterRendered}
+              hasMultipleRefs={hasMultipleRefs}
             />
           </div>,
           rowDivider

diff --git a/app/javascript/components/visualization/ScatterPlot.jsx b/app/javascript/components/visualization/ScatterPlot.jsx
@@ -47,7 +47,7 @@ function RawScatterPlot({
   isAnnotatedScatter=false, isCorrelatedScatter=false, isCellSelecting=false, plotPointsSelected, dataCache,
   canEdit, bucketId, expressionFilter=[0, 1], setCountsByLabelForDe, hiddenTraces=[],
   isSplitLabelArrays, updateExploreParams, filteredCells, refColorMap, setRefColorMap, isRefCluster, refClusterRendered,
-  setRefClusterRendered
+  setRefClusterRendered, hasMultipleRefs
 }) {
   const [countsByLabel, setCountsByLabel] = useState(null)
   const [isLoading, setIsLoading] = useState(false)
@@ -198,7 +198,7 @@ function RawScatterPlot({
       refColorMap,
       setRefColorMap,
       isRefCluster,
-      refClusterRendered
+      hasMultipleRefs
     })
     if (isRG) {
       setCountsByLabel(labelCounts)
@@ -719,7 +719,7 @@ function getPlotlyTraces({
   refColorMap,
   setRefColorMap,
   isRefCluster,
-  refClusterRendered
+  hasMultipleRefs
 }) {
   const unfilteredTrace = {
     type: is3D ? 'scatter3d' : 'scattergl',
@@ -755,7 +755,12 @@ function getPlotlyTraces({
       groupTrace.type = unfilteredTrace.type
       groupTrace.mode = unfilteredTrace.mode
       groupTrace.opacity = unfilteredTrace.opacity
-      const color = getColorForLabel(groupTrace.name, customColors, editedCustomColors, refColorMap, labelIndex)
+      let color
+      if (hasMultipleRefs) {
+        color = getColorForLabel(groupTrace.name, customColors, editedCustomColors, refColorMap, labelIndex)
+      } else {
+        color = getColorForLabel(groupTrace.name, customColors, editedCustomColors, {}, labelIndex)
+      }
       if (isRefCluster) {
         updateRefColorMap(setRefColorMap, color, groupTrace.name)
       }