@bitrix24/b24ui-nuxt 0.5.2 → 0.5.4

package/dist/runtime/components/SelectMenu.vue

@@ -1,21 +1,29 @@
 <script lang="ts">
 import type { VariantProps } from 'tailwind-variants'
-import type { ComboboxRootProps, ComboboxRootEmits, ComboboxContentProps, ComboboxContentEmits, ComboboxArrowProps, AcceptableValue } from 'reka-ui'
+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 { PartialString, MaybeArrayOfArray, MaybeArrayOfArrayItem, SelectModelValue, SelectModelValueEmits, SelectItemKey, EmitsToProps } from '../types/utils'
+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 || {}) })
 
-type SelectMenuVariants = VariantProps<typeof selectMenu>
-
-export interface SelectMenuItem {
+interface _SelectMenuItem {
   label?: string
   /**
    * Display an icon on the left side.
@@ -30,11 +38,16 @@ export interface SelectMenuItem {
    * @defaultValue 'item'
    */
   type?: 'label' | 'separator' | 'item'
+  value?: string | number
   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 MaybeArrayOfArrayItem<I>, I extends MaybeArrayOfArray<SelectMenuItem | AcceptableValue | boolean> = MaybeArrayOfArray<SelectMenuItem | AcceptableValue | boolean>, V extends SelectItemKey<T> | undefined = undefined, M extends boolean = false> extends Pick<ComboboxRootProps<T>, 'open' | 'defaultOpen' | 'disabled' | 'name' | 'resetSearchTermOnBlur' | 'highlightOnHover'>, UseComponentIconsProps {
+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
@@ -113,21 +126,21 @@ export interface SelectMenuProps<T extends MaybeArrayOfArrayItem<I>, I extends M
    * When `items` is an array of objects, select the field to use as the value instead of the object itself.
    * @defaultValue undefined
    */
-  valueKey?: V
+  valueKey?: VK
   /**
    * When `items` is an array of objects, select the field to use as the label.
    * @defaultValue 'label'
    */
-  labelKey?: V
-  items?: I
+  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?: SelectModelValue<T, V, M>
+  defaultValue?: GetModelValue<T, VK, M>
   /**
    * The controlled value of the SelectMenu. Can be binded-with with `v-model`
    */
-  modelValue?: SelectModelValue<T, V, M>
+  modelValue?: GetModelValue<T, VK, M>
   /**
    * Whether multiple options can be selected or not
    * @defaultValue false
@@ -157,19 +170,29 @@ export interface SelectMenuProps<T extends MaybeArrayOfArrayItem<I>, I extends M
   b24ui?: PartialString<typeof selectMenu.slots>
 }
 
-export type SelectMenuEmits<T, V, M extends boolean> = Omit<ComboboxRootEmits<T>, 'update:modelValue'> & {
+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]
-} & SelectModelValueEmits<T, V, M>
-
-type SlotProps<T> = (props: { item: T, index: number }) => any
-
-export interface SelectMenuSlots<T, M extends boolean> {
-  'leading'(props: { modelValue?: M extends true ? T[] : T, open: boolean, b24ui: any }): any
-  'default'(props: { modelValue?: M extends true ? T[] : T, open: boolean }): any
-  'trailing'(props: { modelValue?: M extends true ? T[] : T, open: boolean, b24ui: any }): any
+  /** 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>
@@ -179,7 +202,7 @@ export interface SelectMenuSlots<T, M extends boolean> {
 }
 </script>
 
-<script setup lang="ts" generic="T extends MaybeArrayOfArrayItem<I>, I extends MaybeArrayOfArray<SelectMenuItem | AcceptableValue | boolean> = MaybeArrayOfArray<SelectMenuItem | AcceptableValue | boolean>, V extends SelectItemKey<T> | undefined = undefined, M extends boolean = false">
+<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'
 import {
   ComboboxRoot,
@@ -207,7 +230,7 @@ import { useButtonGroup } from '../composables/useButtonGroup'
 import { useComponentIcons } from '../composables/useComponentIcons'
 import { useFormField } from '../composables/useFormField'
 import { useLocale } from '../composables/useLocale'
-import { get, compare } from '../utils'
+import { compare, get, isArrayOfArray } from '../utils'
 import icons from '../dictionary/icons'
 import B24Avatar from './Avatar.vue'
 import B24Chip from './Chip.vue'
@@ -215,14 +238,14 @@ import B24Input from './Input.vue'
 
 defineOptions({ inheritAttrs: false })
 
-const props = withDefaults(defineProps<SelectMenuProps<T, I, V, M>>(), {
+const props = withDefaults(defineProps<SelectMenuProps<T, VK, M>>(), {
   portal: true,
   searchInput: true,
   labelKey: 'label' as never,
   resetSearchTermOnBlur: true
 })
-const emits = defineEmits<SelectMenuEmits<T, V, M>>()
-const slots = defineSlots<SelectMenuSlots<T, M>>()
+const emits = defineEmits<SelectMenuEmits<T, VK, M>>()
+const slots = defineSlots<SelectMenuSlots<T, VK, M>>()
 
 const searchTerm = defineModel<string>('searchTerm', { default: '' })
 
@@ -264,11 +287,7 @@ const b24ui = computed(() => selectMenu({
   buttonGroup: orientation.value
 }))
 
-const groups = computed(() => props.items?.length ? (Array.isArray(props.items[0]) ? props.items : [props.items]) as SelectMenuItem[][] : [])
-// eslint-disable-next-line vue/no-dupe-keys
-const items = computed(() => groups.value.flatMap(group => group) as T[])
-
-function displayValue(value: T | T[]): string {
+function displayValue(value: GetItemValue<T, VK> | GetItemValue<T, VK>[]): string {
   if (props.multiple && Array.isArray(value)) {
     return value.map(v => displayValue(v)).filter(Boolean).join(', ')
   }
@@ -281,6 +300,16 @@ function displayValue(value: T | T[]): string {
   return item && (typeof item === 'object' ? get(item, props.labelKey as string) : 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 filteredGroups = computed(() => {
   if (props.ignoreFilter || !searchTerm.value) {
     return groups.value
@@ -289,8 +318,8 @@ const filteredGroups = computed(() => {
   const fields = Array.isArray(props.filterFields) ? props.filterFields : [props.labelKey] as string[]
 
   return groups.value.map(items => items.filter((item) => {
-    if (typeof item !== 'object') {
-      return contains(item, searchTerm.value)
+    if (typeof item !== 'object' || item === null) {
+      return contains(String(item), searchTerm.value)
     }
 
     if (item.type && ['label', 'separator'].includes(item.type)) {
@@ -298,19 +327,25 @@ const filteredGroups = computed(() => {
     }
 
     return fields.some(field => contains(get(item, field), searchTerm.value))
-  })).filter(group => group.filter(item => !item.type || !['label', 'separator'].includes(item.type)).length > 0)
+  })).filter(group => group.filter(item =>
+    /**
+     * @memo fix not obj
+     * @see inputMenu
+     */
+    typeof item !== 'object' || (isSelectItem(item) && (!item.type || !['label', 'separator'].includes(item.type)))
+  ).length > 0)
 })
