Skip to content

Commit 5f990cf

Browse files
authored
Merge branch 'v3' into feat/progress
2 parents 37ca223 + b9adc83 commit 5f990cf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+2760
-2111
lines changed

docs/app/app.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ provide('navigation', mappedNavigation)
5353
<NuxtLoadingIndicator color="var(--ui-primary)" :height="2" />
5454

5555
<template v-if="!route.path.startsWith('/examples')">
56-
<Banner />
56+
<!-- <Banner /> -->
5757

5858
<Header :links="links" />
5959
</template>

docs/app/components/content/ComponentPropsSchema.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ const schemaProps = computed(() => {
3838
</script>
3939

4040
<template>
41-
<ProseCollapsible v-if="schemaProps?.length" class="mt-1">
41+
<ProseCollapsible v-if="schemaProps?.length" class="mt-1 mb-0">
4242
<ProseUl>
4343
<ProseLi v-for="schemaProp in schemaProps" :key="schemaProp.name">
4444
<HighlightInlineType :type="`${schemaProp.name}${schemaProp.required === false ? '?' : ''}: ${schemaProp.type}`" />

docs/app/components/content/SupportedLanguages.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ function getEmojiFlag(locale: string): string {
2626
km: 'kh', // Khmer -> Cambodia
2727
ko: 'kr', // Korean -> South Korea
2828
nb: 'no', // Norwegian Bokmål -> Norway
29+
sl: 'si', // Slovenian -> Slovenia
2930
sv: 'se', // Swedish -> Sweden
3031
uk: 'ua', // Ukrainian -> Ukraine
3132
ur: 'pk', // Urdu -> Pakistan

docs/app/error.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ provide('navigation', mappedNavigation)
5959
<UApp>
6060
<NuxtLoadingIndicator color="#FFF" />
6161

62-
<Banner />
62+
<!-- <Banner /> -->
6363

6464
<Header :links="links" />
6565

docs/app/pages/figma/index.vue

Lines changed: 33 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -24,32 +24,41 @@ onMounted(async () => {
2424
const nuxtWordPosition = document.querySelector('#nuxt')?.getBoundingClientRect()
2525
const initialScrollX = window.scrollX
2626
const initialScrollY = window.scrollY
27+
2728
if (figmaWordPosition && nuxtWordPosition) {
28-
animate('#cursor1', { left: Math.round(Math.random() * window.outerWidth), top: Math.round(Math.random() * window.outerHeight) }, { duration: 0.1 })
29-
.then(() => animate('#cursor1', { opacity: 1 }, { duration: 0.3 }))
30-
.then(() => {
31-
return animate('#cursor1', {
32-
left: Math.round(figmaWordPosition.left + initialScrollX + figmaWordPosition.width / 2),
33-
top: Math.round(figmaWordPosition.top + initialScrollY - figmaWordPosition.height / 4)
34-
}, { duration: 1.5, delay: 0.2, ease: 'easeInOut' })
35-
})
36-
.then(() => animate('#cursor1', { scale: 0.8 }, { duration: 0.1, ease: 'easeOut' }))
37-
.then(() => animate('#cursor1', { scale: 1 }, { duration: 0.1, ease: 'easeOut' }))
38-
.then(() => animate('#figma', { color: 'var(--ui-info)' }, { duration: 0.3, ease: 'easeOut' }))
39-
.then(() => animate('#cursor1', { left: Math.round(figmaWordPosition.left + initialScrollX + figmaWordPosition.width), top: Math.round(figmaWordPosition.top + initialScrollY) }, { duration: 0.6, ease: 'easeInOut' }))
29+
const cursor1Sequence = async () => {
30+
await animate('#cursor1', { left: Math.round(Math.random() * window.outerWidth), top: Math.round(Math.random() * window.outerHeight) }, { duration: 0.1 }).finished
31+
await animate('#cursor1', { opacity: 1 }, { duration: 0.3 }).finished
32+
await animate('#cursor1', {
33+
left: Math.round(figmaWordPosition.left + initialScrollX + figmaWordPosition.width / 2),
34+
top: Math.round(figmaWordPosition.top + initialScrollY - figmaWordPosition.height / 4)
35+
}, { duration: 1.5, delay: 0.2, ease: 'easeInOut' }).finished
36+
await animate('#cursor1', { scale: 0.8 }, { duration: 0.1, ease: 'easeOut' }).finished
37+
await animate('#cursor1', { scale: 1 }, { duration: 0.1, ease: 'easeOut' }).finished
38+
await animate('#figma', { color: 'var(--ui-info)' }, { duration: 0.3, ease: 'easeOut' }).finished
39+
await animate('#cursor1', {
40+
left: Math.round(figmaWordPosition.left + initialScrollX + figmaWordPosition.width),
41+
top: Math.round(figmaWordPosition.top + initialScrollY)
42+
}, { duration: 0.6, ease: 'easeInOut' }).finished
43+
}
44+
45+
const cursor2Sequence = async () => {
46+
await animate('#cursor2', { left: Math.round(Math.random() * window.outerWidth), top: Math.round(Math.random() * window.outerHeight) }, { duration: 0.1, delay: 0.6 }).finished
47+
await animate('#cursor2', { opacity: 1 }, { duration: 0.3 }).finished
48+
await animate('#cursor2', {
49+
left: Math.round(nuxtWordPosition.left + initialScrollX + nuxtWordPosition.width / 2),
50+
top: Math.round(nuxtWordPosition.top + initialScrollY - nuxtWordPosition.height / 4)
51+
}, { duration: 1.5, delay: 0.2, ease: 'easeInOut' }).finished
52+
await animate('#cursor2', { scale: 0.8 }, { duration: 0.1, ease: 'easeOut' }).finished
53+
await animate('#cursor2', { scale: 1 }, { duration: 0.1, ease: 'easeOut' }).finished
54+
await animate('#nuxt', { color: 'var(--ui-success)' }, { duration: 0.3, ease: 'easeOut' }).finished
55+
await animate('#cursor2', {
56+
left: Math.round(nuxtWordPosition.left + initialScrollX + nuxtWordPosition.width),
57+
top: Math.round(nuxtWordPosition.top + initialScrollY)
58+
}, { duration: 0.6, ease: 'easeInOut' }).finished
59+
}
4060
41-
animate('#cursor2', { left: Math.round(Math.random() * window.outerWidth), top: Math.round(Math.random() * window.outerHeight) }, { duration: 0.1, delay: 0.6 })
42-
.then(() => animate('#cursor2', { opacity: 1 }, { duration: 0.3 }))
43-
.then(() => {
44-
return animate('#cursor2', {
45-
left: Math.round(nuxtWordPosition.left + initialScrollX + nuxtWordPosition.width / 2),
46-
top: Math.round(nuxtWordPosition.top + initialScrollY - nuxtWordPosition.height / 4)
47-
}, { duration: 1.5, delay: 0.2, ease: 'easeInOut' })
48-
})
49-
.then(() => animate('#cursor2', { scale: 0.8 }, { duration: 0.1, ease: 'easeOut' }))
50-
.then(() => animate('#cursor2', { scale: 1 }, { duration: 0.1, ease: 'easeOut' }))
51-
.then(() => animate('#nuxt', { color: 'var(--ui-success)' }, { duration: 0.3, ease: 'easeOut' }))
52-
.then(() => animate('#cursor2', { left: Math.round(nuxtWordPosition.left + initialScrollX + nuxtWordPosition.width), top: Math.round(nuxtWordPosition.top + initialScrollY) }, { duration: 0.6, ease: 'easeInOut' }))
61+
await Promise.all([cursor1Sequence(), cursor2Sequence()])
5362
}
5463
})
5564
</script>

docs/content/3.components/accordion.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ Use the `items` prop as an array of objects with the following properties:
2323
- `value?: string`{lang="ts-type"}
2424
- `disabled?: boolean`{lang="ts-type"}
2525
- [`slot?: string`{lang="ts-type"}](#with-custom-slot)
26+
- `class?: any`{lang="ts-type"}
27+
- `ui?: { item?: ClassNameValue, header?: ClassNameValue, trigger?: ClassNameValue, leadingIcon?: ClassNameValue, label?: ClassNameValue, trailingIcon?: ClassNameValue, content?: ClassNameValue, body?: ClassNameValue }`{lang="ts-type"}
2628

2729
::component-code
2830
---

docs/content/3.components/breadcrumb.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ Use the `items` prop as an array of objects with the following properties:
1616
- `label?: string`{lang="ts-type"}
1717
- `icon?: string`{lang="ts-type"}
1818
- `avatar?: AvatarProps`{lang="ts-type"}
19-
- `class?: any`{lang="ts-type"}
2019
- [`slot?: string`{lang="ts-type"}](#with-custom-slot)
20+
- `class?: any`{lang="ts-type"}
21+
- `ui?: { item?: ClassNameValue, link?: ClassNameValue, linkLeadingIcon?: ClassNameValue, linkLeadingAvatar?: ClassNameValue, linkLabel?: ClassNameValue, separator?: ClassNameValue, separatorIcon?: ClassNameValue }`{lang="ts-type"}
2122

2223
You can pass any property from the [Link](/components/link#props) component such as `to`, `target`, etc.
2324

docs/content/3.components/carousel.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ class: 'p-8'
2727
---
2828
::
2929

30+
You can also pass an array of objects with the following properties:
31+
32+
- `class?: any`{lang="ts-type"}
33+
- `ui?: { item?: ClassNameValue }`{lang="ts-type"}
34+
3035
You can control how many items are visible by using the [`basis`](https://tailwindcss.com/docs/flex-basis) / [`width`](https://tailwindcss.com/docs/width) utility classes on the `item`:
3136

3237
::component-example

docs/content/3.components/checkbox-group.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ You can also pass an array of objects with the following properties:
4949
- `description?: string`{lang="ts-type"}
5050
- [`value?: string`{lang="ts-type"}](#value-key)
5151
- `disabled?: boolean`{lang="ts-type"}
52+
- `class?: any`{lang="ts-type"}
53+
- `ui?: { item?: ClassNameValue, container?: ClassNameValue, base?: ClassNameValue, 'indicator'?: ClassNameValue, icon?: ClassNameValue, wrapper?: ClassNameValue, label?: ClassNameValue, description?: ClassNameValue }`{lang="ts-type"}
5254

5355
::component-code
5456
---
@@ -199,6 +201,7 @@ items:
199201
variant:
200202
- list
201203
- card
204+
- table
202205
props:
203206
color: 'primary'
204207
variant: 'card'
@@ -229,6 +232,7 @@ items:
229232
variant:
230233
- list
231234
- card
235+
- table
232236
props:
233237
size: 'xl'
234238
variant: 'list'
@@ -259,6 +263,7 @@ items:
259263
variant:
260264
- list
261265
- card
266+
- table
262267
props:
263268
orientation: 'horizontal'
264269
variant: 'list'
@@ -293,6 +298,7 @@ items:
293298
variant:
294299
- list
295300
- card
301+
- table
296302
props:
297303
indicator: 'end'
298304
variant: 'card'

docs/content/3.components/command-palette.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ Each group contains an `items` array of objects that define the commands. Each i
5353
- `disabled?: boolean`{lang="ts-type"}
5454
- [`slot?: string`{lang="ts-type"}](#with-custom-slot)
5555
- `onSelect?(e?: Event): void`{lang="ts-type"}
56+
- `class?: any`{lang="ts-type"}
57+
- `ui?: { item?: ClassNameValue, itemLeadingIcon?: ClassNameValue, itemLeadingAvatarSize?: ClassNameValue, itemLeadingAvatar?: ClassNameValue, itemLeadingChipSize?: ClassNameValue, itemLeadingChip?: ClassNameValue, itemLabel?: ClassNameValue, itemLabelPrefix?: ClassNameValue, itemLabelBase?: ClassNameValue, itemLabelSuffix?: ClassNameValue, itemTrailing?: ClassNameValue, itemTrailingKbds?: ClassNameValue, itemTrailingKbdsSize?: ClassNameValue, itemTrailingHighlightedIcon?: ClassNameValue, itemTrailingIcon?: ClassNameValue,}`{lang="ts-type"}
5658

5759
You can pass any property from the [Link](/components/link#props) component such as `to`, `target`, etc.
5860

docs/content/3.components/context-menu.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,12 @@ Use the `items` prop as an array of objects with the following properties:
2828
- [`color?: "error" | "primary" | "secondary" | "success" | "info" | "warning" | "neutral"`{lang="ts-type"}](#with-color-items)
2929
- [`checked?: boolean`{lang="ts-type"}](#with-checkbox-items)
3030
- `disabled?: boolean`{lang="ts-type"}
31-
- `class?: any`{lang="ts-type"}
3231
- [`slot?: string`{lang="ts-type"}](#with-custom-slot)
3332
- `onSelect?(e: Event): void`{lang="ts-type"}
3433
- [`onUpdateChecked?(checked: boolean): void`{lang="ts-type"}](#with-checkbox-items)
3534
- `children?: ContextMenuItem[] | ContextMenuItem[][]`{lang="ts-type"}
35+
- `class?: any`{lang="ts-type"}
36+
- `ui?: { item?: ClassNameValue, label?: ClassNameValue, separator?: ClassNameValue, itemLeadingIcon?: ClassNameValue, itemLeadingAvatarSize?: ClassNameValue, itemLeadingAvatar?: ClassNameValue, itemLabel?: ClassNameValue, itemLabelExternalIcon?: ClassNameValue, itemTrailing?: ClassNameValue, itemTrailingIcon?: ClassNameValue, itemTrailingKbds?: ClassNameValue, itemTrailingKbdsSize?: ClassNameValue }`{lang="ts-type"}
3637

3738
You can pass any property from the [Link](/components/link#props) component such as `to`, `target`, etc.
3839

docs/content/3.components/dropdown-menu.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,12 @@ Use the `items` prop as an array of objects with the following properties:
2828
- [`color?: "error" | "primary" | "secondary" | "success" | "info" | "warning" | "neutral"`{lang="ts-type"}](#with-color-items)
2929
- [`checked?: boolean`{lang="ts-type"}](#with-checkbox-items)
3030
- `disabled?: boolean`{lang="ts-type"}
31-
- `class?: any`{lang="ts-type"}
3231
- [`slot?: string`{lang="ts-type"}](#with-custom-slot)
3332
- `onSelect?(e: Event): void`{lang="ts-type"}
3433
- [`onUpdateChecked?(checked: boolean): void`{lang="ts-type"}](#with-checkbox-items)
3534
- `children?: DropdownMenuItem[] | DropdownMenuItem[][]`{lang="ts-type"}
35+
- `class?: any`{lang="ts-type"}
36+
- `ui?: { item?: ClassNameValue, label?: ClassNameValue, separator?: ClassNameValue, itemLeadingIcon?: ClassNameValue, itemLeadingAvatarSize?: ClassNameValue, itemLeadingAvatar?: ClassNameValue, itemLabel?: ClassNameValue, itemLabelExternalIcon?: ClassNameValue, itemTrailing?: ClassNameValue, itemTrailingIcon?: ClassNameValue, itemTrailingKbds?: ClassNameValue, itemTrailingKbdsSize?: ClassNameValue }`{lang="ts-type"}
3637

3738
You can pass any property from the [Link](/components/link#props) component such as `to`, `target`, etc.
3839

docs/content/3.components/input-menu.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ You can also pass an array of objects with the following properties:
5555
- [`chip?: ChipProps`{lang="ts-type"}](#with-chip-in-items)
5656
- `disabled?: boolean`{lang="ts-type"}
5757
- `onSelect?(e: Event): void`{lang="ts-type"}
58+
- `class?: any`{lang="ts-type"}
59+
- `ui?: { tagsItem?: ClassNameValue, tagsItemText?: ClassNameValue, tagsItemDelete?: ClassNameValue, tagsItemDeleteIcon?: ClassNameValue, label?: ClassNameValue, separator?: ClassNameValue, item?: ClassNameValue, itemLeadingIcon?: ClassNameValue, itemLeadingAvatarSize?: ClassNameValue, itemLeadingAvatar?: ClassNameValue, itemLeadingChip?: ClassNameValue, itemLeadingChipSize?: ClassNameValue, itemLabel?: ClassNameValue, itemTrailing?: ClassNameValue, itemTrailingIcon?: ClassNameValue }`{lang="ts-type"}
5860

5961
::component-code
6062
---

0 commit comments

Comments
 (0)