From 5c0e0bf95df48c03c094400918b864aae795c6d3 Mon Sep 17 00:00:00 2001
From: Cagatay Civici <cagatay.civici@gmail.com>
Date: Thu, 4 Feb 2021 16:09:00 +0300
Subject: [PATCH] Fixed #939 - Optional chaining not working for TreeTable in
 version 3.2.1

---
 src/components/treetable/TreeTable.vue    | 10 +++++-----
 src/components/treetable/TreeTableRow.vue |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/treetable/TreeTable.vue b/src/components/treetable/TreeTable.vue
index 0b3ed2e5d..13a8d0843 100755
--- a/src/components/treetable/TreeTable.vue
+++ b/src/components/treetable/TreeTable.vue
@@ -24,7 +24,7 @@
                         <th v-for="(col,i) of columns" :key="columnProp(col, 'columnKey')||columnProp(col, 'field')||i" :style="columnProp(col, 'headerStyle')" :class="getColumnHeaderClass(col)" @click="onColumnHeaderClick($event, col)"
                             :tabindex="columnProp(col, 'sortable') ? '0' : null"  :aria-sort="getAriaSort(col)" @keydown="onColumnKeyDown($event, col)">
                             <span class="p-column-resizer" @mousedown="onColumnResizeStart" v-if="resizableColumns"></span>
-                            <component :is="col.children?.header" :column="col" />
+                            <component :is="col.children.header" :column="col" v-if="col.children && col.children.header" />
                             <span class="p-column-title" v-if="columnProp(col, 'header')">{{columnProp(col, 'header')}}</span>
                             <span v-if="columnProp(col, 'sortable')" :class="getSortableColumnIcon(col)"></span>
                             <span v-if="isMultiSorted(col)" class="p-sortable-column-badge">{{getMultiSortMetaIndex(col) + 1}}</span>
@@ -32,14 +32,14 @@
                     </tr>
                     <tr v-if="hasColumnFilter()">
                         <th  v-for="(col,i) of columns" :key="columnProp(col, 'columnKey')||columnProp(col, 'field')||i" :class="getFilterColumnHeaderClass(col)" :style="columnProp(col, 'filterHeaderStyle')">
-                            <component :is="col.children?.filter" :column="col" v-if="col.children?.filter"/>
+                            <component :is="col.children.filter" :column="col" v-if="col.children && col.children.filter"/>
                         </th>
                     </tr>
                 </thead>
                 <tfoot class="p-treetable-tfoot" v-if="hasFooter">
                     <tr>
                         <td v-for="(col,i) of columns" :key="columnProp(col, 'columnKey')||columnProp(col, 'field')||i" :style="columnProp(col, 'footerStyle')" :class="columnProp(col, 'footerClass')">
-                            <component :is="col.children?.footer" :column="col" />
+                            <component :is="col.children.footer" :column="col" v-if="col.children && col.children.footer" />
                             {{columnProp(col, 'footer')}}
                         </td>
                     </tr>
@@ -773,7 +773,7 @@ export default {
         hasColumnFilter() {
             if (this.columns) {
                 for (let col of this.columns) {
-                    if (col.children?.filter) {
+                    if (col.children && col.children.filter) {
                         return true;
                     }
                 }
@@ -858,7 +858,7 @@ export default {
             let hasFooter = false;
 
             for (let col of this.columns) {
-                if (this.columnProp(col, 'footer')|| col.children?.footer) {
+                if (this.columnProp(col, 'footer')|| (col.children && col.children.footer)) {
                     hasFooter = true;
                     break;
                 }
diff --git a/src/components/treetable/TreeTableRow.vue b/src/components/treetable/TreeTableRow.vue
index 896f78bef..a04bbd464 100755
--- a/src/components/treetable/TreeTableRow.vue
+++ b/src/components/treetable/TreeTableRow.vue
@@ -12,7 +12,7 @@
                     <span :class="checkboxIcon"></span>
                 </div>
             </div>
-            <component :is="col.children?.body" :node="node" :column="col" v-if="col.children?.body" />
+            <component :is="col.children.body" :node="node" :column="col" v-if="col.children && col.children.body" />
             <template v-else><span>{{resolveFieldData(node.data, columnProp(col, 'field'))}}</span></template>
         </td>
     </tr>