@bitrix24/b24ui-nuxt 0.5.11 → 0.6.1

package/dist/runtime/components/SelectMenu.vue

@@ -1,208 +1,9 @@
-<script lang="ts">
-import type { VariantProps } from 'tailwind-variants'
-import type { ComboboxRootProps, ComboboxRootEmits, ComboboxContentProps, ComboboxContentEmits, ComboboxArrowProps } from 'reka-ui'
-import type { AppConfig } from '@nuxt/schema'
-import _appConfig from '#build/app.config'
-import theme from '#build/b24ui/select-menu'
-import type { UseComponentIconsProps } from '../composables/useComponentIcons'
-import { tv } from '../utils/tv'
-import type { AvatarProps, ChipProps, InputProps, IconComponent } from '../types'
-import type {
-  AcceptableValue,
-  ArrayOrNested,
-  GetItemKeys,
-  GetItemValue,
-  GetModelValue,
-  GetModelValueEmits,
-  NestedItem,
-  PartialString,
-  EmitsToProps
-} from '../types/utils'
-
-const appConfigSelectMenu = _appConfig as AppConfig & { b24ui: { selectMenu: Partial<typeof theme> } }
-
-const selectMenu = tv({ extend: tv(theme), ...(appConfigSelectMenu.b24ui?.selectMenu || {}) })
-
-interface _SelectMenuItem {
-  label?: string
-  /**
-   * Display an icon on the left side.
-   * @IconComponent
-   */
-  icon?: IconComponent
-  avatar?: AvatarProps
-  color?: SelectMenuVariants['color']
-  chip?: ChipProps
-  /**
-   * The item type.
-   * @defaultValue 'item'
-   */
-  type?: 'label' | 'separator' | 'item'
-  disabled?: boolean
-  onSelect?(e?: Event): void
-  [key: string]: any
-}
-export type SelectMenuItem = _SelectMenuItem | AcceptableValue | boolean
-
-type SelectMenuVariants = VariantProps<typeof selectMenu>
-
-export interface SelectMenuProps<T extends ArrayOrNested<SelectMenuItem> = ArrayOrNested<SelectMenuItem>, VK extends GetItemKeys<T> | undefined = undefined, M extends boolean = false> extends Pick<ComboboxRootProps<T>, 'open' | 'defaultOpen' | 'disabled' | 'name' | 'resetSearchTermOnBlur' | 'highlightOnHover'>, UseComponentIconsProps {
-  id?: string
-  /** The placeholder text when the select is empty. */
-  placeholder?: string
-  /**
-   * Whether to display the search input or not.
-   * Can be an object to pass additional props to the input.
-   * `{ placeholder: 'Search...', type: 'search' }`{lang="ts"}
-   * @defaultValue true
-   */
-  searchInput?: boolean | InputProps
-  /**
-   * @defaultValue 'primary'
-   */
-  color?: SelectMenuVariants['color']
-  /**
-   * @defaultValue 'md'
-   */
-  size?: SelectMenuVariants['size']
-  /**
-   * Removes padding from input
-   * @defaultValue false
-   */
-  noPadding?: boolean
-  /**
-   * Removes all borders (rings)
-   * @defaultValue false
-   */
-  noBorder?: boolean
-  /**
-   * Removes all borders (rings) except the bottom one
-   * @defaultValue false
-   */
-  underline?: boolean
-  /**
-   * Rounds the corners of the button
-   * @defaultValue false
-   */
-  rounded?: boolean
-  tag?: string
-  /**
-   * @defaultValue 'primary'
-   */
-  tagColor?: SelectMenuVariants['tagColor']
-  /**
-   * @defaultValue false
-   */
-  required?: boolean
-  /**
-   * The icon displayed to open the menu.
-   * @defaultValue icons.chevronDown
-   * @IconComponent
-   */
-  trailingIcon?: IconComponent
-  /**
-   * The icon displayed when an item is selected.
-   * @defaultValue icons.check
-   * @IconComponent
-   */
-  selectedIcon?: IconComponent
-  /**
-   * The content of the menu.
-   * @defaultValue { side: 'bottom', sideOffset: 8, collisionPadding: 8, position: 'popper' }
-   */
-  content?: Omit<ComboboxContentProps, 'as' | 'asChild' | 'forceMount'> & Partial<EmitsToProps<ComboboxContentEmits>>
-  /**
-   * Display an arrow alongside the menu.
-   * @defaultValue false
-   */
-  arrow?: boolean | Omit<ComboboxArrowProps, 'as' | 'asChild'>
-  /**
-   * Render the menu in a portal.
-   * @defaultValue true
-   */
-  portal?: boolean
-  /**
-   * When `items` is an array of objects, select the field to use as the value instead of the object itself.
-   * @defaultValue undefined
-   */
-  valueKey?: VK
-  /**
-   * When `items` is an array of objects, select the field to use as the label.
-   * @defaultValue 'label'
-   */
-  labelKey?: keyof NestedItem<T>
-  items?: T
-  /**
-   * The value of the SelectMenu when initially rendered. Use when you do not need to control the state of the SelectMenu
-   */
-  defaultValue?: GetModelValue<T, VK, M>
-  /**
-   * The controlled value of the SelectMenu. Can be binded-with with `v-model`
-   */
-  modelValue?: GetModelValue<T, VK, M>
-  /**
-   * Whether multiple options can be selected or not
-   * @defaultValue false
-   */
-  multiple?: M & boolean
-  /**
-   * Highlight the ring color like a focus state
-   * @defaultValue false
-   */
-  highlight?: boolean
-  /**
-   * Determines if custom user input that does not exist in options can be added.
-   * @defaultValue false
-   */
-  createItem?: boolean | 'always' | { position?: 'top' | 'bottom', when?: 'empty' | 'always' }
-  /**
-   * Fields to filter items by.
-   * @defaultValue [labelKey]
-   */
-  filterFields?: string[]
-  /**
-   * When `true`, disable the default filters, useful for custom filtering (useAsyncData, useFetch, etc.).
-   * @defaultValue false
-   */
-  ignoreFilter?: boolean
-  class?: any
-  b24ui?: PartialString<typeof selectMenu.slots>
-}
-
-export type SelectMenuEmits<A extends ArrayOrNested<SelectMenuItem>, VK extends GetItemKeys<A> | undefined, M extends boolean> = Pick<ComboboxRootEmits, 'update:open'> & {
-  change: [payload: Event]
-  blur: [payload: FocusEvent]
-  focus: [payload: FocusEvent]
-  create: [item: string]
-  /** Event handler when highlighted element changes. */
-  highlight: [payload: {
-    ref: HTMLElement
-    value: GetModelValue<A, VK, M>
-  } | undefined]
-} & GetModelValueEmits<A, VK, M>
-
-type SlotProps<T extends SelectMenuItem> = (props: { item: T, index: number }) => any
-
-export interface SelectMenuSlots<
-  A extends ArrayOrNested<SelectMenuItem> = ArrayOrNested<SelectMenuItem>,
-  VK extends GetItemKeys<A> | undefined = undefined,
-  M extends boolean = false,
-  T extends NestedItem<A> = NestedItem<A>
-> {
-  'leading'(props: { modelValue?: GetModelValue<A, VK, M>, open: boolean, b24ui: ReturnType<typeof selectMenu> }): any
-  'default'(props: { modelValue?: GetModelValue<A, VK, M>, open: boolean }): any
-  'trailing'(props: { modelValue?: GetModelValue<A, VK, M>, open: boolean, b24ui: ReturnType<typeof selectMenu> }): any
-  'empty'(props: { searchTerm?: string }): any
-  'item': SlotProps<T>
-  'item-leading': SlotProps<T>
-  'item-label': SlotProps<T>
-  'item-trailing': SlotProps<T>
-  'create-item-label'(props: { item: string }): any
-}
+<script>
+import theme from "#build/b24ui/select-menu";
 </script>
 
