@jsonforms/material-renderers 3.0.0-beta.1 → 3.0.0-beta.2

package/test/renderers/MaterialArrayLayout.test.tsx

@@ -75,6 +75,18 @@ const nestedSchema = {
   }
 };
 
+const nestedSchemaWithRef = {
+  definitions: {
+    arrayItems: {
+      ...schema
+    }
+  },
+  type: 'array',
+  items: {
+    $ref: '#/definitions/arrayItems'
+  }
+}
+
 const uischema: ControlElement = {
   type: 'Control',
   scope: '#'
@@ -100,6 +112,18 @@ const nestedSchema2 = {
   }
 };
 
+const nestedSchema2WithRef = {
+  definitions: {
+    arrayItems: {
+      ...nestedSchema2
+    }
+  },
+  type: 'array',
+  items: {
+    $ref: '#/definitions/arrayItems'
+  }
+}
+
 const uischemaWithSortOption: ControlElement = {
   type: 'Control',
   scope: '#',
@@ -154,13 +178,16 @@ const uischemaOptions: {
 
 describe('Material array layout tester', () => {
   it('should only be applicable for intermediate array or when containing proper options', () => {
-    expect(materialArrayLayoutTester(uischema, schema)).toBe(-1);
-    expect(materialArrayLayoutTester(uischema, nestedSchema)).toBe(4);
-    expect(materialArrayLayoutTester(uischema, nestedSchema2)).toBe(4);
-
-    expect(materialArrayLayoutTester(uischemaOptions.default, schema)).toBe(-1);
-    expect(materialArrayLayoutTester(uischemaOptions.generate, schema)).toBe(4);
-    expect(materialArrayLayoutTester(uischemaOptions.inline, schema)).toBe(4);
+    expect(materialArrayLayoutTester(uischema, schema, undefined)).toBe(-1);
+    expect(materialArrayLayoutTester(uischema, nestedSchema, undefined)).toBe(4);
+    expect(materialArrayLayoutTester(uischema, nestedSchema2, undefined)).toBe(4);
+    expect(materialArrayLayoutTester(uischema, nestedSchemaWithRef, nestedSchemaWithRef)).toBe(4);
+    expect(materialArrayLayoutTester(uischema, nestedSchemaWithRef, nestedSchemaWithRef)).toBe(4);
+    expect(materialArrayLayoutTester(uischema, nestedSchema2WithRef, nestedSchema2WithRef)).toBe(4);
+
+    expect(materialArrayLayoutTester(uischemaOptions.default, schema, undefined)).toBe(-1);
+    expect(materialArrayLayoutTester(uischemaOptions.generate, schema, undefined)).toBe(4);
+    expect(materialArrayLayoutTester(uischemaOptions.inline, schema, undefined)).toBe(4);
   });
 });
 

package/test/renderers/MaterialBooleanCell.test.tsx

@@ -57,21 +57,22 @@ describe('Material boolean cell tester', () => {
   };
 
   it('should fail', () => {
-    expect(materialBooleanCellTester(undefined, undefined)).toBe(
+    expect(materialBooleanCellTester(undefined, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
-    expect(materialBooleanCellTester(null, undefined)).toBe(NOT_APPLICABLE);
-    expect(materialBooleanCellTester({ type: 'Foo' }, undefined)).toBe(
+    expect(materialBooleanCellTester(null, undefined, undefined)).toBe(NOT_APPLICABLE);
+    expect(materialBooleanCellTester({ type: 'Foo' }, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
-    expect(materialBooleanCellTester({ type: 'Control' }, undefined)).toBe(
+    expect(materialBooleanCellTester({ type: 'Control' }, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
     expect(
       materialBooleanCellTester(control, {
         type: 'object',
         properties: { foo: { type: 'string' } }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
     expect(
       materialBooleanCellTester(control, {
@@ -84,7 +85,8 @@ describe('Material boolean cell tester', () => {
             type: 'boolean'
           }
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
   });
 
@@ -97,7 +99,8 @@ describe('Material boolean cell tester', () => {
             type: 'boolean'
           }
         }
-      })
+      },
+      undefined)
     ).toBe(2);
   });
 });

package/test/renderers/MaterialBooleanToggleCell.test.tsx

@@ -65,23 +65,24 @@ describe('Material boolean toggle cell tester', () => {
   };
 
   it('should fail', () => {
-    expect(materialBooleanToggleCellTester(undefined, undefined)).toBe(
+    expect(materialBooleanToggleCellTester(undefined, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
-    expect(materialBooleanToggleCellTester(null, undefined)).toBe(
+    expect(materialBooleanToggleCellTester(null, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
-    expect(materialBooleanToggleCellTester({ type: 'Foo' }, undefined)).toBe(
+    expect(materialBooleanToggleCellTester({ type: 'Foo' }, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
     expect(
-      materialBooleanToggleCellTester({ type: 'Control' }, undefined)
+      materialBooleanToggleCellTester({ type: 'Control' }, undefined, undefined)
     ).toBe(NOT_APPLICABLE);
     expect(
       materialBooleanToggleCellTester(control, {
         type: 'object',
         properties: { foo: { type: 'string' } }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
     expect(
       materialBooleanToggleCellTester(control, {
@@ -94,7 +95,8 @@ describe('Material boolean toggle cell tester', () => {
             type: 'boolean'
           }
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
 
     // Not applicable for boolean cell if toggle option is false
@@ -114,7 +116,8 @@ describe('Material boolean toggle cell tester', () => {
               type: 'boolean'
             }
           }
-        }
+        },
+        undefined
       )
     ).toBe(NOT_APPLICABLE);
 
@@ -132,7 +135,8 @@ describe('Material boolean toggle cell tester', () => {
               type: 'boolean'
             }
           }
-        }
+        },
+        undefined
       )
     ).toBe(NOT_APPLICABLE);
   });
@@ -146,7 +150,8 @@ describe('Material boolean toggle cell tester', () => {
             type: 'boolean'
           }
         }
-      })
+      },
+      undefined)
     ).toBe(3);
   });
 });

package/test/renderers/MaterialBooleanToggleControl.test.tsx

@@ -70,23 +70,24 @@ describe('Material boolean toggle control tester', () => {
   };
 
   it('should fail', () => {
-    expect(materialBooleanToggleControlTester(undefined, undefined)).toBe(
+    expect(materialBooleanToggleControlTester(undefined, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
-    expect(materialBooleanToggleControlTester(null, undefined)).toBe(
+    expect(materialBooleanToggleControlTester(null, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
-    expect(materialBooleanToggleControlTester({ type: 'Foo' }, undefined)).toBe(
+    expect(materialBooleanToggleControlTester({ type: 'Foo' }, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
     expect(
-      materialBooleanToggleControlTester({ type: 'Control' }, undefined)
+      materialBooleanToggleControlTester({ type: 'Control' }, undefined, undefined)
     ).toBe(NOT_APPLICABLE);
     expect(
       materialBooleanToggleControlTester(control, {
         type: 'object',
         properties: { foo: { type: 'string' } }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
     expect(
       materialBooleanToggleControlTester(control, {
@@ -99,7 +100,8 @@ describe('Material boolean toggle control tester', () => {
             type: 'boolean'
           }
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
 
     // Not applicable for boolean control if toggle option is false
@@ -119,7 +121,8 @@ describe('Material boolean toggle control tester', () => {
               type: 'boolean'
             }
           }
-        }
+        },
+        undefined
       )
     ).toBe(NOT_APPLICABLE);
 
@@ -137,7 +140,8 @@ describe('Material boolean toggle control tester', () => {
               type: 'boolean'
             }
           }
-        }
+        },
+        undefined
       )
     ).toBe(NOT_APPLICABLE);
   });
@@ -151,7 +155,8 @@ describe('Material boolean toggle control tester', () => {
             type: 'boolean'
           }
         }
-      })
+      },
+      undefined)
     ).toBe(3);
   });
 });

package/test/renderers/MaterialCategorizationLayout.test.tsx

@@ -68,11 +68,11 @@ const fixture = {
 
 describe('Material categorization layout tester', () => {
   it('should not fail when given undefined data', () => {
-    expect(materialCategorizationTester(undefined, undefined)).toBe(-1);
-    expect(materialCategorizationTester(null, undefined)).toBe(-1);
-    expect(materialCategorizationTester({ type: 'Foo' }, undefined)).toBe(-1);
+    expect(materialCategorizationTester(undefined, undefined, undefined)).toBe(-1);
+    expect(materialCategorizationTester(null, undefined, undefined)).toBe(-1);
+    expect(materialCategorizationTester({ type: 'Foo' }, undefined, undefined)).toBe(-1);
     expect(
-      materialCategorizationTester({ type: 'Categorization' }, undefined)
+      materialCategorizationTester({ type: 'Categorization' }, undefined, undefined)
     ).toBe(-1);
   });
 
@@ -81,7 +81,7 @@ describe('Material categorization layout tester', () => {
       type: 'Categorization',
       elements: null
     };
-    expect(materialCategorizationTester(uischema, undefined)).toBe(-1);
+    expect(materialCategorizationTester(uischema, undefined, undefined)).toBe(-1);
   });
 
   it('should succeed with empty elements and no schema', () => {
@@ -89,7 +89,7 @@ describe('Material categorization layout tester', () => {
       type: 'Categorization',
       elements: []
     };
-    expect(materialCategorizationTester(uischema, undefined)).toBe(1);
+    expect(materialCategorizationTester(uischema, undefined, undefined)).toBe(1);
   });
 
   it('should not fail tester with single unknown element and no schema', () => {
@@ -101,7 +101,7 @@ describe('Material categorization layout tester', () => {
         }
       ]
     };
-    expect(materialCategorizationTester(uischema, undefined)).toBe(-1);
+    expect(materialCategorizationTester(uischema, undefined, undefined)).toBe(-1);
   });
 
   it('should succeed with a single category and no schema', () => {
@@ -113,7 +113,7 @@ describe('Material categorization layout tester', () => {
         }
       ]
     };
-    expect(materialCategorizationTester(categorization, undefined)).toBe(1);
+    expect(materialCategorizationTester(categorization, undefined, undefined)).toBe(1);
   });
 
   it('should not apply to a nested categorization with single category and no schema', () => {
@@ -129,7 +129,7 @@ describe('Material categorization layout tester', () => {
       type: 'Categorization',
       elements: [nestedCategorization]
     };
-    expect(materialCategorizationTester(categorization, undefined)).toBe(-1);
+    expect(materialCategorizationTester(categorization, undefined, undefined)).toBe(-1);
   });
 
   it('should not apply to nested categorizations without categories and no schema', () => {
@@ -141,7 +141,7 @@ describe('Material categorization layout tester', () => {
         }
       ]
     };
-    expect(materialCategorizationTester(categorization, undefined)).toBe(-1);
+    expect(materialCategorizationTester(categorization, undefined, undefined)).toBe(-1);
   });
 
   it('should not apply to a nested categorization with null elements and no schema', () => {
@@ -156,7 +156,7 @@ describe('Material categorization layout tester', () => {
       ]
     };
 
-    expect(materialCategorizationTester(categorization, undefined)).toBe(-1);
+    expect(materialCategorizationTester(categorization, undefined, undefined)).toBe(-1);
   });
 
   it('should not apply to a nested categorizations with empty elements and no schema', () => {
@@ -169,7 +169,7 @@ describe('Material categorization layout tester', () => {
         }
       ]
     };
-    expect(materialCategorizationTester(categorization, undefined)).toBe(-1);
+    expect(materialCategorizationTester(categorization, undefined, undefined)).toBe(-1);
   });
 });
 

package/test/renderers/MaterialCategorizationStepperLayout.test.tsx

@@ -68,13 +68,13 @@ const fixture = {
 
 describe('Material categorization stepper layout tester', () => {
   it('should not fail when given undefined data', () => {
-    expect(materialCategorizationStepperTester(undefined, undefined)).toBe(-1);
-    expect(materialCategorizationStepperTester(null, undefined)).toBe(-1);
+    expect(materialCategorizationStepperTester(undefined, undefined, undefined)).toBe(-1);
+    expect(materialCategorizationStepperTester(null, undefined, undefined)).toBe(-1);
     expect(
-      materialCategorizationStepperTester({ type: 'Foo' }, undefined)
+      materialCategorizationStepperTester({ type: 'Foo' }, undefined, undefined)
     ).toBe(-1);
     expect(
-      materialCategorizationStepperTester({ type: 'Categorization' }, undefined)
+      materialCategorizationStepperTester({ type: 'Categorization' }, undefined, undefined)
     ).toBe(-1);
   });
 
@@ -83,7 +83,7 @@ describe('Material categorization stepper layout tester', () => {
       type: 'Categorization',
       elements: null
     };
-    expect(materialCategorizationStepperTester(uischema, undefined)).toBe(-1);
+    expect(materialCategorizationStepperTester(uischema, undefined, undefined)).toBe(-1);
   });
 
   it('should not fail with empty elements and no schema', () => {
@@ -91,7 +91,7 @@ describe('Material categorization stepper layout tester', () => {
       type: 'Categorization',
       elements: []
     };
-    expect(materialCategorizationStepperTester(uischema, undefined)).toBe(-1);
+    expect(materialCategorizationStepperTester(uischema, undefined, undefined)).toBe(-1);
   });
 
   it('should not fail tester with single unknown element and no schema', () => {
@@ -103,7 +103,7 @@ describe('Material categorization stepper layout tester', () => {
         }
       ]
     };
-    expect(materialCategorizationStepperTester(uischema, undefined)).toBe(-1);
+    expect(materialCategorizationStepperTester(uischema, undefined, undefined)).toBe(-1);
   });
 
   it('should not apply to a single category and no schema', () => {
@@ -115,7 +115,7 @@ describe('Material categorization stepper layout tester', () => {
         }
       ]
     };
-    expect(materialCategorizationStepperTester(categorization, undefined)).toBe(
+    expect(materialCategorizationStepperTester(categorization, undefined, undefined)).toBe(
       -1
     );
   });
@@ -133,7 +133,7 @@ describe('Material categorization stepper layout tester', () => {
       type: 'Categorization',
       elements: [nestedCategorization]
     };
-    expect(materialCategorizationStepperTester(categorization, undefined)).toBe(
+    expect(materialCategorizationStepperTester(categorization, undefined, undefined)).toBe(
       -1
     );
   });
@@ -147,7 +147,7 @@ describe('Material categorization stepper layout tester', () => {
         }
       ]
     };
-    expect(materialCategorizationStepperTester(categorization, undefined)).toBe(
+    expect(materialCategorizationStepperTester(categorization, undefined, undefined)).toBe(
       -1
     );
   });
@@ -164,7 +164,7 @@ describe('Material categorization stepper layout tester', () => {
       ]
     };
 
-    expect(materialCategorizationStepperTester(categorization, undefined)).toBe(
+    expect(materialCategorizationStepperTester(categorization, undefined, undefined)).toBe(
       -1
     );
   });
@@ -179,7 +179,7 @@ describe('Material categorization stepper layout tester', () => {
         }
       ]
     };
-    expect(materialCategorizationStepperTester(categorization, undefined)).toBe(
+    expect(materialCategorizationStepperTester(categorization, undefined, undefined)).toBe(
       -1
     );
   });

package/test/renderers/MaterialDateCell.test.tsx

@@ -52,12 +52,12 @@ const uischema: ControlElement = {
 
 describe('Material date cell', () => {
   it('should fail', () => {
-    expect(materialDateCellTester(undefined, undefined)).toBe(NOT_APPLICABLE);
-    expect(materialDateCellTester(null, undefined)).toBe(NOT_APPLICABLE);
-    expect(materialDateCellTester({ type: 'Foo' }, undefined)).toBe(
+    expect(materialDateCellTester(undefined, undefined, undefined)).toBe(NOT_APPLICABLE);
+    expect(materialDateCellTester(null, undefined, undefined)).toBe(NOT_APPLICABLE);
+    expect(materialDateCellTester({ type: 'Foo' }, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
-    expect(materialDateCellTester({ type: 'Control' }, undefined)).toBe(
+    expect(materialDateCellTester({ type: 'Control' }, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
 
@@ -67,7 +67,8 @@ describe('Material date cell', () => {
         properties: {
           foo: { type: 'string' }
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
     expect(
       materialDateCellTester(uischema, {
@@ -79,7 +80,8 @@ describe('Material date cell', () => {
             format: 'date'
           }
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
   });
 
@@ -93,7 +95,8 @@ describe('Material date cell', () => {
             format: 'date'
           }
         }
-      })
+      },
+      undefined)
     ).toBe(2);
   });
 });

package/test/renderers/MaterialDateControl.test.tsx

@@ -57,14 +57,14 @@ const uischema: ControlElement = {
 
 describe('Material date control tester', () => {
   test('should fail', () => {
-    expect(materialDateControlTester(undefined, undefined)).toBe(
+    expect(materialDateControlTester(undefined, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
-    expect(materialDateControlTester(null, undefined)).toBe(NOT_APPLICABLE);
-    expect(materialDateControlTester({ type: 'Foo' }, undefined)).toBe(
+    expect(materialDateControlTester(null, undefined, undefined)).toBe(NOT_APPLICABLE);
+    expect(materialDateControlTester({ type: 'Foo' }, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
-    expect(materialDateControlTester({ type: 'Control' }, undefined)).toBe(
+    expect(materialDateControlTester({ type: 'Control' }, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
     expect(
@@ -73,7 +73,8 @@ describe('Material date control tester', () => {
         properties: {
           foo: { type: 'string' }
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
     expect(
       materialDateControlTester(uischema, {
@@ -85,7 +86,8 @@ describe('Material date control tester', () => {
             format: 'date'
           }
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
   });
 
@@ -99,7 +101,8 @@ describe('Material date control tester', () => {
             format: 'date'
           }
         }
-      })
+      },
+      undefined)
     ).toBe(4);
     expect(
       materialDateControlTester(
@@ -111,7 +114,8 @@ describe('Material date control tester', () => {
               type: 'string'
             }
           }
-        }
+        },
+        undefined
       )
     ).toBe(4);
   });

package/test/renderers/MaterialDateTimeControl.test.tsx

@@ -58,14 +58,14 @@ const uischema: ControlElement = {
 
 describe('Material date time control tester', () => {
   it('should fail', () => {
-    expect(materialDateTimeControlTester(undefined, undefined)).toBe(
+    expect(materialDateTimeControlTester(undefined, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
-    expect(materialDateTimeControlTester(null, undefined)).toBe(NOT_APPLICABLE);
-    expect(materialDateTimeControlTester({ type: 'Foo' }, undefined)).toBe(
+    expect(materialDateTimeControlTester(null, undefined, undefined)).toBe(NOT_APPLICABLE);
+    expect(materialDateTimeControlTester({ type: 'Foo' }, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
-    expect(materialDateTimeControlTester({ type: 'Control' }, undefined)).toBe(
+    expect(materialDateTimeControlTester({ type: 'Control' }, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
     expect(
@@ -74,7 +74,8 @@ describe('Material date time control tester', () => {
         properties: {
           foo: { type: 'string' }
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
     expect(
       materialDateTimeControlTester(uischema, {
@@ -86,7 +87,8 @@ describe('Material date time control tester', () => {
             format: 'date-time'
           }
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
   });
 
@@ -100,7 +102,8 @@ describe('Material date time control tester', () => {
             format: 'date-time'
           }
         }
-      })
+      },
+      undefined)
     ).toBe(2);
     expect(
       materialDateTimeControlTester(
@@ -112,7 +115,8 @@ describe('Material date time control tester', () => {
               type: 'string'
             }
           }
-        }
+        },
+        undefined
       )
     ).toBe(2);
   });

package/test/renderers/MaterialEnumArrayRenderer.test.tsx

@@ -51,7 +51,8 @@ describe('EnumArrayControl tester', () => {
       materialEnumArrayRendererTester(uischema, {
         type: 'array',
         items: {}
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
     expect(
       materialEnumArrayRendererTester(uischema, {
@@ -59,12 +60,13 @@ describe('EnumArrayControl tester', () => {
         items: {
           anyOf: []
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
   });
 
   it('should succeed for schema with enum items', () => {
-    expect(materialEnumArrayRendererTester(uischema, enumSchema)).toBe(5);
+    expect(materialEnumArrayRendererTester(uischema, enumSchema, undefined)).toBe(5);
   });
 });
 
@@ -113,7 +115,7 @@ describe('EnumArrayControl', () => {
     );
     const labels = wrapper.find('label');
     expect(labels.first().text()).toBe('My Title');
-    expect(labels.last().text()).toBe('Bar');
+    expect(labels.last().text()).toBe('bar');
   });
 
   test('oneOf items - updates data', (done) => {
@@ -176,9 +178,9 @@ describe('EnumArrayControl', () => {
       />
     );
     const labels = wrapper.find('label');
-    expect(labels.at(0).text()).toBe('A');
-    expect(labels.at(1).text()).toBe('B');
-    expect(labels.at(2).text()).toBe('C');
+    expect(labels.at(0).text()).toBe('a');
+    expect(labels.at(1).text()).toBe('b');
+    expect(labels.at(2).text()).toBe('c');
   });
 
   test('enum items - updates data', (done) => {

package/test/renderers/MaterialEnumCell.test.tsx

@@ -64,7 +64,8 @@ describe('Material enum cell tester', () => {
             enum: ['DE', 'IT', 'JP', 'US', 'RU', 'Other']
           }
         }
-      })
+      },
+      undefined)
     ).toBe(2);
   });
 });