Skip to content

Commit 4f91476

Browse files
committed
Merge branch 'master' into next
2 parents 45d9c84 + bf337fb commit 4f91476

File tree

40 files changed

+885
-145
lines changed

40 files changed

+885
-145
lines changed

β€Žpackages/api-generator/src/helpers/sass.tsβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ function processVariableFile (filePath: string, tagUse: string | string[]) {
1414
: varArr.join(':')
1515
varValues[varName] = {
1616
default: varDefault.replace('!default', '').trim(),
17-
...(tagUse) && { use: tagUse === 'all' || tagUse?.includes(varName) ? 'vuetify' : 'vuetify/settings' },
17+
...{ use: tagUse === 'all' || tagUse?.includes(varName) ? 'vuetify' : 'vuetify/settings' },
1818
}
1919
}
2020
}

β€Žpackages/api-generator/src/locale/en/generic.jsonβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
"prependIcon": "Creates a [v-icon](/api/v-icon/) component in the **prepend** slot before default content.",
5151
"ripple": "Applies the [v-ripple](/directives/ripple) directive.",
5252
"search": "Text input used to filter items.",
53+
"scrollToActive": "Keeps the last active element visible when resizing the scrollable container.",
5354
"selectedClass": "Configure the active CSS class applied when an item is selected.",
5455
"size": "Sets the height and width of the component.",
5556
"subtitle": "Specify a subtitle text for the component.",

β€Žpackages/docs/package.jsonβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"@vue/compiler-dom": "^3.5.13",
2727
"@vuelidate/core": "^2.0.3",
2828
"@vuelidate/validators": "^2.0.4",
29-
"@vuetify/one": "^2.3.0",
29+
"@vuetify/one": "^2.5.1",
3030
"algoliasearch": "^4.24.0",
3131
"fflate": "^0.8.2",
3232
"isomorphic-fetch": "^3.0.0",

β€Žpackages/docs/src/App.vueβ€Ž

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,7 @@
9191
}
9292
9393
watchEffect(() => {
94-
theme.global.name.value = (
95-
user.one.theme === 'system' ? systemTheme.value : user.one.theme
96-
)
94+
theme.change(user.one.theme === 'system' ? systemTheme.value : user.one.theme)
9795
})
9896
9997
watch(theme.global.name, themeTransition)

