fixed issue with position calculation in history module row move redoer

olifolkerd · Jul 23, 2023 · 387b6db · 387b6db
1 parent b042f21
commit 387b6db
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 17 deletions.
diff --git a/dist/js/tabulator_esm.js b/dist/js/tabulator_esm.js
@@ -12634,8 +12634,10 @@ var defaultUndoers = {
  },
 
  rowMove: function(action){
- this.table.rowManager.moveRowActual(action.component, this.table.rowManager.rows[action.data.posFrom-1], action.data.after);
-
+ var after = (action.data.posFrom - action.data.posTo) > 0;
+
+ this.table.rowManager.moveRowActual(action.component, this.table.rowManager.getRowFromPosition(action.data.posFrom), after);
+
  this.table.rowManager.regenerateRowPositions();
  this.table.rowManager.reRenderInPosition();
  },
@@ -12662,8 +12664,10 @@ var defaultRedoers = {
  },
 
  rowMove: function(action){
- this.table.rowManager.moveRowActual(action.component, this.table.rowManager.rows[action.data.posTo], action.data.after);
- this.table.rowManager.redraw();
+ this.table.rowManager.moveRowActual(action.component, this.table.rowManager.getRowFromPosition(action.data.posTo), action.data.after);
+
+ this.table.rowManager.regenerateRowPositions();
+ this.table.rowManager.reRenderInPosition();
  },
 };
 
@@ -12696,10 +12700,7 @@ class History extends Module{
  }
 
  rowMoved(from, to, after){
- var fromPos = from.getPosition(),
- toPos = to.getPosition();
-
- this.action("rowMove", from, {posFrom:fromPos, posTo:toPos, to:to, after:(fromPos - toPos) > 0});
+ this.action("rowMove", from, {posFrom:from.getPosition(), posTo:to.getPosition(), to:to, after:after});
  }
 
  rowAdded(row, data, pos, index){

diff --git a/dist/js/tabulator_esm.js.map b/dist/js/tabulator_esm.js.map
diff --git a/src/js/modules/History/History.js b/src/js/modules/History/History.js
@@ -34,10 +34,7 @@ class History extends Module{
  }
 
  rowMoved(from, to, after){
- var fromPos = from.getPosition(),
- toPos = to.getPosition();
-
- this.action("rowMove", from, {posFrom:fromPos, posTo:toPos, to:to, after:(fromPos - toPos) > 0});
+ this.action("rowMove", from, {posFrom:from.getPosition(), posTo:to.getPosition(), to:to, after:after});
  }
 
  rowAdded(row, data, pos, index){

diff --git a/src/js/modules/History/defaults/redoers.js b/src/js/modules/History/defaults/redoers.js
@@ -19,7 +19,9 @@ export default {
  },
 
  rowMove: function(action){
- this.table.rowManager.moveRowActual(action.component, this.table.rowManager.rows[action.data.posTo], action.data.after);
- this.table.rowManager.redraw();
+ this.table.rowManager.moveRowActual(action.component, this.table.rowManager.getRowFromPosition(action.data.posTo), action.data.after);
+
+ this.table.rowManager.regenerateRowPositions();
+ this.table.rowManager.reRenderInPosition();
  },
 };
diff --git a/src/js/modules/History/defaults/undoers.js b/src/js/modules/History/defaults/undoers.js
@@ -19,8 +19,10 @@ export default {
  },
 
  rowMove: function(action){
- this.table.rowManager.moveRowActual(action.component, this.table.rowManager.rows[action.data.posFrom-1], action.data.after);
-
+ var after = (action.data.posFrom - action.data.posTo) > 0;
+
+ this.table.rowManager.moveRowActual(action.component, this.table.rowManager.getRowFromPosition(action.data.posFrom), after);
+
  this.table.rowManager.regenerateRowPositions();
  this.table.rowManager.reRenderInPosition();
  },