[material] Add oneOf tests

Author: edgarmueller

packages/examples/src/1253.ts

@@ -55,12 +55,53 @@ const schema2 = {
   }
 };
 
+const schema3 = {
+  type: 'object',
+  properties: {
+    thingOrThings: {
+      oneOf: [
+        {
+          title: 'Thing',
+          type: 'object',
+          properties: {
+            thing: {
+              $ref: '#/definitions/thing'
+            }
+          }
+        },
+        {
+          $ref: '#/definitions/thingArray'
+        }
+      ]
+    }
+  },
+  definitions: {
+    thing: {
+      title: 'Thing',
+      type: 'string'
+    },
+    thingArray: {
+      title: 'Things',
+      type: 'array',
+      items: {
+        $ref: '#/definitions/thing'
+      }
+    }
+  }
+};
+
 const uischema2 = {
   type: 'Control',
   label: 'Value',
   scope: '#/properties/oneOrMoreThings'
 };
 
+const uischema3 = {
+  type: 'Control',
+  label: 'Value',
+  scope: '#/properties/thingOrThings'
+};
+
 registerExamples([
   {
     name: 'issue-1253',
@@ -73,10 +114,30 @@ registerExamples([
 
 registerExamples([
   {
-    name: 'issue-1253-field',
-    label: 'issue 1253 (oneOf) - missing field',
+    name: 'issue-1253-wrong-path-binding',
+    label: 'issue 1253 (oneOf) - wrong path binding',
+    data,
+    schema: schema,
+    uischema: uischema
+  }
+]);
+
+registerExamples([
+  {
+    name: 'issue-1253-field-missing-field',
+    label: 'issue 1253 (oneOf) - missing field renderer',
     data,
     schema: schema2,
     uischema: uischema2
   }
 ]);
+
+registerExamples([
+  {
+    name: 'issue-1253-add-button-empty-row',
+    label: 'issue 1253 (oneOf) - add button does nothing',
+    data,
+    schema: schema3,
+    uischema: uischema3
+  }
+]);

packages/material/src/complex/MaterialOneOfRenderer.tsx

@@ -60,7 +60,7 @@ class MaterialOneOfRenderer extends React.Component<ControlProps & OneOfProps, M
     const { path, schema, handleChange } = this.props;
     handleChange(
       path,
-      createDefaultValue(schema.oneOf[this.state.selectedOneOf])
+      createDefaultValue(schema.oneOf[this.state.newOneOfIndex])
     );
     this.setState({
       open: false,
@@ -69,7 +69,7 @@ class MaterialOneOfRenderer extends React.Component<ControlProps & OneOfProps, M
     });
   };
 
-  handleChange = (_event: any, newOneOfIndex: number) => {
+  handleTabChange = (_event: any, newOneOfIndex: number) => {
     this.setState({
       open: true,
       newOneOfIndex
@@ -79,7 +79,7 @@ class MaterialOneOfRenderer extends React.Component<ControlProps & OneOfProps, M
   render() {
 
     const oneOf = 'oneOf';
-    const { schema, path, rootSchema } = this.props;
+    const { schema, path, rootSchema, id } = this.props;
     const _schema = resolveSubSchemas(schema, rootSchema, oneOf);
     const oneOfRenderInfos = createCombinatorRenderInfos((_schema as JsonSchema).oneOf, rootSchema, oneOf);
 
@@ -90,7 +90,7 @@ class MaterialOneOfRenderer extends React.Component<ControlProps & OneOfProps, M
           combinatorKeyword={'oneOf'}
           path={path}
         />
-        <Tabs value={this.state.selectedOneOf} onChange={this.handleChange}>
+        <Tabs value={this.state.selectedOneOf} onChange={this.handleTabChange}>
           {oneOfRenderInfos.map(oneOfRenderInfo => <Tab key={oneOfRenderInfo.label} label={oneOfRenderInfo.label}/>)}
         </Tabs>
         {
@@ -122,7 +122,7 @@ class MaterialOneOfRenderer extends React.Component<ControlProps & OneOfProps, M
             <Button onClick={this.cancel} color='primary'>
               No
             </Button>
-            <Button onClick={this.confirm} color='primary' autoFocus>
+            <Button onClick={this.confirm} color='primary' autoFocus id={`oneOf-${id}-confirm-yes`}>
               Yes
             </Button>
           </DialogActions>