@hina-ui/vue 1.5.0 → 1.6.0

package/src/components/combobox/Combobox.vue

@@ -1,8 +1,7 @@
 <script setup lang="ts" generic="T extends SelectOption = SelectOption">
-  import { computed, ref, shallowRef, watch } from 'vue'
+  import { computed } from 'vue'
   import { ComboboxAnchor, ComboboxInput, ComboboxRoot, ComboboxTrigger } from 'reka-ui'
   import { cn } from '../../lib/cn'
-  import { focusFieldFrom } from '../../lib/field-focus'
   import { useUiLocale } from '../../locale'
   import { X } from '@lucide/vue'
   import InputAction from '../input/InputAction.vue'
@@ -18,13 +17,15 @@
     inputIndicator,
     type InputVariants,
   } from '../input/input.variants'
-  import { flattenOptions, type SelectItems, type SelectOption } from '../select/types'
+  import type { SelectItems, SelectOption } from '../select/types'
+  import { useCombobox } from './composables/useCombobox'
   import ComboboxList from './ComboboxList.vue'
 
   defineOptions({ name: 'HnCombobox', inheritAttrs: false })
 
   const props = defineProps<{
     options: SelectItems<T>
+    selectedOption?: T | null
     placeholder?: string
     ignoreFilter?: boolean
     clearable?: boolean
@@ -44,8 +45,6 @@
 
   const t = useUiLocale()
   const group = injectInputGroup()
-  const keyboard = ref(false)
-  const input = shallowRef<{ $el: HTMLInputElement } | null>(null)
 
   const size = computed(() => (group ? group.size.value : props.size))
   const {
@@ -61,23 +60,14 @@
     () => !!props.clearable && model.value != null && model.value !== '' && !disabled.value,
   )
 
-  function displayValue(value: string | number | null | undefined) {
-    return flattenOptions(props.options).find(option => option.value === value)?.label ?? ''
-  }
-
-  function clear() {
-    model.value = null
-    search.value = ''
-    emit('clear')
-    input.value?.$el.focus()
-  }
-
-  watch(search, value => {
-    if (value === '' && model.value != null) model.value = null
-  })
-
-  watch(open, value => {
-    if (!value) keyboard.value = false
+  const { keyboard, input, displayValue, clear, onInput, onHostClick } = useCombobox({
+    options: () => props.options,
+    selectedOption: () => props.selectedOption,
+    model,
+    search,
+    open,
+    disabled: () => disabled.value,
+    onClear: () => emit('clear'),
   })
 </script>
 
@@ -100,7 +90,7 @@
             props.class,
           )
         "
-        @click="focusFieldFrom($event.currentTarget as HTMLElement, $event.target as HTMLElement)"
+        @click="onHostClick"
         @keydown="keyboard = true"
       >
         <ComboboxInput
@@ -114,6 +104,7 @@
           :disabled="disabled"
           :aria-invalid="invalid || undefined"
           :class="inputControl({ trailing: true })"
+          @input="onInput"
         />
         <Transition
           enter-active-class="hn-transition-base"

package/src/components/combobox/composables/useCombobox.ts

@@ -0,0 +1,63 @@
+import { computed, ref, shallowRef, watch, type Ref } from 'vue'
+import { focusFieldFrom } from '../../../lib/field-focus'
+import type { SelectItems, SelectOption } from '../../select/types'
+import { useOptionLabels } from './useOptionLabels'
+
+interface ComboboxOptions<T extends SelectOption> {
+  options: () => SelectItems<T>
+  selectedOption: () => T | null | undefined
+  model: Ref<string | number | null | undefined>
+  search: Ref<string>
+  open: Ref<boolean>
+  disabled: () => boolean
+  onClear: () => void
+}
+
+export function useCombobox<T extends SelectOption>(options: ComboboxOptions<T>) {
+  const { model, search, open } = options
+  const labels = useOptionLabels(options.options, () => {
+    const option = options.selectedOption()
+    return option ? [option] : []
+  })
+  const label = computed(() => displayValue(model.value))
+  const editing = ref(false)
+  const keyboard = ref(false)
+  const input = shallowRef<{ $el: HTMLInputElement } | null>(null)
+
+  function displayValue(value: string | number | null | undefined) {
+    return value == null ? '' : (labels.get(value) ?? '')
+  }
+
+  function clear() {
+    model.value = null
+    search.value = ''
+    options.onClear()
+    input.value?.$el.focus()
+  }
+
+  function onInput(event: Event) {
+    if (options.disabled()) return
+    editing.value = true
+    if ((event as InputEvent).isComposing) return
+    if ((event.target as HTMLInputElement).value === '' && model.value != null) model.value = null
+  }
+
+  function onHostClick(event: MouseEvent) {
+    focusFieldFrom(event.currentTarget as HTMLElement, event.target as HTMLElement)
+  }
+
+  watch(open, value => {
+    if (!value) {
+      keyboard.value = false
+      editing.value = false
+    }
+  })
+
+  watch(model, () => (editing.value = false), { flush: 'sync' })
+
+  watch(label, value => {
+    if (!editing.value) search.value = value
+  })
+
+  return { keyboard, input, displayValue, clear, onInput, onHostClick }
+}

package/src/components/combobox/composables/useOptionLabels.ts

@@ -0,0 +1,20 @@
+import { reactive, watch } from 'vue'
+import { flattenOptions, type SelectItems, type SelectOption } from '../../select/types'
+
+export function useOptionLabels<T extends SelectOption>(
+  options: () => SelectItems<T>,
+  selectedOptions: () => T[] | undefined,
+) {
+  const labels = reactive(new Map<string | number, string>())
+
+  watch(
+    [options, selectedOptions],
+    ([items, selected]) => {
+      for (const option of flattenOptions(items)) labels.set(option.value, option.label)
+      for (const option of selected ?? []) labels.set(option.value, option.label)
+    },
+    { immediate: true, deep: true },
+  )
+
+  return labels
+}

package/src/components/multi-combobox/MultiCombobox.vue

@@ -33,6 +33,7 @@
   const props = withDefaults(
     defineProps<{
       options: SelectItems<T>
+      selectedOptions?: T[]
       placeholder?: string
       ignoreFilter?: boolean
       loading?: boolean
@@ -69,6 +70,7 @@
   const { selected, keyboard, input, remove, clear, onHostClick, onInputKeydown } =
     useMultiCombobox({
       options: () => props.options,
+      selectedOptions: () => props.selectedOptions,
       model,
       open,
       disabled: () => disabled.value,

package/src/components/multi-combobox/composables/useMultiCombobox.ts

@@ -1,9 +1,11 @@
-import { computed, reactive, ref, shallowRef, watch, type Ref } from 'vue'
+import { computed, ref, shallowRef, watch, type Ref } from 'vue'
 import { focusFieldFrom } from '../../../lib/field-focus'
-import { flattenOptions, type SelectItems, type SelectOption } from '../../select/types'
+import type { SelectItems, SelectOption } from '../../select/types'
+import { useOptionLabels } from '../../combobox/composables/useOptionLabels'
 
 interface MultiComboboxOptions<T extends SelectOption> {
   options: () => SelectItems<T>
+  selectedOptions: () => T[] | undefined
   model: Ref<Array<string | number>>
   open: Ref<boolean>
   disabled: () => boolean
@@ -14,14 +16,7 @@ export function useMultiCombobox<T extends SelectOption>(options: MultiComboboxO
   const { model, open } = options
   const keyboard = ref(false)
   const input = shallowRef<{ $el: HTMLInputElement } | null>(null)
-  const labels = reactive(new Map<string | number, string>())
-  watch(
-    options.options,
-    options => {
-      for (const option of flattenOptions(options)) labels.set(option.value, option.label)
-    },
-    { immediate: true, deep: true },
-  )
+  const labels = useOptionLabels(options.options, options.selectedOptions)
 
   const selected = computed(() =>
     model.value.map(value => ({ value, label: labels.get(value) ?? String(value) })),

package/src/components/nav-link/NavLink.vue

@@ -42,7 +42,13 @@
       :class="cn(navLink({ active: props.active }), props.class)"
     >
       <slot name="icon" />
-      <span :aria-hidden="rail ? 'true' : undefined" data-hn-label :class="navLinkLabel({ rail })">
+      <span
+        :aria-hidden="rail ? 'true' : undefined"
+        :inert="rail"
+        :data-collapsed="rail ? '' : undefined"
+        data-hn-label
+        :class="navLinkLabel()"
+      >
         <slot />
       </span>
     </Primitive>

package/src/components/nav-link/nav-link.variants.ts

@@ -17,14 +17,5 @@ export const navLink = tv({
 })
 
 export const navLinkLabel = tv({
-  base: 'shrink-0 whitespace-nowrap',
-  variants: {
-    rail: {
-      true: 'opacity-0 [transition:opacity_calc(var(--hn-duration-fast)/2)_var(--hn-ease-exit)]',
-      false: 'opacity-100 [transition:opacity_var(--hn-duration-fast)_var(--hn-ease-enter)]',
-    },
-  },
-  defaultVariants: { rail: false },
+  base: 'hn-sidebar-label shrink-0 whitespace-nowrap',
 })
-
-export type NavLinkVariants = VariantProps<typeof navLink>

package/src/components/sidebar/Sidebar.vue

@@ -1,11 +1,17 @@
 <script setup lang="ts">
   import { computed } from 'vue'
-  import { Motion } from 'motion-v'
   import { cn } from '../../lib/cn'
-  import { TRANSITION, prefersReducedMotion } from '../../motion'
   import { useUiLocale } from '../../locale'
   import ScrollArea from '../scroll-area/ScrollArea.vue'
-  import { useSidebar } from './context'
+  import { useSidebar, type SidebarState } from './context'
+  import SidebarLabel from './SidebarLabel.vue'
+  import {
+    sidebarRoot,
+    sidebarRegion,
+    sidebarBrand,
+    sidebarIcon,
+    sidebarWordmark,
+  } from './sidebar.variants'
 
   defineOptions({ name: 'HnSidebar' })
 
@@ -14,54 +20,58 @@
     class?: string
   }>()
 
+  defineSlots<{
+    default?(): unknown
+    header?(props: { state: SidebarState }): unknown
+    icon?(props: { state: SidebarState }): unknown
+    wordmark?(props: { state: SidebarState }): unknown
+    footer?(props: { state: SidebarState }): unknown
+  }>()
+
   const t = useUiLocale()
   const sidebar = useSidebar()
   const state = computed(() => sidebar?.state.value ?? 'expanded')
   const inDrawer = computed(() => sidebar?.inDrawer ?? false)
-
-  const width = computed(() => {
-    if (state.value === 'rail') return 56
-    if (state.value === 'hidden') return 0
-    return 256
-  })
-
-  const transition = computed(() => (prefersReducedMotion() ? { duration: 0 } : TRANSITION.layout))
 </script>
 
 <template>
-  <Motion
-    as="aside"
-    :initial="false"
-    :animate="inDrawer ? undefined : { width }"
-    :transition="transition"
+  <aside
     :data-state="state"
-    :class="
-      cn(
-        'flex h-full min-h-0 shrink-0 flex-col overflow-hidden',
-        inDrawer
-          ? 'w-full'
-          : 'border-line border-e [transition:border-color_var(--hn-duration-base)_var(--hn-ease-move)]',
-        !inDrawer && state === 'hidden' && 'border-e-transparent',
-        props.class,
-      )
-    "
+    :inert="state === 'hidden'"
+    :class="cn(sidebarRoot({ inDrawer }), props.class)"
   >
-    <div v-if="$slots.header" :class="cn('shrink-0', !inDrawer && 'px-3 py-3')">
+    <div v-if="$slots.header" :class="sidebarRegion({ inDrawer })">
       <slot name="header" :state="state" />
     </div>
+    <div
+      v-else-if="$slots.icon || $slots.wordmark"
+      class="hn-collapse shrink-0"
+      :data-state="state === 'rail' && !$slots.icon ? 'closed' : 'open'"
+      :inert="state === 'rail' && !$slots.icon"
+    >
+      <div class="hn-collapse-body">
+        <div :class="sidebarRegion({ inDrawer })">
+          <div :class="sidebarBrand()">
+            <div v-if="$slots.icon" :class="sidebarIcon()">
+              <slot name="icon" :state="state" />
+            </div>
+            <SidebarLabel v-if="$slots.wordmark" as="div" :class="sidebarWordmark()">
+              <slot name="wordmark" :state="state" />
+            </SidebarLabel>
+          </div>
+        </div>
+      </div>
+    </div>
     <ScrollArea class="min-h-0 flex-1">
       <nav
         :aria-label="props.label ?? t.sidebar.navLabel"
-        :class="cn('flex flex-col gap-1', !inDrawer && 'px-2.5 py-2')"
+        :class="cn('flex flex-col gap-1 py-2', !inDrawer && 'px-2.5')"
       >
         <slot />
       </nav>
     </ScrollArea>
-    <div
-      v-if="$slots.footer"
-      :class="cn('border-line shrink-0 border-t', !inDrawer && 'px-3 py-3')"
-    >
+    <div v-if="$slots.footer" :class="sidebarRegion({ inDrawer, footer: true })">
       <slot name="footer" :state="state" />
     </div>
-  </Motion>
+  </aside>
 </template>

package/src/components/sidebar/SidebarGroup.vue

@@ -31,8 +31,13 @@
     :class="cn(props.class)"
     @update:open="v => (rail ? undefined : (open = v))"
   >
-    <div class="hn-collapse" :class="rail ? 'hn-collapse-closed' : 'hn-collapse-open'">
-      <div class="hn-collapse-body">
+    <div class="relative h-(--hn-control-h-sm)">
+      <div
+        class="hn-sidebar-label"
+        :data-collapsed="rail ? '' : undefined"
+        :aria-hidden="rail ? 'true' : undefined"
+        :inert="rail"
+      >
         <CollapsibleTrigger as-child>
           <Button
             variant="ghost"
@@ -49,15 +54,11 @@
           </Button>
         </CollapsibleTrigger>
       </div>
-    </div>
-    <div
-      aria-hidden="true"
-      class="hn-collapse"
-      :class="rail ? 'hn-collapse-open' : 'hn-collapse-closed'"
-    >
-      <div class="hn-collapse-body">
-        <div class="border-line mx-2 my-1.5 border-t" />
-      </div>
+      <div
+        aria-hidden="true"
+        class="hn-sidebar-label border-line pointer-events-none absolute inset-x-2 top-1/2 border-t"
+        :data-collapsed="rail ? undefined : ''"
+      />
     </div>
     <CollapsibleContent>
       <div class="flex flex-col gap-0.5 pt-1">

package/src/components/sidebar/SidebarLabel.vue

@@ -0,0 +1,24 @@
+<script setup lang="ts">
+  import { computed } from 'vue'
+  import { cn } from '../../lib/cn'
+  import { useSidebar } from './context'
+  import { sidebarLabel } from './sidebar.variants'
+
+  defineOptions({ name: 'HnSidebarLabel' })
+
+  const props = withDefaults(defineProps<{ as?: string; class?: string }>(), { as: 'span' })
+  const sidebar = useSidebar()
+  const collapsed = computed(() => sidebar?.state.value === 'rail')
+</script>
+
+<template>
+  <component
+    :is="props.as"
+    :data-collapsed="collapsed ? '' : undefined"
+    :aria-hidden="collapsed ? 'true' : undefined"
+    :inert="collapsed"
+    :class="cn(sidebarLabel(), props.class)"
+  >
+    <slot />
+  </component>
+</template>

package/src/components/sidebar/sidebar.variants.ts

@@ -0,0 +1,36 @@
+import { tv } from '../../lib/tv'
+
+export const sidebarRoot = tv({
+  base: 'flex h-full min-h-0 shrink-0 flex-col overflow-hidden',
+  variants: {
+    inDrawer: {
+      true: 'w-full',
+      false:
+        'hn-sidebar border-line w-64 border-e data-[state=rail]:w-14 data-[state=hidden]:w-0 data-[state=hidden]:border-e-transparent',
+    },
+  },
+})
+
+export const sidebarRegion = tv({
+  base: 'shrink-0 py-3',
+  variants: {
+    inDrawer: { true: 'w-full', false: 'w-[calc(16rem-1px)] px-3' },
+    footer: { true: 'border-line border-t' },
+  },
+})
+
+export const sidebarLabel = tv({
+  base: 'hn-sidebar-label min-w-0',
+})
+
+export const sidebarBrand = tv({
+  base: 'flex min-h-8 items-center gap-2',
+})
+
+export const sidebarIcon = tv({
+  base: 'flex size-8 shrink-0 items-center justify-center overflow-hidden [&>*]:size-full [&_img]:size-full [&_img]:object-contain [&_svg]:size-full',
+})
+
+export const sidebarWordmark = tv({
+  base: 'flex flex-1 items-center [&_img]:max-h-8 [&_img]:max-w-full [&_img]:object-contain [&_svg]:max-h-8 [&_svg]:max-w-full',
+})

package/src/components/tree/Tree.vue

@@ -0,0 +1,132 @@
+<script setup lang="ts">
+  import { TreeItem, TreeRoot } from 'reka-ui'
+  import { cn } from '../../lib/cn'
+  import { useUiLocale } from '../../locale'
+  import { useFieldControl } from '../form-field/context'
+  import DisclosureIcon from '../disclosure-icon/DisclosureIcon.vue'
+  import TreeCheck from './TreeCheck.vue'
+  import { useTree } from './composables/useTree'
+  import { tree, treeEmpty, treeRow, treeToggle } from './tree.variants'
+  import type { TreeNode, TreeNodeSlot, TreeValue } from './types'
+
+  defineOptions({ name: 'HnTree', inheritAttrs: false })
+  const props = withDefaults(
+    defineProps<{
+      items: TreeNode[]
+      multiple?: boolean
+      defaultExpanded?: TreeValue[]
+      disabled?: boolean
+      invalid?: boolean
+      class?: string
+    }>(),
+    { defaultExpanded: () => [] },
+  )
+  const model = defineModel<TreeValue | TreeValue[] | null>()
+  const expandedModel = defineModel<TreeValue[]>('expanded')
+  defineSlots<{
+    node?(props: TreeNodeSlot): unknown
+    trailing?(props: TreeNodeSlot): unknown
+    empty?(): unknown
+  }>()
+  const t = useUiLocale()
+  const { id, labelledBy, describedBy, disabled, invalid } = useFieldControl({
+    disabled: () => props.disabled,
+    invalid: () => props.invalid,
+  })
+  const { selected, expanded, key, getChildren, state, select, toggle, keepRowClick } = useTree(
+    props,
+    model,
+    expandedModel,
+    disabled,
+  )
+</script>
+
+<template>
+  <div
+    v-if="props.items.length === 0"
+    v-bind="$attrs"
+    :id="id"
+    role="status"
+    :aria-labelledby="labelledBy"
+    :aria-describedby="describedBy"
+    data-hn-tree
+    :class="cn(treeEmpty(), props.class)"
+  >
+    <slot name="empty">{{ t.tree.empty }}</slot>
+  </div>
+  <TreeRoot
+    v-else
+    v-bind="$attrs"
+    :id="id"
+    v-slot="{ flattenItems }"
+    v-model:expanded="expanded"
+    :items="props.items"
+    :get-key="key"
+    :get-children="getChildren"
+    :model-value="props.multiple ? selected : selected[0]"
+    :multiple="props.multiple"
+    :disabled="disabled"
+    :aria-labelledby="labelledBy"
+    :aria-describedby="describedBy"
+    :aria-invalid="invalid || undefined"
+    :aria-disabled="disabled || undefined"
+    data-hn-tree
+    :data-disabled="disabled ? '' : undefined"
+    :data-invalid="invalid ? '' : undefined"
+    :class="cn(tree(), props.class)"
+  >
+    <TreeItem
+      v-for="item in flattenItems"
+      :key="item._id"
+      v-slot="{ isExpanded }"
+      v-bind="item.bind"
+      :disabled="state(item.value).disabled"
+      as-child
+      @select="select"
+      @toggle="keepRowClick"
+    >
+      <li
+        :aria-selected="props.multiple ? undefined : state(item.value).selected"
+        :aria-checked="
+          props.multiple
+            ? state(item.value).indeterminate
+              ? 'mixed'
+              : state(item.value).selected
+            : undefined
+        "
+        :style="{ '--hn-tree-level': item.level - 1 }"
+        :class="treeRow()"
+      >
+        <span
+          v-if="item.hasChildren"
+          :class="treeToggle()"
+          aria-hidden="true"
+          data-hn-tree-toggle
+          @click.stop="toggle(item.value)"
+        >
+          <DisclosureIcon direction="end" :open="isExpanded" />
+        </span>
+        <span v-else class="size-5 shrink-0" aria-hidden="true" />
+        <TreeCheck
+          v-if="props.multiple"
+          :selected="state(item.value).selected"
+          :indeterminate="state(item.value).indeterminate"
+        />
+        <span class="min-w-0 flex-1">
+          <slot name="node" :node="item.value" :expanded="isExpanded" v-bind="state(item.value)">
+            <span class="block truncate">{{ item.value.label }}</span>
+            <span v-if="item.value.description" class="text-muted block truncate text-xs">
+              {{ item.value.description }}
+            </span>
+          </slot>
+        </span>
+        <slot
+          name="trailing"
+          :node="item.value"
+          :expanded="isExpanded"
+          v-bind="state(item.value)"
+        />
+      </li>
+    </TreeItem>
+  </TreeRoot>
+</template>

package/src/components/tree/TreeCheck.vue

@@ -0,0 +1,33 @@
+<script setup lang="ts">
+  import { Check, Minus } from '@lucide/vue'
+  import { checkboxBox } from '../checkbox/checkbox.variants'
+
+  defineOptions({ name: 'HnTreeCheck' })
+  const props = defineProps<{ selected: boolean; indeterminate: boolean }>()
+</script>
+
+<template>
+  <span
+    aria-hidden="true"
+    :data-state="props.indeterminate ? 'indeterminate' : props.selected ? 'checked' : 'unchecked'"
+    :class="checkboxBox()"
+    class="pointer-events-none"
+  >
+    <Transition
+      enter-active-class="hn-transition-press"
+      enter-from-class="scale-50 opacity-0"
+      leave-active-class="hn-transition"
+      leave-to-class="scale-50 opacity-0"
+    >
+      <Check v-if="props.selected" />
+    </Transition>
+    <Transition
+      enter-active-class="hn-transition-press"
+      enter-from-class="scale-50 opacity-0"
+      leave-active-class="hn-transition"
+      leave-to-class="scale-50 opacity-0"
+    >
+      <Minus v-if="props.indeterminate" />
+    </Transition>
+  </span>
+</template>