@bitrix24/b24ui-nuxt 0.6.8 → 0.7.0

package/dist/runtime/components/Range.vue

@@ -26,7 +26,7 @@ const props = defineProps({
   minStepsBetweenThumbs: { type: Number, required: false }
 });
 const emits = defineEmits(["update:modelValue", "change"]);
-const modelValue = defineModel({ type: [Number, Array] });
+const modelValue = defineModel({ type: null });
 const appConfig = useAppConfig();
 const rootProps = useForwardPropsEmits(reactivePick(props, "as", "orientation", "min", "max", "step", "minStepsBetweenThumbs", "inverted"), emits);
 const { id, emitFormChange, emitFormInput, size, color, name, disabled, ariaAttrs } = useFormField(props);
@@ -68,7 +68,7 @@ function onChange(value) {
     v-model="rangeValue"
     :name="name"
     :disabled="disabled"
-    :class="b24ui.root({ class: [props.class, props.b24ui?.root] })"
+    :class="b24ui.root({ class: [props.b24ui?.root, props.class] })"
     :default-value="defaultRangeValue"
     @update:model-value="emitFormInput()"
     @value-commit="onChange"

package/dist/runtime/components/Range.vue.d.ts

@@ -29,26 +29,25 @@ export interface RangeProps extends Pick<SliderRootProps, 'name' | 'disabled' |
     class?: any;
     b24ui?: Range['slots'];
 }
-export interface RangeEmits {
-    (e: 'update:modelValue', payload: number | number[]): void;
+export interface RangeEmits<T extends number | number[] = number | number[]> {
+    (e: 'update:modelValue', payload: T): void;
     (e: 'change', payload: Event): void;
 }
-declare const _default: import("vue").DefineComponent<RangeProps & {
-    modelValue?: number | number[];
-}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-    "update:modelValue": (value: number | number[] | undefined) => any;
-} & {
-    change: (payload: Event) => any;
-    "update:modelValue": (payload: number | number[]) => any;
-}, string, import("vue").PublicProps, Readonly<RangeProps & {
-    modelValue?: number | number[];
-}> & Readonly<{
-    onChange?: ((payload: Event) => any) | undefined;
-    "onUpdate:modelValue"?: ((payload: number | number[]) => any) | undefined;
-}>, {
-    orientation: "horizontal" | "vertical";
-    step: number;
-    max: number;
-    min: number;
-}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+declare const _default: <T extends number | number[]>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
+    props: __VLS_PrettifyLocal<Pick<Partial<{}> & Omit<{
+        readonly onChange?: ((payload: Event) => any) | undefined;
+        readonly "onUpdate:modelValue"?: ((payload: T) => any) | undefined;
+    } & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, never>, "onChange" | "onUpdate:modelValue"> & (RangeProps & {
+        modelValue?: T;
+    }) & Partial<{}>> & import("vue").PublicProps;
+    expose(exposed: import("vue").ShallowUnwrapRef<{}>): void;
+    attrs: any;
+    slots: {};
+    emit: RangeEmits<T> & ((evt: "update:modelValue", value: T | undefined) => void);
+}>) => import("vue").VNode & {
+    __ctx?: Awaited<typeof __VLS_setup>;
+};
 export default _default;
+type __VLS_PrettifyLocal<T> = {
+    [K in keyof T]: T[K];
+} & {};

package/dist/runtime/components/Select.vue

@@ -3,8 +3,8 @@ import theme from "#build/b24ui/select";
 </script>
 
 <script setup>
-import { computed, toRef } from "vue";
-import { Primitive, SelectRoot, SelectArrow, SelectTrigger, SelectPortal, SelectContent, SelectViewport, SelectScrollUpButton, SelectScrollDownButton, SelectLabel, SelectGroup, SelectItem, SelectItemIndicator, SelectItemText, SelectSeparator, useForwardPropsEmits } from "reka-ui";
+import { ref, computed, onMounted, toRef } from "vue";
+import { Primitive, SelectRoot, SelectArrow, SelectTrigger, SelectPortal, SelectContent, SelectLabel, SelectGroup, SelectItem, SelectItemIndicator, SelectItemText, SelectSeparator, useForwardPropsEmits } from "reka-ui";
 import { defu } from "defu";
 import { reactivePick } from "@vueuse/core";
 import { useAppConfig } from "#imports";
