@react-typed-forms/schemas 11.4.1 → 11.5.1

package/lib/index.js

@@ -234,7 +234,7 @@ function defaultValueForFields(fields) {
     return [x.field, defaultValueForField(x)];
   }));
 }
-function defaultValueForField(sf, required) {
+function defaultValueForField(sf, required, forceNotNull) {
   if (sf.defaultValue !== undefined) return sf.defaultValue;
   var isRequired = !!(required || sf.required);
   if (isCompoundField(sf)) {
@@ -242,7 +242,7 @@ function defaultValueForField(sf, required) {
       var childValue = defaultValueForFields(sf.children);
       return sf.collection ? [childValue] : childValue;
     }
-    return sf.notNullable ? sf.collection ? [] : {} : undefined;
+    return sf.notNullable || forceNotNull ? sf.collection ? [] : {} : undefined;
   }
   if (sf.collection) {
     return [];
@@ -988,7 +988,7 @@ function useEvalDefaultValueHook(useEvalExpressionHook, definition, schemaField,
       var _ref4 = isDataControlDefinition(definition) ? [definition.required, definition.defaultValue] : [false, undefined],
         required = _ref4[0],
         dcv = _ref4[1];
-      return dcv != null ? dcv : schemaField ? element ? elementValueForField(schemaField) : defaultValueForField(schemaField, required) : undefined;
+      return dcv != null ? dcv : schemaField ? element ? elementValueForField(schemaField) : defaultValueForField(schemaField, required, true) : undefined;
     }
   }, {
     definition: definition,
@@ -1387,28 +1387,32 @@ function useControlRenderer(definition, fields, renderer, options) {
         control = _getControlData[1],
         controlDataContext = _getControlData[2];
       core.useControlEffect(function () {
-        return [visibility.value, defaultValueControl.value, control, isDataControlDefinition(definition) && definition.dontClearHidden, parentControl.isNull, _options.hidden];
+        return [visibility.value, defaultValueControl.value, control == null ? void 0 : control.isNull, isDataControlDefinition(definition) && definition.dontClearHidden, parentControl.isNull, _options.hidden, readonlyControl.value];
       }, function (_ref2) {
         var vc = _ref2[0],
           dv = _ref2[1],
-          cd = _ref2[2],
+          _ = _ref2[2],
           dontClear = _ref2[3],
           parentNull = _ref2[4],
-          hidden = _ref2[5];
-        if (vc && cd && vc.visible === vc.showing) {
-          if (hidden || !vc.visible) {
-            if (_options.clearHidden && !dontClear) {
-              cd.value = undefined;
+          hidden = _ref2[5],
+          ro = _ref2[6];
+        if (!ro) {
+          if (control) {
+            if (vc && vc.visible === vc.showing) {
+              if (hidden || !vc.visible) {
+                if (_options.clearHidden && !dontClear) {
+                  control.value = undefined;
+                }
+              } else control.setValue(function (x) {
+                return x ? x : dv;
+              });
             }
-          } else if (cd.value == null) {
-            cd.value = dv;
+          } else if (parentNull) {
+            parentControl.setValue(function (x) {
+              return x != null ? x : {};
+            });
           }
         }
-        if (parentNull) {
-          parentControl.setValue(function (x) {
-            return x != null ? x : {};
-          });
-        }
       }, true);
       var myOptions = core.useCalculatedControl(function () {
         var _visibility$fields;
@@ -1436,6 +1440,9 @@ function useControlRenderer(definition, fields, renderer, options) {
         renderer: renderer,
         renderChild: function renderChild(k, child, options) {
           var _options$dataContext;
+          if (control && control.isNull) return /*#__PURE__*/React__default["default"].createElement(React.Fragment, {
+            key: k
+          });
           var dataContext = (_options$dataContext = options == null ? void 0 : options.dataContext) != null ? _options$dataContext : controlDataContext;
           return /*#__PURE__*/React__default["default"].createElement(ControlRenderer, {
             key: k,
@@ -2331,15 +2338,13 @@ function createCheckboxRenderer(options) {
       return _extends({}, p, {
         label: undefined,
         children: /*#__PURE__*/React__default["default"].createElement("div", {
-          className: rendererClass(props.className, options.className)
-        }, /*#__PURE__*/React__default["default"].createElement("div", {
-          className: options.entryClass
+          className: rendererClass(props.className, options.entryClass)
         }, /*#__PURE__*/React__default["default"].createElement(core.Fcheckbox, {
           id: props.id,
           control: props.control,
           style: props.style,
           className: options.checkClass
-        }), p.label && renderer.renderLabel(p.label, undefined, undefined)))
+        }), p.label && renderer.renderLabel(p.label, undefined, undefined))
       });
     };
   }, {