From 22d6f8a03724f30b6695a0800412f77a3a8ed738 Mon Sep 17 00:00:00 2001
From: tugcekucukoglu <tugcekucukoglu.860@gmail.com>
Date: Fri, 11 Oct 2024 20:22:09 +0300
Subject: [PATCH] Refactor #6538

---
 packages/primevue/src/cascadeselect/CascadeSelect.vue  |  1 +
 .../primevue/src/cascadeselect/CascadeSelectSub.vue    | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/primevue/src/cascadeselect/CascadeSelect.vue b/packages/primevue/src/cascadeselect/CascadeSelect.vue
index f81b3d07a..640d47009 100644
--- a/packages/primevue/src/cascadeselect/CascadeSelect.vue
+++ b/packages/primevue/src/cascadeselect/CascadeSelect.vue
@@ -71,6 +71,7 @@
                             :optionGroupIcon="optionGroupIcon"
                             :optionGroupLabel="optionGroupLabel"
                             :optionGroupChildren="optionGroupChildren"
+                            :value="modelValue"
                             @option-change="onOptionClick"
                             @option-focus-change="onOptionMouseMove"
                             @option-focus-enter-change="onOptionMouseEnter"
diff --git a/packages/primevue/src/cascadeselect/CascadeSelectSub.vue b/packages/primevue/src/cascadeselect/CascadeSelectSub.vue
index bcb29a34c..873f1c687 100644
--- a/packages/primevue/src/cascadeselect/CascadeSelectSub.vue
+++ b/packages/primevue/src/cascadeselect/CascadeSelectSub.vue
@@ -51,6 +51,7 @@
                     :optionGroupIcon="optionGroupIcon"
                     :optionGroupLabel="optionGroupLabel"
                     :optionGroupChildren="optionGroupChildren"
+                    :value="value"
                     @option-change="$emit('option-change', $event)"
                     @option-focus-change="$emit('option-focus-change', $event)"
                     @option-focus-enter-change="$emit('option-focus-enter-change', $event)"
@@ -63,11 +64,10 @@
 </template>
 
 <script>
-import { isNotEmpty, resolveFieldData } from '@primeuix/utils/object';
+import { equals, isNotEmpty, resolveFieldData } from '@primeuix/utils/object';
 import BaseComponent from '@primevue/core/basecomponent';
 import AngleRightIcon from '@primevue/icons/angleright';
 import Ripple from 'primevue/ripple';
-
 export default {
     name: 'CascadeSelectSub',
     hostName: 'CascadeSelect',
@@ -89,9 +89,9 @@ export default {
         },
         activeOptionPath: Array,
         level: Number,
-        templates: null
+        templates: null,
+        value: null
     },
-
     methods: {
         getOptionId(processedOption) {
             return `${this.selectId}_${processedOption.key}`;
@@ -128,7 +128,7 @@ export default {
             return isNotEmpty(processedOption.children);
         },
         isOptionSelected(processedOption) {
-            return !this.isOptionGroup(processedOption) && this.isOptionActive(processedOption);
+            return equals(this.value, processedOption?.option);
         },
         isOptionActive(processedOption) {
             return this.activeOptionPath.some((path) => path.key === processedOption.key);