@bitrix24/b24ui-nuxt 0.6.7 → 0.7.0

package/dist/runtime/composables/defineShortcuts.js

@@ -1,5 +1,6 @@
 import { ref, computed, toValue } from "vue";
 import { useEventListener, useActiveElement, useDebounceFn } from "@vueuse/core";
+import { useKbd } from "./useKbd.js";
 const chainedShortcutRegex = /^[^-]+.*-.*[^-]+$/;
 const combinedShortcutRegex = /^[^_]+.*_.*[^_]+$/;
 export function extractShortcuts(items) {
@@ -27,6 +28,7 @@ export function defineShortcuts(config, options = {}) {
     chainedInputs.value.splice(0, chainedInputs.value.length);
   };
   const debouncedClearChainedInput = useDebounceFn(clearChainedInput, options.chainDelay ?? 800);
+  const { macOS } = useKbd();
   const activeElement = useActiveElement();
   const onKeyDown = (e) => {
     if (!e.key) {
@@ -86,13 +88,13 @@ export function defineShortcuts(config, options = {}) {
         return null;
       }
       let shortcut;
-      if (key.includes("-") && key !== "-" && !key.match(chainedShortcutRegex)?.length) {
+      if (key.includes("-") && key !== "-" && !key.includes("_") && !key.match(chainedShortcutRegex)?.length) {
         console.trace(`[Shortcut] Invalid key: "${key}"`);
       }
       if (key.includes("_") && key !== "_" && !key.match(combinedShortcutRegex)?.length) {
         console.trace(`[Shortcut] Invalid key: "${key}"`);
       }
-      const chained = key.includes("-") && key !== "-";
+      const chained = key.includes("-") && key !== "-" && !key.includes("_");
       if (chained) {
         shortcut = {
           key: key.toLowerCase(),
@@ -112,6 +114,10 @@ export function defineShortcuts(config, options = {}) {
         };
       }
       shortcut.chained = chained;
+      if (!macOS.value && shortcut.metaKey && !shortcut.ctrlKey) {
+        shortcut.metaKey = false;
+        shortcut.ctrlKey = true;
+      }
       if (typeof shortcutConfig === "function") {
         shortcut.handler = shortcutConfig;
       } else if (typeof shortcutConfig === "object") {

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

@@ -13,7 +13,7 @@ type Props<T> = {
 };
 export declare const formOptionsInjectionKey: InjectionKey<ComputedRef<FormInjectedOptions>>;
 export declare const formBusInjectionKey: InjectionKey<UseEventBusReturn<FormEvent<any>, string>>;
-export declare const formFieldInjectionKey: InjectionKey<ComputedRef<FormFieldInjectedOptions<FormFieldProps>>>;
+export declare const formFieldInjectionKey: InjectionKey<ComputedRef<FormFieldInjectedOptions<FormFieldProps>> | undefined>;
 export declare const inputIdInjectionKey: InjectionKey<Ref<string | undefined>>;
 export declare const formInputsInjectionKey: InjectionKey<Ref<Record<string, {
     id?: string;

package/dist/runtime/composables/useFormField.js

@@ -1,4 +1,4 @@
-import { inject, computed } from "vue";
+import { inject, computed, provide } from "vue";
 import { useDebounceFn } from "@vueuse/core";
 export const formOptionsInjectionKey = Symbol("bitrix24-ui.form-options");
 export const formBusInjectionKey = Symbol("bitrix24-ui.form-events");
@@ -12,6 +12,7 @@ export function useFormField(props, opts) {
   const formField = inject(formFieldInjectionKey, void 0);
   const formInputs = inject(formInputsInjectionKey, void 0);
   const inputId = inject(inputIdInjectionKey, void 0);
+  provide(formFieldInjectionKey, void 0);
   if (formField && inputId) {
     if (opts?.bind === false) {
       inputId.value = void 0;

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

@@ -10,6 +10,7 @@ export declare const kbdKeysMap: {
     win: string;
     command: string;
     shift: string;
+    control: string;
     option: string;
     enter: string;
     delete: string;

package/dist/runtime/composables/useKbd.js

@@ -7,6 +7,7 @@ export const kbdKeysMap = {
   win: "\u229E",
   command: "\u2318",
   shift: "\u21E7",
+  control: "\u2303",
   option: "\u2325",
   enter: "\u21B5",
   delete: "\u2326",
@@ -31,9 +32,9 @@ const _useKbd = () => {
     ctrl: " "
   });
   onMounted(() => {
-    kbdKeysSpecificMap.meta = macOS.value ? kbdKeysMap.command : kbdKeysMap.win;
-    kbdKeysSpecificMap.alt = macOS.value ? kbdKeysMap.option : "alt";
-    kbdKeysSpecificMap.ctrl = macOS.value ? "\u2303" : "ctrl";
+    kbdKeysSpecificMap.meta = macOS.value ? kbdKeysMap.command : "Ctrl";
+    kbdKeysSpecificMap.ctrl = macOS.value ? kbdKeysMap.control : "Ctrl";
+    kbdKeysSpecificMap.alt = macOS.value ? kbdKeysMap.option : "Alt";
   });
   function getKbdKey(value) {
     if (!value) {

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

@@ -11,28 +11,28 @@ interface ManagedOverlayOptionsPrivate<T extends Component> {
     id: symbol;
     isMounted: boolean;
     isOpen: boolean;
+    originalProps?: ComponentProps<T>;
     resolvePromise?: (value: any) => void;
 }
 export type Overlay = OverlayOptions<Component> & ManagedOverlayOptionsPrivate<Component>;
-interface OverlayInstance<T extends Component> extends Omit<ManagedOverlayOptionsPrivate<T>, 'component'> {
+type OverlayInstance<T extends Component> = Omit<ManagedOverlayOptionsPrivate<T>, 'component'> & {
     id: symbol;
-    result: Promise<CloseEventArgType<ComponentEmit<T>>>;
-    open: (props?: ComponentProps<T>) => Omit<OverlayInstance<T>, 'open' | 'close' | 'patch' | 'modelValue' | 'resolvePromise'>;
+    open: (props?: ComponentProps<T>) => OpenedOverlay<T>;
     close: (value?: any) => void;
     patch: (props: Partial<ComponentProps<T>>) => void;
-}
+};
+type OpenedOverlay<T extends Component> = Omit<OverlayInstance<T>, 'open' | 'close' | 'patch' | 'modelValue' | 'resolvePromise'> & {
+    result: Promise<CloseEventArgType<ComponentEmit<T>>>;
+};
 declare function _useOverlay(): {
     overlays: import("vue").ShallowReactive<Overlay[]>;
-    open: <T extends Component>(id: symbol, props?: ComponentProps<T>) => {
-        id: symbol;
-        isMounted: boolean;
-        isOpen: boolean;
-        result: Promise<any>;
-    };
+    open: <T extends Component>(id: symbol, props?: ComponentProps<T>) => OpenedOverlay<T>;
     close: (id: symbol, value?: any) => void;
+    closeAll: () => void;
     create: <T extends Component>(component: T, _options?: OverlayOptions<ComponentProps<T>>) => OverlayInstance<T>;
     patch: <T extends Component>(id: symbol, props: Partial<ComponentProps<T>>) => void;
-    unMount: (id: symbol) => void;
+    unmount: (id: symbol) => void;
+    isOpen: (id: symbol) => boolean;
 };
 export declare const useOverlay: typeof _useOverlay;
 export {};

package/dist/runtime/composables/useOverlay.js

@@ -10,13 +10,12 @@ function _useOverlay() {
       component: markRaw(component),
       isMounted: !!defaultOpen,
       destroyOnClose: !!destroyOnClose,
-      props: props || {}
+      originalProps: props || {},
+      props: { ...props || {} }
     });
     overlays.push(options);
     return {
       ...options,
-      result: new Promise(() => {
-      }),
       open: (props2) => open(options.id, props2),
       close: (value) => close(options.id, value),
       patch: (props2) => patch(options.id, props2)
@@ -26,6 +25,8 @@ function _useOverlay() {
     const overlay = getOverlay(id);
     if (props) {
       patch(overlay.id, props);
+    } else {
+      patch(overlay.id, overlay.originalProps);
     }
     overlay.isOpen = true;
     overlay.isMounted = true;
@@ -33,9 +34,7 @@ function _useOverlay() {
       id,
       isMounted: overlay.isMounted,
       isOpen: overlay.isOpen,
-      result: new Promise((resolve) => {
-        overlay.resolvePromise = resolve;
-      })
+      result: new Promise((resolve) => overlay.resolvePromise = resolve)
     };
   };
   const close = (id, value) => {
@@ -46,7 +45,10 @@ function _useOverlay() {
       overlay.resolvePromise = void 0;
     }
   };
-  const unMount = (id) => {
+  const closeAll = () => {
+    overlays.forEach((overlay) => close(overlay.id));
+  };
+  const unmount = (id) => {
     const overlay = getOverlay(id);
     overlay.isMounted = false;
     if (overlay.destroyOnClose) {
@@ -56,9 +58,7 @@ function _useOverlay() {
   };
   const patch = (id, props) => {
     const overlay = getOverlay(id);
-    Object.entries(props).forEach(([key, value]) => {
-      overlay.props[key] = value;
-    });
+    overlay.props = { ...props };
   };
   const getOverlay = (id) => {
     const overlay = overlays.find((overlay2) => overlay2.id === id);
@@ -67,13 +67,19 @@ function _useOverlay() {
     }
     return overlay;
   };
+  const isOpen = (id) => {
+    const overlay = getOverlay(id);
+    return overlay.isOpen;
+  };
   return {
     overlays,
     open,
     close,
+    closeAll,
     create,
     patch,
-    unMount
+    unmount,
+    isOpen
   };
 }
 export const useOverlay = /* @__PURE__ */ createSharedComposable(_useOverlay);

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

@@ -7,7 +7,7 @@ import { computed } from "vue";
 import { defu } from "defu";
 import { useForwardProps } from "reka-ui";
 import { reactiveOmit } from "@vueuse/core";
-import { usePage, Link as InertiaLink } from "@inertiajs/vue3";
+import { usePage } from "@inertiajs/vue3";
 import { hasProtocol } from "ufo";
 import { useAppConfig } from "#imports";
 import { tv } from "../../utils/tv";
@@ -33,7 +33,6 @@ const props = defineProps({
   data: { type: Object, required: false },
   method: { type: String, required: false },
   headers: { type: Object, required: false },
-  onClick: { type: Function, required: false },
   preserveScroll: { type: [Boolean, String, Function], required: false },
   preserveState: { type: [Boolean, String, Function], required: false },
   replace: { type: Boolean, required: false },
@@ -53,8 +52,9 @@ const props = defineProps({
   cacheFor: { type: [Number, String, Array], required: false }
 });
 defineSlots();
+const page = usePage();
 const appConfig = useAppConfig();
-const routerLinkProps = useForwardProps(reactiveOmit(props, "as", "type", "disabled", "active", "exact", "activeClass", "inactiveClass", "to", "raw", "class"));
+const routerLinkProps = useForwardProps(reactiveOmit(props, "as", "type", "disabled", "active", "exact", "activeClass", "inactiveClass", "to", "href", "raw", "custom", "class"));
 const b24ui = computed(() => tv({
   extend: tv(theme),
   ...defu({
@@ -66,12 +66,33 @@ const b24ui = computed(() => tv({
     }
   }, appConfig.b24ui?.link || {})
 }));
+const href = computed(() => props.to ?? props.href);
 const isExternal = computed(() => {
-  if (!props.to) return false;
-  return typeof props.to === "string" && hasProtocol(props.to, { acceptRelative: true });
+  if (props.external) {
+    return true;
+  }
+  if (!href.value) {
+    return false;
+  }
+  return typeof href.value === "string" && hasProtocol(href.value, { acceptRelative: true });
+});
+const isLinkActive = computed(() => {
+  if (props.active !== void 0) {
+    return props.active;
+  }
+  if (!href.value) {
+    return false;
+  }
+  if (props.exact && page.url === href.value) {
+    return true;
+  }
+  if (!props.exact && page.url.startsWith(href.value)) {
+    return true;
+  }
+  return false;
 });
 const linkClass = computed(() => {
-  const active = isActive.value;
+  const active = isLinkActive.value;
   if (props.raw) {
     return [props.class, active ? props.activeClass : props.inactiveClass];
   }
@@ -82,72 +103,36 @@ const linkClass = computed(() => {
     isAction: Boolean(props.isAction)
   });
 });
-const page = usePage();
-const url = computed(() => props.to ?? props.href ?? "#");
-const isActive = computed(() => props.active || (props.exact ? url.value === props.href : page?.url.startsWith(url.value)));
 </script>
 
 <template>
-  <template v-if="!isExternal">
-    <InertiaLink v-bind="routerLinkProps" :href="url" custom>
-      <template v-if="custom">
-        <slot
-          v-bind="{
-  ...$attrs,
-  as,
-  type,
-  disabled,
-  href: url,
-  active: isActive
-}"
-        />
-      </template>
-      <B24LinkBase
-        v-else
-        v-bind="{
+  <template v-if="custom">
+    <slot
+      v-bind="{
   ...$attrs,
+  ...routerLinkProps,
   as,
   type,
   disabled,
-  href: url,
-  active: isActive
+  href,
+  active: isLinkActive,
+  isExternal
 }"
-        :class="linkClass"
-      >
-        <slot :active="isActive" />
-      </B24LinkBase>
-    </InertiaLink>
+    />
   </template>
-
-  <template v-else>
-    <template v-if="custom">
-      <slot
-        v-bind="{
+  <B24LinkBase
+    v-else
+    v-bind="{
   ...$attrs,
+  ...routerLinkProps,
   as,
   type,
   disabled,
-  href: to,
-  target: isExternal ? '_blank' : void 0,
-  active: isActive
+  href,
+  isExternal
 }"
-      />
-    </template>
-    <B24LinkBase
-      v-else
-      v-bind="{
-  ...$attrs,
-  as,
-  type,
-  disabled,
-  href: url,
-  target: isExternal ? '_blank' : void 0,
-  active: isActive
-}"
-      :is-external="isExternal"
-      :class="linkClass"
-    >
-      <slot :active="isActive" />
-    </B24LinkBase>
-  </template>
+    :class="linkClass"
+  >
+    <slot :active="isLinkActive" />
+  </B24LinkBase>
 </template>

package/dist/runtime/inertia/components/Link.vue.d.ts

@@ -1,6 +1,6 @@
 import type { ButtonHTMLAttributes } from 'vue';
 import type { InertiaLinkProps } from '@inertiajs/vue3';
-interface NuxtLinkProps extends Omit<InertiaLinkProps, 'href'> {
+interface NuxtLinkProps extends Omit<InertiaLinkProps, 'href' | 'onClick'> {
     activeClass?: string;
     /**
      * Route Location the link should navigate to when clicked on.

package/dist/runtime/inertia/components/LinkBase.vue

@@ -0,0 +1,68 @@
+<script>
+
+</script>
+
+<script setup>
+import { Primitive } from "reka-ui";
+import { Link as InertiaLink } from "@inertiajs/vue3";
+defineOptions({ inheritAttrs: false });
+const props = defineProps({
+  as: { type: String, required: false, default: "button" },
+  type: { type: String, required: false, default: "button" },
+  disabled: { type: Boolean, required: false },
+  onClick: { type: [Function, Array], required: false },
+  href: { type: String, required: false },
+  target: { type: [String, Object, null], required: false },
+  active: { type: Boolean, required: false },
+  isExternal: { type: Boolean, required: false }
+});
+function onClickWrapper(e) {
+  if (props.disabled) {
+    e.stopPropagation();
+    e.preventDefault();
+    return;
+  }
+  if (props.onClick) {
+    for (const onClick of Array.isArray(props.onClick) ? props.onClick : [props.onClick]) {
+      onClick(e);
+    }
+  }
+}
+</script>
+
+<template>
+  <InertiaLink
+    v-if="!!href && !isExternal && !disabled"
+    :href="href"
+    v-bind="{
+  target: target || (isExternal ? '_blank' : void 0),
+  ...$attrs
+}"
+    @click="onClickWrapper"
+  >
+    <slot />
+  </InertiaLink>
+  <Primitive
+    v-else
+    v-bind="href ? {
+  'as': 'a',
+  'href': disabled ? void 0 : href,
+  'aria-disabled': disabled ? 'true' : void 0,
+  'role': disabled ? 'link' : void 0,
+  'tabindex': disabled ? -1 : void 0,
+  'target': target || (isExternal ? '_blank' : void 0),
+  ...$attrs
+} : as === 'button' ? {
+  as,
+  type,
+  disabled,
+  ...$attrs
+} : {
+  as,
+  ...$attrs
+}"
+    @click="onClickWrapper"
+  >
+    <slot />
+  </Primitive>
+</template>

package/dist/runtime/inertia/components/LinkBase.vue.d.ts

@@ -0,0 +1,25 @@
+import type { LinkProps } from '../../types';
+export interface LinkBaseProps {
+    as?: string;
+    type?: string;
+    disabled?: boolean;
+    onClick?: ((e: MouseEvent) => void | Promise<void>) | Array<((e: MouseEvent) => void | Promise<void>)>;
+    href?: string;
+    target?: LinkProps['target'];
+    active?: boolean;
+    isExternal?: boolean;
+}
+declare const _default: __VLS_WithSlots<import("vue").DefineComponent<LinkBaseProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<LinkBaseProps> & Readonly<{}>, {
+    as: string;
+    type: string;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>, {
+    default?: (props: {}) => any;
+} & {
+    default?: (props: {}) => any;
+}>;
+export default _default;
+type __VLS_WithSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

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

@@ -1,6 +1,7 @@
 import type { Ref } from 'vue';
 import type { NuxtApp } from '#app';
 export { useHead } from '@unhead/vue';
+export { useAppConfig } from '../vue/composables/useAppConfig';
 export { defineShortcuts } from '../composables/defineShortcuts';
 export { defineLocale } from '../composables/defineLocale';
 export { useLocale } from '../composables/useLocale';
@@ -19,7 +20,6 @@ export declare const useColorMode: () => {
     readonly value: import("@vueuse/core").BasicColorMode;
     forced: boolean;
 };
-export declare const useAppConfig: () => any;
 export declare const useCookie: <T = string>(_name: string, _options?: Record<string, any>) => {
     value: Ref<T, T>;
     get: () => T;

package/dist/runtime/inertia/stubs.js

@@ -4,6 +4,7 @@ import appConfig from "#build/app.config";
 import { useColorMode as useColorModeVueUse } from "@vueuse/core";
 import { usePage } from "@inertiajs/vue3";
 export { useHead } from "@unhead/vue";
+export { useAppConfig } from "../vue/composables/useAppConfig.js";
 export { defineShortcuts } from "../composables/defineShortcuts.js";
 export { defineLocale } from "../composables/defineLocale.js";
 export { useLocale } from "../composables/useLocale.js";
@@ -37,7 +38,6 @@ export const useColorMode = () => {
     forced: false
   };
 };
-export const useAppConfig = () => appConfig;
 export const useCookie = (_name, _options = {}) => {
   const value = ref(null);
   return {

package/dist/runtime/prose/A.vue

@@ -16,7 +16,7 @@ const b24ui = computed(() => tv({ extend: tv(theme), ...appConfig.b24ui?.prose?.
 </script>
 
 <template>
-  <a :class="b24ui.base({ class: [props.class, props.b24ui?.base] })">
+  <a :class="b24ui.base({ class: [props.b24ui?.base, props.class] })">
     <slot />
   </a>
 </template>

package/dist/runtime/prose/Blockquote.vue

@@ -16,7 +16,7 @@ const b24ui = computed(() => tv({ extend: tv(theme), ...appConfig.b24ui?.prose?.
 </script>
 
 <template>
-  <blockquote :class="b24ui.base({ class: [props.class, props.b24ui?.base] })">
+  <blockquote :class="b24ui.base({ class: [props.b24ui?.base, props.class] })">
     <slot />
   </blockquote>
 </template>

package/dist/runtime/prose/Code.vue

@@ -20,6 +20,6 @@ const b24ui = computed(() => tv({ extend: tv(theme), ...appConfig.b24ui?.prose?.
 
 <template>
   <code
-    :class="b24ui.base({ class: [props.class, props.b24ui?.base] })"
+    :class="b24ui.base({ class: [props.b24ui?.base, props.class] })"
   ><slot /></code>
 </template>

package/dist/runtime/prose/Em.vue

@@ -16,7 +16,7 @@ const b24ui = computed(() => tv({ extend: tv(theme), ...appConfig.b24ui?.prose?.
 </script>
 
 <template>
-  <em :class="b24ui.base({ class: [props.class, props.b24ui?.base] })">
+  <em :class="b24ui.base({ class: [props.b24ui?.base, props.class] })">
     <slot />
   </em>
 </template>

package/dist/runtime/prose/H1.vue

@@ -16,7 +16,7 @@ const b24ui = computed(() => tv({ extend: tv(theme), ...appConfig.b24ui?.prose?.
 </script>
 
 <template>
-  <h1 :class="b24ui.base({ class: [props.class, props.b24ui?.base] })">
+  <h1 :class="b24ui.base({ class: [props.b24ui?.base, props.class] })">
     <slot />
   </h1>
 </template>

package/dist/runtime/prose/H2.vue

@@ -16,7 +16,7 @@ const b24ui = computed(() => tv({ extend: tv(theme), ...appConfig.b24ui?.prose?.
 </script>
 
 <template>
-  <h2 :class="b24ui.base({ class: [props.class, props.b24ui?.base] })">
+  <h2 :class="b24ui.base({ class: [props.b24ui?.base, props.class] })">
     <slot />
   </h2>
 </template>

package/dist/runtime/prose/H3.vue

@@ -16,7 +16,7 @@ const b24ui = computed(() => tv({ extend: tv(theme), ...appConfig.b24ui?.prose?.
 </script>
 
 <template>
-  <h3 :class="b24ui.base({ class: [props.class, props.b24ui?.base] })">
+  <h3 :class="b24ui.base({ class: [props.b24ui?.base, props.class] })">
     <slot />
   </h3>
 </template>

package/dist/runtime/prose/H4.vue

@@ -16,7 +16,7 @@ const b24ui = computed(() => tv({ extend: tv(theme), ...appConfig.b24ui?.prose?.
 </script>
 
 <template>
-  <h4 :class="b24ui.base({ class: [props.class, props.b24ui?.base] })">
+  <h4 :class="b24ui.base({ class: [props.b24ui?.base, props.class] })">
     <slot />
   </h4>
 </template>

package/dist/runtime/prose/H5.vue

@@ -16,7 +16,7 @@ const b24ui = computed(() => tv({ extend: tv(theme), ...appConfig.b24ui?.prose?.
 </script>
 
 <template>
-  <h5 :class="b24ui.base({ class: [props.class, props.b24ui?.base] })">
+  <h5 :class="b24ui.base({ class: [props.b24ui?.base, props.class] })">
     <slot />
   </h5>
 </template>

package/dist/runtime/prose/H6.vue

@@ -16,7 +16,7 @@ const b24ui = computed(() => tv({ extend: tv(theme), ...appConfig.b24ui?.prose?.
 </script>
 
 <template>
-  <h6 :class="b24ui.base({ class: [props.class, props.b24ui?.base] })">
+  <h6 :class="b24ui.base({ class: [props.b24ui?.base, props.class] })">
     <slot />
   </h6>
 </template>

package/dist/runtime/prose/Hr.vue

@@ -15,5 +15,5 @@ const b24ui = computed(() => tv({ extend: tv(theme), ...appConfig.b24ui?.prose?.
 </script>
 
 <template>
-  <hr :class="b24ui.base({ class: [props.class, props.b24ui?.base] })">
+  <hr :class="b24ui.base({ class: [props.b24ui?.base, props.class] })">
 </template>

package/dist/runtime/prose/Img.vue

@@ -15,5 +15,5 @@ const b24ui = computed(() => tv({ extend: tv(theme), ...appConfig.b24ui?.prose?.
 </script>
 
 <template>
-  <img :class="b24ui.base({ class: [props.class, props.b24ui?.base] })">
+  <img :class="b24ui.base({ class: [props.b24ui?.base, props.class] })">
 </template>

package/dist/runtime/prose/Li.vue

@@ -16,7 +16,7 @@ const b24ui = computed(() => tv({ extend: tv(theme), ...appConfig.b24ui?.prose?.
 </script>
 
 <template>
-  <li :class="b24ui.base({ class: [props.class, props.b24ui?.base] })">
+  <li :class="b24ui.base({ class: [props.b24ui?.base, props.class] })">
     <slot />
   </li>
 </template>

package/dist/runtime/prose/Ol.vue

@@ -16,7 +16,7 @@ const b24ui = computed(() => tv({ extend: tv(theme), ...appConfig.b24ui?.prose?.
 </script>
 
 <template>
-  <ol :class="b24ui.base({ class: [props.class, props.b24ui?.base] })">
+  <ol :class="b24ui.base({ class: [props.b24ui?.base, props.class] })">
     <slot />
   </ol>
 </template>

package/dist/runtime/prose/P.vue

@@ -16,7 +16,7 @@ const b24ui = computed(() => tv({ extend: tv(theme), ...appConfig.b24ui?.prose?.
 </script>
 
 <template>
-  <p :class="b24ui.base({ class: [props.class, props.b24ui?.base] })">
+  <p :class="b24ui.base({ class: [props.b24ui?.base, props.class] })">
     <slot />
   </p>
 </template>