From 20726d35e149faf3baac7880b6e66e30861a920d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tu=C4=9F=C3=A7e=20K=C3=BC=C3=A7=C3=BCko=C4=9Flu?=
 <tugcekucukoglu.860@gmail.com>
Date: Fri, 7 Apr 2023 09:49:49 +0300
Subject: [PATCH] Refactor #3832 Refactor #3833 - For Tree

---
 api-generator/components/tree.js | 22 +++++++++++++++++-
 components/lib/tree/Tree.d.ts    | 38 ++++++++++++++++++++++++++++----
 components/lib/tree/Tree.vue     | 19 ++++++++++------
 components/lib/tree/TreeNode.vue | 20 ++++++++++-------
 4 files changed, 79 insertions(+), 20 deletions(-)

diff --git a/api-generator/components/tree.js b/api-generator/components/tree.js
index 0f0e2b1a9..433d4f39b 100644
--- a/api-generator/components/tree.js
+++ b/api-generator/components/tree.js
@@ -127,11 +127,31 @@ const TreeEvents = [
     }
 ];
 
+const TreeSlots = [
+    {
+        name: 'loadingicon',
+        description: 'Custom loading icon template.'
+    },
+    {
+        name: 'searchicon',
+        description: 'Custom search icon template.'
+    },
+    {
+        name: 'togglericon',
+        description: 'Custom toggler icon template.'
+    },
+    {
+        name: 'checkboxicon',
+        description: 'Custom checkbox icon template.'
+    }
+];
+
 module.exports = {
     tree: {
         name: 'Tree',
         description: 'Tree is used to display hierarchical data.',
         props: TreeProps,
-        events: TreeEvents
+        events: TreeEvents,
+        slots: TreeSlots
     }
 };
