@react-typed-forms/schemas 1.0.0-dev.24 → 1.0.0-dev.25

package/lib/index.js

@@ -617,7 +617,7 @@ function useDefaultValue(definition, field, formState, hooks) {
   return field.defaultValue;
 }
 function useIsControlVisible(definition, formState, hooks) {
-  var _definition$dynamic2, _ref2, _onlyForTypes$length;
+  var _definition$dynamic2, _schemaField$onlyForT;
   var visibleExpression = (_definition$dynamic2 = definition.dynamic) == null ? void 0 : _definition$dynamic2.find(function (x) {
     return x.type === exports.DynamicPropertyType.Visible;
   });
@@ -629,31 +629,26 @@ function useIsControlVisible(definition, formState, hooks) {
     };
   }
   var schemaFields = formState.fields;
-  var _useMemo = React.useMemo(function () {
-      var _ref, _formState$data$field;
-      var typeField = schemaFields.find(function (x) {
-        return isScalarField(x) && x.isTypeField;
-      });
-      var typeControl = (_ref = typeField && ((_formState$data$field = formState.data.fields) == null ? void 0 : _formState$data$field[typeField.field])) != null ? _ref : core.newControl(undefined);
-      var compoundField = isGroupControl(definition) && definition.compoundField ? formState.data.fields[definition.compoundField] : undefined;
-      return {
-        typeControl: typeControl,
-        compoundField: compoundField
-      };
-    }, [schemaFields, formState.data]),
-    typeControl = _useMemo.typeControl,
-    compoundField = _useMemo.compoundField;
+  var typeControl = React.useMemo(function () {
+    var _ref, _formState$data$field;
+    var typeField = schemaFields.find(function (x) {
+      return isScalarField(x) && x.isTypeField;
+    });
+    return (_ref = typeField && ((_formState$data$field = formState.data.fields) == null ? void 0 : _formState$data$field[typeField.field])) != null ? _ref : core.newControl(undefined);
+  }, [schemaFields, formState.data]);
   var fieldName = fieldForControl(definition);
-  var onlyForTypes = (_ref2 = fieldName ? findField(schemaFields, fieldName) : undefined) == null ? void 0 : _ref2.onlyForTypes;
-  var canChange = Boolean(compoundField || ((_onlyForTypes$length = onlyForTypes == null ? void 0 : onlyForTypes.length) != null ? _onlyForTypes$length : 0) > 0);
-  var value = (!compoundField || compoundField.value != null) && (!onlyForTypes || onlyForTypes.length === 0 || Boolean(typeControl.value && onlyForTypes.includes(typeControl.value)));
+  var schemaField = fieldName ? findField(schemaFields, fieldName) : undefined;
+  var isSingleCompoundField = schemaField && schemaField.type === exports.FieldType.Compound && !schemaField.collection;
+  var onlyForTypes = (_schemaField$onlyForT = schemaField == null ? void 0 : schemaField.onlyForTypes) != null ? _schemaField$onlyForT : [];
+  var canChange = Boolean(isSingleCompoundField || onlyForTypes.length);
+  var value = (!isSingleCompoundField || formState.data.fields[fieldName].value != null) && (!onlyForTypes.length || Boolean(typeControl.value && onlyForTypes.includes(typeControl.value)));
   return {
     value: value,
     canChange: canChange
   };
 }
 function getDefaultScalarControlProperties(definition, field, visible, defaultValue, control, formState) {
-  var _definition$renderOpt, _definition$required, _ref3, _formState$readonly;
+  var _definition$renderOpt, _definition$required, _ref2, _formState$readonly;
   return {
     definition: definition,
     field: field,
@@ -664,7 +659,7 @@ function getDefaultScalarControlProperties(definition, field, visible, defaultVa
     },
     required: (_definition$required = definition.required) != null ? _definition$required : false,
     visible: visible,
-    readonly: (_ref3 = (_formState$readonly = formState.readonly) != null ? _formState$readonly : definition.readonly) != null ? _ref3 : false,
+    readonly: (_ref2 = (_formState$readonly = formState.readonly) != null ? _formState$readonly : definition.readonly) != null ? _ref2 : false,
     control: control,
     formState: formState
   };
@@ -701,6 +696,7 @@ function createDefaultSchemaHooks() {
       case exports.ExpressionType.FieldValue:
         var fvExpr = expr;
         return core.useComputed(function () {
+          console.log(fvExpr);
           var fv = controlForField(fvExpr.field, formState).value;
           return Array.isArray(fv) ? fv.includes(fvExpr.value) : fv === fvExpr.value;
         });
@@ -721,9 +717,9 @@ function createDefaultSchemaHooks() {
           var errorMsg = useExpression(v, formState);
           core.useControlEffect(function () {
             return [isVisible, errorMsg.value];
-          }, function (_ref4) {
-            var isVisible = _ref4[0],
-              msg = _ref4[1];
+          }, function (_ref3) {
+            var isVisible = _ref3[0],
+              msg = _ref3[1];
             return control.setError(v.type + i, isVisible ? msg : null);
           }, true);
           break;