Merge branch 'v3' into feat/init-blog

2026-01-26 09:50:33 +01:00 · 2025-06-17 15:16:34 +02:00
parent 917849f638 2fa8db64dd
commit 842760d777
224 changed files with 13203 additions and 6457 deletions
--- a/docs/app/components/Header.vue
+++ b/docs/app/components/Header.vue
@@ -22,9 +22,7 @@ onMounted(() => {

 const navigation = inject<Ref<ContentNavigationItem[]>>('navigation')

-const githubLink = computed(() => {
-  return `https://github.com/nuxt/${value.value}`
-})
+const githubLink = computed(() => `https://github.com/nuxt/${value.value}`)

 const desktopLinks = computed(() => props.links.map(({ icon, ...link }) => link))
 const mobileLinks = computed(() => [
@@ -36,6 +34,16 @@ const mobileLinks = computed(() => [
    target: '_blank'
  }
 ])
+
+const items = computed(() => {
+  const ui2 = { label: 'v2.22.0', to: 'https://ui2.nuxt.com' }
+  const uiPro1 = { label: 'v1.8.0', to: 'https://ui2.nuxt.com/pro' }
+
+  return [
+    { label: `v${config.version}`, active: true, color: 'primary' as const, checked: true, type: 'checkbox' as const },
+    route.path === '/' ? ui2 : route.path.startsWith('/pro') ? uiPro1 : module.value === 'ui-pro' ? uiPro1 : ui2
+  ]
+})
 </script>

 <template>
@@ -53,7 +61,7 @@ const mobileLinks = computed(() => [
      <UDropdownMenu
        v-slot="{ open }"
        :modal="false"
-        :items="[{ label: `v${config.version}`, active: true, color: 'primary', checked: true, type: 'checkbox' }, { label: module === 'ui-pro' ? 'v1.7.1' : 'v2.21.1', to: module === 'ui-pro' ? 'https://ui2.nuxt.com/pro' : 'https://ui2.nuxt.com' }]"
+        :items="items"
        :ui="{ content: 'w-(--reka-dropdown-menu-trigger-width) min-w-0' }"
        size="xs"
      >
--- a/docs/app/components/content/SupportedLanguages.vue
+++ b/docs/app/components/content/SupportedLanguages.vue
@@ -26,6 +26,7 @@ function getEmojiFlag(locale: string): string {
    km: 'kh', // Khmer -> Cambodia
    ko: 'kr', // Korean -> South Korea
    ky: 'kg', // Kyrgyz -> Kyrgyzstan
+    lb: 'lu', // Luxembourgish -> Luxembourg
    ms: 'my', // Malay -> Malaysia
    nb: 'no', // Norwegian Bokmål -> Norway
    sl: 'si', // Slovenian -> Slovenia
--- a/docs/app/components/content/examples/command-palette/CommandPaletteCustomSlotExample.vue
+++ b/docs/app/components/content/examples/command-palette/CommandPaletteCustomSlotExample.vue
@@ -83,7 +83,7 @@ const groups = [
    </template>

    <template #billing-label="{ item }">
-      {{ item.label }}
+      <span class="font-medium text-primary">{{ item.label }}</span>

      <UBadge variant="subtle" size="sm">
        50% off
--- a/docs/app/components/content/examples/command-palette/CommandPaletteItemsChildrenExample.vue
+++ b/docs/app/components/content/examples/command-palette/CommandPaletteItemsChildrenExample.vue
@@ -0,0 +1,119 @@
+<script setup lang="ts">
+const toast = useToast()
+
+const groups = [{
+  id: 'actions',
+  label: 'Actions',
+  items: [{
+    label: 'Create new',
+    icon: 'i-lucide-plus',
+    children: [{
+      label: 'New file',
+      icon: 'i-lucide-file-plus',
+      suffix: 'Create a new file in the current directory',
+      onSelect(e: Event) {
+        e.preventDefault()
+        toast.add({ title: 'New file created!' })
+      },
+      kbds: ['meta', 'N']
+    }, {
+      label: 'New folder',
+      icon: 'i-lucide-folder-plus',
+      suffix: 'Create a new folder in the current directory',
+      onSelect(e: Event) {
+        e.preventDefault()
+        toast.add({ title: 'New folder created!' })
+      },
+      kbds: ['meta', 'F']
+    }, {
+      label: 'New project',
+      icon: 'i-lucide-folder-git',
+      suffix: 'Create a new project from a template',
+      onSelect(e: Event) {
+        e.preventDefault()
+        toast.add({ title: 'New project created!' })
+      },
+      kbds: ['meta', 'P']
+    }]
+  }, {
+    label: 'Share',
+    icon: 'i-lucide-share',
+    children: [{
+      label: 'Copy link',
+      icon: 'i-lucide-link',
+      suffix: 'Copy a link to the current item',
+      onSelect(e: Event) {
+        e.preventDefault()
+        toast.add({ title: 'Link copied to clipboard!' })
+      },
+      kbds: ['meta', 'L']
+    }, {
+      label: 'Share via email',
+      icon: 'i-lucide-mail',
+      suffix: 'Share the current item via email',
+      onSelect(e: Event) {
+        e.preventDefault()
+        toast.add({ title: 'Share via email dialog opened!' })
+      }
+    }, {
+      label: 'Share on social',
+      icon: 'i-lucide-share-2',
+      suffix: 'Share the current item on social media',
+      children: [{
+        label: 'Twitter',
+        icon: 'i-simple-icons-twitter',
+        onSelect(e: Event) {
+          e.preventDefault()
+          toast.add({ title: 'Shared on Twitter!' })
+        }
+      }, {
+        label: 'LinkedIn',
+        icon: 'i-simple-icons-linkedin',
+        onSelect(e: Event) {
+          e.preventDefault()
+          toast.add({ title: 'Shared on LinkedIn!' })
+        }
+      }, {
+        label: 'Facebook',
+        icon: 'i-simple-icons-facebook',
+        onSelect(e: Event) {
+          e.preventDefault()
+          toast.add({ title: 'Shared on Facebook!' })
+        }
+      }]
+    }]
+  }, {
+    label: 'Settings',
+    icon: 'i-lucide-settings',
+    children: [{
+      label: 'General',
+      icon: 'i-lucide-sliders',
+      suffix: 'Configure general settings',
+      onSelect(e: Event) {
+        e.preventDefault()
+        toast.add({ title: 'General settings opened!' })
+      }
+    }, {
+      label: 'Appearance',
+      icon: 'i-lucide-palette',
+      suffix: 'Customize the appearance',
+      onSelect(e: Event) {
+        e.preventDefault()
+        toast.add({ title: 'Appearance settings opened!' })
+      }
+    }, {
+      label: 'Security',
+      icon: 'i-lucide-shield',
+      suffix: 'Manage security settings',
+      onSelect(e: Event) {
+        e.preventDefault()
+        toast.add({ title: 'Security settings opened!' })
+      }
+    }]
+  }]
+}]
+</script>
+
+<template>
+  <UCommandPalette :groups="groups" class="flex-1" />
+</template>
--- a/docs/app/components/content/examples/form/FormExampleElements.vue
+++ b/docs/app/components/content/examples/form/FormExampleElements.vue
@@ -15,6 +15,9 @@ const schema = z.object({
  select: z.string().refine(value => value === 'option-2', {
    message: 'Select Option 2'
  }),
+  selectMultiple: z.array(z.string()).refine(values => values.includes('option-2'), {
+    message: 'Include Option 2'
+  }),
  selectMenu: z.any().refine(option => option?.value === 'option-2', {
    message: 'Select Option 2'
  }),
@@ -81,6 +84,10 @@ async function onSubmit(event: FormSubmitEvent<Schema>) {
        <USelect v-model="state.select" :items="items" class="w-full" />
      </UFormField>

+      <UFormField name="selectMultiple" label="Select (Multiple)">
+        <USelect v-model="state.selectMultiple" multiple :items="items" class="w-full" />
+      </UFormField>
+
      <UFormField name="selectMenu" label="Select Menu">
        <USelectMenu v-model="state.selectMenu" :items="items" class="w-full" />
      </UFormField>
--- a/docs/app/components/content/examples/input-tags/InputTagsFormFieldExample.vue
+++ b/docs/app/components/content/examples/input-tags/InputTagsFormFieldExample.vue
@@ -0,0 +1,9 @@
+<script setup lang="ts">
+const tags = ref(['Vue'])
+</script>
+
+<template>
+  <UFormField label="Tags" required>
+    <UInputTags v-model="tags" placeholder="Enter tags..." />
+  </UFormField>
+</template>
--- a/docs/app/components/content/examples/input/InputButtonGroupExample.vue
+++ b/docs/app/components/content/examples/input/InputButtonGroupExample.vue
@@ -10,7 +10,7 @@ const domain = ref(domains[0])
      v-model="value"
      placeholder="nuxt"
      :ui="{
-        base: 'pl-[57px]',
+        base: 'pl-14.5',
        leading: 'pointer-events-none'
      }"
    >
--- a/docs/app/components/content/examples/input/InputCopyButtonExample.vue
+++ b/docs/app/components/content/examples/input/InputCopyButtonExample.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-const value = ref('npx nuxi module add ui')
+const value = ref('npx nuxt module add ui')
 const copied = ref(false)

 function copy() {
--- a/docs/app/components/content/examples/input/InputMaskExample.vue
+++ b/docs/app/components/content/examples/input/InputMaskExample.vue
@@ -0,0 +1,14 @@
+<script setup lang="ts">
+import { vMaska } from 'maska/vue'
+</script>
+
+<template>
+  <div class="flex flex-col gap-2">
+    <UInput v-maska="'#### #### #### ####'" placeholder="4242 4242 4242 4242" icon="i-lucide-credit-card" />
+
+    <div class="flex items-center gap-2">
+      <UInput v-maska="'##/##'" placeholder="MM/YY" icon="i-lucide-calendar" />
+      <UInput v-maska="'###'" placeholder="CVC" />
+    </div>
+  </div>
+</template>
--- a/docs/app/components/content/examples/modal/ModalFooterSlotExample.vue
+++ b/docs/app/components/content/examples/modal/ModalFooterSlotExample.vue
@@ -10,8 +10,8 @@ const open = ref(false)
      <Placeholder class="h-48" />
    </template>

-    <template #footer>
-      <UButton label="Cancel" color="neutral" variant="outline" @click="open = false" />
+    <template #footer="{ close }">
+      <UButton label="Cancel" color="neutral" variant="outline" @click="close" />
      <UButton label="Submit" color="neutral" />
    </template>
  </UModal>
--- a/docs/app/components/content/examples/slideover/SlideoverFooterSlotExample.vue
+++ b/docs/app/components/content/examples/slideover/SlideoverFooterSlotExample.vue
@@ -10,8 +10,8 @@ const open = ref(false)
      <Placeholder class="h-full" />
    </template>

-    <template #footer>
-      <UButton label="Cancel" color="neutral" variant="outline" @click="open = false" />
+    <template #footer="{ close }">
+      <UButton label="Cancel" color="neutral" variant="outline" @click="close" />
      <UButton label="Submit" color="neutral" />
    </template>
  </USlideover>
--- a/docs/app/components/content/examples/timeline/TimelineAlternatingLayoutExample.vue
+++ b/docs/app/components/content/examples/timeline/TimelineAlternatingLayoutExample.vue
@@ -0,0 +1,34 @@
+<script setup lang="ts">
+import type { TimelineItem } from '@nuxt/ui'
+
+const items: TimelineItem[] = [{
+  date: 'Mar 15, 2025',
+  title: 'Project Kickoff',
+  icon: 'i-lucide-rocket',
+  value: 'kickoff'
+}, {
+  date: 'Mar 22, 2025',
+  title: 'Design Phase',
+  icon: 'i-lucide-palette',
+  value: 'design'
+}, {
+  date: 'Mar 29, 2025',
+  title: 'Development Sprint',
+  icon: 'i-lucide-code',
+  value: 'development'
+}, {
+  date: 'Apr 5, 2025',
+  title: 'Testing & Deployment',
+  icon: 'i-lucide-check-circle',
+  value: 'deployment'
+}]
+</script>
+
+<template>
+  <UTimeline
+    :items="items"
+    :ui="{ item: 'even:flex-row-reverse even:-translate-x-[calc(100%-2rem)] even:text-right' }"
+    :default-value="2"
+    class="translate-x-[calc(50%-1rem)]"
+  />
+</template>
--- a/docs/app/components/content/examples/timeline/TimelineCustomSlotExample.vue
+++ b/docs/app/components/content/examples/timeline/TimelineCustomSlotExample.vue
@@ -0,0 +1,52 @@
+<script setup lang="ts">
+import type { TimelineItem } from '@nuxt/ui'
+
+const items = [{
+  date: 'Mar 15, 2025',
+  title: 'Project Kickoff',
+  subtitle: 'Project Initiation',
+  description: 'Kicked off the project with team alignment. Set up project milestones and allocated resources.',
+  icon: 'i-lucide-rocket',
+  value: 'kickoff'
+}, {
+  date: 'Mar 22, 2025',
+  title: 'Design Phase',
+  description: 'User research and design workshops. Created wireframes and prototypes for user testing.',
+  icon: 'i-lucide-palette',
+  value: 'design'
+}, {
+  date: 'Mar 29, 2025',
+  title: 'Development Sprint',
+  description: 'Frontend and backend development. Implemented core features and integrated with APIs.',
+  icon: 'i-lucide-code',
+  value: 'development',
+  slot: 'development' as const,
+  developers: [
+    {
+      src: 'https://github.com/J-Michalek.png'
+    }, {
+      src: 'https://github.com/benjamincanac.png'
+    }
+  ]
+}, {
+  date: 'Apr 5, 2025',
+  title: 'Testing & Deployment',
+  description: 'QA testing and performance optimization. Deployed the application to production.',
+  icon: 'i-lucide-check-circle',
+  value: 'deployment'
+}] satisfies TimelineItem[]
+</script>
+
+<template>
+  <UTimeline :items="items" :default-value="2" class="w-96">
+    <template #development-title="{ item }">
+      <div class="flex items-center gap-1">
+        <span>{{ item.title }}</span>
+
+        <UAvatarGroup size="2xs">
+          <UAvatar v-for="(developer, index) of item.developers" :key="index" v-bind="developer" />
+        </UAvatarGroup>
+      </div>
+    </template>
+  </UTimeline>
+</template>
--- a/docs/app/components/content/examples/timeline/TimelineModelValueExample.vue
+++ b/docs/app/components/content/examples/timeline/TimelineModelValueExample.vue
@@ -0,0 +1,42 @@
+<script setup lang="ts">
+import type { TimelineItem } from '@nuxt/ui'
+
+const items: TimelineItem[] = [{
+  date: 'Mar 15, 2025',
+  title: 'Project Kickoff',
+  description: 'Kicked off the project with team alignment. Set up project milestones and allocated resources.',
+  icon: 'i-lucide-rocket',
+  value: 'kickoff'
+}, {
+  date: 'Mar 22, 2025',
+  title: 'Design Phase',
+  description: 'User research and design workshops. Created wireframes and prototypes for user testing.',
+  icon: 'i-lucide-palette',
+  value: 'design'
+}, {
+  date: 'Mar 29, 2025',
+  title: 'Development Sprint',
+  description: 'Frontend and backend development. Implemented core features and integrated with APIs.',
+  icon: 'i-lucide-code',
+  value: 'development'
+}, {
+  date: 'Apr 5, 2025',
+  title: 'Testing & Deployment',
+  description: 'QA testing and performance optimization. Deployed the application to production.',
+  icon: 'i-lucide-check-circle',
+  value: 'deployment'
+}]
+
+const active = ref(0)
+
+// Note: This is for demonstration purposes only. Don't do this at home.
+onMounted(() => {
+  setInterval(() => {
+    active.value = (active.value + 1) % items.length
+  }, 2000)
+})
+</script>
+
+<template>
+  <UTimeline v-model="active" :items="items" class="w-96" />
+</template>
--- a/docs/app/components/content/examples/timeline/TimelineSlotsExample.vue
+++ b/docs/app/components/content/examples/timeline/TimelineSlotsExample.vue
@@ -0,0 +1,60 @@
+<script lang="ts" setup>
+import type { TimelineItem } from '@nuxt/ui'
+import { useTimeAgo } from '@vueuse/core'
+
+const items = [{
+  username: 'J-Michalek',
+  date: '2025-05-24T14:58:55Z',
+  action: 'opened this',
+  avatar: {
+    src: 'https://github.com/J-Michalek.png'
+  }
+}, {
+  username: 'J-Michalek',
+  date: '2025-05-26T19:30:14+02:00',
+  action: 'marked this pull request as ready for review',
+  icon: 'i-lucide-check-circle'
+}, {
+  username: 'benjamincanac',
+  date: '2025-05-27T11:01:20Z',
+  action: 'commented on this',
+  description: 'I\'ve made a few changes, let me know what you think! Basically I updated the design, removed unnecessary divs, used Avatar component for the indicator since it supports icon already.',
+  avatar: {
+    src: 'https://github.com/benjamincanac.png'
+  }
+}, {
+  username: 'J-Michalek',
+  date: '2025-05-27T11:01:20Z',
+  action: 'commented on this',
+  description: 'Looks great! Good job on cleaning it up.',
+  avatar: {
+    src: 'https://github.com/J-Michalek.png'
+  }
+}, {
+  username: 'benjamincanac',
+  date: '2025-05-27T11:01:20Z',
+  action: 'merged this',
+  icon: 'i-lucide-git-merge'
+}] satisfies TimelineItem[]
+</script>
+
+<template>
+  <UTimeline
+    :items="items"
+    size="xs"
+    class="w-96"
+    :ui="{
+      date: 'float-end ms-1',
+      description: 'px-3 py-2 ring ring-default mt-2 rounded-md text-default'
+    }"
+  >
+    <template #title="{ item }">
+      <span>{{ item.username }}</span>
+      <span class="font-normal text-muted">&nbsp;{{ item.action }}</span>
+    </template>
+
+    <template #date="{ item }">
+      {{ useTimeAgo(new Date(item.date)) }}
+    </template>
+  </UTimeline>
+</template>