@react-typed-forms/schemas 10.3.0 → 11.0.0

package/lib/controlRender.d.ts

@@ -117,6 +117,7 @@ export interface DataRendererProps extends ParentRendererProps {
 export interface ActionRendererProps {
     actionId: string;
     actionText: string;
+    actionData?: any;
     onClick: () => void;
     className?: string;
     style?: React.CSSProperties;
@@ -146,14 +147,15 @@ export interface DataControlProps {
 export type CreateDataProps = (controlProps: DataControlProps) => DataRendererProps;
 export interface ControlRenderOptions extends FormContextOptions {
     useDataHook?: (c: ControlDefinition) => CreateDataProps;
+    actionOnClick?: (actionId: string, actionData: any) => () => void;
     useEvalExpressionHook?: UseEvalExpressionHook;
     clearHidden?: boolean;
     schemaInterface?: SchemaInterface;
     elementIndex?: number;
 }
 export declare function useControlRenderer(definition: ControlDefinition, fields: SchemaField[], renderer: FormRenderer, options?: ControlRenderOptions): FC<ControlRenderProps>;
-export declare function lookupSchemaField(c: ControlDefinition, fields: SchemaField[]): SchemaField | undefined;
-export declare function getControlData(schemaField: SchemaField | undefined, parentContext: ControlDataContext, elementIndex: number | undefined): [Control<any> | undefined, Control<any> | undefined, ControlDataContext];
+export declare function lookupSchemaField(c: ControlDefinition, fields: SchemaField[]): SchemaField[] | undefined;
+export declare function getControlData(fieldPath: SchemaField[] | undefined, parentContext: ControlDataContext, elementIndex: number | undefined): [Control<any> | undefined, Control<any> | undefined, ControlDataContext];
 export declare function ControlRenderer({ definition, fields, renderer, options, control, parentPath, }: {
     definition: ControlDefinition;
     fields: SchemaField[];
@@ -184,7 +186,9 @@ export interface RenderControlProps {
     displayControl?: Control<string | undefined>;
     style?: React.CSSProperties;
     allowedOptions?: Control<any[] | undefined>;
+    actionDataControl?: Control<any | undefined | null>;
     useChildVisibility: ChildVisibilityFunc;
+    actionOnClick?: (actionId: string, actionData: any) => () => void;
 }
 export declare function renderControlLayout(props: RenderControlProps): ControlLayoutProps;
 export declare function appendMarkup(k: keyof Omit<RenderedLayout, "errorControl" | "style" | "className">, markup: ReactNode): (layout: RenderedLayout) => void;

package/lib/hooks.d.ts

@@ -3,19 +3,21 @@ import React from "react";
 import { Control } from "@react-typed-forms/core";
 import { ControlDataContext, DataContext, DynamicHookGenerator } from "./util";
 export type EvalExpressionHook<A = any> = DynamicHookGenerator<Control<A | undefined>, ControlDataContext>;
-export type UseEvalExpressionHook = (expr: EntityExpression | undefined) => DynamicHookGenerator<Control<any> | undefined, ControlDataContext>;
-export declare function useEvalVisibilityHook(useEvalExpressionHook: UseEvalExpressionHook, definition: ControlDefinition, schemaField?: SchemaField): EvalExpressionHook<boolean>;
+export type UseEvalExpressionHook = (expr: EntityExpression | undefined, coerce: (v: any) => any) => DynamicHookGenerator<Control<any> | undefined, ControlDataContext>;
+export declare function useEvalVisibilityHook(useEvalExpressionHook: UseEvalExpressionHook, definition: ControlDefinition, fieldPath?: SchemaField[]): EvalExpressionHook<boolean>;
 export declare function useEvalReadonlyHook(useEvalExpressionHook: UseEvalExpressionHook, definition: ControlDefinition): EvalExpressionHook<boolean>;
 export declare function useEvalStyleHook(useEvalExpressionHook: UseEvalExpressionHook, property: DynamicPropertyType, definition: ControlDefinition): EvalExpressionHook<React.CSSProperties>;
 export declare function useEvalAllowedOptionsHook(useEvalExpressionHook: UseEvalExpressionHook, definition: ControlDefinition): EvalExpressionHook<any[]>;
 export declare function useEvalDisabledHook(useEvalExpressionHook: UseEvalExpressionHook, definition: ControlDefinition): EvalExpressionHook<boolean>;
 export declare function useEvalDisplayHook(useEvalExpressionHook: UseEvalExpressionHook, definition: ControlDefinition): DynamicHookGenerator<Control<string | undefined> | undefined, ControlDataContext>;
 export declare function useEvalDefaultValueHook(useEvalExpressionHook: UseEvalExpressionHook, definition: ControlDefinition, schemaField: SchemaField | undefined, element: boolean): EvalExpressionHook;
-export declare function defaultEvalHooks(expr: EntityExpression, context: ControlDataContext): Control<any>;
+export declare function defaultEvalHooks(expr: EntityExpression, context: ControlDataContext, coerce: (v: any) => any): Control<any>;
 export declare const defaultUseEvalExpressionHook: UseEvalExpressionHook;
-export declare function makeEvalExpressionHook(f: (expr: EntityExpression, context: ControlDataContext) => Control<any>): UseEvalExpressionHook;
-export declare function useEvalDynamicHook(definition: ControlDefinition, type: DynamicPropertyType, useEvalExpressionHook: UseEvalExpressionHook): DynamicHookGenerator<Control<any> | undefined, ControlDataContext>;
-export declare function matchesType(context: ControlDataContext, types?: string[] | null): boolean | undefined;
-export declare function hideDisplayOnly(context: ControlDataContext, field: SchemaField, definition: ControlDefinition, schemaInterface: SchemaInterface): boolean | undefined;
-export declare function useJsonataExpression(jExpr: string, dataContext: DataContext, bindings?: () => Record<string, any>): Control<any>;
+export declare function makeEvalExpressionHook(f: (expr: EntityExpression, context: ControlDataContext, coerce: (v: any) => any) => Control<any>): UseEvalExpressionHook;
+export declare function useEvalDynamicBoolHook(definition: ControlDefinition, type: DynamicPropertyType, useEvalExpressionHook: UseEvalExpressionHook): DynamicHookGenerator<Control<any> | undefined, ControlDataContext>;
+export declare function useEvalDynamicHook(definition: ControlDefinition, type: DynamicPropertyType, useEvalExpressionHook: UseEvalExpressionHook, coerce?: (v: any) => any): DynamicHookGenerator<Control<any> | undefined, ControlDataContext>;
+export declare function matchesType(context: ControlDataContext, fieldPath?: SchemaField[]): boolean | undefined;
+export declare function hideDisplayOnly(context: ControlDataContext, fieldPath: SchemaField[], definition: ControlDefinition, schemaInterface: SchemaInterface): boolean | undefined;
+export declare function useJsonataExpression(jExpr: string, dataContext: DataContext, bindings?: () => Record<string, any>, coerce?: (v: any) => any): Control<any>;
+export declare function useEvalActionHook(useExpr: UseEvalExpressionHook, definition: ControlDefinition): EvalExpressionHook<string | null>;
 export declare function useEvalLabelText(useExpr: UseEvalExpressionHook, definition: ControlDefinition): EvalExpressionHook<string | null>;

package/lib/index.js

@@ -41,6 +41,7 @@ exports.DynamicPropertyType = void 0;
   DynamicPropertyType["LayoutStyle"] = "LayoutStyle";
   DynamicPropertyType["AllowedOptions"] = "AllowedOptions";
   DynamicPropertyType["Label"] = "Label";
+  DynamicPropertyType["ActionData"] = "ActionData";
 })(exports.DynamicPropertyType || (exports.DynamicPropertyType = {}));
 exports.ExpressionType = void 0;
 (function (ExpressionType) {
@@ -419,11 +420,13 @@ function isControlReadonly(c) {
 function getDisplayOnlyOptions(d) {
   return isDataControlDefinition(d) && d.renderOptions && isDisplayOnlyRenderer(d.renderOptions) ? d.renderOptions : undefined;
 }
-function getTypeField(context) {
-  var typeSchemaField = context.fields.find(function (x) {
+function getTypeField(context, fieldPath) {
+  var withoutLast = fieldPath.slice(0, -1);
+  var fieldList = withoutLast.length > 0 ? withoutLast.at(-1).children : context.fields;
+  var typeSchemaField = fieldList.find(function (x) {
     return x.isTypeField;
   });
-  return typeSchemaField ? lookupChildControl(context, typeSchemaField.field) : undefined;
+  return typeSchemaField ? lookupChildControl(context, [].concat(withoutLast, [typeSchemaField])) : undefined;
 }
 function visitControlDataArray(controls, context, cb) {
   if (!controls) return undefined;
@@ -478,8 +481,13 @@ function visitControlData(definition, ctx, cb) {
     }
   }
 }
-function lookupChildControl(data, child) {
-  var childPath = [].concat(data.path, [child]);
+function lookupChildControl(data, path) {
+  return lookupChildControlPath(data, path.map(function (x) {
+    return x.field;
+  }));
+}
+function lookupChildControlPath(data, jsonPath) {
+  var childPath = [].concat(data.path, jsonPath);
   return watchControlLookup(data.data, childPath);
 }
 function cleanDataForSchema(v, fields) {
@@ -624,6 +632,21 @@ function appendElementIndex(dataContext, elementIndex) {
 function applyLengthRestrictions(length, min, max, minValue, maxValue) {
   return [min == null || length > min ? minValue : undefined, max == null || length < max ? maxValue : undefined];
 }
+function findFieldPath(fields, fieldPath) {
+  var fieldNames = fieldPath.split("/");
+  var foundFields = [];
+  var i = 0;
+  var currentFields = fields;
+  while (i < fieldNames.length && currentFields) {
+    var cf = fieldNames[i];
+    var nextField = findField(currentFields, cf);
+    if (!nextField) return undefined;
+    foundFields.push(nextField);
+    currentFields = isCompoundField(nextField) && !nextField.collection ? nextField.children : undefined;
+    i++;
+  }
+  return foundFields.length === fieldNames.length ? foundFields : undefined;
+}
 
 function buildSchema(def) {
   return Object.entries(def).map(function (x) {
@@ -884,43 +907,6 @@ function applyExtensionsToSchema(schemaMap, extensions) {
   return resolveSchemas(extensions.reduce(applyExtensionToSchema, schemaMap));
 }
 
-function useCalculatedControl(calculate) {
-  var c = core.useControl(calculate);
-  core.useControlEffect(calculate, function (v) {
-    return c.value = v;
-  });
-  return c;
-}
-function cc(n) {
-  return n ? n : undefined;
-}
-function trackedStructure(c, tracker) {
-  var cc = c.current;
-  var cv = cc.value;
-  if (cv == null) {
-    tracker(c, core.ControlChange.Structure);
-    return cv;
-  }
-  if (typeof cv !== "object") {
-    tracker(c, core.ControlChange.Value);
-    return cv;
-  }
-  return new Proxy(cv, {
-    get: function get(target, p, receiver) {
-      if (Array.isArray(cv)) {
-        tracker(c, core.ControlChange.Structure);
-        if (typeof p === "symbol" || p[0] >= "9" || p[0] < "0") return Reflect.get(cv, p);
-        var nc = cc.elements[p];
-        if (typeof nc === "function") return nc;
-        if (nc == null) return null;
-        return trackedStructure(nc, tracker);
-      }
-      if (p in cc.fields || p in cv) return trackedStructure(cc.fields[p], tracker);
-      return undefined;
-    }
-  });
-}
-
 function _finallyRethrows(body, finalizer) {
   try {
     var result = body();
@@ -932,24 +918,24 @@ function _finallyRethrows(body, finalizer) {
   }
   return finalizer(false, result);
 }
-function useEvalVisibilityHook(useEvalExpressionHook, definition, schemaField) {
-  var dynamicVisibility = useEvalDynamicHook(definition, exports.DynamicPropertyType.Visible, useEvalExpressionHook);
+function useEvalVisibilityHook(useEvalExpressionHook, definition, fieldPath) {
+  var dynamicVisibility = useEvalDynamicBoolHook(definition, exports.DynamicPropertyType.Visible, useEvalExpressionHook);
   return makeDynamicPropertyHook(dynamicVisibility, function (ctx, _ref) {
-    var schemaField = _ref.schemaField,
+    var fieldPath = _ref.fieldPath,
       definition = _ref.definition;
     return core.useComputed(function () {
-      return matchesType(ctx, schemaField == null ? void 0 : schemaField.onlyForTypes) && (!schemaField || !hideDisplayOnly(ctx, schemaField, definition, ctx.schemaInterface));
+      return matchesType(ctx, fieldPath) && (!fieldPath || !hideDisplayOnly(ctx, fieldPath, definition, ctx.schemaInterface));
     });
   }, {
-    schemaField: schemaField,
+    fieldPath: fieldPath,
     definition: definition
   });
 }
 function useEvalReadonlyHook(useEvalExpressionHook, definition) {
-  var dynamicReadonly = useEvalDynamicHook(definition, exports.DynamicPropertyType.Readonly, useEvalExpressionHook);
+  var dynamicReadonly = useEvalDynamicBoolHook(definition, exports.DynamicPropertyType.Readonly, useEvalExpressionHook);
   return makeDynamicPropertyHook(dynamicReadonly, function (ctx, _ref2) {
     var definition = _ref2.definition;
-    return useCalculatedControl(function () {
+    return core.useCalculatedControl(function () {
       return isControlReadonly(definition);
     });
   }, {
@@ -969,7 +955,7 @@ function useEvalAllowedOptionsHook(useEvalExpressionHook, definition) {
   }, undefined);
 }
 function useEvalDisabledHook(useEvalExpressionHook, definition) {
-  var dynamicDisabled = useEvalDynamicHook(definition, exports.DynamicPropertyType.Disabled, useEvalExpressionHook);
+  var dynamicDisabled = useEvalDynamicBoolHook(definition, exports.DynamicPropertyType.Disabled, useEvalExpressionHook);
   return makeDynamicPropertyHook(dynamicDisabled, function () {
     return core.useControl(false);
   }, undefined);
@@ -994,63 +980,89 @@ function useEvalDefaultValueHook(useEvalExpressionHook, definition, schemaField,
     schemaField: schemaField
   });
 }
-function useDataExpression(fvExpr, fields, data) {
-  var refField = findField(fields, fvExpr.field);
-  var otherField = refField ? lookupChildControl(data, refField.field) : undefined;
-  return useCalculatedControl(function () {
-    return otherField == null ? void 0 : otherField.value;
+function useDataExpression(fvExpr, fields, data, coerce) {
+  if (coerce === void 0) {
+    coerce = function coerce(x) {
+      return x;
+    };
+  }
+  var refField = findFieldPath(fields, fvExpr.field);
+  var otherField = refField ? lookupChildControl(data, refField) : undefined;
+  return core.useCalculatedControl(function () {
+    return coerce(otherField == null ? void 0 : otherField.value);
   });
 }
-function useDataMatchExpression(fvExpr, fields, data) {
-  var refField = findField(fields, fvExpr.field);
-  var otherField = refField ? lookupChildControl(data, refField.field) : undefined;
-  return core.useComputed(function () {
+function useDataMatchExpression(fvExpr, fields, data, coerce) {
+  if (coerce === void 0) {
+    coerce = function coerce(x) {
+      return x;
+    };
+  }
+  var refField = findFieldPath(fields, fvExpr.field);
+  var otherField = refField ? lookupChildControl(data, refField) : undefined;
+  return core.useCalculatedControl(function () {
     var fv = otherField == null ? void 0 : otherField.value;
-    return Array.isArray(fv) ? fv.includes(fvExpr.value) : fv === fvExpr.value;
+    return coerce(Array.isArray(fv) ? fv.includes(fvExpr.value) : fv === fvExpr.value);
   });
 }
-function defaultEvalHooks(expr, context) {
+function defaultEvalHooks(expr, context, coerce) {
   switch (expr.type) {
     case exports.ExpressionType.Jsonata:
-      return useJsonataExpression(expr.expression, context);
+      return useJsonataExpression(expr.expression, context, undefined, coerce);
     case exports.ExpressionType.Data:
-      return useDataExpression(expr, context.fields, context);
+      return useDataExpression(expr, context.fields, context, coerce);
     case exports.ExpressionType.DataMatch:
-      return useDataMatchExpression(expr, context.fields, context);
+      return useDataMatchExpression(expr, context.fields, context, coerce);
     default:
       return core.useControl(undefined);
   }
 }
 var defaultUseEvalExpressionHook = makeEvalExpressionHook(defaultEvalHooks);
 function makeEvalExpressionHook(f) {
-  return function (expr) {
+  return function (expr, coerce) {
     return {
       deps: expr == null ? void 0 : expr.type,
       state: expr,
       runHook: function runHook(ctx, state) {
-        return state ? f(state, ctx) : undefined;
+        return state ? f(state, ctx, coerce) : undefined;
       }
     };
   };
 }
-function useEvalDynamicHook(definition, type, useEvalExpressionHook) {
+function useEvalDynamicBoolHook(definition, type, useEvalExpressionHook) {
+  return useEvalDynamicHook(definition, type, useEvalExpressionHook, function (x) {
+    return Boolean(x);
+  });
+}
+function useEvalDynamicHook(definition, type, useEvalExpressionHook, coerce) {
   var _definition$dynamic;
+  if (coerce === void 0) {
+    coerce = function coerce(x) {
+      return x;
+    };
+  }
   var expression = (_definition$dynamic = definition.dynamic) == null ? void 0 : _definition$dynamic.find(function (x) {
     return x.type === type;
   });
-  return useEvalExpressionHook(expression == null ? void 0 : expression.expr);
+  return useEvalExpressionHook(expression == null ? void 0 : expression.expr, coerce);
 }
-function matchesType(context, types) {
+function matchesType(context, fieldPath) {
+  var types = fieldPath ? fieldPath[fieldPath.length - 1].onlyForTypes : undefined;
   if (types == null || types.length === 0) return true;
-  var typeField = getTypeField(context);
+  var typeField = getTypeField(context, fieldPath);
   return typeField && types.includes(typeField.value);
 }
-function hideDisplayOnly(context, field, definition, schemaInterface) {
+function hideDisplayOnly(context, fieldPath, definition, schemaInterface) {
   var _lookupChildControl;
   var displayOptions = getDisplayOnlyOptions(definition);
-  return displayOptions && !displayOptions.emptyText && schemaInterface.isEmptyValue(field, (_lookupChildControl = lookupChildControl(context, field.field)) == null ? void 0 : _lookupChildControl.value);
+  return displayOptions && !displayOptions.emptyText && schemaInterface.isEmptyValue(fieldPath.at(-1), (_lookupChildControl = lookupChildControl(context, fieldPath)) == null ? void 0 : _lookupChildControl.value);
 }
-function useJsonataExpression(jExpr, dataContext, bindings) {
+function useJsonataExpression(jExpr, dataContext, bindings, coerce) {
+  if (coerce === void 0) {
+    coerce = function coerce(x) {
+      return x;
+    };
+  }
   var pathString = jsonPathString(dataContext.path, function (x) {
     return "#$i[" + x + "]";
   });
@@ -1086,8 +1098,9 @@ function useJsonataExpression(jExpr, dataContext, bindings) {
           updateSubscriptions = _ref$current[1];
         var _temp = _finallyRethrows(function () {
           var bindingData = bindings ? core.collectChanges(collect, bindings) : undefined;
-          return Promise.resolve(compiledExpr.evaluate(trackedStructure(dataContext.data, collect), bindingData)).then(function (_compiledExpr$evaluat) {
-            control.value = _compiledExpr$evaluat;
+          var _coerce = coerce;
+          return Promise.resolve(compiledExpr.evaluate(core.trackedValue(dataContext.data, collect), bindingData)).then(function (_compiledExpr$evaluat) {
+            control.value = _coerce(_compiledExpr$evaluat);
           });
         }, function (_wasThrown, _result) {
           updateSubscriptions();
@@ -1107,6 +1120,12 @@ function useJsonataExpression(jExpr, dataContext, bindings) {
   }, [compiledExpr]);
   return control;
 }
+function useEvalActionHook(useExpr, definition) {
+  var dynamicValue = useEvalDynamicHook(definition, exports.DynamicPropertyType.ActionData, useExpr);
+  return makeDynamicPropertyHook(dynamicValue, function () {
+    return core.useControl(null);
+  }, undefined);
+}
 function useEvalLabelText(useExpr, definition) {
   var dynamicValue = useEvalDynamicHook(definition, exports.DynamicPropertyType.Label, useExpr);
   return makeDynamicPropertyHook(dynamicValue, function () {
@@ -1143,8 +1162,8 @@ function useValidationHook(definition, field) {
       return control.setError("default", "");
     });
     core.useValidator(control, function (v) {
-      return !hidden && dd.required && (v == null || v === "" || Array.isArray(v) && v.length === 0) ? "Please enter a value" : null;
-    }, "required");
+      return !hidden && dd.required && field && schemaInterface.isEmptyValue(field, v) ? "Please enter a value" : null;
+    }, "required", undefined, [hidden, dd.required, !!field]);
     ((_dd$validators = dd.validators) != null ? _dd$validators : []).forEach(function (x, i) {
       switch (x.type) {
         case exports.ValidatorType.Length:
@@ -1217,6 +1236,10 @@ function useDateValidator(control, dv, i) {
   }, "date" + i);
 }
 
+function cc(n) {
+  return n ? n : undefined;
+}
+
 var DefaultSchemaInterface = /*#__PURE__*/function () {
   function DefaultSchemaInterface() {}
   var _proto = DefaultSchemaInterface.prototype;
@@ -1268,14 +1291,16 @@ function useControlRenderer(definition, fields, renderer, options) {
   var elementIndex = options.elementIndex;
   var schemaInterface = (_options$schemaInterf = options.schemaInterface) != null ? _options$schemaInterf : defaultSchemaInterface;
   var useExpr = (_options$useEvalExpre = options.useEvalExpressionHook) != null ? _options$useEvalExpre : defaultUseEvalExpressionHook;
-  var schemaField = lookupSchemaField(definition, fields);
+  var fieldPath = lookupSchemaField(definition, fields);
+  var schemaField = fieldPath == null ? void 0 : fieldPath.at(-1);
   var dynamicHooks = useDynamicHooks({
     defaultValueControl: useEvalDefaultValueHook(useExpr, definition, schemaField, elementIndex != null),
-    visibleControl: useEvalVisibilityHook(useExpr, definition, schemaField),
+    visibleControl: useEvalVisibilityHook(useExpr, definition, fieldPath),
     readonlyControl: useEvalReadonlyHook(useExpr, definition),
     disabledControl: useEvalDisabledHook(useExpr, definition),
     allowedOptions: useEvalAllowedOptionsHook(useExpr, definition),
     labelText: useEvalLabelText(useExpr, definition),
+    actionData: useEvalActionHook(useExpr, definition),
     customStyle: useEvalStyleHook(useExpr, exports.DynamicPropertyType.Style, definition),
     layoutStyle: useEvalStyleHook(useExpr, exports.DynamicPropertyType.LayoutStyle, definition),
     displayControl: useEvalDisplayHook(useExpr, definition)
@@ -1285,7 +1310,7 @@ function useControlRenderer(definition, fields, renderer, options) {
     options: options,
     definition: definition,
     fields: fields,
-    schemaField: schemaField,
+    fieldPath: fieldPath,
     elementIndex: elementIndex
   });
   var Component = React.useCallback(function (_ref) {
@@ -1299,8 +1324,9 @@ function useControlRenderer(definition, fields, renderer, options) {
         c = _r$current.definition,
         _options = _r$current.options,
         _fields = _r$current.fields,
-        _schemaField = _r$current.schemaField,
+        _fieldPath = _r$current.fieldPath,
         _elementIndex = _r$current.elementIndex;
+      var _schemaField = _fieldPath == null ? void 0 : _fieldPath.at(-1);
       var parentDataContext = {
         fields: _fields,
         schemaInterface: schemaInterface,
@@ -1316,7 +1342,8 @@ function useControlRenderer(definition, fields, renderer, options) {
         labelText = _dynamicHooks.labelText,
         customStyle = _dynamicHooks.customStyle,
         allowedOptions = _dynamicHooks.allowedOptions,
-        defaultValueControl = _dynamicHooks.defaultValueControl;
+        defaultValueControl = _dynamicHooks.defaultValueControl,
+        actionData = _dynamicHooks.actionData;
       var visible = visibleControl.current.value;
       var visibility = core.useControl(function () {
         return visible != null ? {
@@ -1334,7 +1361,7 @@ function useControlRenderer(definition, fields, renderer, options) {
           };
         });
       });
-      var _getControlData = getControlData(_schemaField, parentDataContext, _elementIndex),
+      var _getControlData = getControlData(_fieldPath, parentDataContext, _elementIndex),
         parentControl = _getControlData[0],
         control = _getControlData[1],
         controlDataContext = _getControlData[2];
@@ -1360,7 +1387,7 @@ function useControlRenderer(definition, fields, renderer, options) {
           parentControl.value = {};
         }
       }, true);
-      var myOptions = useCalculatedControl(function () {
+      var myOptions = core.useCalculatedControl(function () {
         var _visibility$fields;
         return {
           hidden: _options.hidden || !((_visibility$fields = visibility.fields) != null && _visibility$fields.showing.value),
@@ -1410,6 +1437,8 @@ function useControlRenderer(definition, fields, renderer, options) {
         displayControl: displayControl,
         style: customStyle.value,
         allowedOptions: allowedOptions,
+        actionDataControl: actionData,
+        actionOnClick: _options.actionOnClick,
         useChildVisibility: function useChildVisibility(childDef, context) {
           var schemaField = lookupSchemaField(childDef, (context != null ? context : controlDataContext).fields);
           return useEvalVisibilityHook(useExpr, childDef, schemaField);
@@ -1432,12 +1461,17 @@ function useControlRenderer(definition, fields, renderer, options) {
 }
 function lookupSchemaField(c, fields) {
   var fieldName = isGroupControlsDefinition(c) ? c.compoundField : isDataControlDefinition(c) ? c.field : undefined;
-  return fieldName ? findField(fields, fieldName) : undefined;
+  return fieldName ? findFieldPath(fields, fieldName) : undefined;
 }
-function getControlData(schemaField, parentContext, elementIndex) {
-  var _parentControl$fields, _childControl$element;
+function getControlData(fieldPath, parentContext, elementIndex) {
+  var _fieldPath$slice$map, _parentControl$fields, _childControl$element;
   var data = parentContext.data,
-    path = parentContext.path;
+    pp = parentContext.path;
+  var extraPath = (_fieldPath$slice$map = fieldPath == null ? void 0 : fieldPath.slice(0, -1).map(function (x) {
+    return x.field;
+  })) != null ? _fieldPath$slice$map : [];
+  var path = [].concat(pp, extraPath);
+  var schemaField = fieldPath == null ? void 0 : fieldPath.at(-1);
   var parentControl = data.lookupControl(path);
   var childPath = schemaField ? elementIndex != null ? [].concat(path, [schemaField.field, elementIndex]) : [].concat(path, [schemaField.field]) : path;
   var childControl = schemaField && parentControl ? (_parentControl$fields = parentControl.fields) == null ? void 0 : _parentControl$fields[schemaField.field] : undefined;
@@ -1593,12 +1627,14 @@ function renderControlLayout(props) {
     };
   }
   if (isActionControlsDefinition(c)) {
-    var _ref5, _labelText$value2;
+    var _props$actionDataCont, _props$actionDataCont2, _ref5, _labelText$value2, _props$actionOnClick;
+    var actionData = (_props$actionDataCont = (_props$actionDataCont2 = props.actionDataControl) == null ? void 0 : _props$actionDataCont2.value) != null ? _props$actionDataCont : c.actionData;
     return {
       children: renderer.renderAction({
         actionText: (_ref5 = (_labelText$value2 = labelText == null ? void 0 : labelText.value) != null ? _labelText$value2 : c.title) != null ? _ref5 : c.actionId,
         actionId: c.actionId,
-        onClick: function onClick() {},
+        actionData: actionData,
+        onClick: (_props$actionOnClick = props.actionOnClick == null ? void 0 : props.actionOnClick(c.actionId, actionData)) != null ? _props$actionOnClick : function () {},
         className: cc(c.styleClass),
         style: style
       })
@@ -2555,7 +2591,7 @@ function createFormRenderer(customRenderers, defaultRenderers) {
     var options = hasOptions(props);
     var renderer = (_dataRegistrations$fi = dataRegistrations.find(function (x) {
       var _x$collection, _field$collection, _x$options;
-      return ((_x$collection = x.collection) != null ? _x$collection : false) === (props.elementIndex == null && ((_field$collection = field.collection) != null ? _field$collection : false)) && ((_x$options = x.options) != null ? _x$options : false) === options && (x.schemaType && isOneOf(x.schemaType, field.type) || x.renderType && isOneOf(x.renderType, renderType) || x.match && x.match(props));
+      return ((_x$collection = x.collection) != null ? _x$collection : false) === (props.elementIndex == null && ((_field$collection = field.collection) != null ? _field$collection : false)) && ((_x$options = x.options) != null ? _x$options : false) === options && (x.schemaType && renderType == exports.DataRenderType.Standard && isOneOf(x.schemaType, field.type) || x.renderType && isOneOf(x.renderType, renderType) || x.match && x.match(props));
     })) != null ? _dataRegistrations$fi : defaultRenderers.data;
     var result = renderer.render(props, formRenderers);
     if (typeof result === "function") return result;
@@ -2730,6 +2766,7 @@ exports.findCompoundField = findCompoundField;
 exports.findCompoundGroups = findCompoundGroups;
 exports.findControlsForCompound = findControlsForCompound;
 exports.findField = findField;
+exports.findFieldPath = findFieldPath;
 exports.findNonDataGroups = findNonDataGroups;
 exports.findScalarField = findScalarField;
 exports.getAllReferencedClasses = getAllReferencedClasses;
@@ -2761,6 +2798,7 @@ exports.jsonPathString = jsonPathString;
 exports.jsonataExpr = jsonataExpr;
 exports.layoutKeyForPlacement = layoutKeyForPlacement;
 exports.lookupChildControl = lookupChildControl;
+exports.lookupChildControlPath = lookupChildControlPath;
 exports.lookupSchemaField = lookupSchemaField;
 exports.makeCompoundField = makeCompoundField;
 exports.makeEvalExpressionHook = makeEvalExpressionHook;
@@ -2781,10 +2819,12 @@ exports.toDepString = toDepString;
 exports.useControlDefinitionForSchema = useControlDefinitionForSchema;
 exports.useControlRenderer = useControlRenderer;
 exports.useDynamicHooks = useDynamicHooks;
+exports.useEvalActionHook = useEvalActionHook;
 exports.useEvalAllowedOptionsHook = useEvalAllowedOptionsHook;
 exports.useEvalDefaultValueHook = useEvalDefaultValueHook;
 exports.useEvalDisabledHook = useEvalDisabledHook;
 exports.useEvalDisplayHook = useEvalDisplayHook;
+exports.useEvalDynamicBoolHook = useEvalDynamicBoolHook;
 exports.useEvalDynamicHook = useEvalDynamicHook;
 exports.useEvalLabelText = useEvalLabelText;
 exports.useEvalReadonlyHook = useEvalReadonlyHook;
@@ -2796,6 +2836,7 @@ exports.useValidationHook = useValidationHook;
 exports.visitControlData = visitControlData;
 exports.visitControlDataArray = visitControlDataArray;
 exports.visitControlDefinition = visitControlDefinition;
+exports.watchControlLookup = watchControlLookup;
 exports.withScalarOptions = withScalarOptions;
 exports.wrapMarkup = wrapMarkup;
 exports.wrapMarkupAt = wrapMarkupAt;