@jsonforms/material-renderers 3.2.0-beta.0 → 3.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/additional/MaterialListWithDetailRenderer.d.ts +1 -1
- package/lib/additional/unwrapped.d.ts +1 -1
- package/lib/complex/TableToolbar.d.ts +1 -0
- package/lib/index.d.ts +1 -1
- package/lib/jsonforms-react-material.cjs.js +125 -82
- package/lib/jsonforms-react-material.cjs.js.map +1 -1
- package/lib/jsonforms-react-material.esm.js +131 -92
- package/lib/jsonforms-react-material.esm.js.map +1 -1
- package/lib/layouts/ArrayToolbar.d.ts +1 -0
- package/lib/util/datejs.d.ts +3 -1
- package/package.json +10 -9
- package/src/additional/ListWithDetailMasterItem.tsx +1 -1
- package/src/additional/MaterialListWithDetailRenderer.tsx +2 -0
- package/src/complex/MaterialEnumArrayRenderer.tsx +1 -1
- package/src/complex/MaterialTableControl.tsx +7 -3
- package/src/complex/TableToolbar.tsx +34 -21
- package/src/complex/ValidationIcon.tsx +1 -1
- package/src/controls/MaterialDateControl.tsx +29 -5
- package/src/controls/MaterialDateTimeControl.tsx +29 -5
- package/src/controls/MaterialTimeControl.tsx +29 -5
- package/src/layouts/ArrayToolbar.tsx +53 -40
- package/src/layouts/ExpandPanelRenderer.tsx +6 -4
- package/src/layouts/MaterialArrayLayout.tsx +2 -0
- package/src/mui-controls/MuiInputText.tsx +1 -1
- package/src/util/datejs.tsx +45 -6
package/src/util/datejs.tsx
CHANGED
|
@@ -8,17 +8,56 @@ export const createOnChangeHandler =
|
|
|
8
8
|
(
|
|
9
9
|
path: string,
|
|
10
10
|
handleChange: (path: string, value: any) => void,
|
|
11
|
-
saveFormat: string
|
|
11
|
+
saveFormat: string
|
|
12
12
|
) =>
|
|
13
|
-
(
|
|
14
|
-
if (!
|
|
13
|
+
(value: dayjs.Dayjs) => {
|
|
14
|
+
if (!value) {
|
|
15
15
|
handleChange(path, undefined);
|
|
16
|
-
|
|
16
|
+
} else if (value.toString() !== 'Invalid Date') {
|
|
17
|
+
const formatedDate = formatDate(value, saveFormat);
|
|
18
|
+
handleChange(path, formatedDate);
|
|
17
19
|
}
|
|
18
|
-
const result = dayjs(time).format(saveFormat);
|
|
19
|
-
handleChange(path, result);
|
|
20
20
|
};
|
|
21
21
|
|
|
22
|
+
export const createOnBlurHandler =
|
|
23
|
+
(
|
|
24
|
+
path: string,
|
|
25
|
+
handleChange: (path: string, value: any) => void,
|
|
26
|
+
format: string,
|
|
27
|
+
saveFormat: string,
|
|
28
|
+
rerenderChild: () => void,
|
|
29
|
+
onBlur: () => void
|
|
30
|
+
) =>
|
|
31
|
+
(e: React.FocusEvent<HTMLTextAreaElement | HTMLInputElement, Element>) => {
|
|
32
|
+
const date = dayjs(e.target.value, format);
|
|
33
|
+
const formatedDate = formatDate(date, saveFormat);
|
|
34
|
+
if (formatedDate.toString() === 'Invalid Date') {
|
|
35
|
+
handleChange(path, undefined);
|
|
36
|
+
rerenderChild();
|
|
37
|
+
} else {
|
|
38
|
+
handleChange(path, formatedDate);
|
|
39
|
+
}
|
|
40
|
+
onBlur();
|
|
41
|
+
};
|
|
42
|
+
|
|
43
|
+
export const formatDate = (date: dayjs.Dayjs, saveFormat: string) => {
|
|
44
|
+
let formatedDate = date.format(saveFormat);
|
|
45
|
+
// Workaround to address a bug in Dayjs, neglecting leading 0 (https://github.com/iamkun/dayjs/issues/1849)
|
|
46
|
+
const indexOfYear = saveFormat.indexOf('YYYY');
|
|
47
|
+
if (date.year() < 1000 && indexOfYear !== -1) {
|
|
48
|
+
const stringUpToYear = formatedDate.slice(0, indexOfYear);
|
|
49
|
+
const stringFromYear = formatedDate.slice(indexOfYear);
|
|
50
|
+
if (date.year() >= 100) {
|
|
51
|
+
formatedDate = [stringUpToYear, 0, stringFromYear].join('');
|
|
52
|
+
} else if (date.year() >= 10) {
|
|
53
|
+
formatedDate = [stringUpToYear, 0, 0, stringFromYear].join('');
|
|
54
|
+
} else if (date.year() >= 1) {
|
|
55
|
+
formatedDate = [stringUpToYear, 0, 0, 0, stringFromYear].join('');
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
return formatedDate;
|
|
59
|
+
};
|
|
60
|
+
|
|
22
61
|
export const getData = (
|
|
23
62
|
data: any,
|
|
24
63
|
saveFormat: string | undefined
|