@sewadah/selaras 0.3.0 → 0.3.2

package/dist/runtime/components/Dropdown.vue

@@ -1,14 +1,26 @@
 <script setup>
 import { DropdownMenuArrow, DropdownMenuContent, DropdownMenuItem, DropdownMenuPortal, DropdownMenuRoot, DropdownMenuSeparator, DropdownMenuTrigger } from "reka-ui";
-import { computed, getCurrentInstance, ref, watch } from "vue";
+import { computed, getCurrentInstance, onMounted, ref, useId, watch, watchPostEffect } from "vue";
+import { NuxtLink } from "#components";
+import { useIsMobile } from "../composables/use-media-query";
+import { useMessages } from "../composables/use-messages";
+import { vHotkey } from "../directives/hotkey";
+import ShortcutHint from "../internal/ShortcutHint.vue";
 import { dropdownTheme } from "../theme/dropdown";
-import { resolveSlot, useComponentTheme, useThemeBindings } from "../utils/ui";
+import { arrowContentProps, arrowElementProps } from "../utils/arrow";
+import { overlayPortalProps } from "../utils/overlay";
+import { resolveSlot, useComponentTheme, useFallthroughProps, useThemeBindings } from "../utils/ui";
 import Icon from "./Icon.vue";
+import Modal from "./Modal.vue";
+defineOptions({ inheritAttrs: false });
 const props = defineProps({
   items: { type: Array, required: true },
   open: { type: Boolean, required: false, default: void 0 },
   defaultOpen: { type: Boolean, required: false },
-  arrow: { type: Boolean, required: false, default: false },
+  arrow: { type: [Boolean, Object], required: false, default: false },
+  positioning: { type: Object, required: false },
+  portal: { type: [Boolean, String], required: false, skipCheck: true, default: void 0 },
+  adaptive: { type: Boolean, required: false },
   ui: { type: Object, required: false }
 });
 const emit = defineEmits(["update:open"]);
@@ -25,42 +37,164 @@ function onUpdateOpen(value) {
 }
 const theme = useComponentTheme("dropdown", dropdownTheme);
 const themeBindings = useThemeBindings();
+const messages = useMessages();
+const isMobile = useIsMobile();
+const modalId = `selaras-dropdown-modal-${useId()}`;
+const triggerElement = ref();
 const ui = computed(() => theme.value());
-const contentProps = computed(() => resolveSlot(ui.value.content, props.ui?.content));
-const arrowProps = computed(() => resolveSlot(ui.value.arrow, props.ui?.arrow));
+const triggerProps = useFallthroughProps();
+const contentProps = computed(() => ({ ...resolveSlot(ui.value.content, props.ui?.content), ...arrowContentProps(props.arrow), ...props.positioning }));
+const portalProps = computed(() => overlayPortalProps(props.portal));
+const arrowProps = computed(() => ({ ...resolveSlot(ui.value.arrow, props.ui?.arrow), ...arrowElementProps(props.arrow) }));
 function itemPropsFor(item) {
   return resolveSlot(theme.value({ destructive: item.destructive }).item, props.ui?.item);
 }
+function mobileItemPropsFor(item) {
+  return resolveSlot(theme.value({ destructive: item.destructive, mobile: true }).item, props.ui?.item);
+}
+const mobileListProps = computed(() => resolveSlot(ui.value.mobileList, props.ui?.mobileList));
+const mobileGroupProps = computed(() => resolveSlot(ui.value.mobileGroup, props.ui?.mobileGroup));
 function iconPropsFor(item) {
   return resolveSlot(theme.value({ destructive: item.destructive }).icon, props.ui?.icon);
 }
+function hotkeyFor(item) {
+  return item.hotkey && item.shortcut && !item.disabled ? { keys: item.shortcut, when: () => internalOpen.value } : void 0;
+}
 const separatorProps = computed(() => resolveSlot(ui.value.separator, props.ui?.separator));
