#7593 fix drag'n drop columns for table with custom index column (#7596)

twosigma · Jun 28, 2018 · 470e1bd · 470e1bd
1 parent 534ea94
commit 470e1bd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/js/notebook/src/tableDisplay/dataGrid/column/reducer.ts b/js/notebook/src/tableDisplay/dataGrid/column/reducer.ts
@@ -157,7 +157,6 @@ function reduceColumnPositions(state: IColumnsState, action: DataGridColumnsActi
     columnState => columnsVisible[columnState.name] === false
   );
 
-
   // Remove frozen columns
   if (columnsFrozenCopy.length > 0) {
     columnsFrozenCopy.sort((name1, name2) => {

diff --git a/js/notebook/src/tableDisplay/dataGrid/model/reducer.ts b/js/notebook/src/tableDisplay/dataGrid/model/reducer.ts
@@ -19,8 +19,8 @@ import IDataModelState from "../interface/IDataGridModelState";
 import DataGridAction, {DataGridColumnAction} from "../store/DataGridAction";
 import { each } from "@phosphor/algorithm";
 import {
-  selectColumnNames, selectColumnOrder, selectColumnsFrozen, selectColumnsFrozenNames,
-  selectColumnsVisible
+  selectColumnNames, selectColumnOrder, selectColumnsFrozen,
+  selectColumnsVisible, selectHasIndex
 } from "./selectors";
 import {selectCellHighlighters} from "./selectors/model";
 import IHihglighterState from "../interface/IHighlighterState";
@@ -135,7 +135,8 @@ function reduceColumnOrder(state, action: DataGridColumnAction) {
   const columnOrder = getColumnOrderArray(state);
   const columnVisible = state.columnsVisible;
   const columnsFrozenen = selectColumnsFrozen({ model: state });
-  let destination = position.value;
+  const hasIndex = selectHasIndex({ model: state });
+  let destination = hasIndex ? position.value + 1 : position.value;
 
   Object.keys(columnVisible).forEach(name => {
     if (columnVisible[name] !== false) {