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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@react-typed-forms/schemas",
-	"version": "1.0.0-dev.24",
+	"version": "1.0.0-dev.26",
 	"description": "",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",

package/src/controlBuilder.ts

@@ -1,4 +1,5 @@
 import {
+  ControlDefinition,
   ControlDefinitionType,
   DataControlDefinition,
   DisplayControlDefinition,
@@ -8,6 +9,7 @@ import {
   EntityExpression,
   ExpressionType,
   FieldValueExpression,
+  GroupedControlsDefinition,
   HtmlDisplay,
   JsonataExpression,
   TextDisplay,
@@ -43,6 +45,9 @@ export function htmlDisplayControl(
   };
 }
 
+export function dynamicDefaultValue(expr: EntityExpression): DynamicProperty {
+  return { type: DynamicPropertyType.DefaultValue, expr };
+}
 export function visibility(expr: EntityExpression): DynamicProperty {
   return { type: DynamicPropertyType.Visible, expr };
 }
@@ -53,3 +58,19 @@ export function fieldEqExpr(field: string, value: any): FieldValueExpression {
 export function jsonataExpr(expression: string): JsonataExpression {
   return { type: ExpressionType.Jsonata, expression };
 }
+
+export function compoundControl(
+  compoundField: string,
+  title: string | undefined,
+  children: ControlDefinition[],
+  options?: Partial<GroupedControlsDefinition>,
+): GroupedControlsDefinition {
+  return {
+    type: ControlDefinitionType.Group,
+    compoundField,
+    children,
+    title,
+    groupOptions: { type: "Standard", hideTitle: !title },
+    ...options,
+  };
+}

package/src/hooks.tsx

@@ -13,6 +13,7 @@ import {
   FieldValueExpression,
   GroupedControlsDefinition,
   GroupRenderType,
+  isDataControlDefinition,
   JsonataExpression,
   SchemaField,
   SchemaValidator,
@@ -51,12 +52,12 @@ import {
   elementValueForField,
   findCompoundField,
   findField,
-  isGroupControl,
   isScalarField,
 } from "./util";
+import { FieldType } from "./types";
 
 export function useDefaultValue(
-  definition: DataControlDefinition,
+  definition: ControlDefinition,
   field: SchemaField,
   formState: FormEditState,
   hooks: SchemaHooks,
@@ -67,7 +68,11 @@ export function useDefaultValue(
   if (valueExpression) {
     return hooks.useExpression(valueExpression.expr, formState).value;
   }
-  return field.defaultValue;
+  return (
+    (isDataControlDefinition(definition)
+      ? definition.defaultValue
+      : undefined) ?? field.defaultValue
+  );
 }
 
 export function useIsControlVisible(
@@ -90,30 +95,29 @@ export function useIsControlVisible(
   }
   const schemaFields = formState.fields;
 
-  const { typeControl, compoundField } = useMemo(() => {
+  const typeControl = useMemo(() => {
     const typeField = schemaFields.find(
       (x) => isScalarField(x) && x.isTypeField,
     ) as SchemaField | undefined;
 
-    const typeControl = ((typeField &&
-      formState.data.fields?.[typeField.field]) ??
+    return ((typeField && formState.data.fields?.[typeField.field]) ??
       newControl(undefined)) as Control<string | undefined>;
-    const compoundField =
-      isGroupControl(definition) && definition.compoundField
-        ? formState.data.fields[definition.compoundField]
-        : undefined;
-    return { typeControl, compoundField };
   }, [schemaFields, formState.data]);
 
   const fieldName = fieldForControl(definition);
-  const onlyForTypes = (
-    fieldName ? findField(schemaFields, fieldName) : undefined
-  )?.onlyForTypes;
-  const canChange = Boolean(compoundField || (onlyForTypes?.length ?? 0) > 0);
+  const schemaField = fieldName
+    ? findField(schemaFields, fieldName)
+    : undefined;
+  const isSingleCompoundField =
+    schemaField &&
+    schemaField.type === FieldType.Compound &&
+    !schemaField.collection;
+  const onlyForTypes = schemaField?.onlyForTypes ?? [];
+  const canChange = Boolean(isSingleCompoundField || onlyForTypes.length);
   const value =
-    (!compoundField || compoundField.value != null) &&
-    (!onlyForTypes ||
-      onlyForTypes.length === 0 ||
+    (!isSingleCompoundField ||
+      formState.data.fields[fieldName!].value != null) &&
+    (!onlyForTypes.length ||
       Boolean(typeControl.value && onlyForTypes.includes(typeControl.value)));
   return { value, canChange };
 }
@@ -331,6 +335,20 @@ export function createFormEditHooks(schemaHooks: SchemaHooks): FormEditHooks {
       const field = definition.compoundField
         ? findCompoundField(fs.fields, definition.compoundField)
         : undefined;
+
+      const defaultValue =
+        field && useDefaultValue(definition, field, fs, schemaHooks);
+      const dataControl = field && fs.data.fields[field.field];
+      const isVisible = visible.value && !fs.invisible;
+
+      useEffect(() => {
+        if (!dataControl) return;
+        if (isVisible === false) dataControl.value = null;
+        else if (dataControl.current.value == null) {
+          dataControl.value = defaultValue;
+        }
+      }, [dataControl, isVisible, defaultValue]);
+
       const newFs: RenderControlOptions = {
         ...fs,
         fields: field ? field.children : fs.fields,