Move full column order fetching back into onDragStart (#1280)

iterative · Feb 3, 2022 · 69a0c6b · 69a0c6b
1 parent 456bf99
commit 69a0c6b
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 31 deletions.
diff --git a/webview/src/experiments/components/Experiments/index.tsx b/webview/src/experiments/components/Experiments/index.tsx
@@ -166,13 +166,6 @@ export const ExperimentsTable: React.FC<{
           expandedRowCount
         })
       })
-      hooks.allColumns.push((allColumns, { instance: { state } }) => {
-        const { columnOrder } = state
-        if (!columnOrder || columnOrder.length === 0) {
-          state.columnOrder = allColumns.map(col => col.id)
-        }
-        return allColumns
-      })
     }
   )
 

diff --git a/webview/src/experiments/components/Table/MergeHeaderGroups.tsx b/webview/src/experiments/components/Table/MergeHeaderGroups.tsx
@@ -3,33 +3,32 @@ import cx from 'classnames'
 import { SortDefinition } from 'dvc/src/experiments/model/sortBy'
 import { Experiment, MetricOrParam } from 'dvc/src/experiments/webview/contract'
 import { HeaderGroup } from 'react-table'
-import {
-  DragDropContext,
-  DragUpdate,
-  Droppable,
-  DropResult,
-  ResponderProvided
-} from 'react-beautiful-dnd'
+import { DragDropContext, Droppable, Responders } from 'react-beautiful-dnd'
 import { TableHeader } from './TableHeader'
 import styles from './styles.module.scss'
 
-export const MergedHeaderGroup: React.FC<{
-  headerGroup: HeaderGroup<Experiment>
-  columns: HeaderGroup<Experiment>[]
-  sorts: SortDefinition[]
-  orderedColumns: MetricOrParam[]
-  onDragUpdate?: (initial: DragUpdate, provided: ResponderProvided) => void
-  onDragEnd: (initial: DropResult, provided: ResponderProvided) => void
-}> = ({
+export const MergedHeaderGroup: React.FC<
+  {
+    headerGroup: HeaderGroup<Experiment>
+    columns: HeaderGroup<Experiment>[]
+    sorts: SortDefinition[]
+    orderedColumns: MetricOrParam[]
+  } & Responders
+> = ({
   headerGroup,
   sorts,
   columns,
   orderedColumns,
+  onDragStart,
   onDragUpdate,
   onDragEnd
 }) => {
   return (
-    <DragDropContext onDragUpdate={onDragUpdate} onDragEnd={onDragEnd}>
+    <DragDropContext
+      onDragStart={onDragStart}
+      onDragUpdate={onDragUpdate}
+      onDragEnd={onDragEnd}
+    >
       <Droppable droppableId="droppable" direction="horizontal">
         {provided => (
           <div

diff --git a/webview/src/experiments/components/Table/TableHead.tsx b/webview/src/experiments/components/Table/TableHead.tsx
@@ -1,6 +1,6 @@
 import { SortDefinition } from 'dvc/src/experiments/model/sortBy'
 import { Experiment, MetricOrParam } from 'dvc/src/experiments/webview/contract'
-import React from 'react'
+import React, { useRef } from 'react'
 import { HeaderGroup, TableInstance } from 'react-table'
 import { DragUpdate } from 'react-beautiful-dnd'
 import { MessageFromWebviewType } from 'dvc/src/webview/contract'
@@ -19,7 +19,8 @@ export const TableHead: React.FC<TableHeadProps> = ({
   instance: {
     headerGroups,
     setColumnOrder,
-    state: { columnOrder }
+    state: { columnOrder },
+    allColumns
   },
   columns,
   sorts
@@ -28,18 +29,23 @@ export const TableHead: React.FC<TableHeadProps> = ({
   const allHeaders: HeaderGroup<Experiment>[] = []
   headerGroups.forEach(headerGroup => allHeaders.push(...headerGroup.headers))
 
+  const fullColumnOrder = useRef<string[]>()
+
+  const onDragStart = () => {
+    fullColumnOrder.current = allColumns.map(column => column.id)
+  }
+
   const onDragUpdate = (column: DragUpdate) => {
     if (!column.destination) {
       return
     }
     const { draggableId, destination } = column
     if (destination.index > 1) {
-      const colOrder = [...columnOrder]
-      const oldIndex = colOrder.indexOf(draggableId)
-
-      colOrder.splice(oldIndex, 1)
-      colOrder.splice(destination.index, 0, draggableId)
-      setColumnOrder(colOrder)
+      const newColumnOrder = [...(fullColumnOrder.current as string[])]
+      const oldIndex = newColumnOrder.indexOf(draggableId)
+      newColumnOrder.splice(oldIndex, 1)
+      newColumnOrder.splice(destination.index, 0, draggableId)
+      setColumnOrder(newColumnOrder)
     }
   }
 
@@ -60,6 +66,7 @@ export const TableHead: React.FC<TableHeadProps> = ({
           headerGroup={headerGroup}
           columns={allHeaders}
           sorts={sorts}
+          onDragStart={onDragStart}
           onDragUpdate={onDragUpdate}
           onDragEnd={onDragEnd}
         />