From effb19203aec2fa07e3acd1e485e5ad4e5e40921 Mon Sep 17 00:00:00 2001
From: Cagatay Civici <cagatay.civici@gmail.com>
Date: Thu, 24 Sep 2020 11:05:14 +0300
Subject: [PATCH] V3 migration for Table Reordering

---
 src/components/datatable/BodyCell.vue  |  2 +-
 src/components/datatable/DataTable.vue | 14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/components/datatable/BodyCell.vue b/src/components/datatable/BodyCell.vue
index 0e1f4697c..64eeb780a 100755
--- a/src/components/datatable/BodyCell.vue
+++ b/src/components/datatable/BodyCell.vue
@@ -7,7 +7,7 @@
             <DTCheckbox :value="rowData" :checked="selected" @change="toggleRowWithCheckbox" v-else-if="column.props.selectionMode ==='multiple'" />
         </template>
         <template v-else-if="column.props.rowReorder">
-            <i :class="['p-datatable-reorderablerow-handle', column.props.rowReorderIcon]"></i>
+            <i :class="['p-datatable-reorderablerow-handle', (column.props.rowReorderIcon || 'pi pi-bars')]"></i>
         </template>
         <template v-else-if="column.props.expander">
             <button class="p-row-toggler p-link" @click="toggleRow" type="button" v-ripple>
diff --git a/src/components/datatable/DataTable.vue b/src/components/datatable/DataTable.vue
index 2e46bf448..f9fb39520 100755
--- a/src/components/datatable/DataTable.vue
+++ b/src/components/datatable/DataTable.vue
@@ -433,13 +433,9 @@ export default {
     mounted() {
         if (this.reorderableColumns) {
             let columnOrder = [];
-            const children = this.$slots.default();
-            for (let child of children) {
-                if (child.type.name === 'column') {
-                    columnOrder.push(child.props.columnKey||child.props.field);
-                }
-            }
+            this.columns.forEach(col => columnOrder.push(col.props.columnKey||col.props.field));
             this.d_columnOrder = columnOrder;
+            console.log()
         }
     },
     beforeUnmount() {
@@ -1136,7 +1132,7 @@ export default {
             const event = e.originalEvent;
             const column = e.column;
 
-            if (this.reorderableColumns && column.reorderableColumn) {
+            if (this.reorderableColumns && column.props.reorderableColumn !== false) {
                 if (event.target.nodeName === 'INPUT' || event.target.nodeName === 'TEXTAREA' || DomHandler.hasClass(event.target, 'p-column-resizer'))
                     event.currentTarget.draggable = false;
                 else
@@ -1670,9 +1666,7 @@ export default {
                     }
                 }
 
-                return [...orderedColumns, ...cols.filter((item) => {
-                    return orderedColumns.indexOf(item) < 0;
-                })];
+                return [...orderedColumns, ...cols.filter((item) => orderedColumns.indexOf(item) < 0)];
             }
             
             return cols;