@react-typed-forms/schemas 11.0.3 → 11.1.0

package/lib/index.js

@@ -417,6 +417,9 @@ function useUpdatedRef(a) {
 function isControlReadonly(c) {
   return isDataControl(c) && !!c.readonly;
 }
+function isControlDisabled(c) {
+  return isDataControl(c) && !!c.disabled;
+}
 function getDisplayOnlyOptions(d) {
   return isDataControlDefinition(d) && d.renderOptions && isDisplayOnlyRenderer(d.renderOptions) ? d.renderOptions : undefined;
 }
@@ -490,17 +493,17 @@ function lookupChildControlPath(data, jsonPath) {
   var childPath = [].concat(data.path, jsonPath);
   return watchControlLookup(data.data, childPath);
 }
-function cleanDataForSchema(v, fields) {
+function cleanDataForSchema(v, fields, removeIfDefault) {
   if (!v) return v;
   var typeField = fields.find(function (x) {
     return x.isTypeField;
   });
   if (!typeField) return v;
   var typeValue = v[typeField.field];
-  var cleanableFields = fields.filter(function (x) {
+  var cleanableFields = !removeIfDefault ? fields.filter(function (x) {
     var _x$onlyForTypes$lengt, _x$onlyForTypes;
     return isCompoundField(x) || ((_x$onlyForTypes$lengt = (_x$onlyForTypes = x.onlyForTypes) == null ? void 0 : _x$onlyForTypes.length) != null ? _x$onlyForTypes$lengt : 0) > 0;
-  });
+  }) : fields;
   if (!cleanableFields.length) return v;
   var out = _extends({}, v);
   cleanableFields.forEach(function (x) {
@@ -515,15 +518,15 @@ function cleanDataForSchema(v, fields) {
       if (x.collection) {
         if (Array.isArray(childValue)) {
           out[x.field] = childValue.map(function (cv) {
-            return cleanDataForSchema(cv, childFields);
+            return cleanDataForSchema(cv, childFields, removeIfDefault);
           });
         }
       } else {
-        out[x.field] = cleanDataForSchema(childValue, childFields);
+        out[x.field] = cleanDataForSchema(childValue, childFields, removeIfDefault);
       }
     }
     function canBeNull() {
-      return x.collection && Array.isArray(childValue) && !childValue.length
+      return removeIfDefault && x.defaultValue === childValue || x.collection && Array.isArray(childValue) && !childValue.length
       //|| (x.type === FieldType.Bool && childValue === false)
       ;
     }
@@ -957,7 +960,9 @@ function useEvalAllowedOptionsHook(useEvalExpressionHook, definition) {
 function useEvalDisabledHook(useEvalExpressionHook, definition) {
   var dynamicDisabled = useEvalDynamicBoolHook(definition, exports.DynamicPropertyType.Disabled, useEvalExpressionHook);
   return makeDynamicPropertyHook(dynamicDisabled, function () {
-    return core.useControl(false);
+    return core.useComputed(function () {
+      return isControlDisabled(definition);
+    });
   }, undefined);
 }
 function useEvalDisplayHook(useEvalExpressionHook, definition) {
@@ -2806,6 +2811,7 @@ exports.htmlDisplayControl = htmlDisplayControl;
 exports.intField = intField;
 exports.isActionControlsDefinition = isActionControlsDefinition;
 exports.isCompoundField = isCompoundField;
+exports.isControlDisabled = isControlDisabled;
 exports.isControlReadonly = isControlReadonly;
 exports.isDataControl = isDataControl;
 exports.isDataControlDefinition = isDataControlDefinition;