{
return computeChildLabel(
diff --git a/packages/material-renderers/src/layouts/MaterialArrayLayout.tsx b/packages/material-renderers/src/layouts/MaterialArrayLayout.tsx
index 6846fd421..32fa6daf5 100644
--- a/packages/material-renderers/src/layouts/MaterialArrayLayout.tsx
+++ b/packages/material-renderers/src/layouts/MaterialArrayLayout.tsx
@@ -51,7 +51,7 @@ const MaterialArrayLayoutComponent = (
[]
);
const isExpanded = (index: number) =>
- expanded === composePaths(props.path, `${index}`);
+ expanded === composePaths(props.path, index);
const {
enabled,
diff --git a/packages/material-renderers/test/renderers/MaterialBooleanCell.test.tsx b/packages/material-renderers/test/renderers/MaterialBooleanCell.test.tsx
index 4da535359..81dc630a7 100644
--- a/packages/material-renderers/test/renderers/MaterialBooleanCell.test.tsx
+++ b/packages/material-renderers/test/renderers/MaterialBooleanCell.test.tsx
@@ -138,7 +138,7 @@ describe('Material boolean cell', () => {
-
+
);
const input = wrapper.find('input').first();
@@ -158,7 +158,7 @@ describe('Material boolean cell', () => {
-
+
);
const input = wrapper.find('input').first();
@@ -175,7 +175,7 @@ describe('Material boolean cell', () => {
-
+
);
const input = wrapper.find('input').first();
@@ -188,7 +188,7 @@ describe('Material boolean cell', () => {
-
+
);
@@ -211,7 +211,7 @@ describe('Material boolean cell', () => {
onChangeData.data = data;
}}
/>
-
+
);
@@ -234,7 +234,7 @@ describe('Material boolean cell', () => {
onChangeData.data = data;
}}
/>
-
+
);
core.data = { ...core.data, foo: false };
@@ -259,7 +259,7 @@ describe('Material boolean cell', () => {
onChangeData.data = data;
}}
/>
-
+
);
core.data = { ...core.data, foo: undefined };
@@ -283,7 +283,7 @@ describe('Material boolean cell', () => {
onChangeData.data = data;
}}
/>
-
+
);
core.data = { ...core.data, foo: null };
@@ -307,7 +307,7 @@ describe('Material boolean cell', () => {
onChangeData.data = data;
}}
/>
-
+
);
core.data = { ...core.data, bar: 11 };
@@ -330,7 +330,7 @@ describe('Material boolean cell', () => {
onChangeData.data = data;
}}
/>
-
+
);
core.data = { ...core.data, null: false };
@@ -353,7 +353,7 @@ describe('Material boolean cell', () => {
onChangeData.data = data;
}}
/>
-
+
);
core.data = { ...core.data, undefined: false };
@@ -373,7 +373,7 @@ describe('Material boolean cell', () => {
schema={schema}
uischema={uischema}
enabled={false}
- path='foo'
+ path='/foo'
/>
);
@@ -387,7 +387,7 @@ describe('Material boolean cell', () => {
-
+
);
const input = wrapper.find('input').first();
@@ -400,7 +400,12 @@ describe('Material boolean cell', () => {
-
+
);
const input = wrapper.find('input');
diff --git a/packages/material-renderers/test/renderers/MaterialBooleanToggleCell.test.tsx b/packages/material-renderers/test/renderers/MaterialBooleanToggleCell.test.tsx
index 6090b0a95..8fe4dd16c 100644
--- a/packages/material-renderers/test/renderers/MaterialBooleanToggleCell.test.tsx
+++ b/packages/material-renderers/test/renderers/MaterialBooleanToggleCell.test.tsx
@@ -191,7 +191,7 @@ describe('Material boolean toggle cell', () => {
-
+
);
const input = wrapper.find('input').first();
@@ -212,7 +212,7 @@ describe('Material boolean toggle cell', () => {
-
+
);
const input = wrapper.find('input').first();
@@ -232,7 +232,7 @@ describe('Material boolean toggle cell', () => {
-
+
);
const input = wrapper.find('input').first();
@@ -245,7 +245,7 @@ describe('Material boolean toggle cell', () => {
-
+
);
@@ -271,7 +271,7 @@ describe('Material boolean toggle cell', () => {
onChangeData.data = data;
}}
/>
-
+
);
@@ -294,7 +294,7 @@ describe('Material boolean toggle cell', () => {
onChangeData.data = data;
}}
/>
-
+
);
core.data = { ...core.data, foo: false };
@@ -319,7 +319,7 @@ describe('Material boolean toggle cell', () => {
onChangeData.data = data;
}}
/>
-
+
);
core.data = { ...core.data, foo: undefined };
@@ -343,7 +343,7 @@ describe('Material boolean toggle cell', () => {
onChangeData.data = data;
}}
/>
-
+
);
core.data = { ...core.data, foo: null };
@@ -367,7 +367,7 @@ describe('Material boolean toggle cell', () => {
onChangeData.data = data;
}}
/>
-
+
);
core.data = { ...core.data, bar: 11 };
@@ -390,7 +390,7 @@ describe('Material boolean toggle cell', () => {
onChangeData.data = data;
}}
/>
-
+
);
core.data = { ...core.data, null: false };
@@ -413,7 +413,7 @@ describe('Material boolean toggle cell', () => {
onChangeData.data = data;
}}
/>
-
+
);
core.data = { ...core.data, undefined: false };
@@ -433,7 +433,7 @@ describe('Material boolean toggle cell', () => {
schema={schema}
uischema={uischema}
enabled={false}
- path='foo'
+ path='/foo'
/>
);
@@ -447,7 +447,7 @@ describe('Material boolean toggle cell', () => {
-
+
);
const input = wrapper.find('input').first();
@@ -463,7 +463,7 @@ describe('Material boolean toggle cell', () => {
diff --git a/packages/material-renderers/test/renderers/MaterialDateCell.test.tsx b/packages/material-renderers/test/renderers/MaterialDateCell.test.tsx
index ed9ec7bf4..9043fb42c 100644
--- a/packages/material-renderers/test/renderers/MaterialDateCell.test.tsx
+++ b/packages/material-renderers/test/renderers/MaterialDateCell.test.tsx
@@ -128,7 +128,7 @@ describe('Material date cell', () => {
-
+
);
const input = wrapper.find('input').first();
@@ -148,7 +148,7 @@ describe('Material date cell', () => {
-
+
);
const input = wrapper.find('input').first();
@@ -165,7 +165,7 @@ describe('Material date cell', () => {
-
+
);
const input = wrapper.find('input').first();
@@ -178,7 +178,7 @@ describe('Material date cell', () => {
-
+
);
@@ -201,7 +201,7 @@ describe('Material date cell', () => {
onChangeData.data = data;
}}
/>
-
+
);
const input = wrapper.find('input').first();
@@ -215,7 +215,7 @@ describe('Material date cell', () => {
-
+
);
core.data = { ...core.data, foo: '1961-04-12' };
@@ -231,7 +231,7 @@ describe('Material date cell', () => {
-
+
);
core.data = { ...core.data, foo: null };
@@ -247,7 +247,7 @@ describe('Material date cell', () => {
-
+
);
core.data = { ...core.data, foo: undefined };
@@ -263,7 +263,7 @@ describe('Material date cell', () => {
-
+
);
core.data = { ...core.data, bar: 'Bar' };
@@ -279,7 +279,7 @@ describe('Material date cell', () => {
-
+
);
core.data = { ...core.data, null: '1961-04-12' };
@@ -295,7 +295,7 @@ describe('Material date cell', () => {
-
+
);
core.data = { ...core.data, undefined: '1961-04-12' };
@@ -315,7 +315,7 @@ describe('Material date cell', () => {
schema={schema}
uischema={uischema}
enabled={false}
- path='foo'
+ path='/foo'
/>
);
@@ -329,7 +329,7 @@ describe('Material date cell', () => {
-
+
);
const input = wrapper.find('input').first();
diff --git a/packages/material-renderers/test/renderers/MaterialEnumCell.test.tsx b/packages/material-renderers/test/renderers/MaterialEnumCell.test.tsx
index 9211850a8..e601d2eb6 100644
--- a/packages/material-renderers/test/renderers/MaterialEnumCell.test.tsx
+++ b/packages/material-renderers/test/renderers/MaterialEnumCell.test.tsx
@@ -80,7 +80,7 @@ describe('Material enum cell', () => {
);
diff --git a/packages/material-renderers/test/renderers/MaterialEnumControl.test.tsx b/packages/material-renderers/test/renderers/MaterialEnumControl.test.tsx
index 2345d2a32..eb1973f58 100644
--- a/packages/material-renderers/test/renderers/MaterialEnumControl.test.tsx
+++ b/packages/material-renderers/test/renderers/MaterialEnumControl.test.tsx
@@ -58,7 +58,7 @@ describe('Material enum control', () => {
);
diff --git a/packages/material-renderers/test/renderers/MaterialIntegerCell.test.tsx b/packages/material-renderers/test/renderers/MaterialIntegerCell.test.tsx
index 4ea7c9dfd..53db2d71b 100644
--- a/packages/material-renderers/test/renderers/MaterialIntegerCell.test.tsx
+++ b/packages/material-renderers/test/renderers/MaterialIntegerCell.test.tsx
@@ -119,7 +119,7 @@ describe('Material integer cells', () => {
-
+
);
const input = wrapper.find('input').first();
@@ -139,7 +139,7 @@ describe('Material integer cells', () => {
-
+
);
const input = wrapper.find('input');
@@ -156,7 +156,7 @@ describe('Material integer cells', () => {
-
+
);
const input = wrapper.find('input').first();
@@ -169,7 +169,7 @@ describe('Material integer cells', () => {
-
+
);
@@ -185,7 +185,7 @@ describe('Material integer cells', () => {
-
+
);
@@ -209,7 +209,7 @@ describe('Material integer cells', () => {
onChangeData.data = data;
}}
/>
-
+
);
@@ -227,7 +227,7 @@ describe('Material integer cells', () => {
-
+
);
core.data = { ...core.data, foo: 42 };
@@ -246,7 +246,7 @@ describe('Material integer cells', () => {
-
+
);
core.data = { ...core.data, foo: undefined };
@@ -265,7 +265,7 @@ describe('Material integer cells', () => {
-
+
);
core.data = { ...core.data, foo: null };
@@ -284,7 +284,7 @@ describe('Material integer cells', () => {
-
+
);
core.data = { ...core.data, bar: 11 };
@@ -303,7 +303,7 @@ describe('Material integer cells', () => {
-
+
);
core.data = { ...core.data, null: 13 };
@@ -322,7 +322,7 @@ describe('Material integer cells', () => {
-
+
);
core.data = { ...core.data, undefined: 13 };
@@ -345,7 +345,7 @@ describe('Material integer cells', () => {
schema={schema}
uischema={uischema}
enabled={false}
- path='foo'
+ path='/foo'
/>
);
@@ -359,7 +359,7 @@ describe('Material integer cells', () => {
-
+
);
const input = wrapper.find('input').first();
diff --git a/packages/material-renderers/test/renderers/MaterialNumberCell.test.tsx b/packages/material-renderers/test/renderers/MaterialNumberCell.test.tsx
index aa02d0f65..a9491310c 100644
--- a/packages/material-renderers/test/renderers/MaterialNumberCell.test.tsx
+++ b/packages/material-renderers/test/renderers/MaterialNumberCell.test.tsx
@@ -146,7 +146,7 @@ describe('Material number cells', () => {
-
+
);
const inputs = wrapper.find('input');
@@ -166,7 +166,7 @@ describe('Material number cells', () => {
-
+
);
const inputs = wrapper.find('input');
@@ -183,7 +183,7 @@ describe('Material number cells', () => {
-
+
);
const inputs = wrapper.find('input');
@@ -204,7 +204,7 @@ describe('Material number cells', () => {
-
+
);
@@ -228,7 +228,7 @@ describe('Material number cells', () => {
-
+
);
@@ -252,7 +252,7 @@ describe('Material number cells', () => {
onChangeData.data = data;
}}
/>
-
+
);
const input = wrapper.find('input');
@@ -269,7 +269,7 @@ describe('Material number cells', () => {
-
+
);
const input = wrapper.find('input').first();
@@ -291,7 +291,7 @@ describe('Material number cells', () => {
-
+
);
core.data = { ...core.data, foo: undefined };
@@ -310,7 +310,7 @@ describe('Material number cells', () => {
-
+
);
core.data = { ...core.data, foo: null };
@@ -329,7 +329,7 @@ describe('Material number cells', () => {
-
+
);
core.data = { ...core.data, bar: 11 };
@@ -348,7 +348,7 @@ describe('Material number cells', () => {
-
+
);
core.data = { ...core.data, null: 2.72 };
@@ -367,7 +367,7 @@ describe('Material number cells', () => {
-
+
);
core.data = { ...core.data, undefined: 13 };
@@ -389,7 +389,7 @@ describe('Material number cells', () => {
@@ -404,7 +404,7 @@ describe('Material number cells', () => {
-
+
);
const input = wrapper.find('input').first();
diff --git a/packages/material-renderers/test/renderers/MaterialOneOfEnumCell.test.tsx b/packages/material-renderers/test/renderers/MaterialOneOfEnumCell.test.tsx
index d625045be..70fc45f9f 100644
--- a/packages/material-renderers/test/renderers/MaterialOneOfEnumCell.test.tsx
+++ b/packages/material-renderers/test/renderers/MaterialOneOfEnumCell.test.tsx
@@ -86,7 +86,7 @@ describe('Material enum cell', () => {
);
diff --git a/packages/material-renderers/test/renderers/MaterialTextCell.test.tsx b/packages/material-renderers/test/renderers/MaterialTextCell.test.tsx
index 8368e5b60..f1e3421ad 100644
--- a/packages/material-renderers/test/renderers/MaterialTextCell.test.tsx
+++ b/packages/material-renderers/test/renderers/MaterialTextCell.test.tsx
@@ -153,7 +153,7 @@ describe('Material text cell', () => {
-
+
);
const input = wrapper.find('input').first();
@@ -171,7 +171,7 @@ describe('Material text cell', () => {
-
+
);
const input = wrapper.find('input').first();
@@ -188,7 +188,7 @@ describe('Material text cell', () => {
-
+
);
const input = wrapper.find('input').first();
@@ -207,7 +207,7 @@ describe('Material text cell', () => {
-
+
);
@@ -229,7 +229,7 @@ describe('Material text cell', () => {
onChangeData.data = data;
}}
/>
-
+
);
@@ -247,7 +247,7 @@ describe('Material text cell', () => {
-
+
);
core.data = { ...core.data, name: 'Bar' };
@@ -266,7 +266,7 @@ describe('Material text cell', () => {
-
+
);
core.data = { ...core.data, name: undefined };
@@ -285,7 +285,7 @@ describe('Material text cell', () => {
-
+
);
core.data = { ...core.data, name: null };
@@ -304,7 +304,7 @@ describe('Material text cell', () => {
-
+
);
core.data = { ...core.data, firstname: 'Bar' };
@@ -323,7 +323,7 @@ describe('Material text cell', () => {
-
+
);
core.data = { ...core.data, null: 'Bar' };
@@ -342,7 +342,7 @@ describe('Material text cell', () => {
-
+
);
core.data = { ...core.data, undefined: 'Bar' };
@@ -364,7 +364,7 @@ describe('Material text cell', () => {
@@ -379,7 +379,7 @@ describe('Material text cell', () => {
-
+
);
const input = wrapper.find('input').first();
@@ -400,7 +400,7 @@ describe('Material text cell', () => {
-
+
);
const input = wrapper.find('input').first();
@@ -420,7 +420,7 @@ describe('Material text cell', () => {
-
+
);
const input = wrapper
@@ -445,7 +445,7 @@ describe('Material text cell', () => {
-
+
);
const input = wrapper
@@ -465,7 +465,7 @@ describe('Material text cell', () => {
-
+
);
const input = wrapper
@@ -493,7 +493,7 @@ describe('Material text cell', () => {
-
+
);
const input = wrapper
@@ -518,7 +518,7 @@ describe('Material text cell', () => {
-
+
);
@@ -543,7 +543,7 @@ describe('Material text cell', () => {
-
+
);
@@ -563,7 +563,7 @@ describe('Material text cell', () => {
-
+
);
const input = wrapper
@@ -585,7 +585,7 @@ describe('Material text cell', () => {
diff --git a/packages/material-renderers/test/renderers/MaterialTimeCell.test.tsx b/packages/material-renderers/test/renderers/MaterialTimeCell.test.tsx
index 74c4a6852..fbcbc0c2d 100644
--- a/packages/material-renderers/test/renderers/MaterialTimeCell.test.tsx
+++ b/packages/material-renderers/test/renderers/MaterialTimeCell.test.tsx
@@ -172,7 +172,7 @@ describe('Material time cell', () => {
-
+
);
const input = wrapper.find('input').first();
@@ -185,7 +185,7 @@ describe('Material time cell', () => {
-
+
);
@@ -208,7 +208,7 @@ describe('Material time cell', () => {
onChangeData.data = data;
}}
/>
-
+
);
const input = wrapper.find('input').first();
@@ -225,7 +225,7 @@ describe('Material time cell', () => {
-
+
);
core.data = { ...core.data, foo: '20:15' };
@@ -244,7 +244,7 @@ describe('Material time cell', () => {
-
+
);
core.data = { ...core.data, foo: null };
@@ -263,7 +263,7 @@ describe('Material time cell', () => {
-
+
);
core.data = { ...core.data, foo: undefined };
@@ -282,7 +282,7 @@ describe('Material time cell', () => {
-
+
);
core.data = { ...core.data, bar: 'Bar' };
@@ -301,7 +301,7 @@ describe('Material time cell', () => {
-
+
);
core.data = { ...core.data, null: '20:15' };
@@ -320,7 +320,7 @@ describe('Material time cell', () => {
-
+
);
core.data = { ...core.data, undefined: '20:15' };
@@ -343,7 +343,7 @@ describe('Material time cell', () => {
schema={schema}
uischema={uischema}
enabled={false}
- path='foo'
+ path='/foo'
/>
);
@@ -357,7 +357,7 @@ describe('Material time cell', () => {
-
+
);
const input = wrapper.find('input').first();
diff --git a/packages/react/test/JsonFormsContext.test.tsx b/packages/react/test/JsonFormsContext.test.tsx
index c6ca58773..3cce31253 100644
--- a/packages/react/test/JsonFormsContext.test.tsx
+++ b/packages/react/test/JsonFormsContext.test.tsx
@@ -88,7 +88,7 @@ test('withJsonFormsEnumProps - constant: should supply control and enum props',
expect(mockEnumControlUnwrappedProps.uischema).toEqual(uischema);
expect(mockEnumControlUnwrappedProps.schema).toEqual(schema.properties.name);
- expect(mockEnumControlUnwrappedProps.path).toEqual('name');
+ expect(mockEnumControlUnwrappedProps.path).toEqual('/name');
expect(mockEnumControlUnwrappedProps.id).toEqual('#/properties/name');
expect(mockEnumControlUnwrappedProps.options).toEqual([
{ value: 'Cambodia', label: 'Cambodia' },
@@ -138,7 +138,7 @@ test('withJsonFormsEnumProps - enum: should supply control and enum props', () =
.props();
expect(mockEnumControlUnwrappedProps.uischema).toEqual(uischema);
expect(mockEnumControlUnwrappedProps.schema).toEqual(schema.properties.color);
- expect(mockEnumControlUnwrappedProps.path).toEqual('color');
+ expect(mockEnumControlUnwrappedProps.path).toEqual('/color');
expect(mockEnumControlUnwrappedProps.id).toEqual('#/properties/color');
expect(mockEnumControlUnwrappedProps.options).toEqual([
{ value: 'red', label: 'red' },
diff --git a/packages/vanilla-renderers/src/complex/TableArrayControl.tsx b/packages/vanilla-renderers/src/complex/TableArrayControl.tsx
index 2319f80bf..62c48bf89 100644
--- a/packages/vanilla-renderers/src/complex/TableArrayControl.tsx
+++ b/packages/vanilla-renderers/src/complex/TableArrayControl.tsx
@@ -40,7 +40,6 @@ import {
Resolve,
Test,
getControlPath,
- encode,
ArrayTranslations,
} from '@jsonforms/core';
import {
@@ -72,7 +71,7 @@ class TableArrayControl extends React.Component<
any
> {
confirmDelete = (path: string, index: number) => {
- const p = path.substring(0, path.lastIndexOf('.'));
+ const p = path.substring(0, path.lastIndexOf('/'));
this.props.removeItems(p, [index])();
};
@@ -105,7 +104,8 @@ class TableArrayControl extends React.Component<
const createControlElement = (key?: string): ControlElement => ({
type: 'Control',
label: false,
- scope: schema.type === 'object' ? `#/properties/${key}` : '#',
+ scope:
+ schema.type === 'object' ? Paths.compose('#', 'properties', key) : '#',
});
const isValid = errors.length === 0;
const divClassNames = [validationClass]
@@ -155,8 +155,7 @@ class TableArrayControl extends React.Component<
) : (
data.map((_child, index) => {
- const childPath = Paths.compose(path, `${index}`);
- // TODO
+ const childPath = Paths.compose(path, index);
const errorsPerEntry: any[] = filter(childErrors, (error) => {
const errorPath = getControlPath(error);
return errorPath.startsWith(childPath);
@@ -182,27 +181,24 @@ class TableArrayControl extends React.Component<
(prop) => schema.properties[prop].type !== 'array'
),
fpmap((prop) => {
- const childPropPath = Paths.compose(
- childPath,
- prop.toString()
- );
+ const childPropPath = Paths.compose(childPath, prop);
return (
|
);
})
)(schema.properties)
) : (
-
+ |
{data ? (
range(0, data.length).map((index) => {
- const childPath = composePaths(path, `${index}`);
+ const childPath = composePaths(path, index);
return (
{
const core = initCore(fixture.schema, uischema, fixture.data);
wrapper = mount(
-
+
,
// Attach to body to get focus to work with JSDom
{ attachTo: document.body }
@@ -211,7 +211,7 @@ describe('Boolean cell', () => {
const core = initCore(fixture.schema, uischema, fixture.data);
wrapper = mount(
-
+
);
const input = wrapper.find('input').getDOMNode() as HTMLInputElement;
@@ -226,7 +226,7 @@ describe('Boolean cell', () => {
const core = initCore(fixture.schema, uischema, fixture.data);
wrapper = mount(
-
+
);
const input = wrapper.find('input').getDOMNode();
@@ -240,7 +240,7 @@ describe('Boolean cell', () => {
);
@@ -257,7 +257,7 @@ describe('Boolean cell', () => {
);
@@ -282,7 +282,7 @@ describe('Boolean cell', () => {
);
@@ -308,7 +308,7 @@ describe('Boolean cell', () => {
);
@@ -327,7 +327,7 @@ describe('Boolean cell', () => {
);
@@ -345,7 +345,7 @@ describe('Boolean cell', () => {
);
@@ -363,7 +363,7 @@ describe('Boolean cell', () => {
);
@@ -381,7 +381,7 @@ describe('Boolean cell', () => {
);
@@ -399,7 +399,7 @@ describe('Boolean cell', () => {
);
@@ -432,7 +432,7 @@ describe('Boolean cell', () => {
);
@@ -447,7 +447,7 @@ describe('Boolean cell', () => {
);
diff --git a/packages/vanilla-renderers/test/renderers/DateCell.test.tsx b/packages/vanilla-renderers/test/renderers/DateCell.test.tsx
index 345a24121..2123eb308 100644
--- a/packages/vanilla-renderers/test/renderers/DateCell.test.tsx
+++ b/packages/vanilla-renderers/test/renderers/DateCell.test.tsx
@@ -177,7 +177,7 @@ describe('Date cell', () => {
wrapper = mount(
-
+
,
// Attach to body to get focus to work with JSDom
{ attachTo: document.body }
@@ -197,7 +197,7 @@ describe('Date cell', () => {
const core = initCore(fixture.schema, uischema, fixture.data);
wrapper = mount(
-
+
);
const input = wrapper.find('input').getDOMNode() as HTMLInputElement;
@@ -212,7 +212,7 @@ describe('Date cell', () => {
const core = initCore(fixture.schema, uischema, fixture.data);
wrapper = mount(
-
+
);
const input = wrapper.find('input').getDOMNode() as HTMLInputElement;
@@ -226,7 +226,7 @@ describe('Date cell', () => {
);
@@ -243,7 +243,7 @@ describe('Date cell', () => {
);
@@ -268,7 +268,7 @@ describe('Date cell', () => {
);
@@ -284,7 +284,7 @@ describe('Date cell', () => {
);
@@ -302,7 +302,7 @@ describe('Date cell', () => {
);
@@ -320,7 +320,7 @@ describe('Date cell', () => {
);
@@ -338,7 +338,7 @@ describe('Date cell', () => {
);
@@ -356,7 +356,7 @@ describe('Date cell', () => {
);
@@ -374,7 +374,7 @@ describe('Date cell', () => {
);
@@ -407,7 +407,7 @@ describe('Date cell', () => {
);
diff --git a/packages/vanilla-renderers/test/renderers/DateTimeCell.test.tsx b/packages/vanilla-renderers/test/renderers/DateTimeCell.test.tsx
index 6ec93dc5b..ab24d810f 100644
--- a/packages/vanilla-renderers/test/renderers/DateTimeCell.test.tsx
+++ b/packages/vanilla-renderers/test/renderers/DateTimeCell.test.tsx
@@ -178,7 +178,7 @@ describe('date time cell', () => {
wrapper = mount(
-
+
,
// Attach to body to get focus to work with JSDom
{ attachTo: document.body }
@@ -199,7 +199,7 @@ describe('date time cell', () => {
wrapper = mount(
-
+
);
const input = wrapper.find('input').getDOMNode() as HTMLInputElement;
@@ -215,7 +215,7 @@ describe('date time cell', () => {
wrapper = mount(
-
+
);
const input = wrapper.find('input').getDOMNode() as HTMLInputElement;
@@ -229,7 +229,7 @@ describe('date time cell', () => {
);
@@ -246,7 +246,7 @@ describe('date time cell', () => {
);
@@ -272,7 +272,7 @@ describe('date time cell', () => {
);
@@ -288,7 +288,7 @@ describe('date time cell', () => {
);
@@ -306,7 +306,7 @@ describe('date time cell', () => {
);
@@ -324,7 +324,7 @@ describe('date time cell', () => {
);
@@ -342,7 +342,7 @@ describe('date time cell', () => {
);
@@ -360,7 +360,7 @@ describe('date time cell', () => {
);
@@ -378,7 +378,7 @@ describe('date time cell', () => {
);
@@ -396,7 +396,7 @@ describe('date time cell', () => {
@@ -412,7 +412,7 @@ describe('date time cell', () => {
);
diff --git a/packages/vanilla-renderers/test/renderers/EnumCell.test.tsx b/packages/vanilla-renderers/test/renderers/EnumCell.test.tsx
index d444c0685..ddd8dcdc6 100644
--- a/packages/vanilla-renderers/test/renderers/EnumCell.test.tsx
+++ b/packages/vanilla-renderers/test/renderers/EnumCell.test.tsx
@@ -143,7 +143,7 @@ describe('Enum cell', () => {
);
@@ -164,7 +164,7 @@ describe('Enum cell', () => {
);
@@ -190,7 +190,7 @@ describe('Enum cell', () => {
);
@@ -214,7 +214,7 @@ describe('Enum cell', () => {
);
@@ -232,7 +232,7 @@ describe('Enum cell', () => {
);
@@ -251,7 +251,7 @@ describe('Enum cell', () => {
);
@@ -270,7 +270,7 @@ describe('Enum cell', () => {
);
@@ -289,7 +289,7 @@ describe('Enum cell', () => {
);
@@ -308,7 +308,7 @@ describe('Enum cell', () => {
);
@@ -327,7 +327,7 @@ describe('Enum cell', () => {
);
@@ -361,7 +361,7 @@ describe('Enum cell', () => {
);
diff --git a/packages/vanilla-renderers/test/renderers/IntegerCell.test.tsx b/packages/vanilla-renderers/test/renderers/IntegerCell.test.tsx
index b05b9bcec..58732eecf 100644
--- a/packages/vanilla-renderers/test/renderers/IntegerCell.test.tsx
+++ b/packages/vanilla-renderers/test/renderers/IntegerCell.test.tsx
@@ -154,7 +154,7 @@ describe('Integer cell', () => {
const core = initCore(fixture.schema, uischema, fixture.data);
wrapper = mount(
-
+
,
// Attach to body to get focus to work with JSDom
{ attachTo: document.body }
@@ -175,7 +175,7 @@ describe('Integer cell', () => {
wrapper = mount(
-
+
);
const input = wrapper.find('input').getDOMNode() as HTMLInputElement;
@@ -191,7 +191,7 @@ describe('Integer cell', () => {
wrapper = mount(
-
+
);
const input = wrapper.find('input').getDOMNode() as HTMLInputElement;
@@ -205,7 +205,7 @@ describe('Integer cell', () => {
);
@@ -223,7 +223,7 @@ describe('Integer cell', () => {
);
@@ -249,7 +249,7 @@ describe('Integer cell', () => {
);
@@ -267,7 +267,7 @@ describe('Integer cell', () => {
);
@@ -285,7 +285,7 @@ describe('Integer cell', () => {
);
@@ -303,7 +303,7 @@ describe('Integer cell', () => {
);
@@ -321,7 +321,7 @@ describe('Integer cell', () => {
);
@@ -339,7 +339,7 @@ describe('Integer cell', () => {
);
@@ -357,7 +357,7 @@ describe('Integer cell', () => {
);
@@ -390,7 +390,7 @@ describe('Integer cell', () => {
);
@@ -405,7 +405,7 @@ describe('Integer cell', () => {
);
diff --git a/packages/vanilla-renderers/test/renderers/NumberCell.test.tsx b/packages/vanilla-renderers/test/renderers/NumberCell.test.tsx
index 20d569d7a..28c0ad795 100644
--- a/packages/vanilla-renderers/test/renderers/NumberCell.test.tsx
+++ b/packages/vanilla-renderers/test/renderers/NumberCell.test.tsx
@@ -192,7 +192,7 @@ describe('Number cell', () => {
const core = initCore(fixture.schema, uischema, fixture.data);
wrapper = mount(
-
+
,
// Attach to body to get focus to work with JSDom
{ attachTo: document.body }
@@ -213,7 +213,7 @@ describe('Number cell', () => {
wrapper = mount(
-
+
);
const input = wrapper.find('input').getDOMNode() as HTMLInputElement;
@@ -228,7 +228,7 @@ describe('Number cell', () => {
const core = initCore(fixture.schema, uischema, fixture.data);
wrapper = mount(
-
+
);
const input = wrapper.find('input').getDOMNode() as HTMLInputElement;
@@ -240,7 +240,7 @@ describe('Number cell', () => {
const core = initCore(schema, fixture.uischema, { foo: 3.14 });
wrapper = mount(
-
+
);
@@ -257,7 +257,7 @@ describe('Number cell', () => {
);
@@ -283,7 +283,7 @@ describe('Number cell', () => {
);
@@ -300,7 +300,7 @@ describe('Number cell', () => {
);
@@ -319,7 +319,7 @@ describe('Number cell', () => {
);
@@ -337,7 +337,7 @@ describe('Number cell', () => {
);
@@ -355,7 +355,7 @@ describe('Number cell', () => {
);
@@ -373,7 +373,7 @@ describe('Number cell', () => {
);
@@ -391,7 +391,7 @@ describe('Number cell', () => {
);
@@ -424,7 +424,7 @@ describe('Number cell', () => {
);
@@ -439,7 +439,7 @@ describe('Number cell', () => {
);
diff --git a/packages/vanilla-renderers/test/renderers/SliderCell.test.tsx b/packages/vanilla-renderers/test/renderers/SliderCell.test.tsx
index 3232f85cc..83e6f9111 100644
--- a/packages/vanilla-renderers/test/renderers/SliderCell.test.tsx
+++ b/packages/vanilla-renderers/test/renderers/SliderCell.test.tsx
@@ -295,7 +295,7 @@ describe('Slider cell', () => {
const core = initCore(fixture.schema, uischema, fixture.data);
wrapper = mount(
-
+
,
// Attach to body to get focus to work with JSDom
{ attachTo: document.body }
@@ -313,7 +313,7 @@ describe('Slider cell', () => {
const core = initCore(fixture.schema, uischema, fixture.data);
wrapper = mount(
-
+
);
const input = wrapper.find('input').getDOMNode() as HTMLInputElement;
@@ -327,7 +327,7 @@ describe('Slider cell', () => {
);
@@ -350,7 +350,7 @@ describe('Slider cell', () => {
const core = initCore(schema, fixture.uischema, { foo: 5 });
wrapper = mount(
-
+
);
const input = wrapper.find('input').getDOMNode() as HTMLInputElement;
@@ -365,7 +365,7 @@ describe('Slider cell', () => {
);
@@ -391,7 +391,7 @@ describe('Slider cell', () => {
);
@@ -408,7 +408,7 @@ describe('Slider cell', () => {
);
@@ -426,7 +426,7 @@ describe('Slider cell', () => {
);
@@ -444,7 +444,7 @@ describe('Slider cell', () => {
);
@@ -462,7 +462,7 @@ describe('Slider cell', () => {
);
@@ -480,7 +480,7 @@ describe('Slider cell', () => {
);
@@ -498,7 +498,7 @@ describe('Slider cell', () => {
);
@@ -516,7 +516,7 @@ describe('Slider cell', () => {
@@ -532,7 +532,7 @@ describe('Slider cell', () => {
);
diff --git a/packages/vanilla-renderers/test/renderers/TextAreaCell.test.tsx b/packages/vanilla-renderers/test/renderers/TextAreaCell.test.tsx
index 38519459b..0727c9ed5 100644
--- a/packages/vanilla-renderers/test/renderers/TextAreaCell.test.tsx
+++ b/packages/vanilla-renderers/test/renderers/TextAreaCell.test.tsx
@@ -114,7 +114,11 @@ describe('Text area cell', () => {
const core = initCore(fixture.schema, uischema, fixture.data);
wrapper = mount(
-
+
,
// Attach to body to get focus to work with JSDom
{ attachTo: document.body }
@@ -134,7 +138,11 @@ describe('Text area cell', () => {
const core = initCore(fixture.schema, uischema, fixture.data);
wrapper = mount(
-
+
);
const input = wrapper.find('textarea').getDOMNode() as HTMLInputElement;
@@ -149,7 +157,11 @@ describe('Text area cell', () => {
const core = initCore(fixture.schema, uischema, fixture.data);
wrapper = mount(
-
+
);
const input = wrapper.find('textarea').getDOMNode() as HTMLInputElement;
@@ -163,7 +175,7 @@ describe('Text area cell', () => {
);
@@ -180,7 +192,7 @@ describe('Text area cell', () => {
);
@@ -206,7 +218,7 @@ describe('Text area cell', () => {
);
@@ -223,7 +235,7 @@ describe('Text area cell', () => {
);
@@ -243,7 +255,7 @@ describe('Text area cell', () => {
);
@@ -263,7 +275,7 @@ describe('Text area cell', () => {
);
@@ -283,7 +295,7 @@ describe('Text area cell', () => {
);
@@ -303,7 +315,7 @@ describe('Text area cell', () => {
);
@@ -323,7 +335,7 @@ describe('Text area cell', () => {
);
@@ -360,7 +372,7 @@ describe('Text area cell', () => {
);
@@ -381,7 +393,11 @@ describe('Text area cell', () => {
const core = initCore(fixture.schema, uischema, fixture.data);
wrapper = mount(
-
+
);
const textArea = wrapper
diff --git a/packages/vanilla-renderers/test/renderers/TextCell.test.tsx b/packages/vanilla-renderers/test/renderers/TextCell.test.tsx
index 02ae69c21..b6e3186f6 100644
--- a/packages/vanilla-renderers/test/renderers/TextCell.test.tsx
+++ b/packages/vanilla-renderers/test/renderers/TextCell.test.tsx
@@ -125,7 +125,7 @@ describe('Text cell', () => {
,
// Attach to body to get focus to work with JSDom
@@ -147,7 +147,7 @@ describe('Text cell', () => {
);
@@ -166,7 +166,7 @@ describe('Text cell', () => {
);
@@ -184,7 +184,7 @@ describe('Text cell', () => {
const core = initCore(schema, fixture.uischema, { name: 'Foo' });
wrapper = mount(
-
+
);
const input = wrapper.find('input').getDOMNode() as HTMLInputElement;
@@ -198,7 +198,7 @@ describe('Text cell', () => {
);
@@ -228,7 +228,7 @@ describe('Text cell', () => {
);
@@ -248,7 +248,7 @@ describe('Text cell', () => {
);
@@ -270,7 +270,7 @@ describe('Text cell', () => {
);
@@ -292,7 +292,7 @@ describe('Text cell', () => {
);
@@ -314,7 +314,7 @@ describe('Text cell', () => {
);
@@ -336,7 +336,7 @@ describe('Text cell', () => {
);
@@ -358,7 +358,7 @@ describe('Text cell', () => {
);
@@ -380,7 +380,7 @@ describe('Text cell', () => {
@@ -400,7 +400,7 @@ describe('Text cell', () => {
);
@@ -419,7 +419,7 @@ describe('Text cell', () => {
const core = initCore(fixture.schema, uischema, fixture.data);
wrapper = mount(
-
+
);
const input = wrapper.find('input').getDOMNode() as HTMLInputElement;
@@ -441,7 +441,7 @@ describe('Text cell', () => {
);
@@ -465,7 +465,7 @@ describe('Text cell', () => {
);
@@ -489,7 +489,7 @@ describe('Text cell', () => {
);
@@ -509,7 +509,7 @@ describe('Text cell', () => {
);
@@ -530,7 +530,7 @@ describe('Text cell', () => {
const core = initCore(fixture.schema, uischema, fixture.data);
wrapper = mount(
-
+
);
const input = wrapper.find('input').getDOMNode() as HTMLInputElement;
@@ -550,7 +550,7 @@ describe('Text cell', () => {
const core = initCore(fixture.schema, uischema, fixture.data);
wrapper = mount(
-
+
);
const input = wrapper.find('input').getDOMNode() as HTMLInputElement;
@@ -570,7 +570,7 @@ describe('Text cell', () => {
const core = initCore(fixture.schema, uischema, fixture.data);
wrapper = mount(
-
+
);
const input = wrapper.find('input').getDOMNode() as HTMLInputElement;
@@ -585,7 +585,7 @@ describe('Text cell', () => {
);
diff --git a/packages/vanilla-renderers/test/renderers/TimeCell.test.tsx b/packages/vanilla-renderers/test/renderers/TimeCell.test.tsx
index 055d93b28..12a3a8174 100644
--- a/packages/vanilla-renderers/test/renderers/TimeCell.test.tsx
+++ b/packages/vanilla-renderers/test/renderers/TimeCell.test.tsx
@@ -165,7 +165,7 @@ describe('Time cell', () => {
const core = initCore(fixture.schema, uischema, fixture.data);
wrapper = mount(
-
+
,
// Attach to body to get focus to work with JSDom
{ attachTo: document.body }
@@ -185,7 +185,7 @@ describe('Time cell', () => {
const core = initCore(fixture.schema, uischema, fixture.data);
wrapper = mount(
-
+
);
const input = wrapper.find('input').getDOMNode() as HTMLInputElement;
@@ -200,7 +200,7 @@ describe('Time cell', () => {
const core = initCore(fixture.schema, uischema, fixture.data);
wrapper = mount(
-
+
);
const input = wrapper.find('input').getDOMNode() as HTMLInputElement;
@@ -214,7 +214,7 @@ describe('Time cell', () => {
);
@@ -231,7 +231,7 @@ describe('Time cell', () => {
);
@@ -257,7 +257,7 @@ describe('Time cell', () => {
);
@@ -274,7 +274,7 @@ describe('Time cell', () => {
);
@@ -292,7 +292,7 @@ describe('Time cell', () => {
);
@@ -310,7 +310,7 @@ describe('Time cell', () => {
);
@@ -328,7 +328,7 @@ describe('Time cell', () => {
);
@@ -346,7 +346,7 @@ describe('Time cell', () => {
);
@@ -364,7 +364,7 @@ describe('Time cell', () => {
);
@@ -382,7 +382,7 @@ describe('Time cell', () => {
@@ -398,7 +398,7 @@ describe('Time cell', () => {
);
diff --git a/packages/vue-vanilla/src/array/ArrayListRenderer.vue b/packages/vue-vanilla/src/array/ArrayListRenderer.vue
index b54376e68..453575f53 100644
--- a/packages/vue-vanilla/src/array/ArrayListRenderer.vue
+++ b/packages/vue-vanilla/src/array/ArrayListRenderer.vue
@@ -33,7 +33,7 @@
(
}
const labelValue = Resolve.data(
input.control.value.data,
- composePaths(`${index}`, childLabelProp)
+ composePaths(`/${index}`, childLabelProp)
);
if (
labelValue === undefined ||
|