From 57dcf2c4661ac9d8349ab8eac6decdeefa9f2154 Mon Sep 17 00:00:00 2001
From: Cagatay Civici <cagatay.civici@gmail.com>
Date: Sun, 29 Sep 2024 01:47:57 +0300
Subject: [PATCH] Material TreeSelect

---
 .../showcase/doc/treeselect/FloatLabelDoc.vue | 10 ++--
 apps/showcase/doc/treeselect/IftaLabelDoc.vue | 10 ++--
 apps/showcase/doc/treeselect/InvalidDoc.vue   | 27 +++++++----
 apps/showcase/pages/treeselect/index.vue      | 10 ++--
 .../src/treeselect/style/TreeSelectStyle.js   |  4 ++
 .../src/presets/material/treeselect/index.js  | 47 ++++++++++++++++++-
 6 files changed, 82 insertions(+), 26 deletions(-)

diff --git a/apps/showcase/doc/treeselect/FloatLabelDoc.vue b/apps/showcase/doc/treeselect/FloatLabelDoc.vue
index 871026e4a..a9b6d660a 100644
--- a/apps/showcase/doc/treeselect/FloatLabelDoc.vue
+++ b/apps/showcase/doc/treeselect/FloatLabelDoc.vue
@@ -9,7 +9,7 @@
         </FloatLabel>
 
         <FloatLabel class="w-full md:w-80" variant="in">
-            <TreeSelect v-model="value2" inputId="in_label" :options="nodes" class="w-full" />
+            <TreeSelect v-model="value2" inputId="in_label" :options="nodes" class="w-full" variant="filled" />
             <label for="in_label">In Label</label>
         </FloatLabel>
 
@@ -39,7 +39,7 @@ export default {
 </FloatLabel>
 
 <FloatLabel class="w-full md:w-80" variant="in">
-    <TreeSelect v-model="value2" inputId="in_label" :options="nodes" class="w-full" />
+    <TreeSelect v-model="value2" inputId="in_label" :options="nodes" class="w-full" variant="filled" />
     <label for="in_label">In Label</label>
 </FloatLabel>
 
@@ -57,7 +57,7 @@ export default {
         </FloatLabel>
 
         <FloatLabel class="w-full md:w-80" variant="in">
-            <TreeSelect v-model="value2" inputId="in_label" :options="nodes" class="w-full" />
+            <TreeSelect v-model="value2" inputId="in_label" :options="nodes" class="w-full" variant="filled" />
             <label for="in_label">In Label</label>
         </FloatLabel>
 
@@ -81,7 +81,7 @@ export default {
         }
     },
     mounted() {
-        NodeService.getTreeNodes().then((data) => (this.nodes     = data));
+        NodeService.getTreeNodes().then((data) => (this.nodes = data));
     }
 }
 <\/script>
