@bitrix24/b24ui-nuxt 2.2.1 → 2.4.0

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

@@ -1,18 +1,15 @@
 import type { NavigationMenuRootProps, NavigationMenuContentProps, NavigationMenuContentEmits, AccordionRootProps } from 'reka-ui';
 import type { AppConfig } from '@nuxt/schema';
 import theme from '#build/b24ui/navigation-menu';
-import type { AvatarProps, BadgeProps, IconComponent, LinkProps, PopoverProps, TooltipProps } from '../types';
+import type { AvatarProps, BadgeProps, ChipProps, IconComponent, LinkProps, PopoverProps, TooltipProps } from '../types';
 import type { ArrayOrNested, DynamicSlots, GetItemKeys, MergeTypes, NestedItem, EmitsToProps } from '../types/utils';
 import type { ComponentConfig } from '../types/tv';
 type NavigationMenu = ComponentConfig<typeof theme, AppConfig, 'navigationMenu'>;
 /**
- * @memo not use in NavigationMenuChildItem
- * - description
- * - avatar
- * - b24ui
- * - children - only 1 level
+ * @memo only 1 level
+ * @memo not use in NavigationMenuChildItem: `b24ui` | `description` | `avatar` | `children` | `description`
  */
-export interface NavigationMenuChildItem extends Omit<NavigationMenuItem, 'type' | 'b24ui' | 'avatar' | 'children'> {
+export interface NavigationMenuChildItem extends Omit<NavigationMenuItem, 'type' | 'b24ui' | 'avatar' | 'children' | 'description'> {
     [key: string]: any;
 }
 export interface NavigationMenuItem extends Omit<LinkProps, 'type' | 'raw' | 'custom'> {
@@ -29,16 +26,22 @@ export interface NavigationMenuItem extends Omit<LinkProps, 'type' | 'raw' | 'cu
     avatar?: AvatarProps;
     /**
      * Display a badge on the item.
-     * `{ size: 'xs', color: 'air-primary-alert' }`{lang="ts"}
+     * `{ size: 'xs', color: 'air-primary-alert' }`{lang="ts-type"}
      */
     badge?: string | number | BadgeProps;
+    /**
+     * Display a chip around the icon of the item.
+     * `{ inset: true }`{lang="ts-type"}
+     */
+    chip?: boolean | ChipProps;
     /**
      * Display a hint on the item in `horizontal` orientation.
      */
     hint?: string;
     /**
-     * Display a tooltip on the item when the menu is collapsed with the label of the item.
-     * This has priority over the global `tooltip` prop.
+     * Display a tooltip on the item with the label of the item.
+     * In `vertical` orientation, only works when the menu is `collapsed`.
+     * In `horizontal` orientation, works on any item.
      */
     tooltip?: boolean | TooltipProps;
     /**
@@ -60,7 +63,7 @@ export interface NavigationMenuItem extends Omit<LinkProps, 'type' | 'raw' | 'cu
     slot?: string;
     /**
      * The value of the item. Avoid using `index` as the value to prevent conflicts in horizontal orientation with Reka UI.
-     * @defaultValue `item-${index}`
+     * @defaultValue `item-${index}`, `item-${level}-${index}` for nested children, or `group-${listIndex}-item-${index}` when using grouped items
      */
     value?: string;
     children?: NavigationMenuChildItem[];
@@ -72,19 +75,14 @@ export interface NavigationMenuItem extends Omit<LinkProps, 'type' | 'raw' | 'cu
     open?: boolean;
     onSelect?: (e: Event) => void;
     class?: any;
-    b24ui?: Pick<NavigationMenu['slots'], 'item' | 'linkLeadingAvatarSize' | 'linkLeadingAvatar' | 'linkLeadingIcon' | 'linkLabel' | 'linkLabelExternalIcon' | 'linkTrailing' | 'linkLeadingHint' | 'linkLeadingBadgeSize' | 'linkLeadingBadge' | 'linkTrailingIcon' | 'label' | 'link' | 'content' | 'childList' | 'childLabel' | 'childItem' | 'childLink' | 'childLinkIcon' | 'childLinkHint' | 'childLinkBadgeSize' | 'childLinkBadge' | 'childLinkWrapper' | 'childLinkLabel' | 'childLinkLabelExternalIcon' | 'popoverWrapper'>;
+    b24ui?: Pick<NavigationMenu['slots'], 'item' | 'linkLeadingAvatarSize' | 'linkLeadingAvatar' | 'linkLeadingIcon' | 'linkLeadingChipSize' | 'linkLabel' | 'linkLabelExternalIcon' | 'linkTrailing' | 'linkLeadingHint' | 'linkLeadingBadgeSize' | 'linkLeadingBadge' | 'linkTrailingIcon' | 'label' | 'link' | 'content' | 'childList' | 'childLabel' | 'childItem' | 'childLink' | 'childLinkIcon' | 'childLinkHint' | 'childLinkBadgeSize' | 'childLinkBadge' | 'childLinkWrapper' | 'childLinkLabel' | 'childLinkLabelExternalIcon' | 'popoverWrapper'>;
     [key: string]: any;
 }
 type SingleOrMultipleType = 'single' | 'multiple';
-type Orientation = NavigationMenuRootProps['orientation'];
+type Orientation = NavigationMenu['variants']['orientation'];
 type NavigationMenuModelValue<K extends SingleOrMultipleType = SingleOrMultipleType, O extends Orientation = Orientation> = O extends 'horizontal' ? string : K extends 'single' ? string : K extends 'multiple' ? string[] : string | string[];
 /**
- * @memo remove contentOrientation
- * @memo remove highlight
- * @memo remove highlightColor
- * @memo remove arrow
- * @memo remove color
- * @memo remove variant (link) -> use variant.pill
+ * @memo remove contentOrientation | highlight | highlightColor | arrow | color | variant (link) -> use variant.pill
  */
 export interface NavigationMenuProps<T extends ArrayOrNested<NavigationMenuItem> = ArrayOrNested<NavigationMenuItem>, K extends SingleOrMultipleType = SingleOrMultipleType, O extends Orientation = Orientation> extends Pick<NavigationMenuRootProps, 'delayDuration' | 'disableClickTrigger' | 'disableHoverTrigger' | 'skipDelayDuration' | 'disablePointerLeaveClose' | 'unmountOnHide'>, Pick<AccordionRootProps, 'disabled' | 'collapsible'> {
     /**
@@ -143,7 +141,8 @@ export interface NavigationMenuProps<T extends ArrayOrNested<NavigationMenuItem>
      */
     collapsed?: boolean;
     /**
-     * Display a tooltip on the items when the menu is collapsed with the label of the item.
+     * Display a tooltip on the items with the label of the item.
+     * Only works when `orientation` is `vertical` and `collapsed` is `true`.
      * `{ delayDuration: 0, content: { side: 'right' } }`{lang="ts-type"}
      * @defaultValue false
      */
@@ -158,6 +157,11 @@ export interface NavigationMenuProps<T extends ArrayOrNested<NavigationMenuItem>
      * The content of the menu.
      */
     content?: Omit<NavigationMenuContentProps, 'as' | 'asChild' | 'forceMount'> & Partial<EmitsToProps<NavigationMenuContentEmits>>;
+    /**
+     * The key used to get the value from the item.
+     * @defaultValue 'value'
+     */
+    valueKey?: GetItemKeys<T>;
     /**
      * The key used to get the label from the item.
      * @defaultValue 'label'
@@ -204,8 +208,12 @@ export type NavigationMenuSlots<A extends ArrayOrNested<NavigationMenuItem> = Ar
     active?: boolean;
     b24ui: NavigationMenu['b24ui'];
 }>;
-declare const __VLS_export: <T extends ArrayOrNested<NavigationMenuItem>, K extends SingleOrMultipleType = SingleOrMultipleType, O extends Orientation = Orientation>(__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<NavigationMenuProps<T, K, O> & __VLS_EmitsToProps<__VLS_NormalizeEmits<(evt: "update:modelValue", value: NavigationMenuModelValue<K, O> | undefined) => void>>> & import("vue").PublicProps & (typeof globalThis extends {
+declare const _default: typeof __VLS_export;
+export default _default;
+declare const __VLS_export: <T extends ArrayOrNested<NavigationMenuItem>, K extends SingleOrMultipleType = SingleOrMultipleType, O extends Orientation = Orientation>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_exposed?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
+    props: import("vue").PublicProps & __VLS_PrettifyLocal<NavigationMenuProps<T, K, O> & {
+        "onUpdate:modelValue"?: ((value: NavigationMenuModelValue<K, O> | undefined) => any) | undefined;
+    }> & (typeof globalThis extends {
         __VLS_PROPS_FALLBACK: infer P;
     } ? P : {});
     expose: (exposed: {}) => void;
@@ -215,8 +223,8 @@ declare const __VLS_export: <T extends ArrayOrNested<NavigationMenuItem>, K exte
 }>) => import("vue").VNode & {
     __ctx?: Awaited<typeof __VLS_setup>;
 };
-declare const _default: typeof __VLS_export;
-export default _default;
-type __VLS_PrettifyLocal<T> = {
+type __VLS_PrettifyLocal<T> = (T extends any ? {
+    [K in keyof T]: T[K];
+} : {
     [K in keyof T as K]: T[K];
-} & {};
+}) & {};

package/dist/runtime/components/NavigationMenu.vue

@@ -8,6 +8,7 @@ import { NavigationMenuRoot, NavigationMenuList, NavigationMenuItem, NavigationM
 import { defu } from "defu";
 import { reactivePick, createReusableTemplate } from "@vueuse/core";
 import { useAppConfig } from "#imports";
+import { useComponentUI } from "../composables/useComponentUI";
 import { get, isArrayOfArray } from "../utils";
 import { tv } from "../utils/tv";
 import { pickLinkProps } from "../utils/link";
@@ -16,6 +17,7 @@ import B24LinkBase from "./LinkBase.vue";
 import B24Link from "./Link.vue";
 import B24Avatar from "./Avatar.vue";
 import B24Badge from "./Badge.vue";
+import B24Chip from "./Chip.vue";
 import B24Popover from "./Popover.vue";
 import B24Tooltip from "./Tooltip.vue";
 defineOptions({ inheritAttrs: false });
@@ -32,9 +34,10 @@ const props = defineProps({
   tooltip: { type: [Boolean, Object], required: false },
   popover: { type: [Boolean, Object], required: false },
   content: { type: Object, required: false },
+  valueKey: { type: null, required: false, default: "value" },
   labelKey: { type: null, required: false, default: "label" },
   class: { type: null, required: false },
-  b24ui: { type: null, required: false },
+  b24ui: { type: Object, required: false },
   delayDuration: { type: Number, required: false, default: 0 },
   disableClickTrigger: { type: Boolean, required: false },
   disableHoverTrigger: { type: Boolean, required: false },
@@ -47,6 +50,7 @@ const props = defineProps({
 const emits = defineEmits(["update:modelValue"]);
 const slots = defineSlots();
 const appConfig = useAppConfig();
+const uiProp = useComponentUI("navigationMenu", props);
 const rootProps = useForwardPropsEmits(computed(() => ({
   as: props.as,
   delayDuration: props.delayDuration,
@@ -59,14 +63,15 @@ const rootProps = useForwardPropsEmits(computed(() => ({
 })), emits);
 const accordionProps = useForwardPropsEmits(reactivePick(props, "collapsible", "disabled", "type", "unmountOnHide"), emits);
 const contentProps = toRef(() => props.content);
-const tooltipProps = toRef(() => defu(typeof props.tooltip === "boolean" ? {} : props.tooltip, { delayDuration: 0, content: { side: "right" } }));
+const tooltipProps = toRef(() => defu(typeof props.tooltip === "boolean" ? {} : props.tooltip, { ...props.orientation === "vertical" && { delayDuration: 0, content: { side: "right" } } }));
 const popoverProps = toRef(() => defu(typeof props.popover === "boolean" ? {} : props.popover, { arrow: true, mode: "hover", content: { side: "right", align: "center", alignOffset: 2 } }));
 const [DefineLinkTemplate, ReuseLinkTemplate] = createReusableTemplate();
 const [DefineItemTemplate, ReuseItemTemplate] = createReusableTemplate({
   props: {
     item: Object,
     index: Number,
-    level: Number
+    level: Number,
+    listIndex: Number
   }
 });
 const b24ui = computed(() => tv({ extend: tv(theme), ...appConfig.b24ui?.navigationMenu || {} })({
@@ -76,21 +81,36 @@ const b24ui = computed(() => tv({ extend: tv(theme), ...appConfig.b24ui?.navigat
 const lists = computed(
   () => props.items?.length ? isArrayOfArray(props.items) ? props.items : [props.items] : []
 );
-function getAccordionDefaultValue(list, level = 0) {
+function getItemValue(item, index, level, listIndex) {
+  const prefix = lists.value.length > 1 ? `group-${listIndex}-` : "";
+  return get(item, props.valueKey) ?? (level > 0 ? `${prefix}item-${level}-${index}` : `${prefix}item-${index}`);
+}
+function getAccordionDefaultValue(list, level = 0, listIndex = 0) {
   const indexes = list.reduce((acc, item, index) => {
     if (item.defaultOpen || item.open) {
-      acc.push(item.value || (level > 0 ? `item-${level}-${index}` : `item-${index}`));
+      acc.push(getItemValue(item, index, level, listIndex));
     }
     return acc;
   }, []);
   return props.type === "single" ? indexes[0] : indexes;
 }
+function onLinkTrailingClick(e, item) {
+  if (!item.children?.length) {
+    return;
+  }
+  if (props.orientation === "horizontal") {
+    e.preventDefault();
+  } else if (props.orientation === "vertical" && !props.collapsed) {
+    e.preventDefault();
+    e.stopPropagation();
+  }
+}
 </script>
 
 <template>
   <DefineLinkTemplate v-slot="{ item, active, index }">
     <slot :name="item.slot || 'item'" :item="item" :index="index" :active="active" :b24ui="b24ui">
-      <span data-slot="linkLabelWrapper" :class="b24ui.linkLabelWrapper({ class: props.b24ui?.linkLabelWrapper, active })">
+      <span data-slot="linkLabelWrapper" :class="b24ui.linkLabelWrapper({ class: uiProp?.linkLabelWrapper, active })">
         <slot
           :name="item.slot ? `${item.slot}-leading` : 'item-leading'"
           :item="item"
@@ -99,41 +119,54 @@ function getAccordionDefaultValue(list, level = 0) {
           :b24ui="b24ui"
         >
           <template v-if="orientation === 'vertical' && item.type !== 'label'">
+            <B24Chip
+              v-if="item.icon && item.chip"
+              :size="item.b24ui?.linkLeadingChipSize || uiProp?.linkLeadingChipSize || b24ui.linkLeadingChipSize()"
+              inset
+              v-bind="typeof item.chip === 'object' ? item.chip : {}"
+              data-slot="linkLeadingChip"
+            >
+              <Component
+                :is="item.icon"
+                data-slot="linkLeadingIcon"
+                :class="b24ui.linkLeadingIcon({ class: [uiProp?.linkLeadingIcon, item.b24ui?.linkLeadingIcon], active, disabled: !!item.disabled })"
+              />
+            </B24Chip>
             <Component
               :is="item.icon"
-              v-if="item.icon"
+              v-else-if="item.icon"
               data-slot="linkLeadingIcon"
-              :class="b24ui.linkLeadingIcon({ class: [props.b24ui?.linkLeadingIcon, item.b24ui?.linkLeadingIcon], active, disabled: !!item.disabled })"
+              :class="b24ui.linkLeadingIcon({ class: [uiProp?.linkLeadingIcon, item.b24ui?.linkLeadingIcon], active, disabled: !!item.disabled })"
             />
             <B24Avatar
               v-else-if="item.avatar"
-              :size="item.b24ui?.linkLeadingAvatarSize || props.b24ui?.linkLeadingAvatarSize || b24ui.linkLeadingAvatarSize()"
+              :size="item.b24ui?.linkLeadingAvatarSize || uiProp?.linkLeadingAvatarSize || b24ui.linkLeadingAvatarSize()"
               v-bind="item.avatar"
               data-slot="linkLeadingAvatar"
-              :class="b24ui.linkLeadingAvatar({ class: [props.b24ui?.linkLeadingAvatar, item.b24ui?.linkLeadingAvatar], active, disabled: !!item.disabled })"
+              :class="b24ui.linkLeadingAvatar({ class: [uiProp?.linkLeadingAvatar, item.b24ui?.linkLeadingAvatar], active, disabled: !!item.disabled })"
             />
           </template>
           <div
             v-if="item.hint && item.type !== 'label' && orientation === 'horizontal'"
             data-slot="linkLeadingHint"
-            :class="b24ui.linkLeadingHint({ class: [props.b24ui?.linkLeadingHint, item.b24ui?.linkLeadingHint] })"
+            :class="b24ui.linkLeadingHint({ class: [uiProp?.linkLeadingHint, item.b24ui?.linkLeadingHint] })"
           >
             {{ item.hint }}
           </div>
           <B24Badge
             v-if="(item.badge || item.badge === 0) && item.type !== 'label'"
             color="air-primary-alert"
-            :size="item.b24ui?.linkLeadingBadgeSize || props.b24ui?.linkLeadingBadgeSize || b24ui.linkLeadingBadgeSize()"
+            :size="item.b24ui?.linkLeadingBadgeSize || uiProp?.linkLeadingBadgeSize || b24ui.linkLeadingBadgeSize()"
             v-bind="typeof item.badge === 'string' || typeof item.badge === 'number' ? { label: item.badge } : item.badge"
             data-slot="linkLeadingBadge"
-            :class="b24ui.linkLeadingBadge({ class: [props.b24ui?.linkLeadingBadge, item.b24ui?.linkLeadingBadge] })"
+            :class="b24ui.linkLeadingBadge({ class: [uiProp?.linkLeadingBadge, item.b24ui?.linkLeadingBadge] })"
           />
         </slot>
 
         <span
           v-if="get(item, props.labelKey) || !!slots[item.slot ? `${item.slot}-label` : 'item-label']"
           data-slot="linkLabel"
-          :class="b24ui.linkLabel({ class: [props.b24ui?.linkLabel, item.b24ui?.linkLabel], active })"
+          :class="b24ui.linkLabel({ class: [uiProp?.linkLabel, item.b24ui?.linkLabel], active })"
         >
           <slot :name="item.slot ? `${item.slot}-label` : 'item-label'" :item="item" :active="active" :index="index">
             {{ get(item, props.labelKey) }}
@@ -143,7 +176,7 @@ function getAccordionDefaultValue(list, level = 0) {
           :is="typeof externalIcon !== 'boolean' ? externalIcon : icons.external"
           v-if="item.target === '_blank' && externalIcon !== false"
           data-slot="linkLabelExternalIcon"
-          :class="b24ui.linkLabelExternalIcon({ class: [props.b24ui?.linkLabelExternalIcon, item.b24ui?.linkLabelExternalIcon], active })"
+          :class="b24ui.linkLabelExternalIcon({ class: [uiProp?.linkLabelExternalIcon, item.b24ui?.linkLabelExternalIcon], active })"
         />
       </span>
 
@@ -153,10 +186,10 @@ function getAccordionDefaultValue(list, level = 0) {
   /* (item.badge || item.badge === 0) || */
   orientation === 'horizontal' && (item.children?.length || !!slots[item.slot ? `${item.slot}-content` : 'item-content']) || orientation === 'vertical' && item.children?.length || item.trailingIcon || !!slots[item.slot ? `${item.slot}-trailing` : 'item-trailing']
 "
-        as="span"
+        :as="orientation === 'vertical' && item.children?.length && !collapsed ? 'span' : void 0"
         data-slot="linkTrailing"
-        :class="b24ui.linkTrailing({ class: [props.b24ui?.linkTrailing, item.b24ui?.linkTrailing] })"
-        @click.stop.prevent
+        :class="b24ui.linkTrailing({ class: [uiProp?.linkTrailing, item.b24ui?.linkTrailing] })"
+        @click="(e) => onLinkTrailingClick(e, item)"
       >
         <slot
           :name="item.slot ? `${item.slot}-trailing` : 'item-trailing'"
@@ -169,29 +202,29 @@ function getAccordionDefaultValue(list, level = 0) {
             :is="item.trailingIcon || trailingIcon || icons.chevronDown"
             v-if="orientation === 'horizontal' && (item.children?.length || !!slots[item.slot ? `${item.slot}-content` : 'item-content']) || orientation === 'vertical' && item.children?.length"
             data-slot="linkTrailingIcon"
-            :class="b24ui.linkTrailingIcon({ class: [props.b24ui?.linkTrailingIcon, item.b24ui?.linkTrailingIcon], active })"
+            :class="b24ui.linkTrailingIcon({ class: [uiProp?.linkTrailingIcon, item.b24ui?.linkTrailingIcon], active })"
           />
           <Component
             :is="item.trailingIcon"
             v-else-if="item.trailingIcon"
             data-slot="linkTrailingIcon"
-            :class="b24ui.linkTrailingIcon({ class: [props.b24ui?.linkTrailingIcon, item.b24ui?.linkTrailingIcon], active })"
+            :class="b24ui.linkTrailingIcon({ class: [uiProp?.linkTrailingIcon, item.b24ui?.linkTrailingIcon], active })"
           />
         </slot>
       </component>
     </slot>
   </DefineLinkTemplate>
 
-  <DefineItemTemplate v-slot="{ item, index, level = 0 }">
+  <DefineItemTemplate v-slot="{ item, index, level = 0, listIndex = 0 }">
     <component
       :is="orientation === 'vertical' && !collapsed ? AccordionItem : NavigationMenuItem"
       as="li"
-      :value="item.value || (level > 0 ? `item-${level}-${index}` : `item-${index}`)"
+      :value="getItemValue(item, index, level, listIndex)"
     >
       <div
         v-if="orientation === 'vertical' && item.type === 'label' && !collapsed"
         data-slot="label"
-        :class="b24ui.label({ class: [props.b24ui?.label, item.b24ui?.label, item.class] })"
+        :class="b24ui.label({ class: [uiProp?.label, item.b24ui?.label, item.class] })"
       >
         <ReuseLinkTemplate :item="item" :index="index" />
       </div>
@@ -211,13 +244,13 @@ function getAccordionDefaultValue(list, level = 0) {
           <B24Popover
             v-if="orientation === 'vertical' && collapsed && item.children?.length && (!!props.popover || !!item.popover)"
             v-bind="{ ...popoverProps, ...typeof item.popover === 'boolean' ? {} : item.popover || {} }"
-            :b24ui="{ content: b24ui.content({ class: [props.b24ui?.content, item.b24ui?.content] }) }"
+            :b24ui="{ content: b24ui.content({ class: [uiProp?.content, item.b24ui?.content] }) }"
           >
             <B24LinkBase
               v-bind="slotProps"
               data-slot="link"
               :class="b24ui.link({
-  class: [props.b24ui?.link, item.b24ui?.link, item.class],
+  class: [uiProp?.link, item.b24ui?.link, item.class],
   active: active || item.active,
   disabled: !!item.disabled,
   level: level > 0
@@ -227,7 +260,7 @@ function getAccordionDefaultValue(list, level = 0) {
             </B24LinkBase>
 
             <template #content="{ close }">
-              <div data-slot="popoverWrapper" :class="b24ui.popoverWrapper({ class: props.b24ui?.popoverWrapper })">
+              <div data-slot="popoverWrapper" :class="b24ui.popoverWrapper({ class: uiProp?.popoverWrapper })">
                 <slot
                   :name="item.slot ? `${item.slot}-content` : 'item-content'"
                   :item="item"
@@ -236,45 +269,58 @@ function getAccordionDefaultValue(list, level = 0) {
                   :b24ui="b24ui"
                   :close="close"
                 >
-                  <ul data-slot="childList" :class="b24ui.childList({ class: [props.b24ui?.childList, item.b24ui?.childList] })">
-                    <li data-slot="childLabel" :class="b24ui.childLabel({ class: [props.b24ui?.childLabel, item.b24ui?.childLabel] })">
+                  <ul data-slot="childList" :class="b24ui.childList({ class: [uiProp?.childList, item.b24ui?.childList] })">
+                    <li data-slot="childLabel" :class="b24ui.childLabel({ class: [uiProp?.childLabel, item.b24ui?.childLabel] })">
                       {{ get(item, props.labelKey) }}
                     </li>
                     <li
                       v-for="(childItem, childIndex) in item.children"
                       :key="childIndex"
                       data-slot="childItem"
-                      :class="b24ui.childItem({ class: [props.b24ui?.childItem, item.b24ui?.childItem] })"
+                      :class="b24ui.childItem({ class: [uiProp?.childItem, item.b24ui?.childItem] })"
                     >
                       <B24Link v-slot="{ active: childActive, ...childSlotProps }" v-bind="pickLinkProps(childItem)" custom>
                         <NavigationMenuLink as-child :active="childActive" @select="childItem.onSelect">
                           <B24LinkBase
                             v-bind="childSlotProps"
                             data-slot="childLink"
-                            :class="b24ui.childLink({ class: [props.b24ui?.childLink, item.b24ui?.childLink, childItem.class], active: childActive })"
+                            :class="b24ui.childLink({ class: [uiProp?.childLink, item.b24ui?.childLink, childItem.class], active: childActive })"
                           >
+                            <B24Chip
+                              v-if="childItem.icon && childItem.chip"
+                              :size="childItem.b24ui?.linkLeadingChipSize || uiProp?.linkLeadingChipSize || b24ui.linkLeadingChipSize()"
+                              inset
+                              v-bind="typeof childItem.chip === 'object' ? childItem.chip : {}"
+                              data-slot="linkLeadingChip"
+                            >
+                              <Component
+                                :is="childItem.icon"
+                                data-slot="childLinkIcon"
+                                :class="b24ui.childLinkIcon({ class: [uiProp?.childLinkIcon, item.b24ui?.childLinkIcon], active: childActive })"
+                              />
+                            </B24Chip>
                             <Component
                               :is="childItem.icon"
-                              v-if="childItem.icon"
+                              v-else-if="childItem.icon"
                               data-slot="childLinkIcon"
-                              :class="b24ui.childLinkIcon({ class: [props.b24ui?.childLinkIcon, item.b24ui?.childLinkIcon], active: childActive })"
+                              :class="b24ui.childLinkIcon({ class: [uiProp?.childLinkIcon, item.b24ui?.childLinkIcon], active: childActive })"
                             />
                             <div
                               v-if="childItem.hint"
                               data-slot="childLinkHint"
-                              :class="b24ui.childLinkHint({ class: [props.b24ui?.childLinkHint, item.b24ui?.childLinkHint] })"
+                              :class="b24ui.childLinkHint({ class: [uiProp?.childLinkHint, item.b24ui?.childLinkHint] })"
                             >
                               {{ childItem.hint }}
                             </div>
 
-                            <span data-slot="childLinkLabel" :class="b24ui.childLinkLabel({ class: [props.b24ui?.childLinkLabel, item.b24ui?.childLinkLabel], active: childActive })">
+                            <span data-slot="childLinkLabel" :class="b24ui.childLinkLabel({ class: [uiProp?.childLinkLabel, item.b24ui?.childLinkLabel], active: childActive })">
                               {{ get(childItem, props.labelKey) }}
                             </span>
                             <Component
                               :is="typeof externalIcon === 'boolean' ? icons.external : externalIcon"
                               v-if="childItem.target === '_blank' && externalIcon !== false"
                               data-slot="childLinkLabelExternalIcon"
-                              :class="b24ui.childLinkLabelExternalIcon({ class: [props.b24ui?.childLinkLabelExternalIcon, item.b24ui?.childLinkLabelExternalIcon], active: childActive })"
+                              :class="b24ui.childLinkLabelExternalIcon({ class: [uiProp?.childLinkLabelExternalIcon, item.b24ui?.childLinkLabelExternalIcon], active: childActive })"
                             />
                           </B24LinkBase>
                         </NavigationMenuLink>
@@ -286,7 +332,7 @@ function getAccordionDefaultValue(list, level = 0) {
             </template>
           </B24Popover>
           <B24Tooltip
-            v-else-if="orientation === 'vertical' && collapsed && (!!props.tooltip || !!item.tooltip)"
+            v-else-if="orientation === 'vertical' && collapsed && (!!props.tooltip || !!item.tooltip) || orientation === 'horizontal' && !!item.tooltip"
             :text="get(item, props.labelKey)"
             v-bind="{ ...tooltipProps, ...typeof item.tooltip === 'boolean' ? {} : item.tooltip || {} }"
           >
@@ -294,7 +340,7 @@ function getAccordionDefaultValue(list, level = 0) {
               v-bind="slotProps"
               data-slot="link"
               :class="b24ui.link({
-  class: [props.b24ui?.link, item.b24ui?.link, item.class],
+  class: [uiProp?.link, item.b24ui?.link, item.class],
   active: active || item.active,
   disabled: !!item.disabled,
   level: level > 0
@@ -308,7 +354,7 @@ function getAccordionDefaultValue(list, level = 0) {
             v-bind="slotProps"
             data-slot="link"
             :class="b24ui.link({
-  class: [props.b24ui?.link, item.b24ui?.link, item.class],
+  class: [uiProp?.link, item.b24ui?.link, item.class],
   active: active || item.active,
   disabled: !!item.disabled,
   level: orientation === 'horizontal' || level > 0
@@ -323,7 +369,7 @@ function getAccordionDefaultValue(list, level = 0) {
           v-bind="contentProps"
           :data-viewport="item.viewportRtl ? 'rtl' : 'ltr'"
           data-slot="content"
-          :class="b24ui.content({ class: [props.b24ui?.content, item.b24ui?.content] })"
+          :class="b24ui.content({ class: [uiProp?.content, item.b24ui?.content] })"
         >
           <slot
             :name="item.slot ? `${item.slot}-content` : 'item-content'"
@@ -332,12 +378,12 @@ function getAccordionDefaultValue(list, level = 0) {
             :index="index"
             :b24ui="b24ui"
           >
-            <ul data-slot="childList" :class="b24ui.childList({ class: [props.b24ui?.childList, item.b24ui?.childList] })">
+            <ul data-slot="childList" :class="b24ui.childList({ class: [uiProp?.childList, item.b24ui?.childList] })">
               <li
                 v-for="(childItem, childIndex) in item.children"
                 :key="childIndex"
                 data-slot="childItem"
-                :class="b24ui.childItem({ class: [props.b24ui?.childItem, item.b24ui?.childItem] })"
+                :class="b24ui.childItem({ class: [uiProp?.childItem, item.b24ui?.childItem] })"
               >
                 <B24Link
                   v-slot="{ active: childActive, ...childSlotProps }"
@@ -348,40 +394,53 @@ function getAccordionDefaultValue(list, level = 0) {
                     <B24LinkBase
                       v-bind="childSlotProps"
                       data-slot="childLink"
-                      :class="b24ui.childLink({ class: [props.b24ui?.childLink, childItem.childLink, childItem.class], active: childActive })"
+                      :class="b24ui.childLink({ class: [uiProp?.childLink, childItem.childLink, childItem.class], active: childActive })"
                     >
+                      <B24Chip
+                        v-if="childItem.icon && childItem.chip"
+                        :size="childItem.b24ui?.linkLeadingChipSize || uiProp?.linkLeadingChipSize || b24ui.linkLeadingChipSize()"
+                        inset
+                        v-bind="typeof childItem.chip === 'object' ? childItem.chip : {}"
+                        data-slot="linkLeadingChip"
+                      >
+                        <Component
+                          :is="childItem.icon"
+                          data-slot="childLinkIcon"
+                          :class="b24ui.childLinkIcon({ class: [uiProp?.childLinkIcon, item.b24ui?.childLinkIcon], active: childActive })"
+                        />
+                      </B24Chip>
                       <Component
                         :is="childItem.icon"
-                        v-if="childItem.icon"
+                        v-else-if="childItem.icon"
                         data-slot="childLinkIcon"
-                        :class="b24ui.childLinkIcon({ class: [props.b24ui?.childLinkIcon, item.b24ui?.childLinkIcon], active: childActive })"
+                        :class="b24ui.childLinkIcon({ class: [uiProp?.childLinkIcon, item.b24ui?.childLinkIcon], active: childActive })"
                       />
 
                       <div
                         v-if="childItem.hint"
                         data-slot="childLinkHint"
-                        :class="b24ui.childLinkHint({ class: [props.b24ui?.childLinkHint, item.b24ui?.childLinkHint] })"
+                        :class="b24ui.childLinkHint({ class: [uiProp?.childLinkHint, item.b24ui?.childLinkHint] })"
                       >
                         {{ childItem.hint }}
                       </div>
-                      <div data-slot="childLinkWrapper" :class="b24ui.childLinkWrapper({ class: [props.b24ui?.childLinkWrapper, item.b24ui?.childLinkWrapper] })">
-                        <p data-slot="childLinkLabel" :class="b24ui.childLinkLabel({ class: [props.b24ui?.childLinkLabel, item.b24ui?.childLinkLabel], active: childActive })">
+                      <div data-slot="childLinkWrapper" :class="b24ui.childLinkWrapper({ class: [uiProp?.childLinkWrapper, item.b24ui?.childLinkWrapper] })">
+                        <p data-slot="childLinkLabel" :class="b24ui.childLinkLabel({ class: [uiProp?.childLinkLabel, item.b24ui?.childLinkLabel], active: childActive })">
                           {{ get(childItem, props.labelKey) }}
                         </p>
                         <B24Badge
                           v-if="childItem.badge !== void 0"
                           color="air-primary-alert"
-                          :size="item.b24ui?.childLinkBadgeSize || props.b24ui?.childLinkBadgeSize || b24ui.childLinkBadgeSize()"
+                          :size="item.b24ui?.childLinkBadgeSize || uiProp?.childLinkBadgeSize || b24ui.childLinkBadgeSize()"
                           v-bind="typeof childItem.badge === 'string' || typeof childItem.badge === 'number' ? { label: childItem.badge } : childItem.badge"
                           data-slot="childLinkBadge"
-                          :class="b24ui.childLinkBadge({ class: [props.b24ui?.childLinkBadge, item.b24ui?.childLinkBadge] })"
+                          :class="b24ui.childLinkBadge({ class: [uiProp?.childLinkBadge, item.b24ui?.childLinkBadge] })"
                         />
                       </div>
                       <Component
                         :is="typeof externalIcon === 'boolean' ? icons.external : externalIcon"
                         v-if="childItem.target === '_blank' && externalIcon !== false"
                         data-slot="childLinkLabelExternalIcon"
-                        :class="b24ui.childLinkLabelExternalIcon({ class: [props.b24ui?.childLinkLabelExternalIcon, item.b24ui?.childLinkLabelExternalIcon], active: childActive })"
+                        :class="b24ui.childLinkLabelExternalIcon({ class: [uiProp?.childLinkLabelExternalIcon, item.b24ui?.childLinkLabelExternalIcon], active: childActive })"
                       />
                     </B24LinkBase>
                   </NavigationMenuLink>
@@ -395,16 +454,16 @@ function getAccordionDefaultValue(list, level = 0) {
       <AccordionContent
         v-if="orientation === 'vertical' && item.children?.length && !collapsed"
         data-slot="content"
-        :class="b24ui.content({ class: [props.b24ui?.content, item.b24ui?.content] })"
+        :class="b24ui.content({ class: [uiProp?.content, item.b24ui?.content] })"
       >
         <AccordionRoot
           v-bind="{
   ...accordionProps,
-  defaultValue: getAccordionDefaultValue(item.children, level + 1)
+  defaultValue: getAccordionDefaultValue(item.children, level + 1, listIndex)
 }"
           as="ul"
           data-slot="childList"
-          :class="b24ui.childList({ class: props.b24ui?.childList })"
+          :class="b24ui.childList({ class: uiProp?.childList })"
         >
           <ReuseItemTemplate
             v-for="(childItem, childIndex) in item.children"
@@ -412,8 +471,9 @@ function getAccordionDefaultValue(list, level = 0) {
             :item="childItem"
             :index="childIndex"
             :level="level + 1"
+            :list-index="listIndex"
             data-slot="childItem"
-            :class="b24ui.childItem({ class: [props.b24ui?.childItem, childItem.b24ui?.childItem] })"
+            :class="b24ui.childItem({ class: [uiProp?.childItem, childItem.b24ui?.childItem] })"
           />
         </AccordionRoot>
       </AccordionContent>
@@ -432,7 +492,7 @@ function getAccordionDefaultValue(list, level = 0) {
     :data-collapsed="collapsed"
     data-component="section"
     data-slot="root"
-    :class="b24ui.root({ class: [props.b24ui?.root, props.class] })"
+    :class="b24ui.root({ class: [uiProp?.root, props.class] })"
   >
     <slot name="list-leading" />
 
@@ -441,30 +501,31 @@ function getAccordionDefaultValue(list, level = 0) {
         v-bind="orientation === 'vertical' && !collapsed ? {
   ...accordionProps,
   modelValue,
-  defaultValue: defaultValue ?? getAccordionDefaultValue(list)
+  defaultValue: defaultValue ?? getAccordionDefaultValue(list, 0, listIndex)
 } : {}"
         :is="orientation === 'vertical' ? AccordionRoot : NavigationMenuList"
         as="ul"
         data-slot="list"
-        :class="b24ui.list({ class: props.b24ui?.list })"
+        :class="b24ui.list({ class: uiProp?.list })"
       >
         <ReuseItemTemplate
           v-for="(item, index) in list"
           :key="`list-${listIndex}-${index}`"
           :item="item"
           :index="index"
+          :list-index="listIndex"
           data-slot="item"
-          :class="b24ui.item({ class: [props.b24ui?.item, item.b24ui?.item] })"
+          :class="b24ui.item({ class: [uiProp?.item, item.b24ui?.item] })"
         />
       </component>
 
-      <div v-if="orientation === 'vertical' && listIndex < lists.length - 1" data-slot="separator" :class="b24ui.separator({ class: props.b24ui?.separator })" />
+      <div v-if="orientation === 'vertical' && listIndex < lists.length - 1" data-slot="separator" :class="b24ui.separator({ class: uiProp?.separator })" />
     </template>
 
     <slot name="list-trailing" />
 
-    <div v-if="orientation === 'horizontal'" data-slot="viewportWrapper" :class="b24ui.viewportWrapper({ class: props.b24ui?.viewportWrapper })">
-      <NavigationMenuViewport data-slot="viewport" :class="b24ui.viewport({ class: props.b24ui?.viewport })" />
+    <div v-if="orientation === 'horizontal'" data-slot="viewportWrapper" :class="b24ui.viewportWrapper({ class: uiProp?.viewportWrapper })">
+      <NavigationMenuViewport data-slot="viewport" :class="b24ui.viewport({ class: uiProp?.viewport })" />
     </div>
   </NavigationMenuRoot>
 </template>