@jsonforms/material-renderers 3.0.0-alpha.3 → 3.0.0-beta.2

package/test/renderers/MaterialAnyOfStringOrEnumControl.test.tsx

@@ -52,9 +52,9 @@ const uischema: ControlElement = {
 describe('Material simple any of control tester', () => {
   it('should only be applicable for simple any of cases', () => {
     expect(
-      materialAnyOfStringOrEnumControlTester({ type: 'Foo' }, schema)
+      materialAnyOfStringOrEnumControlTester({ type: 'Foo' }, schema, undefined)
     ).toBe(-1);
-    expect(materialAnyOfStringOrEnumControlTester(uischema, schema)).toBe(5);
+    expect(materialAnyOfStringOrEnumControlTester(uischema, schema, undefined)).toBe(5);
 
     const nestedSchema: JsonSchema = {
       properties: {
@@ -66,7 +66,7 @@ describe('Material simple any of control tester', () => {
       scope: '#/properties/foo'
     };
     expect(
-      materialAnyOfStringOrEnumControlTester(nestedUischema, nestedSchema)
+      materialAnyOfStringOrEnumControlTester(nestedUischema, nestedSchema, undefined)
     ).toBe(5);
     const schemaNoEnum: JsonSchema = {
       anyOf: [{ type: 'string' }]
@@ -80,17 +80,17 @@ describe('Material simple any of control tester', () => {
     const schemaNoString: JsonSchema = {
       anyOf: [{ type: 'integer' }, { enum: [1, 2] }]
     };
-    expect(materialAnyOfStringOrEnumControlTester(uischema, schemaNoEnum)).toBe(
+    expect(materialAnyOfStringOrEnumControlTester(uischema, schemaNoEnum, undefined)).toBe(
       -1
     );
     expect(
-      materialAnyOfStringOrEnumControlTester(uischema, schemaConflictTypes)
+      materialAnyOfStringOrEnumControlTester(uischema, schemaConflictTypes, undefined)
     ).toBe(-1);
     expect(
-      materialAnyOfStringOrEnumControlTester(uischema, schemaAdditionalProps)
+      materialAnyOfStringOrEnumControlTester(uischema, schemaAdditionalProps, undefined)
     ).toBe(5);
     expect(
-      materialAnyOfStringOrEnumControlTester(uischema, schemaNoString)
+      materialAnyOfStringOrEnumControlTester(uischema, schemaNoString, undefined)
     ).toBe(-1);
   });
 });

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);
   });
 });
 
@@ -306,7 +333,7 @@ describe('Material array layout', () => {
         .find({ 'aria-label': 'Move down' }).length
     ).toBe(1);
   });
-  it('should move item up if up button is presses', () => {
+  it('should move item up if up button is presses', (done) => {
     const onChangeData: any = {
       data: undefined
     };
@@ -331,19 +358,23 @@ describe('Material array layout', () => {
       .find('button')
       .find({ 'aria-label': 'Move up' });
     upButton.simulate('click');
-    expect(onChangeData.data).toEqual([
-      {
-        message: 'Yolo',
-        message2: 'Yolo 2'
-      },
-      {
-        message: 'El Barto was here',
-        message2: 'El Barto was here 2',
-        done: true
-      }
-    ]);
+    // events are debounced for some time, so let's wait
+    setTimeout(() => {
+      expect(onChangeData.data).toEqual([
+        {
+          message: 'Yolo',
+          message2: 'Yolo 2'
+        },
+        {
+          message: 'El Barto was here',
+          message2: 'El Barto was here 2',
+          done: true
+        }
+      ]);
+      done();
+    }, 50);
   });
-  it('shoud move item down if down button is pressed', () => {
+  it('should move item down if down button is pressed', (done) => {
     const onChangeData: any = {
       data: undefined
     };
@@ -368,17 +399,20 @@ describe('Material array layout', () => {
       .find('button')
       .find({ 'aria-label': 'Move down' });
     upButton.simulate('click');
-    expect(onChangeData.data).toEqual([
-      {
-        message: 'Yolo',
-        message2: 'Yolo 2'
-      },
-      {
-        message: 'El Barto was here',
-        message2: 'El Barto was here 2',
-        done: true
-      }
-    ]);
+    // events are debounced for some time, so let's wait
+    setTimeout(() => {
+      expect(onChangeData.data).toEqual([
+        {
+          message: 'Yolo',
+          message2: 'Yolo 2'
+        },
+        {
+          message: 'El Barto was here',
+          message2: 'El Barto was here 2',
+          done: true
+        }
+      ]); done();
+    }, 50);
   });
   it('should have up button disabled for first element', () => {
     wrapper = mount(

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);
   });
 });
 
@@ -270,7 +270,7 @@ describe('Material categorization layout', () => {
 
     const beforeClick = wrapper.find(Tabs).props().value;
     wrapper
-      .find(Tab)
+      .find('button[role="tab"]')
       .at(1)
       .simulate('click');
     const afterClick = wrapper.find(Tabs).props().value;
@@ -429,7 +429,7 @@ describe('Material categorization layout', () => {
     );
     
     wrapper
-      .find(Tab)
+      .find('button[role="tab"]')
       .at(1)
       .simulate('click');
 

package/test/renderers/MaterialCategorizationStepperLayout.test.tsx

@@ -39,7 +39,7 @@ import MaterialCategorizationStepperLayoutRenderer, {
   materialCategorizationStepperTester
 } from '../../src/layouts/MaterialCategorizationStepperLayout';
 import { MaterialLayoutRenderer, materialRenderers } from '../../src';
-import { Button, Step, StepButton, Stepper } from '@mui/material';
+import { Button, Step, Stepper } from '@mui/material';
 import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
 import { initCore } from './util';
 
@@ -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
     );
   });
@@ -281,7 +281,7 @@ describe('Material categorization stepper layout', () => {
     );
     const beforeClick = wrapper.find(Stepper).props().activeStep;
     wrapper
-      .find(StepButton)
+      .find('button')
       .at(1)
       .simulate('click');
     const afterClick = wrapper.find(Stepper).props().activeStep;
@@ -422,7 +422,7 @@ describe('Material categorization stepper layout', () => {
     const isPrevButtonEnabledBeforeClick = !wrapper.find(Button).at(1).props().disabled;
     const isNextButtonEnabledBeforeClick = !wrapper.find(Button).at(0).props().disabled;
     wrapper
-      .find(StepButton)
+      .find('button')
       .at(1)
       .simulate('click');
     const isPrevButtonEnabledAfterClick = !wrapper.find(Button).at(1).props().disabled;
@@ -489,8 +489,8 @@ describe('Material categorization stepper layout', () => {
     );
     const activeStepBeforeClick = wrapper.find(Stepper).props().activeStep;
     wrapper
-      .find(Button)
-      .at(0)
+      .find('button')
+      .at(4)
       .simulate('click');
     const activeStepAfterClick = wrapper.find(Stepper).props().activeStep;
 
@@ -618,7 +618,7 @@ describe('Material categorization stepper layout', () => {
     );
     
     wrapper
-      .find(StepButton)
+      .find('button')
       .at(1)
       .simulate('click');
 

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);
   });
 });