@jsonforms/material-renderers 3.0.0-beta.3 → 3.0.0-rc.0

package/test/renderers/MaterialDateTimeControl.test.tsx

@@ -387,4 +387,31 @@ describe('Material date time control', () => {
     input.simulate('change', input);
     expect(onChangeData.data.foo).toBe('2005/12/10 11:22 am');
   });
+
+  it('should call onChange with original input value for invalid date strings', () => {
+    const core = initCore(schema, uischema);
+    const onChangeData: any = {
+      data: undefined
+    };
+    wrapper = mount(
+      <JsonFormsStateProvider initState={{ renderers: materialRenderers, core }}>
+        <TestEmitter
+          onChange={({ data }) => {
+            onChangeData.data = data;
+          }}
+        />
+        <MaterialDateTimeControl
+          schema={schema}
+          uischema={{...uischema}}
+        />
+      </JsonFormsStateProvider>
+    );
+
+    const input = wrapper.find('input').first();
+    expect(input.props().value).toBe('');
+
+    (input.getDOMNode() as HTMLInputElement).value = 'invalid date string'; 
+    input.simulate('change', input);
+    expect(onChangeData.data.foo).toBe('invalid date string');
+  });
 });

package/test/renderers/MaterialGroupLayout.test.tsx

@@ -67,7 +67,7 @@ const uischema = {
 describe('Material group layout', () => {
   it('should render a GroupComponent with direction column when given no direction LayoutProp', () => {
     const wrapper = mount(
-      <MaterialGroupLayout schema={schema} uischema={uischema} />
+      <MaterialGroupLayout schema={schema} uischema={uischema} direction="column" enabled visible path=""/>
     );
     expect(wrapper.find(MaterialLayoutRenderer).props().direction).toBe(
       'column'
@@ -80,6 +80,9 @@ describe('Material group layout', () => {
         schema={schema}
         uischema={uischema}
         direction={'row'}
+        enabled
+        visible
+        path=""
       />
     );
     expect(wrapper.find(MaterialLayoutRenderer).props().direction).toBe('row');

package/test/renderers/MaterialInputControl.test.tsx

@@ -250,6 +250,10 @@ describe('Material input control', () => {
         <MaterialHorizontalLayoutRenderer
           schema={jsonSchema}
           uischema={layout}
+          direction="row"
+          enabled
+          visible
+          path=""
         />
       </ JsonFormsStateProvider>
     );

package/test/renderers/MaterialLabelRenderer.test.tsx

@@ -25,6 +25,7 @@
 import './MatchMediaMock';
 import * as React from 'react';
 import {
+  LabelElement,
   NOT_APPLICABLE
 } from '@jsonforms/core';
 import '../../src/cells';
@@ -44,7 +45,7 @@ const schema = {
   type: 'object',
   properties: {}
 };
-const uischema = {
+const uischema: LabelElement = {
   type: 'Label',
   text: 'Foo'
 };

package/test/renderers/MaterialTimeControl.test.tsx

@@ -381,4 +381,31 @@ describe('Material time control', () => {
     input.simulate('change', input);
     expect(onChangeData.data.foo).toBe('1//12 am');
   });
+
+  it('should call onChange with original input value for invalid date strings', () => {
+    const core = initCore(schema, uischema);
+    const onChangeData: any = {
+      data: undefined
+    };
+    wrapper = mount(
+      <JsonFormsStateProvider initState={{ renderers: materialRenderers, core }}>
+        <TestEmitter
+          onChange={({ data }) => {
+            onChangeData.data = data;
+          }}
+        />
+        <MaterialTimeControl
+          schema={schema}
+          uischema={{...uischema}}
+        />
+      </JsonFormsStateProvider>
+    );
+
+    const input = wrapper.find('input').first();
+    expect(input.props().value).toBe('');
+
+    (input.getDOMNode() as HTMLInputElement).value = 'invalid date string'; 
+    input.simulate('change', input);
+    expect(onChangeData.data.foo).toBe('invalid date string');
+  });
 });

package/test/renderers/util.ts

@@ -26,6 +26,7 @@
 import {
   createAjv,
   JsonSchema,
+  TesterContext,
   UISchemaElement
 } from '@jsonforms/core';
 import { JsonFormsReactProps, useJsonForms } from '@jsonforms/react';
@@ -43,3 +44,7 @@ export const TestEmitter : React.FC<JsonFormsReactProps> = ({onChange}) => {
   }, [data, errors]);
   return null;
 };
+
+export const createTesterContext = (rootSchema: JsonSchema, config?: any): TesterContext => {
+  return { rootSchema, config };
+};

package/src/util/datejs.ts

@@ -1,32 +0,0 @@
-import dayjs from 'dayjs';
-import customParsing from 'dayjs/plugin/customParseFormat';
-
-// required for the custom save formats in the date, time and date-time pickers
-dayjs.extend(customParsing);
-
-export const createOnChangeHandler = (
-  path: string,
-  handleChange: (path: string, value: any) => void,
-  saveFormat: string | undefined
-) => (time: dayjs.Dayjs) => {
-  if (!time) {
-    handleChange(path, undefined);
-    return;
-  }
-  const result = dayjs(time).format(saveFormat);
-  handleChange(path, result === 'Invalid Date' ? undefined : result);
-};
-
-export const getData = (
-  data: any,
-  saveFormat: string | undefined
-): dayjs.Dayjs | null => {
-  if (!data) {
-    return null;
-  }
-  const dayjsData = dayjs(data, saveFormat);
-  if (dayjsData.toString() === 'Invalid Date') {
-    return null;
-  }
-  return dayjsData;
-};