From 6288f51920318fe8e79f4680e2f3c3e72b923d4c Mon Sep 17 00:00:00 2001
From: tugcekucukoglu <tugcekucukoglu.860@gmail.com>
Date: Thu, 10 Oct 2024 18:26:24 +0300
Subject: [PATCH] Refactor #6538

---
 packages/primevue/src/cascadeselect/CascadeSelect.vue       | 4 +++-
 .../primevue/src/cascadeselect/style/CascadeSelectStyle.js  | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/primevue/src/cascadeselect/CascadeSelect.vue b/packages/primevue/src/cascadeselect/CascadeSelect.vue
index 2a4b28c91..412f30c40 100644
--- a/packages/primevue/src/cascadeselect/CascadeSelect.vue
+++ b/packages/primevue/src/cascadeselect/CascadeSelect.vue
@@ -346,8 +346,10 @@ export default {
             isFocus && focus(this.$refs.focusInput);
         },
         onOptionMouseEnter(event) {
-            if (this.dirty) {
+            if (this.dirty || (!this.dirty && isNotEmpty(this.modelValue))) {
                 this.onOptionChange(event);
+            } else if (!this.dirty && event.processedOption.level === 0) {
+                this.onOptionClick(event);
             }
         },
         onOptionMouseMove(event) {
diff --git a/packages/primevue/src/cascadeselect/style/CascadeSelectStyle.js b/packages/primevue/src/cascadeselect/style/CascadeSelectStyle.js
index d734c42e5..55c25cb7a 100644
--- a/packages/primevue/src/cascadeselect/style/CascadeSelectStyle.js
+++ b/packages/primevue/src/cascadeselect/style/CascadeSelectStyle.js
@@ -149,7 +149,6 @@ const theme = ({ dt }) => `
 .p-cascadeselect-option-active > .p-cascadeselect-option-content {
     background: ${dt('cascadeselect.option.focus.background')};
     color: ${dt('cascadeselect.option.focus.color')};
-    border-radius: ${dt('cascadeselect.option.border.radius')};
 }
 
 .p-cascadeselect-option:not(.p-cascadeselect-option-selected):not(.p-disabled).p-focus > .p-cascadeselect-option-content {
@@ -161,7 +160,7 @@ const theme = ({ dt }) => `
     color: ${dt('cascadeselect.option.icon.focus.color')};
 }
 
-.p-cascadeselect-option-selected .p-cascadeselect-option-content {
+.p-cascadeselect-option-selected > .p-cascadeselect-option-content {
     background: ${dt('cascadeselect.option.selected.background')};
     color: ${dt('cascadeselect.option.selected.color')};
 }
@@ -184,6 +183,7 @@ const theme = ({ dt }) => `
     overflow: hidden;
     position: relative;
     padding: ${dt('cascadeselect.option.padding')};
+    border-radius: ${dt('cascadeselect.option.border.radius')};
 }
 
 .p-cascadeselect-group-icon {
@@ -262,7 +262,7 @@ const classes = {
             'p-cascadeselect-mobile-active': instance.queryMatches
         }
     ],
-    listContainer: 'p-cascadeselect-list',
+    listContainer: 'p-cascadeselect-list-container',
     list: 'p-cascadeselect-list',
     option: ({ instance, processedOption }) => [
         'p-cascadeselect-option',