-<script setup lang="ts" generic="T extends ArrayOrNested<SelectMenuItem>, VK extends GetItemKeys<T> | undefined = undefined, M extends boolean = false">
-import { computed, toRef, toRaw } from 'vue'
+<script setup>
+import { computed, toRef, toRaw } from "vue";
 import {
   ComboboxRoot,
   ComboboxArrow,
@@ -222,56 +23,85 @@ import {
   useForwardPropsEmits,
   useFilter,
   Primitive
-} from 'reka-ui'
-import { defu } from 'defu'
-import { reactivePick, createReusableTemplate } from '@vueuse/core'
-import { useButtonGroup } from '../composables/useButtonGroup'
-import { useComponentIcons } from '../composables/useComponentIcons'
-import { useFormField } from '../composables/useFormField'
-import { useLocale } from '../composables/useLocale'
-import { compare, get, isArrayOfArray } from '../utils'
-import icons from '../dictionary/icons'
-import B24Avatar from './Avatar.vue'
-import B24Chip from './Chip.vue'
-import B24Input from './Input.vue'
-
-defineOptions({ inheritAttrs: false })
-
-const props = withDefaults(defineProps<SelectMenuProps<T, VK, M>>(), {
-  portal: true,
-  searchInput: true,
-  labelKey: 'label' as never,
-  resetSearchTermOnBlur: true
-})
-const emits = defineEmits<SelectMenuEmits<T, VK, M>>()
-const slots = defineSlots<SelectMenuSlots<T, VK, M>>()
-
-const searchTerm = defineModel<string>('searchTerm', { default: '' })
-
-const { t } = useLocale()
-const { contains } = useFilter({ sensitivity: 'base' })
-
-const rootProps = useForwardPropsEmits(reactivePick(props, 'modelValue', 'defaultValue', 'open', 'defaultOpen', 'required', 'multiple', 'resetSearchTermOnBlur', 'highlightOnHover'), emits)
-const contentProps = toRef(() => defu(props.content, { side: 'bottom', sideOffset: 8, collisionPadding: 8, position: 'popper' }) as ComboboxContentProps)
-const arrowProps = toRef(() => props.arrow as ComboboxArrowProps)
-const searchInputProps = toRef(() => defu(props.searchInput, { placeholder: t('selectMenu.search'), type: 'search' }) as InputProps)
-
-const { emitFormBlur, emitFormFocus, emitFormInput, emitFormChange, size: formGroupSize, color, id, name, highlight, disabled, ariaAttrs } = useFormField<InputProps>(props)
-const { orientation, size: buttonGroupSize } = useButtonGroup<InputProps>(props)
+} from "reka-ui";
+import { defu } from "defu";
+import { reactivePick, createReusableTemplate } from "@vueuse/core";
+import { useAppConfig } from "#imports";
+import { useButtonGroup } from "../composables/useButtonGroup";
+import { useComponentIcons } from "../composables/useComponentIcons";
+import { useFormField } from "../composables/useFormField";
+import { useLocale } from "../composables/useLocale";
+import { compare, get, isArrayOfArray } from "../utils";
+import { tv } from "../utils/tv";
+import icons from "../dictionary/icons";
+import B24Avatar from "./Avatar.vue";
+import B24Chip from "./Chip.vue";
+import B24Input from "./Input.vue";
+defineOptions({ inheritAttrs: false });
+const props = defineProps({
+  id: { type: String, required: false },
+  placeholder: { type: String, required: false },
+  searchInput: { type: [Boolean, Object], required: false, default: true },
+  color: { type: null, required: false },
+  size: { type: null, required: false },
+  noPadding: { type: Boolean, required: false },
+  noBorder: { type: Boolean, required: false },
+  underline: { type: Boolean, required: false },
+  rounded: { type: Boolean, required: false },
+  tag: { type: String, required: false },
+  tagColor: { type: null, required: false },
+  required: { type: Boolean, required: false },
+  trailingIcon: { type: [Function, Object], required: false },
+  selectedIcon: { type: [Function, Object], required: false },
+  content: { type: Object, required: false },
+  arrow: { type: [Boolean, Object], required: false },
+  portal: { type: Boolean, required: false, default: true },
+  valueKey: { type: null, required: false },
+  labelKey: { type: null, required: false, default: "label" },
+  items: { type: null, required: false },
+  defaultValue: { type: null, required: false },
+  modelValue: { type: null, required: false },
+  multiple: { type: Boolean, required: false },
+  highlight: { type: Boolean, required: false },
+  createItem: { type: [Boolean, String, Object], required: false },
+  filterFields: { type: Array, required: false },
+  ignoreFilter: { type: Boolean, required: false },
+  class: { type: null, required: false },
+  b24ui: { type: null, required: false },
+  open: { type: Boolean, required: false },
+  defaultOpen: { type: Boolean, required: false },
+  disabled: { type: Boolean, required: false },
+  name: { type: String, required: false },
+  resetSearchTermOnBlur: { type: Boolean, required: false, default: true },
+  resetSearchTermOnSelect: { type: Boolean, required: false, default: true },
+  highlightOnHover: { type: Boolean, required: false },
+  icon: { type: [Function, Object], required: false },
+  avatar: { type: Object, required: false },
+  loading: { type: Boolean, required: false },
+  trailing: { type: Boolean, required: false }
+});
+const emits = defineEmits(["update:open", "change", "blur", "focus", "create", "highlight", "update:modelValue"]);
+const slots = defineSlots();
+const searchTerm = defineModel("searchTerm", { type: String, ...{ default: "" } });
+const { t } = useLocale();
+const appConfig = useAppConfig();
+const { contains } = useFilter({ sensitivity: "base" });
+const rootProps = useForwardPropsEmits(reactivePick(props, "modelValue", "defaultValue", "open", "defaultOpen", "required", "multiple", "resetSearchTermOnBlur", "resetSearchTermOnSelect", "highlightOnHover"), emits);
+const contentProps = toRef(() => defu(props.content, { side: "bottom", sideOffset: 8, collisionPadding: 8, position: "popper" }));
+const arrowProps = toRef(() => props.arrow);
+const searchInputProps = toRef(() => defu(props.searchInput, { placeholder: t("selectMenu.search"), type: "search" }));
+const { emitFormBlur, emitFormFocus, emitFormInput, emitFormChange, size: formGroupSize, color, id, name, highlight, disabled, ariaAttrs } = useFormField(props);
+const { orientation, size: buttonGroupSize } = useButtonGroup(props);
 const { isLeading, isTrailing, leadingIconName, trailingIconName } = useComponentIcons(toRef(() => defu(
   props,
   { trailingIcon: icons.chevronDown }
-)))
-
-const selectSize = computed(() => buttonGroupSize.value || formGroupSize.value)
-
-const [DefineCreateItemTemplate, ReuseCreateItemTemplate] = createReusableTemplate()
-
+)));
+const selectSize = computed(() => buttonGroupSize.value || formGroupSize.value);
+const [DefineCreateItemTemplate, ReuseCreateItemTemplate] = createReusableTemplate();
 const isTag = computed(() => {
-  return props.tag
-})
-
-const b24ui = computed(() => selectMenu({
+  return props.tag;
+});
+const b24ui = computed(() => tv({ extend: tv(theme), ...appConfig.b24ui?.selectMenu || {} })({
   color: color.value,
   size: selectSize?.value,
   loading: props.loading,
@@ -284,115 +114,98 @@ const b24ui = computed(() => selectMenu({
   leading: Boolean(isLeading.value || !!props.avatar || !!slots.leading),
   trailing: Boolean(isTrailing.value || !!slots.trailing),
   buttonGroup: orientation.value
-}))
-
-function displayValue(value: GetItemValue<T, VK> | GetItemValue<T, VK>[]): string {
+}));
+function displayValue(value) {
   if (props.multiple && Array.isArray(value)) {
-    return value.map(v => displayValue(v)).filter(Boolean).join(', ')
+    return value.map((v) => displayValue(v)).filter(Boolean).join(", ");
   }
-
   if (!props.valueKey) {
-    return value && (typeof value === 'object' ? get(value, props.labelKey as string) : value)
+    return value && (typeof value === "object" ? get(value, props.labelKey) : value);
   }
-
-  const item = items.value.find(item => compare(typeof item === 'object' ? get(item as Record<string, any>, props.valueKey as string) : item, value))
-  return item && (typeof item === 'object' ? get(item, props.labelKey as string) : item)
+  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 groups = computed<SelectMenuItem[][]>(() =>
-  props.items?.length
-    ? isArrayOfArray(props.items)
-      ? props.items
-      : [props.items]
-    : []
-)
-// eslint-disable-next-line vue/no-dupe-keys
-const items = computed(() => groups.value.flatMap(group => group) as T[])
-
+const groups = computed(
+  () => props.items?.length ? isArrayOfArray(props.items) ? props.items : [props.items] : []
+);
+const items = computed(() => groups.value.flatMap((group) => group));
 const filteredGroups = computed(() => {
   if (props.ignoreFilter || !searchTerm.value) {
-    return groups.value
+    return groups.value;
   }
-
-  const fields = Array.isArray(props.filterFields) ? props.filterFields : [props.labelKey] as string[]
-
-  return groups.value.map(items => items.filter((item) => {
-    if (typeof item !== 'object' || item === null) {
-      return contains(String(item), searchTerm.value)
+  const fields = Array.isArray(props.filterFields) ? props.filterFields : [props.labelKey];
+  return groups.value.map((items2) => items2.filter((item) => {
+    if (typeof item !== "object" || item === null) {
+      return contains(String(item), searchTerm.value);
     }
-
-    if (item.type && ['label', 'separator'].includes(item.type)) {
-      return true
+    if (item.type && ["label", "separator"].includes(item.type)) {
+      return true;
     }
-
-    return fields.some(field => contains(get(item, field), searchTerm.value))
-  })).filter(group => group.filter(item =>
-    !isSelectItem(item) || (isSelectItem(item) && (!item.type || !['label', 'separator'].includes(item.type)))
-  ).length > 0)
-})
-const filteredItems = computed(() => filteredGroups.value.flatMap(group => group))
-
+    return fields.some((field) => contains(get(item, field), searchTerm.value));
+  })).filter((group) => group.filter(
+    (item) => !isSelectItem(item) || isSelectItem(item) && (!item.type || !["label", "separator"].includes(item.type))
+  ).length > 0);
+});
+const filteredItems = computed(() => filteredGroups.value.flatMap((group) => group));
 const createItem = computed(() => {
   if (!props.createItem || !searchTerm.value) {
-    return false
+    return false;
   }
-
-  const newItem = props.valueKey ? { [props.valueKey]: searchTerm.value } as NestedItem<T> : searchTerm.value
-
-  if ((typeof props.createItem === 'object' && props.createItem.when === 'always') || props.createItem === 'always') {
-    return !filteredItems.value.find(item => compare(item, newItem, String(props.valueKey)))
+  const newItem = props.valueKey ? { [props.valueKey]: searchTerm.value } : searchTerm.value;
+  if (typeof props.createItem === "object" && props.createItem.when === "always" || props.createItem === "always") {
+    return !filteredItems.value.find((item) => compare(item, newItem, String(props.valueKey)));
   }
-
-  return !filteredItems.value.length
-})
-const createItemPosition = computed(() => typeof props.createItem === 'object' ? props.createItem.position : 'bottom')
-
-function onUpdate(value: any) {
+  return !filteredItems.value.length;
+});
+const createItemPosition = computed(() => typeof props.createItem === "object" ? props.createItem.position : "bottom");
+function onUpdate(value) {
   if (toRaw(props.modelValue) === value) {
-    return
+    return;
+  }
+  const event = new Event("change", { target: { value } });
+  emits("change", event);
+  emitFormChange();
+  emitFormInput();
+  if (props.resetSearchTermOnSelect) {
+    searchTerm.value = "";
   }
-  // @ts-expect-error - 'target' does not exist in type 'EventInit'
-  const event = new Event('change', { target: { value } })
-  emits('change', event)
-
-  emitFormChange()
-  emitFormInput()
 }
-
-function onUpdateOpen(value: boolean) {
-  let timeoutId: ReturnType<typeof setTimeout> | undefined
-
+function onUpdateOpen(value) {
+  let timeoutId;
   if (!value) {
-    const event = new FocusEvent('blur')
-
-    emits('blur', event)
-    emitFormBlur()
-
-    // Since we use `displayValue` prop inside ComboboxInput we should reset searchTerm manually
-    // https://reka-ui.com/docs/components/combobox#api-reference
+    const event = new FocusEvent("blur");
+    emits("blur", event);
+    emitFormBlur();
     if (props.resetSearchTermOnBlur) {
-      const STATE_ANIMATION_DELAY_MS = 100
-
+      const STATE_ANIMATION_DELAY_MS = 100;
       timeoutId = setTimeout(() => {
-        searchTerm.value = ''
-      }, STATE_ANIMATION_DELAY_MS)
+        searchTerm.value = "";
+      }, STATE_ANIMATION_DELAY_MS);
     }
   } else {
-    const event = new FocusEvent('focus')
-    emits('focus', event)
-    emitFormFocus()
+    const event = new FocusEvent("focus");
+    emits("focus", event);
+    emitFormFocus();
     if (timeoutId) {
-      clearTimeout(timeoutId)
+      clearTimeout(timeoutId);
     }
   }
 }
-
-function isSelectItem(item: SelectMenuItem): item is _SelectMenuItem {
-  return typeof item === 'object' && item !== null
+function onSelect(e, item) {
+  if (!isSelectItem(item)) {
+    return;
+  }
+  if (item.disabled) {
+    e.preventDefault();
+    return;
+  }
+  item.onSelect?.(e);
+}
+function isSelectItem(item) {
+  return typeof item === "object" && item !== null;
 }
 </script>
 
-<!-- eslint-disable vue/no-template-shadow -->
 <template>
   <Primitive as="div" :class="b24ui.root({ addNew: true, class: [props.b24ui?.root] })">
     <DefineCreateItemTemplate>
@@ -432,29 +245,29 @@ function isSelectItem(item: SelectMenuItem): item is _SelectMenuItem {
             {{ props.tag }}
           </div>
           <span v-if="isLeading || !!avatar || !!slots.leading" :class="b24ui.leading({ class: props.b24ui?.leading })">
-            <slot name="leading" :model-value="(modelValue as GetModelValue<T, VK, M>)" :open="open" :b24ui="b24ui">
+            <slot name="leading" :model-value="modelValue" :open="open" :b24ui="b24ui">
               <Component
                 :is="leadingIconName"
                 v-if="isLeading && leadingIconName"
                 :class="b24ui.leadingIcon({ class: props.b24ui?.leadingIcon })"
               />
-              <B24Avatar v-else-if="!!avatar" :size="((props.b24ui?.itemLeadingAvatarSize || b24ui.itemLeadingAvatarSize()) as AvatarProps['size'])" v-bind="avatar" :class="b24ui.itemLeadingAvatar({ class: props.b24ui?.itemLeadingAvatar })" />
+              <B24Avatar v-else-if="!!avatar" :size="props.b24ui?.itemLeadingAvatarSize || b24ui.itemLeadingAvatarSize()" v-bind="avatar" :class="b24ui.itemLeadingAvatar({ class: props.b24ui?.itemLeadingAvatar })" />
             </slot>
           </span>
 
-          <slot :model-value="(modelValue as GetModelValue<T, VK, M>)" :open="open">
-            <template v-for="displayedModelValue in [displayValue(modelValue as GetModelValue<T, VK, M>)]" :key="displayedModelValue">
+          <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 })">
                 {{ displayedModelValue }}
               </span>
               <span v-else :class="b24ui.placeholder({ class: props.b24ui?.placeholder })">
-                {{ placeholder ?? '&nbsp;' }}
+                {{ placeholder ?? '\xA0' }}
               </span>
             </template>
           </slot>
 
           <span v-if="isTrailing || !!slots.trailing" :class="b24ui.trailing({ class: props.b24ui?.trailing })">
-            <slot name="trailing" :model-value="(modelValue as GetModelValue<T, VK, M>)" :open="open" :b24ui="b24ui">
+            <slot name="trailing" :model-value="modelValue" :open="open" :b24ui="b24ui">
               <Component
                 :is="trailingIconName"
                 v-if="trailingIconName"
@@ -484,29 +297,29 @@ function isSelectItem(item: SelectMenuItem): item is _SelectMenuItem {
               <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 })">
-                    {{ get(item, props.labelKey as string) }}
+                    {{ get(item, props.labelKey) }}
                   </ComboboxLabel>
 
                   <ComboboxSeparator v-else-if="isSelectItem(item) && item.type === 'separator'" :class="b24ui.separator({ class: props.b24ui?.separator })" />
 
                   <ComboboxItem
                     v-else
-                    :class="b24ui.item({ class: props.b24ui?.item, colorItem: isSelectItem(item) ? item?.color : undefined })"
+                    :class="b24ui.item({ class: props.b24ui?.item, colorItem: isSelectItem(item) ? item?.color : void 0 })"
                     :disabled="isSelectItem(item) && item.disabled"
-                    :value="props.valueKey && isSelectItem(item) ? get(item, props.valueKey as string) : item"
-                    @select="isSelectItem(item) && item.onSelect?.($event)"
+                    :value="props.valueKey && isSelectItem(item) ? get(item, props.valueKey) : item"
+                    @select="onSelect($event, item)"
                   >
-                    <slot name="item" :item="(item as NestedItem<T>)" :index="index">
-                      <slot name="item-leading" :item="(item as NestedItem<T>)" :index="index">
+                    <slot name="item" :item="item" :index="index">
+                      <slot name="item-leading" :item="item" :index="index">
                         <Component
                           :is="item.icon"
                           v-if="isSelectItem(item) && item.icon"
                           :class="b24ui.itemLeadingIcon({ class: props.b24ui?.itemLeadingIcon, colorItem: item?.color })"
                         />
-                        <B24Avatar v-else-if="isSelectItem(item) && item.avatar" :size="((props.b24ui?.itemLeadingAvatarSize || b24ui.itemLeadingAvatarSize()) as AvatarProps['size'])" v-bind="item.avatar" :class="b24ui.itemLeadingAvatar({ class: props.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()) as ChipProps['size'])"
+                          :size="props.b24ui?.itemLeadingChipSize || b24ui.itemLeadingChipSize()"
                           inset
                           standalone
                           v-bind="item.chip"
@@ -515,18 +328,18 @@ function isSelectItem(item: SelectMenuItem): item is _SelectMenuItem {
                       </slot>
 
                       <span :class="b24ui.itemLabel({ class: props.b24ui?.itemLabel })">
-                        <slot name="item-label" :item="(item as NestedItem<T>)" :index="index">
-                          {{ isSelectItem(item) ? get(item, props.labelKey as string) : item }}
+                        <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 : undefined })">
-                        <slot name="item-trailing" :item="(item as NestedItem<T>)" :index="index" />
+                      <span :class="b24ui.itemTrailing({ class: props.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 : undefined })"
+                            :class="b24ui.itemTrailingIcon({ class: props.b24ui?.itemTrailingIcon, colorItem: isSelectItem(item) ? item?.color : void 0 })"
                           />
                         </ComboboxItemIndicator>
                       </span>