@bitrix24/b24ui-nuxt 0.6.8 → 0.7.1

package/dist/runtime/components/Switch.vue

@@ -54,7 +54,7 @@ function onUpdate(value) {
 </script>
 
 <template>
-  <Primitive :as="as" :class="b24ui.root({ class: [props.class, props.b24ui?.root] })">
+  <Primitive :as="as" :class="b24ui.root({ class: [props.b24ui?.root, props.class] })">
     <div :class="b24ui.container({ class: props.b24ui?.container })">
       <SwitchRoot
         :id="id"

package/dist/runtime/components/Tabs.vue

@@ -3,7 +3,7 @@ import theme from "#build/b24ui/tabs";
 </script>
 
 <script setup>
-import { computed } from "vue";
+import { ref, computed } from "vue";
 import { TabsRoot, TabsList, TabsIndicator, TabsTrigger, TabsContent, useForwardPropsEmits } from "reka-ui";
 import { reactivePick } from "@vueuse/core";
 import { useAppConfig } from "#imports";
@@ -39,26 +39,42 @@ const b24ui = computed(() => tv({ extend: tv(theme), ...appConfig.b24ui?.tabs ||
   size: props.size,
   orientation: props.orientation
 }));
+const triggersRef = ref([]);
+defineExpose({
+  triggersRef
+});
 </script>
 
 <template>
-  <TabsRoot v-bind="rootProps" :class="b24ui.root({ class: [props.class, props.b24ui?.root] })">
+  <TabsRoot v-bind="rootProps" :class="b24ui.root({ class: [props.b24ui?.root, props.class] })">
     <TabsList :class="b24ui.list({ class: props.b24ui?.list })">
       <TabsIndicator :class="b24ui.indicator({ class: props.b24ui?.indicator })" />
 
       <slot name="list-leading" />
 
-      <TabsTrigger v-for="(item, index) in items" :key="index" :value="item.value || String(index)" :disabled="item.disabled" :class="b24ui.trigger({ class: props.b24ui?.trigger })">
+      <TabsTrigger
+        v-for="(item, index) in items"
+        :key="index"
+        :ref="(el) => triggersRef[index] = el"
+        :value="item.value || String(index)"
+        :disabled="item.disabled"
+        :class="b24ui.trigger({ class: [props.b24ui?.trigger, item.b24ui?.trigger] })"
+      >
         <slot name="leading" :item="item" :index="index">
           <Component
             :is="item.icon"
             v-if="item.icon"
-            :class="b24ui.leadingIcon({ class: props.b24ui?.leadingIcon })"
+            :class="b24ui.leadingIcon({ class: [props.b24ui?.leadingIcon, item.b24ui?.leadingIcon] })"
+          />
+          <B24Avatar
+            v-else-if="item.avatar"
+            :size="item.b24ui?.leadingAvatarSize || props.b24ui?.leadingAvatarSize || b24ui.leadingAvatarSize()"
+            v-bind="item.avatar"
+            :class="b24ui.leadingAvatar({ class: [props.b24ui?.leadingAvatar, item.b24ui?.leadingAvatar] })"
           />
-          <B24Avatar v-else-if="item.avatar" :size="props.b24ui?.leadingAvatarSize || b24ui.leadingAvatarSize()" v-bind="item.avatar" :class="b24ui.leadingAvatar({ class: props.b24ui?.leadingAvatar })" />
         </slot>
 
-        <span v-if="getLabel(item) || !!slots.default" :class="b24ui.label({ class: props.b24ui?.label })">
+        <span v-if="getLabel(item) || !!slots.default" :class="b24ui.label({ class: [props.b24ui?.label, item.b24ui?.label] })">
           <slot :item="item" :index="index">{{ getLabel(item) }}</slot>
         </span>
 
@@ -69,7 +85,12 @@ const b24ui = computed(() => tv({ extend: tv(theme), ...appConfig.b24ui?.tabs ||
     </TabsList>
 
     <template v-if="!!content">
-      <TabsContent v-for="(item, index) in items" :key="index" :value="item.value || String(index)" :class="b24ui.content({ class: props.b24ui?.content })">
+      <TabsContent
+        v-for="(item, index) in items"
+        :key="index"
+        :value="item.value || String(index)"
+        :class="b24ui.content({ class: [props.b24ui?.content, item.b24ui?.content, item.class] })"
+      >
         <slot :name="item.slot || 'content'" :item="item" :index="index">
           {{ item.content }}
         </slot>

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

@@ -1,3 +1,4 @@
+import type { ComponentPublicInstance } from 'vue';
 import type { TabsRootProps, TabsRootEmits } from 'reka-ui';
 import type { AppConfig } from '@nuxt/schema';
 import theme from '#build/b24ui/tabs';
@@ -16,6 +17,8 @@ export interface TabsItem {
     /** A unique value for the tab item. Defaults to the index. */
     value?: string | number;
     disabled?: boolean;
+    class?: any;
+    b24ui?: Pick<Tabs['slots'], 'trigger' | 'leadingIcon' | 'leadingAvatarSize' | 'leadingAvatar' | 'label' | 'content'>;
     [key: string]: any;
 }
 export interface TabsProps<T extends TabsItem = TabsItem> extends Pick<TabsRootProps<string | number>, 'defaultValue' | 'modelValue' | 'activationMode' | 'unmountOnHide'> {
@@ -75,7 +78,9 @@ declare const _default: <T extends TabsItem>(__VLS_props: NonNullable<Awaited<ty
     props: __VLS_PrettifyLocal<Pick<Partial<{}> & Omit<{
         readonly "onUpdate:modelValue"?: ((payload: string | number) => any) | undefined;
     } & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, never>, "onUpdate:modelValue"> & TabsProps<T> & Partial<{}>> & import("vue").PublicProps;
-    expose(exposed: import("vue").ShallowUnwrapRef<{}>): void;
+    expose(exposed: import("vue").ShallowUnwrapRef<{
+        triggersRef: import("vue").Ref<ComponentPublicInstance[], ComponentPublicInstance[]>;
+    }>): void;
     attrs: any;
     slots: TabsSlots<T>;
     emit: (evt: "update:modelValue", payload: string | number) => void;

package/dist/runtime/components/Textarea.vue

@@ -5,6 +5,7 @@ import theme from "#build/b24ui/textarea";
 <script setup>
 import { ref, computed, onMounted, nextTick, watch } from "vue";
 import { Primitive } from "reka-ui";
+import { useVModel } from "@vueuse/core";
 import { useAppConfig } from "#imports";
 import { useComponentIcons } from "../composables/useComponentIcons";
 import { useFormField } from "../composables/useFormField";
@@ -33,6 +34,9 @@ const props = defineProps({
   tag: { type: String, required: false },
   tagColor: { type: null, required: false },
   highlight: { type: Boolean, required: false },
+  modelValue: { type: null, required: false },
+  defaultValue: { type: null, required: false },
+  modelModifiers: { type: Object, required: false },
   class: { type: null, required: false },
   b24ui: { type: null, required: false },
   icon: { type: [Function, Object], required: false },
@@ -41,9 +45,9 @@ const props = defineProps({
   trailing: { type: Boolean, required: false },
   trailingIcon: { type: [Function, Object], required: false }
 });
-const slots = defineSlots();
 const emits = defineEmits(["update:modelValue", "blur", "change"]);
-const [modelValue, modelModifiers] = defineModel({ type: [String, Number, null] });
+const slots = defineSlots();
+const modelValue = useVModel(props, "modelValue", emits, { defaultValue: props.defaultValue });
 const appConfig = useAppConfig();
 const { emitFormFocus, emitFormBlur, emitFormInput, emitFormChange, color, id, name, highlight, disabled, ariaAttrs } = useFormField(props, { deferInputValidation: true });
 const { isLeading, isTrailing, leadingIconName, trailingIconName } = useComponentIcons(props);
@@ -65,13 +69,13 @@ const b24ui = computed(() => tv({ extend: tv(theme), ...appConfig.b24ui?.textare
 }));
 const textareaRef = ref(null);
 function updateInput(value) {
-  if (modelModifiers.trim) {
+  if (props.modelModifiers?.trim) {
     value = value?.trim() ?? null;
   }
-  if (modelModifiers.number) {
+  if (props.modelModifiers?.number) {
     value = looseToNumber(value);
   }
-  if (modelModifiers.nullify) {
+  if (props.modelModifiers?.nullify) {
     value ||= null;
   }
   modelValue.value = value;
@@ -79,16 +83,16 @@ function updateInput(value) {
 }
 function onInput(event) {
   autoResize();
-  if (!modelModifiers.lazy) {
+  if (!props.modelModifiers?.lazy) {
     updateInput(event.target.value);
   }
 }
 function onChange(event) {
   const value = event.target.value;
-  if (modelModifiers.lazy) {
+  if (props.modelModifiers?.lazy) {
     updateInput(value);
   }
-  if (modelModifiers.trim) {
+  if (props.modelModifiers?.trim) {
     event.target.value = value.trim();
   }
   emitFormChange();
@@ -138,7 +142,7 @@ defineExpose({
 </script>
 
 <template>
-  <Primitive :as="as" :class="b24ui.root({ class: [props.class, props.b24ui?.root] })">
+  <Primitive :as="as" :class="b24ui.root({ class: [props.b24ui?.root, props.class] })">
     <div v-if="isTag" :class="b24ui.tag({ class: props.b24ui?.tag })">
       {{ props.tag }}
     </div>

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

@@ -3,7 +3,8 @@ import theme from '#build/b24ui/textarea';
 import type { UseComponentIconsProps } from '../composables/useComponentIcons';
 import type { ComponentConfig } from '../types/utils';
 type Textarea = ComponentConfig<typeof theme, AppConfig, 'textarea'>;
-export interface TextareaProps extends UseComponentIconsProps {
+type TextareaValue = string | number | null;
+export interface TextareaProps<T extends TextareaValue = TextareaValue> extends UseComponentIconsProps {
     /**
      * The element or component this component should render as.
      * @defaultValue 'div'
@@ -81,11 +82,20 @@ export interface TextareaProps extends UseComponentIconsProps {
      * @defaultValue false
      */
     highlight?: boolean;
+    modelValue?: T;
+    defaultValue?: T;
+    modelModifiers?: {
+        string?: boolean;
+        number?: boolean;
+        trim?: boolean;
+        lazy?: boolean;
+        nullify?: boolean;
+    };
     class?: any;
     b24ui?: Textarea['slots'];
 }
-export interface TextareaEmits {
-    (e: 'update:modelValue', payload: string | number): void;
+export interface TextareaEmits<T extends TextareaValue = TextareaValue> {
+    (e: 'update:modelValue', payload: T): void;
     (e: 'blur', event: FocusEvent): void;
     (e: 'change', event: Event): void;
 }
@@ -94,31 +104,22 @@ export interface TextareaSlots {
     default(props?: {}): any;
     trailing(props?: {}): any;
 }
-declare const _default: __VLS_WithSlots<import("vue").DefineComponent<TextareaProps & {
-    modelValue?: string | number | null;
-}, {
-    textareaRef: import("vue").Ref<HTMLTextAreaElement | null, HTMLTextAreaElement | null>;
-}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-    "update:modelValue": (value: string | number | null | undefined) => any;
-} & {
-    blur: (event: FocusEvent) => any;
-    change: (event: Event) => any;
-    "update:modelValue": (payload: string | number) => any;
-}, string, import("vue").PublicProps, Readonly<TextareaProps & {
-    modelValue?: string | number | null;
-}> & Readonly<{
-    onBlur?: ((event: FocusEvent) => any) | undefined;
-    onChange?: ((event: Event) => any) | undefined;
-    "onUpdate:modelValue"?: ((payload: string | number) => any) | undefined;
-}>, {
-    autofocusDelay: number;
-    autoresizeDelay: number;
-    rows: number;
-    maxrows: number;
-}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>, TextareaSlots>;
-export default _default;
-type __VLS_WithSlots<T, S> = T & {
-    new (): {
-        $slots: S;
-    };
+declare const _default: <T extends TextareaValue>(__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<Pick<Partial<{}> & Omit<{
+        readonly onBlur?: ((event: FocusEvent) => any) | undefined;
+        readonly onChange?: ((event: Event) => any) | undefined;
+        readonly "onUpdate:modelValue"?: ((payload: T) => any) | undefined;
+    } & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, never>, "onBlur" | "onChange" | "onUpdate:modelValue"> & TextareaProps<T> & Partial<{}>> & import("vue").PublicProps;
+    expose(exposed: import("vue").ShallowUnwrapRef<{
+        textareaRef: import("vue").Ref<HTMLTextAreaElement | null, HTMLTextAreaElement | null>;
+    }>): void;
+    attrs: any;
+    slots: TextareaSlots;
+    emit: TextareaEmits<T>;
+}>) => import("vue").VNode & {
+    __ctx?: Awaited<typeof __VLS_setup>;
 };
+export default _default;
+type __VLS_PrettifyLocal<T> = {
+    [K in keyof T]: T[K];
+} & {};

package/dist/runtime/components/Toast.vue

@@ -3,7 +3,7 @@ import theme from "#build/b24ui/toast";
 </script>
 
 <script setup>
-import { ref, computed, onMounted } from "vue";
+import { ref, computed, onMounted, nextTick } from "vue";
 import { ToastRoot, ToastTitle, ToastDescription, ToastAction, ToastClose, useForwardPropsEmits } from "reka-ui";
 import { reactivePick } from "@vueuse/core";
 import { useAppConfig } from "#imports";
@@ -20,6 +20,7 @@ const props = defineProps({
   avatar: { type: Object, required: false },
   color: { type: null, required: false },
   orientation: { type: null, required: false, default: "vertical" },
+  progress: { type: Boolean, required: false, default: true },
   actions: { type: Array, required: false },
   close: { type: [Boolean, Object], required: false, default: true },
   closeIcon: { type: [Function, Object], required: false },
@@ -46,9 +47,9 @@ onMounted(() => {
   if (!el.value) {
     return;
   }
-  setTimeout(() => {
-    height.value = el.value.$el.getBoundingClientRect()?.height;
-  }, 0);
+  nextTick(() => {
+    height.value = el.value?.$el?.getBoundingClientRect()?.height;
+  });
 });
 defineExpose({
   height
@@ -61,7 +62,7 @@ defineExpose({
     v-slot="{ remaining, duration }"
     v-bind="rootProps"
     :data-orientation="orientation"
-    :class="b24ui.root({ class: [props.class, props.b24ui?.root] })"
+    :class="b24ui.root({ class: [props.b24ui?.root, props.class] })"
     :style="{ '--height': height }"
   >
     <slot name="leading">
@@ -127,6 +128,6 @@ defineExpose({
       </ToastClose>
     </div>
 
-    <div v-if="remaining > 0 && duration" :class="b24ui.progress({ class: props.b24ui?.progress })" :style="{ width: `${remaining / duration * 100}%` }" />
+    <div v-if="progress && remaining > 0 && duration" :class="b24ui.progress({ class: props.b24ui?.progress })" :style="{ width: `${remaining / duration * 100}%` }" />
   </ToastRoot>
 </template>

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

@@ -26,6 +26,11 @@ export interface ToastProps extends Pick<ToastRootProps, 'defaultOpen' | 'open'
      * @defaultValue 'vertical'
      */
     orientation?: Toast['variants']['orientation'];
+    /**
+     * Whether to show the progress bar.
+     * @defaultValue true
+     */
+    progress?: boolean;
     /**
      * Display a list of actions:
      * - under the title and description when orientation is `vertical`
@@ -147,6 +152,7 @@ declare const _default: __VLS_WithSlots<import("vue").DefineComponent<ToastProps
     }>, "currentTarget">) => any) | undefined;
 }>, {
     close: boolean | Partial<ButtonProps>;
+    progress: boolean;
     orientation: Toast["variants"]["orientation"];
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>, ToastSlots>;
 export default _default;

package/dist/runtime/components/Toaster.vue

@@ -18,6 +18,7 @@ import B24Toast from "./Toast.vue";
 const props = defineProps({
   position: { type: null, required: false, default: "top-right" },
   expand: { type: Boolean, required: false, default: true },
+  progress: { type: Boolean, required: false, default: true },
   portal: { type: [Boolean, String], required: false, skipCheck: true, default: true },
   duration: { type: Number, required: false, default: 5e3 },
   class: { type: null, required: false },
@@ -76,6 +77,7 @@ function getOffset(index) {
       v-for="(toast, index) in toasts"
       :key="toast.id"
       ref="refs"
+      :progress="progress"
       v-bind="proxyToastProps(toast)"
       :close="toast.close"
       :data-expanded="expanded"
@@ -88,9 +90,7 @@ function getOffset(index) {
   '--translate': expanded ? 'calc(var(--offset) * var(--translate-factor))' : 'calc(var(--before) * var(--gap))',
   '--transform': 'translateY(var(--translate)) scale(var(--scale))'
 }"
-      :class="[b24ui.base(), {
-  'cursor-pointer': !!toast.onClick
-}]"
+      :class="b24ui.base({ class: [props.b24ui?.base, toast.onClick ? 'cursor-pointer' : void 0] })"
       @update:open="onUpdateOpen($event, toast.id)"
       @click="toast.onClick && toast.onClick(toast)"
     />
@@ -98,7 +98,7 @@ function getOffset(index) {
     <ToastPortal v-bind="portalProps">
       <ToastViewport
         :data-expanded="expanded"
-        :class="b24ui.viewport({ class: [props.class, props.b24ui?.viewport] })"
+        :class="b24ui.viewport({ class: [props.b24ui?.viewport, props.class] })"
         :style="{
   '--scale-factor': '0.05',
   '--translate-factor': position?.startsWith('top') ? '1px' : '-1px',

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

@@ -14,6 +14,11 @@ export interface ToasterProps extends Omit<ToastProviderProps, 'swipeDirection'>
      * @defaultValue true
      */
     expand?: boolean;
+    /**
+     * Whether to show the progress bar on all toasts.
+     * @defaultValue true
+     */
+    progress?: boolean;
     /**
      * Render the toaster in a portal.
      * @defaultValue true
@@ -30,6 +35,7 @@ export interface ToasterSlots {
     default(props?: {}): any;
 }
 declare const _default: __VLS_WithSlots<import("vue").DefineComponent<ToasterProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<ToasterProps> & Readonly<{}>, {
+    progress: boolean;
     position: Toaster["variants"]["position"];
     duration: number;
     expand: boolean;

package/dist/runtime/components/Tooltip.vue

@@ -17,6 +17,7 @@ const props = defineProps({
   content: { type: Object, required: false },
   arrow: { type: [Boolean, Object], required: false },
   portal: { type: [Boolean, String], required: false, skipCheck: true, default: true },
+  reference: { type: null, required: false },
   class: { type: null, required: false },
   b24ui: { type: null, required: false },
   defaultOpen: { type: Boolean, required: false },
@@ -41,12 +42,18 @@ const b24ui = computed(() => tv({ extend: tv(theme), ...appConfig.b24ui?.tooltip
 
 <template>
   <TooltipRoot v-slot="{ open }" v-bind="rootProps">
-    <TooltipTrigger v-if="!!slots.default" v-bind="$attrs" as-child :class="props.class">
+    <TooltipTrigger
+      v-if="!!slots.default || !!reference"
+      v-bind="$attrs"
+      as-child
+      :reference="reference"
+      :class="props.class"
+    >
       <slot :open="open" />
     </TooltipTrigger>
 
     <TooltipPortal v-bind="portalProps">
-      <TooltipContent v-bind="contentProps" :class="b24ui.content({ class: [!slots.default && props.class, props.b24ui?.content] })">
+      <TooltipContent v-bind="contentProps" :class="b24ui.content({ class: [!slots.default && props.b24ui?.content, props.class] })">
         <slot name="content">
           <span v-if="text" :class="b24ui.text({ class: props.b24ui?.text })">{{ text }}</span>
 

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

@@ -1,4 +1,4 @@
-import type { TooltipRootProps, TooltipRootEmits, TooltipContentProps, TooltipContentEmits, TooltipArrowProps } from 'reka-ui';
+import type { TooltipRootProps, TooltipRootEmits, TooltipContentProps, TooltipContentEmits, TooltipArrowProps, TooltipTriggerProps } from 'reka-ui';
 import type { AppConfig } from '@nuxt/schema';
 import theme from '#build/b24ui/tooltip';
 import type { KbdProps } from '../types';
@@ -24,6 +24,7 @@ export interface TooltipProps extends TooltipRootProps {
      * @defaultValue true
      */
     portal?: boolean | string | HTMLElement;
+    reference?: TooltipTriggerProps['reference'];
     class?: any;
     b24ui?: Tooltip['slots'];
 }

package/dist/runtime/components/content/TableWrapper.vue

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

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

@@ -1,4 +1,5 @@
 import type { Locale, Direction } from '../types/locale';
+import type { DeepPartial } from '../types/utils';
 interface DefineLocaleOptions<M> {
     name: string;
     code: string;
@@ -7,4 +8,5 @@ interface DefineLocaleOptions<M> {
     messages: M;
 }
 export declare function defineLocale<M>(options: DefineLocaleOptions<M>): Locale<M>;
+export declare function extendLocale<M>(locale: Locale<M>, options: Partial<DefineLocaleOptions<DeepPartial<M>>>): Locale<M>;
 export {};

package/dist/runtime/composables/defineLocale.js

@@ -3,3 +3,7 @@ import { defu } from "defu";
 export function defineLocale(options) {
   return defu(options, { dir: "ltr" });
 }
+// @__NO_SIDE_EFFECTS__
+export function extendLocale(locale, options) {
+  return defu(options, locale);
+}

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 {};