fix: scroll position in pivot (#6099)

rilldata · Nov 20, 2024 · d9e0335 · d9e0335 · github-actions · Nov 20, 2024
1 parent 37c22bf
commit d9e0335
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/web-common/src/features/dashboards/pivot/PivotTable.svelte b/web-common/src/features/dashboards/pivot/PivotTable.svelte
@@ -211,10 +211,11 @@
     ];
   }
   function onExpandedChange(updater: Updater<ExpandedState>) {
-    // Something is off with tanstack's types
-    //@ts-expect-error-free
-    //eslint-disable-next-line
-    expanded = updater(expanded);
+    if (updater instanceof Function) {
+      expanded = updater(expanded);
+    } else {
+      expanded = updater;
+    }
     metricsExplorerStore.setPivotExpanded($exploreName, expanded);
   }
 
@@ -225,6 +226,7 @@
       sorting = updater;
     }
     metricsExplorerStore.setPivotSort($exploreName, sorting);
+    rowScrollOffset = 0;
   }
 
   const handleScroll = (containerRefElement?: HTMLDivElement | null) => {

diff --git a/web-common/src/features/dashboards/pivot/pivot-data-store.ts b/web-common/src/features/dashboards/pivot/pivot-data-store.ts
@@ -552,7 +552,7 @@ export function createPivotDataStore(
                 if (rowMeasureTotalsAxesQuery?.isFetching) {
                   return cellSet({
                     isFetching: true,
-                    data: axesRowTotals,
+                    data: lastPivotData ? lastPivotData : axesRowTotals,
                     columnDef,
                     assembled: false,
                     totalColumns,