@bitrix24/b24ui-nuxt 0.6.7 → 0.7.0

package/dist/runtime/components/Link.vue

@@ -5,11 +5,12 @@ import theme from "#build/b24ui/link";
 <script setup>
 import { computed } from "vue";
 import { defu } from "defu";
-import { isEqual, diff } from "ohash/utils";
+import { isEqual } from "ohash/utils";
 import { useForwardProps } from "reka-ui";
 import { reactiveOmit } from "@vueuse/core";
 import { useRoute, useAppConfig } from "#imports";
 import { tv } from "../utils/tv";
+import { isPartiallyEqual } from "../utils/link";
 import B24LinkBase from "./LinkBase.vue";
 defineOptions({ inheritAttrs: false });
 const props = defineProps({
@@ -44,7 +45,7 @@ const props = defineProps({
 defineSlots();
 const route = useRoute();
 const appConfig = useAppConfig();
-const nuxtLinkProps = useForwardProps(reactiveOmit(props, "as", "type", "disabled", "active", "exact", "exactQuery", "exactHash", "activeClass", "inactiveClass", "raw", "class"));
+const nuxtLinkProps = useForwardProps(reactiveOmit(props, "as", "type", "disabled", "active", "exact", "exactQuery", "exactHash", "activeClass", "inactiveClass", "to", "href", "raw", "custom", "class"));
 const b24ui = computed(() => tv({
   extend: tv(theme),
   ...defu({
@@ -56,17 +57,7 @@ const b24ui = computed(() => tv({
     }
   }, appConfig.b24ui?.link || {})
 }));
-function isPartiallyEqual(item1, item2) {
-  const diffedKeys = diff(item1, item2).reduce((filtered, q) => {
-    if (q.type === "added") {
-      filtered.add(q.key);
-    }
-    return filtered;
-  }, /* @__PURE__ */ new Set());
-  const item1Filtered = Object.fromEntries(Object.entries(item1).filter(([key]) => !diffedKeys.has(key)));
-  const item2Filtered = Object.fromEntries(Object.entries(item2).filter(([key]) => !diffedKeys.has(key)));
-  return isEqual(item1Filtered, item2Filtered);
-}
+const to = computed(() => props.to ?? props.href);
 function isLinkActive({ route: linkRoute, isActive, isExactActive }) {
   if (props.active !== void 0) {
     return props.active;
@@ -105,6 +96,7 @@ function resolveLinkClass({ route: route2, isActive, isExactActive }) {
   <NuxtLink
     v-slot="{ href, navigate, route: linkRoute, rel, target, isExternal, isActive, isExactActive }"
     v-bind="nuxtLinkProps"
+    :to="to"
     custom
   >
     <template v-if="custom">

package/dist/runtime/components/Modal.vue

@@ -31,7 +31,7 @@ const props = defineProps({
   defaultOpen: { type: Boolean, required: false },
   modal: { type: Boolean, required: false, default: true }
 });
-const emits = defineEmits(["after:leave", "close:prevent", "update:open"]);
+const emits = defineEmits(["after:leave", "after:enter", "close:prevent", "update:open"]);
 const slots = defineSlots();
 const { t } = useLocale();
 const appConfig = useAppConfig();
@@ -43,14 +43,14 @@ const contentEvents = computed(() => {
     closeAutoFocus: (e) => e.preventDefault()
   };
   if (!props.dismissible) {
-    const events = ["pointerDownOutside", "interactOutside", "escapeKeyDown", "closeAutoFocus"];
+    const events = ["pointerDownOutside", "interactOutside", "escapeKeyDown"];
     return events.reduce((acc, curr) => {
       acc[curr] = (e) => {
         e.preventDefault();
         emits("close:prevent");
       };
       return acc;
-    }, {});
+    }, defaultEvents);
   }
   return defaultEvents;
 });
@@ -62,7 +62,7 @@ const b24ui = computed(() => tv({ extend: tv(theme), ...appConfig.b24ui?.modal |
 </script>
 
 <template>
-  <DialogRoot v-slot="{ open }" v-bind="rootProps">
+  <DialogRoot v-slot="{ open, close }" v-bind="rootProps">
     <DialogTrigger v-if="!!slots.default" as-child :class="props.class">
       <slot :open="open" />
     </DialogTrigger>
@@ -70,7 +70,13 @@ const b24ui = computed(() => tv({ extend: tv(theme), ...appConfig.b24ui?.modal |
     <DialogPortal v-bind="portalProps">
       <DialogOverlay v-if="overlay" :class="b24ui.overlay({ class: props.b24ui?.overlay })" />
 
-      <DialogContent :class="b24ui.content({ class: [!slots.default && props.class, props.b24ui?.content] })" v-bind="contentProps" @after-leave="emits('after:leave')" v-on="contentEvents">
+      <DialogContent
+        :class="b24ui.content({ class: [!slots.default && props.b24ui?.content, props.class] })"
+        v-bind="contentProps"
+        @after-enter="emits('after:enter')"
+        @after-leave="emits('after:leave')"
+        v-on="contentEvents"
+      >
         <VisuallyHidden v-if="!!slots.content && (title || !!slots.title || (description || !!slots.description))">
           <DialogTitle v-if="title || !!slots.title">
             <slot name="title">
@@ -85,9 +91,9 @@ const b24ui = computed(() => tv({ extend: tv(theme), ...appConfig.b24ui?.modal |
           </DialogDescription>
         </VisuallyHidden>
 
-        <slot name="content">
-          <div v-if="!!slots.header || (title || !!slots.title) || (description || !!slots.description) || (close || !!slots.close)" :class="b24ui.header({ class: props.b24ui?.header })">
-            <slot name="header">
+        <slot name="content" :close="close">
+          <div v-if="!!slots.header || (title || !!slots.title) || (description || !!slots.description) || (props.close || !!slots.close)" :class="b24ui.header({ class: props.b24ui?.header })">
+            <slot name="header" :close="close">
               <div :class="b24ui.wrapper({ class: props.b24ui?.wrapper })">
                 <DialogTitle v-if="title || !!slots.title" :class="b24ui.title({ class: props.b24ui?.title })">
                   <slot name="title">
@@ -102,15 +108,17 @@ const b24ui = computed(() => tv({ extend: tv(theme), ...appConfig.b24ui?.modal |
                 </DialogDescription>
               </div>
 
-              <DialogClose v-if="close || !!slots.close" as-child>
-                <slot name="close" :b24ui="b24ui">
+              <slot name="actions" />
+
+              <DialogClose v-if="props.close || !!slots.close" as-child>
+                <slot name="close" :close="close" :b24ui="b24ui">
                   <B24Button
-                    v-if="close"
+                    v-if="props.close"
                     :icon="closeIcon || icons.close"
                     size="xs"
                     color="link"
                     :aria-label="t('modal.close')"
-                    v-bind="typeof close === 'object' ? close : {}"
+                    v-bind="typeof props.close === 'object' ? props.close : {}"
                     :class="b24ui.close({ class: props.b24ui?.close })"
                   />
                 </slot>
@@ -119,11 +127,11 @@ const b24ui = computed(() => tv({ extend: tv(theme), ...appConfig.b24ui?.modal |
           </div>
 
           <div v-if="!!slots.body" :class="b24ui.body({ class: props.b24ui?.body, scrollbarThin: Boolean(props.scrollbarThin) })">
-            <slot name="body" />
+            <slot name="body" :close="close" />
           </div>
 
           <div v-if="!!slots.footer" :class="b24ui.footer({ class: props.b24ui?.footer })">
-            <slot name="footer" />
+            <slot name="footer" :close="close" />
           </div>
         </slot>
       </DialogContent>

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

@@ -63,39 +63,52 @@ export interface ModalProps extends DialogRootProps {
 }
 export interface ModalEmits extends DialogRootEmits {
     'after:leave': [];
+    'after:enter': [];
     'close:prevent': [];
 }
 export interface ModalSlots {
     default(props: {
         open: boolean;
     }): any;
-    content(props?: {}): any;
-    header(props?: {}): any;
+    content(props: {
+        close: () => void;
+    }): any;
+    header(props: {
+        close: () => void;
+    }): any;
     title(props?: {}): any;
     description(props?: {}): any;
+    actions(props?: {}): any;
     close(props: {
+        close: () => void;
         b24ui: {
             [K in keyof Required<Modal['slots']>]: (props?: Record<string, any>) => string;
         };
     }): any;
-    body(props?: {}): any;
-    footer(props?: {}): any;
+    body(props: {
+        close: () => void;
+    }): any;
+    footer(props: {
+        close: () => void;
+    }): any;
 }
 declare const _default: __VLS_WithSlots<import("vue").DefineComponent<ModalProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     "update:open": (value: boolean) => any;
     "after:leave": () => any;
+    "after:enter": () => any;
     "close:prevent": () => any;
 }, string, import("vue").PublicProps, Readonly<ModalProps> & Readonly<{
     "onUpdate:open"?: ((value: boolean) => any) | undefined;
     "onAfter:leave"?: (() => any) | undefined;
+    "onAfter:enter"?: (() => any) | undefined;
     "onClose:prevent"?: (() => any) | undefined;
 }>, {
     close: boolean | Partial<ButtonProps>;
     modal: boolean;
-    transition: boolean;
     portal: boolean | string | HTMLElement;
     overlay: boolean;
     overlayBlur: Modal["variants"]["overlayBlur"];
+    transition: boolean;
     dismissible: boolean;
     scrollbarThin: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>, ModalSlots>;

package/dist/runtime/components/Navbar.vue

@@ -19,7 +19,7 @@ const b24ui = computed(() => tv({ extend: tv(theme), ...appConfig.b24ui?.navbar
 
 <template>
   <!-- Navbar -->
-  <Primitive :as="as" :class="b24ui.root({ class: [props.class, props.b24ui?.root] })">
+  <Primitive :as="as" :class="b24ui.root({ class: [props.b24ui?.root, props.class] })">
     <slot />
   </Primitive>
 </template>

package/dist/runtime/components/NavbarDivider.vue

@@ -18,7 +18,7 @@ const b24ui = computed(() => tv({ extend: tv(theme), ...appConfig.b24ui?.navbarD
 </script>
 
 <template>
-  <Primitive :as="as" aria-hidden="true" :class="b24ui.root({ class: [props.class, props.b24ui?.root] })">
+  <Primitive :as="as" aria-hidden="true" :class="b24ui.root({ class: [props.b24ui?.root, props.class] })">
     <slot />
   </Primitive>
 </template>

package/dist/runtime/components/NavbarSection.vue

@@ -20,7 +20,7 @@ const b24ui = computed(() => tv({ extend: tv(theme), ...appConfig.b24ui?.navbarS
 <template>
   <Primitive
     :as="as"
-    :class="b24ui.root({ class: [props.class, props.b24ui?.root] })"
+    :class="b24ui.root({ class: [props.b24ui?.root, props.class] })"
     data-slot="section"
   >
     <slot />

package/dist/runtime/components/NavbarSpacer.vue

@@ -18,7 +18,7 @@ const b24ui = computed(() => tv({ extend: tv(theme), ...appConfig.b24ui?.navbarS
 </script>
 
 <template>
-  <Primitive :as="as" aria-hidden="true" :class="b24ui.root({ class: [props.class, props.b24ui?.root] })">
+  <Primitive :as="as" aria-hidden="true" :class="b24ui.root({ class: [props.b24ui?.root, props.class] })">
     <slot />
   </Primitive>
 </template>

package/dist/runtime/components/NavigationMenu.vue

@@ -4,8 +4,9 @@ import theme from "#build/b24ui/navigation-menu";
 
 <script setup>
 import { computed, toRef } from "vue";
-import { NavigationMenuRoot, NavigationMenuList, NavigationMenuItem, NavigationMenuTrigger, NavigationMenuContent, NavigationMenuLink, NavigationMenuIndicator, NavigationMenuViewport, useForwardPropsEmits } from "reka-ui";
-import { createReusableTemplate } from "@vueuse/core";
+import { NavigationMenuRoot, NavigationMenuList, NavigationMenuItem, NavigationMenuTrigger, NavigationMenuContent, NavigationMenuLink, NavigationMenuIndicator, NavigationMenuViewport, AccordionRoot, AccordionItem, AccordionTrigger, AccordionContent, useForwardPropsEmits } from "reka-ui";
+import { defu } from "defu";
+import { reactivePick, createReusableTemplate } from "@vueuse/core";
 import { useAppConfig } from "#imports";
 import { get, isArrayOfArray } from "../utils";
 import { tv } from "../utils/tv";
@@ -15,7 +16,8 @@ import B24LinkBase from "./LinkBase.vue";
 import B24Link from "./Link.vue";
 import B24Avatar from "./Avatar.vue";
 import B24Badge from "./Badge.vue";
-import B24Collapsible from "./Collapsible.vue";
+import B24Popover from "./Popover.vue";
+import B24Tooltip from "./Tooltip.vue";
 const props = defineProps({
   as: { type: null, required: false },
   trailingIcon: { type: [Function, Object], required: false },
@@ -25,6 +27,8 @@ const props = defineProps({
   variant: { type: null, required: false },
   orientation: { type: null, required: false, default: "horizontal" },
   collapsed: { type: Boolean, required: false },
+  tooltip: { type: [Boolean, Object], required: false },
+  popover: { type: [Boolean, Object], required: false },
   highlight: { type: Boolean, required: false },
   highlightColor: { type: null, required: false },
   content: { type: Object, required: false },
@@ -40,7 +44,10 @@ const props = defineProps({
   disableHoverTrigger: { type: Boolean, required: false },
   skipDelayDuration: { type: Number, required: false },
   disablePointerLeaveClose: { type: Boolean, required: false },
-  unmountOnHide: { type: Boolean, required: false, default: true }
+  unmountOnHide: { type: Boolean, required: false, default: true },
+  disabled: { type: Boolean, required: false },
+  type: { type: String, required: false, default: "multiple" },
+  collapsible: { type: Boolean, required: false, default: true }
 });
 const emits = defineEmits(["update:modelValue"]);
 const slots = defineSlots();
@@ -57,7 +64,10 @@ const rootProps = useForwardPropsEmits(computed(() => ({
   disablePointerLeaveClose: props.disablePointerLeaveClose,
   unmountOnHide: props.unmountOnHide
 })), 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 popoverProps = toRef(() => defu(typeof props.popover === "boolean" ? {} : props.popover, { mode: "hover", content: { side: "right", align: "start", alignOffset: 2 } }));
 const [DefineLinkTemplate, ReuseLinkTemplate] = createReusableTemplate();
 const [DefineItemTemplate, ReuseItemTemplate] = createReusableTemplate({
   props: {
@@ -75,7 +85,7 @@ const getLabel = (item) => {
 };
 const b24ui = computed(() => tv({ extend: tv(theme), ...appConfig.b24ui?.navigationMenu || {} })({
   orientation: props.orientation,
-  contentOrientation: props.contentOrientation,
+  contentOrientation: props.orientation === "vertical" ? void 0 : props.contentOrientation,
   collapsed: props.collapsed,
   color: props.color,
   variant: props.variant,
@@ -85,6 +95,15 @@ 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) {
+  const indexes = list.reduce((acc, item, index) => {
+    if (item.defaultOpen || item.open) {
+      acc.push(item.value || (level > 0 ? `item-${level}-${index}` : `item-${index}`));
+    }
+    return acc;
+  }, []);
+  return props.type === "single" ? indexes[0] : indexes;
+}
 </script>
 
 <template>
@@ -95,14 +114,14 @@ const lists = computed(
           <Component
             :is="item.icon"
             v-if="item.icon"
-            :class="b24ui.linkLeadingIcon({ class: props.b24ui?.linkLeadingIcon, active, disabled: !!item.disabled })"
+            :class="b24ui.linkLeadingIcon({ class: [props.b24ui?.linkLeadingIcon, item.b24ui?.linkLeadingIcon], active, disabled: !!item.disabled })"
           />
-          <B24Avatar v-else-if="item.avatar" :size="props.b24ui?.linkLeadingAvatarSize || b24ui.linkLeadingAvatarSize()" v-bind="item.avatar" :class="b24ui.linkLeadingAvatar({ class: props.b24ui?.linkLeadingAvatar, active, disabled: !!item.disabled })" />
+          <B24Avatar v-else-if="item.avatar" :size="item.b24ui?.linkLeadingAvatarSize || props.b24ui?.linkLeadingAvatarSize || b24ui.linkLeadingAvatarSize()" v-bind="item.avatar" :class="b24ui.linkLeadingAvatar({ class: [props.b24ui?.linkLeadingAvatar, item.b24ui?.linkLeadingAvatar], active, disabled: !!item.disabled })" />
         </slot>
 
         <span
           v-if="(!collapsed || orientation !== 'vertical') && (getLabel(item) || !!slots[item.slot ? `${item.slot}-label` : 'item-label'])"
-          :class="b24ui.linkLabel({ class: props.b24ui?.linkLabel, active })"
+          :class="b24ui.linkLabel({ class: [props.b24ui?.linkLabel, item.b24ui?.linkLabel], active })"
         >
           <slot :name="item.slot ? `${item.slot}-label` : 'item-label'" :item="item" :active="active" :index="index">
             {{ getLabel(item) }}
@@ -111,21 +130,27 @@ const lists = computed(
           <Component
             :is="typeof externalIcon !== 'boolean' ? externalIcon : icons.external"
             v-if="item.target === '_blank' && externalIcon !== false"
-            :class="b24ui.linkLabelExternalIcon({ class: props.b24ui?.linkLabelExternalIcon, active })"
+            :class="b24ui.linkLabelExternalIcon({ class: [props.b24ui?.linkLabelExternalIcon, item.b24ui?.linkLabelExternalIcon], active })"
           />
         </span>
       </span>
-      <span v-if="(!collapsed || orientation !== 'vertical') && (item.badge || 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'])" :class="b24ui.linkTrailing({ class: props.b24ui?.linkTrailing })">
+      <component
+        :is="orientation === 'vertical' && item.children?.length && !collapsed ? AccordionTrigger : 'span'"
+        v-if="(!collapsed || orientation !== 'vertical') && (item.badge || 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'])"
+        :class="b24ui.linkTrailing({ class: [props.b24ui?.linkTrailing, item.b24ui?.linkTrailing] })"
+      >
         <slot :name="item.slot ? `${item.slot}-trailing` : 'item-trailing'" :item="item" :active="active" :index="index">
           <Component
             :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"
-            :class="b24ui.linkTrailingIcon({ class: props.b24ui?.linkTrailingIcon, active })"
+            as="span"
+            :class="b24ui.linkTrailingIcon({ class: [props.b24ui?.linkTrailingIcon, item.b24ui?.linkTrailingIcon], active })"
+            @click.stop.prevent
           />
           <Component
             :is="item.trailingIcon"
             v-else-if="item.trailingIcon"
-            :class="b24ui.linkTrailingIcon({ class: props.b24ui?.linkTrailingIcon, active })"
+            :class="b24ui.linkTrailingIcon({ class: [props.b24ui?.linkTrailingIcon, item.b24ui?.linkTrailingIcon], active })"
           />
 
           <B24Badge
@@ -133,36 +158,124 @@ const lists = computed(
             color="danger"
             depth="dark"
             :use-fill="true"
-            :size="props.b24ui?.linkTrailingBadgeSize || b24ui.linkTrailingBadgeSize()"
+            :size="item.b24ui?.linkTrailingBadgeSize || props.b24ui?.linkTrailingBadgeSize || b24ui.linkTrailingBadgeSize()"
             v-bind="typeof item.badge === 'string' || typeof item.badge === 'number' ? { label: item.badge } : item.badge"
-            :class="b24ui.linkTrailingBadge({ class: props.b24ui?.linkTrailingBadge })"
+            :class="b24ui.linkTrailingBadge({ class: [props.b24ui?.linkTrailingBadge, item.b24ui?.linkTrailingBadge] })"
           />
         </slot>
-      </span>
+      </component>
     </slot>
   </DefineLinkTemplate>
 
   <DefineItemTemplate v-slot="{ item, index, level }">
     <component
-      :is="orientation === 'vertical' && item.children?.length && !collapsed ? B24Collapsible : NavigationMenuItem"
+      :is="orientation === 'vertical' && !collapsed ? AccordionItem : NavigationMenuItem"
       as="li"
-      :value="item.value || String(index)"
-      :default-open="item.defaultOpen"
-      :unmount-on-hide="orientation === 'vertical' && item.children?.length && !collapsed ? unmountOnHide : void 0"
-      :open="item.open"
+      :value="item.value || ((level || 0) > 0 ? `item-${level}-${index}` : `item-${index}`)"
     >
-      <div v-if="orientation === 'vertical' && item.type === 'label'" :class="b24ui.label({ class: props.b24ui?.label })">
+      <div
+        v-if="orientation === 'vertical' && item.type === 'label' && !collapsed"
+        :class="b24ui.label({ class: [props.b24ui?.label, item.b24ui?.label, item.class] })"
+      >
         <ReuseLinkTemplate :item="item" :index="index" />
       </div>
-      <B24Link v-else-if="item.type !== 'label'" v-slot="{ active, ...slotProps }" v-bind="orientation === 'vertical' && item.children?.length && !collapsed ? {} : pickLinkProps(item)" custom>
+      <B24Link
+        v-else-if="item.type !== 'label'"
+        v-slot="{ active, ...slotProps }"
+        v-bind="orientation === 'vertical' && item.children?.length && !collapsed && item.type === 'trigger' ? {} : pickLinkProps(item)"
+        custom
+      >
         <component
-          :is="orientation === 'horizontal' && (item.children?.length || !!slots[item.slot ? `${item.slot}-content` : 'item-content']) ? NavigationMenuTrigger : NavigationMenuLink"
+          :is="orientation === 'horizontal' && (item.children?.length || !!slots[item.slot ? `${item.slot}-content` : 'item-content']) ? NavigationMenuTrigger : orientation === 'vertical' && item.children?.length && !collapsed && !slotProps.href ? AccordionTrigger : NavigationMenuLink"
           as-child
           :active="active || item.active"
           :disabled="item.disabled"
           @select="item.onSelect"
         >
-          <B24LinkBase v-bind="slotProps" :class="b24ui.link({ class: [props.b24ui?.link, item.class], active: active || item.active, disabled: !!item.disabled, level: orientation === 'horizontal' || (level || 0) > 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] }) }"
+          >
+            <B24LinkBase
+              v-bind="slotProps"
+              :class="b24ui.link({
+  class: [props.b24ui?.link, item.b24ui?.link, item.class],
+  active: active || item.active,
+  disabled: !!item.disabled,
+  level: (level || 0) > 0
+})"
+            >
+              <ReuseLinkTemplate :item="item" :active="active || item.active" :index="index" />
+            </B24LinkBase>
+
+            <template #content>
+              <slot :name="item.slot ? `${item.slot}-content` : 'item-content'" :item="item" :active="active || item.active" :index="index">
+                <ul :class="b24ui.childList({ class: [props.b24ui?.childList, item.b24ui?.childList] })">
+                  <li :class="b24ui.childLabel({ class: [props.b24ui?.childLabel, item.b24ui?.childLabel] })">
+                    {{ getLabel(item) }}
+                  </li>
+                  <li
+                    v-for="(childItem, childIndex) in item.children"
+                    :key="childIndex"
+                    :class="b24ui.childItem({ class: [props.b24ui?.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"
+                          :class="b24ui.childLink({ class: [props.b24ui?.childLink, item.b24ui?.childLink, childItem.class], active: childActive })"
+                        >
+                          <Component
+                            :is="childItem.icon"
+                            v-if="childItem.icon"
+                            :class="b24ui.childLinkIcon({ class: [props.b24ui?.childLinkIcon, item.b24ui?.childLinkIcon], active: childActive })"
+                          />
+
+                          <span :class="b24ui.childLinkLabel({ class: [props.b24ui?.childLinkLabel, item.b24ui?.childLinkLabel], active: childActive })">
+                            {{ getLabel(childItem) }}
+
+                            <Component
+                              :is="typeof externalIcon === 'string' ? externalIcon : icons.external"
+                              v-if="childItem.target === '_blank' && externalIcon !== false"
+                              :class="b24ui.childLinkLabelExternalIcon({ class: [props.b24ui?.childLinkLabelExternalIcon, item.b24ui?.childLinkLabelExternalIcon], active: childActive })"
+                            />
+                          </span>
+                        </B24LinkBase>
+                      </NavigationMenuLink>
+                    </B24Link>
+                  </li>
+                </ul>
+              </slot>
+            </template>
+          </B24Popover>
+          <B24Tooltip
+            v-else-if="orientation === 'vertical' && collapsed && (!!props.tooltip || !!item.tooltip)"
+            :text="get(item, props.labelKey)"
+            v-bind="{ ...tooltipProps, ...typeof item.tooltip === 'boolean' ? {} : item.tooltip || {} }"
+          >
+            <B24LinkBase
+              v-bind="slotProps"
+              :class="b24ui.link({
+  class: [props.b24ui?.link, item.b24ui?.link, item.class],
+  active: active || item.active,
+  disabled: !!item.disabled,
+  level: (level || 0) > 0
+})"
+            >
+              <ReuseLinkTemplate :item="item" :active="active || item.active" :index="index" />
+            </B24LinkBase>
+          </B24Tooltip>
+          <B24LinkBase
+            v-else
+            v-bind="slotProps"
+            :class="b24ui.link({
+  class: [props.b24ui?.link, item.b24ui?.link, item.class],
+  active: active || item.active,
+  disabled: !!item.disabled,
+  level: orientation === 'horizontal' || (level || 0) > 0
+})"
+          >
             <ReuseLinkTemplate :item="item" :active="active || item.active" :index="index" />
           </B24LinkBase>
         </component>
@@ -171,31 +284,42 @@ const lists = computed(
           v-if="orientation === 'horizontal' && (item.children?.length || !!slots[item.slot ? `${item.slot}-content` : 'item-content'])"
           v-bind="contentProps"
           :data-viewport="item.viewportRtl ? 'rtl' : 'ltr'"
-          :class="b24ui.content({ class: props.b24ui?.content })"
+          :class="b24ui.content({ class: [props.b24ui?.content, item.b24ui?.content] })"
         >
-          <slot :name="item.slot ? `${item.slot}-content` : 'item-content'" :item="item" :active="active" :index="index">
-            <ul :class="b24ui.childList({ class: props.b24ui?.childList })">
-              <li v-for="(childItem, childIndex) in item.children" :key="childIndex" :class="b24ui.childItem({ class: props.b24ui?.childItem })">
-                <B24Link v-slot="{ active: childActive, ...childSlotProps }" v-bind="pickLinkProps(childItem)" custom>
+          <slot :name="item.slot ? `${item.slot}-content` : 'item-content'" :item="item" :active="active || item.active" :index="index">
+            <ul :class="b24ui.childList({ class: [props.b24ui?.childList, item.b24ui?.childList] })">
+              <li
+                v-for="(childItem, childIndex) in item.children"
+                :key="childIndex"
+                :class="b24ui.childItem({ class: [props.b24ui?.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" :class="b24ui.childLink({ class: [props.b24ui?.childLink, childItem.class], active: childActive })">
+                    <B24LinkBase
+                      v-bind="childSlotProps"
+                      :class="b24ui.childLink({ class: [props.b24ui?.childLink, childItem.childLink, childItem.class], active: childActive })"
+                    >
                       <Component
                         :is="childItem.icon"
                         v-if="childItem.icon"
-                        :class="b24ui.childLinkIcon({ class: props.b24ui?.childLinkIcon, active: childActive })"
+                        :class="b24ui.childLinkIcon({ class: [props.b24ui?.childLinkIcon, item.b24ui?.childLinkIcon], active: childActive })"
                       />
 
-                      <div :class="b24ui.childLinkWrapper({ class: props.b24ui?.childLinkWrapper })">
-                        <p :class="b24ui.childLinkLabel({ class: props.b24ui?.childLinkLabel, active: childActive })">
+                      <div :class="b24ui.childLinkWrapper({ class: [props.b24ui?.childLinkWrapper, item.b24ui?.childLinkWrapper] })">
+                        <p :class="b24ui.childLinkLabel({ class: [props.b24ui?.childLinkLabel, item.b24ui?.childLinkLabel], active: childActive })">
                           {{ getLabel(childItem) }}
 
                           <Component
                             :is="typeof externalIcon === 'string' ? externalIcon : icons.external"
                             v-if="childItem.target === '_blank' && externalIcon !== false"
-                            :class="b24ui.childLinkLabelExternalIcon({ class: props.b24ui?.childLinkLabelExternalIcon, active: childActive })"
+                            :class="b24ui.childLinkLabelExternalIcon({ class: [props.b24ui?.childLinkLabelExternalIcon, item.b24ui?.childLinkLabelExternalIcon], active: childActive })"
                           />
                         </p>
-                        <p v-if="childItem.description" :class="b24ui.childLinkDescription({ class: props.b24ui?.childLinkDescription, active: childActive })">
+                        <p v-if="childItem.description" :class="b24ui.childLinkDescription({ class: [props.b24ui?.childLinkDescription, item.b24ui?.childLinkDescription], active: childActive })">
                           {{ childItem.description }}
                         </p>
                       </div>
@@ -208,39 +332,57 @@ const lists = computed(
         </NavigationMenuContent>
       </B24Link>
 
-      <template v-if="orientation === 'vertical' && item.children?.length && !collapsed" #content>
-        <ul :class="b24ui.childList({ class: props.b24ui?.childList })">
+      <AccordionContent
+        v-if="orientation === 'vertical' && item.children?.length && !collapsed"
+        :class="b24ui.content({ class: [props.b24ui?.content, item.b24ui?.content] })"
+      >
+        <AccordionRoot
+          v-bind="{
+  ...accordionProps,
+  defaultValue: getAccordionDefaultValue(item.children, (level || 0) + 1)
+}"
+          as="ul"
+          :class="b24ui.childList({ class: props.b24ui?.childList })"
+        >
           <ReuseItemTemplate
             v-for="(childItem, childIndex) in item.children"
             :key="childIndex"
             :item="childItem"
             :index="childIndex"
             :level="(level || 0) + 1"
-            :class="b24ui.childItem({ class: props.b24ui?.childItem })"
+            :class="b24ui.childItem({ class: [props.b24ui?.childItem, childItem.b24ui?.childItem] })"
           />
-        </ul>
-      </template>
+        </AccordionRoot>
+      </AccordionContent>
     </component>
   </DefineItemTemplate>
 
   <NavigationMenuRoot
     v-bind="rootProps"
     :data-collapsed="collapsed"
-    :class="b24ui.root({ class: [props.class, props.b24ui?.root] })"
+    :class="b24ui.root({ class: [props.b24ui?.root, props.class] })"
     data-slot="section"
   >
     <slot name="list-leading" />
 
     <template v-for="(list, listIndex) in lists" :key="`list-${listIndex}`">
-      <NavigationMenuList :class="b24ui.list({ class: props.b24ui?.list })">
+      <component
+        v-bind="orientation === 'vertical' && !collapsed ? {
+  ...accordionProps,
+  defaultValue: getAccordionDefaultValue(list)
+} : {}"
+        :is="orientation === 'vertical' && !collapsed ? AccordionRoot : NavigationMenuList"
+        as="ul"
+        :class="b24ui.list({ class: props.b24ui?.list })"
+      >
         <ReuseItemTemplate
           v-for="(item, index) in list"
           :key="`list-${listIndex}-${index}`"
           :item="item"
           :index="index"
-          :class="b24ui.item({ class: props.b24ui?.item })"
+          :class="b24ui.item({ class: [props.b24ui?.item, item.b24ui?.item] })"
         />
-      </NavigationMenuList>
+      </component>
 
       <div v-if="orientation === 'vertical' && listIndex < lists.length - 1" :class="b24ui.separator({ class: props.b24ui?.separator })" />
     </template>