fix(Select): position issue for value missing in content (#1745)

zernonia · web-flow · commit 770c292a5bd1 · 2025-03-22T15:29:16.000+08:00
diff --git a/packages/core/src/Select/SelectContentImpl.vue b/packages/core/src/Select/SelectContentImpl.vue
@@ -118,6 +118,7 @@ const selectedItem = ref<HTMLElement>()
 const selectedItemText = ref<HTMLElement>()
 const isPositioned = ref(false)
 const firstValidItemFoundRef = ref(false)
+const firstSelectedItemInArrayFoundRef = ref(false)
 
 function focusSelectedItem() {
   if (selectedItem.value && content.value)
@@ -226,16 +227,28 @@ provideSelectContentContext({
     const isFirstValidItem = !firstValidItemFoundRef.value && !disabled
     const isSelectedItem = valueComparator(rootContext.modelValue.value, value, rootContext.by)
 
-    if (isFirstValidItem) {
-      if (rootContext.isEmptyModelValue.value) {
-        firstValidItemFoundRef.value = true
+    if (rootContext.multiple.value) {
+      if (firstSelectedItemInArrayFoundRef.value) {
+        return
+      }
+      if (isSelectedItem || isFirstValidItem) {
         selectedItem.value = node
+
+        // make sure to keep the first item highlighted when `multiple`
+        if (isSelectedItem) {
+          firstSelectedItemInArrayFoundRef.value = true
+        }
       }
-      else if (isSelectedItem) {
-        firstValidItemFoundRef.value = true
+    }
+    else {
+      if (isSelectedItem || isFirstValidItem) {
         selectedItem.value = node
       }
     }
+
+    if (isFirstValidItem) {
+      firstValidItemFoundRef.value = true
+    }
   },
   selectedItem,
   selectedItemText,