+const mobilePresentation = ref(false);
+const isOpen = computed(() => isControlled ? props.open ?? false : internalOpen.value);
+watch(isOpen, (open) => {
+  if (open)
+    mobilePresentation.value = !!props.adaptive && isMobile.value;
+});
+onMounted(() => {
+  if (isOpen.value)
+    mobilePresentation.value = !!props.adaptive && isMobile.value;
+});
+function onUpdateMenuOpen(value) {
+  onUpdateOpen(value);
+}
+const desktopOpen = computed(() => isOpen.value && !mobilePresentation.value);
+const mobileOpen = computed(() => isOpen.value && mobilePresentation.value);
+const adaptiveUi = computed(() => ({
+  content: {
+    class: "rounded-[var(--selaras-resolved-radius-md)]",
+    id: modalId
+  }
+}));
+watchPostEffect(() => {
+  if (!props.adaptive)
+    return;
+  const element = triggerElement.value instanceof HTMLElement ? triggerElement.value : triggerElement.value?.$el;
+  if (!element)
+    return;
+  const dialog = isOpen.value ? mobilePresentation.value : isMobile.value;
+  element.setAttribute("aria-haspopup", dialog ? "dialog" : "menu");
+  element.setAttribute("aria-expanded", String(isOpen.value));
+  if (dialog && isOpen.value)
+    element.setAttribute("aria-controls", modalId);
+  else if (element.getAttribute("aria-controls") === modalId)
+    element.removeAttribute("aria-controls");
+});
+function selectMobileItem(item) {
+  item.onSelect?.();
+  onUpdateOpen(false);
+}
+function onModalAfterLeave() {
+  if (!isOpen.value)
+    mobilePresentation.value = false;
+}
 </script>
 
 <template>
-  <DropdownMenuRoot :open="internalOpen" @update:open="onUpdateOpen">
-    <DropdownMenuTrigger as-child>
+  <DropdownMenuRoot :open="desktopOpen" @update:open="onUpdateMenuOpen">
+    <DropdownMenuTrigger ref="triggerElement" as-child v-bind="triggerProps">
       <slot />
     </DropdownMenuTrigger>
-    <DropdownMenuPortal>
+    <DropdownMenuPortal v-if="!mobilePresentation" v-bind="portalProps">
       <DropdownMenuContent :side-offset="6" align="start" :data-selaras-theme="themeBindings['data-selaras-theme']" :data-selaras-mode="themeBindings['data-selaras-mode']" :style="themeBindings.style" v-bind="contentProps">
         <template v-for="(group, groupIndex) in items" :key="groupIndex">
           <DropdownMenuSeparator v-if="groupIndex > 0" v-bind="separatorProps" />
           <DropdownMenuItem
             v-for="(item, itemIndex) in group"
             :key="itemIndex"
+            v-hotkey="hotkeyFor(item)"
             :disabled="item.disabled"
+            :as-child="Boolean(item.to)"
             v-bind="itemPropsFor(item)"
             @select="item.onSelect?.()"
           >
-            <Icon v-if="item.icon" :name="item.icon" v-bind="iconPropsFor(item)" />
-            <slot name="item" :item="item">
-              {{ item.label }}
-            </slot>
+            <NuxtLink v-if="item.to" :to="item.to" :target="item.target" :rel="item.rel">
+              <Icon v-if="item.icon" :name="item.icon" v-bind="iconPropsFor(item)" />
+              <slot name="item" :item="item">
+                {{ item.label }}
+                <ShortcutHint :shortcut="item.shortcut" />
+              </slot>
+            </NuxtLink>
+            <template v-else>
+              <Icon v-if="item.icon" :name="item.icon" v-bind="iconPropsFor(item)" />
+              <slot name="item" :item="item">
+                {{ item.label }}
+                <ShortcutHint :shortcut="item.shortcut" />
+              </slot>
+            </template>
           </DropdownMenuItem>
         </template>
         <DropdownMenuArrow v-if="arrow" v-bind="arrowProps" />
       </DropdownMenuContent>
     </DropdownMenuPortal>
   </DropdownMenuRoot>
