AT: scrollToRef

Author: Lukas742

packages/main/src/components/AnalyticalTable/TableBody/VirtualTableBody.tsx

@@ -35,7 +35,6 @@ interface VirtualTableBodyProps {
   subRowsKey: string;
   scrollContainerRef?: MutableRefObject<HTMLDivElement>;
   triggerScroll?: TriggerScrollState;
-  scrollToRef: MutableRefObject<ReactVirtualScrollToMethods>;
   rowVirtualizer: Virtualizer<DivWithCustomScrollProp, HTMLElement>;
 }
 
@@ -54,7 +53,6 @@ export const VirtualTableBody = (props: VirtualTableBodyProps) => {
     classes,
     prepareRow,
     rows,
-    scrollToRef,
     isTreeTable,
     internalRowHeight,
     visibleColumns,
@@ -76,12 +74,6 @@ export const VirtualTableBody = (props: VirtualTableBodyProps) => {
   const rowHeight = popInRowHeight !== internalRowHeight ? popInRowHeight : internalRowHeight;
   const lastNonEmptyRow = useRef(null);
 
-  scrollToRef.current = {
-    ...scrollToRef.current,
-    scrollToOffset: rowVirtualizer.scrollToOffset,
-    scrollToIndex: rowVirtualizer.scrollToIndex,
-  };
-
   useEffect(() => {
     if (triggerScroll && triggerScroll.direction === 'vertical') {
       if (triggerScroll.type === 'offset') {

packages/main/src/components/AnalyticalTable/index.tsx

@@ -368,13 +368,6 @@ const AnalyticalTable = forwardRef<AnalyticalTableDomRef, AnalyticalTablePropTyp
     }
   }, [tableState.groupBy, tableState.columnOrder]);
 
-  if (parentRef.current) {
-    scrollToRef.current = {
-      ...scrollToRef.current,
-      horizontalScrollToOffset: columnVirtualizer.scrollToOffset,
-      horizontalScrollToIndex: columnVirtualizer.scrollToIndex,
-    };
-  }
   useEffect(() => {
     if (triggerScroll && triggerScroll.direction === 'horizontal') {
       if (triggerScroll.type === 'offset') {
@@ -726,6 +719,16 @@ const AnalyticalTable = forwardRef<AnalyticalTableDomRef, AnalyticalTablePropTyp
   // add range to instance for `useAutoResize` plugin hook
   tableInstanceRef.current.virtualRowsRange = rowVirtualizer.range;
 
+  if (parentRef.current) {
+    scrollToRef.current = {
+      ...scrollToRef.current,
+      horizontalScrollToOffset: columnVirtualizer.scrollToOffset,
+      horizontalScrollToIndex: columnVirtualizer.scrollToIndex,
+      scrollToOffset: rowVirtualizer.scrollToOffset,
+      scrollToIndex: rowVirtualizer.scrollToIndex,
+    };
+  }
+
   return (
     <div
       className={className}
@@ -854,7 +857,6 @@ const AnalyticalTable = forwardRef<AnalyticalTableDomRef, AnalyticalTablePropTyp
                 classes={classNames}
                 prepareRow={prepareRow}
                 rows={rows}
-                scrollToRef={scrollToRef}
                 isTreeTable={isTreeTable}
                 internalRowHeight={internalRowHeight}
                 popInRowHeight={popInRowHeight}