β€Žpackages/docs/src/data/new-in.jsonβ€Ž

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@
5151
"baseColor": "3.8.0"
5252
}
5353
},
54+
"VChipGroup": {
55+
"props": {
56+
"scrollToActive": "3.10.6"
57+
}
58+
},
5459
"VColorPicker": {
5560
"props": {
5661
"hideEyeDropper": "3.10.0",
@@ -214,7 +219,8 @@
214219
},
215220
"VSlideGroup": {
216221
"props": {
217-
"contentClass": "3.9.0"
222+
"contentClass": "3.9.0",
223+
"scrollToActive": "3.10.6"
218224
}
219225
},
220226
"VSnackbar": {

β€Žpackages/docs/src/data/page-to-api.jsonβ€Ž

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,15 @@
5757
"components/checkboxes": ["VCheckbox", "VCheckboxBtn"],
5858
"components/chip-groups": ["VChip", "VChipGroup"],
5959
"components/chips": ["VChip", "VChipGroup"],
60+
"components/color-inputs": ["VColorInput", "VColorPicker"],
6061
"components/color-pickers": ["VColorPicker"],
61-
"components/confirm-edit": ["VConfirmEdit"],
6262
"components/combobox": ["VCombobox"],
63+
"components/confirm-edit": ["VConfirmEdit"],
6364
"components/data-iterators": ["VDataIterator"],
65+
"components/date-inputs": ["VDateInput", "VDatePicker"],
66+
"components/date-pickers-month": ["VDatePicker"],
67+
"components/date-pickers": ["VDatePicker", "VDateInput"],
68+
"components/defaults-providers": ["VDefaultsProvider"],
6469
"components/data-tables": [
6570
"VDataTable",
6671
"VDataTableFooter",
@@ -75,11 +80,6 @@
7580
"components/data-tables/virtual-tables": [
7681
"VDataTableVirtual"
7782
],
78-
"components/color-inputs": ["VColorInput", "VColorPicker"],
79-
"components/date-inputs": ["VDateInput", "VDatePicker"],
80-
"components/date-pickers-month": ["VDatePicker"],
81-
"components/date-pickers": ["VDatePicker", "VDateInput"],
82-
"components/defaults-providers": ["VDefaultsProvider"],
8383
"components/dialogs": ["VDialog", "VOverlay"],
8484
"components/dividers": ["VDivider"],
8585
"components/empty-states": ["VEmptyState"],
@@ -90,11 +90,14 @@
9090
"VExpansionPanelTitle"
9191
],
9292
"components/file-inputs": ["VFileInput"],
93+
"components/file-upload": ["VFileUpload"],
9394
"components/floating-action-buttons": ["VFab"],
9495
"components/footers": ["VFooter"],
9596
"components/forms": ["VForm"],
9697
"components/grids": ["VCol", "VContainer", "VRow", "VSpacer"],
98+
"components/hotkeys": ["VHotkey"],
9799
"components/hover": ["VHover"],
100+
"components/icon-buttons": ["VIconBtn"],
98101
"components/icons": ["VIcon"],
99102
"components/images": ["VImg"],
100103
"components/infinite-scroller": ["VInfiniteScroll"],
@@ -113,9 +116,11 @@
113116
"VListImg"
114117
],
115118
"components/locale-providers": ["VLocaleProvider"],
119+
"components/mask-inputs": ["VMaskInput"],
116120
"components/menus": ["VMenu"],
117121
"components/navigation-drawers": ["VNavigationDrawer"],
118122
"components/no-ssr": ["VNoSsr"],
123+
"components/number-inputs": ["VNumberInput"],
119124
"components/otp-input": ["VOtpInput"],
120125
"components/overflow-btns": ["VOverflowBtn"],
121126
"components/overlays": ["VOverlay"],
@@ -124,18 +129,19 @@
124129
"components/pie-charts": ["VPie", "VPieSegment", "VPieTooltip"],
125130
"components/progress-circular": ["VProgressCircular"],
126131
"components/progress-linear": ["VProgressLinear"],
132+
"components/pull-to-refresh": ["VPullToRefresh"],
127133
"components/radio-buttons": ["VRadio", "VRadioGroup"],
128134
"components/range-sliders": ["VRangeSlider", "VSlider"],
129135
"components/ratings": ["VRating"],
130136
"components/selects": ["VSelect"],
131137
"components/sheets": ["VSheet"],
132-
"components/simple-tables": ["VSimpleTable"],
133138
"components/skeleton-loaders": ["VSkeletonLoader"],
134139
"components/slide-groups": ["VSlideGroup", "VSlideGroupItem"],
135140
"components/sliders": ["VRangeSlider", "VSlider"],
136-
"components/snackbars": ["VSnackbar"],
137141
"components/snackbar-queue": ["VSnackbarQueue", "VSnackbar"],
142+
"components/snackbars": ["VSnackbar"],
138143
"components/sparklines": ["VSparkline"],
144+
"components/speed-dials": ["VSpeedDial"],
139145
"components/steppers": [
140146
"VStepper",
141147
"VStepperHeader",
@@ -160,6 +166,7 @@
160166
"VTreeviewChildren",
161167
"VTreeviewGroup"
162168
],
169+
"components/vertical-steppers": ["VStepperVertical", "VStepperVerticalActions", "VStepperVerticalItem"],
163170
"components/videos": ["VVideo", "VVideoControls", "VVideoVolume"],
164171
"components/virtual-scroller": ["VVirtualScroll"],
165172
"components/windows": ["VWindow", "VWindowItem"],
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<template>
2+
<v-stepper-vertical
3+
:items="['Step 1', 'Step 2', 'Step 3']"
4+
:mandatory="false"
5+
editable
6+
non-linear
7+
></v-stepper-vertical>
8+
</template>
Lines changed: 92 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,104 @@
11
<template>
2-
<v-card>
3-
<v-tabs
4-
v-model="tab"
5-
bg-color="primary"
6-
>
7-
<v-tab value="one">Item One</v-tab>
8-
<v-tab value="two">Item Two</v-tab>
9-
<v-tab value="three">Item Three</v-tab>
10-
</v-tabs>
11-
12-
<v-card-text>
2+
<ExamplesUsageExample
3+
v-model="model"
4+
:code="code"
5+
:name="name"
6+
:options="options"
7+
>
8+
<v-card :class="direction === 'vertical' ? 'd-flex' : ''" elevation="4">
9+
<v-tabs
10+
v-model="tab"
11+
v-bind="props"
12+
>
13+
<v-tab value="one">Item One</v-tab>
14+
<v-tab value="two">Item Two</v-tab>
15+
<v-tab value="three">Item Three</v-tab>
16+
</v-tabs>
17+
18+
<v-divider :vertical="direction === 'vertical'"></v-divider>
19+
1320
<v-tabs-window v-model="tab">
1421
<v-tabs-window-item value="one">
15-
One
22+
<v-sheet class="pa-5" color="purple">One</v-sheet>
1623
</v-tabs-window-item>
17-
1824
<v-tabs-window-item value="two">
19-
Two
25+
<v-sheet class="pa-5" color="orange">Two</v-sheet>
2026
</v-tabs-window-item>
21-
2227
<v-tabs-window-item value="three">
23-
Three
28+
<v-sheet class="pa-5" color="cyan">Three</v-sheet>
2429
</v-tabs-window-item>
2530
</v-tabs-window>
26-
</v-card-text>
27-
</v-card>
31+
</v-card>
32+
33+
<template v-slot:configuration>
34+
<v-select
35+
v-model="direction"
36+
:items="['horizontal', 'vertical']"
37+
label="Direction"
38+
mandatory
39+
></v-select>
40+
<v-select
41+
v-model="color"
42+
:items="['primary', 'cyan']"
43+
label="Color"
44+
clearable
45+
></v-select>
46+
<v-select
47+
v-model="bgColor"
48+
:items="['orange', 'lime-lighten-2']"
49+
label="Background"
50+
clearable
51+
></v-select>
52+
<v-checkbox
53+
v-model="hideSlider"
54+
color="secondary"
55+
label="Hide slider"
56+
hide-details
57+
></v-checkbox>
58+
</template>
59+
</ExamplesUsageExample>
2860
</template>
2961

30-
<script>
31-
export default {
32-
data: () => ({
33-
tab: null,
34-
}),
35-
}
62+
<script setup>
63+
const name = 'v-tabs'
64+
const tab = shallowRef(0)
65+
66+
const direction = shallowRef('horizontal')
67+
const color = shallowRef('primary')
68+
const bgColor = shallowRef(null)
69+
const hideSlider = shallowRef(false)
70+
71+
const props = computed(() => {
72+
return {
73+
color: color.value || undefined,
74+
'bg-color': bgColor.value || undefined,
75+
direction: direction.value === 'vertical' ? direction.value : undefined,
76+
'hide-slider': hideSlider.value || undefined,
77+
}
78+
})
79+
80+
const code = computed(() => {
81+
return `
82+
<v-sheet${direction.value === 'vertical' ? 'class="d-flex"' : ''} elevation="4">
83+
<${name}${propsToString(props.value, [], 2)}>
84+
<v-tab value="one">Item One</v-tab>
85+
<v-tab value="two">Item Two</v-tab>
86+
<v-tab value="three">Item Three</v-tab>
87+
</${name}>
88+
89+
<v-divider${direction.value === 'vertical' ? 'vertical' : ''}></v-divider>
90+
91+
<v-tabs-window v-model="tab">
92+
<v-tabs-window-item value="one">
93+
<v-sheet class="pa-5" color="purple">One</v-sheet>
94+
</v-tabs-window-item>
95+
<v-tabs-window-item value="two">
96+
<v-sheet class="pa-5" color="orange">Two</v-sheet>
97+
</v-tabs-window-item>
98+
<v-tabs-window-item value="three">
99+
<v-sheet class="pa-5" color="brown">Three</v-sheet>
100+
</v-tabs-window-item>
101+
</v-tabs-window>
102+
</v-sheet>`
103+
})
36104
</script>

β€Žpackages/docs/src/pages/en/blog/index.mdβ€Ž

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,14 @@ Latest news, updates, and stories about Vuetify.
1818

1919
<br>
2020

21+
## September 2025 Update
22+
23+
πŸ–ŠοΈ John Leider β€’ πŸ“… October 12th, 2025
24+
25+
September marks significant progress as we assemble the building blocks for Vuetify's next phase. From revolutionary design-to-development workflows with our new Figma UI Kit to foundational v0 composables, September has been about connecting the pieces that will define the future of Vue development. This update includes the release of v3.10.0 (Argo), updated Figma UI Kit, new Vuetify0 composables, and over 60 bug fixes and features... { .text-medium-emphasis }
26+
27+
[Read More](/blog/september-2025-update/) { .text-end }
28+
2129
## August 2025 Update
2230

2331
πŸ–ŠοΈ John Leider β€’ πŸ“… September 9th, 2025

0 commit comments

Comments
Β (0)