@@ -95,7 +95,7 @@ export default {
         </FloatLabel>
 
         <FloatLabel class="w-full md:w-80" variant="in">
-            <TreeSelect v-model="value2" inputId="in_label" :options="nodes" class="w-full" />
+            <TreeSelect v-model="value2" inputId="in_label" :options="nodes" class="w-full" variant="filled" />
             <label for="in_label">In Label</label>
         </FloatLabel>
 
diff --git a/apps/showcase/doc/treeselect/IftaLabelDoc.vue b/apps/showcase/doc/treeselect/IftaLabelDoc.vue
index 2a15c5ba0..065be229c 100644
--- a/apps/showcase/doc/treeselect/IftaLabelDoc.vue
+++ b/apps/showcase/doc/treeselect/IftaLabelDoc.vue
@@ -4,7 +4,7 @@
     </DocSectionText>
     <div class="card flex justify-center">
         <IftaLabel class="w-full md:w-80">
-            <TreeSelect v-model="selectedValue" inputId="t_file" :options="nodes" class="w-full" />
+            <TreeSelect v-model="selectedValue" inputId="t_file" :options="nodes" class="w-full" variant="filled" />
             <label for="t_file">File</label>
         </IftaLabel>
     </div>
@@ -22,7 +22,7 @@ export default {
             code: {
                 basic: `
 <IftaLabel class="w-full md:w-80">
-    <TreeSelect v-model="selectedValue" inputId="t_file" :options="nodes" class="w-full" />
+    <TreeSelect v-model="selectedValue" inputId="t_file" :options="nodes" class="w-full" variant="filled" />
     <label for="t_file">File</label>
 </IftaLabel>
 `,
@@ -30,7 +30,7 @@ export default {
 <template>
     <div class="card flex justify-center">
         <IftaLabel class="w-full md:w-80">
-            <TreeSelect v-model="selectedValue" inputId="t_file" :options="nodes" class="w-full" />
+            <TreeSelect v-model="selectedValue" inputId="t_file" :options="nodes" class="w-full" variant="filled" />
             <label for="t_file">File</label>
         </IftaLabel>
     </div>
@@ -47,7 +47,7 @@ export default {
         }
     },
     mounted() {
-        NodeService.getTreeNodes().then((data) => (this.nodes     = data));
+        NodeService.getTreeNodes().then((data) => (this.nodes = data));
     }
 }
 <\/script>
@@ -56,7 +56,7 @@ export default {
 <template>
     <div class="card flex justify-center">
         <IftaLabel class="w-full md:w-80">
-            <TreeSelect v-model="selectedValue" inputId="t_file" :options="nodes" class="w-full" />
+            <TreeSelect v-model="selectedValue" inputId="t_file" :options="nodes" class="w-full" variant="filled" />
             <label for="t_file">File</label>
         </IftaLabel>
     </div>
diff --git a/apps/showcase/doc/treeselect/InvalidDoc.vue b/apps/showcase/doc/treeselect/InvalidDoc.vue
index 8dba8de91..e90eec608 100644
--- a/apps/showcase/doc/treeselect/InvalidDoc.vue
+++ b/apps/showcase/doc/treeselect/InvalidDoc.vue
@@ -2,8 +2,9 @@
     <DocSectionText v-bind="$attrs">
         <p>Invalid state is displayed using the <i>invalid</i> prop to indicate a failed validation. You can use this style when integrating with form validation libraries.</p>
     </DocSectionText>
-    <div class="card flex justify-center">
-        <TreeSelect v-model="selectedValue" :invalid="Object.keys(selectedValue).length === 0" class="md:w-80 w-full" :options="nodes" placeholder="TreeSelect" />
+    <div class="card flex flex-wrap justify-center gap-4">
+        <TreeSelect v-model="selectedValue1" :invalid="Object.keys(selectedValue1).length === 0" class="md:w-80 w-full" :options="nodes" placeholder="TreeSelect" />
+        <TreeSelect v-model="selectedValue2" :invalid="Object.keys(selectedValue2).length === 0" class="md:w-80 w-full" :options="nodes" placeholder="TreeSelect" variant="filled" />
     </div>
     <DocSectionCode :code="code" :service="['NodeService']" v-bind="$attrs" />
 </template>
@@ -15,15 +16,18 @@ export default {
     data() {
         return {
             nodes: null,
-            selectedValue: {},
+            selectedValue1: {},
+            selectedValue2: {},
             code: {
                 basic: `
-<TreeSelect v-model="selectedValue" :invalid="Object.keys(selectedValue).length === 0" class="md:w-80 w-full" :options="nodes" placeholder="TreeSelect" />
+<TreeSelect v-model="selectedValue1" :invalid="Object.keys(selectedValue1).length === 0" class="md:w-80 w-full" :options="nodes" placeholder="TreeSelect" />
+<TreeSelect v-model="selectedValue2" :invalid="Object.keys(selectedValue2).length === 0" class="md:w-80 w-full" :options="nodes" placeholder="TreeSelect" variant="filled" />
 `,
                 options: `
 <template>
-    <div class="card flex justify-center">
-        <TreeSelect v-model="selectedValue" :invalid="Object.keys(selectedValue).length === 0" class="md:w-80 w-full" :options="nodes" placeholder="TreeSelect" />
+    <div class="card flex flex-wrap justify-center gap-4">
+        <TreeSelect v-model="selectedValue1" :invalid="Object.keys(selectedValue1).length === 0" class="md:w-80 w-full" :options="nodes" placeholder="TreeSelect" />
+        <TreeSelect v-model="selectedValue2" :invalid="Object.keys(selectedValue2).length === 0" class="md:w-80 w-full" :options="nodes" placeholder="TreeSelect" variant="filled" />
     </div>
 </template>
 
@@ -34,7 +38,8 @@ export default {
     data() {
         return {
             nodes: null,
-            selectedValue: {},
+            selectedValue1: {},
+            selectedValue2: {},
         }
     },
     mounted() {
@@ -45,8 +50,9 @@ export default {
 `,
                 composition: `
 <template>
-    <div class="card flex justify-center">
-        <TreeSelect v-model="selectedValue" :invalid="Object.keys(selectedValue).length === 0" class="md:w-80 w-full" :options="nodes" placeholder="TreeSelect" />
+    <div class="card flex flex-wrap justify-center gap-4">
+        <TreeSelect v-model="selectedValue1" :invalid="Object.keys(selectedValue1).length === 0" class="md:w-80 w-full" :options="nodes" placeholder="TreeSelect" />
+        <TreeSelect v-model="selectedValue2" :invalid="Object.keys(selectedValue2).length === 0" class="md:w-80 w-full" :options="nodes" placeholder="TreeSelect" variant="filled" />
     </div>
 </template>
 
@@ -55,7 +61,8 @@ import { ref, onMounted } from 'vue';
 import { NodeService } from './service/NodeService';
 
 const nodes = ref(null);
-const selectedValue = ref({});
+const selectedValue1 = ref({});
+const selectedValue2 = ref({});
 
 onMounted(() => {
     NodeService.getTreeNodes().then((data) => (nodes.value = data));
diff --git a/apps/showcase/pages/treeselect/index.vue b/apps/showcase/pages/treeselect/index.vue
index 3b40295cc..bde6487ab 100644
--- a/apps/showcase/pages/treeselect/index.vue
+++ b/apps/showcase/pages/treeselect/index.vue
@@ -60,6 +60,11 @@ export default {
                     label: 'Filter',
                     component: FilterDoc
                 },
+                {
+                    id: 'filled',
+                    label: 'Filled',
+                    component: FilledDoc
+                },
                 {
                     id: 'floatlabel',
                     label: 'Float Label',
@@ -70,11 +75,6 @@ export default {
                     label: 'Ifta Label',
                     component: IftaLabelDoc
                 },
-                {
-                    id: 'filled',
-                    label: 'Filled',
-                    component: FilledDoc
-                },
                 {
                     id: 'invalid',
                     label: 'Invalid',
diff --git a/packages/primevue/src/treeselect/style/TreeSelectStyle.js b/packages/primevue/src/treeselect/style/TreeSelectStyle.js
index f0671fd40..0ca19b801 100644
--- a/packages/primevue/src/treeselect/style/TreeSelectStyle.js
+++ b/packages/primevue/src/treeselect/style/TreeSelectStyle.js
@@ -31,6 +31,10 @@ const theme = ({ dt }) => `
     background: ${dt('treeselect.filled.background')};
 }
 
+.p-treeselect.p-variant-filled:not(.p-disabled):hover {
+    background: ${dt('treeselect.filled.hover.background')};
+}
+
 .p-treeselect.p-variant-filled.p-focus {
     background: ${dt('treeselect.filled.focus.background')};
 }
diff --git a/packages/themes/src/presets/material/treeselect/index.js b/packages/themes/src/presets/material/treeselect/index.js
index fb63191d2..817ef88d9 100644
--- a/packages/themes/src/presets/material/treeselect/index.js
+++ b/packages/themes/src/presets/material/treeselect/index.js
@@ -3,6 +3,7 @@ export default {
         background: '{form.field.background}',
         disabledBackground: '{form.field.disabled.background}',
         filledBackground: '{form.field.filled.background}',
+        filledHoverBackground: '{form.field.filled.hover.background}',
         filledFocusBackground: '{form.field.filled.focus.background}',
         borderColor: '{form.field.border.color}',
         hoverBorderColor: '{form.field.hover.border.color}',
@@ -43,5 +44,49 @@ export default {
     },
     chip: {
         borderRadius: '{border.radius.sm}'
-    }
+    },
+    style: ({ dt }) => `
+.p-treeselect.p-variant-filled {
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 0;
+    border: 1px solid transparent;
+    background: ${dt('treeselect.filled.background')} no-repeat;
+    background-image: linear-gradient(to bottom, ${dt('treeselect.focus.border.color')}, ${dt('treeselect.focus.border.color')}), linear-gradient(to bottom, ${dt('treeselect.border.color')}, ${dt('treeselect.border.color')});
+    background-size: 0 2px, 100% 1px;
+    background-position: 50% 100%, 50% 100%;
+    background-origin: border-box;
+    transition: background-size 0.3s cubic-bezier(0.64, 0.09, 0.08, 1);
+}
+
+.p-treeselect.p-variant-filled:not(.p-disabled):hover {
+    background: ${dt('treeselect.filled.hover.background')} no-repeat;
+    background-image: linear-gradient(to bottom, ${dt('treeselect.focus.border.color')}, ${dt('treeselect.focus.border.color')}), linear-gradient(to bottom, ${dt('treeselect.hover.border.color')}, ${dt('treeselect.hover.border.color')});
+    background-size: 0 2px, 100% 1px;
+    background-position: 50% 100%, 50% 100%;
+    background-origin: border-box;
+    border-color: transparent;
+}
+
+.p-treeselect.p-variant-filled:not(.p-disabled).p-focus {
+    outline: 0 none;
+    background: ${dt('treeselect.filled.focus.background')} no-repeat;
+    background-image: linear-gradient(to bottom, ${dt('treeselect.focus.border.color')}, ${dt('treeselect.focus.border.color')}), linear-gradient(to bottom, ${dt('treeselect.border.color')}, ${dt('treeselect.border.color')});
+    background-size: 100% 2px, 100% 1px;
+    background-position: 50% 100%, 50% 100%;
+    background-origin: border-box;
+    border-color: transparent;
+}
+
+.p-treeselect.p-variant-filled:not(.p-disabled).p-focus:hover {
+    background-image: linear-gradient(to bottom, ${dt('treeselect.focus.border.color')}, ${dt('treeselect.focus.border.color')}), linear-gradient(to bottom, ${dt('treeselect.hover.border.color')}, ${dt('treeselect.hover.border.color')});
+}
+
+.p-treeselect.p-variant-filled.p-invalid {
+    background-image: linear-gradient(to bottom, ${dt('treeselect.invalid.border.color')}, ${dt('treeselect.invalid.border.color')}), linear-gradient(to bottom, ${dt('treeselect.invalid.border.color')}, ${dt('treeselect.invalid.border.color')});
+}
+
+.p-treeselect.p-variant-filled.p-invalid:not(.p-disabled).p-focus  {
+    background-image: linear-gradient(to bottom, ${dt('treeselect.invalid.border.color')}, ${dt('treeselect.invalid.border.color')}), linear-gradient(to bottom, ${dt('treeselect.invalid.border.color')}, ${dt('treeselect.invalid.border.color')});
+}
+`
 };