Skip to content

Commit 114a6d1

Browse files
committed
WIP: Update to Vuetify ^3.9 and Vue ^3.5.17
- Update to latest Vuetify 3.9.0 - Update to latest Vue 3.5.17 - Fix imports for Vuetify promoted from labs - Fix typings for update events in Vuetify DateControlRenderer - Adapt Vuetify test snapshots to changes in Vuetify (e.g. setting values in HTML element) TODO: Focus behavior seems to have changed in the tests. Figure out if this is a regression or fine as is.
1 parent 883f108 commit 114a6d1

23 files changed

+345
-208
lines changed

packages/vue-vanilla/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,12 @@
8989
"tslib": "^2.5.0",
9090
"typedoc": "~0.25.3",
9191
"typescript": "~5.5.0",
92-
"vue": "^3.4.21",
92+
"vue": "^3.5.17",
9393
"vue-jest": "^5.0.0-0"
9494
},
9595
"peerDependencies": {
9696
"@jsonforms/core": "3.6.0",
9797
"@jsonforms/vue": "3.6.0",
98-
"vue": "^3.2.26"
98+
"vue": "^3.5.17"
9999
}
100100
}

packages/vue-vuetify/dev/store/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ function useHistoryHashQuery<T extends string | boolean | number>(
8080
queryParam: string,
8181
initialValue: T,
8282
) {
83-
const data: Ref<UnwrapRef<T>> = ref<T>(initialValue);
83+
const data = ref<T>(initialValue);
8484

8585
// Function to update data based on URL hash
8686
const updateDataFromHash = () => {

packages/vue-vuetify/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@
6464
"dayjs": "^1.10.6",
6565
"lodash": "^4.17.21",
6666
"maska": "^2.1.11",
67-
"vue": "^3.4.21",
68-
"vuetify": "^3.6.6"
67+
"vue": "^3.5.17",
68+
"vuetify": "^3.9.0"
6969
},
7070
"devDependencies": {
7171
"@fortawesome/fontawesome-free": "^6.5.2",
@@ -110,11 +110,11 @@
110110
"vite-plugin-dts": "^3.9.1",
111111
"vite-plugin-node-polyfills": "^0.21.0",
112112
"vite-plugin-static-copy": "^1.0.5",
113-
"vite-plugin-vuetify": "^2.0.3",
113+
"vite-plugin-vuetify": "^2.1.1",
114114
"vitest": "^1.4.0",
115-
"vue": "^3.4.21",
115+
"vue": "^3.5.17",
116116
"vue-eslint-parser": "^9.4.2",
117117
"vue-tsc": "^2.0.11",
118-
"vuetify": "^3.6.6"
118+
"vuetify": "^3.9.0"
119119
}
120120
}

packages/vue-vuetify/src/controls/DateControlRenderer.vue

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,19 @@
4949
v-if="showMenu"
5050
:model-value="showActions ? proxyModel.value : pickerValue"
5151
@update:model-value="
52-
(val) => updateDatePickerValue(val, proxyModel)
52+
(val: any) => updateDatePickerValue(val, proxyModel)
5353
"
5454
v-bind="vuetifyProps('v-date-picker')"
5555
:title="computedLabel"
5656
:min="minDate"
5757
:max="maxDate"
5858
v-model:view-mode="viewMode"
5959
@update:month="
60-
(month) => updateDatePickerMonth(month, proxyModel)
60+
(month: number) => updateDatePickerMonth(month, proxyModel)
61+
"
62+
@update:year="
63+
(year: number) => updateDatePickerYear(year, proxyModel)
6164
"
62-
@update:year="(year) => updateDatePickerYear(year, proxyModel)"
6365
>
6466
<template v-slot:actions v-if="showActions">
6567
<component :is="actions"></component>

packages/vue-vuetify/src/controls/DateTimeControlRenderer.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,10 @@ import {
197197
VTab,
198198
VTabs,
199199
VTextField,
200+
VTimePicker,
200201
VWindow,
201202
VWindowItem,
202203
} from 'vuetify/components';
203-
import { VTimePicker } from 'vuetify/labs/VTimePicker';
204204
205205
import { vMaska, type MaskOptions, type MaskaDetail } from 'maska';
206206
import { useDisplay, useLocale } from 'vuetify';

