Fixed #6910, Fixed #7730

primefaces · Jun 3, 2019 · 023a2c5 · 023a2c5
1 parent 3043069
commit 023a2c5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/app/components/table/table.ts b/src/app/components/table/table.ts
@@ -1963,7 +1963,7 @@ export class Table implements OnInit, AfterViewInit, AfterContentInit, Blockable
 
             this.onRowReorder.emit({
                 dragIndex: this.draggedRowIndex,
-                dropIndex: this.droppedRowIndex
+                dropIndex: dropIndex
             });
         }
         //cleanup

diff --git a/src/app/components/utils/objectutils.ts b/src/app/components/utils/objectutils.ts
@@ -109,12 +109,10 @@ export class ObjectUtils {
 
     public static reorderArray(value: any[], from: number, to: number) {
         let target: number;
-        if(value && (from !== to)) {
-            if(to >= value.length) {
-                target = to - value.length;
-                while((target--) + 1) {
-                    value.push(undefined);
-                }
+        if (value && from !== to) {
+            if (to >= value.length) {
+                to %= value.length;
+                from %= value.length;
             }
             value.splice(to, 0, value.splice(from, 1)[0]);
         }