@dartech/arsenal-ui 1.3.41 → 1.3.43

package/index.js

@@ -1979,6 +1979,7 @@ const ControlDate = ({
   format: _format = DATE_DEFAULT_FORMAT,
   hideErrorMessage: _hideErrorMessage = false
 }) => {
+  const [localFormat, setLocalFormat] = useState(DATE_DEFAULT_FORMAT);
   const {
     field,
     fieldState: {
@@ -1990,7 +1991,7 @@ const ControlDate = ({
     rules: {
       required: required && 'Please, fill this field',
       validate: val => {
-        if (isMatch(val, _format)) {
+        if (isMatch(val, localFormat)) {
           return true;
         }
         return 'Incorrect date format';
@@ -1998,16 +1999,25 @@ const ControlDate = ({
     }
   });
   const handleChange = useCallback(date => {
-    field.onChange(isValid(date) ? format(date, _format) : date);
-  }, [field, _format]);
+    field.onChange(isValid(date) ? format(date, localFormat) : date);
+  }, [field, localFormat]);
+  useEffect(() => {
+    const fixedTimeZone = _format.replace(/[Z,z,x]+/g, 'XX');
+    try {
+      isMatch(format(new Date(), fixedTimeZone), fixedTimeZone);
+      setLocalFormat(fixedTimeZone);
+    } catch (e) {
+      console.error(e);
+    }
+  }, [_format]);
   return jsx(DatePicker, Object.assign({}, field, {
     label: required ? jsxs(Fragment, {
       children: [label, " ", jsx("span", {
         children: "*"
       })]
     }) : label,
-    inputFormat: _format,
-    value: _format ? parse(field.value, _format, new Date()) : field.value,
+    inputFormat: localFormat,
+    value: localFormat ? parse(field.value, localFormat, new Date()) : field.value,
     onChange: handleChange,
     renderInput: props => jsx(TextField, Object.assign({}, props, {
       fullWidth: true,
@@ -2033,6 +2043,7 @@ const ControlDateTime = ({
   format: _format = DATE_TIME_DEFAULT_FORMAT,
   hideErrorMessage: _hideErrorMessage = false
 }) => {
+  const [localFormat, setLocalFormat] = useState(DATE_TIME_DEFAULT_FORMAT);
   const {
     field,
     fieldState: {
@@ -2044,7 +2055,7 @@ const ControlDateTime = ({
     rules: {
       required: required && 'Please, fill this field',
       validate: val => {
-        if (isMatch(val, _format)) {
+        if (isMatch(val, localFormat)) {
           return true;
         }
         return 'Incorrect date format';
@@ -2052,8 +2063,17 @@ const ControlDateTime = ({
     }
   });
   const handleChange = useCallback(date => {
-    field.onChange(isValid(date) ? format(date, _format) : date);
-  }, [field, _format]);
+    field.onChange(isValid(date) ? format(date, localFormat) : date);
+  }, [field, localFormat]);
+  useEffect(() => {
+    const fixedTimeZone = _format.replace(/[Z,z,x]+/g, 'XX');
+    try {
+      isMatch(format(new Date(), fixedTimeZone), fixedTimeZone);
+      setLocalFormat(fixedTimeZone);
+    } catch (e) {
+      console.error(e);
+    }
+  }, [_format]);
   return jsx(DateTimePicker, Object.assign({}, field, {
     ampm: false,
     label: required ? jsxs(Fragment, {
@@ -2061,8 +2081,8 @@ const ControlDateTime = ({
         children: "*"
       })]
     }) : label,
-    value: _format ? parse(field.value, _format, new Date()) : field.value,
-    inputFormat: _format,
+    value: localFormat ? parse(field.value, localFormat, new Date()) : field.value,
+    inputFormat: localFormat,
     onChange: handleChange,
     renderInput: props => jsx(TextField, Object.assign({}, props, {
       fullWidth: true,
@@ -3849,7 +3869,8 @@ const PropertyFiller = ({
 }) => {
   const {
     control,
-    clearErrors
+    clearErrors,
+    setValue
   } = useFormContext();
   const {
     field: {
@@ -3885,11 +3906,9 @@ const PropertyFiller = ({
   const handleFillOptionChange = useCallback(event => {
     const selectedType = event.target.value;
     if (selectedType === 'null') {
-      // onChange(null);
+      setValue(name, null);
       clearErrors(name);
-      // register(name, { value: null });
     } else if (selectedType === 'widget') {
-      clearErrors(name);
       if (propertyType === PropertyType.JSON && value && typeof value !== 'string' && fillOption === 'dem_builder' && 'properties' in value) {
         const definitionValue = Object.assign(Object.assign({}, value), {
           properties: propertiesArrayToObject(value.property || [])
@@ -3900,10 +3919,10 @@ const PropertyFiller = ({
           console.log('Stringify failed');
         }
       } else {
-        onChange(null);
+        setValue(name, null);
       }
     } else if (selectedType === 'expression' || selectedType === 'string') {
-      onChange('');
+      setValue(name, '');
     } else if (selectedType === 'dem_builder') {
       const defaultArrayValue = {
         code: '',
@@ -3926,7 +3945,7 @@ const PropertyFiller = ({
     }
     setFillOption(selectedType);
     clearErrors(name);
-  }, [name, clearErrors, value, setFillOption, onChange, fillOption, propertyType]);
+  }, [name, clearErrors, value, setFillOption, onChange, fillOption, propertyType, setValue]);
   useEffect(() => {
     if (value === undefined) {
       onChange(null);

package/package.json

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