@@ -41,6 +41,8 @@ const props = defineProps({
   modelValue: { type: null, required: false },
   multiple: { type: Boolean, required: false },
   highlight: { type: Boolean, required: false },
+  autofocus: { type: Boolean, required: false },
+  autofocusDelay: { type: Number, required: false, default: 0 },
   class: { type: null, required: false },
   b24ui: { type: null, required: false },
   open: { type: Boolean, required: false },
@@ -91,11 +93,25 @@ const groups = computed(
 const items = computed(() => groups.value.flatMap((group) => group));
 function displayValue(value) {
   if (props.multiple && Array.isArray(value)) {
-    return value.map((v) => displayValue(v)).filter(Boolean).join(", ");
+    const values = value.map((v) => displayValue(v)).filter(Boolean);
+    return values?.length ? values.join(", ") : void 0;
   }
   const item = items.value.find((item2) => compare(typeof item2 === "object" ? get(item2, props.valueKey) : item2, value));
   return item && (typeof item === "object" ? get(item, props.labelKey) : item);
 }
+const triggerRef = ref(null);
+function autoFocus() {
+  if (props.autofocus) {
+    triggerRef.value?.$el?.focus({
+      focusVisible: true
+    });
+  }
+}
+onMounted(() => {
+  setTimeout(() => {
+    autoFocus();
+  }, props.autofocusDelay);
+});
 function onUpdate(value) {
   const event = new Event("change", { target: { value } });
   emits("change", event);
@@ -116,6 +132,9 @@ function onUpdateOpen(value) {
 function isSelectItem(item) {
   return typeof item === "object" && item !== null;
 }
+defineExpose({
+  triggerRef
+});
 </script>
 
 <template>
@@ -131,7 +150,12 @@ function isSelectItem(item) {
       @update:model-value="onUpdate"
       @update:open="onUpdateOpen"
     >
-      <SelectTrigger :id="id" :class="b24ui.base({ class: [props.class, props.b24ui?.base] })" v-bind="{ ...$attrs, ...ariaAttrs }">
+      <SelectTrigger
+        :id="id"
+        ref="triggerRef"
+        :class="b24ui.base({ class: [props.b24ui?.base, props.class] })"
+        v-bind="{ ...$attrs, ...ariaAttrs }"
+      >
         <div v-if="isTag" :class="b24ui.tag({ class: props.b24ui?.tag })">
           {{ props.tag }}
         </div>
@@ -149,11 +173,17 @@ function isSelectItem(item) {
 
         <slot :model-value="modelValue" :open="open">
           <template v-for="displayedModelValue in [displayValue(modelValue)]" :key="displayedModelValue">
-            <span v-if="displayedModelValue" :class="b24ui.value({ class: props.b24ui?.value })">
+            <span
+              v-if="displayedModelValue !== void 0 && displayedModelValue !== null"
+              :class="b24ui.value({ class: props.b24ui?.value })"
+            >
               {{ displayedModelValue }}
             </span>
-            <span v-else :class="b24ui.placeholder({ class: props.b24ui?.placeholder })">
-              {{ placeholder ?? '\xA0' }}
+            <span
+              v-else
+              :class="b24ui.placeholder({ class: props.b24ui?.placeholder })"
+            >
+              {{ placeholder ?? "\xA0" }}
             </span>
           </template>
         </slot>
@@ -173,24 +203,21 @@ function isSelectItem(item) {
         <SelectContent :class="b24ui.content({ class: props.b24ui?.content })" v-bind="contentProps">
           <slot name="content-top" />
 
-          <SelectScrollUpButton :class="b24ui.scrollUpDownButton({ class: props.b24ui?.scrollUpDownButton })">
-            <Component
-              :is="icons.chevronUp"
-              :class="b24ui.scrollUpDownButtonIcon({ class: props.b24ui?.scrollUpDownButtonIcon })"
-            />
-          </SelectScrollUpButton>
-          <SelectViewport :class="b24ui.viewport({ class: props.b24ui?.viewport })">
+          <div
+            role="presentation"
+            :class="b24ui.viewport({ class: props.b24ui?.viewport })"
+          >
             <SelectGroup v-for="(group, groupIndex) in groups" :key="`group-${groupIndex}`" :class="b24ui.group({ class: props.b24ui?.group })">
               <template v-for="(item, index) in group" :key="`group-${groupIndex}-${index}`">
-                <SelectLabel v-if="isSelectItem(item) && item.type === 'label'" :class="b24ui.label({ class: props.b24ui?.label })">
+                <SelectLabel v-if="isSelectItem(item) && item.type === 'label'" :class="b24ui.label({ class: [props.b24ui?.label, item.b24ui?.label, item.class] })">
                   {{ get(item, props.labelKey) }}
                 </SelectLabel>
 
-                <SelectSeparator v-else-if="isSelectItem(item) && item.type === 'separator'" :class="b24ui.separator({ class: props.b24ui?.separator })" />
+                <SelectSeparator v-else-if="isSelectItem(item) && item.type === 'separator'" :class="b24ui.separator({ class: [props.b24ui?.separator, item.b24ui?.separator, item.class] })" />
 
                 <SelectItem
                   v-else
-                  :class="b24ui.item({ class: props.b24ui?.item, colorItem: isSelectItem(item) ? item?.color : void 0 })"
+                  :class="b24ui.item({ class: [props.b24ui?.item, isSelectItem(item) && item.b24ui?.item, isSelectItem(item) && item.class], colorItem: isSelectItem(item) && item?.color || void 0 })"
                   :disabled="isSelectItem(item) && item.disabled"
                   :value="isSelectItem(item) ? get(item, props.valueKey) : item"
                   @select="isSelectItem(item) && item.onSelect?.($event)"
@@ -200,32 +227,37 @@ function isSelectItem(item) {
                       <Component
                         :is="item.icon"
                         v-if="isSelectItem(item) && item.icon"
-                        :class="b24ui.itemLeadingIcon({ class: props.b24ui?.itemLeadingIcon, colorItem: item?.color })"
+                        :class="b24ui.itemLeadingIcon({ class: [props.b24ui?.itemLeadingIcon, item.b24ui?.itemLeadingIcon], colorItem: item?.color })"
+                      />
+                      <B24Avatar
+                        v-else-if="isSelectItem(item) && item.avatar"
+                        :size="item.b24ui?.itemLeadingAvatarSize || props.b24ui?.itemLeadingAvatarSize || b24ui.itemLeadingAvatarSize()"
+                        v-bind="item.avatar"
+                        :class="b24ui.itemLeadingAvatar({ class: [props.b24ui?.itemLeadingAvatar, item.b24ui?.itemLeadingAvatar], colorItem: item?.color })"
                       />
-                      <B24Avatar v-else-if="isSelectItem(item) && item.avatar" :size="props.b24ui?.itemLeadingAvatarSize || b24ui.itemLeadingAvatarSize()" v-bind="item.avatar" :class="b24ui.itemLeadingAvatar({ class: props.b24ui?.itemLeadingAvatar, colorItem: item?.color })" />
                       <B24Chip
                         v-else-if="isSelectItem(item) && item.chip"
-                        :size="props.b24ui?.itemLeadingChipSize || b24ui.itemLeadingChipSize()"
+                        :size="item.b24ui?.itemLeadingChipSize || props.b24ui?.itemLeadingChipSize || b24ui.itemLeadingChipSize()"
                         inset
                         standalone
                         v-bind="item.chip"
-                        :class="b24ui.itemLeadingChip({ class: props.b24ui?.itemLeadingChip, colorItem: item?.color })"
+                        :class="b24ui.itemLeadingChip({ class: [props.b24ui?.itemLeadingChip, item.b24ui?.itemLeadingChip], colorItem: item?.color })"
                       />
                     </slot>
 
-                    <SelectItemText :class="b24ui.itemLabel({ class: props.b24ui?.itemLabel })">
+                    <SelectItemText :class="b24ui.itemLabel({ class: [props.b24ui?.itemLabel, isSelectItem(item) && item.b24ui?.itemLabel] })">
                       <slot name="item-label" :item="item" :index="index">
                         {{ isSelectItem(item) ? get(item, props.labelKey) : item }}
                       </slot>
                     </SelectItemText>
 
-                    <span :class="b24ui.itemTrailing({ class: props.b24ui?.itemTrailing, colorItem: isSelectItem(item) ? item?.color : void 0 })">
+                    <span :class="b24ui.itemTrailing({ class: [props.b24ui?.itemTrailing, isSelectItem(item) && item.b24ui?.itemTrailing], colorItem: isSelectItem(item) && item?.color || void 0 })">
                       <slot name="item-trailing" :item="item" :index="index" />
 
                       <SelectItemIndicator as-child>
                         <Component
                           :is="selectedIcon || icons.check"
-                          :class="b24ui.itemTrailingIcon({ class: props.b24ui?.itemTrailingIcon, colorItem: isSelectItem(item) ? item?.color : void 0 })"
+                          :class="b24ui.itemTrailingIcon({ class: [props.b24ui?.itemTrailingIcon, isSelectItem(item) && item.b24ui?.itemTrailingIcon], colorItem: isSelectItem(item) && item?.color || void 0 })"
                         />
                       </SelectItemIndicator>
                     </span>
@@ -233,13 +265,7 @@ function isSelectItem(item) {
                 </SelectItem>
               </template>
             </SelectGroup>
-          </SelectViewport>
-          <SelectScrollDownButton :class="b24ui.scrollUpDownButton({ class: props.b24ui?.scrollUpDownButton })">
-            <Component
-              :is="icons.chevronDown"
-              :class="b24ui.scrollUpDownButtonIcon({ class: props.b24ui?.scrollUpDownButtonIcon })"
-            />
-          </SelectScrollDownButton>
+          </div>
 
           <slot name="content-bottom" />
 

package/dist/runtime/components/Select.vue.d.ts

@@ -20,9 +20,11 @@ interface SelectItemBase {
      * @defaultValue 'item'
      */
     type?: 'label' | 'separator' | 'item';
-    value?: string | number;
+    value?: AcceptableValue | boolean;
     disabled?: boolean;
     onSelect?(e?: Event): void;
+    class?: any;
+    b24ui?: Pick<Select['slots'], 'label' | 'separator' | 'item' | 'itemLeadingIcon' | 'itemLeadingAvatarSize' | 'itemLeadingAvatar' | 'itemLeadingChipSize' | 'itemLeadingChip' | 'itemLabel' | 'itemTrailing' | 'itemTrailingIcon'>;
     [key: string]: any;
 }
 export type SelectItem = SelectItemBase | AcceptableValue | boolean;
@@ -119,6 +121,8 @@ export interface SelectProps<T extends ArrayOrNested<SelectItem> = ArrayOrNested
      * @defaultValue false
      */
     highlight?: boolean;
+    autofocus?: boolean;
+    autofocusDelay?: number;
     class?: any;
     b24ui?: Select['slots'];
 }
@@ -165,7 +169,111 @@ declare const _default: <T extends ArrayOrNested<SelectItem>, VK extends GetItem
         readonly "onUpdate:open"?: ((value: boolean) => any) | undefined;
         readonly "onUpdate:modelValue"?: ((payload: GetModelValue<T, VK, M>) => any) | undefined;
     } & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, never>, "onFocus" | "onBlur" | "onChange" | "onUpdate:open" | "onUpdate:modelValue"> & SelectProps<T, VK, M> & Partial<{}>> & import("vue").PublicProps;
-    expose(exposed: import("vue").ShallowUnwrapRef<{}>): void;
+    expose(exposed: import("vue").ShallowUnwrapRef<{
+        triggerRef: import("vue").Ref<({
+            $: import("vue").ComponentInternalInstance;
+            $data: {};
+            $props: {
+                readonly disabled?: boolean | undefined;
+                readonly reference?: import("reka-ui").ReferenceElement | undefined;
+                readonly asChild?: boolean | undefined;
+                readonly as?: (import("reka-ui").AsTag | import("vue").Component) | undefined;
+            } & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps;
+            $attrs: {
+                [x: string]: unknown;
+            };
+            $refs: {
+                [x: string]: unknown;
+            };
+            $slots: Readonly<{
+                [name: string]: import("vue").Slot<any> | undefined;
+            }>;
+            $root: import("vue").ComponentPublicInstance | null;
+            $parent: import("vue").ComponentPublicInstance | null;
+            $host: Element | null;
+            $emit: (event: string, ...args: any[]) => void;
+            $el: any;
+            $options: import("vue").ComponentOptionsBase<Readonly<import("reka-ui").SelectTriggerProps> & Readonly<{}>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, {
+                as: import("reka-ui").AsTag | import("vue").Component;
+            }, {}, string, {}, import("vue").GlobalComponents, import("vue").GlobalDirectives, string, import("vue").ComponentProvideOptions> & {
+                beforeCreate?: (() => void) | (() => void)[];
+                created?: (() => void) | (() => void)[];
+                beforeMount?: (() => void) | (() => void)[];
+                mounted?: (() => void) | (() => void)[];
+                beforeUpdate?: (() => void) | (() => void)[];
+                updated?: (() => void) | (() => void)[];
+                activated?: (() => void) | (() => void)[];
+                deactivated?: (() => void) | (() => void)[];
+                beforeDestroy?: (() => void) | (() => void)[];
+                beforeUnmount?: (() => void) | (() => void)[];
+                destroyed?: (() => void) | (() => void)[];
+                unmounted?: (() => void) | (() => void)[];
+                renderTracked?: ((e: import("vue").DebuggerEvent) => void) | ((e: import("vue").DebuggerEvent) => void)[];
+                renderTriggered?: ((e: import("vue").DebuggerEvent) => void) | ((e: import("vue").DebuggerEvent) => void)[];
+                errorCaptured?: ((err: unknown, instance: import("vue").ComponentPublicInstance | null, info: string) => boolean | void) | ((err: unknown, instance: import("vue").ComponentPublicInstance | null, info: string) => boolean | void)[];
+            };
+            $forceUpdate: () => void;
+            $nextTick: typeof import("vue").nextTick;
+            $watch<T_1 extends string | ((...args: any) => any)>(source: T_1, cb: T_1 extends (...args: any) => infer R ? (...args: [R, R, import("@vue/reactivity").OnCleanup]) => any : (...args: [any, any, import("@vue/reactivity").OnCleanup]) => any, options?: import("vue").WatchOptions): import("vue").WatchStopHandle;
+        } & Readonly<{
+            as: import("reka-ui").AsTag | import("vue").Component;
+        }> & Omit<Readonly<import("reka-ui").SelectTriggerProps> & Readonly<{}>, "as"> & import("vue").ShallowUnwrapRef<{}> & {} & import("vue").ComponentCustomProperties & {} & {
+            $slots: {
+                default?(_: {}): any;
+            };
+        }) | null, ({
+            $: import("vue").ComponentInternalInstance;
+            $data: {};
+            $props: {
+                readonly disabled?: boolean | undefined;
+                readonly reference?: import("reka-ui").ReferenceElement | undefined;
+                readonly asChild?: boolean | undefined;
+                readonly as?: (import("reka-ui").AsTag | import("vue").Component) | undefined;
+            } & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps;
+            $attrs: {
+                [x: string]: unknown;
+            };
+            $refs: {
+                [x: string]: unknown;
+            };
+            $slots: Readonly<{
+                [name: string]: import("vue").Slot<any> | undefined;
+            }>;
+            $root: import("vue").ComponentPublicInstance | null;
+            $parent: import("vue").ComponentPublicInstance | null;
+            $host: Element | null;
+            $emit: (event: string, ...args: any[]) => void;
+            $el: any;
+            $options: import("vue").ComponentOptionsBase<Readonly<import("reka-ui").SelectTriggerProps> & Readonly<{}>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, {
+                as: import("reka-ui").AsTag | import("vue").Component;
+            }, {}, string, {}, import("vue").GlobalComponents, import("vue").GlobalDirectives, string, import("vue").ComponentProvideOptions> & {
+                beforeCreate?: (() => void) | (() => void)[];
+                created?: (() => void) | (() => void)[];
+                beforeMount?: (() => void) | (() => void)[];
+                mounted?: (() => void) | (() => void)[];
+                beforeUpdate?: (() => void) | (() => void)[];
+                updated?: (() => void) | (() => void)[];
+                activated?: (() => void) | (() => void)[];
+                deactivated?: (() => void) | (() => void)[];
+                beforeDestroy?: (() => void) | (() => void)[];
+                beforeUnmount?: (() => void) | (() => void)[];
+                destroyed?: (() => void) | (() => void)[];
+                unmounted?: (() => void) | (() => void)[];
+                renderTracked?: ((e: import("vue").DebuggerEvent) => void) | ((e: import("vue").DebuggerEvent) => void)[];
+                renderTriggered?: ((e: import("vue").DebuggerEvent) => void) | ((e: import("vue").DebuggerEvent) => void)[];
+                errorCaptured?: ((err: unknown, instance: import("vue").ComponentPublicInstance | null, info: string) => boolean | void) | ((err: unknown, instance: import("vue").ComponentPublicInstance | null, info: string) => boolean | void)[];
+            };
+            $forceUpdate: () => void;
+            $nextTick: typeof import("vue").nextTick;
+            $watch<T_1 extends string | ((...args: any) => any)>(source: T_1, cb: T_1 extends (...args: any) => infer R ? (...args: [R, R, import("@vue/reactivity").OnCleanup]) => any : (...args: [any, any, import("@vue/reactivity").OnCleanup]) => any, options?: import("vue").WatchOptions): import("vue").WatchStopHandle;
+        } & Readonly<{
+            as: import("reka-ui").AsTag | import("vue").Component;
+        }> & Omit<Readonly<import("reka-ui").SelectTriggerProps> & Readonly<{}>, "as"> & import("vue").ShallowUnwrapRef<{}> & {} & import("vue").ComponentCustomProperties & {} & {
+            $slots: {
+                default?(_: {}): any;
+            };
+        }) | null>;
+    }>): void;
     attrs: any;
     slots: SelectSlots<T, VK, M, NestedItem<T>>;
     emit: ((evt: "blur", payload: FocusEvent) => void) & ((evt: "change", payload: Event) => void) & ((evt: "focus", payload: FocusEvent) => void) & ((evt: "update:open", value: boolean) => void) & ((evt: "update:modelValue", payload: GetModelValue<T, VK, M>) => void);

package/dist/runtime/components/SelectMenu.vue

@@ -3,7 +3,7 @@ import theme from "#build/b24ui/select-menu";
 </script>
 
 <script setup>
-import { computed, toRef, toRaw } from "vue";
+import { ref, computed, onMounted, toRef, toRaw } from "vue";
 import {
   ComboboxRoot,
   ComboboxArrow,
@@ -12,7 +12,6 @@ import {
   ComboboxTrigger,
   ComboboxPortal,
   ComboboxContent,
-  ComboboxViewport,
   ComboboxEmpty,
   ComboboxGroup,
   ComboboxLabel,
@@ -67,6 +66,8 @@ const props = defineProps({
   createItem: { type: [Boolean, String, Object], required: false },
   filterFields: { type: Array, required: false },
   ignoreFilter: { type: Boolean, required: false },
+  autofocus: { type: Boolean, required: false },
+  autofocusDelay: { type: Number, required: false, default: 0 },
   class: { type: null, required: false },
   b24ui: { type: null, required: false },
   open: { type: Boolean, required: false },
@@ -119,7 +120,8 @@ const b24ui = computed(() => tv({ extend: tv(theme), ...appConfig.b24ui?.selectM
 }));
 function displayValue(value) {
   if (props.multiple && Array.isArray(value)) {
-    return value.map((v) => displayValue(v)).filter(Boolean).join(", ");
+    const values = value.map((v) => displayValue(v)).filter(Boolean);
+    return values?.length ? values.join(", ") : void 0;
   }
   if (!props.valueKey) {
     return value && (typeof value === "object" ? get(value, props.labelKey) : value);
@@ -160,6 +162,19 @@ const createItem = computed(() => {
   return !filteredItems.value.length;
 });
 const createItemPosition = computed(() => typeof props.createItem === "object" ? props.createItem.position : "bottom");
+const triggerRef = ref(null);
+function autoFocus() {
+  if (props.autofocus) {
+    triggerRef.value?.$el?.focus({
+      focusVisible: true
+    });
+  }
+}
+onMounted(() => {
+  setTimeout(() => {
+    autoFocus();
+  }, props.autofocusDelay);
+});
 function onUpdate(value) {
   if (toRaw(props.modelValue) === value) {
     return;
@@ -206,6 +221,9 @@ function onSelect(e, item) {
 function isSelectItem(item) {
   return typeof item === "object" && item !== null;
 }
+defineExpose({
+  triggerRef
+});
 </script>
 
 <template>
@@ -223,7 +241,7 @@ function isSelectItem(item) {
                 :is="icons.plus"
                 :class="b24ui.itemLeadingIcon({ addNew: true, class: props.b24ui?.itemLeadingIcon })"
               />
-              {{ t('selectMenu.create', { label: searchTerm }) }}
+              {{ t("selectMenu.create", { label: searchTerm }) }}
             </slot>
           </span>
         </ComboboxItem>
@@ -242,7 +260,11 @@ function isSelectItem(item) {
       @update:open="onUpdateOpen"
     >
       <ComboboxAnchor as-child>
-        <ComboboxTrigger :class="b24ui.base({ class: [props.class, props.b24ui?.base] })" tabindex="0">
+        <ComboboxTrigger
+          ref="triggerRef"
+          :class="b24ui.base({ class: [props.b24ui?.base, props.class] })"
+          tabindex="0"
+        >
           <div v-if="isTag" :class="b24ui.tag({ class: props.b24ui?.tag })">
             {{ props.tag }}
           </div>
@@ -259,11 +281,17 @@ function isSelectItem(item) {
 
           <slot :model-value="modelValue" :open="open">
             <template v-for="displayedModelValue in [displayValue(modelValue)]" :key="displayedModelValue">
-              <span v-if="displayedModelValue" :class="b24ui.value({ class: props.b24ui?.value })">
+              <span
+                v-if="displayedModelValue !== void 0 && displayedModelValue !== null"
+                :class="b24ui.value({ class: props.b24ui?.value })"
+              >
                 {{ displayedModelValue }}
               </span>
-              <span v-else :class="b24ui.placeholder({ class: props.b24ui?.placeholder })">
-                {{ placeholder ?? '\xA0' }}
+              <span
+                v-else
+                :class="b24ui.placeholder({ class: props.b24ui?.placeholder })"
+              >
+                {{ placeholder ?? "\xA0" }}
               </span>
             </template>
           </slot>
@@ -285,30 +313,51 @@ function isSelectItem(item) {
           <FocusScope trapped :class="b24ui.focusScope({ class: props.b24ui?.focusScope })">
             <slot name="content-top" />
 
-            <ComboboxInput v-if="!!searchInput" v-model="searchTerm" :display-value="() => searchTerm" as-child>
-              <B24Input no-border autofocus autocomplete="off" v-bind="searchInputProps" :class="b24ui.input({ class: props.b24ui?.input })" />
+            <ComboboxInput
+              v-if="!!searchInput"
+              v-model="searchTerm"
+              :display-value="() => searchTerm"
+              as-child
+            >
+              <B24Input
+                no-border
+                autofocus
+                autocomplete="off"
+                :size="size"
+                v-bind="searchInputProps"
+                :class="b24ui.input({ class: props.b24ui?.input })"
+              />
             </ComboboxInput>
 
             <ComboboxEmpty :class="b24ui.empty({ class: props.b24ui?.empty })">
               <slot name="empty" :search-term="searchTerm">
-                {{ searchTerm ? t('selectMenu.noMatch', { searchTerm }) : t('selectMenu.noData') }}
+                {{ searchTerm ? t("selectMenu.noMatch", { searchTerm }) : t("selectMenu.noData") }}
               </slot>
             </ComboboxEmpty>
 
-            <ComboboxViewport :class="b24ui.viewport({ class: props.b24ui?.viewport })">
+            <div
+              role="presentation"
+              :class="b24ui.viewport({ class: props.b24ui?.viewport })"
+            >
               <ReuseCreateItemTemplate v-if="createItem && createItemPosition === 'top'" />
 
               <ComboboxGroup v-for="(group, groupIndex) in filteredGroups" :key="`group-${groupIndex}`" :class="b24ui.group({ class: props.b24ui?.group })">
                 <template v-for="(item, index) in group" :key="`group-${groupIndex}-${index}`">
-                  <ComboboxLabel v-if="isSelectItem(item) && item.type === 'label'" :class="b24ui.label({ class: props.b24ui?.label })">
+                  <ComboboxLabel
+                    v-if="isSelectItem(item) && item.type === 'label'"
+                    :class="b24ui.label({ class: [props.b24ui?.label, item.b24ui?.label, item.class] })"
+                  >
                     {{ get(item, props.labelKey) }}
                   </ComboboxLabel>
 
-                  <ComboboxSeparator v-else-if="isSelectItem(item) && item.type === 'separator'" :class="b24ui.separator({ class: props.b24ui?.separator })" />
+                  <ComboboxSeparator
+                    v-else-if="isSelectItem(item) && item.type === 'separator'"
+                    :class="b24ui.separator({ class: [props.b24ui?.separator, item.b24ui?.separator, item.class] })"
+                  />
 
                   <ComboboxItem
                     v-else
-                    :class="b24ui.item({ class: props.b24ui?.item, colorItem: isSelectItem(item) ? item?.color : void 0 })"
+                    :class="b24ui.item({ class: [props.b24ui?.item, isSelectItem(item) && item.b24ui?.item, isSelectItem(item) && item.class], colorItem: isSelectItem(item) && item?.color || void 0 })"
                     :disabled="isSelectItem(item) && item.disabled"
                     :value="props.valueKey && isSelectItem(item) ? get(item, props.valueKey) : item"
                     @select="onSelect($event, item)"
@@ -318,32 +367,37 @@ function isSelectItem(item) {
                         <Component
                           :is="item.icon"
                           v-if="isSelectItem(item) && item.icon"
-                          :class="b24ui.itemLeadingIcon({ class: props.b24ui?.itemLeadingIcon, colorItem: item?.color })"
+                          :class="b24ui.itemLeadingIcon({ class: [props.b24ui?.itemLeadingIcon, item.b24ui?.itemLeadingIcon], colorItem: item?.color })"
+                        />
+                        <B24Avatar
+                          v-else-if="isSelectItem(item) && item.avatar"
+                          :size="item.b24ui?.itemLeadingAvatarSize || props.b24ui?.itemLeadingAvatarSize || b24ui.itemLeadingAvatarSize()"
+                          v-bind="item.avatar"
+                          :class="b24ui.itemLeadingAvatar({ class: [props.b24ui?.itemLeadingAvatar, item.b24ui?.itemLeadingAvatar], colorItem: item?.color })"
                         />
-                        <B24Avatar v-else-if="isSelectItem(item) && item.avatar" :size="props.b24ui?.itemLeadingAvatarSize || b24ui.itemLeadingAvatarSize()" v-bind="item.avatar" :class="b24ui.itemLeadingAvatar({ class: props.b24ui?.itemLeadingAvatar, colorItem: item?.color })" />
                         <B24Chip
                           v-else-if="isSelectItem(item) && item.chip"
-                          :size="props.b24ui?.itemLeadingChipSize || b24ui.itemLeadingChipSize()"
+                          :size="item.b24ui?.itemLeadingChipSize || props.b24ui?.itemLeadingChipSize || b24ui.itemLeadingChipSize()"
                           inset
                           standalone
                           v-bind="item.chip"
-                          :class="b24ui.itemLeadingChip({ class: props.b24ui?.itemLeadingChip, colorItem: item?.color })"
+                          :class="b24ui.itemLeadingChip({ class: [props.b24ui?.itemLeadingChip, item.b24ui?.itemLeadingChip], colorItem: item?.color })"
                         />
                       </slot>
 
-                      <span :class="b24ui.itemLabel({ class: props.b24ui?.itemLabel })">
+                      <span :class="b24ui.itemLabel({ class: [props.b24ui?.itemLabel, isSelectItem(item) && item.b24ui?.itemLabel] })">
                         <slot name="item-label" :item="item" :index="index">
                           {{ isSelectItem(item) ? get(item, props.labelKey) : item }}
                         </slot>
                       </span>
 
-                      <span :class="b24ui.itemTrailing({ class: props.b24ui?.itemTrailing, colorItem: isSelectItem(item) ? item?.color : void 0 })">
+                      <span :class="b24ui.itemTrailing({ class: [props.b24ui?.itemTrailing, isSelectItem(item) && item.b24ui?.itemTrailing], colorItem: isSelectItem(item) && item?.color || void 0 })">
                         <slot name="item-trailing" :item="item" :index="index" />
 
                         <ComboboxItemIndicator as-child>
                           <Component
                             :is="selectedIcon || icons.check"
-                            :class="b24ui.itemTrailingIcon({ class: props.b24ui?.itemTrailingIcon, colorItem: isSelectItem(item) ? item?.color : void 0 })"
+                            :class="b24ui.itemTrailingIcon({ class: [props.b24ui?.itemTrailingIcon, isSelectItem(item) && item.b24ui?.itemTrailingIcon], colorItem: isSelectItem(item) && item?.color || void 0 })"
                           />
                         </ComboboxItemIndicator>
                       </span>
@@ -353,7 +407,7 @@ function isSelectItem(item) {
               </ComboboxGroup>
 
               <ReuseCreateItemTemplate v-if="createItem && createItemPosition === 'bottom'" />
-            </ComboboxViewport>
+            </div>
 
             <slot name="content-bottom" />
           </FocusScope>