@bitrix24/b24ui-nuxt 0.4.11 → 0.5.0

package/dist/module.cjs

@@ -2,7 +2,7 @@
 
 const defu = require('defu');
 const kit = require('@nuxt/kit');
-const templates = require('./shared/b24ui-nuxt.CltBJi1M.cjs');
+const templates = require('./shared/b24ui-nuxt.DHbGsmbj.cjs');
 require('node:url');
 require('scule');
 

package/dist/module.json

@@ -5,7 +5,7 @@
     "nuxt": ">=3.16.0"
   },
   "docs": "https://bitrix24.github.io/b24ui/guide/installation-nuxt-app.html",
-  "version": "0.4.11",
+  "version": "0.5.0",
   "builder": {
     "@nuxt/module-builder": "0.8.4",
     "unbuild": "2.0.0"

package/dist/module.mjs

@@ -1,6 +1,6 @@
 import { defu } from 'defu';
 import { defineNuxtModule, createResolver, addVitePlugin, addPlugin, addComponentsDir, addImportsDir, hasNuxtModule, installModule } from '@nuxt/kit';
-import { d as defaultOptions, a as getDefaultUiConfig, b as addTemplates } from './shared/b24ui-nuxt.CJqO7fYv.mjs';
+import { d as defaultOptions, a as getDefaultUiConfig, b as addTemplates } from './shared/b24ui-nuxt.Bj4fKDSa.mjs';
 import 'node:url';
 import 'scule';
 

package/dist/runtime/components/DropdownMenu.vue

@@ -147,7 +147,7 @@ const b24ui = computed(() => dropdownMenu({
       :checked-icon="checkedIcon"
       :external-icon="externalIcon"
     >
-      <template v-for="(_, name) in proxySlots" #[name]="slotData: any">
+      <template v-for="(_, name) in proxySlots" #[name]="slotData">
         <slot :name="name" v-bind="slotData" />
       </template>
 

package/dist/runtime/components/Form.vue

@@ -12,14 +12,34 @@ const form = tv({ extend: tv(theme), ...(appConfigForm.b24ui?.form || {}) })
 
 export interface FormProps<T extends object> {
   id?: string | number
+  /** Schema to validate the form state. Supports Standard Schema objects, Yup, Joi, and Superstructs. */
   schema?: FormSchema<T>
+  /** An object representing the current state of the form. */
   state: Partial<T>
+  /**
+   * Custom validation function to validate the form state.
+   * @param state - The current state of the form.
+   * @returns A promise that resolves to an array of FormError objects, or an array of FormError objects directly.
+   */
   validate?: (state: Partial<T>) => Promise<FormError[]> | FormError[]
+  /**
+   * The list of input events that trigger the form validation.
+   * @defaultValue `['blur', 'change', 'input']`
+   */
   validateOn?: FormInputEvents[]
+  /** Disable all inputs inside the form. */
   disabled?: boolean
+  /**
+   * Delay in milliseconds before validating the form on input events.
+   * @defaultValue `300`
+   */
   validateOnInputDelay?: number
-  class?: any
+  /**
+   * If true, schema transformations will be applied to the state on submit.
+   * @defaultValue `true`
+   */
   transform?: boolean
+  class?: any
   onSubmit?: ((event: FormSubmitEvent<T>) => void | Promise<void>) | (() => void | Promise<void>)
 }
 

package/dist/runtime/components/FormField.vue

@@ -34,7 +34,12 @@ export interface FormFieldProps {
    * @defaultValue false
    */
   required?: boolean
+  /** If true, validation on input will be active immediately instead of waiting for a blur event. */
   eagerValidation?: boolean
+  /**
+   * Delay in milliseconds before validating the form on input events.
+   * @defaultValue `300`
+   */
   validateOnInputDelay?: number
   class?: any
   b24ui?: Partial<typeof formField.slots>

package/dist/runtime/components/NavigationMenu.vue

@@ -204,7 +204,7 @@ const lists = computed(() => props.items?.length ? (Array.isArray(props.items[0]
 
       <span
         v-if="(!collapsed || orientation !== 'vertical') && (get(item, props.labelKey as string) || !!slots[item.slot ? `${item.slot}-label` : 'item-label'])"
-        :class="b24ui.linkLabel({ class: props.b24ui?.linkLabel })"
+        :class="b24ui.linkLabel({ class: props.b24ui?.linkLabel, active })"
       >
         <slot :name="item.slot ? `${item.slot}-label` : 'item-label'" :item="(item as T)" :active="active" :index="index">
           {{ get(item, props.labelKey as string) }}
@@ -320,7 +320,12 @@ const lists = computed(() => props.items?.length ? (Array.isArray(props.items[0]
     </component>
   </DefineItemTemplate>
 
-  <NavigationMenuRoot v-bind="rootProps" :data-collapsed="collapsed" :class="b24ui.root({ class: [props.class, props.b24ui?.root] })">
+  <NavigationMenuRoot
+    v-bind="rootProps"
+    :data-collapsed="collapsed"
+    :class="b24ui.root({ class: [props.class, props.b24ui?.root] })"
+    data-slot="section"
+  >
     <template v-for="(list, listIndex) in lists" :key="`list-${listIndex}`">
       <NavigationMenuList :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 })" />

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/index.css

@@ -1 +1 @@
-@plugin "@bitrix24/b24style";@import "#build/b24ui.css";@import "./keyframes.css";@variant light (&:where(.light, .light *));@variant dark (&:where(.dark, .dark *));@layer base{--b24ui-header-height:calc(var(--spacing)*16);body{@apply antialiased scheme-light dark:scheme-dark}}@layer theme{:host,:root{--spacing:.25rem}}.scrollbar-thin{scrollbar-width:thin}.scrollbar-transparent{scrollbar-color:hsla(0,0%,100%,.21) transparent}.scrollbar-transparent:hover{scrollbar-color:rgba(82,92,105,.36) transparent}.dark .scrollbar-transparent{scrollbar-color:rgba(0,0,0,.21) transparent}.dark .scrollbar-transparent:hover{scrollbar-color:#515a67 transparent}
+@plugin "@bitrix24/b24style";@import "#build/b24ui.css";@import "./keyframes.css";@variant light (&:where(.light, .light *));@variant dark (&:where(.dark, .dark *));@layer base{--b24ui-header-height:calc(var(--spacing)*16);body{@apply antialiased scheme-light dark:scheme-dark}}@layer theme{:host,:root{--spacing:.25rem}}.scrollbar-thin{scrollbar-width:thin}.scrollbar-transparent{scrollbar-color:transparent transparent;scrollbar-gutter:stable}.scrollbar-transparent:hover{scrollbar-color:rgba(82,92,105,.36) transparent}.dark .scrollbar-transparent{scrollbar-color:rgba(0,0,0,.21) transparent}.dark .scrollbar-transparent:hover{scrollbar-color:#515a67 transparent}

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

@@ -1,9 +1,7 @@
 import type { StandardSchemaV1 } from '@standard-schema/spec';
 import type { ComputedRef, DeepReadonly, Ref } from 'vue';
-import type { ZodSchema } from 'zod';
 import type { Schema as JoiSchema } from 'joi';
 import type { ObjectSchema as YupObjectSchema } from 'yup';
-import type { GenericSchema as ValibotSchema, GenericSchemaAsync as ValibotSchemaAsync, SafeParser as ValibotSafeParser, SafeParserAsync as ValibotSafeParserAsync } from 'valibot';
 import type { GetObjectField } from './utils';
 import type { Struct as SuperstructSchema } from 'superstruct';
 export interface Form<T extends object> {
@@ -24,7 +22,7 @@ export interface Form<T extends object> {
     touchedFields: DeepReadonly<Set<keyof T>>;
     blurredFields: DeepReadonly<Set<keyof T>>;
 }
-export type FormSchema<T extends object> = ZodSchema | YupObjectSchema<T> | ValibotSchema | ValibotSchemaAsync | ValibotSafeParser<any, any> | ValibotSafeParserAsync<any, any> | JoiSchema<T> | SuperstructSchema<any, any> | StandardSchemaV1;
+export type FormSchema<T extends object> = YupObjectSchema<T> | JoiSchema<T> | SuperstructSchema<any, any> | StandardSchemaV1;
 export type FormInputEvents = 'input' | 'blur' | 'change' | 'focus';
 export interface FormError<P extends string = string> {
     name?: P;

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

@@ -1,17 +1,13 @@
 import type { StandardSchemaV1 } from '@standard-schema/spec';
-import type { ZodSchema } from 'zod';
 import type { ValidationError as JoiError, Schema as JoiSchema } from 'joi';
 import type { ObjectSchema as YupObjectSchema, ValidationError as YupError } from 'yup';
-import type { GenericSchema as ValibotSchema, GenericSchemaAsync as ValibotSchemaAsync, SafeParser as ValibotSafeParser, SafeParserAsync as ValibotSafeParserAsync } from 'valibot';
 import type { Struct } from 'superstruct';
 import type { FormSchema, ValidateReturnSchema } from '../types/form';
 export declare function isYupSchema(schema: any): schema is YupObjectSchema<any>;
 export declare function isYupError(error: any): error is YupError;
 export declare function isSuperStructSchema(schema: any): schema is Struct<any, any>;
-export declare function isZodSchema(schema: any): schema is ZodSchema;
 export declare function isJoiSchema(schema: any): schema is JoiSchema;
 export declare function isJoiError(error: any): error is JoiError;
-export declare function isValibotSchema(schema: any): schema is ValibotSchema | ValibotSchemaAsync | ValibotSafeParser<any, any> | ValibotSafeParserAsync<any, any>;
 export declare function isStandardSchema(schema: any): schema is StandardSchemaV1;
 export declare function validateStandardSchema(state: any, schema: StandardSchemaV1): Promise<ValidateReturnSchema<typeof state>>;
 export declare function validateSchema<T extends object>(state: T, schema: FormSchema<T>): Promise<ValidateReturnSchema<typeof state>>;

package/dist/runtime/utils/form.js

@@ -7,18 +7,12 @@ export function isYupError(error) {
 export function isSuperStructSchema(schema) {
   return "schema" in schema && typeof schema.coercer === "function" && typeof schema.validator === "function" && typeof schema.refiner === "function";
 }
-export function isZodSchema(schema) {
-  return schema.parse !== void 0;
-}
 export function isJoiSchema(schema) {
   return schema.validateAsync !== void 0 && schema.id !== void 0;
 }
 export function isJoiError(error) {
   return error.isJoi === true;
 }
-export function isValibotSchema(schema) {
-  return "_run" in schema || typeof schema === "function" && "schema" in schema;
-}
 export function isStandardSchema(schema) {
   return "~standard" in schema;
 }
@@ -77,23 +71,6 @@ async function validateSuperstructSchema(state, schema) {
     result
   };
 }
-async function validateZodSchema(state, schema) {
-  const result = await schema.safeParseAsync(state);
-  if (result.success === false) {
-    const errors = result.error.issues.map((issue) => ({
-      name: issue.path.join("."),
-      message: issue.message
-    }));
-    return {
-      errors,
-      result: null
-    };
-  }
-  return {
-    result: result.data,
-    errors: null
-  };
-}
 async function validateJoiSchema(state, schema) {
   try {
     const result = await schema.validateAsync(state, { abortEarly: false });
@@ -116,33 +93,11 @@ async function validateJoiSchema(state, schema) {
     }
   }
 }
-async function validateValibotSchema(state, schema) {
-  const result = await ("_run" in schema ? schema._run({ typed: false, value: state }, {}) : schema(state));
-  if (!result.issues || result.issues.length === 0) {
-    const output = "output" in result ? result.output : "value" in result ? result.value : null;
-    return {
-      errors: null,
-      result: output
-    };
-  }
-  const errors = result.issues.map((issue) => ({
-    name: issue.path?.map((item) => item.key).join(".") || "",
-    message: issue.message
-  }));
-  return {
-    errors,
-    result: null
-  };
-}
 export function validateSchema(state, schema) {
-  if (isZodSchema(schema)) {
-    return validateZodSchema(state, schema);
+  if (isStandardSchema(schema)) {
+    return validateStandardSchema(state, schema);
   } else if (isJoiSchema(schema)) {
     return validateJoiSchema(state, schema);
-  } else if (isStandardSchema(schema)) {
-    return validateStandardSchema(state, schema);
-  } else if (isValibotSchema(schema)) {
-    return validateValibotSchema(state, schema);
   } else if (isYupSchema(schema)) {
     return validateYupSchema(state, schema);
   } else if (isSuperStructSchema(schema)) {

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

@@ -6,24 +6,24 @@ export declare function pickLinkProps(link: LinkProps & {
     replace: any;
     type: any;
     title: any;
-    href: any;
-    target: any;
-    as: any;
-    prefetch: any;
-    rel: any;
-    external: any;
-    exact: any;
     active: any;
-    disabled: 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;
 };

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

@@ -12,7 +12,7 @@ export declare const useColorMode: () => {
     preference?: undefined;
     readonly value?: undefined;
 } | {
-    preference: "dark" | "light" | "system";
+    preference: "light" | "dark" | "system";
     readonly value: import("@vueuse/core").BasicColorMode;
     forced: boolean;
 };

package/dist/shared/{b24ui-nuxt.CJqO7fYv.mjs → b24ui-nuxt.Bj4fKDSa.mjs}

@@ -3515,47 +3515,108 @@ const modal = {
 
 const navigationMenu = {
   slots: {
-    root: "relative flex gap-1.5 [&>div]:min-w-0",
+    root: "relative flex [&>div]:min-w-0 font-b24-secondary",
     list: "isolate min-w-0",
-    label: "w-full flex items-center gap-1.5 font-semibold text-xs/5 text-(--ui-text-highlighted) px-2.5 py-1.5",
+    label: [
+      "w-full min-h-6",
+      "flex items-center rtl:flex-row-reverse gap-1.5",
+      "font-medium text-xs/6",
+      "text-base-500 dark:text-base-400",
+      "ps-2xl pe-xs rtl:ps-xs rtl:pe-2xl"
+    ].join(" "),
     item: "min-w-0",
-    link: "group relative w-full flex items-center gap-1.5 font-medium text-sm before:absolute before:z-[-1] before:rounded-[calc(var(--ui-radius)*1.5)] focus:outline-none focus-visible:outline-none dark:focus-visible:outline-none focus-visible:before:ring-inset focus-visible:before:ring-2",
+    link: [
+      "group relative",
+      "cursor-pointer",
+      "w-full",
+      "flex items-center gap-1.5",
+      "font-normal text-lg leading-9 min-h-9",
+      "before:absolute before:z-[-1]",
+      "focus:outline-none focus-visible:before:rounded-md focus-visible:outline-none dark:focus-visible:outline-none focus-visible:before:ring-inset focus-visible:before:ring-2"
+    ].join(" "),
     linkLeadingIcon: "shrink-0 size-5",
     linkLeadingAvatar: "shrink-0",
     linkLeadingAvatarSize: "2xs",
     linkTrailing: "ms-auto inline-flex gap-1.5 items-center",
     linkTrailingBadge: "shrink-0",
     linkTrailingBadgeSize: "sm",
-    linkTrailingIcon: "size-5 transform shrink-0 group-data-[state=open]:rotate-180 transition-transform duration-200",
+    linkTrailingIcon: "text-base-600 size-5 transform shrink-0 group-data-[state=open]:rotate-180 transition-transform duration-200",
     linkLabel: "truncate",
-    linkLabelExternalIcon: "inline-block size-3 align-top text-(--ui-text-dimmed)",
+    linkLabelExternalIcon: "inline-block h-6 w-3 align-top text-base-500 dark:text-base-700",
     childList: "",
     childItem: "",
-    childLink: "group size-full px-3 py-2 rounded-[calc(var(--ui-radius)*1.5)] flex items-start gap-2 text-start",
+    childLink: [
+      "group",
+      "size-full",
+      "px-3 py-2",
+      // 'rounded-md',
+      "flex items-start gap-2",
+      "text-start"
+    ].join(" "),
     childLinkWrapper: "flex flex-col items-start",
     childLinkIcon: "size-5 shrink-0",
     childLinkLabel: "font-semibold text-sm relative inline-flex",
-    childLinkLabelExternalIcon: "inline-block size-3 align-top text-(--ui-text-dimmed)",
+    childLinkLabelExternalIcon: "inline-block h-6 w-3 align-top text-base-500 dark:text-base-700",
     childLinkDescription: "text-sm text-(--ui-text-muted)",
     separator: "px-2 h-px bg-(--ui-border)",
     viewportWrapper: "absolute top-full left-0 flex w-full",
-    viewport: "relative overflow-hidden bg-(--ui-bg) shadow-lg rounded-[calc(var(--ui-radius)*1.5)] ring ring-(--ui-border) h-(--reka-navigation-menu-viewport-height) w-full transition-[width,height,left] duration-200 origin-[top_center] data-[state=open]:animate-[scale-in_100ms_ease-out] data-[state=closed]:animate-[scale-out_100ms_ease-in]",
+    viewport: [
+      "relative overflow-hidden",
+      "w-full",
+      "bg-(--ui-bg)",
+      "shadow-lg",
+      "rounded-md",
+      "ring ring-(--ui-border)",
+      "h-(--reka-navigation-menu-viewport-height)",
+      "transition-[width,height,left] duration-200 origin-[top_center]",
+      "motion-safe:data-[state=open]:animate-[scale-in_100ms_ease-out] motion-safe:data-[state=closed]:animate-[scale-out_100ms_ease-in]"
+    ].join(" "),
     content: "absolute top-0 left-0 w-full",
-    indicator: "absolute data-[state=visible]:animate-[fade-in_100ms_ease-out] data-[state=hidden]:animate-[fade-out_100ms_ease-in] data-[state=hidden]:opacity-0 bottom-0 z-[1] w-(--reka-navigation-menu-indicator-size) translate-x-(--reka-navigation-menu-indicator-position) flex h-2.5 items-end justify-center overflow-hidden transition-[translate,width] duration-200",
-    arrow: "relative top-[50%] size-2.5 rotate-45 border border-(--ui-border) bg-(--ui-bg) z-[1] rounded-[calc(var(--ui-radius)/2)]"
+    indicator: [
+      "absolute",
+      "motion-safe:data-[state=visible]:animate-[fade-in_100ms_ease-out] motion-safe:data-[state=hidden]:animate-[fade-out_100ms_ease-in]",
+      "data-[state=hidden]:opacity-0",
+      "bottom-0",
+      "z-[1]",
+      "w-(--reka-navigation-menu-indicator-size)",
+      "h-2.5",
+      "translate-x-(--reka-navigation-menu-indicator-position)",
+      "flex items-end justify-center",
+      "overflow-hidden",
+      "transition-[translate,width] duration-200"
+    ].join(" "),
+    arrow: "relative top-[50%] size-2.5 rotate-45 border border-(--ui-border) bg-(--ui-bg) z-[1] rounded-md"
   },
   variants: {
     color: {
       default: {
-        link: "focus-visible:before:ring-(--ui-border-inverted)",
-        childLink: "focus-visible:outline-(--ui-border-inverted)"
-      }
+        link: "focus-visible:before:ring-base-300 dark:focus-visible:before:ring-base-800",
+        childLink: "focus-visible:outline-base-300 dark:focus-visible:outline-base-800"
+      },
+      danger: "",
+      success: "",
+      warning: "",
+      primary: "",
+      secondary: "",
+      collab: "",
+      ai: ""
     },
     highlightColor: {
-      default: ""
+      default: "",
+      danger: "",
+      success: "",
+      warning: "",
+      primary: "",
+      secondary: "",
+      collab: "",
+      ai: ""
     },
     variant: {
-      pill: "",
+      pill: {
+        link: [
+          "hover:before:bg-base-250/80 dark:hover:before:bg-white/10"
+        ].join(" ")
+      },
       link: ""
     },
     orientation: {
@@ -3567,15 +3628,19 @@ const navigationMenu = {
         childList: "grid p-2"
       },
       vertical: {
-        root: "flex-col",
-        link: "flex-row px-2.5 py-1.5 before:inset-y-px before:inset-x-0"
+        root: "flex-col w-full",
+        link: [
+          "ps-2xl pe-xs rtl:ps-xs rtl:pe-2xl",
+          "flex-row rtl:flex-row-reverse",
+          "before:inset-y-px before:inset-x-0"
+        ].join(" ")
       }
     },
     contentOrientation: {
       horizontal: {
         viewport: "",
         viewportWrapper: "justify-center",
-        content: "data-[motion=from-start]:animate-[enter-from-left_200ms_ease] data-[motion=from-end]:animate-[enter-from-right_200ms_ease] data-[motion=to-start]:animate-[exit-to-left_200ms_ease] data-[motion=to-end]:animate-[exit-to-right_200ms_ease]"
+        content: "motion-safe:data-[motion=from-start]:animate-[enter-from-left_200ms_ease] motion-safe:data-[motion=from-end]:animate-[enter-from-right_200ms_ease] motion-safe:data-[motion=to-start]:animate-[exit-to-left_200ms_ease] motion-safe:data-[motion=to-end]:animate-[exit-to-right_200ms_ease]"
       },
       vertical: {
         viewport: "sm:w-(--reka-navigation-menu-viewport-width) left-(--reka-navigation-menu-viewport-left)",
@@ -3588,10 +3653,17 @@ const navigationMenu = {
         childLinkIcon: "text-(--ui-text)"
       },
       false: {
-        link: "text-(--ui-text-muted)",
-        linkLeadingIcon: "text-(--ui-text-dimmed)",
-        childLink: ["hover:bg-(--ui-bg-elevated)/50 text-(--ui-text) hover:text-(--ui-text-highlighted)", "transition-colors"],
-        childLinkIcon: ["text-(--ui-text-dimmed) group-hover:text-(--ui-text)", "transition-colors"]
+        link: "text-base-900 dark:text-base-200",
+        linkLeadingIcon: "text-base-500 dark:text-base-700",
+        childLink: [
+          "hover:bg-(--ui-bg-elevated)/50 text-(--ui-text) hover:text-(--ui-text-highlighted)",
+          "transition-colors"
+        ].join(" "),
+        childLinkIcon: [
+          "text-base-500 dark:text-base-700",
+          "group-hover:text-(--ui-text)",
+          "transition-colors"
+        ].join(" ")
       }
     },
     disabled: {
@@ -3610,6 +3682,7 @@ const navigationMenu = {
     }
   },
   compoundVariants: [
+    // region horizontal ////
     {
       orientation: "horizontal",
       contentOrientation: "horizontal",
@@ -3632,6 +3705,8 @@ const navigationMenu = {
         link: ["after:absolute after:-bottom-2 after:inset-x-2.5 after:block after:h-px after:rounded-full", "after:transition-colors"]
       }
     },
+    // endregion ////
+    // region vertical ////
     {
       orientation: "vertical",
       highlight: true,
@@ -3640,13 +3715,20 @@ const navigationMenu = {
         link: ["after:absolute after:-start-1.5 after:inset-y-0.5 after:block after:w-px after:rounded-full", "after:transition-colors"]
       }
     },
+    // endregion ////
+    // region disabled ////
     {
       disabled: false,
       active: false,
       variant: "pill",
       class: {
-        link: ["hover:text-(--ui-text-highlighted) hover:before:bg-(--ui-bg-elevated)/50", "transition-colors before:transition-colors"],
-        linkLeadingIcon: ["group-hover:text-(--ui-text)", "transition-colors"]
+        link: [
+          "transition-colors before:transition-colors"
+        ].join(" "),
+        linkLeadingIcon: [
+          "group-hover:text-(--ui-text)",
+          "transition-colors"
+        ].join(" ")
       }
     },
     {
@@ -3678,13 +3760,18 @@ const navigationMenu = {
         link: "data-[state=open]:before:bg-(--ui-bg-elevated)/50"
       }
     },
+    // endregion ////
     {
       color: "default",
       variant: "pill",
       active: true,
       class: {
-        link: "text-(--ui-text-highlighted)",
-        linkLeadingIcon: "text-(--ui-text-highlighted) group-data-[state=open]:text-(--ui-text-highlighted)"
+        // link: 'text-(--ui-text-highlighted)',
+        linkLeadingIcon: "text-(--ui-text-highlighted) group-data-[state=open]:text-(--ui-text-highlighted)",
+        linkLabel: [
+          "text-white dark:text-white",
+          "bg-base-800 dark:bg-white/35"
+        ].join(" ")
       }
     },
     {
@@ -3692,7 +3779,18 @@ const navigationMenu = {
       active: true,
       highlight: false,
       class: {
-        link: "before:bg-(--ui-bg-elevated)"
+        link: [
+          "leading-9"
+        ].join(" "),
+        linkLabel: [
+          "px-3",
+          "-ms-3 me-3 rtl:-me-3 rtl:ms-3",
+          "font-semibold leading-[1.563rem]",
+          "text-white dark:text-white",
+          "bg-base-800 dark:bg-white/35",
+          // (--ui-bg-elevated)
+          "rounded-2xl"
+        ].join(" ")
       }
     },
     {
@@ -3700,16 +3798,26 @@ const navigationMenu = {
       active: true,
       highlight: true,
       class: {
-        link: ["hover:before:bg-(--ui-bg-elevated)/50", "before:transition-colors"]
+        link: [
+          "hover:before:bg-(--ui-bg-elevated)/50",
+          "before:transition-colors"
+        ]
       }
     },
+    // region link ////
     {
       disabled: false,
       active: false,
       variant: "link",
       class: {
-        link: ["hover:text-(--ui-text-highlighted)", "transition-colors"],
-        linkLeadingIcon: ["group-hover:text-(--ui-text)", "transition-colors"]
+        link: [
+          "hover:text-base-950 dark:hover:text-base-50",
+          "transition-colors"
+        ].join(" "),
+        linkLeadingIcon: [
+          "group-hover:text-(--ui-text)",
+          "transition-colors"
+        ].join(" ")
       }
     },
     {
@@ -3731,6 +3839,7 @@ const navigationMenu = {
         linkLeadingIcon: "text-(--ui-text-highlighted) group-data-[state=open]:text-(--ui-text-highlighted)"
       }
     },
+    // endregion ////
     {
       highlightColor: "default",
       highlight: true,
@@ -3744,8 +3853,8 @@ const navigationMenu = {
       orientation: "vertical",
       collapsed: false,
       class: {
-        childList: "ms-5 border-s border-(--ui-border)",
-        childItem: "ps-1.5 -ms-px"
+        childList: "v-1",
+        childItem: "v-2 [&>a]:ps-[44px]"
       }
     },
     {
@@ -3757,9 +3866,6 @@ const navigationMenu = {
     }
   ],
   defaultVariants: {
-    /**
-     * @todo change to primary
-     */
     color: "default",
     highlightColor: "default",
     variant: "pill"
@@ -5770,7 +5876,7 @@ const sidebar = {
 const sidebarHeader = {
   slots: {
     root: [
-      "p-4",
+      "py-4",
       "flex flex-col",
       // 'border-b border-base-950/5 dark:border-white/5',
       "[&>[data-slot=section]+[data-slot=section]]:mt-2.5"
@@ -5781,7 +5887,7 @@ const sidebarHeader = {
 const sidebarBody = {
   slots: {
     root: [
-      "p-4",
+      "py-4",
       "flex flex-1 flex-col",
       "overflow-y-auto",
       "[&>[data-slot=section]+[data-slot=section]]:mt-8"
@@ -5802,7 +5908,7 @@ const sidebarBody = {
 const sidebarFooter = {
   slots: {
     root: [
-      "p-4",
+      "py-4",
       "flex flex-col",
       "max-lg:hidden",
       // 'border-t border-base-950/5 dark:border-white/5',
@@ -5814,6 +5920,7 @@ const sidebarFooter = {
 const sidebarSection = {
   slots: {
     root: [
+      "ps-2xl pe-xs",
       "flex flex-col gap-0.5"
     ].join(" ")
   }
@@ -5823,7 +5930,6 @@ const sidebarHeading = {
   slots: {
     root: [
       "mb-1",
-      "px-2",
       "text-xs/6 font-medium ",
       "text-base-500 dark:text-base-400"
     ].join(" ")