From 4c9a2d56fbdc288e3f9b6a5f2394bd6c69ae4bce Mon Sep 17 00:00:00 2001
From: tugcekucukoglu <tugcekucukoglu.860@gmail.com>
Date: Mon, 28 Oct 2024 14:30:12 +0300
Subject: [PATCH] Fixed #6654 - For TreeSelect

---
 .../src/treeselect/BaseTreeSelect.vue         |  8 +++++++
 .../primevue/src/treeselect/TreeSelect.d.ts   | 24 +++++++++++++++++++
 .../primevue/src/treeselect/TreeSelect.vue    | 21 ++++++++++++----
 .../src/treeselect/style/TreeSelectStyle.d.ts |  4 ++++
 .../src/treeselect/style/TreeSelectStyle.js   |  9 +++++++
 5 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/packages/primevue/src/treeselect/BaseTreeSelect.vue b/packages/primevue/src/treeselect/BaseTreeSelect.vue
index f5ab6370a..b73cc1663 100644
--- a/packages/primevue/src/treeselect/BaseTreeSelect.vue
+++ b/packages/primevue/src/treeselect/BaseTreeSelect.vue
@@ -51,6 +51,14 @@ export default {
             type: String,
             default: 'mask'
         },
+        showClear: {
+            type: Boolean,
+            default: false
+        },
+        clearIcon: {
+            type: String,
+            default: undefined
+        },
         filter: {
             type: Boolean,
             default: false
diff --git a/packages/primevue/src/treeselect/TreeSelect.d.ts b/packages/primevue/src/treeselect/TreeSelect.d.ts
index 6c3d6154c..17a34865c 100644
--- a/packages/primevue/src/treeselect/TreeSelect.d.ts
+++ b/packages/primevue/src/treeselect/TreeSelect.d.ts
@@ -80,6 +80,10 @@ export interface TreeSelectPassThroughOptions {
      * Used to pass attributes to the label's DOM element.
      */
     label?: TreeSelectPassThroughOptionType;
+    /**
+     * Used to pass attributes to the clear icon's DOM element.
+     */
+    clearIcon?: TreeSelectPassThroughOptionType;
     /**
      * Used to pass attributes to the chip's DOM element.
      */
@@ -189,6 +193,15 @@ export interface TreeSelectProps {
      * A map of keys to represent the expansion state in controlled mode.
      */
     expandedKeys?: TreeExpandedKeys;
+    /**
+     * When enabled, a clear icon is displayed to clear the value.
+     * @defaultValue false
+     */
+    showClear?: boolean | undefined;
+    /**
+     * Icon to display in clear button.
+     */
+    clearIcon?: string | undefined;
     /**
      * Height of the viewport, a scrollbar is defined if height of list exceeds this value.
      * @defaultValue 20rem
@@ -473,6 +486,17 @@ export interface TreeSelectSlots {
          */
         partialChecked: boolean;
     }): VNode[];
+    /**
+     * Custom clear icon template.
+     * @param {Object} scope - clear icon slot's params.
+     */
+    clearicon(scope: {
+        /**
+         * Clear icon click function.
+         * @param {Event} event - Browser event
+         */
+        clearCallback: (event: Event) => void;
+    }): VNode[];
 }
 
 /**
diff --git a/packages/primevue/src/treeselect/TreeSelect.vue b/packages/primevue/src/treeselect/TreeSelect.vue
index ec7183fe4..8e1a3dcb9 100644
--- a/packages/primevue/src/treeselect/TreeSelect.vue
+++ b/packages/primevue/src/treeselect/TreeSelect.vue
@@ -37,6 +37,9 @@
                 </slot>
             </div>
         </div>
+        <slot v-if="isClearIconVisible" name="clearicon" :class="cx('clearIcon')" :clearCallback="onClearClick">
+            <component :is="clearIcon ? 'i' : 'TimesIcon'" ref="clearIcon" :class="[cx('clearIcon'), clearIcon]" @click="onClearClick" v-bind="ptm('clearIcon')" data-pc-section="clearicon" />
+        </slot>
         <div :class="cx('dropdown')" role="button" aria-haspopup="tree" :aria-expanded="overlayVisible" v-bind="ptm('dropdown')">
             <!-- TODO: triggericon is deprecated since v4.0 -->
             <slot :name="$slots.dropdownicon ? 'dropdownicon' : 'triggericon'" :class="cx('dropdownIcon')">
@@ -121,7 +124,7 @@
 
 <script>
 import { absolutePosition, addStyle, find, findSingle, focus, getFirstFocusableElement, getFocusableElements, getLastFocusableElement, getOuterWidth, isTouchDevice, relativePosition } from '@primeuix/utils/dom';
-import { isEmpty } from '@primeuix/utils/object';
+import { isEmpty, isNotEmpty } from '@primeuix/utils/object';
 import { ZIndex } from '@primeuix/utils/zindex';
 import { ConnectedOverlayScrollHandler, UniqueComponentId } from '@primevue/core/utils';
 import ChevronDownIcon from '@primevue/icons/chevrondown';
@@ -131,6 +134,7 @@ import Portal from 'primevue/portal';
 import Ripple from 'primevue/ripple';
 import Tree from 'primevue/tree';
 import BaseTreeSelect from './BaseTreeSelect.vue';
+import TimesIcon from '@primevue/icons/times';
 
 export default {
     name: 'TreeSelect',
@@ -217,13 +221,18 @@ export default {
                 return;
             }
 
-            if (!this.disabled && (!this.overlay || !this.overlay.contains(event.target))) {
+            if (event.target.tagName === 'INPUT' || event.target.getAttribute('data-pc-section') === 'clearicon' || event.target.closest('[data-pc-section="clearicon"]')) {
+                return;
+            } else if (!this.disabled && (!this.overlay || !this.overlay.contains(event.target))) {
                 if (this.overlayVisible) this.hide();
                 else this.show();
 
                 focus(this.$refs.focusInput);
             }
         },
+        onClearClick(event) {
+            this.onSelectionChange(null);
+        },
         onSelectionChange(keys) {
             this.selfChange = true;
             this.writeValue(keys);
@@ -525,13 +534,17 @@ export default {
         },
         hasFluid() {
             return isEmpty(this.fluid) ? !!this.$pcFluid : this.fluid;
+        },
+        isClearIconVisible() {
+            return this.showClear && this.d_value != null && isNotEmpty(this.options);
         }
     },
     components: {
         TSTree: Tree,
         Chip,
-        Portal: Portal,
-        ChevronDownIcon: ChevronDownIcon
+        Portal,
+        ChevronDownIcon,
+        TimesIcon
     },
     directives: {
         ripple: Ripple
diff --git a/packages/primevue/src/treeselect/style/TreeSelectStyle.d.ts b/packages/primevue/src/treeselect/style/TreeSelectStyle.d.ts
index 205ecef61..b58c4a9be 100644
--- a/packages/primevue/src/treeselect/style/TreeSelectStyle.d.ts
+++ b/packages/primevue/src/treeselect/style/TreeSelectStyle.d.ts
@@ -22,6 +22,10 @@ export enum TreeSelectClasses {
      * Class name of the label element
      */
     label = 'p-treeselect-label',
