@dartech/arsenal-ui 1.3.60 → 1.3.62

package/index.js

@@ -241,18 +241,15 @@ const ControlInput = _a => {
     _d = _c.field,
     {
       ref,
-      onChange
+      onChange,
+      value
     } = _d,
-    fieldProps = __rest(_d, ["ref", "onChange"]),
+    fieldProps = __rest(_d, ["ref", "onChange", "value"]),
     {
       fieldState: {
         error
       }
     } = _c;
-  const value = useWatch({
-    control,
-    name
-  });
   return jsx(TextField, Object.assign({}, fieldProps, {
     fullWidth: true,
     size: "small",
@@ -431,18 +428,15 @@ const ControlSelect = _a => {
     _d = _c.field,
     {
       ref,
-      onChange
+      onChange,
+      value
     } = _d,
-    fieldProps = __rest(_d, ["ref", "onChange"]),
+    fieldProps = __rest(_d, ["ref", "onChange", "value"]),
     {
       fieldState: {
         error
       }
     } = _c;
-  const value = useWatch({
-    control,
-    name
-  });
   const getValue = useCallback(option => {
     if (typeof option === 'string') return option;
     return valueKey ? option[valueKey] : option.value;
@@ -538,18 +532,15 @@ const ControlCheckbox = _a => {
     _c = _b.field,
     {
       ref,
-      onChange
+      onChange,
+      value
     } = _c,
-    fieldProps = __rest(_c, ["ref", "onChange"]),
+    fieldProps = __rest(_c, ["ref", "onChange", "value"]),
     {
       fieldState: {
         error
       }
     } = _b;
-  const value = useWatch({
-    control,
-    name
-  });
   const checked = useMemo(() => {
     if (typeof value === 'boolean') {
       return value;
@@ -617,19 +608,15 @@ const ControlRadio = ({
     }),
     _b = _a.field,
     {
-      ref,
       onChange
     } = _b,
-    fieldProps = __rest(_b, ["ref", "onChange"]),
+    fieldProps = __rest(_b, ["onChange"]),
     {
       fieldState: {
         error
       }
     } = _a;
-  const value = useWatch({
-    control,
-    name
-  });
+  // const value = useWatch({ control, name });
   const getValue = useCallback(option => {
     if (typeof option === 'string') return option;
     return valueKey ? option[valueKey] : option.value;
@@ -649,9 +636,6 @@ const ControlRadio = ({
     })), jsx(RadioGroup, Object.assign({}, fieldProps, {
       row: row,
       "aria-labelledby": "radio-buttons-group",
-      ref: ref,
-      name: name,
-      value: value,
       onChange: customOnChange ? customOnChange : onChange
     }, {
       children: _values.map((item, i) => jsx(FormControlLabel, {
@@ -726,28 +710,26 @@ const ControlAutocomplete = _a => {
       disableCloseOnSelect
     } = _a,
     autocompleteProps = __rest(_a, ["control", "validate", "name", "label", "required", "defaultValue", "disabled", "hideErrorMessage", "onChange", "labelKey", "valueKey", "options", "multiple", "textFieldProps", "disableCloseOnSelect"]);
-  const {
-    field: {
+  const _b = useController({
+      name,
+      control,
+      defaultValue: defaultValue || (multiple ? [] : null),
+      rules: {
+        required: required && 'Please, fill this field',
+        validate
+      }
+    }),
+    _c = _b.field,
+    {
       ref,
       onChange
-    },
-    fieldState: {
-      error
-    }
-  } = useController({
-    name,
-    control,
-    defaultValue,
-    rules: {
-      required: required && 'Please, fill this field',
-      validate
-    }
-  });
-  const formValue = useWatch({
-    control,
-    name,
-    defaultValue: multiple ? [] : null
-  });
+    } = _c,
+    fieldProps = __rest(_c, ["ref", "onChange"]),
+    {
+      fieldState: {
+        error
+      }
+    } = _b;
   const {
     getOptionLabel,
     isOptionEqualToValue,
@@ -759,7 +741,7 @@ const ControlAutocomplete = _a => {
   const handleChange = (_, value) => {
     onChange(value);
   };
-  return jsx(Autocomplete, Object.assign({
+  return jsx(Autocomplete, Object.assign({}, fieldProps, {
     fullWidth: true,
     disablePortal: true,
     size: "small",
@@ -770,7 +752,6 @@ const ControlAutocomplete = _a => {
     isOptionEqualToValue: isOptionEqualToValue,
     disableCloseOnSelect: disableCloseOnSelect || multiple,
     filterSelectedOptions: multiple,
-    value: formValue,
     onChange: customOnChange ? customOnChange : handleChange,
     renderOption: renderOption,
     renderInput: params => {
@@ -816,28 +797,29 @@ function ControlQueryAutocomplete(_a) {
       itemQueryFunction
     } = _a,
     autocompleteProps = __rest(_a, ["name", "label", "control", "required", "searchBy", "labelKey", "multiple", "disabled", "valueKey", "sortBy", "hideErrorMessage", "disableCloseOnSelect", "textFieldProps", "onChange", "queryFunction", "validate", "itemQueryFunction"]);
-  const {
-    field: {
+  const _b = useController({
+      control,
+      name,
+      defaultValue: multiple ? [] : null,
+      rules: {
+        required: required && 'Please, fill this field',
+        validate
+      }
+    }),
+    _c = _b.field,
+    {
       ref,
-      onChange: setFieldValue
-    },
-    fieldState: {
-      error,
-      isDirty
-    }
-  } = useController({
-    control,
-    name,
-    rules: {
-      required: required && 'Please, fill this field',
-      validate
-    }
-  });
-  const formValue = useWatch({
-    control,
-    name,
-    defaultValue: multiple ? [] : null
-  });
+      onChange: setFieldValue,
+      value: formValue
+    } = _c,
+    fieldProps = __rest(_c, ["ref", "onChange", "value"]),
+    {
+      fieldState: {
+        error,
+        isDirty
+      }
+    } = _b;
+  // const formValue = useWatch({ control, name, defaultValue:  });
   const {
     getOptionLabel,
     isOptionEqualToValue,
@@ -913,7 +895,7 @@ function ControlQueryAutocomplete(_a) {
       setTotalItems(data.totalItems);
     }
   }, [data]);
-  return jsx(Autocomplete, Object.assign({
+  return jsx(Autocomplete, Object.assign({}, fieldProps, {
     fullWidth: true,
     disablePortal: true,
     size: "small",
@@ -1056,25 +1038,25 @@ const ControlAceEditor = /*#__PURE__*/forwardRef((_a, ref) => {
     setError,
     clearErrors
   } = useFormContext();
-  const {
-    field: {
+  const _b = useController({
+      control,
+      name,
+      rules: {
+        required: required && 'Please, fill this field'
+      }
+    }),
+    _c = _b.field,
+    {
       onChange,
+      value,
       ref: formRef
-    },
-    fieldState: {
-      error
-    }
-  } = useController({
-    control,
-    name,
-    rules: {
-      required: required && 'Please, fill this field'
-    }
-  });
-  const value = useWatch({
-    control,
-    name
-  });
+    } = _c,
+    fieldProps = __rest(_c, ["onChange", "value", "ref"]),
+    {
+      fieldState: {
+        error
+      }
+    } = _b;
   const extensions = useMemo(() => ({
     json: [langs.json()],
     javascript: [langs.javascript()],
@@ -1093,6 +1075,7 @@ const ControlAceEditor = /*#__PURE__*/forwardRef((_a, ref) => {
         JSON.parse(value);
         clearErrors(name);
       } catch (error) {
+        console.error(error);
         setError(name, {
           message: 'Invalid JSON'
         });
@@ -1108,7 +1091,7 @@ const ControlAceEditor = /*#__PURE__*/forwardRef((_a, ref) => {
     } else {
       onChange(value);
     }
-  }, [setError, clearErrors, onChange, required, name, parseValue, validateJson]);
+  }, [setError, clearErrors, onChange, name, parseValue, validateJson, required]);
   return jsxs(Box, Object.assign({
     display: "flex",
     flexDirection: "column",
@@ -1132,7 +1115,7 @@ const ControlAceEditor = /*#__PURE__*/forwardRef((_a, ref) => {
         }) : label
       }))
     }), jsxs(Fragment, {
-      children: [jsx(CodeMirror, Object.assign({
+      children: [jsx(CodeMirror, Object.assign({}, fieldProps, {
         ref: ref || formRef,
         basicSetup: {
           autocompletion: true,
@@ -1958,13 +1941,10 @@ const ControlSwitch = _a => {
     }).field,
     {
       ref,
-      onChange
+      onChange,
+      value
     } = _b,
-    fieldProps = __rest(_b, ["ref", "onChange"]);
-  const value = useWatch({
-    control,
-    name
-  });
+    fieldProps = __rest(_b, ["ref", "onChange", "value"]);
   const checked = useMemo(() => {
     if (typeof value === 'boolean') {
       return value;
@@ -2156,18 +2136,15 @@ const ControlTime = ({
     _b = _a.field,
     {
       onChange,
-      ref
+      ref,
+      value
     } = _b,
-    fieldProps = __rest(_b, ["onChange", "ref"]),
+    fieldProps = __rest(_b, ["onChange", "ref", "value"]),
     {
       fieldState: {
         error
       }
     } = _a;
-  const value = useWatch({
-    control,
-    name
-  });
   const [fieldValue, setFieldValue] = useState(null);
   const handleChange = date => {
     setFieldValue(date);
@@ -3596,53 +3573,6 @@ const PropertyAdditionalFields = ({
   }
 };
 
-const JsonEditor = /*#__PURE__*/forwardRef(({
-  validate: _validate = false,
-  name,
-  useParsedValue
-}, ref) => {
-  const {
-    control,
-    setValue,
-    setError,
-    clearErrors
-  } = useFormContext();
-  const value = useWatch({
-    control,
-    name
-  });
-  const handleChange = value => {
-    try {
-      if (value) setValue(name, useParsedValue ? JSON.parse(value) : value);
-      clearErrors(name);
-    } catch (e) {
-      if (_validate) setError(name, {
-        message: 'Invalid JSON'
-      });
-    }
-  };
-  return jsx(CodeMirror, {
-    ref: ref,
-    basicSetup: {
-      autocompletion: true,
-      history: true
-    },
-    theme: abcdef,
-    width: "100%",
-    height: "200px",
-    style: {
-      fontSize: 14,
-      lineHeight: 1.4,
-      zIndex: 0,
-      isolation: 'isolate'
-    },
-    value: typeof value !== 'string' ? value === null ? '' : JSON.stringify(value) : value,
-    onChange: handleChange,
-    extensions: [langs.json()]
-  });
-});
-var JsonEditor$1 = JsonEditor;
-
 const StringValueField = ({
   name,
   label,
@@ -3704,21 +3634,20 @@ const StringValueField = ({
 };
 var StringValueField$1 = StringValueField;
 
-const PropertyWidget = /*#__PURE__*/forwardRef(({
+const PropertyWidget = ({
   property,
   name,
   label,
-  useExpression
-}, ref) => {
-  const {
-    control
-  } = useFormContext();
+  useExpression,
+  control
+}) => {
   const propertyType = useMemo(() => typeof property.propertyType === 'string' ? property.propertyType : property['propertyType']['value'], [property]);
   switch (propertyType) {
     case PropertyType.BIG_DECIMAL:
     case PropertyType.FLOAT:
     case PropertyType.DOUBLE:
       return jsx(ControlNumberInput, {
+        required: true,
         decimal: true,
         hideErrorMessage: true,
         control: control,
@@ -3729,10 +3658,8 @@ const PropertyWidget = /*#__PURE__*/forwardRef(({
     case PropertyType.INTEGER:
     case PropertyType.BIG_INTEGER:
     case PropertyType.LONG:
-      return jsx(ControlNumberInput
-      // required
-      , {
-        // required
+      return jsx(ControlNumberInput, {
+        required: true,
         hideErrorMessage: true,
         control: control,
         name: name,
@@ -3778,12 +3705,15 @@ const PropertyWidget = /*#__PURE__*/forwardRef(({
         format: property.format
       });
     case PropertyType.JSON:
-      return jsx(JsonEditor$1, {
-        validate: true,
+      return jsx(ControlAceEditor, {
+        control: control,
         name: name,
-        ref: ref,
-        useParsedValue: true
+        label: label,
+        parseValue: true,
+        hideErrorMessage: true,
+        validateJson: true
       });
+    // return <JsonEditor validate name={name} ref={ref} useParsedValue />;
     case PropertyType.STRING:
       return jsx(StringValueField$1
       // required={!property.isRequired}
@@ -3802,9 +3732,11 @@ const PropertyWidget = /*#__PURE__*/forwardRef(({
         control: control
       });
     case PropertyType.ANY:
-      return jsx(JsonEditor$1, {
+      return jsx(ControlAceEditor, {
+        control: control,
         name: name,
-        ref: ref
+        hideErrorMessage: true,
+        label: label
       });
     case PropertyType.ENTITY:
       return jsx(DefinitionFiller, {
@@ -3817,7 +3749,7 @@ const PropertyWidget = /*#__PURE__*/forwardRef(({
         children: "No widget"
       });
   }
-});
+};
 
 const usePropertyFiller = ({
   value,
@@ -3845,31 +3777,36 @@ const usePropertyFiller = ({
     useExpression: _useExpression
   }), [_useExpression, _required, propertyType, _multipleOptions]);
   const defaultProperyValue = useMemo(() => {
-    if (property.isRequired || property.isMultiple) {
-      switch (propertyType) {
-        case PropertyType.STRING:
-        case PropertyType.DATE:
-        case PropertyType.TIME:
-        case PropertyType.DATE_TIME:
-        case PropertyType.ENTITY_REFERENCE:
-        case PropertyType.ANY:
-          return '';
-        case PropertyType.JSON:
-          return {};
-        case PropertyType.BOOLEAN:
-          return true;
-        case PropertyType.INTEGER:
-        case PropertyType.BIG_DECIMAL:
-        case PropertyType.BIG_INTEGER:
-        case PropertyType.DOUBLE:
-        case PropertyType.LONG:
-        case PropertyType.FLOAT:
-          return 0;
-        default:
-          return {};
-      }
-    } else return null;
-  }, [propertyType, property]);
+    switch (propertyType) {
+      case PropertyType.STRING:
+      case PropertyType.DATE:
+      case PropertyType.TIME:
+      case PropertyType.DATE_TIME:
+      case PropertyType.ENTITY_REFERENCE:
+      case PropertyType.ANY:
+        return '';
+      case PropertyType.JSON:
+        return {};
+      case PropertyType.BOOLEAN:
+        return true;
+      case PropertyType.INTEGER:
+      case PropertyType.BIG_DECIMAL:
+      case PropertyType.BIG_INTEGER:
+      case PropertyType.DOUBLE:
+      case PropertyType.LONG:
+      case PropertyType.FLOAT:
+        return 0;
+      default:
+        return {};
+    }
+  }, [propertyType]);
+  const checkFillOption = useCallback(() => {
+    if (isExpression(value) && fillOption !== 'expression') {
+      setFillOption('expression');
+    } else if (value !== null && value !== undefined && !isExpression(value) && fillOption !== 'widget') {
+      setFillOption('widget');
+    }
+  }, [value, fillOption]);
   useEffect(() => {
     if (!fillOption) {
       if (isPropertyValueEmpty(value) && (fillOptions === null || fillOptions === void 0 ? void 0 : fillOptions.length)) {
@@ -3880,13 +3817,9 @@ const usePropertyFiller = ({
         setFillOption('widget');
       }
     } else if (!isDirty) {
-      if (isExpression(value) && fillOption !== 'expression') {
-        setFillOption('expression');
-      } else if (value !== null && value !== undefined && !isExpression(value) && fillOption !== 'widget') {
-        setFillOption('widget');
-      }
+      checkFillOption();
     }
-  }, [value, fillOption, fillOptions, _useExpression, isDirty]);
+  }, [value, fillOption, fillOptions, _useExpression, isDirty, checkFillOption]);
   return {
     propertyType,
     valueLabel,
@@ -3894,7 +3827,8 @@ const usePropertyFiller = ({
     fillOption,
     fillOptions,
     setFillOption,
-    defaultProperyValue
+    defaultProperyValue,
+    checkFillOption
   };
 };
 var usePropertyFiller$1 = usePropertyFiller;
@@ -3923,8 +3857,6 @@ const PropertyFiller = ({
   } = useFormContext();
   const {
     field: {
-      ref,
-      onChange,
       value
     },
     fieldState: {
@@ -3966,7 +3898,7 @@ const PropertyFiller = ({
           properties: propertiesArrayToObject(value.property || [])
         });
         try {
-          onChange(JSON.stringify(definitionValue, null, '\t'));
+          setValue(name, JSON.stringify(definitionValue, null, '\t'));
         } catch (error) {
           console.log('Stringify failed', error);
         }
@@ -3974,7 +3906,7 @@ const PropertyFiller = ({
         setValue(name, property.defaultValue || defaultProperyValue);
       }
     } else if (selectedType === 'expression' || selectedType === 'string') {
-      onChange('');
+      setValue(name, '');
     } else if (selectedType === 'dem_builder') {
       const defaultArrayValue = {
         code: '',
@@ -3986,22 +3918,27 @@ const PropertyFiller = ({
         try {
           const definitionValue = JSON.parse(value);
           definitionValue['properties'] = propertiesObjectToArray(definitionValue['properties'] || {});
-          onChange(definitionValue);
+          setValue(name, definitionValue);
         } catch (error) {
-          onChange(defaultArrayValue);
+          setValue(name, defaultArrayValue);
           // console.log('Parse failed');
         }
       } else {
-        onChange(defaultArrayValue);
+        setValue(name, defaultArrayValue);
       }
     }
     clearErrors();
-  }, [name, defaultProperyValue, clearErrors, value, setFillOption, onChange, fillOption, propertyType, setValue, property]);
+  }, [name, defaultProperyValue, clearErrors, value, setFillOption, fillOption, propertyType, setValue, property]);
   useEffect(() => {
-    if (value === undefined) {
-      onChange(property.defaultValue || defaultProperyValue);
+    if (!isDirty && property.defaultValue) {
+      setValue(name, property.defaultValue);
     }
-  }, [value, onChange, defaultProperyValue, property]);
+  }, [isDirty, property, name, setValue]);
+  useEffect(() => {
+    if (property.isRequired && !value) {
+      setValue(name, defaultProperyValue);
+    }
+  }, [value, setValue, defaultProperyValue, property, name, isDirty]);
   return jsxs(Grid$1, Object.assign({
     xs: 12
   }, {
@@ -4038,10 +3975,15 @@ const PropertyFiller = ({
           }), option.value))
         }))]
       }))
-    })) : null, fillOption === 'expression' && (propertyType === PropertyType.JSON || propertyType === PropertyType.ENTITY || propertyType === PropertyType.ANY ? jsx(JsonEditor$1, {
+    })) : null, fillOption === 'expression' && (propertyType === PropertyType.JSON || propertyType === PropertyType.ENTITY || propertyType === PropertyType.ANY ?
+    // <JsonEditor validate name={name} useParsedValue />
+    jsx(ControlAceEditor, {
       name: name,
-      ref: ref,
-      useParsedValue: true
+      control: control,
+      label: valueLabel,
+      parseValue: true,
+      validateJson: true,
+      hideErrorMessage: true
     }) : jsx(ControlInput, {
       control: control,
       name: name,
@@ -4054,15 +3996,19 @@ const PropertyFiller = ({
       label: valueLabel,
       required: true,
       hideErrorMessage: true
-    }), fillOption === 'json_notvalid' && jsx(JsonEditor$1, {
+    }), fillOption === 'json_notvalid' &&
+    // <JsonEditor validate name={name} />
+    jsx(ControlAceEditor, {
       name: name,
-      ref: ref
+      control: control,
+      label: valueLabel,
+      hideErrorMessage: true
     }), fillOption === 'widget' && jsx(PropertyWidget, {
+      control: control,
       property: property,
       name: name,
       useExpression: useExpression,
       label: valueLabel,
-      ref: ref,
       required: required
     }), fillOption === 'dem_builder' && jsx(CreateDefinition, {
       title: "JSON",
@@ -4075,6 +4021,53 @@ const PropertyFiller = ({
   }));
 };
 
+const JsonEditor = /*#__PURE__*/forwardRef(({
+  validate: _validate = false,
+  name,
+  useParsedValue
+}, ref) => {
+  const {
+    control,
+    setValue,
+    setError,
+    clearErrors
+  } = useFormContext();
+  const value = useWatch({
+    control,
+    name
+  });
+  const handleChange = value => {
+    try {
+      if (value) setValue(name, useParsedValue ? JSON.parse(value) : value);
+      clearErrors(name);
+    } catch (e) {
+      if (_validate) setError(name, {
+        message: 'Invalid JSON'
+      });
+    }
+  };
+  return jsx(CodeMirror, {
+    ref: ref,
+    basicSetup: {
+      autocompletion: true,
+      history: true
+    },
+    theme: abcdef,
+    width: "100%",
+    height: "200px",
+    style: {
+      fontSize: 14,
+      lineHeight: 1.4,
+      zIndex: 0,
+      isolation: 'isolate'
+    },
+    value: typeof value !== 'string' ? value === null ? '' : JSON.stringify(value) : value,
+    onChange: handleChange,
+    extensions: [langs.json()]
+  });
+});
+var JsonEditor$1 = JsonEditor;
+
 const MultiplePropertyWidget = ({
   name,
   property,
@@ -4166,6 +4159,8 @@ const MultiplePropertyFiller = ({
   label,
   title
 }) => {
+  var _a;
+  const [selectTouched, setSelectTouched] = useState(false);
   const {
     control,
     clearErrors,
@@ -4174,7 +4169,8 @@ const MultiplePropertyFiller = ({
   const {
     field: {
       ref,
-      onChange
+      onChange,
+      value
     },
     fieldState: {
       error,
@@ -4183,7 +4179,7 @@ const MultiplePropertyFiller = ({
   } = useController({
     control,
     name,
-    defaultValue: property.defaultValue,
+    defaultValue: (_a = property.defaultValue) !== null && _a !== void 0 ? _a : [],
     rules: {
       validate: val => {
         if (required && !val) return 'Please, fill this field';
@@ -4191,17 +4187,14 @@ const MultiplePropertyFiller = ({
       }
     }
   });
-  const value = useWatch({
-    control,
-    name
-  });
   const {
     propertyType,
     valueLabel,
     fillOptionLabel,
     fillOption,
     fillOptions,
-    setFillOption
+    setFillOption,
+    checkFillOption
   } = usePropertyFiller$1({
     property,
     value,
@@ -4212,23 +4205,28 @@ const MultiplePropertyFiller = ({
     multipleOptions: true
   });
   const handleFillOptionChange = event => {
+    setSelectTouched(true);
     const selectedType = event.target.value;
     if (selectedType === 'null') {
       setValue(name, null);
     } else if (selectedType === 'expression' || selectedType === 'json_valid' || selectedType === 'json_notvalid') {
       onChange('');
     } else if (selectedType === 'widget') {
-      console.log('WiDGET??');
       onChange([]);
     }
     setFillOption(selectedType);
     clearErrors(name);
   };
   useEffect(() => {
-    if (value === undefined) {
+    if (!value) {
       onChange(property.isRequired ? [] : null);
     }
   }, [value, property, onChange]);
+  useEffect(() => {
+    if (value && !selectTouched) {
+      checkFillOption();
+    }
+  }, [checkFillOption, selectTouched, value]);
   return jsxs(Grid$1, {
     children: [title && jsx(Box, Object.assign({
       mb: 2
@@ -4328,7 +4326,7 @@ const PropertyValueField = ({
     const typeValue = typeof propertyType === 'string' ? propertyType : propertyType.value;
     return {
       name: _label,
-      isRequired,
+      isRequired: required !== null && required !== void 0 ? required : isRequired,
       isMultiple,
       format,
       restrictedValues,
@@ -4341,7 +4339,7 @@ const PropertyValueField = ({
       uiSettings: null,
       validationNode: null
     };
-  }, [propertyType, format, restrictedValues, isMultiple, _label, isRequired, properties]);
+  }, [propertyType, format, restrictedValues, isMultiple, _label, isRequired, properties, required]);
   return isMultiple ? jsx(MultiplePropertyFiller, {
     name: name,
     property: fillerProperty,

package/package.json

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

package/src/lib/Property/PropertyFiller/usePropertyFiller.d.ts

@@ -21,5 +21,6 @@ declare const usePropertyFiller: ({ value, property, label, isDirty, required, u
     }[];
     setFillOption: import("react").Dispatch<import("react").SetStateAction<PropertyFillType>>;
     defaultProperyValue: {};
+    checkFillOption: () => void;
 };
 export default usePropertyFiller;

package/src/lib/Property/PropertyWidget/PropertyWidget.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="react" />
+import { Control } from 'react-hook-form';
 import { PropertyUnion } from '../../../interfaces';
 type Props = {
     property: PropertyUnion;
@@ -6,6 +7,7 @@ type Props = {
     label?: string;
     useExpression?: boolean;
     required?: boolean;
+    control: Control<any>;
 };
-export declare const PropertyWidget: import("react").ForwardRefExoticComponent<Props & import("react").RefAttributes<any>>;
+export declare const PropertyWidget: ({ property, name, label, useExpression, control }: Props) => JSX.Element;
 export default PropertyWidget;

package/src/lib/Property/UpsertProperty/index.d.ts

@@ -1,2 +1,3 @@
 export * from './CreatePropertiesList';
 export * from './CreatePropertyFormFields';
+export * from './PropertyValueField';

package/src/lib/Property/index.d.ts

@@ -1,5 +1,4 @@
 export * from './UpsertProperty';
-export * from './PropertyValueField';
 export * from './ViewProperty';
 export * from './ViewPropertiesList';
 export * from './PropertyFiller';