Skip to content

Commit cf808ce

Browse files
yaffolsdirix
andcommitted
chore: update to JSON Forms 3.2.1
Also adds `rootSchema` to components that require it for `createDefaults`. Co-authored-by: Stefan Dirix <sdirix@eclipsesource.com>
1 parent ff6bb6e commit cf808ce

File tree

8 files changed

+26
-15
lines changed

8 files changed

+26
-15
lines changed

packages/example/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"name": "example",
3-
"version": "3.2.0-preview-alpha.3",
3+
"version": "3.2.1",
44
"private": true,
55
"scripts": {
66
"build": "vue-cli-service build",
77
"serve": "vue-cli-service serve",
88
"clean": "rimraf dist"
99
},
1010
"dependencies": {
11-
"@jsonforms/core": "3.2.0-alpha.3",
12-
"@jsonforms/vue": "3.2.0-alpha.3",
13-
"@jsonforms/vue-vuetify": "^3.2.0-preview-alpha.3",
11+
"@jsonforms/core": "3.2.1",
12+
"@jsonforms/vue": "3.2.1",
13+
"@jsonforms/vue-vuetify": "3.2.1",
1414
"ajv-keywords": "^5.1.0",
1515
"core-js": "^3.9.1",
1616
"json-refs": "^3.0.15",

packages/vue-vuetify/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@jsonforms/vue-vuetify",
3-
"version": "3.2.0-preview-alpha.3",
3+
"version": "3.2.1",
44
"description": "Vue Vuetify renderers for JSON Forms",
55
"repository": "https://github.com/eclipsesource/jsonforms-vuetify-renderers",
66
"bugs": "https://github.com/eclipsesource/jsonforms/issues",
@@ -47,8 +47,8 @@
4747
"lodash": "^4.17.15"
4848
},
4949
"peerDependencies": {
50-
"@jsonforms/core": "3.2.0-alpha.3",
51-
"@jsonforms/vue": "3.2.0-alpha.3",
50+
"@jsonforms/core": "3.2.1",
51+
"@jsonforms/vue": "3.2.1",
5252
"@mdi/font": "^7.0.96",
5353
"vue": "^3.2.47",
5454
"vuetify": "^3.1.12"
@@ -57,8 +57,8 @@
5757
"@babel/core": "^7.14.6",
5858
"@babel/preset-env": "^7.14.7",
5959
"@babel/preset-typescript": "^7.14.5",
60-
"@jsonforms/core": "3.2.0-alpha.3",
61-
"@jsonforms/vue": "3.2.0-alpha.3",
60+
"@jsonforms/core": "3.2.1",
61+
"@jsonforms/vue": "3.2.1",
6262
"@mdi/font": "^7.0.96",
6363
"@rollup/plugin-babel": "^6.0.3",
6464
"@rollup/plugin-node-resolve": "^15.0.1",

packages/vue-vuetify/src/complex/ArrayControlRenderer.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ const controlRenderer = defineComponent({
255255
addButtonClick() {
256256
this.addItem(
257257
this.control.path,
258-
createDefaultValue(this.control.schema)
258+
createDefaultValue(this.control.schema, this.control.rootSchema)
259259
)();
260260
},
261261
moveUpClick(event: Event, toMove: number): void {

packages/vue-vuetify/src/complex/OneOfRenderer.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,8 @@ const controlRenderer = defineComponent({
185185
this.path,
186186
this.newSelectedIndex !== undefined && this.newSelectedIndex !== null
187187
? createDefaultValue(
188-
this.indexedOneOfRenderInfos[this.newSelectedIndex].schema
188+
this.indexedOneOfRenderInfos[this.newSelectedIndex].schema,
189+
this.control.rootSchema
189190
)
190191
: {}
191192
);

packages/vue-vuetify/src/complex/OneOfTabRenderer.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,10 @@ const controlRenderer = defineComponent({
171171
openNewTab(): void {
172172
this.handleChange(
173173
this.path,
174-
createDefaultValue(this.oneOfRenderInfos[this.newSelectedIndex].schema)
174+
createDefaultValue(
175+
this.oneOfRenderInfos[this.newSelectedIndex].schema,
176+
this.control.rootSchema
177+
)
175178
);
176179
this.tabIndex = this.newSelectedIndex;
177180
this.selectedIndex = this.newSelectedIndex;

packages/vue-vuetify/src/complex/components/AdditionalProperties.vue

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,10 @@ export default defineComponent({
425425
(newData[ap.propertyName] === null &&
426426
ap.schema.type !== 'null')) // createDefaultValue will return null only when the ap.schema.type is 'null'
427427
) {
428-
const newValue = createDefaultValue(ap.schema);
428+
const newValue = createDefaultValue(
429+
ap.schema,
430+
this.control.rootSchema
431+
);
429432
hasChanges = newData[ap.propertyName] !== newValue;
430433
newData[ap.propertyName] = newValue;
431434
}
@@ -466,7 +469,7 @@ export default defineComponent({
466469
additionalProperty.schema
467470
) {
468471
this.control.data[this.newPropertyName] = createDefaultValue(
469-
additionalProperty.schema
472+
additionalProperty.schema, this.control.rootSchema
470473
);
471474
// we need always to preserve the key even when the value is "empty"
472475
this.input.handleChange(this.control.path, this.control.data);

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<template>
2+
<p class="text-red">live</p>
23
<control-wrapper
34
v-bind="controlWrapper"
45
:styles="styles"

packages/vue-vuetify/src/layouts/ArrayLayoutRenderer.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,10 @@ const controlRenderer = defineComponent({
411411
addButtonClick() {
412412
this.addItem(
413413
this.control.path,
414-
createDefaultValue(this.control.schema)
414+
createDefaultValue(
415+
this.control.schema,
416+
this.control.rootSchema
417+
)
415418
)();
416419
if (!this.appliedOptions.collapseNewItems && this.control.data?.length) {
417420
this.currentlyExpanded = this.dataLength - 1;

0 commit comments

Comments
 (0)