diff --git a/components/lib/tree/Tree.d.ts b/components/lib/tree/Tree.d.ts
index ecbaefff8..5c0ae0f6b 100755
--- a/components/lib/tree/Tree.d.ts
+++ b/components/lib/tree/Tree.d.ts
@@ -168,15 +168,45 @@ export interface TreeProps {
  */
 export interface TreeSlots {
     /**
-     * Optional slots.
-     * @todo
+     * Custom loading icon template.
      */
-    [key: string]: (scope: {
+    loadingicon(): VNode[];
+    /**
+     * Custom search icon template.
+     */
+    searchicon(): VNode[];
+    /**
+     * Custom toggler icon template.
+     */
+    togglericon(scope: {
         /**
          * Tree node instance
          */
         node: TreeNode;
-    }) => VNode[];
+        /**
+         * Expanded state of the node
+         */
+        expanded: boolean;
+    }): VNode[];
+    /**
+     * Custom checkbox icon
+     */
+    checkboxicon(scope: {
+        /**
+         * Check state of the node
+         */
+        checked: boolean;
+        /**
+         * Partial check state of the node
+         */
+        partialChecked: boolean;
+    }): VNode[];
+    /**
+     * Optional slots.
+     * @todo
+     */
+
+    [key: string]: (node: any) => VNode[];
 }
 
 /**
diff --git a/components/lib/tree/Tree.vue b/components/lib/tree/Tree.vue
index a8d12d6c2..74b74823a 100755
--- a/components/lib/tree/Tree.vue
+++ b/components/lib/tree/Tree.vue
@@ -2,12 +2,16 @@
     <div :class="containerClass">
         <template v-if="loading">
             <div class="p-tree-loading-overlay p-component-overlay">
-                <i :class="loadingIconClass" />
+                <slot name="loadingicon">
+                    <component :is="loadingIcon ? 'i' : 'SpinnerIcon'" spin :class="['p-tree-loading-icon', loadingIcon]" />
+                </slot>
             </div>
         </template>
         <div v-if="filter" class="p-tree-filter-container">
             <input v-model="filterValue" type="text" autocomplete="off" class="p-tree-filter p-inputtext p-component" :placeholder="filterPlaceholder" @keydown="onFilterKeydown" />
-            <span class="p-tree-filter-icon pi pi-search"></span>
+            <slot name="searchicon">
+                <SearchIcon class="p-tree-filter-icon" />
+            </slot>
         </div>
         <div class="p-tree-wrapper" :style="{ maxHeight: scrollHeight }">
             <ul class="p-tree-container" role="tree" :aria-labelledby="ariaLabelledby" :aria-label="ariaLabel">
@@ -31,6 +35,8 @@
 </template>
 
 <script>
+import SearchIcon from 'primevue/icon/search';
+import SpinnerIcon from 'primevue/icon/spinner';
 import { ObjectUtils } from 'primevue/utils';
 import TreeNode from './TreeNode.vue';
 
@@ -64,7 +70,7 @@ export default {
         },
         loadingIcon: {
             type: String,
-            default: 'pi pi-spinner'
+            default: undefined
         },
         filter: {
             type: Boolean,
@@ -275,9 +281,6 @@ export default {
                 }
             ];
         },
-        loadingIconClass() {
-            return ['p-tree-loading-icon pi-spin', this.loadingIcon];
-        },
         filteredValue() {
             let filteredNodes = [];
             const searchFields = this.filterBy.split(',');
@@ -304,7 +307,9 @@ export default {
         }
     },
     components: {
-        TreeNode: TreeNode
+        TreeNode: TreeNode,
+        SearchIcon: SearchIcon,
+        SpinnerIcon: SpinnerIcon
     }
 };
 </script>
diff --git a/components/lib/tree/TreeNode.vue b/components/lib/tree/TreeNode.vue
index f97003db4..47ae64076 100755
--- a/components/lib/tree/TreeNode.vue
+++ b/components/lib/tree/TreeNode.vue
@@ -15,11 +15,11 @@
     >
         <div :class="contentClass" @click="onClick" @touchend="onTouchEnd" :style="node.style">
             <button v-ripple type="button" class="p-tree-toggler p-link" @click="toggle" tabindex="-1" aria-hidden="true">
-                <span :class="toggleIcon"></span>
+                <component :is="templates['togglericon'] ? templates['togglericon'] : expanded ? node.expandedIcon || 'ChevronDownIcon' : node.collapsedIcon || 'ChevronRightIcon'" :node="node" :expanded="expanded" class="p-tree-toggler-icon pi-fw" />
             </button>
             <div v-if="checkboxMode" class="p-checkbox p-component" aria-hidden="true">
                 <div :class="checkboxClass" role="checkbox">
-                    <span :class="checkboxIcon"></span>
+                    <component :is="templates['checkboxicon'] ? templates['checkboxicon'] : checked ? 'CheckIcon' : partialChecked ? 'MinusIcon' : null" :checked="checked" :partialChecked="partialChecked" class="p-checkbox-icon" />
                 </div>
             </div>
             <span :class="icon"></span>
@@ -47,6 +47,10 @@
 </template>
 
 <script>
+import CheckIcon from 'primevue/icon/check';
+import ChevronDownIcon from 'primevue/icon/chevrondown';
+import ChevronRightIcon from 'primevue/icon/chevronright';
+import MinusIcon from 'primevue/icon/minus';
 import Ripple from 'primevue/ripple';
 import { DomHandler } from 'primevue/utils';
 
@@ -408,15 +412,9 @@ export default {
         icon() {
             return ['p-treenode-icon', this.node.icon];
         },
-        toggleIcon() {
-            return ['p-tree-toggler-icon pi pi-fw', this.expanded ? this.node.expandedIcon || 'pi-chevron-down' : this.node.collapsedIcon || 'pi-chevron-right'];
-        },
         checkboxClass() {
             return ['p-checkbox-box', { 'p-highlight': this.checked, 'p-indeterminate': this.partialChecked }];
         },
-        checkboxIcon() {
-            return ['p-checkbox-icon', { 'pi pi-check': this.checked, 'pi pi-minus': this.partialChecked }];
-        },
         checkboxMode() {
             return this.selectionMode === 'checkbox' && this.node.selectable !== false;
         },
@@ -433,6 +431,12 @@ export default {
             return this.checkboxMode ? this.checked : undefined;
         }
     },
+    components: {
+        ChevronDownIcon: ChevronDownIcon,
+        ChevronRightIcon: ChevronRightIcon,
+        CheckIcon: CheckIcon,
+        MinusIcon: MinusIcon
+    },
     directives: {
         ripple: Ripple
     }