From 15c27c164f18c0153c0314948303284bb3ee06ce Mon Sep 17 00:00:00 2001
From: jeffvli <jeffvictorli@gmail.com>
Date: Fri, 3 Oct 2025 23:10:00 -0700
Subject: [PATCH] handle table column order based on pinned column config

---
 .../item-list/helpers/sort-table-columns.ts   | 34 +++++++++++++++++++
 .../item-table-list/item-table-list.tsx       | 13 ++++---
 2 files changed, 42 insertions(+), 5 deletions(-)
 create mode 100644 src/renderer/components/item-list/helpers/sort-table-columns.ts

diff --git a/src/renderer/components/item-list/helpers/sort-table-columns.ts b/src/renderer/components/item-list/helpers/sort-table-columns.ts
new file mode 100644
index 000000000..e56990863
--- /dev/null
+++ b/src/renderer/components/item-list/helpers/sort-table-columns.ts
@@ -0,0 +1,34 @@
+import { ItemTableListColumnConfig } from '/@/renderer/components/item-list/item-table-list/item-table-list';
+
+/**
+ * Sorts table columns by their pinned position:
+ * - Left pinned columns come first (maintaining their original order)
+ * - Unpinned columns come next (maintaining their original order)
+ * - Right pinned columns come last (maintaining their original order)
+ */
+export const sortTableColumns = (
+    columns: ItemTableListColumnConfig[],
+): ItemTableListColumnConfig[] => {
+    const leftPinned: ItemTableListColumnConfig[] = [];
+    const unpinned: ItemTableListColumnConfig[] = [];
+    const rightPinned: ItemTableListColumnConfig[] = [];
+
+    // Separate columns by pinned position while maintaining original order
+    columns.forEach((column) => {
+        switch (column.pinned) {
+            case 'left':
+                leftPinned.push(column);
+                break;
+            case 'right':
+                rightPinned.push(column);
+                break;
+            case null:
+            default:
+                unpinned.push(column);
+                break;
+        }
+    });
+
+    // Combine in the desired order: left pinned, unpinned, right pinned
+    return [...leftPinned, ...unpinned, ...rightPinned];
+};
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 971371867..0d1afda7a 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
@@ -11,6 +11,7 @@ import {
     UIEvent,
     useCallback,
     useEffect,
+    useMemo,
     useRef,
     useState,
 } from 'react';
@@ -20,6 +21,7 @@ import styles from './item-table-list.module.css';
 
 import { ExpandedListItem } from '/@/renderer/components/item-list/expanded-list-item';
 import { useItemListState } from '/@/renderer/components/item-list/helpers/item-list-state';
+import { sortTableColumns } from '/@/renderer/components/item-list/helpers/sort-table-columns';
 import { LibraryItem } from '/@/shared/types/domain-types';
 import { TableColumn } from '/@/shared/types/types';
 
@@ -107,11 +109,12 @@ export const ItemTableList = ({
     size = 'default',
     totalItemCount,
 }: ItemTableListProps) => {
-    const columnCount = columns.length;
+    const sortedColumns = useMemo(() => sortTableColumns(columns), [columns]);
+    const columnCount = sortedColumns.length;
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const columnWidth = (index: number, _cellProps: CellProps) => columns[index].width;
-    const pinnedLeftColumnCount = columns.filter((col) => col.pinned === 'left').length;
-    const pinnedRightColumnCount = columns.filter((col) => col.pinned === 'right').length;
+    const columnWidth = (index: number, _cellProps: CellProps) => sortedColumns[index].width;
+    const pinnedLeftColumnCount = sortedColumns.filter((col) => col.pinned === 'left').length;
+    const pinnedRightColumnCount = sortedColumns.filter((col) => col.pinned === 'right').length;
 
     const pinnedRowCount = enableHeader ? 1 : 0;
     const totalRowCount = totalItemCount - pinnedRowCount;
@@ -538,7 +541,7 @@ export const ItemTableList = ({
     );
 
     const cellProps = {
-        columns,
+        columns: sortedColumns,
         data,
         enableHeader,
         handleExpand,