@react-typed-forms/schemas 15.1.3 → 16.0.0

package/lib/RenderForm.d.ts

@@ -0,0 +1,39 @@
+import { ControlRenderOptions, ControlRenderProps, FormRenderer } from "./controlRender";
+import React, { FC } from "react";
+import { ControlDefinition, FormNode, JsonPath, SchemaDataNode, SchemaField } from "@astroapps/forms-core";
+import { Control } from "@react-typed-forms/core";
+export interface RenderFormProps {
+    data: SchemaDataNode;
+    form: FormNode;
+    renderer: FormRenderer;
+    options?: ControlRenderOptions;
+}
+export declare function RenderForm({ data, form, renderer, options, }: RenderFormProps): React.ReactNode;
+/**
+ * @deprecated Use RenderForm instead.
+ */
+export declare function useControlRendererComponent(controlOrFormNode: ControlDefinition | FormNode, renderer: FormRenderer, options: ControlRenderOptions | undefined, parentDataNode: SchemaDataNode): FC<{}>;
+/**
+ * @deprecated Use RenderForm instead.
+ */
+export declare function ControlRenderer({ definition, fields, renderer, options, control, parentPath, }: {
+    definition: ControlDefinition;
+    fields: SchemaField[];
+    renderer: FormRenderer;
+    options?: ControlRenderOptions;
+    control: Control<any>;
+    parentPath?: JsonPath[];
+}): JSX.Element;
+/**
+ * @deprecated Use RenderForm instead.
+ */
+export declare function NewControlRenderer({ definition, renderer, options, parentDataNode, }: {
+    definition: ControlDefinition | FormNode;
+    renderer: FormRenderer;
+    options?: ControlRenderOptions;
+    parentDataNode: SchemaDataNode;
+}): JSX.Element;
+/**
+ * @deprecated Use RenderForm instead.
+ */
+export declare function useControlRenderer(definition: ControlDefinition, fields: SchemaField[], renderer: FormRenderer, options?: ControlRenderOptions): FC<ControlRenderProps>;

package/lib/controlBuilder.d.ts

