@react-typed-forms/schemas 16.0.0 → 16.0.2

package/lib/index.js

@@ -597,6 +597,9 @@ function getNullToggler(c) {
       c.value = currentNotNull ? lastDefined.current.value : null;
       c.disabled = !currentNotNull;
     }, ControlChange.Value);
+    c.subscribe(() => {
+      notNull.value = c.current.value != null;
+    }, ControlChange.Value);
     return notNull;
     function disableIfNotEditing() {
       notNull.disabled = isEditing.current.value === false;
@@ -632,6 +635,20 @@ function getIsEditing(control) {
 function getAllValues(control) {
   return ensureMetaValue(control, "$allValues", () => newControl([control.value]));
 }
+function clearMultiValues(dataNode) {
+  const c = dataNode.control;
+  const sf = dataNode.schema.field;
+  if (sf.collection) {
+    return;
+  } else if (isCompoundField(sf)) {
+    dataNode.schema.getChildNodes().forEach(c => {
+      clearMultiValues(dataNode.getChild(c));
+    });
+  } else {
+    const allValues = getAllValues(c);
+    allValues.setValue(x => [c.current.value]);
+  }
+}
 function applyValues(dataNode, value) {
   const c = dataNode.control;
   const sf = dataNode.schema.field;
@@ -650,7 +667,10 @@ function applyValues(dataNode, value) {
 }
 function collectDifferences(dataNode, values) {
   values.forEach((v, i) => {
-    if (i == 0) dataNode.control.setInitialValue(v);else applyValues(dataNode, v);
+    if (i == 0) {
+      dataNode.control.setInitialValue(v);
+      clearMultiValues(dataNode);
+    } else applyValues(dataNode, v);
   });
   const allEdits = [];
   resetMultiValues(dataNode);
@@ -1495,7 +1515,8 @@ function RenderForm({
       var _options$formState;
       return (_options$formState = options == null ? void 0 : options.formState) != null ? _options$formState : createFormState(schemaInterface);
     });
-    const state = formState.getControlState(data, form, options);
+    const effects = [];
+    const state = formState.getControlState(data, form, options, cb => effects.push(cb));
     useEffect(() => {
       if (!(options != null && options.formState)) {
         return () => formState.cleanup();
@@ -1581,7 +1602,7 @@ function RenderForm({
       textClass: textClass,
       getChildState(child, parent) {
         var _ref3;
-        return formState.getControlState((_ref3 = parent != null ? parent : state.dataNode) != null ? _ref3 : data, child, childOptions);
+        return formState.getControlState((_ref3 = parent != null ? parent : state.dataNode) != null ? _ref3 : data, child, childOptions, cb => effects.push(cb));
       },
       runExpression: (scope, expr, returnResult) => {
         if (expr != null && expr.type) {
@@ -1589,7 +1610,8 @@ function RenderForm({
             scope,
             dataNode: data,
             schemaInterface,
-            returnResult
+            returnResult,
+            runAsync: cb => effects.push(cb)
           });
         }
       }
@@ -1600,9 +1622,13 @@ function RenderForm({
       style: state.layoutStyle
     });
     const renderedControl = renderer.renderLayout((_options$adjustLayout = options.adjustLayout == null ? void 0 : options.adjustLayout(dataContext, layoutProps)) != null ? _options$adjustLayout : layoutProps);
-    return renderer.renderVisibility(_extends({
+    const rendered = renderer.renderVisibility(_extends({
       visibility
     }, renderedControl));
+    useEffect(() => {
+      effects.forEach(cb => cb());
+    }, [effects]);
+    return rendered;
   } finally {
     _effect();
   }
@@ -1691,5 +1717,5 @@ function useControlRenderer(definition, fields, renderer, options = {}) {
   }, [r]);
 }
 
-export { AppendAdornmentPriority, ControlRenderer, LabelType, NewControlRenderer, RenderForm, WrapAdornmentPriority, accordionOptions, actionControl, actionHandlers, addMissingControls, addMissingControlsForSchema, adornmentOptions, appendMarkup, appendMarkupAt, applyArrayLengthRestrictions, applyDefaultForField, applyDefaultValues, applyExtensionToSchema, applyExtensionsToSchema, applyLengthRestrictions, applyValues, autocompleteOptions, checkListOptions, cleanDataForSchema, coerceToString, collectDifferences, compoundControl, controlTitle, createAction, createActionRenderer, createAdornmentRenderer, createArrayActions, createArrayRenderer, createDataRenderer, createDisplayRenderer, createFormRenderer, createGroupRenderer, createLabelRenderer, createLayoutRenderer, createVisibilityRenderer, dataControl, dateValidatorOptions, deepMerge, defaultControlForField, defaultDataProps, defaultValueForField, defaultValueForFields, displayOnlyOptions, dynamicDefaultValue, dynamicDisabled, dynamicReadonly, dynamicVisibility, elementValueForField, emptyGroupDefinition, fieldDisplayName, fieldEqExpr, fieldExpr, fieldHasTag, fieldOptionAdornment, findChildDefinition, findCompoundField, findControlsForCompound, findFieldPath, findNonDataGroups, findScalarField, getAllReferencedClasses, getAllValues, getDiffObject, getExternalEditData, getGroupClassOverrides, getIsEditing, getLastDefinedValue, getLengthRestrictions, getNullToggler, getOverrideClass, groupedControl, hasOptions, htmlDisplayControl, isAccordionAdornment, isIconAdornment, isOptionalAdornment, isSetFieldAdornment, jsonataExpr, jsonataOptions, jsonataValidatorOptions, layoutKeyForPlacement, lengthValidatorOptions, lookupChildDataContext, mergeObjects, radioButtonOptions, renderControlLayout, renderLayoutParts, renderOptionsFor, rendererClass, textDisplayControl, textfieldOptions, useControlDefinitionForSchema, useControlRenderer, useControlRendererComponent, useExpression, useUpdatedRef, validationVisitor, validatorOptions, wrapLayout, wrapMarkup, wrapMarkupAt };
+export { AppendAdornmentPriority, ControlRenderer, LabelType, NewControlRenderer, RenderForm, WrapAdornmentPriority, accordionOptions, actionControl, actionHandlers, addMissingControls, addMissingControlsForSchema, adornmentOptions, appendMarkup, appendMarkupAt, applyArrayLengthRestrictions, applyDefaultForField, applyDefaultValues, applyExtensionToSchema, applyExtensionsToSchema, applyLengthRestrictions, applyValues, autocompleteOptions, checkListOptions, cleanDataForSchema, clearMultiValues, coerceToString, collectDifferences, compoundControl, controlTitle, createAction, createActionRenderer, createAdornmentRenderer, createArrayActions, createArrayRenderer, createDataRenderer, createDisplayRenderer, createFormRenderer, createGroupRenderer, createLabelRenderer, createLayoutRenderer, createVisibilityRenderer, dataControl, dateValidatorOptions, deepMerge, defaultControlForField, defaultDataProps, defaultValueForField, defaultValueForFields, displayOnlyOptions, dynamicDefaultValue, dynamicDisabled, dynamicReadonly, dynamicVisibility, elementValueForField, emptyGroupDefinition, fieldDisplayName, fieldEqExpr, fieldExpr, fieldHasTag, fieldOptionAdornment, findChildDefinition, findCompoundField, findControlsForCompound, findFieldPath, findNonDataGroups, findScalarField, getAllReferencedClasses, getAllValues, getDiffObject, getExternalEditData, getGroupClassOverrides, getIsEditing, getLastDefinedValue, getLengthRestrictions, getNullToggler, getOverrideClass, groupedControl, hasOptions, htmlDisplayControl, isAccordionAdornment, isIconAdornment, isOptionalAdornment, isSetFieldAdornment, jsonataExpr, jsonataOptions, jsonataValidatorOptions, layoutKeyForPlacement, lengthValidatorOptions, lookupChildDataContext, mergeObjects, radioButtonOptions, renderControlLayout, renderLayoutParts, renderOptionsFor, rendererClass, textDisplayControl, textfieldOptions, useControlDefinitionForSchema, useControlRenderer, useControlRendererComponent, useExpression, useUpdatedRef, validationVisitor, validatorOptions, wrapLayout, wrapMarkup, wrapMarkupAt };
 //# sourceMappingURL=index.js.map