+
+  <Modal
+    v-if="mobilePresentation"
+    :open="mobileOpen"
+    :title="messages.dropdownMenu"
+    :description="messages.dropdownMenuDescription"
+    :close="false"
+    :ui="adaptiveUi"
+    @update:open="onUpdateOpen"
+    @after-leave="onModalAfterLeave"
+  >
+    <template #content>
+      <div v-bind="mobileListProps">
+        <template v-for="(group, groupIndex) in items" :key="groupIndex">
+          <div v-if="groupIndex > 0" role="separator" v-bind="separatorProps" />
+          <div v-bind="mobileGroupProps">
+            <template v-for="(item, itemIndex) in group" :key="itemIndex">
+              <!-- A disabled link renders as the disabled button below, which is inert. -->
+              <NuxtLink
+                v-if="item.to && !item.disabled"
+                v-hotkey="hotkeyFor(item)"
+                :to="item.to"
+                :target="item.target"
+                :rel="item.rel"
+                v-bind="mobileItemPropsFor(item)"
+                @click="selectMobileItem(item)"
+              >
+                <Icon v-if="item.icon" :name="item.icon" v-bind="iconPropsFor(item)" />
+                <slot name="item" :item="item">
+                  {{ item.label }}
+                  <ShortcutHint :shortcut="item.shortcut" />
+                </slot>
+              </NuxtLink>
+              <button
+                v-else
+                v-hotkey="hotkeyFor(item)"
+                type="button"
+                :disabled="item.disabled"
+                v-bind="mobileItemPropsFor(item)"
+                @click="selectMobileItem(item)"
+              >
+                <Icon v-if="item.icon" :name="item.icon" v-bind="iconPropsFor(item)" />
+                <slot name="item" :item="item">
+                  {{ item.label }}
+                  <ShortcutHint :shortcut="item.shortcut" />
+                </slot>
+              </button>
+            </template>
+          </div>
+        </template>
+      </div>
+    </template>
+  </Modal>
 </template>

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

@@ -1,4 +1,6 @@
 import type { DropdownThemeSlots } from '../theme/dropdown.js';
