From 306b38ef5d5a00ca654a4179ac390f95cf8116d7 Mon Sep 17 00:00:00 2001
From: mertsincan <sincan.mert@gmail.com>
Date: Thu, 7 Oct 2021 09:26:26 +0300
Subject: [PATCH] Fixed #1646 - Kebab-case properties are not working on
 DataTable and TreeTable

---
 src/components/datatable/DataTable.vue    | 2 +-
 src/components/datatable/TableBody.vue    | 2 +-
 src/components/datatable/TableFooter.vue  | 3 ++-
 src/components/datatable/TableHeader.vue  | 3 ++-
 src/components/treetable/TreeTable.vue    | 4 ++--
 src/components/treetable/TreeTableRow.vue | 4 ++--
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/components/datatable/DataTable.vue b/src/components/datatable/DataTable.vue
index 44bf5927d..8414b3278 100755
--- a/src/components/datatable/DataTable.vue
+++ b/src/components/datatable/DataTable.vue
@@ -428,7 +428,7 @@ export default {
     },
     methods: {
         columnProp(col, prop) {
-            return col.props ? ((col.type.props[prop].type === Boolean && col.props[prop] === '') ? true : col.props[prop]) : null;
+            return ObjectUtils.getVNodeProp(col, prop);
         },
         onPage(event) {
             this.clearEditingMetaData();
diff --git a/src/components/datatable/TableBody.vue b/src/components/datatable/TableBody.vue
index 18be716a2..3ac61d2c1 100755
--- a/src/components/datatable/TableBody.vue
+++ b/src/components/datatable/TableBody.vue
@@ -193,7 +193,7 @@ export default {
     },
     methods: {
         columnProp(col, prop) {
-            return col.props ? ((col.type.props[prop].type === Boolean && col.props[prop] === '') ? true : col.props[prop]) : null;
+            return ObjectUtils.getVNodeProp(col, prop);
         },
         shouldRenderRowGroupHeader(value, rowData, i) {
             let currentRowFieldData = ObjectUtils.resolveFieldData(rowData, this.groupRowsBy);
diff --git a/src/components/datatable/TableFooter.vue b/src/components/datatable/TableFooter.vue
index 0e993c4ce..d3f92ba6f 100755
--- a/src/components/datatable/TableFooter.vue
+++ b/src/components/datatable/TableFooter.vue
@@ -17,6 +17,7 @@
 
 <script>
 import FooterCell from './FooterCell.vue';
+import {ObjectUtils} from 'primevue/utils';
 
 export default {
     name: 'TableFooter',
@@ -32,7 +33,7 @@ export default {
     },
     methods: {
         columnProp(col, prop) {
-            return col.props ? ((col.type.props[prop].type === Boolean && col.props[prop] === '') ? true : col.props[prop]) : null;
+            return ObjectUtils.getVNodeProp(col, prop);
         }
     },
     computed: {
diff --git a/src/components/datatable/TableHeader.vue b/src/components/datatable/TableHeader.vue
index 3ef5fb680..fd37590be 100755
--- a/src/components/datatable/TableHeader.vue
+++ b/src/components/datatable/TableHeader.vue
@@ -51,6 +51,7 @@
 import HeaderCell from './HeaderCell.vue';
 import HeaderCheckbox from './HeaderCheckbox.vue';
 import ColumnFilter from './ColumnFilter.vue';
+import {ObjectUtils} from 'primevue/utils';
 
 export default {
     name: 'TableHeader',
@@ -121,7 +122,7 @@ export default {
     },
     methods: {
         columnProp(col, prop) {
-            return col.props ? ((col.type.props[prop].type === Boolean && col.props[prop] === '') ? true : col.props[prop]) : null;
+            return ObjectUtils.getVNodeProp(col, prop);
         },
         getFilterColumnHeaderClass(column) {
             return ['p-filter-column', this.columnProp(column, 'filterHeaderClass'), this.columnProp(column, 'class'), {
diff --git a/src/components/treetable/TreeTable.vue b/src/components/treetable/TreeTable.vue
index 41c2509c3..1fa441349 100755
--- a/src/components/treetable/TreeTable.vue
+++ b/src/components/treetable/TreeTable.vue
@@ -280,7 +280,7 @@ export default {
     },
     methods: {
         columnProp(col, prop) {
-            return col.props ? ((col.type.props[prop].type === Boolean && col.props[prop] === '') ? true : col.props[prop]) : null;
+            return ObjectUtils.getVNodeProp(col, prop);
         },
         onNodeToggle(node) {
             const key = node.key;
@@ -693,7 +693,7 @@ export default {
                 else if (this.columnResizeMode === 'expand') {
                     this.$refs.table.style.width = this.$refs.table.offsetWidth + delta + 'px';
 
-                    if (!this.scrollable) 
+                    if (!this.scrollable)
                         this.resizeColumnElement.style.width = newColumnWidth + 'px';
                     else
                         this.resizeTableCells(newColumnWidth);
diff --git a/src/components/treetable/TreeTableRow.vue b/src/components/treetable/TreeTableRow.vue
index 6a5c93f07..206df28c2 100755
--- a/src/components/treetable/TreeTableRow.vue
+++ b/src/components/treetable/TreeTableRow.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import {DomHandler} from 'primevue/utils';
+import {DomHandler, ObjectUtils} from 'primevue/utils';
 import BodyCell from './BodyCell.vue';
 
 export default {
@@ -58,7 +58,7 @@ export default {
     nodeTouched: false,
     methods: {
         columnProp(col, prop) {
-            return col.props ? ((col.type.props[prop].type === Boolean && col.props[prop] === '') ? true : col.props[prop]) : null;
+            return ObjectUtils.getVNodeProp(col, prop);
         },
         toggle() {
             this.$emit('node-toggle', this.node);