@dartech/arsenal-ui 1.3.95 → 1.3.96

package/index.js

@@ -1047,15 +1047,25 @@ const ControlAceEditor = /*#__PURE__*/forwardRef((_a, ref) => {
       parseValue
     } = _a,
     otherProps = __rest(_a, ["control", "name", "mode", "label", "width", "height", "readOnly", "required", "validateJson", "hideErrorMessage", "fontSize", "validate", "parseValue"]);
-  const {
-    setError,
-    clearErrors
-  } = useFormContext();
   const _b = useController({
       control,
       name,
       rules: {
-        required: required && 'Please, fill this field'
+        required: required && 'Please, fill this field',
+        validate: val => {
+          console.log('_____', val);
+          if (val && validateJson) {
+            try {
+              JSON.parse(val);
+              return true;
+              // clearErrors(name);
+            } catch (error) {
+              console.error(error);
+              return 'Invalid JSON';
+            }
+          }
+          return true;
+        }
       }
     }),
     _c = _b.field,
@@ -1070,30 +1080,13 @@ const ControlAceEditor = /*#__PURE__*/forwardRef((_a, ref) => {
         error
       }
     } = _b;
+  console.log(error);
   const extensions = useMemo(() => ({
     json: [langs.json()],
     javascript: [langs.javascript()],
     python: [langs.python()]
   }), []);
   const handleChange = useCallback(value => {
-    if (!value && required) {
-      setError(name, {
-        message: 'Required field'
-      });
-    } else {
-      clearErrors(name);
-    }
-    if (validateJson) {
-      try {
-        JSON.parse(value);
-        clearErrors(name);
-      } catch (error) {
-        console.error(error);
-        setError(name, {
-          message: 'Invalid JSON'
-        });
-      }
-    }
     if (parseValue) {
       try {
         const val = JSON.parse(value);
@@ -1104,7 +1097,7 @@ const ControlAceEditor = /*#__PURE__*/forwardRef((_a, ref) => {
     } else {
       onChange(value);
     }
-  }, [setError, clearErrors, onChange, name, parseValue, validateJson, required]);
+  }, [onChange, parseValue]);
   return jsxs(Box, Object.assign({
     display: "flex",
     flexDirection: "column",
@@ -3684,14 +3677,12 @@ const PropertyAdditionalFields = ({
 };
 
 const StringValueField = ({
+  control,
   name,
   label,
   required,
   restrictedValues
 }) => {
-  const {
-    control
-  } = useFormContext();
   const {
     field: {
       onChange,
@@ -3910,6 +3901,7 @@ const PropertyWidget = ({
       });
     case PropertyType.STRING:
       return jsx(StringValueField$1, {
+        control: control,
         name: name,
         label: label,
         restrictedValues: property.restrictedValues
@@ -3923,7 +3915,8 @@ const PropertyWidget = ({
       } else {
         return jsx(StringValueField$1, {
           name: name,
-          label: label
+          label: label,
+          control: control
         });
       }
     case PropertyType.FILE:
@@ -3938,7 +3931,8 @@ const PropertyWidget = ({
       } else {
         return jsx(StringValueField$1, {
           name: name,
-          label: label
+          label: label,
+          control: control
         });
       }
     case PropertyType.ANY:
@@ -5168,8 +5162,10 @@ const CreatePropertiesList = /*#__PURE__*/forwardRef(({
     control,
     setValue,
     getValues,
-    reset
+    reset,
+    trigger
   } = useForm({
+    mode: 'all',
     defaultValues: {
       properties
     }
@@ -5196,8 +5192,6 @@ const CreatePropertiesList = /*#__PURE__*/forwardRef(({
       }
     }
   });
-  // console.log(watch());
-  // const properties = useWatch({ control, name: fieldName });
   const refs = useRef([]);
   const handleAddParameter = useCallback(() => {
     append(defaultPropertyValues);

package/package.json

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

package/src/lib/Property/UpsertProperty/PropertyValueField/BooleanValueField.d.ts

@@ -1,7 +1,8 @@
-/// <reference types="react" />
+import { Control } from 'react-hook-form';
 type Props = {
+    control: Control<any>;
     name: string;
     label?: string;
 };
-declare const BooleanValueField: ({ name, label }: Props) => JSX.Element;
+declare const BooleanValueField: ({ name, label, control }: Props) => JSX.Element;
 export default BooleanValueField;

package/src/lib/Property/UpsertProperty/PropertyValueField/DateTimeValueField.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 type Props = {
     name: string;
     label?: string;

package/src/lib/Property/UpsertProperty/PropertyValueField/DateValueField.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 type Props = {
     name: string;
     format: string;

package/src/lib/Property/UpsertProperty/PropertyValueField/JsonValueField.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 type Props = {
     name: string;
     label?: string;

package/src/lib/Property/UpsertProperty/PropertyValueField/StringValueField.d.ts

@@ -1,10 +1,12 @@
 /// <reference types="react" />
+import { Control } from 'react-hook-form';
 type Props = {
+    control: Control<any>;
     name: string;
     label?: string;
     required?: boolean;
     restrictedValues?: string[];
     urlValidate?: boolean;
 };
-declare const StringValueField: ({ name, label, required, restrictedValues, }: Props) => JSX.Element;
+declare const StringValueField: ({ control, name, label, required, restrictedValues, }: Props) => JSX.Element;
 export default StringValueField;

package/src/lib/Property/UpsertProperty/PropertyValueField/TimeValueField.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 type Props = {
     name: string;
     label?: string;

package/src/lib/Property/ViewProperty/PropertyItem.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PropertyUnion } from '../../../interfaces';
 type PropertyItemProps = {
     property: PropertyUnion;