+import type { RoundedArrowConfig } from '../utils/arrow.js';
+import type { OverlayPortal, OverlayPositioning } from '../utils/overlay.js';
 import type { UiProp } from '../utils/ui.js';
 export interface DropdownItem {
     label: string;
@@ -7,28 +9,53 @@ export interface DropdownItem {
     /** Styles this item for a delete/remove-style action (danger text, danger-tinted hover) - just this one flag rather than the full color palette, since a menu item realistically only ever needs this one special case. */
     destructive?: boolean;
     onSelect?: () => void;
-    /** Not read by Dropdown's own default item rendering - carried purely so a custom #item slot override can display one. */
+    /** Displays a keyboard shortcut hint. */
     shortcut?: string;
+    /** Bind `shortcut` while this menu is open; activation follows the normal menu item click path. */
+    hotkey?: boolean;
+    /** Nuxt route or URL to navigate to instead of rendering an action item. */
+    to?: string;
+    /** Link target, for example `_blank`. */
+    target?: string;
+    rel?: string;
 }
 export interface DropdownProps {
     items: DropdownItem[][];
     open?: boolean;
     /** Initial visibility for an uncontrolled dropdown. Supplying `open` makes the parent authoritative. */
     defaultOpen?: boolean;
-    /** Shows a small pointer triangle connecting the menu to its trigger. */
-    arrow?: boolean;
+    /** Shows the pointer; an object configures its size, rounding, and edge clearance. */
+    arrow?: boolean | RoundedArrowConfig;
+    /** Anchored menu placement. */
+    positioning?: OverlayPositioning;
+    /** Teleport target, or `false` to render inline. Defaults to `body`. */
+    portal?: OverlayPortal;
+    /** Opens a dialog-style action list on mobile instead of the anchored menu. */
+    adaptive?: boolean;
     ui?: UiProp<DropdownThemeSlots>;
 }
 export interface DropdownEmits {
     'update:open': [value: boolean];
 }
-declare var __VLS_16: {}, __VLS_48: {
+declare var __VLS_17: {}, __VLS_55: {
+    item: DropdownItem;
+}, __VLS_67: {
+    item: DropdownItem;
+}, __VLS_102: {
+    item: DropdownItem;
+}, __VLS_114: {
     item: DropdownItem;
 };
 type __VLS_Slots = {} & {
-    default?: (props: typeof __VLS_16) => any;
+    default?: (props: typeof __VLS_17) => any;
+} & {
+    item?: (props: typeof __VLS_55) => any;
+} & {
+    item?: (props: typeof __VLS_67) => any;
+} & {
+    item?: (props: typeof __VLS_102) => any;
 } & {
-    item?: (props: typeof __VLS_48) => any;
+    item?: (props: typeof __VLS_114) => any;
 };
 declare const __VLS_base: import("vue").DefineComponent<DropdownProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     "update:open": (value: boolean) => any;

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

@@ -6,6 +6,8 @@ export interface FileTreeNode {
     /** A node with children renders as a directory, one without as a file - the same convention ContentNavigation's own tree uses. */
     children?: FileTreeNode[];
     icon?: string;
+    /** Optional language hint for resolving a file-type icon when the filename is not recognized. */
+    language?: string;
 }
 export interface FileTreeProps {
     items: FileTreeNode[];

package/dist/runtime/components/FileTree.vue

@@ -1,7 +1,8 @@
 <script setup>
-import { computed, ref } from "vue";
+import { computed, ref, toRaw } from "vue";
 import { useIcons } from "../composables/use-icons";
 import { fileTreeTheme } from "../theme/file-tree";
+import { resolveFileIcon } from "../utils/file-icons";
 import { resolveRegisteredColorRole } from "../utils/registered-colors";
 import { resolveSlot, useComponentTheme, useRootProps } from "../utils/ui";
 import Icon from "./Icon.vue";
@@ -31,11 +32,14 @@ function toggle(index) {
 function selectFile(node) {
   emit("update:selected", node);
 }
+function isSelected(node) {
+  return props.selected != null && toRaw(props.selected) === toRaw(node);
+}
 function iconFor(node, index) {
   if (node.icon)
     return node.icon;
   if (!node.children)
-    return icons.value.file;
+    return resolveFileIcon(node.language, node.name) ?? icons.value.file;
   return isExpanded(index) ? icons.value.folderOpen : icons.value.folder;
 }
 const theme = useComponentTheme("fileTree", fileTreeTheme);
@@ -46,14 +50,14 @@ const itemProps = computed(() => resolveSlot(ui.value.item, props.ui?.item));
 const iconProps = computed(() => resolveSlot(ui.value.icon, props.ui?.icon));
 const labelProps = computed(() => resolveSlot(ui.value.label, props.ui?.label));
 function rowProps(node) {
-  return resolveSlot(theme.value({ isNested: props.isNested, selected: props.selected === node, color: effectiveColor.value }).row, props.ui?.row);
+  return resolveSlot(theme.value({ isNested: props.isNested, selected: isSelected(node), color: effectiveColor.value }).row, props.ui?.row);
 }
 </script>
 
 <template>
   <ul :data-selaras-color="effectiveColor" v-bind="rootProps">
     <li v-for="(node, index) in items" :key="node.name" v-bind="itemProps">
-      <button type="button" v-bind="rowProps(node)" @click="node.children ? toggle(index) : selectFile(node)">
+      <button type="button" :aria-current="isSelected(node) ? 'true' : void 0" v-bind="rowProps(node)" @click="node.children ? toggle(index) : selectFile(node)">
         <Icon :name="iconFor(node, index)" v-bind="iconProps" />
         <span v-bind="labelProps">{{ node.name }}</span>
       </button>

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

@@ -6,6 +6,8 @@ export interface FileTreeNode {
     /** A node with children renders as a directory, one without as a file - the same convention ContentNavigation's own tree uses. */
     children?: FileTreeNode[];
     icon?: string;
+    /** Optional language hint for resolving a file-type icon when the filename is not recognized. */
+    language?: string;
 }
 export interface FileTreeProps {
     items: FileTreeNode[];

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

@@ -16,6 +16,10 @@ export interface FormFieldProps {
     size?: FormFieldVariants['size'];
     /** 'vertical' (default) stacks the label above the control; 'horizontal' places the label beside it, with the control filling the remaining row width. */
     orientation?: FormFieldVariants['orientation'];
+    /** 'floating' overlays the label on an empty control and lifts it on focus, open, or once filled. */
+    labelMode?: FormFieldVariants['labelMode'];
+    /** Explicit filled state for a custom or third-party control. */
+    filled?: boolean;
     ui?: UiProp<FormFieldThemeSlots>;
 }
 declare var __VLS_1: {}, __VLS_3: {

package/dist/runtime/components/FormField.vue

@@ -14,10 +14,13 @@ const props = defineProps({
   required: { type: Boolean, required: false },
   size: { type: null, required: false },
   orientation: { type: null, required: false, default: "vertical" },
+  labelMode: { type: null, required: false, default: "static" },
+  filled: { type: Boolean, required: false },
   ui: { type: Object, required: false }
 });
 const id = props.id ?? useId();
 const invalid = computed(() => !!props.error);
+const floatingLabel = computed(() => props.labelMode === "floating");
 const errorMessage = computed(() => typeof props.error === "string" ? props.error : void 0);
 const describedBy = computed(() => {
   const ids = [
@@ -32,11 +35,16 @@ provideFormField({
   labelId: props.label ? `${id}-label` : void 0,
   name: props.name,
   size: props.size,
+  floatingLabel,
   invalid,
   describedBy
 });
 const theme = useComponentTheme("formField", formFieldTheme);
-const ui = computed(() => theme.value({ size: props.size, orientation: props.orientation }));
+const ui = computed(() => theme.value({
+  size: props.size,
+  orientation: floatingLabel.value ? "vertical" : props.orientation,
+  labelMode: props.labelMode
+}));
 const rootProps = useRootProps(() => ui.value.root, () => props.ui?.root);
 const bodyProps = computed(() => resolveSlot(ui.value.body, props.ui?.body));
 const headerProps = computed(() => resolveSlot(ui.value.header, props.ui?.header));
@@ -49,10 +57,10 @@ const errorProps = computed(() => resolveSlot(ui.value.error, props.ui?.error));
 </script>
 
 <template>
-  <div v-bind="rootProps">
+  <div :data-selaras-label-mode="labelMode" :data-filled="filled || void 0" :data-invalid="invalid || void 0" v-bind="rootProps">
     <div v-bind="bodyProps">
-      <div v-bind="headerProps">
-        <label v-if="label" :id="`${id}-label`" :for="id" v-bind="labelProps">
+      <div v-if="description || label && !floatingLabel" v-bind="headerProps">
+        <label v-if="label && !floatingLabel" :id="`${id}-label`" :for="id" v-bind="labelProps">
           {{ label }}<span v-if="required" v-bind="requiredProps">*</span>
         </label>
         <p v-if="description" :id="`${id}-description`" v-bind="descriptionProps">
@@ -62,6 +70,9 @@ const errorProps = computed(() => resolveSlot(ui.value.error, props.ui?.error));
         </p>
       </div>
       <div v-bind="containerProps">
+        <label v-if="label && floatingLabel" :id="`${id}-label`" :for="id" data-selaras-floating-label v-bind="labelProps">
+          {{ label }}<span v-if="required" v-bind="requiredProps">*</span>
+        </label>
         <slot :id="id" :invalid="invalid" :described-by="describedBy" />
       </div>
     </div>
@@ -73,3 +84,7 @@ const errorProps = computed(() => resolveSlot(ui.value.error, props.ui?.error));
     </p>
   </div>
 </template>
+
+<style scoped>
+[data-selaras-label-mode=floating] [data-selaras-floating-label]{background:var(--selaras-resolved-surface-default);color:var(--selaras-resolved-text-muted);inset-inline-start:.75rem;line-height:1.2;max-width:calc(100% - 1.5rem);overflow:hidden;padding-inline:.25rem;pointer-events:none;position:absolute;text-overflow:ellipsis;top:50%;transform:translateY(-50%);transition:top .15s ease,color .15s ease,font-size .15s ease;white-space:nowrap;z-index:11}[data-selaras-label-mode=floating]:has(textarea) [data-selaras-floating-label]{top:1.1rem}[data-selaras-label-mode=floating]:has(:deep([data-selaras-field-leading])) [data-selaras-floating-label]{inset-inline-start:2.25rem;max-width:calc(100% - 3rem)}[data-selaras-label-mode=floating]:is(:focus-within,[data-filled],:has([data-selaras-field-segmented],[data-selaras-field-filled],[data-selaras-field-active],[data-ui-group-item]:is(input,textarea):not(:-moz-placeholder))) [data-selaras-floating-label]{color:var(--selaras-resolved-text-default);font-size:.75rem;top:0}[data-selaras-label-mode=floating]:is(:focus-within,[data-filled],:has([data-selaras-field-segmented],[data-selaras-field-filled],[data-selaras-field-active],[data-ui-group-item]:is(input,textarea):not(:placeholder-shown))) [data-selaras-floating-label]{color:var(--selaras-resolved-text-default);font-size:.75rem;top:0}[data-selaras-label-mode=floating][data-invalid] [data-selaras-floating-label]{color:var(--selaras-resolved-color-danger-text)}[data-selaras-label-mode=floating] :deep(:is(input,textarea)::-moz-placeholder){color:transparent}[data-selaras-label-mode=floating] :deep(:is(input,textarea)::placeholder){color:transparent}[data-selaras-label-mode=floating] :deep(:is(input,textarea):focus::-moz-placeholder){color:var(--selaras-resolved-text-muted)}[data-selaras-label-mode=floating] :deep(:is(input,textarea):focus::placeholder){color:var(--selaras-resolved-text-muted)}[data-selaras-label-mode=floating]:not(:has([data-selaras-field-segmented])) :deep([data-placeholder]){visibility:hidden}[data-selaras-label-mode=floating]:focus-within :deep([data-placeholder]){visibility:visible}@media (prefers-reduced-motion:reduce){[data-selaras-label-mode=floating] [data-selaras-floating-label]{transition:none}}
+</style>

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

@@ -16,6 +16,10 @@ export interface FormFieldProps {
     size?: FormFieldVariants['size'];
     /** 'vertical' (default) stacks the label above the control; 'horizontal' places the label beside it, with the control filling the remaining row width. */
     orientation?: FormFieldVariants['orientation'];
+    /** 'floating' overlays the label on an empty control and lifts it on focus, open, or once filled. */
+    labelMode?: FormFieldVariants['labelMode'];
+    /** Explicit filled state for a custom or third-party control. */
+    filled?: boolean;
     ui?: UiProp<FormFieldThemeSlots>;
 }
 declare var __VLS_1: {}, __VLS_3: {

package/dist/runtime/components/Input.vue

@@ -27,6 +27,7 @@ const props = defineProps({
 });
 const emit = defineEmits(["update:modelValue"]);
 const field = useFormField();
+const effectivePlaceholder = computed(() => props.placeholder || (field?.floatingLabel.value ? " " : void 0));
 const inputId = computed(() => props.id ?? field?.id);
 const inputInvalid = computed(() => props.invalid || (field?.invalid.value ?? false));
 const describedBy = computed(() => field?.describedBy.value);
@@ -57,7 +58,7 @@ const inputProps = computed(() => mergeProps(baseProps.value, nativeInputAttrs.v
 </script>
 
 <template>
-  <div :data-selaras-color="inputInvalid ? 'danger' : effectiveColor" v-bind="rootProps">
+  <div :data-selaras-color="inputInvalid ? 'danger' : effectiveColor" :data-selaras-field-leading="icon ? '' : void 0" v-bind="rootProps">
     <Icon v-if="icon" :name="icon" v-bind="resolveSlot(ui.leadingIcon, props.ui?.leadingIcon)" />
     <input
       :id="inputId"
@@ -65,7 +66,7 @@ const inputProps = computed(() => mergeProps(baseProps.value, nativeInputAttrs.v
       :value="modelValue"
       :type="type"
       :name="name ?? field?.name"
-      :placeholder="placeholder"
+      :placeholder="effectivePlaceholder"
       :disabled="disabled"
       :aria-invalid="inputInvalid || void 0"
       :aria-describedby="describedBy"

package/dist/runtime/components/Kbd.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { computed } from "vue";
+import { computed, onMounted, ref } from "vue";
 import { kbdTheme } from "../theme/kbd";
 import { useComponentTheme, useRootProps } from "../utils/ui";
 defineOptions({ inheritAttrs: false });
@@ -8,6 +8,10 @@ const props = defineProps({
   size: { type: null, required: false },
   ui: { type: Object, required: false }
 });
+const isMacPlatform = ref(false);
+onMounted(() => {
+  isMacPlatform.value = /mac|iphone|ipad|ipod/i.test(navigator.platform || "");
+});
 const KEY_SYMBOLS = {
   meta: "\u2318",
   command: "\u2318",
@@ -31,7 +35,13 @@ const KEY_SYMBOLS = {
   right: "\u2192",
   space: "Space"
 };
-const resolvedValue = computed(() => props.value ? KEY_SYMBOLS[props.value.toLowerCase()] ?? props.value : void 0);
+const resolvedValue = computed(() => {
+  if (!props.value)
+    return void 0;
+  if (props.value.toLowerCase() === "mod")
+    return isMacPlatform.value ? KEY_SYMBOLS.meta : KEY_SYMBOLS.ctrl;
+  return KEY_SYMBOLS[props.value.toLowerCase()] ?? props.value;
+});
 const theme = useComponentTheme("kbd", kbdTheme);
 const ui = computed(() => theme.value({ size: props.size }));
 const rootProps = useRootProps(() => ui.value.base, () => props.ui?.base);

package/dist/runtime/components/Modal.vue

@@ -4,9 +4,10 @@ import { computed, getCurrentInstance, ref, useSlots, watch, watchEffect } from
 import { useIcons } from "../composables/use-icons";
 import { useMessages } from "../composables/use-messages";
 import { modalTheme } from "../theme/modal";
-import { resolveSlot, useComponentTheme, useThemeBindings } from "../utils/ui";
+import { resolveSlot, useComponentTheme, useRootProps, useThemeBindings } from "../utils/ui";
 import Button from "./Button.vue";
 import Icon from "./Icon.vue";
+defineOptions({ inheritAttrs: false });
 const props = defineProps({
   open: { type: Boolean, required: false, default: void 0 },
   defaultOpen: { type: Boolean, required: false },
@@ -84,8 +85,8 @@ const messages = useMessages();
 const theme = useComponentTheme("modal", modalTheme);
 const themeBindings = useThemeBindings();
 const ui = computed(() => theme.value({ fullscreen: internalFullscreen.value, transition: props.transition }));
+const contentProps = useRootProps(() => ui.value.content, () => props.ui?.content);
 const overlayProps = computed(() => resolveSlot(ui.value.overlay, props.ui?.overlay));
-const contentProps = computed(() => resolveSlot(ui.value.content, props.ui?.content));
 const headerProps = computed(() => resolveSlot(ui.value.header, props.ui?.header));
 const headerActionsProps = computed(() => resolveSlot(ui.value.headerActions, props.ui?.headerActions));
 const titleProps = computed(() => resolveSlot(ui.value.title, props.ui?.title));

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

@@ -45,19 +45,19 @@ declare var __VLS_8: {}, __VLS_17: string, __VLS_18: {
 }, __VLS_124: string, __VLS_125: {
     item: NavigationMenuItem;
     active: boolean;
-}, __VLS_142: string, __VLS_143: {
+}, __VLS_147: string, __VLS_148: {
     item: NavigationMenuItem;
     active: boolean;
-}, __VLS_146: string, __VLS_147: {
+}, __VLS_151: string, __VLS_152: {
     item: NavigationMenuItem;
     active: boolean;
-}, __VLS_155: string, __VLS_156: {
+}, __VLS_160: string, __VLS_161: {
     item: NavigationMenuItem;
     active: boolean;
-}, __VLS_159: string, __VLS_160: {
+}, __VLS_164: string, __VLS_165: {
     item: NavigationMenuItem;
     active: boolean;
-}, __VLS_162: {};
+}, __VLS_172: {};
 type __VLS_Slots = {} & {
     [K in NonNullable<typeof __VLS_17>]?: (props: typeof __VLS_18) => any;
 } & {
@@ -83,17 +83,17 @@ type __VLS_Slots = {} & {
 } & {
     [K in NonNullable<typeof __VLS_124>]?: (props: typeof __VLS_125) => any;
 } & {
-    [K in NonNullable<typeof __VLS_142>]?: (props: typeof __VLS_143) => any;
+    [K in NonNullable<typeof __VLS_147>]?: (props: typeof __VLS_148) => any;
 } & {
-    [K in NonNullable<typeof __VLS_146>]?: (props: typeof __VLS_147) => any;
+    [K in NonNullable<typeof __VLS_151>]?: (props: typeof __VLS_152) => any;
 } & {
-    [K in NonNullable<typeof __VLS_155>]?: (props: typeof __VLS_156) => any;
+    [K in NonNullable<typeof __VLS_160>]?: (props: typeof __VLS_161) => any;
 } & {
-    [K in NonNullable<typeof __VLS_159>]?: (props: typeof __VLS_160) => any;
+    [K in NonNullable<typeof __VLS_164>]?: (props: typeof __VLS_165) => any;
 } & {
     'list-leading'?: (props: typeof __VLS_8) => any;
 } & {
-    'list-trailing'?: (props: typeof __VLS_162) => any;
+    'list-trailing'?: (props: typeof __VLS_172) => any;
 };
 declare const __VLS_base: import("vue").DefineComponent<NavigationMenuProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<NavigationMenuProps> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;

package/dist/runtime/components/NavigationMenu.vue

@@ -12,8 +12,10 @@ import { computed, ref, useSlots } from "vue";
 import { NuxtLink } from "#components";
 import { useRoute } from "#imports";
 import { useIcons } from "../composables/use-icons";
+import { vHotkey } from "../directives/hotkey";
+import ShortcutHint from "../internal/ShortcutHint.vue";
 import { navigationMenuTheme } from "../theme/navigation-menu";
-import { isNavigationMenuItemActive } from "../utils/navigation-menu";
+import { isNavigationMenuItemActive, navigationMenuHotkey } from "../utils/navigation-menu";
 import { resolveRegisteredColorRole } from "../utils/registered-colors";
 import { resolveSlot, useComponentTheme } from "../utils/ui";
 import Icon from "./Icon.vue";
@@ -120,10 +122,10 @@ function onSelect(item, event) {
                   <li v-for="child in item.children" :key="child.label" v-bind="resolveSlot(ui.childItem, props.ui?.childItem)">
                     <NavigationMenuLink as-child :active="isActive(child)">
                       <component
-                        :is="child.to ? NuxtLink : 'button'" :to="child.to" :type="child.to ? void 0 : 'button'"
-                        :disabled="child.to ? void 0 : child.disabled" v-bind="childLinkProps(child)"
-                        :target="child.target" :rel="child.rel" :aria-label="child.ariaLabel"
-                        :aria-disabled="child.to && child.disabled ? 'true' : void 0" @click="onSelect(child, $event)"
+                        :is="child.to ? NuxtLink : 'button'" v-hotkey="navigationMenuHotkey(child)" :to="child.to"
+                        :type="child.to ? void 0 : 'button'" :disabled="child.to ? void 0 : child.disabled"
+                        v-bind="childLinkProps(child)" :target="child.target" :rel="child.rel"
+                        :aria-label="child.ariaLabel" :aria-disabled="child.to && child.disabled ? 'true' : void 0" @click="onSelect(child, $event)"
                       >
                         <slot :name="slotName(child, '')" :item="child" :active="isActive(child)">
                           <slot :name="slotName(child, '-leading')" :item="child" :active="isActive(child)">
@@ -133,6 +135,7 @@ function onSelect(item, event) {
                             <span v-bind="resolveSlot(ui.childLinkLabel, props.ui?.childLinkLabel)">{{ child.label }}</span>
                           </slot>
                           <slot :name="slotName(child, '-trailing')" :item="child" :active="isActive(child)" />
+                          <ShortcutHint :shortcut="child.shortcut" />
                         </slot>
                       </component>
                     </NavigationMenuLink>
@@ -143,10 +146,10 @@ function onSelect(item, event) {
           </template>
           <NavigationMenuLink v-else as-child :active="isActive(item)">
             <component
-              :is="item.to ? NuxtLink : 'button'" :to="item.to" :type="item.to ? void 0 : 'button'"
-              :disabled="item.to ? void 0 : item.disabled" v-bind="linkProps(item)"
-              :target="item.target" :rel="item.rel" :aria-label="item.ariaLabel"
-              :aria-disabled="item.to && item.disabled ? 'true' : void 0" @click="onSelect(item, $event)"
+              :is="item.to ? NuxtLink : 'button'" v-hotkey="navigationMenuHotkey(item)" :to="item.to"
+              :type="item.to ? void 0 : 'button'" :disabled="item.to ? void 0 : item.disabled"
+              v-bind="linkProps(item)" :target="item.target" :rel="item.rel"
+              :aria-label="item.ariaLabel" :aria-disabled="item.to && item.disabled ? 'true' : void 0" @click="onSelect(item, $event)"
             >
               <slot :name="slotName(item, '')" :item="item" :active="isActive(item)">
                 <slot :name="slotName(item, '-leading')" :item="item" :active="isActive(item)">
@@ -157,6 +160,7 @@ function onSelect(item, event) {
                   <span v-bind="resolveSlot(ui.linkLabel, props.ui?.linkLabel)">{{ item.label }}</span>
                 </slot>
                 <slot :name="slotName(item, '-trailing')" :item="item" :active="isActive(item)" />
+                <ShortcutHint :shortcut="collapsed ? void 0 : item.shortcut" />
               </slot>
             </component>
           </NavigationMenuLink>