@dartech/arsenal-ui 1.4.5 → 1.4.7

package/index.js

@@ -1054,8 +1054,7 @@ const ControlAceEditor = /*#__PURE__*/forwardRef((_a, ref) => {
       rules: {
         required: required && 'Please, fill this field',
         validate: val => {
-          console.log('_____', val);
-          if (val && validateJson) {
+          if (val && validateJson && typeof val === 'string') {
             try {
               JSON.parse(val);
               return true;
@@ -1112,7 +1111,7 @@ const ControlAceEditor = /*#__PURE__*/forwardRef((_a, ref) => {
         }
       }, {
         children: required ? jsxs(Fragment, {
-          children: [label, " ", jsx(Box, Object.assign({
+          children: [label, ' ', jsx(Box, Object.assign({
             component: "span",
             color: "#D6331F"
           }, {
@@ -2552,9 +2551,10 @@ const ControlPhoneInput = _a => {
       name,
       label,
       required,
-      mask = '+7 (799) 999 99 99'
+      mask = '+7 (799) 999 99 99',
+      inputMaskProps
     } = _a,
-    textFieldProps = __rest(_a, ["control", "name", "label", "required", "mask"]);
+    textFieldProps = __rest(_a, ["control", "name", "label", "required", "mask", "inputMaskProps"]);
   return jsx(Controller, {
     control: control,
     name: name,
@@ -2573,8 +2573,11 @@ const ControlPhoneInput = _a => {
         error
       }
     }) => jsx(InputMask, Object.assign({
-      mask: mask
-    }, field, {
+      mask: mask,
+      value: field.value,
+      onChange: field.onChange,
+      onBlur: field.onBlur
+    }, inputMaskProps, {
       children: jsx(TextField, Object.assign({
         fullWidth: true,
         size: "small",
@@ -5816,11 +5819,12 @@ const PropertyFiller = ({
   const {
     control,
     clearErrors,
-    setValue,
-    watch
+    setValue
   } = useFormContext();
   const {
-    // field: { value },
+    field: {
+      value
+    },
     fieldState: {
       error,
       isDirty
@@ -5835,11 +5839,6 @@ const PropertyFiller = ({
       }
     }
   });
-  // const value = watch(name);
-  const value = useWatch({
-    control,
-    name
-  });
   const prevValueRef = useRef({});
   const {
     propertyType,
@@ -5913,26 +5912,22 @@ const PropertyFiller = ({
     clearErrors();
   }, [name, defaultProperyValue, clearErrors, value, setFillOption, fillOption, propertyType, setValue, property]);
   useEffect(() => {
-    if (!isDirty && (property.defaultValue || property.value) && isPropertyValueEmpty(value)) {
-      setValue(name, property.defaultValue || property.value, {
-        shouldDirty: true
-      });
+    var _a;
+    if (!isDirty && isPropertyValueEmpty(value)) {
+      if (property.isRequired && (property.defaultValue === null || property.value === null)) {
+        setValue(name, (_a = prevValueRef.current[fillOption]) !== null && _a !== void 0 ? _a : defaultProperyValue);
+      } else if (!property.isRequired && (property.defaultValue === null || property.value === null)) {
+        setValue(name, null);
+      } else if (!(isPropertyValueEmpty(property.defaultValue) || isPropertyValueEmpty(property.value))) {
+        setValue(name, property.defaultValue || property.value);
+      }
     }
-  }, [isDirty, property, name, setValue, value, required]);
+  }, [value, setValue, defaultProperyValue, property, name, fillOption, isDirty]);
   useEffect(() => {
-    var _a;
-    if (
-    // value === undefined ||
-    property.isRequired && isPropertyValueEmpty(value) && (property.defaultValue === null || property.value === null)) {
-      setValue(name, (_a = prevValueRef.current[fillOption]) !== null && _a !== void 0 ? _a : defaultProperyValue, {
-        shouldDirty: true
-      });
-    } else if ((value === undefined || value === null) && !property.isRequired && (property.defaultValue === null || property.value === null)) {
-      setValue(name, null, {
-        shouldDirty: true
-      });
+    if (!isPropertyValueEmpty(value) && property.propertyType !== PropertyType.JSON) {
+      setValue(name, value);
     }
-  }, [value, setValue, defaultProperyValue, property, name, fillOption]);
+  }, [name, setValue, value, property]);
   return jsxs(Grid, Object.assign({
     xs: 12
   }, {

package/package.json

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

package/src/lib/Forms/ControlPhoneInput.d.ts

@@ -1,12 +1,14 @@
 import { ReactNode } from 'react';
 import { TextFieldProps } from '@mui/material/TextField';
 import { Control } from 'react-hook-form';
+import { Props as InputMaskProps } from 'react-input-mask';
 type Props = TextFieldProps & {
     control: Control<any>;
     name: string;
     required?: boolean;
     mask?: string;
     label?: ReactNode;
+    inputMaskProps?: InputMaskProps;
 };
-export declare const ControlPhoneInput: ({ control, name, label, required, mask, ...textFieldProps }: Props) => JSX.Element;
+export declare const ControlPhoneInput: ({ control, name, label, required, mask, inputMaskProps, ...textFieldProps }: Props) => JSX.Element;
 export default ControlPhoneInput;