@@ -1,9 +1,5 @@
-import { AccordionAdornment, ActionControlDefinition, AutocompleteRenderOptions, CheckListRenderOptions, ControlAdornmentType, ControlDefinition, DataControlDefinition, DataRenderType, DisplayControlDefinition, DisplayOnlyRenderOptions, DynamicProperty, GroupedControlsDefinition, JsonataRenderOptions, RadioButtonRenderOptions, RenderOptions, TextfieldRenderOptions } from "./controlDefinition";
-import { ActionRendererProps } from "./controlRender";
-import { DateValidator, JsonataValidator, LengthValidator, ValidatorType } from "./schemaValidator";
-import { SchemaField, SchemaMap } from "./schemaField";
-import { DataExpression, DataMatchExpression, EntityExpression, JsonataExpression } from "./entityExpression";
-import { SchemaNode } from "./schemaNode";
+import { AccordionAdornment, ActionControlDefinition, AutocompleteRenderOptions, CheckListRenderOptions, ControlAdornmentType, ControlDefinition, DataControlDefinition, DataExpression, DataMatchExpression, DataRenderType, DateValidator, DisplayControlDefinition, DisplayOnlyRenderOptions, DynamicProperty, EntityExpression, GroupedControlsDefinition, JsonataExpression, JsonataRenderOptions, JsonataValidator, LengthValidator, RadioButtonRenderOptions, RenderOptions, SchemaField, SchemaMap, SchemaNode, TextfieldRenderOptions, ValidatorType } from "@astroapps/forms-core";
+import { ActionRendererProps } from "./types";
 export declare function dataControl(field: string, title?: string | null, options?: Partial<DataControlDefinition>): DataControlDefinition;
 export declare function validatorOptions<A extends {
     type: string;
@@ -48,7 +44,7 @@ export declare function jsonataExpr(expression: string): JsonataExpression;
 export declare function groupedControl(children: ControlDefinition[], title?: string, options?: Partial<GroupedControlsDefinition>): GroupedControlsDefinition;
 export declare function compoundControl(field: string, title: string | undefined, children: ControlDefinition[], options?: Partial<DataControlDefinition>): DataControlDefinition;
 export declare function actionControl(actionText: string, actionId: string, options?: Partial<ActionControlDefinition>): ActionControlDefinition;
-export declare function createAction(actionId: string, onClick: () => void, actionText?: string, options?: Partial<ActionRendererProps>): ActionRendererProps;
+export declare function createAction(actionId: string, onClick: () => void, actionText?: string | null, options?: Partial<ActionRendererProps>): ActionRendererProps;
 export declare const emptyGroupDefinition: GroupedControlsDefinition;
 export declare function useControlDefinitionForSchema(sf: SchemaField[], definition?: GroupedControlsDefinition): GroupedControlsDefinition;
 export interface EditorGroup {

package/lib/controlRender.d.ts

@@ -1,14 +1,8 @@
-import React, { ComponentType, ElementType, FC, HTMLAttributes, Key, ReactElement, ReactNode } from "react";
+import React, { ComponentType, ElementType, HTMLAttributes, Key, ReactElement, ReactNode } from "react";
 import { Control } from "@react-typed-forms/core";
-import { ActionStyle, AdornmentPlacement, ArrayActionOptions, ControlActionHandler, ControlAdornment, ControlDataContext, ControlDefinition, DataControlDefinition, DisplayData, FormContextData, GroupRenderOptions, IconPlacement, IconReference, RenderOptions } from "./controlDefinition";
-import { ControlClasses, JsonPath } from "./util";
-import { EvalExpressionHook, UseEvalExpressionHook } from "./hooks";
-import { ValidationContext } from "./validators";
-import { SchemaValidator } from "./schemaValidator";
-import { FieldOption, SchemaField } from "./schemaField";
-import { FormNode } from "./formNode";
-import { SchemaInterface } from "./schemaInterface";
-import { SchemaDataNode } from "./schemaDataNode";
+import { AdornmentPlacement, ArrayActionOptions, ControlAdornment, ControlDefinition, ControlState, DataControlDefinition, DisplayData, FieldOption, FormContextOptions, FormNode, FormState, GroupRenderOptions, JsonPath, RenderOptions, SchemaDataNode, SchemaField, SchemaInterface } from "@astroapps/forms-core";
+import { ControlClasses } from "./util";
+import { ActionRendererProps, ControlActionHandler, ControlDataContext, RunExpression } from "./types";
 export interface HtmlIconProperties {
     className?: string;
     style?: React.CSSProperties;
@@ -57,6 +51,10 @@ export interface HtmlButtonProperties {
     onClick?: () => void;
     inline?: boolean;
     children?: ReactNode;
+    title?: string;
+    notWrapInText?: boolean;
+    androidRippleColor?: string;
+    nonTextContent?: boolean;
 }
 export interface HtmlComponents {
     Div: ComponentType<HtmlDivProperties>;
@@ -139,7 +137,7 @@ export interface FormRenderer {
 export interface AdornmentProps {
     adornment: ControlAdornment;
     dataContext: ControlDataContext;
-    useExpr?: UseEvalExpressionHook;
+    runExpression?: RunExpression;
     designMode?: boolean;
     formOptions: FormContextOptions;
 }
@@ -278,17 +276,18 @@ export interface DisplayRendererProps {
     style?: React.CSSProperties;
     inline?: boolean;
 }
-export type ChildVisibilityFunc = (child: ControlDefinition, parentNode?: SchemaDataNode, dontOverride?: boolean) => EvalExpressionHook<boolean>;
 export interface ParentRendererProps {
     formNode: FormNode;
+    state: ControlState;
     renderChild: ChildRenderer;
     className?: string;
     textClass?: string;
     style?: React.CSSProperties;
     dataContext: ControlDataContext;
-    useChildVisibility: ChildVisibilityFunc;
-    useEvalExpression: UseEvalExpressionHook;
+    getChildState(node: FormNode, parent?: SchemaDataNode): ControlState;
+    runExpression: RunExpression;
     designMode?: boolean;
+    actionOnClick?: ControlActionHandler;
 }
 export interface GroupRendererProps extends ParentRendererProps {
     definition: ControlDefinition;
@@ -308,85 +307,54 @@ export interface DataRendererProps extends ParentRendererProps {
     displayOnly: boolean;
     inline: boolean;
 }
-export interface ActionRendererProps {
-    actionId: string;
-    actionText: string;
-    actionData?: any;
-    actionStyle?: ActionStyle;
-    icon?: IconReference | null;
-    iconPlacement?: IconPlacement;
-    onClick: () => void;
-    className?: string | null;
-    textClass?: string | null;
-    style?: React.CSSProperties;
-    disabled?: boolean;
-    inline?: boolean;
-}
 export interface ControlRenderProps {
     control: Control<any>;
     parentPath?: JsonPath[];
 }
-export interface FormContextOptions {
-    readonly?: boolean | null;
-    hidden?: boolean | null;
-    disabled?: boolean | null;
-    displayOnly?: boolean;
-    inline?: boolean;
-}
 export type CreateDataProps = (controlProps: RenderLayoutProps, definition: DataControlDefinition, control: Control<any>) => DataRendererProps;
-export interface ControlRenderOptions extends FormContextOptions, ControlClasses {
+export interface ControlRenderOptions extends ControlClasses {
+    formState?: FormState;
     useDataHook?: (c: ControlDefinition) => CreateDataProps;
     actionOnClick?: ControlActionHandler;
     customDisplay?: (customId: string, displayProps: DisplayRendererProps) => ReactNode;
-    useValidationHook?: (validator: SchemaValidator, ctx: ValidationContext) => void;
-    useEvalExpressionHook?: UseEvalExpressionHook;
     adjustLayout?: (context: ControlDataContext, layout: ControlLayoutProps) => ControlLayoutProps;
+    readonly?: boolean | null;
+    hidden?: boolean | null;
+    disabled?: boolean | null;
+    displayOnly?: boolean;
+    inline?: boolean;
     clearHidden?: boolean;
+    stateKey?: string;
     schemaInterface?: SchemaInterface;
-    formData?: FormContextData;
+    variables?: Record<string, any>;
 }
-export declare function useControlRenderer(definition: ControlDefinition, fields: SchemaField[], renderer: FormRenderer, options?: ControlRenderOptions): FC<ControlRenderProps>;
-export declare function useControlRendererComponent(controlOrFormNode: ControlDefinition | FormNode, renderer: FormRenderer, options: ControlRenderOptions | undefined, parentDataNode: SchemaDataNode): FC<{}>;
-export declare function ControlRenderer({ definition, fields, renderer, options, control, parentPath, }: {
-    definition: ControlDefinition;
-    fields: SchemaField[];
-    renderer: FormRenderer;
-    options?: ControlRenderOptions;
-    control: Control<any>;
-    parentPath?: JsonPath[];
-}): JSX.Element;
-export declare function NewControlRenderer({ definition, renderer, options, parentDataNode, }: {
-    definition: ControlDefinition | FormNode;
-    renderer: FormRenderer;
-    options?: ControlRenderOptions;
-    parentDataNode: SchemaDataNode;
-}): JSX.Element;
-export declare function defaultDataProps({ formOptions, style, allowedOptions, schemaInterface, styleClass, textClass: tc, ...props }: RenderLayoutProps, definition: DataControlDefinition, control: Control<any>): DataRendererProps;
+export declare function defaultDataProps({ formOptions, style, allowedOptions, schemaInterface, styleClass, textClass: tc, displayOnly, inline, ...props }: RenderLayoutProps, definition: DataControlDefinition, control: Control<any>): DataRendererProps;
 export interface ChildRendererOptions {
     parentDataNode?: SchemaDataNode;
-    formData?: FormContextData;
     inline?: boolean;
     displayOnly?: boolean;
     styleClass?: string;
     layoutClass?: string;
     labelClass?: string;
+    labelTextClass?: string;
+    actionOnClick?: ControlActionHandler;
+    stateKey?: string;
+    variables?: Record<string, any>;
 }
 export type ChildRenderer = (k: Key, child: FormNode, options?: ChildRendererOptions) => ReactNode;
 export interface RenderLayoutProps {
     formNode: FormNode;
     renderer: FormRenderer;
+    state: ControlState;
     renderChild: ChildRenderer;
     createDataProps: CreateDataProps;
     formOptions: FormContextOptions;
     dataContext: ControlDataContext;
     control?: Control<any>;
-    labelText?: Control<string | null | undefined>;
-    displayControl?: Control<string | undefined>;
     style?: React.CSSProperties;
-    allowedOptions?: Control<any[] | undefined>;
-    actionDataControl?: Control<any | undefined | null>;
-    useChildVisibility: ChildVisibilityFunc;
-    useEvalExpression: UseEvalExpressionHook;
+    allowedOptions?: any[];
+    getChildState(node: FormNode, parent?: SchemaDataNode): ControlState;
+    runExpression: RunExpression;
     actionOnClick?: ControlActionHandler;
     schemaInterface?: SchemaInterface;
     designMode?: boolean;
@@ -395,6 +363,8 @@ export interface RenderLayoutProps {
     labelTextClass?: string;
     styleClass?: string;
     textClass?: string;
+    inline?: boolean;
+    displayOnly?: boolean;
 }
 export declare function renderControlLayout(props: RenderLayoutProps): ControlLayoutProps;
 type MarkupKeys = keyof Omit<RenderedLayout, "errorControl" | "style" | "className" | "wrapLayout" | "readonly" | "disabled" | "inline">;
@@ -415,5 +385,6 @@ export declare function applyArrayLengthRestrictions({ arrayControl, min, max, e
     addDisabled: boolean;
     removeDisabled: boolean;
 };
-export declare function fieldOptionAdornment(p: DataRendererProps): (o: FieldOption, i: number, selected: boolean) => JSX.Element;
+export declare function fieldOptionAdornment(p: DataRendererProps): (o: FieldOption, fieldIndex: number, selected: boolean) => JSX.Element;
+export declare function lookupChildDataContext(dataContext: ControlDataContext, c: ControlDefinition): ControlDataContext;
 export {};