packages/vue-vuetify/src/controls/IntegerControlRenderer.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import {
3636
type RendererProps,
3737
} from '@jsonforms/vue';
3838
import { defineComponent } from 'vue';
39-
import { VNumberInput } from 'vuetify/labs/VNumberInput';
39+
import { VNumberInput } from 'vuetify/components';
4040
import { determineClearValue, useVuetifyControl } from '../util';
4141
import { default as ControlWrapper } from './ControlWrapper.vue';
4242
import { DisabledIconFocus } from './directives';

packages/vue-vuetify/src/controls/NumberControlRenderer.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import {
3636
type RendererProps,
3737
} from '@jsonforms/vue';
3838
import { defineComponent } from 'vue';
39-
import { VNumberInput } from 'vuetify/labs/VNumberInput';
39+
import { VNumberInput } from 'vuetify/components';
4040
4141
import { determineClearValue, useVuetifyControl } from '../util';
4242
import { default as ControlWrapper } from './ControlWrapper.vue';

packages/vue-vuetify/src/controls/TimeControlRenderer.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ import {
9595
VMenu,
9696
VSpacer,
9797
VTextField,
98+
VTimePicker,
9899
} from 'vuetify/components';
99-
import { VTimePicker } from 'vuetify/labs/VTimePicker';
100100
101101
import { useLocale } from 'vuetify';
102102
import type { IconValue } from '../icons';

packages/vue-vuetify/tests/unit/additional/__snapshots__/ListWithDetailRenderer.spec.ts.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ exports[`ListWithDetailRenderer.vue > should render component and match snapshot
1717
</div>
1818
</div>
1919
<div data-v-7e93fcc2="" class="v-spacer"></div>
20-
<!--v-if--><button data-v-7e93fcc2="" type="button" class="v-btn v-btn--icon v-theme--light v-btn--density-default elevation-0 v-btn--size-default v-btn--variant-text list-with-detail-add" small="" aria-label="MyAdd" aria-describedby="v-tooltip-0"><span class="v-btn__overlay"></span><span class="v-btn__underlay"></span>
20+
<!--v-if--><button data-v-7e93fcc2="" type="button" class="v-btn v-btn--icon v-theme--light v-btn--density-default elevation-0 v-btn--size-default v-btn--variant-text list-with-detail-add" small="" aria-label="MyAdd" aria-describedby="v-tooltip-v-0"><span class="v-btn__overlay"></span><span class="v-btn__underlay"></span>
2121
<!----><span class="v-btn__content" data-no-activator=""><i data-v-7e93fcc2="" class="mdi-plus mdi v-icon notranslate v-theme--light v-icon--size-default" aria-hidden="true"></i></span>
2222
<!---->
2323
<!---->

packages/vue-vuetify/tests/unit/complex/__snapshots__/ArrayControlRenderer.spec.ts.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ exports[`ArrayControlRenderer.vue > should render component and match snapshot 1
3333
</div>
3434
</div>
3535
<div data-v-4896f876="" class="v-spacer"></div>
36-
<!--v-if--><button data-v-4896f876="" type="button" class="v-btn v-btn--icon v-theme--light v-btn--density-default elevation-0 v-btn--size-default v-btn--variant-text array-list-add" small="" aria-label="MyAdd" aria-describedby="v-tooltip-0"><span class="v-btn__overlay"></span><span class="v-btn__underlay"></span>
36+
<!--v-if--><button data-v-4896f876="" type="button" class="v-btn v-btn--icon v-theme--light v-btn--density-default elevation-0 v-btn--size-default v-btn--variant-text array-list-add" small="" aria-label="MyAdd" aria-describedby="v-tooltip-v-0"><span class="v-btn__overlay"></span><span class="v-btn__underlay"></span>
3737
<!----><span class="v-btn__content" data-no-activator=""><i data-v-4896f876="" class="mdi-plus mdi v-icon notranslate v-theme--light v-icon--size-default" aria-hidden="true"></i></span>
3838
<!---->
3939
<!---->

0 commit comments

Comments
 (0)