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

package/lib/controlBuilder.d.ts

@@ -1,7 +1,9 @@
-import { DataControlDefinition, DisplayControlDefinition, DynamicProperty, EntityExpression, FieldValueExpression, JsonataExpression } from "./types";
+import { ControlDefinition, DataControlDefinition, DisplayControlDefinition, DynamicProperty, EntityExpression, FieldValueExpression, GroupedControlsDefinition, JsonataExpression } from "./types";
 export declare function dataControl(field: string, title?: string | null, options?: Partial<DataControlDefinition>): DataControlDefinition;
 export declare function textDisplayControl(text: string, options?: Partial<DisplayControlDefinition>): DisplayControlDefinition;
 export declare function htmlDisplayControl(html: string, options?: Partial<DisplayControlDefinition>): DisplayControlDefinition;
+export declare function dynamicDefaultValue(expr: EntityExpression): DynamicProperty;
 export declare function visibility(expr: EntityExpression): DynamicProperty;
 export declare function fieldEqExpr(field: string, value: any): FieldValueExpression;
 export declare function jsonataExpr(expression: string): JsonataExpression;
+export declare function compoundControl(compoundField: string, title: string | undefined, children: ControlDefinition[], options?: Partial<GroupedControlsDefinition>): GroupedControlsDefinition;

package/lib/hooks.d.ts

@@ -1,7 +1,7 @@
 import { ControlDefinition, DataControlDefinition, FieldOption, GroupedControlsDefinition, SchemaField } from "./types";
 import { DataRendererProps, FormEditHooks, FormEditState, SchemaHooks, Visibility } from "./controlRender";
 import { Control } from "@react-typed-forms/core";
-export declare function useDefaultValue(definition: DataControlDefinition, field: SchemaField, formState: FormEditState, hooks: SchemaHooks): any;
+export declare function useDefaultValue(definition: ControlDefinition, field: SchemaField, formState: FormEditState, hooks: SchemaHooks): any;
 export declare function useIsControlVisible(definition: ControlDefinition, formState: FormEditState, hooks: SchemaHooks): Visibility;
 export declare function getDefaultScalarControlProperties(definition: DataControlDefinition, field: SchemaField, visible: Visibility, defaultValue: any, control: Control<any>, formState: FormEditState): DataRendererProps;
 export declare function getOptionsForScalarField(field: SchemaField): FieldOption[] | undefined | null;

package/lib/index.js

@@ -282,6 +282,12 @@ function htmlDisplayControl(html, options) {
     }
   }, options);
 }
+function dynamicDefaultValue(expr) {
+  return {
+    type: exports.DynamicPropertyType.DefaultValue,
+    expr: expr
+  };
+}
 function visibility(expr) {
   return {
     type: exports.DynamicPropertyType.Visible,
@@ -301,6 +307,18 @@ function jsonataExpr(expression) {
     expression: expression
   };
 }
+function compoundControl(compoundField, title, children, options) {
+  return _extends({
+    type: exports.ControlDefinitionType.Group,
+    compoundField: compoundField,
+    children: children,
+    title: title,
+    groupOptions: {
+      type: "Standard",
+      hideTitle: !title
+    }
+  }, options);
+}
 
 function applyDefaultValues(v, fields) {
   if (!v) return defaultValueForFields(fields);
@@ -607,17 +625,17 @@ function visitControlData(definition, _ref6, cb) {
 }
 
 function useDefaultValue(definition, field, formState, hooks) {
-  var _definition$dynamic;
+  var _definition$dynamic, _ref;
   var valueExpression = (_definition$dynamic = definition.dynamic) == null ? void 0 : _definition$dynamic.find(function (x) {
     return x.type === exports.DynamicPropertyType.DefaultValue;
   });
   if (valueExpression) {
     return hooks.useExpression(valueExpression.expr, formState).value;
   }
-  return field.defaultValue;
+  return (_ref = isDataControlDefinition(definition) ? definition.defaultValue : undefined) != null ? _ref : 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,24 +647,19 @@ 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 _ref2, _formState$data$field;
+    var typeField = schemaFields.find(function (x) {
+      return isScalarField(x) && x.isTypeField;
+    });
+    return (_ref2 = typeField && ((_formState$data$field = formState.data.fields) == null ? void 0 : _formState$data$field[typeField.field])) != null ? _ref2 : 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
@@ -801,6 +814,15 @@ function createFormEditHooks(schemaHooks) {
       var _definition$groupOpti;
       var visible = useIsControlVisible(definition, fs, schemaHooks);
       var field = definition.compoundField ? findCompoundField(fs.fields, definition.compoundField) : undefined;
+      var defaultValue = field && useDefaultValue(definition, field, fs, schemaHooks);
+      var dataControl = field && fs.data.fields[field.field];
+      var isVisible = visible.value && !fs.invisible;
+      React.useEffect(function () {
+        if (!dataControl) return;
+        if (isVisible === false) dataControl.value = null;else if (dataControl.current.value == null) {
+          dataControl.value = defaultValue;
+        }
+      }, [dataControl, isVisible, defaultValue]);
       var newFs = _extends({}, fs, {
         fields: field ? field.children : fs.fields,
         invisible: visible.value === false || fs.invisible
@@ -1547,6 +1569,7 @@ exports.applyDefaultForField = applyDefaultForField;
 exports.applyDefaultValues = applyDefaultValues;
 exports.boolField = boolField;
 exports.buildSchema = buildSchema;
+exports.compoundControl = compoundControl;
 exports.compoundField = compoundField;
 exports.controlForField = controlForField;
 exports.controlTitle = controlTitle;
@@ -1579,6 +1602,7 @@ exports.defaultScalarField = defaultScalarField;
 exports.defaultTailwindTheme = defaultTailwindTheme;
 exports.defaultValueForField = defaultValueForField;
 exports.defaultValueForFields = defaultValueForFields;
+exports.dynamicDefaultValue = dynamicDefaultValue;
 exports.elementValueForField = elementValueForField;
 exports.emptyGroupDefinition = emptyGroupDefinition;
 exports.fieldDisplayName = fieldDisplayName;