Merge pull request #440 from Renumics/fix/no-colors-on-filtered-simmap

fix computation of filtered values in color tf factory
Renumics · Feb 27, 2024 · 53c03aa · 53c03aa
2 parents 4a78a95 + 75be158
commit 53c03aa
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/src/stores/dataset/colorTransferFunctionFactory.tsx b/src/stores/dataset/colorTransferFunctionFactory.tsx
@@ -18,16 +18,22 @@ export const makeColumnsColorTransferFunctions = (
     const colors = useColors.getState();
 
     return columns.reduce((a, column) => {
+        const values = data[column.key];
+        const filteredValues = new Array(filteredIndices.length);
+        for (let i = 0; i < filteredIndices.length; ++i) {
+            filteredValues[i] = data[column.key][filteredIndices[i]];
+        }
+
         a[column.key] = {
             full: createColorTransferFunction(
-                data[column.key],
+                values,
                 column.type,
                 colors.robust,
                 colors.continuousInts,
                 colors.continuousCategories
             ),
             filtered: createColorTransferFunction(
-                filteredIndices.map((i) => data[column.key][i]),
+                filteredValues,
                 column.type,
                 colors.robust,
                 colors.continuousInts,

diff --git a/src/stores/dataset/dataset.ts b/src/stores/dataset/dataset.ts
@@ -472,19 +472,19 @@ export const useDataset = create(
 
                 set({ columnRelevance, isComputingRelevance: false });
             },
-            recomputeColorTransferFunctions: async () => {
-                const columnsToCompute = get()
-                    .columns.filter((c) => isScalar(c.type) || isCategorical(c.type))
-                    .map((c) => c.key);
-
-                const newTransferFunctions = makeColumnsColorTransferFunctions(
-                    get().columns.filter(({ key }) => columnsToCompute.includes(key)),
-                    get().columnData,
-                    get().filteredIndices
-                );
+            recomputeColorTransferFunctions: () => {
+                set(({ columns, columnData, filteredIndices }) => {
+                    const columnsToCompute = columns
+                        .filter((c) => isScalar(c.type) || isCategorical(c.type))
+                        .map((c) => c.key);
 
-                set({
-                    colorTransferFunctions: newTransferFunctions,
+                    return {
+                        colorTransferFunctions: makeColumnsColorTransferFunctions(
+                            columns.filter(({ key }) => columnsToCompute.includes(key)),
+                            columnData,
+                            filteredIndices
+                        ),
+                    };
                 });
             },
             clearLoadingError: () => {