From 063e80a659eb632cd6c9a60b1e4887ba8250fd4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl-Gerhard=20Lindesva=CC=88rd?= <lindesvard@gmail.com>
Date: Thu, 5 Feb 2026 21:57:58 +0000
Subject: [PATCH] fix: memo issue on tables

---
 apps/start/src/components/events/table/index.tsx   | 4 ++--
 apps/start/src/components/profiles/table/index.tsx | 1 +
 apps/start/src/components/sessions/table/index.tsx | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/start/src/components/events/table/index.tsx b/apps/start/src/components/events/table/index.tsx
index af06e9f7..30071399 100644
--- a/apps/start/src/components/events/table/index.tsx
+++ b/apps/start/src/components/events/table/index.tsx
@@ -65,7 +65,6 @@ const VirtualRow = memo(
   }: VirtualRowProps) {
     return (
       <div
-        key={virtualRow.key}
         data-index={virtualRow.index}
         ref={virtualRow.measureElement}
         className="absolute top-0 left-0 w-full border-b hover:bg-muted/50 transition-colors group/row"
@@ -198,7 +197,7 @@ const VirtualizedEventsTable = ({
 
           return (
             <VirtualRow
-              key={virtualRow.key}
+              key={row.id}
               row={row}
               virtualRow={{
                 ...virtualRow,
@@ -249,6 +248,7 @@ export const EventsTable = ({ query }: Props) => {
     },
     onColumnVisibilityChange: setColumnVisibility,
     onColumnOrderChange: setColumnOrder,
+    getRowId: (row, index) => row.id ?? `loading-${index}`,
   });
 
   const inViewportRef = useRef<HTMLDivElement>(null);
diff --git a/apps/start/src/components/profiles/table/index.tsx b/apps/start/src/components/profiles/table/index.tsx
index df46040e..8617a0d2 100644
--- a/apps/start/src/components/profiles/table/index.tsx
+++ b/apps/start/src/components/profiles/table/index.tsx
@@ -66,6 +66,7 @@ export const ProfilesTable = memo(
             : updaterOrValue;
         setPage(nextPagination.pageIndex + 1);
       },
+      getRowId: (row, index) => row.id ?? `loading-${index}`,
     });
 
     return (
diff --git a/apps/start/src/components/sessions/table/index.tsx b/apps/start/src/components/sessions/table/index.tsx
index fbf1920a..40c5db68 100644
--- a/apps/start/src/components/sessions/table/index.tsx
+++ b/apps/start/src/components/sessions/table/index.tsx
@@ -95,7 +95,6 @@ const VirtualRow = memo(
   }: VirtualRowProps) {
     return (
       <div
-        key={virtualRow.key}
         data-index={virtualRow.index}
         ref={virtualRow.measureElement}
         className="absolute top-0 left-0 w-full border-b hover:bg-muted/50 transition-colors group/row"
@@ -225,7 +224,7 @@ const VirtualizedSessionsTable = ({
 
           return (
             <VirtualRow
-              key={virtualRow.key}
+              key={row.id}
               row={row}
               virtualRow={{
                 ...virtualRow,
@@ -275,6 +274,7 @@ export const SessionsTable = ({ query }: Props) => {
       columnVisibility,
     },
     onColumnVisibilityChange: setColumnVisibility,
+    getRowId: (row, index) => row.id ?? `loading-${index}`,
   });
 
   const inViewportRef = useRef<HTMLDivElement>(null);