fix(BaseTable): fix virtual rows positioning when reordering or sorti…

…ng rows (#71)
gravity-ui · Oct 9, 2024 · ab0f936 · ab0f936
1 parent 7b95f62
commit ab0f936
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/components/BaseTable/BaseTable.tsx b/src/components/BaseTable/BaseTable.tsx
@@ -196,6 +196,9 @@ export const BaseTable = React.forwardRef(
                     ? rows[virtualItemOrRow.index]
                     : (virtualItemOrRow as Row<TData>);
 
+                const virtualItem = rowVirtualizer ? (virtualItemOrRow as VirtualItem) : undefined;
+                const key = virtualItem?.key ?? row.id;
+
                 const rowProps: BaseRowProps<TData, TScrollElement> = {
                     cellClassName,
                     className: rowClassName,
@@ -212,18 +215,18 @@ export const BaseTable = React.forwardRef(
                     row,
                     rowVirtualizer,
                     table,
-                    virtualItem: rowVirtualizer ? (virtualItemOrRow as VirtualItem) : undefined,
+                    virtualItem,
                     'aria-rowindex': headerRowCount + ariaRowIndexMap[row.id],
                     'aria-selected': table.options.enableRowSelection
                         ? row.getIsSelected()
                         : undefined,
                 };
 
                 if (draggableContext) {
-                    return <BaseDraggableRow key={row.id} {...rowProps} />;
+                    return <BaseDraggableRow key={key} {...rowProps} />;
                 }
 
-                return <BaseRow key={row.id} {...rowProps} />;
+                return <BaseRow key={key} {...rowProps} />;
             });
         };