Compare commits

...

23 Commits

Author SHA1 Message Date
Benjamin Canac
912ec15d08 chore(release): v2.18.7 2024-10-09 15:58:09 +02:00
EdmundChaplin
5cf24fa6e7 fix(Carousel): pages calculation (#2345)
Co-authored-by: Edmund Chaplin <edmund.chaplin@zaros.co.uk>
2024-10-09 15:54:38 +02:00
renovate[bot]
6895b5d443 chore(deps): update all non-major dependencies (dev) (#2343)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-09 15:51:16 +02:00
renovate[bot]
18db7c99a9 chore(deps): update all non-major dependencies (dev) (#2334)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-08 12:16:37 +02:00
renovate[bot]
ede7d7c2b7 chore(deps): update pnpm to v9.12.1 (dev) (#2327)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-07 16:54:09 +02:00
renovate[bot]
7cbe1983f7 chore(deps): update devdependency @nuxt/test-utils to ^3.14.3 (dev) (#2325)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-07 15:41:26 +02:00
renovate[bot]
773665050b chore(deps): update all non-major dependencies (dev) (#2310)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-07 15:19:04 +02:00
renovate[bot]
d581bd9ad0 chore(deps): lock file maintenance (dev) (#2315)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-07 12:24:25 +02:00
OrbisK
a6d106377e chore(github): add separate v3 issue template (#2307) 2024-10-06 13:58:35 +02:00
renovate[bot]
6dbd0e0932 chore(deps): update all non-major dependencies (dev) (#2289)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-05 23:14:15 +02:00
Asoka Wotulo
33467ad171 docs(form): specify component ref type (#2296) 2024-10-03 16:43:27 +02:00
Abolfazl
5ed5c57d0d fix(Tooltip): hide when text prop & slot are empty (#2232) 2024-10-02 11:51:26 +02:00
Malik-Jouda
db5e5c4907 fix(Carousel): arrows & indicators are broken in RTL (#2251) 2024-10-02 11:16:00 +02:00
Gerben Mulder
474accbefb feat(forms): allow null as initial value (#2275)
Co-authored-by: Romain Hamel <rom.hml@gmail.com>
2024-10-01 19:55:03 +02:00
Daniel Qolami
4ae9654062 fix(Dropdown/Popover): conflict in toggle for touch devices (#2272) 2024-10-01 15:00:58 +02:00
renovate[bot]
847ee4591a chore(deps): lock file maintenance (dev) (#2278)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-30 09:33:34 +02:00
renovate[bot]
f270c7b76e chore(deps): update all non-major dependencies (dev) (#2276)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-30 09:24:14 +02:00
Benjamin Canac
0aa3909e71 fix(Link): allow title field
Resolves #1439
2024-09-27 12:50:18 +02:00
Benjamin Canac
d324dee4f1 chore(renovate): update 2024-09-26 15:12:12 +02:00
renovate[bot]
29591e275c chore(deps): update all non-major dependencies (dev) (#2252)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-26 15:06:22 +02:00
Benjamin Canac
a9339ccf2a docs: remove /dev switch 2024-09-25 12:18:02 +02:00
Benjamin Canac
39b85f11d8 docs(deps): update @nuxt/ui-pro 2024-09-23 12:44:26 +02:00
Benjamin Canac
0430b34ca7 chore(package): put back docs typecheck 2024-09-23 12:35:23 +02:00
42 changed files with 1749 additions and 1647 deletions

65
.github/ISSUE_TEMPLATE/bug-v3.yml vendored Normal file
View File

@@ -0,0 +1,65 @@
name: "🐛 Bug report (v3)"
description: Report a bug to help us improve the module (v3 only).
labels: ["triage", "bug", "v3"]
body:
- type: markdown
attributes:
value: |
> [!IMPORTANT]
> As Nuxt UI v3 is currently in alpha, we recommend thorough testing before using it in production environments. We're actively working on stabilization and welcome feedback from early adopters to improve the library.
- type: markdown
attributes:
value: |
Before reporting a bug, please make sure that you have read through our [v3 documentation](https://ui3.nuxt.dev/) and existing [issues](https://github.com/nuxt/ui/issues?q=is%3Aissue%20is%3Aopen%20sort%3Aupdated-desc%20label%3Av3).
- type: textarea
id: env
attributes:
label: Environment
description: You can use `npx nuxi info` to fill this section
placeholder: |
- Operating System: `Darwin`
- Node Version: `v18.16.0`
- Nuxt Version: `3.7.3`
- CLI Version: `3.8.4`
- Nitro Version: `2.6.3`
- Package Manager: `pnpm@8.7.4`
- Builder: `-`
- User Config: `-`
- Runtime Modules: `-`
- Build Modules: `-`
validations:
required: true
- type: input
id: version
attributes:
label: Version
placeholder: v3.0.0-alpha.5
validations:
required: true
- type: textarea
id: reproduction
attributes:
label: Reproduction
description: Please provide a reproduction link. A minimal [reproduction is required](https://antfu.me/posts/why-reproductions-are-required) unless you are absolutely sure that the issue is obvious and the provided information is enough to understand the problem. If a report is vague (e.g. just a generic error message) and has no reproduction, it will receive a "needs reproduction" label. If no reproduction is provided we might close it.
placeholder: https://github.com/my/reproduction
validations:
required: true
- type: textarea
id: description
attributes:
label: Description
description: A clear and concise description of what the bug is. If you intend to submit a PR for this issue, tell us in the description.
validations:
required: true
- type: textarea
id: additonal
attributes:
label: Additional context
description: If applicable, add any other context or screenshots here.
- type: textarea
id: logs
attributes:
label: Logs
description: |
Optional if provided reproduction. Please try not to insert an image but copy paste the log text.
render: shell-script

View File

@@ -1,5 +1,21 @@
# Changelog
## [2.18.7](https://github.com/nuxt/ui/compare/v2.18.6...v2.18.7) (2024-10-09)
### Features
* **forms:** allow `null` as initial value ([#2275](https://github.com/nuxt/ui/issues/2275)) ([474accb](https://github.com/nuxt/ui/commit/474accbefb36ead3b54406ee4ae0fdd2387fab61))
### Bug Fixes
* **Carousel:** arrows & indicators are broken in RTL ([#2251](https://github.com/nuxt/ui/issues/2251)) ([db5e5c4](https://github.com/nuxt/ui/commit/db5e5c49078a4faac3fb0c41b23b0dbd64efdd77))
* **Carousel:** pages calculation ([#2345](https://github.com/nuxt/ui/issues/2345)) ([5cf24fa](https://github.com/nuxt/ui/commit/5cf24fa6e7ba1508458dd5bc1319ac431d908cb0))
* **Dropdown/Popover:** conflict in toggle for touch devices ([#2272](https://github.com/nuxt/ui/issues/2272)) ([4ae9654](https://github.com/nuxt/ui/commit/4ae96540629faff1c3b5046cf7ce6a9315bb9bf4))
* **Link:** allow `title` field ([0aa3909](https://github.com/nuxt/ui/commit/0aa3909e715e34ac80565c0111d4378c828fb566)), closes [#1439](https://github.com/nuxt/ui/issues/1439)
* **Tooltip:** hide when `text` prop & slot are empty ([#2232](https://github.com/nuxt/ui/issues/2232)) ([5ed5c57](https://github.com/nuxt/ui/commit/5ed5c57d0d09ae39d623c963270bb0a894a97d29))
## [2.18.6](https://github.com/nuxt/ui/compare/v2.18.5...v2.18.6) (2024-09-23)

View File

@@ -3,7 +3,7 @@
<div>
<NuxtLoadingIndicator />
<Banner v-if="!$route.path.startsWith('/examples')" />
<!-- <Banner v-if="!$route.path.startsWith('/examples')" /> -->
<Header v-if="!$route.path.startsWith('/examples')" :links="links" />
@@ -36,35 +36,20 @@ const searchRef = ref()
const route = useRoute()
const colorMode = useColorMode()
const { branch } = useContentSource()
const { data: nav } = await useAsyncData('navigation', () => fetchContentNavigation())
const { data: navigation } = await useAsyncData('navigation', () => fetchContentNavigation())
const { data: files } = useLazyFetch<ParsedContent[]>('/api/search.json', { default: () => [], server: false })
// Computed
const navigation = computed(() => {
if (branch.value?.name === 'dev') {
const dev = nav.value.find(item => item._path === '/dev')?.children
const pro = nav.value.find(item => item._path === '/pro')
return [
...dev,
...(pro ? [pro] : [])
]
}
return nav.value?.filter(item => item._path !== '/dev') || []
})
const color = computed(() => colorMode.value === 'dark' ? '#18181b' : 'white')
const links = computed(() => {
return [{
label: 'Docs',
icon: 'i-heroicons-book-open',
to: branch.value?.name === 'dev' ? '/dev/getting-started' : '/getting-started',
active: branch.value?.name === 'dev' ? (route.path.startsWith('/dev/getting-started') || route.path.startsWith('/dev/components')) : (route.path.startsWith('/getting-started') || route.path.startsWith('/components'))
to: '/getting-started',
active: route.path.startsWith('/getting-started') || route.path.startsWith('/components')
}, ...(navigation.value.find(item => item._path === '/pro') ? [{
label: 'Pro',
icon: 'i-heroicons-square-3-stack-3d',

View File

@@ -8,7 +8,7 @@ const hideBanner = () => {
document.querySelector('html')?.classList.add('hide-banner')
}
if (process.server) {
if (import.meta.server) {
useHead({
script: [{
key: 'prehydrate-template-banner',
@@ -32,7 +32,7 @@ if (process.server) {
<div class="flex items-center justify-between gap-2">
<div class="lg:flex-1 hidden lg:flex items-center" />
<p class="text-sm font-medium text-white dark:text-gray-900">
<p class="text-sm font-medium text-white dark:text-gray-900 truncate">
<UIcon name="i-heroicons-rocket-launch" class="w-5 h-5 align-top flex-shrink-0 pointer-events-none mr-2" />
<span class="font-semibold">Nuxt UI Pro v1.0</span> is out with dashboard components!
</p>

View File

@@ -1,34 +0,0 @@
<template>
<div class="mb-3 lg:mb-6">
<UDropdown
class="w-full"
:items="[branches]"
color="gray"
mode="hover"
:ui="{ width: 'w-full' }"
:popper="{ strategy: 'absolute', placement: 'bottom' }"
>
<UButton color="gray" class="w-full">
<UIcon v-if="branch.icon" :name="branch.icon" class="w-4 h-4 flex-shrink-0 text-gray-600 dark:text-gray-300" />
<span class="text-gray-900 dark:text-white">{{ branch.label }}</span>
<span class="text-gray-400 dark:text-gray-500">{{ branch.suffix }}</span>
<UIcon name="i-heroicons-chevron-down-20-solid" class="w-5 h-5 text-gray-400 dark:text-gray-500 ml-auto -mr-1" />
</UButton>
<template #item="{ item }">
<UIcon v-if="item.icon" :name="item.icon" class="w-4 h-4 flex-shrink-0 text-gray-600 dark:text-gray-300" />
<span>{{ item.label }}</span>
<span class="truncate text-gray-400 dark:text-gray-500">{{ item.suffix }}</span>
</template>
</UDropdown>
</div>
</template>
<script setup lang="ts">
const { branches, branch } = useContentSource()
</script>

View File

@@ -5,13 +5,16 @@
'border-primary-200/75 dark:border-primary-900/50': $route.path === '/',
'border-gray-200 dark:border-gray-800': $route.path !== '/'
}"
:ui="{
left: 'min-w-0'
}"
>
<template #left>
<NuxtLink to="/" class="flex items-end gap-2 font-bold text-xl text-gray-900 dark:text-white" aria-label="Nuxt UI">
<Logo class="w-auto h-6" />
<NuxtLink to="/" class="flex items-end gap-2 font-bold text-xl text-gray-900 dark:text-white min-w-0" aria-label="Nuxt UI">
<LogoPro v-if="$route.path.startsWith('/pro')" class="w-auto h-6 shrink-0" />
<Logo v-else class="w-auto h-6 shrink-0" />
<UBadge v-if="$route.path.startsWith('/pro')" label="Pro" variant="subtle" size="xs" class="-mb-[2px] rounded font-semibold" />
<UBadge v-if="$route.path.startsWith('/dev')" label="Edge" variant="subtle" size="xs" class="-mb-[2px] rounded font-semibold" />
<UBadge :label="$route.path.startsWith('/pro') ? `v${pkg.version.split('-')[0]}` : `v${config.version}`" variant="subtle" size="xs" class="-mb-[2px] rounded font-semibold truncate hidden sm:inline-flex" />
</NuxtLink>
</template>
@@ -38,8 +41,6 @@
<UDivider type="dashed" class="my-4" />
<BranchSelect />
<UNavigationTree :links="mapContentNavigation(navigation)" :multiple="false" default-open />
</template>
</UHeader>
@@ -48,6 +49,7 @@
<script setup lang="ts">
import type { NavItem } from '@nuxt/content'
import type { HeaderLink } from '#ui-pro/types'
import pkg from '@nuxt/ui-pro/package.json'
defineProps<{
links: HeaderLink[]
@@ -56,6 +58,7 @@ defineProps<{
const route = useRoute()
const { $ui } = useNuxtApp()
const { metaSymbol } = useShortcuts()
const config = useRuntimeConfig().public
const nav = inject<Ref<NavItem[]>>('navigation')

View File

@@ -0,0 +1,14 @@
<template>
<svg width="1352" height="200" viewBox="0 0 1352 200" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M377 200C379.16 200 381 198.209 381 196V103C381 103 386 112 395 127L434 194C435.785 197.74 439.744 200 443 200H470V50H443C441.202 50 439 51.4941 439 54V148L421 116L385 55C383.248 51.8912 379.479 50 376 50H350V200H377Z" fill="currentColor" />
<path d="M726 92H739C742.314 92 745 89.3137 745 86V60H773V92H800V116H773V159C773 169.5 778.057 174 787 174H800V200H783C759.948 200 745 185.071 745 160V116H726V92Z" fill="currentColor" />
<path d="M591 92V154C591 168.004 585.742 179.809 578 188C570.258 196.191 559.566 200 545 200C530.434 200 518.742 196.191 511 188C503.389 179.809 498 168.004 498 154V92H514C517.412 92 520.769 92.622 523 95C525.231 97.2459 526 98.5652 526 102V154C526 162.059 526.457 167.037 530 171C533.543 174.831 537.914 176 545 176C552.217 176 555.457 174.831 559 171C562.543 167.037 563 162.059 563 154V102C563 98.5652 563.769 96.378 566 94C567.96 91.9107 570.028 91.9599 573 92C573.411 92.0055 574.586 92 575 92H591Z" fill="currentColor" />
<path d="M676 144L710 92H684C680.723 92 677.812 93.1758 676 96L660 120L645 97C643.188 94.1758 639.277 92 636 92H611L645 143L608 200H634C637.25 200 640.182 196.787 642 194L660 167L679 195C680.818 197.787 683.75 200 687 200H713L676 144Z" fill="currentColor" />
<path d="M168 200H279C282.542 200 285.932 198.756 289 197C292.068 195.244 295.23 193.041 297 190C298.77 186.959 300.002 183.51 300 179.999C299.998 176.488 298.773 173.04 297 170.001L222 41C220.23 37.96 218.067 35.7552 215 34C211.933 32.2448 207.542 31 204 31C200.458 31 197.067 32.2448 194 34C190.933 35.7552 188.77 37.96 187 41L168 74L130 9.99764C128.228 6.95784 126.068 3.75491 123 2C119.932 0.245087 116.542 0 113 0C109.458 0 106.068 0.245087 103 2C99.9323 3.75491 96.7717 6.95784 95 9.99764L2 170.001C0.226979 173.04 0.00154312 176.488 1.90993e-06 179.999C-0.0015393 183.51 0.229648 186.959 2 190C3.77035 193.04 6.93245 195.244 10 197C13.0675 198.756 16.4578 200 20 200H90C117.737 200 137.925 187.558 152 164L186 105L204 74L259 168H186L168 200ZM89 168H40L113 42L150 105L125.491 147.725C116.144 163.01 105.488 168 89 168Z" fill="rgb(var(--color-primary-DEFAULT))" />
<path d="M958 60.0001H938C933.524 60.0001 929.926 59.9395 927 63C924.074 65.8905 925 67.5792 925 72V141C925 151.372 923.648 156.899 919 162C914.352 166.931 908.468 169 899 169C889.705 169 882.648 166.931 878 162C873.352 156.899 873 151.372 873 141V72.0001C873 67.5793 872.926 65.8906 870 63.0001C867.074 59.9396 863.476 60.0001 859 60.0001H840V141C840 159.023 845.016 173.458 855 184C865.156 194.542 879.893 200 899 200C918.107 200 932.844 194.542 943 184C953.156 173.458 958 159.023 958 141V60.0001Z" fill="currentColor" />
<path fill-rule="evenodd" clip-rule="evenodd" d="M1000 60.0233L1020 60V77L1020 128V156.007L1020 181L1020 189.004C1020 192.938 1019.98 194.429 1017 197.001C1014.02 199.725 1009.56 200 1005 200H986.001V181.006L986 130.012V70.0215C986 66.1576 986.016 64.5494 989 62.023C991.819 59.6358 995.437 60.0233 1000 60.0233Z" fill="currentColor" />
<path d="M1060 200V60H1117C1126.67 60 1134.98 61.2896 1142 65C1149.16 68.7104 1155.29 74.3744 1159 81C1162.71 87.6256 1164 95.3867 1164 104C1164 112.481 1162.71 120.374 1159 127C1155.29 133.626 1149.16 138.157 1142 142C1134.98 145.71 1126.67 148 1117 148H1090V200H1060ZM1115 123C1121.63 123 1126.69 121.578 1130 118C1133.31 114.29 1135 109.433 1135 104C1135 98.567 1133.31 93.5778 1130 90C1126.69 86.2896 1121.63 85 1115 85H1090V123H1115Z" fill="rgb(var(--color-primary-DEFAULT))" />
<path d="M1226 123C1219.37 123 1214.31 124.965 1211 130C1207.69 135.035 1206 142.122 1206 151V200H1178V100H1200C1203.31 100 1206 102.686 1206 106V116C1208.65 109.904 1211.16 106.518 1215 104C1218.98 101.482 1224.77 100 1231 100H1242V123H1226Z" fill="rgb(var(--color-primary-DEFAULT))" />
<path d="M1299 200C1288.93 200 1280.08 197.373 1272 193C1263.92 188.495 1257.51 182.818 1253 175C1248.49 167.049 1246 157.806 1246 148C1246 138.194 1248.49 129.818 1253 122C1257.51 114.049 1263.92 107.373 1272 103C1280.08 98.4946 1288.93 97 1299 97C1309.07 97 1318.92 98.4946 1327 103C1335.08 107.373 1340.49 114.049 1345 122C1349.51 129.818 1352 138.194 1352 148C1352 157.806 1349.51 167.049 1345 175C1340.49 182.818 1335.08 188.495 1327 193C1318.92 197.373 1309.07 200 1299 200ZM1299 176C1306.42 176 1312.36 173.168 1317 168C1321.64 162.832 1324 156.216 1324 148C1324 139.652 1321.64 133.168 1317 128C1312.36 122.832 1306.42 120 1299 120C1291.58 120 1285.64 122.832 1281 128C1276.36 133.168 1274 139.652 1274 148C1274 156.216 1276.36 162.832 1281 168C1285.64 173.168 1291.58 176 1299 176Z" fill="rgb(var(--color-primary-DEFAULT))" />
</svg>
</template>

View File

@@ -20,12 +20,12 @@ const items = [
:prev-button="{
color: 'gray',
icon: 'i-heroicons-arrow-left-20-solid',
class: '-left-12'
class: '-start-12'
}"
:next-button="{
color: 'gray',
icon: 'i-heroicons-arrow-right-20-solid',
class: '-right-12'
class: '-end-12'
}"
arrows
class="w-64 mx-auto"

View File

@@ -1,6 +1,4 @@
<script setup lang="ts">
const route = useRoute()
const links = [{
label: 'Profile',
avatar: {
@@ -14,7 +12,7 @@ const links = [{
}, {
label: 'Horizontal Navigation',
icon: 'i-heroicons-chart-bar',
to: `${route.path.startsWith('/dev') ? '/dev' : ''}/components/horizontal-navigation`
to: '/components/horizontal-navigation'
}, {
label: 'Command Palette',
icon: 'i-heroicons-command-line',

View File

@@ -1,9 +1,7 @@
<script setup lang="ts">
const route = useRoute()
const links = [{
label: 'Horizontal Navigation',
to: `${route.path.startsWith('/dev') ? '/dev' : ''}/components/horizontal-navigation`
to: '/components/horizontal-navigation'
}, {
label: 'Command Palette',
to: '/components/command-palette'

View File

@@ -1,6 +1,4 @@
<script setup lang="ts">
const route = useRoute()
const links = [
[{
label: 'Installation',
@@ -9,7 +7,7 @@ const links = [
}, {
label: 'Horizontal Navigation',
icon: 'i-heroicons-chart-bar',
to: `${route.path.startsWith('/dev') ? '/dev' : ''}/components/horizontal-navigation`
to: '/components/horizontal-navigation'
}, {
label: 'Command Palette',
icon: 'i-heroicons-command-line',

View File

@@ -1,6 +1,4 @@
<script setup lang="ts">
const route = useRoute()
const links = [{
label: 'Profile',
avatar: {
@@ -14,7 +12,7 @@ const links = [{
}, {
label: 'Vertical Navigation',
icon: 'i-heroicons-chart-bar',
to: `${route.path.startsWith('/dev') ? '/dev' : ''}/components/vertical-navigation`
to: '/components/vertical-navigation'
}, {
label: 'Command Palette',
icon: 'i-heroicons-command-line',

View File

@@ -1,6 +1,4 @@
<script setup lang="ts">
const route = useRoute()
const links = [
[{
label: 'Profile',
@@ -15,7 +13,7 @@ const links = [
}, {
label: 'Vertical Navigation',
icon: 'i-heroicons-chart-bar',
to: `${route.path.startsWith('/dev') ? '/dev' : ''}/components/vertical-navigation`
to: '/components/vertical-navigation'
}, {
label: 'Command Palette',
icon: 'i-heroicons-command-line',

View File

@@ -1,76 +0,0 @@
import pkg from '@nuxt/ui-pro/package.json'
export const useContentSource = () => {
const route = useRoute()
const router = useRouter()
const config = useRuntimeConfig().public
const branches = computed(() => [{
id: 'main',
name: 'main',
label: 'nuxt/ui',
icon: 'i-heroicons-cube',
suffix: `v${config.version}`,
click: () => select({ name: 'main' })
}, {
id: 'dev',
name: 'dev',
label: 'nuxt/ui-edge',
icon: 'i-heroicons-cube-transparent',
suffix: 'dev',
click: () => select({ name: 'dev' })
}, {
id: 'pro',
name: 'pro',
label: 'nuxt/ui-pro',
icon: 'i-heroicons-cube',
suffix: `v${pkg.version.split('-')[0]}`,
click: () => select({ name: 'pro' })
}, {
id: 'pro-edge',
name: 'pro-edge',
label: 'nuxt/ui-pro-edge',
icon: 'i-heroicons-cube-transparent',
suffix: 'dev',
disabled: true,
click: () => select({ name: 'pro-dev' })
}])
const branch = computed(() => branches.value.find(b => b.name === (route.path.startsWith('/dev') ? 'dev' : route.path.startsWith('/pro') ? 'pro' : 'main')))
function select (b) {
if (b.name === branch.value.name) {
return
}
if (b.name === 'pro') {
router.push('/pro/getting-started')
return
}
if (branch.value.name === 'pro') {
if (b.name === 'dev') {
router.push('/dev/getting-started')
} else {
router.push('/getting-started')
}
return
}
if (b.name === 'dev') {
if (route.path.startsWith('/dev')) {
return
}
router.push(`/dev${route.path}`)
} else {
router.push(route.path.replace('/dev', ''))
}
}
return {
branches,
branch
}
}

View File

@@ -117,23 +117,28 @@ You can manually set errors after form submission if required. To do this, simpl
```vue
<script setup lang="ts">
import type { FormError, FormSubmitEvent } from '#ui/types'
import type { Form, FormSubmitEvent } from '#ui/types'
const state = reactive({
interface Schema {
email?: string
password?: string
}
const state = reactive<Schema>({
email: undefined,
password: undefined
})
const form = ref()
const form = ref<Form<Schema>>()
async function onSubmit (event: FormSubmitEvent<any>) {
form.value.clear()
async function onSubmit (event: FormSubmitEvent<Schema>) {
form.value!.clear()
try {
const response = await $fetch('...')
// ...
} catch (err) {
if (err.statusCode === 422) {
form.value.setErrors(err.data.errors.map((err) => ({
form.value!.setErrors(err.data.errors.map((err) => ({
// Map validation errors to { path: string, message: string }
message: err.message,
path: err.path,

View File

@@ -43,35 +43,20 @@ defineProps<{
const route = useRoute()
const colorMode = useColorMode()
const { branch } = useContentSource()
const { data: nav } = await useAsyncData('navigation', () => fetchContentNavigation())
const { data: navigation } = await useAsyncData('navigation', () => fetchContentNavigation())
const { data: files } = useLazyFetch<ParsedContent[]>('/api/search.json', { default: () => [], server: false })
// Computed
const navigation = computed(() => {
if (branch.value?.name === 'dev') {
const dev = nav.value.find(item => item._path === '/dev')?.children
const pro = nav.value.find(item => item._path === '/pro')
return [
...dev,
...(pro ? [pro] : [])
]
}
return nav.value?.filter(item => item._path !== '/dev') || []
})
const color = computed(() => colorMode.value === 'dark' ? '#18181b' : 'white')
const links = computed(() => {
return [{
label: 'Docs',
icon: 'i-heroicons-book-open',
to: branch.value?.name === 'dev' ? '/dev/getting-started' : '/getting-started',
active: branch.value?.name === 'dev' ? (route.path.startsWith('/dev/getting-started') || route.path.startsWith('/dev/components')) : (route.path.startsWith('/getting-started') || route.path.startsWith('/components'))
to: '/getting-started',
active: route.path.startsWith('/getting-started') || route.path.startsWith('/components')
}, ...(navigation.value.find(item => item._path === '/pro') ? [{
label: 'Pro',
icon: 'i-heroicons-square-3-stack-3d',

View File

@@ -4,8 +4,6 @@
<UPage>
<template #left>
<UAside>
<BranchSelect />
<UNavigationTree :links="mapContentNavigation(navigation)" />
</UAside>
</template>

View File

@@ -48,18 +48,6 @@ export default defineNuxtConfig({
]
},
sources: {
dev: {
prefix: '/dev',
driver: 'fs',
base: resolve('./content')
},
// overwrite default source AKA `content` directory
content: {
driver: 'github',
repo: 'nuxt/ui',
branch: 'main',
dir: 'docs/content'
},
pro: process.env.NUXT_UI_PRO_PATH ? {
prefix: '/pro',
driver: 'fs',
@@ -79,12 +67,17 @@ export default defineNuxtConfig({
provider: 'ipx'
},
icon: {
clientBundle: {
scan: true
}
},
nitro: {
prerender: {
routes: [
'/',
'/getting-started',
'/dev/getting-started',
'/api/search.json',
'/api/releases.json',
'/api/pulls.json'
@@ -94,8 +87,7 @@ export default defineNuxtConfig({
},
routeRules: {
'/components': { redirect: '/components/accordion', prerender: false },
'/dev/components': { redirect: '/dev/components/accordion', prerender: false }
'/components': { redirect: '/components/accordion', prerender: false }
},
componentMeta: {
@@ -152,4 +144,4 @@ export default defineNuxtConfig({
},
compatibilityDate: '2024-07-23'
})
})

View File

@@ -3,16 +3,16 @@
"private": true,
"type": "module",
"dependencies": {
"@iconify-json/heroicons": "^1.2.0",
"@iconify-json/simple-icons": "^1.2.4",
"@iconify-json/heroicons": "^1.2.1",
"@iconify-json/simple-icons": "^1.2.7",
"@iconify-json/vscode-icons": "^1.2.2",
"@nuxt/content": "^2.13.2",
"@nuxt/eslint-config": "^0.4.0",
"@nuxt/fonts": "^0.8.0",
"@nuxt/image": "^1.8.0",
"@nuxt/fonts": "^0.10.0",
"@nuxt/image": "^1.8.1",
"@nuxt/ui": "latest",
"@nuxt/ui-pro": "npm:@nuxt/ui-pro-edge@1.3.1-28698404.4d54eb2",
"@nuxtjs/plausible": "^1.0.2",
"@nuxt/ui-pro": "^1.4.3",
"@nuxtjs/plausible": "^1.0.3",
"@octokit/rest": "^21.0.2",
"@vueuse/nuxt": "^11.1.0",
"date-fns": "^4.1.0",
@@ -21,7 +21,7 @@
"nuxt": "^3.13.2",
"nuxt-cloudflare-analytics": "^1.0.8",
"nuxt-component-meta": "^0.8.2",
"nuxt-og-image": "^3.0.2",
"nuxt-og-image": "^3.0.4",
"prettier": "^3.3.3",
"ufo": "^1.5.4",
"v-calendar": "^3.1.2",

View File

@@ -39,7 +39,6 @@
import { withoutTrailingSlash } from 'ufo'
const route = useRoute()
const { branch } = useContentSource()
definePageMeta({
layout: 'docs'
@@ -54,9 +53,6 @@ const { data: surround } = await useAsyncData(`${route.path}-surround`, () => {
return queryContent()
.where({
_extension: 'md',
_path: {
[branch.value?.name === 'dev' ? '$eq' : '$ne']: new RegExp('^/dev')
},
navigation: {
$ne: false
}
@@ -82,7 +78,7 @@ defineOgImageComponent('Docs', {
const communityLinks = computed(() => [{
icon: 'i-heroicons-pencil-square',
label: 'Edit this page',
to: `https://github.com/nuxt/ui/edit/dev/docs/content/${branch.value?.name === 'dev' ? page?.value?._file.split('/').slice(1).join('/') : page?.value?._file}`,
to: `https://github.com/nuxt/ui/edit/dev/docs/content/${page?.value?._file}`,
target: '_blank'
}, {
icon: 'i-heroicons-star',

View File

@@ -413,7 +413,7 @@ import type { ParsedContent, NavItem } from '@nuxt/content'
import { useElementBounding, useWindowScroll, useElementSize, breakpointsTailwind, useBreakpoints } from '@vueuse/core'
import type { HomeProBlock } from '~/types'
const { data: page } = await useAsyncData('index', () => queryContent('/dev').findOne())
const { data: page } = await useAsyncData('index', () => queryContent('/').findOne())
const { data: module } = await useFetch<{
stats: {
downloads: number

View File

@@ -36,7 +36,7 @@
<script setup lang="ts">
import { eachDayOfInterval, isSameDay, isToday } from 'date-fns'
const { data: page } = await useAsyncData('releases', () => queryContent('/dev/releases').findOne())
const { data: page } = await useAsyncData('releases', () => queryContent('/releases').findOne())
if (!page.value) {
throw createError({ statusCode: 404, statusMessage: 'Page not found', fatal: true })
}

View File

@@ -1,8 +1,8 @@
{
"name": "@nuxt/ui",
"description": "A UI Library for Modern Web Apps, powered by Vue & Tailwind CSS.",
"version": "2.18.6",
"packageManager": "pnpm@9.11.0",
"version": "2.18.7",
"packageManager": "pnpm@9.12.1",
"repository": "nuxt/ui",
"homepage": "https://ui.nuxt.com",
"type": "module",
@@ -26,7 +26,7 @@
"build:docs": "nuxi generate docs",
"lint": "eslint .",
"lint:fix": "eslint . --fix",
"typecheck": "vue-tsc --noEmit",
"typecheck": "vue-tsc --noEmit && nuxi typecheck docs",
"dev:prepare": "nuxt-module-build build --stub && nuxt-module-build prepare && nuxi prepare docs",
"release": "release-it",
"test": "vitest"
@@ -34,8 +34,8 @@
"dependencies": {
"@headlessui/tailwindcss": "^0.2.1",
"@headlessui/vue": "^1.7.23",
"@iconify-json/heroicons": "^1.2.0",
"@nuxt/icon": "^1.5.1",
"@iconify-json/heroicons": "^1.2.1",
"@nuxt/icon": "^1.5.5",
"@nuxt/kit": "^3.13.2",
"@nuxtjs/color-mode": "^3.5.1",
"@nuxtjs/tailwindcss": "^6.12.1",
@@ -52,25 +52,25 @@
"ohash": "^1.1.4",
"pathe": "^1.1.2",
"scule": "^1.3.0",
"tailwind-merge": "^2.5.2",
"tailwindcss": "^3.4.12"
"tailwind-merge": "^2.5.3",
"tailwindcss": "^3.4.13"
},
"devDependencies": {
"@nuxt/eslint-config": "^0.4.0",
"@nuxt/module-builder": "^0.8.4",
"@nuxt/test-utils": "^3.14.2",
"@nuxt/test-utils": "^3.14.3",
"@release-it/conventional-changelog": "^8.0.2",
"@vue/test-utils": "^2.4.6",
"eslint": "^8.57.0",
"happy-dom": "^14.12.3",
"joi": "^17.13.3",
"nuxt": "^3.13.2",
"release-it": "^17.6.0",
"release-it": "^17.7.0",
"unbuild": "^2.0.0",
"valibot": "^0.42.1",
"valibot30": "npm:valibot@0.30.0",
"valibot31": "npm:valibot@0.31.0",
"vitest": "^2.1.1",
"vitest": "^2.1.2",
"vitest-environment-nuxt": "^1.0.1",
"vue-tsc": "^2.1.6",
"yup": "^1.4.0",

2938
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@@ -16,5 +16,12 @@
"packageRules": [{
"matchBaseBranches": ["v3"],
"labels": ["v3"]
}, {
"groupName": "tailwindcss",
"matchPackageNames": [
"tailwindcss",
"@tailwindcss/postcss",
"@tailwindcss/vite"
]
}]
}

View File

@@ -1,5 +1,5 @@
<template>
<div :class="ui.wrapper" v-bind="attrs">
<div :class="ui.wrapper" v-bind="attrs" :dir="dir">
<div ref="carouselRef" :class="ui.container" class="no-scrollbar">
<div
v-for="(item, index) in items"
@@ -89,6 +89,10 @@ export default defineComponent({
type: Boolean,
default: false
},
dir: {
type: String as PropType<'ltr' | 'rtl'>,
default: 'ltr'
},
prevButton: {
type: Object as PropType<Button & { class?: string }>,
default: () => config.default.prevButton as Button & { class?: string }
@@ -124,12 +128,16 @@ export default defineComponent({
itemWidth.value = entry?.target?.firstElementChild?.clientWidth || 0
})
const isRtl = computed(() => props.dir === 'rtl')
const currentPage = computed(() => {
if (!itemWidth.value) {
return 0
}
return Math.round(x.value / itemWidth.value) + 1
return isRtl.value
? Math.round(-x.value / itemWidth.value) + 1
: Math.round(x.value / itemWidth.value) + 1
})
const pages = computed(() => {
@@ -137,22 +145,28 @@ export default defineComponent({
return 0
}
return props.items.length - Math.round(carouselWidth.value / itemWidth.value) + 1
const itemDivisions = Math.round(carouselWidth.value / itemWidth.value)
if (props.items.length <= itemDivisions) {
return 0
}
return props.items.length - itemDivisions + 1
})
const isFirst = computed(() => currentPage.value <= 1)
const isLast = computed(() => currentPage.value === pages.value)
function onClickNext () {
x.value += itemWidth.value
x.value += isRtl.value ? -itemWidth.value : itemWidth.value
}
function onClickPrev () {
x.value -= itemWidth.value
x.value -= isRtl.value ? -itemWidth.value : itemWidth.value
}
function onClick (page: number) {
x.value = (page - 1) * itemWidth.value
x.value = (page - 1) * itemWidth.value * (isRtl.value ? -1 : 1)
}
expose({

View File

@@ -183,7 +183,7 @@ export default defineComponent({
})
function onTouchStart (event: TouchEvent) {
if (!event.cancelable || !menuApi.value) {
if (!event.cancelable || !menuApi.value || props.mode === 'click') {
return
}

View File

@@ -57,7 +57,7 @@ export default defineComponent({
default: null
},
modelValue: {
type: [Boolean, Array],
type: [Boolean, Array] as PropType<boolean | Array<any> | null>,
default: null
},
name: {

View File

@@ -54,7 +54,7 @@ export default defineComponent({
inheritAttrs: false,
props: {
modelValue: {
type: [String, Number],
type: [String, Number] as PropType<string | number | null>,
default: ''
},
type: {

View File

@@ -134,7 +134,7 @@ export default defineComponent({
inheritAttrs: false,
props: {
modelValue: {
type: [String, Number, Object, Array],
type: [String, Number, Object, Array] as PropType<string | number | object | Array<any> | null>,
default: ''
},
query: {

View File

@@ -56,7 +56,7 @@ export default defineComponent({
default: null
},
modelValue: {
type: [String, Number, Boolean, Object],
type: [String, Number, Boolean, Object] as PropType<string | number | boolean | object | null>,
default: null
},
name: {

View File

@@ -52,7 +52,7 @@ export default defineComponent({
inheritAttrs: false,
props: {
modelValue: {
type: [String, Number, Object, Boolean],
type: [String, Number, Object, Boolean] as PropType<string | number | boolean | object | null>,
default: ''
},
name: {

View File

@@ -37,7 +37,7 @@ export default defineComponent({
inheritAttrs: false,
props: {
modelValue: {
type: Number,
type: Number as PropType<number | null>,
default: 0
},
id: {

View File

@@ -75,7 +75,7 @@ export default defineComponent({
inheritAttrs: false,
props: {
modelValue: {
type: [String, Number, Object],
type: [String, Number, Object] as PropType<string | number | object | null>,
default: ''
},
id: {

View File

@@ -174,7 +174,7 @@ export default defineComponent({
inheritAttrs: false,
props: {
modelValue: {
type: [String, Number, Object, Array, Boolean],
type: [String, Number, Object, Array, Boolean] as PropType<string | number | object | Array<any> | boolean | null>,
default: ''
},
query: {

View File

@@ -39,7 +39,7 @@ export default defineComponent({
inheritAttrs: false,
props: {
modelValue: {
type: [String, Number],
type: [String, Number] as PropType<string | number | null>,
default: ''
},
id: {

View File

@@ -62,7 +62,7 @@ export default defineComponent({
default: null
},
modelValue: {
type: Boolean,
type: Boolean as PropType<boolean | null>,
default: false
},
disabled: {

View File

@@ -155,7 +155,7 @@ export default defineComponent({
})
function onTouchStart (event: TouchEvent) {
if (!event.cancelable || !popoverApi.value) {
if (!event.cancelable || !popoverApi.value || props.mode === 'click') {
return
}

View File

@@ -4,7 +4,7 @@
Hover
</slot>
<div v-if="open && !prevent" ref="container" :class="[ui.container, ui.width]">
<div v-if="open && !prevent && isVisible" ref="container" :class="[ui.container, ui.width]">
<Transition appear v-bind="ui.transition">
<div>
<div v-if="popper.arrow" data-popper-arrow :class="Object.values(ui.arrow)" />
@@ -29,7 +29,7 @@
</template>
<script lang="ts">
import { computed, ref, toRef, defineComponent } from 'vue'
import { computed, ref, toRef, defineComponent, useSlots } from 'vue'
import type { PropType } from 'vue'
import { defu } from 'defu'
import UKbd from '../elements/Kbd.vue'
@@ -40,6 +40,8 @@ import type { DeepPartial, PopperOptions, Strategy } from '../../types/index'
// @ts-expect-error
import appConfig from '#build/app.config'
import { tooltip } from '#ui/ui.config'
// import useslots
const config = mergeConfig<typeof tooltip>(appConfig.ui.strategy, appConfig.ui.tooltip, tooltip)
@@ -94,6 +96,8 @@ export default defineComponent({
let openTimeout: NodeJS.Timeout | null = null
let closeTimeout: NodeJS.Timeout | null = null
const isVisible = computed<boolean>(() => !!(useSlots().text || props.text))
// Methods
function onMouseEnter () {
@@ -138,7 +142,8 @@ export default defineComponent({
container,
open,
onMouseEnter,
onMouseLeave
onMouseLeave,
isVisible
}
}
})

View File

@@ -14,12 +14,12 @@ export default {
default: {
prevButton: {
color: 'black' as const,
class: 'rtl:[&_span:first-child]:rotate-180 absolute left-4 top-1/2 transform -translate-y-1/2 rounded-full',
class: 'rtl:[&_span:first-child]:rotate-180 absolute start-4 top-1/2 transform -translate-y-1/2 rounded-full',
icon: 'i-heroicons-chevron-left-20-solid'
},
nextButton: {
color: 'black' as const,
class: 'rtl:[&_span:last-child]:rotate-180 absolute right-4 top-1/2 transform -translate-y-1/2 rounded-full',
class: 'rtl:[&_span:last-child]:rotate-180 absolute end-4 top-1/2 transform -translate-y-1/2 rounded-full',
icon: 'i-heroicons-chevron-right-20-solid'
}
}

View File

@@ -127,7 +127,7 @@ export const getNuxtLinkProps = (props) => {
}
export const getULinkProps = (props) => {
const keys = [...Object.keys(nuxtLinkProps), ...Object.keys(uLinkProps), 'ariaLabel']
const keys = [...Object.keys(nuxtLinkProps), ...Object.keys(uLinkProps), 'ariaLabel', 'title']
return keys.reduce((acc, key) => {
if (props[key] !== undefined) {

View File

@@ -68,6 +68,11 @@
"destination": "/dev/components/:path",
"permanent": true
},
{
"source": "/dev/components/:path(.*)",
"destination": "/components/:path",
"permanent": true
},
{
"source": "/pro/guide",
"destination": "/pro/getting-started",