From cfc6841c3c968e818ad2433c99fb46323454170a Mon Sep 17 00:00:00 2001
From: Brian Hung <brianlhung@gmail.com>
Date: Tue, 11 Jun 2024 02:06:56 -0700
Subject: [PATCH] fix onColumnProposeMove rowMarkerOffset

---
 packages/core/src/data-editor/data-editor.tsx | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/core/src/data-editor/data-editor.tsx b/packages/core/src/data-editor/data-editor.tsx
index 4736b1099..1da206a0a 100644
--- a/packages/core/src/data-editor/data-editor.tsx
+++ b/packages/core/src/data-editor/data-editor.tsx
@@ -2528,6 +2528,17 @@ const DataEditorImpl: React.ForwardRefRenderFunction<DataEditorRef, DataEditorPr
         ]
     );
 
+    const onColumnProposeMoveImpl = whenDefined(
+        onColumnProposeMove,
+        React.useCallback(
+            (startIndex: number, endIndex: number) => {
+                return onColumnProposeMove?.(startIndex - rowMarkerOffset, endIndex - rowMarkerOffset);
+            },
+            [onColumnProposeMove, rowMarkerOffset]
+        )
+    )
+
+
     const onColumnMovedImpl = whenDefined(
         onColumnMoved,
         React.useCallback(
@@ -4052,7 +4063,7 @@ const DataEditorImpl: React.ForwardRefRenderFunction<DataEditorRef, DataEditorPr
                     columns={mangledCols}
                     nonGrowWidth={nonGrowWidth}
                     drawHeader={drawHeader}
-                    onColumnProposeMove={onColumnProposeMove}
+                    onColumnProposeMove={onColumnProposeMoveImpl}
                     drawCell={drawCell}
                     disabledRows={disabledRows}
                     freezeColumns={mangledFreezeColumns}