From 5e9fc25fd1eec769ab30b25bef69b4e0e5f7eb27 Mon Sep 17 00:00:00 2001
From: Vitalii Dudnik <dudnikvtl@gmail.com>
Date: Wed, 18 Mar 2026 13:53:34 +0200
Subject: [PATCH 1/2] feat: add autocomplete attribute to UInputSearch and
 enhance after-option slot in UListbox and USelect

---
 src/ui.form-input-search/UInputSearch.vue |  1 +
 src/ui.form-listbox/UListbox.vue          | 12 +++++++++---
 src/ui.form-select/USelect.vue            |  5 +++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/ui.form-input-search/UInputSearch.vue b/src/ui.form-input-search/UInputSearch.vue
index 7248d5707..f57fada64 100644
--- a/src/ui.form-input-search/UInputSearch.vue
+++ b/src/ui.form-input-search/UInputSearch.vue
@@ -138,6 +138,7 @@ const {
     :placeholder="placeholder"
     inputmode="search"
     :left-icon="leftIcon"
+    :autocomplete="false"
     v-bind="searchButtonLabel ? searchInputWithButtonAttrs : searchInputAttrs"
     :data-test="getDataTest()"
     @update:model-value="onUpdateValue"
diff --git a/src/ui.form-listbox/UListbox.vue b/src/ui.form-listbox/UListbox.vue
index dfd4e0931..8bd58d7dc 100644
--- a/src/ui.form-listbox/UListbox.vue
+++ b/src/ui.form-listbox/UListbox.vue
@@ -120,7 +120,7 @@ const getOptionAriaSelected = (option: Option) => {
   if (option && option.groupLabel) return undefined;
   if (option.divider) return undefined;
 
-  return !!isSelectedOption(option);
+  return isSelectedOption(option);
 };
 
 const filteredOptions = computed(() => {
@@ -285,7 +285,7 @@ function select(option: Option, keyCode?: string) {
 
 function isSelectedOption(option: Option) {
   if (props.multiple) {
-    return (selectedValue.value as SelectedValue[]).find((selected) =>
+    return !!(selectedValue.value as SelectedValue[]).find((selected) =>
       isEqual(selected, option[props.valueKey]),
     );
   }
@@ -515,9 +515,15 @@ const {
           <!--
             @slot Use it to add something after the option.
             @binding {object} option
+            @binding {boolean} selected
             @binding {number} index
           -->
-          <slot name="after-option" :option="option" :index="index">
+          <slot
+            name="after-option"
+            :option="option"
+            :selected="isSelectedOption(option)"
+            :index="index"
+          >
             <UIcon
               v-if="isSelectedOption(option)"
               color="inherit"
diff --git a/src/ui.form-select/USelect.vue b/src/ui.form-select/USelect.vue
index 549ccd464..dc88e6dcd 100644
--- a/src/ui.form-select/USelect.vue
+++ b/src/ui.form-select/USelect.vue
@@ -885,13 +885,14 @@ const {
           <slot name="option" :option="option" :index="index" />
         </template>
 
-        <template #after-option="{ option, index }">
+        <template #after-option="{ option, selected, index }">
           <!--
             @slot Use it to add something after option.
             @binding {object} option
+            @binding {boolean} selected
             @binding {number} index
           -->
-          <slot name="after-option" :option="option" :index="index" />
+          <slot name="after-option" :option="option" :selected="selected" :index="index" />
         </template>
 
         <template #empty>

From 2302475124f514a284ecfedee54c8043f7a2aeef Mon Sep 17 00:00:00 2001
From: Vitalii Dudnik <dudnikvtl@gmail.com>
Date: Wed, 18 Mar 2026 14:17:47 +0200
Subject: [PATCH 2/2] refactor: update badgeLabel structure in config and
 simplify UBadge usage in USelect

---
 src/ui.form-select/USelect.vue | 7 +------
 src/ui.form-select/config.ts   | 7 ++++++-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/ui.form-select/USelect.vue b/src/ui.form-select/USelect.vue
index dc88e6dcd..43920d1a7 100644
--- a/src/ui.form-select/USelect.vue
+++ b/src/ui.form-select/USelect.vue
@@ -718,12 +718,7 @@ const {
                   :key="index"
                   v-bind="selectedLabelAttrs"
                 >
-                  <UBadge
-                    :title="option[labelKey]"
-                    :size="size"
-                    variant="subtle"
-                    v-bind="badgeLabelAttrs"
-                  >
+                  <UBadge :title="option[labelKey]" :size="size" v-bind="badgeLabelAttrs">
                     <div v-bind="selectedLabelTextAttrs">
                       <!--
                         @slot Use it to customize selected option.
diff --git a/src/ui.form-select/config.ts b/src/ui.form-select/config.ts
index b67ac282e..70c7e428a 100644
--- a/src/ui.form-select/config.ts
+++ b/src/ui.form-select/config.ts
@@ -76,7 +76,12 @@ export default /*tw*/ {
     ],
   },
   counter: "",
-  badgeLabel: "{UBadge} py-0.5 px-1.5 gap-0.5 rounded-small max-w-full",
+  badgeLabel: {
+    base: "{UBadge} py-0.5 px-1.5 gap-0.5 rounded-small max-w-full",
+    defaults: {
+      variant: "subtle",
+    },
+  },
   badgeClearIcon: {
     base: "{>clearIcon} -mr-1",
     defaults: {