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

package/lib/types.d.ts

@@ -259,7 +259,4 @@ export interface ControlVisitor<A> {
     action(d: ActionControlDefinition): A;
 }
 export declare function visitControlDefinition<A>(x: ControlDefinition, visitor: ControlVisitor<A>, defaultValue: (c: ControlDefinition) => A): A;
-export declare function dataControl(field: string, options?: Partial<DataControlDefinition>): DataControlDefinition;
-export declare function fieldValueExpr(field: string, value: any): FieldValueExpression;
-export declare function visibility(expr: EntityExpression): DynamicProperty;
 export declare function isGridRenderer(options: GroupRenderOptions): options is GridRenderer;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@react-typed-forms/schemas",
-	"version": "1.0.0-dev.22",
+	"version": "1.0.0-dev.24",
 	"description": "",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
@@ -24,13 +24,13 @@
 		"material-ui"
 	],
 	"dependencies": {
-		"@react-typed-forms/core": "^3.0.0-dev.116",
+		"@react-typed-forms/core": "^3.0.0-dev.117",
 		"clsx": "^1 || ^2",
 		"jsonata": "^2.0.3",
 		"react": "^18.2.0"
 	},
 	"devDependencies": {
-		"@react-typed-forms/transform": "^0.1.0",
+		"@react-typed-forms/transform": "^0.2.0",
 		"@types/react": "^18.2.28",
 		"markdown-magic": "^2.6.1",
 		"microbundle": "^0.15.1",

package/src/controlBuilder.ts

@@ -0,0 +1,55 @@
+import {
+  ControlDefinitionType,
+  DataControlDefinition,
+  DisplayControlDefinition,
+  DisplayDataType,
+  DynamicProperty,
+  DynamicPropertyType,
+  EntityExpression,
+  ExpressionType,
+  FieldValueExpression,
+  HtmlDisplay,
+  JsonataExpression,
+  TextDisplay,
+} from "./types";
+
+export function dataControl(
+  field: string,
+  title?: string | null,
+  options?: Partial<DataControlDefinition>,
+): DataControlDefinition {
+  return { type: ControlDefinitionType.Data, field, title, ...options };
+}
+
+export function textDisplayControl(
+  text: string,
+  options?: Partial<DisplayControlDefinition>,
+): DisplayControlDefinition {
+  return {
+    type: ControlDefinitionType.Display,
+    displayData: { type: DisplayDataType.Text, text } as TextDisplay,
+    ...options,
+  };
+}
+
+export function htmlDisplayControl(
+  html: string,
+  options?: Partial<DisplayControlDefinition>,
+): DisplayControlDefinition {
+  return {
+    type: ControlDefinitionType.Display,
+    displayData: { type: DisplayDataType.Html, html } as HtmlDisplay,
+    ...options,
+  };
+}
+
+export function visibility(expr: EntityExpression): DynamicProperty {
+  return { type: DynamicPropertyType.Visible, expr };
+}
+
+export function fieldEqExpr(field: string, value: any): FieldValueExpression {
+  return { type: ExpressionType.FieldValue, field, value };
+}
+export function jsonataExpr(expression: string): JsonataExpression {
+  return { type: ExpressionType.Jsonata, expression };
+}

package/src/controlRender.tsx

@@ -33,7 +33,7 @@ export interface SchemaHooks {
   ): Control<any | undefined>;
   useValidators(
     formState: FormEditState,
-    isVisible: boolean,
+    isVisible: boolean | undefined,
     control: Control<any>,
     required: boolean,
     validations?: SchemaValidator[] | null,
@@ -137,7 +137,7 @@ export interface FormRenderer {
 }
 
 export interface Visibility {
-  value: boolean;
+  value: boolean | undefined;
   canChange: boolean;
 }
 export interface LabelRendererProps {

package/src/hooks.tsx

@@ -84,7 +84,7 @@ export function useIsControlVisible(
       formState,
     ).value;
     return {
-      value: Boolean(exprValue),
+      value: exprValue,
       canChange: true,
     };
   }
@@ -170,6 +170,7 @@ export function createDefaultSchemaHooks(): SchemaHooks {
           async (v) => {
             control.value = await compiledExpr.evaluate(v);
           },
+          true,
         );
         return control;
       case ExpressionType.FieldValue:
@@ -187,7 +188,7 @@ export function createDefaultSchemaHooks(): SchemaHooks {
 
   function useValidators(
     formState: FormEditState,
-    isVisible: boolean,
+    isVisible: boolean | undefined,
     control: Control<any>,
     required: boolean,
     validators?: SchemaValidator[] | null,
@@ -196,7 +197,9 @@ export function createDefaultSchemaHooks(): SchemaHooks {
       useValidator(
         control,
         (v) =>
-          isVisible && (v == null || v == "") ? "Please enter a value" : null,
+          isVisible === true && (v == null || v === "")
+            ? "Please enter a value"
+            : null,
         "required",
       );
     validators?.forEach((v, i) => {
@@ -276,7 +279,7 @@ export function createFormEditHooks(schemaHooks: SchemaHooks): FormEditHooks {
       const scalarControl = formState.data.fields[field.field];
 
       useEffect(() => {
-        if (!isVisible) scalarControl.value = null;
+        if (isVisible === false) scalarControl.value = null;
         else if (scalarControl.current.value == null) {
           scalarControl.value = defaultValue;
         }
@@ -331,7 +334,7 @@ export function createFormEditHooks(schemaHooks: SchemaHooks): FormEditHooks {
       const newFs: RenderControlOptions = {
         ...fs,
         fields: field ? field.children : fs.fields,
-        invisible: !visible.value || fs.invisible,
+        invisible: visible.value === false || fs.invisible,
       };
       const data = field ? fs.data.fields[field.field] : fs.data;
       const groupProps = {
@@ -419,7 +422,7 @@ function defaultArrayRendererProps(
   };
 }
 
-const emptyGroupDefinition: GroupedControlsDefinition = {
+export const emptyGroupDefinition: GroupedControlsDefinition = {
   type: ControlDefinitionType.Group,
   children: [],
   groupOptions: { type: GroupRenderType.Standard, hideTitle: true },
@@ -428,12 +431,12 @@ const emptyGroupDefinition: GroupedControlsDefinition = {
 export function useControlDefinitionForSchema(
   sf: SchemaField[],
   definition: GroupedControlsDefinition = emptyGroupDefinition,
-) {
-  return useMemo(
-    () =>
-      definition.children.length
-        ? definition
-        : { ...definition, children: addMissingControls(sf, []) },
+): GroupedControlsDefinition {
+  return useMemo<GroupedControlsDefinition>(
+    () => ({
+      ...definition,
+      children: addMissingControls(sf, definition.children),
+    }),
     [sf, definition],
   );
 }

package/src/index.ts

@@ -1,5 +1,6 @@
 export * from "./types";
 export * from "./schemaBuilder";
+export * from "./controlBuilder";
 export * from "./controlRender";
 export * from "./hooks";
 export * from "./util";

package/src/types.ts

@@ -352,25 +352,6 @@ export function visitControlDefinition<A>(
       return defaultValue(x);
   }
 }
-
-export function dataControl(
-  field: string,
-  options?: Partial<DataControlDefinition>,
-): DataControlDefinition {
-  return { type: ControlDefinitionType.Data, field, ...options };
-}
-
-export function fieldValueExpr(
-  field: string,
-  value: any,
-): FieldValueExpression {
-  return { type: ExpressionType.FieldValue, field, value };
-}
-
-export function visibility(expr: EntityExpression): DynamicProperty {
-  return { type: DynamicPropertyType.Visible, expr };
-}
-
 export function isGridRenderer(
   options: GroupRenderOptions,
 ): options is GridRenderer {