@dartech/arsenal-ui 1.3.28 → 1.3.29

package/index.js

@@ -1974,10 +1974,7 @@ const ControlDate = ({
   hideErrorMessage: _hideErrorMessage = false
 }) => {
   const {
-    field: {
-      onChange,
-      ref
-    },
+    field,
     fieldState: {
       error
     }
@@ -1994,22 +1991,17 @@ const ControlDate = ({
       }
     }
   });
-  const value = useWatch({
-    control,
-    name
-  });
-  const handleChange = date => {
-    onChange(isValid(date) ? format(date, _format) : date);
-  };
-  return jsx(DatePicker, {
+  const handleChange = useCallback(date => {
+    field.onChange(isValid(date) ? format(date, _format) : date);
+  }, [field, _format]);
+  return jsx(DatePicker, Object.assign({}, field, {
     label: required ? jsxs(Fragment, {
       children: [label, " ", jsx("span", {
         children: "*"
       })]
     }) : label,
-    inputRef: ref,
     inputFormat: _format,
-    value: value || null,
+    value: _format ? parse(field.value, _format, new Date()) : field.value,
     onChange: handleChange,
     renderInput: props => jsx(TextField, Object.assign({}, props, {
       fullWidth: true,
@@ -2024,7 +2016,7 @@ const ControlDate = ({
       error: !!error,
       helperText: !_hideErrorMessage && (error === null || error === void 0 ? void 0 : error.message)
     }))
-  });
+  }));
 };
 
 const ControlDateTime = ({
@@ -2036,10 +2028,7 @@ const ControlDateTime = ({
   hideErrorMessage: _hideErrorMessage = false
 }) => {
   const {
-    field: {
-      onChange,
-      ref
-    },
+    field,
     fieldState: {
       error
     }
@@ -2056,23 +2045,17 @@ const ControlDateTime = ({
       }
     }
   });
-  const value = useWatch({
-    control,
-    name
-  });
-  const handleChange = date => {
-    onChange(isValid(date) ? format(date, _format) : date);
-  };
-  return jsx(DateTimePicker, {
-    mask: "",
+  const handleChange = useCallback(date => {
+    field.onChange(isValid(date) ? format(date, _format) : date);
+  }, [field, _format]);
+  return jsx(DateTimePicker, Object.assign({}, field, {
     ampm: false,
-    inputRef: ref,
     label: required ? jsxs(Fragment, {
       children: [label, " ", jsx("span", {
         children: "*"
       })]
     }) : label,
-    value: value || null,
+    value: _format ? parse(field.value, _format, new Date()) : field.value,
     inputFormat: _format,
     onChange: handleChange,
     renderInput: props => jsx(TextField, Object.assign({}, props, {
@@ -2088,7 +2071,7 @@ const ControlDateTime = ({
       error: !!error,
       helperText: !_hideErrorMessage && (error === null || error === void 0 ? void 0 : error.message)
     }))
-  });
+  }));
 };
 
 const ControlTime = ({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dartech/arsenal-ui",
-  "version": "1.3.28",
+  "version": "1.3.29",
   "author": "DAR",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"