@react-typed-forms/schemas 7.1.0 → 7.2.0

package/lib/controlRender.d.ts

@@ -141,6 +141,7 @@ export interface ControlRenderOptions extends FormContextOptions {
     useEvalExpressionHook?: UseEvalExpressionHook;
     clearHidden?: boolean;
     schemaInterface?: SchemaInterface;
+    dataRoot?: Control<any>;
 }
 export declare function useControlRenderer(definition: ControlDefinition, fields: SchemaField[], renderer: FormRenderer, options?: ControlRenderOptions): FC<ControlRenderProps>;
 export declare function lookupSchemaField(c: ControlDefinition, fields: SchemaField[]): SchemaField | undefined;

package/lib/hooks.d.ts

@@ -17,4 +17,4 @@ export declare function makeEvalExpressionHook(f: (expr: EntityExpression, conte
 export declare function useEvalDynamicHook(definition: ControlDefinition, type: DynamicPropertyType, useEvalExpressionHook: (expr: EntityExpression | undefined) => EvalExpressionHook | undefined): EvalExpressionHook | undefined;
 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, data: Control<any>): Control<any>;
+export declare function useJsonataExpression(jExpr: string, data: Control<any>, root: Control<any>): Control<any>;

package/lib/index.js

@@ -479,11 +479,10 @@ function visitControlData(definition, ctx, cb) {
         var elemResult = def ? cb(def, fieldData, c, true) : undefined;
         if (elemResult !== undefined) return elemResult;
         if (isCompoundField(fieldData)) {
-          var cfResult = visitControlDataArray(children, {
+          var cfResult = visitControlDataArray(children, _extends({}, ctx, {
             fields: fieldData.children,
-            groupControl: c,
-            schemaInterface: ctx.schemaInterface
-          }, cb);
+            groupControl: c
+          }), cb);
           if (cfResult !== undefined) return cfResult;
         }
       }
@@ -528,7 +527,6 @@ function cleanDataForSchema(v, fields) {
       ;
     }
   });
-
   return out;
 }
 function getAllReferencedClasses(c) {
@@ -754,7 +752,7 @@ function useDataMatchExpression(fvExpr, fields, data) {
 function defaultEvalHooks(expr, context) {
   switch (expr.type) {
     case exports.ExpressionType.Jsonata:
-      return useJsonataExpression(expr.expression, context.groupControl);
+      return useJsonataExpression(expr.expression, context.groupControl, context.root);
     case exports.ExpressionType.Data:
       return useDataExpression(expr, context.fields, context.groupControl);
     case exports.ExpressionType.DataMatch:
@@ -790,21 +788,25 @@ function hideDisplayOnly(context, field, definition, schemaInterface) {
   var displayOptions = getDisplayOnlyOptions(definition);
   return displayOptions && !displayOptions.emptyText && schemaInterface.isEmptyValue(field, context.groupControl.fields[field.field].value);
 }
-function useJsonataExpression(jExpr, data) {
+function useJsonataExpression(jExpr, data, root) {
   var compiledExpr = React.useMemo(function () {
     try {
       return jsonata__default["default"](jExpr);
     } catch (e) {
       console.error(e);
-      return jsonata__default["default"]("");
+      return jsonata__default["default"]("null");
     }
   }, [jExpr]);
   var control = core.useControl();
   core.useControlEffect(function () {
-    return data.value;
-  }, function (v) {
+    return [data.value, root.value];
+  }, function (_ref2) {
+    var v = _ref2[0],
+      rv = _ref2[1];
     try {
-      return Promise.resolve(compiledExpr.evaluate(v)).then(function (_compiledExpr$evaluat) {
+      return Promise.resolve(compiledExpr.evaluate(v, {
+        root: rv
+      })).then(function (_compiledExpr$evaluat) {
         control.value = _compiledExpr$evaluat;
       });
     } catch (e) {
@@ -841,7 +843,7 @@ function useValidationHook(definition) {
   }, validatorTypes ? validatorTypes : [null]);
 }
 function useJsonataValidator(control, context, expr, hidden, i) {
-  var errorMsg = useJsonataExpression(expr.expression, context.groupControl);
+  var errorMsg = useJsonataExpression(expr.expression, context.groupControl, context.root);
   core.useControlEffect(function () {
     return [hidden, errorMsg.value];
   }, function (_ref) {
@@ -933,7 +935,7 @@ function useControlRenderer(definition, fields, renderer, options) {
     var parentControl = _ref.control;
     var stopTracking = core.useComponentTracking();
     try {
-      var _c$children$map, _c$children, _definition$adornment, _definition$adornment2;
+      var _options$dataRoot, _c$children$map, _c$children, _definition$adornment, _definition$adornment2;
       var _r$current = r.current,
         c = _r$current.definition,
         _options = _r$current.options,
@@ -942,7 +944,8 @@ function useControlRenderer(definition, fields, renderer, options) {
       var dataContext = {
         groupControl: parentControl,
         fields: _fields,
-        schemaInterface: schemaInterface
+        schemaInterface: schemaInterface,
+        root: (_options$dataRoot = _options.dataRoot) != null ? _options$dataRoot : parentControl
       };
       var readonlyControl = useIsReadonly(dataContext);
       var disabledControl = useIsDisabled(dataContext);
@@ -1001,7 +1004,9 @@ function useControlRenderer(definition, fields, renderer, options) {
       }).value;
       useValidation(control, !!myOptions.hidden, dataContext);
       var childRenderers = (_c$children$map = (_c$children = c.children) == null ? void 0 : _c$children.map(function (cd) {
-        return useControlRenderer(cd, childContext.fields, renderer, _extends({}, _options, myOptions));
+        return useControlRenderer(cd, childContext.fields, renderer, _extends({}, _options, myOptions, {
+          dataRoot: dataContext.root
+        }));
       })) != null ? _c$children$map : [];
       React.useEffect(function () {
         if (control && typeof myOptions.disabled === "boolean") control.disabled = myOptions.disabled;
@@ -1053,11 +1058,10 @@ function lookupSchemaField(c, fields) {
 function getControlData(schemaField, parentContext) {
   var _parentContext$groupC, _parentContext$groupC2;
   var childControl = schemaField ? (_parentContext$groupC = (_parentContext$groupC2 = parentContext.groupControl.fields) == null ? void 0 : _parentContext$groupC2[schemaField.field]) != null ? _parentContext$groupC : core.newControl({}) : undefined;
-  return [childControl, schemaField && isCompoundField(schemaField) ? {
+  return [childControl, schemaField && isCompoundField(schemaField) ? _extends({}, parentContext, {
     groupControl: childControl,
-    fields: schemaField.children,
-    schemaInterface: parentContext.schemaInterface
-  } : parentContext];
+    fields: schemaField.children
+  }) : parentContext];
 }
 function groupProps(renderOptions, childCount, _renderChild, control, className, style) {
   if (renderOptions === void 0) {