fix drag and drop

Author: Lukas742

packages/main/src/components/AnalyticalTable/ColumnHeader/ColumnHeaderContainer.tsx

@@ -30,16 +30,17 @@ export const ColumnHeaderContainer = (props) => {
     headerGroup,
     onSort,
     onGroupByChanged,
-    handleDragStart,
-    handleDragOver,
-    handleOnDrop,
-    handleDragEnter,
-    handleOnDragEnd,
+    onDragStart,
+    onDragOver,
+    onDrop,
+    onDragEnter,
+    onDragEnd,
     dragOver,
 
     tableRef,
     visibleColumnsWidth,
-    overscanCountHorizontal
+    overscanCountHorizontal,
+    resizeInfo
   } = props;
   const columnVirtualizer = useVirtual({
     size: visibleColumnsWidth.length,
@@ -63,22 +64,6 @@ export const ColumnHeaderContainer = (props) => {
         const isLastColumn = !column.disableResizing && virtualColumn.index + 1 === headerGroup.headers.length;
         return (
           <>
-            <ColumnHeader
-              {...column.getHeaderProps()}
-              onSort={onSort}
-              onGroupBy={onGroupByChanged}
-              //todo
-              // onDragStart={handleDragStart}
-              // onDragOver={handleDragOver}
-              // onDrop={handleOnDrop}
-              // onDragEnter={handleDragEnter}
-              // onDragEnd={handleOnDragEnd}
-              // dragOver={column.id === dragOver}
-              // isDraggable={column.canReorder}
-              virtualColumn={virtualColumn}
-            >
-              {column.render('Header')}
-            </ColumnHeader>
             {column.canResize && column.getResizerProps && (
               <div
                 {...column.getResizerProps()}
@@ -87,6 +72,21 @@ export const ColumnHeaderContainer = (props) => {
                 style={{ left: `${column.totalFlexWidth + column.totalLeft - (isLastColumn ? 3 : 0)}px` }}
               />
             )}
+            <ColumnHeader
+              {...column.getHeaderProps()}
+              onSort={onSort}
+              onGroupBy={onGroupByChanged}
+              onDragStart={onDragStart}
+              onDragOver={onDragOver}
+              onDrop={onDrop}
+              onDragEnter={onDragEnter}
+              onDragEnd={onDragEnd}
+              dragOver={column.id === dragOver}
+              isDraggable={column.canReorder && !resizeInfo.isResizingColumn}
+              virtualColumn={virtualColumn}
+            >
+              {column.render('Header')}
+            </ColumnHeader>
           </>
         );
       })}

packages/main/src/components/AnalyticalTable/index.tsx

@@ -417,6 +417,7 @@ const AnalyticalTable: FC<TableProps> = forwardRef((props: TableProps, ref: Ref<
             tableRef.current && (
               <ColumnHeaderContainer
                 tableRef={tableRef}
+                resizeInfo={tableState.columnResizing}
                 visibleColumnsWidth={visibleColumnsWidth}
                 headerProps={headerProps}
                 headerGroup={headerGroup}