+    /**
+     * Class name of the clear icon element
+     */
+    clearIcon = 'p-select-clear-icon',
     /**
      * Class name of the chip item element
      */
diff --git a/packages/primevue/src/treeselect/style/TreeSelectStyle.js b/packages/primevue/src/treeselect/style/TreeSelectStyle.js
index db0dcaa85..ffc87add3 100644
--- a/packages/primevue/src/treeselect/style/TreeSelectStyle.js
+++ b/packages/primevue/src/treeselect/style/TreeSelectStyle.js
@@ -48,6 +48,14 @@ const theme = ({ dt }) => `
     background: ${dt('treeselect.disabled.background')};
 }
 
+.p-treeselect-clear-icon {
+    position: absolute;
+    top: 50%;
+    margin-top: -0.5rem;
+    color: ${dt('treeselect.clear.icon.color')};
+    inset-inline-end: ${dt('treeselect.dropdown.width')};
+}
+
 .p-treeselect-dropdown {
     display: flex;
     align-items: center;
@@ -192,6 +200,7 @@ const classes = {
             'p-treeselect-label-empty': !props.placeholder && instance.emptyValue
         }
     ],
+    clearIcon: 'p-treeselect-clear-icon',
     chip: 'p-treeselect-chip-item',
     pcChip: 'p-treeselect-chip',
     dropdown: 'p-treeselect-dropdown',