-const filteredItems = computed(() => filteredGroups.value.flatMap(group => group) as T[])
+const filteredItems = computed(() => filteredGroups.value.flatMap(group => group))
 
 const createItem = computed(() => {
   if (!props.createItem || !searchTerm.value) {
     return false
   }
 
-  const newItem = props.valueKey ? { [props.valueKey]: searchTerm.value } as T : searchTerm.value
+  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, props.valueKey))
+    return !filteredItems.value.find(item => compare(item, newItem, String(props.valueKey)))
   }
 
   return !filteredItems.value.length
@@ -356,6 +391,10 @@ function onUpdateOpen(value: boolean) {
     }
   }
 }
+
+function isSelectItem(item: SelectMenuItem): item is _SelectMenuItem {
+  return typeof item === 'object' && item !== null
+}
 </script>
 
 <!-- eslint-disable vue/no-template-shadow -->
@@ -398,7 +437,7 @@ function onUpdateOpen(value: boolean) {
             {{ props.tag }}
           </div>
           <span v-if="isLeading || !!avatar || !!slots.leading" :class="b24ui.leading({ class: props.b24ui?.leading })">
-            <slot name="leading" :model-value="(modelValue as M extends true ? T[] : T)" :open="open" :b24ui="b24ui">
+            <slot name="leading" :model-value="(modelValue as GetModelValue<T, VK, M>)" :open="open" :b24ui="b24ui">
               <Component
                 :is="leadingIconName"
                 v-if="isLeading && leadingIconName"
@@ -408,8 +447,8 @@ function onUpdateOpen(value: boolean) {
             </slot>
           </span>
 
-          <slot :model-value="(modelValue as M extends true ? T[] : T)" :open="open">
-            <template v-for="displayedModelValue in [displayValue(modelValue as M extends true ? T[] : T)]" :key="displayedModelValue">
+          <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">
               <span v-if="displayedModelValue" :class="b24ui.value({ class: props.b24ui?.value })">
                 {{ displayedModelValue }}
               </span>
@@ -420,7 +459,7 @@ function onUpdateOpen(value: boolean) {
           </slot>
 
           <span v-if="isTrailing || !!slots.trailing" :class="b24ui.trailing({ class: props.b24ui?.trailing })">
-            <slot name="trailing" :model-value="(modelValue as M extends true ? T[] : T)" :open="open" :b24ui="b24ui">
+            <slot name="trailing" :model-value="(modelValue as GetModelValue<T, VK, M>)" :open="open" :b24ui="b24ui">
               <Component
                 :is="trailingIconName"
                 v-if="trailingIconName"
@@ -449,29 +488,29 @@ function onUpdateOpen(value: boolean) {
 
               <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="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 })">
                     {{ get(item, props.labelKey as string) }}
                   </ComboboxLabel>
 
-                  <ComboboxSeparator v-else-if="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 })" />
 
                   <ComboboxItem
                     v-else
-                    :class="b24ui.item({ class: props.b24ui?.item, colorItem: item?.color })"
-                    :disabled="item.disabled"
-                    :value="valueKey && typeof item === 'object' ? get(item, props.valueKey as string) : item"
-                    @select="item.onSelect"
+                    :class="b24ui.item({ class: props.b24ui?.item, colorItem: isSelectItem(item) ? item?.color : undefined })"
+                    :disabled="isSelectItem(item) && item.disabled"
+                    :value="props.valueKey && isSelectItem(item) ? get(item, props.valueKey as string) : item"
+                    @select="isSelectItem(item) && item.onSelect"
                   >
-                    <slot name="item" :item="(item as T)" :index="index">
-                      <slot name="item-leading" :item="(item as T)" :index="index">
+                    <slot name="item" :item="(item as NestedItem<T>)" :index="index">
+                      <slot name="item-leading" :item="(item as NestedItem<T>)" :index="index">
                         <Component
                           :is="item.icon"
-                          v-if="item.icon"
+                          v-if="isSelectItem(item) && item.icon"
                           :class="b24ui.itemLeadingIcon({ class: props.b24ui?.itemLeadingIcon, colorItem: item?.color })"
                         />
-                        <B24Avatar v-else-if="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()) as AvatarProps['size'])" v-bind="item.avatar" :class="b24ui.itemLeadingAvatar({ class: props.b24ui?.itemLeadingAvatar, colorItem: item?.color })" />
                         <B24Chip
-                          v-else-if="item.chip"
+                          v-else-if="isSelectItem(item) && item.chip"
                           :size="((props.b24ui?.itemLeadingChipSize || b24ui.itemLeadingChipSize()) as ChipProps['size'])"
                           inset
                           standalone
@@ -481,18 +520,18 @@ function onUpdateOpen(value: boolean) {
                       </slot>
 
                       <span :class="b24ui.itemLabel({ class: props.b24ui?.itemLabel })">
-                        <slot name="item-label" :item="(item as T)" :index="index">
-                          {{ typeof item === 'object' ? get(item, props.labelKey as string) : item }}
+                        <slot name="item-label" :item="(item as NestedItem<T>)" :index="index">
+                          {{ isSelectItem(item) ? get(item, props.labelKey as string) : item }}
                         </slot>
                       </span>
 
-                      <span :class="b24ui.itemTrailing({ class: props.b24ui?.itemTrailing, colorItem: item?.color })">
-                        <slot name="item-trailing" :item="(item as T)" :index="index" />
+                      <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" />
 
                         <ComboboxItemIndicator as-child>
                           <Component
                             :is="selectedIcon || icons.check"
-                            :class="b24ui.itemTrailingIcon({ class: props.b24ui?.itemTrailingIcon, colorItem: item?.color })"
+                            :class="b24ui.itemTrailingIcon({ class: props.b24ui?.itemTrailingIcon, colorItem: isSelectItem(item) ? item?.color : undefined })"
                           />
                         </ComboboxItemIndicator>
                       </span>

package/dist/runtime/components/Slideover.vue

@@ -83,7 +83,7 @@ export interface SlideoverSlots {
   header(props?: {}): any
   title(props?: {}): any
   description(props?: {}): any
-  close(props: { b24ui: any }): any
+  close(props: { b24ui: ReturnType<typeof slideover> }): any
   body(props?: {}): any
   footer(props?: {}): any
 }

package/dist/runtime/components/Tabs.vue

@@ -24,11 +24,12 @@ export interface TabsItem {
   /** A unique value for the tab item. Defaults to the index. */
   value?: string | number
   disabled?: boolean
+  [key: string]: any
 }
 
 type TabsVariants = VariantProps<typeof tabs>
 
-export interface TabsProps<T> extends Pick<TabsRootProps<string | number>, 'defaultValue' | 'modelValue' | 'activationMode' | 'unmountOnHide'> {
+export interface TabsProps<T extends TabsItem = TabsItem> extends Pick<TabsRootProps<string | number>, 'defaultValue' | 'modelValue' | 'activationMode' | 'unmountOnHide'> {
   /**
    * The element or component this component should render as.
    * @defaultValue 'div'
@@ -68,14 +69,14 @@ export interface TabsProps<T> extends Pick<TabsRootProps<string | number>, 'defa
 
 export interface TabsEmits extends TabsRootEmits<string | number> {}
 
-type SlotProps<T> = (props: { item: T, index: number }) => any
+type SlotProps<T extends TabsItem> = (props: { item: T, index: number }) => any
 
-export type TabsSlots<T extends { slot?: string }> = {
+export type TabsSlots<T extends TabsItem = TabsItem> = {
   leading: SlotProps<T>
   default: SlotProps<T>
   trailing: SlotProps<T>
   content: SlotProps<T>
-} & DynamicSlots<T, SlotProps<T>>
+} & DynamicSlots<T, undefined, { index: number }>
 </script>
 
 <script setup lang="ts" generic="T extends TabsItem">
@@ -130,7 +131,7 @@ const b24ui = computed(() => tabs({
 
     <template v-if="!!content">
       <TabsContent v-for="(item, index) of items" :key="index" :value="item.value || String(index)" :class="b24ui.content({ class: props.b24ui?.content })">
-        <slot :name="item.slot || 'content'" :item="item" :index="index">
+        <slot :name="((item.slot || 'content') as keyof TabsSlots<T>)" :item="(item as Extract<T, { slot: string; }>)" :index="index">
           {{ item.content }}
         </slot>
       </TabsContent>

package/dist/runtime/components/Toast.vue

@@ -66,7 +66,7 @@ export interface ToastSlots {
   title(props?: {}): any
   description(props?: {}): any
   actions(props?: {}): any
-  close(props: { b24ui: any }): any
+  close(props: { b24ui: ReturnType<typeof toast> }): any
 }
 </script>
 

package/dist/runtime/composables/defineShortcuts.js

@@ -21,7 +21,6 @@ export function extractShortcuts(items) {
   traverse(items.flat());
   return shortcuts;
 }
-// @__NO_SIDE_EFFECTS__
 export function defineShortcuts(config, options = {}) {
   const chainedInputs = ref([]);
   const clearChainedInput = () => {

package/dist/runtime/composables/useComponentIcons.d.ts

@@ -22,6 +22,6 @@ export interface UseComponentIconsProps {
 export declare function useComponentIcons(componentProps: MaybeRefOrGetter<UseComponentIconsProps>): {
     isLeading: import("vue").ComputedRef<any>;
     isTrailing: import("vue").ComputedRef<boolean>;
-    leadingIconName: import("vue").ComputedRef<import("vue").FunctionalComponent<import("vue").HTMLAttributes & import("vue").VNodeProps, {}, any, {}> | undefined>;
-    trailingIconName: import("vue").ComputedRef<import("vue").FunctionalComponent<import("vue").HTMLAttributes & import("vue").VNodeProps, {}, any, {}> | undefined>;
+    leadingIconName: import("vue").ComputedRef<IconComponent | undefined>;
+    trailingIconName: import("vue").ComputedRef<IconComponent | undefined>;
 };

package/dist/runtime/types/utils.d.ts

@@ -1,3 +1,4 @@
+import type { AcceptableValue as _AcceptableValue } from 'reka-ui';
 import type { VNode } from 'vue';
 export interface TightMap<O = any> {
     [key: string]: TightMap | O;
@@ -9,19 +10,39 @@ export type DeepPartial<T, O = any> = {
 };
 export type DynamicSlots<T extends {
     slot?: string;
-}, SlotProps, Slot = T['slot']> = Record<string, SlotProps> & (Slot extends string ? Record<Slot, SlotProps> : Record<string, never>);
+}, S extends string | undefined = undefined, D extends object = {}> = {
+    [K in T['slot'] as K extends string ? S extends string ? (K | `${K}-${S}`) : K : never]?: (props: {
+        item: Extract<T, {
+            slot: K extends `${infer Base}-${S}` ? Base : K;
+        }>;
+    } & D) => any;
+};
 export type GetObjectField<MaybeObject, Key extends string> = MaybeObject extends Record<string, any> ? MaybeObject[Key] : never;
 export type PartialString<T> = {
     [K in keyof T]?: string;
 };
-export type MaybeArrayOfArray<T> = T[] | T[][];
-export type MaybeArrayOfArrayItem<I> = I extends Array<infer T> ? T extends Array<infer U> ? U : T : never;
-export type SelectModelValue<T, V, M extends boolean = false, DV = T> = (T extends Record<string, any> ? V extends keyof T ? T[V] : DV : T) extends infer U ? M extends true ? U[] : U : never;
-export type SelectItemKey<T> = T extends Record<string, any> ? keyof T : string;
-export type SelectModelValueEmits<T, V, M extends boolean = false, DV = T> = {
-    'update:modelValue': [payload: SelectModelValue<T, V, M, DV>];
+export type AcceptableValue = Exclude<_AcceptableValue, Record<string, any>>;
+export type ArrayOrNested<T> = T[] | T[][];
+export type NestedItem<T> = T extends Array<infer I> ? NestedItem<I> : T;
+type AllKeys<T> = T extends any ? keyof T : never;
+type NonCommonKeys<T extends object> = Exclude<AllKeys<T>, keyof T>;
+type PickTypeOf<T, K extends string | number | symbol> = K extends AllKeys<T> ? T extends {
+    [k in K]?: any;
+} ? T[K] : undefined : never;
+export type MergeTypes<T extends object> = {
+    [k in keyof T]: PickTypeOf<T, k>;
+} & {
+    [k in NonCommonKeys<T>]?: PickTypeOf<T, k>;
+};
+export type GetItemKeys<I> = keyof Extract<NestedItem<I>, object>;
+export type GetItemValue<I, VK extends GetItemKeys<I> | undefined, T extends NestedItem<I> = NestedItem<I>> = T extends object ? VK extends undefined ? T : VK extends keyof T ? T[VK] : never : T;
+export type GetModelValue<T, VK extends GetItemKeys<T> | undefined, M extends boolean> = M extends true ? GetItemValue<T, VK>[] : GetItemValue<T, VK>;
+export type GetModelValueEmits<T, VK extends GetItemKeys<T> | undefined, M extends boolean> = {
+    /** Event handler called when the value changes. */
+    'update:modelValue': [payload: GetModelValue<T, VK, M>];
 };
 export type StringOrVNode = string | VNode | (() => VNode);
 export type EmitsToProps<T> = {
     [K in keyof T as `on${Capitalize<string & K>}`]: T[K] extends [...args: infer Args] ? (...args: Args) => void : never;
 };
+export {};

package/dist/runtime/utils/index.d.ts

@@ -4,3 +4,4 @@ export declare function get(object: Record<string, any> | undefined, path: (stri
 export declare function set(object: Record<string, any>, path: (string | number)[] | string, value: any): void;
 export declare function looseToNumber(val: any): any;
 export declare function compare<T>(value?: T, currentValue?: T, comparator?: string | ((a: T, b: T) => boolean)): boolean;
+export declare function isArrayOfArray<A>(item: A[] | A[][]): item is A[][];

package/dist/runtime/utils/index.js

@@ -61,3 +61,6 @@ export function compare(value, currentValue, comparator) {
   }
   return isEqual(value, currentValue);
 }
+export function isArrayOfArray(item) {
+  return Array.isArray(item[0]);
+}

package/dist/runtime/utils/link.d.ts

@@ -1,29 +1,6 @@
 import type { LinkProps } from '../types';
 export declare function pickLinkProps(link: LinkProps & {
-    ariaLabel?: string;
-    title?: string;
+    [key: string]: any;
 }): {
-    replace: any;
-    type: any;
-    title: any;
-    active: any;
-    activeClass: any;
-    ariaCurrentValue: any;
-    ariaLabel: any;
-    as: any;
-    disabled: any;
-    exact: any;
-    exactActiveClass: any;
-    exactHash: any;
-    exactQuery: any;
-    external: any;
-    href: any;
-    inactiveClass: any;
-    noPrefetch: any;
-    noRel: any;
-    prefetch: any;
-    prefetchedClass: any;
-    rel: any;
-    target: any;
-    to: any;
+    [x: string]: any;
 };

package/dist/runtime/utils/link.js

@@ -1,4 +1,34 @@
 import { reactivePick } from "@vueuse/core";
 export function pickLinkProps(link) {
-  return reactivePick(link, "active", "activeClass", "ariaCurrentValue", "ariaLabel", "as", "disabled", "exact", "exactActiveClass", "exactHash", "exactQuery", "external", "href", "inactiveClass", "noPrefetch", "noRel", "prefetch", "prefetchedClass", "rel", "replace", "target", "to", "type", "title");
+  const keys = Object.keys(link);
+  const ariaKeys = keys.filter((key) => key.startsWith("aria-"));
+  const dataKeys = keys.filter((key) => key.startsWith("data-"));
+  const propsToInclude = [
+    "active",
+    "activeClass",
+    "ariaCurrentValue",
+    "as",
+    "disabled",
+    "exact",
+    "exactActiveClass",
+    "exactHash",
+    "exactQuery",
+    "external",
+    "href",
+    "inactiveClass",
+    "noPrefetch",
+    "noRel",
+    "prefetch",
+    "prefetchedClass",
+    "rel",
+    "replace",
+    "target",
+    "to",
+    "type",
+    "title",
+    "onClick",
+    ...ariaKeys,
+    ...dataKeys
+  ];
+  return reactivePick(link, ...propsToInclude);
 }

package/dist/runtime/vue/components/Link.vue

@@ -106,6 +106,7 @@ defineOptions({ inheritAttrs: false })
 const props = withDefaults(defineProps<LinkProps>(), {
   as: 'button',
   type: 'button',
+  ariaCurrentValue: 'page',
   active: undefined,
   isAction: false,
   activeClass: '',
@@ -213,6 +214,7 @@ function resolveLinkClass({ route, isActive, isExactActive }: any = {}) {
         <slot
           v-bind="{
             ...$attrs,
+            ...(exact && isExactActive ? { 'aria-current': props.ariaCurrentValue } : {}),
             as,
             type,
             disabled,
@@ -227,6 +229,7 @@ function resolveLinkClass({ route, isActive, isExactActive }: any = {}) {
         v-else
         v-bind="{
           ...$attrs,
+          ...(exact && isExactActive ? { 'aria-current': props.ariaCurrentValue } : {}),
           as,
           type,
           disabled,

package/dist/runtime/vue/stubs.d.ts

@@ -9,10 +9,10 @@ export { useConfetti } from '../composables/useConfetti';
 export { useOverlay } from '../composables/useOverlay';
 export declare const useColorMode: () => {
     forced: boolean;
-    preference?: undefined;
-    readonly value?: undefined;
+    preference?: "dark" | "light" | "system";
+    readonly value?: import("@vueuse/core").BasicColorMode;
 } | {
-    preference: "light" | "dark" | "system";
+    preference: "dark" | "light" | "system";
     readonly value: import("@vueuse/core").BasicColorMode;
     forced: boolean;
 };