From dddc38af4c77c9d15d3daff3b46f5d16ec0daff1 Mon Sep 17 00:00:00 2001
From: jeffvli <jeffvictorli@gmail.com>
Date: Fri, 10 Oct 2025 11:31:36 -0700
Subject: [PATCH] fix table item count offset due to header

---
 .../item-list/item-table-list/item-table-list.tsx    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/renderer/components/item-list/item-table-list/item-table-list.tsx b/src/renderer/components/item-list/item-table-list/item-table-list.tsx
index 8d3919be1..434fc1c91 100644
--- a/src/renderer/components/item-list/item-table-list/item-table-list.tsx
+++ b/src/renderer/components/item-list/item-table-list/item-table-list.tsx
@@ -101,7 +101,7 @@ export const ItemTableList = ({
     rowHeight,
     size = 'default',
 }: ItemTableListProps) => {
-    const totalItemCount = data.length;
+    const totalItemCount = enableHeader ? data.length + 1 : data.length;
     const parsedColumns = useMemo(() => parseTableColumns(columns), [columns]);
     const columnCount = parsedColumns.length;
 
@@ -662,7 +662,7 @@ export const ItemTableList = ({
     const itemProps: TableItemProps = {
         cellPadding,
         columns: parsedColumns,
-        data,
+        data: enableHeader ? [null, ...data] : data,
         enableAlternateRowColors,
         enableExpansion,
         enableHeader,
@@ -697,18 +697,18 @@ export const ItemTableList = ({
             clearSelected: () => {
                 internalState.clearSelected();
             },
-            getItem: (index: number) => (enableHeader ? data[index + 1] : data[index]),
-            getItemCount: () => (enableHeader ? data.length - 1 : data.length),
+            getItem: (index: number) => (enableHeader ? data[index - 1] : data[index]),
+            getItemCount: () => (enableHeader ? data.length : data.length),
             getItems: () => data,
             internalState,
             scrollToIndex: (index: number) => {
                 scrollToTableIndex(enableHeader ? index + 1 : index);
             },
             scrollToOffset: (offset: number) => {
-                scrollToTableOffset(enableHeader ? offset + headerHeight : offset);
+                scrollToTableOffset(offset);
             },
         };
-    }, [data, enableHeader, headerHeight, internalState, scrollToTableIndex, scrollToTableOffset]);
+    }, [data, enableHeader, internalState, scrollToTableIndex, scrollToTableOffset]);
 
     useImperativeHandle(ref, () => imperativeHandle);