@react-typed-forms/schemas 16.2.2 → 17.0.0

package/src/renderers.tsx

@@ -16,8 +16,11 @@ import {
 } from "./controlRender";
 import {
   AccordionAdornment,
+  ChildNodeSpec,
+  ChildResolverFunc,
   ControlAdornment,
   ControlAdornmentType,
+  FormStateNode,
   IconAdornment,
   OptionalAdornment,
   RenderOptions,
@@ -53,11 +56,12 @@ export interface DataRendererRegistration {
   renderType?: string | string[];
   options?: boolean;
   collection?: boolean;
-  match?: (props: DataRendererProps, renderOptions: RenderOptions) => boolean;
+  match?: (props: FormStateNode, renderOptions: RenderOptions) => boolean;
   render: (
     props: DataRendererProps,
     renderers: FormRenderer,
   ) => ReactNode | ((layout: ControlLayoutProps) => ControlLayoutProps);
+  resolveChildren?: ChildResolverFunc;
 }
 
 export interface LabelRendererRegistration {
@@ -75,6 +79,7 @@ export interface ActionRendererRegistration {
   type: "action";
   actionType?: string | string[];
   render: (props: ActionRendererProps, renderers: FormRenderer) => ReactElement;
+  resolveChildren?: ChildResolverFunc;
 }
 
 export interface ArrayRendererRegistration {
@@ -89,6 +94,7 @@ export interface GroupRendererRegistration {
     props: GroupRendererProps,
     renderers: FormRenderer,
   ) => ReactElement | ((layout: ControlLayoutProps) => ControlLayoutProps);
+  resolveChildren?: ChildResolverFunc;
 }
 
 export interface DisplayRendererRegistration {
@@ -98,6 +104,7 @@ export interface DisplayRendererRegistration {
     props: DisplayRendererProps,
     renderers: FormRenderer,
   ) => ReactElement;
+  resolveChildren?: ChildResolverFunc;
 }
 
 export interface AdornmentRendererRegistration {

package/src/types.ts

@@ -6,9 +6,10 @@ import {
   IconReference,
   SchemaDataNode,
   SchemaInterface,
+  ControlDisableType,
 } from "@astroapps/forms-core";
 import React, { Key, ReactNode } from "react";
-import { CleanupScope } from "@react-typed-forms/core";
+import { ChangeListenerFunc, CleanupScope } from "@react-typed-forms/core";
 
 /**
  * Interface representing the control data context.
@@ -17,14 +18,22 @@ export interface ControlDataContext {
   schemaInterface: SchemaInterface;
   dataNode: SchemaDataNode | undefined;
   parentNode: SchemaDataNode;
-  variables: Record<string, any>;
 }
+export interface ControlActionContext {
+  disableForm(disable: ControlDisableType): void;
+  runAction(action: string, actionData?: any): void | Promise<any>;
+}
+
+export const NoOpControlActionContext: ControlActionContext = {
+  disableForm(disable: ControlDisableType) {},
+  runAction(actionId: string, actionData?: any): void | Promise<any> {},
+};
 
 export type ControlActionHandler = (
   actionId: string,
   actionData: any,
-  ctx: ControlDataContext,
-) => (() => void) | undefined;
+  dataContext: ControlDataContext,
+) => ((actionContext: ControlActionContext) => void | Promise<any>) | undefined;
 
 export interface ActionRendererProps {
   key?: Key;
@@ -42,11 +51,12 @@ export interface ActionRendererProps {
   disabled?: boolean;
   hidden?: boolean;
   inline?: boolean;
+  busy?: boolean;
 }
 
 export type RunExpression = (
   scope: CleanupScope,
   expression: EntityExpression,
   returnResult: (v: unknown) => void,
-  bindings?: FormContextData,
+  variables?: (changes: ChangeListenerFunc<any>) => Record<string, any>,
 ) => void;

package/src/util.ts

@@ -35,6 +35,7 @@ import {
 import { MutableRefObject, useRef } from "react";
 import clsx from "clsx";
 import {
+  ChangeListenerFunc,
   Control,
   ControlChange,
   createScopedEffect,
@@ -1022,7 +1023,7 @@ export function useExpression<T>(
   runExpression: RunExpression,
   expression: EntityExpression | null | undefined,
   coerce: (x: any) => T,
-  bindings?: Record<string, any>,
+  bindings?: (changes: ChangeListenerFunc<any>) => Record<string, any>,
 ): Control<T> {
   const value = useControl<T>(defaultValue);
   createScopedEffect((scope) => {
@@ -1037,3 +1038,14 @@ export function useExpression<T>(
   }, value);
   return value;
 }
+
+export function setIncluded<A>(array: A[], elem: A, included: boolean): A[] {
+  const already = array.includes(elem);
+  if (included === already) {
+    return array;
+  }
+  if (included) {
+    return [...array, elem];
+  }
+  return array.filter((e) => e !== elem);
+}