@react-typed-forms/schemas 7.0.0 → 7.2.0

package/lib/controlRender.d.ts

@@ -132,6 +132,7 @@ export interface DataControlProps {
     style: React.CSSProperties | undefined;
     childCount: number;
     renderChild: ChildRenderer;
+    allowedOptions?: Control<any[] | undefined>;
     elementRenderer?: (elemProps: Control<any>) => ReactNode;
 }
 export type CreateDataProps = (controlProps: DataControlProps) => DataRendererProps;
@@ -140,11 +141,12 @@ 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;
 export declare function getControlData(schemaField: SchemaField | undefined, parentContext: ControlDataContext): [Control<any> | undefined, ControlDataContext];
-export declare function defaultDataProps({ definition, field, control, options, elementRenderer, style, ...props }: DataControlProps): DataRendererProps;
+export declare function defaultDataProps({ definition, field, control, options, elementRenderer, style, allowedOptions, ...props }: DataControlProps): DataRendererProps;
 export declare function defaultArrayProps(arrayControl: Control<any[] | undefined | null>, field: SchemaField, required: boolean, style: CSSProperties | undefined, className: string | undefined, renderElement: (elemProps: Control<any>) => ReactNode): ArrayRendererProps;
 export type ChildRenderer = (k: Key, childIndex: number, props: ControlRenderProps) => ReactNode;
 export interface RenderControlProps {
@@ -159,8 +161,9 @@ export interface RenderControlProps {
     schemaField?: SchemaField;
     displayControl?: Control<string | undefined>;
     style?: React.CSSProperties;
+    allowedOptions?: Control<any[] | undefined>;
 }
-export declare function renderControlLayout({ definition: c, renderer, childCount, renderChild: childRenderer, control: childControl, schemaField, dataContext, formOptions: dataOptions, createDataProps: dataProps, displayControl, style, }: RenderControlProps): ControlLayoutProps;
+export declare function renderControlLayout({ definition: c, renderer, childCount, renderChild: childRenderer, control: childControl, schemaField, dataContext, formOptions: dataOptions, createDataProps: dataProps, displayControl, style, allowedOptions, }: RenderControlProps): ControlLayoutProps;
 export declare function appendMarkup(k: keyof Omit<RenderedLayout, "errorControl" | "style" | "className">, markup: ReactNode): (layout: RenderedLayout) => void;
 export declare function wrapMarkup(k: keyof Omit<RenderedLayout, "errorControl" | "style" | "className">, wrap: (ex: ReactNode) => ReactNode): (layout: RenderedLayout) => void;
 export declare function layoutKeyForPlacement(pos: AdornmentPlacement): keyof Omit<RenderedLayout, "errorControl" | "style" | "className">;

package/lib/hooks.d.ts

@@ -6,6 +6,7 @@ export type UseEvalExpressionHook = (expr: EntityExpression | undefined) => Eval
 export declare function useEvalVisibilityHook(useEvalExpressionHook: UseEvalExpressionHook, definition: ControlDefinition, schemaField?: 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): (groupContext: ControlDataContext) => Control<string | undefined> | undefined;
 export declare function useEvalDefaultValueHook(useEvalExpressionHook: UseEvalExpressionHook, definition: ControlDefinition, schemaField?: SchemaField): EvalExpressionHook;
@@ -16,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

@@ -39,6 +39,7 @@ exports.DynamicPropertyType = void 0;
   DynamicPropertyType["Display"] = "Display";
   DynamicPropertyType["Style"] = "Style";
   DynamicPropertyType["LayoutStyle"] = "LayoutStyle";
+  DynamicPropertyType["AllowedOptions"] = "AllowedOptions";
 })(exports.DynamicPropertyType || (exports.DynamicPropertyType = {}));
 exports.ExpressionType = void 0;
 (function (ExpressionType) {
@@ -478,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;
         }
       }
@@ -527,7 +527,6 @@ function cleanDataForSchema(v, fields) {
       ;
     }
   });
-
   return out;
 }
 function getAllReferencedClasses(c) {
@@ -695,6 +694,13 @@ function useEvalStyleHook(useEvalExpressionHook, property, definition) {
     return core.useControl(undefined);
   }, [dynamicStyle]);
 }
+function useEvalAllowedOptionsHook(useEvalExpressionHook, definition) {
+  var dynamicAllowed = useEvalDynamicHook(definition, exports.DynamicPropertyType.AllowedOptions, useEvalExpressionHook);
+  return React.useCallback(function (ctx) {
+    if (dynamicAllowed) return dynamicAllowed(ctx);
+    return core.useControl([]);
+  }, [dynamicAllowed]);
+}
 function useEvalDisabledHook(useEvalExpressionHook, definition) {
   var dynamicDisabled = useEvalDynamicHook(definition, exports.DynamicPropertyType.Disabled, useEvalExpressionHook);
   return React.useCallback(function (ctx) {
@@ -746,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:
@@ -782,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) {
@@ -833,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) {
@@ -889,7 +899,7 @@ function defaultTextValue(f, value) {
   }
 }
 
-var _excluded$1 = ["definition", "field", "control", "options", "elementRenderer", "style"];
+var _excluded$1 = ["definition", "field", "control", "options", "elementRenderer", "style", "allowedOptions"];
 var AppendAdornmentPriority = 0;
 var WrapAdornmentPriority = 1000;
 exports.LabelType = void 0;
@@ -910,6 +920,7 @@ function useControlRenderer(definition, fields, renderer, options) {
   var useIsVisible = useEvalVisibilityHook(useExpr, definition, schemaField);
   var useIsReadonly = useEvalReadonlyHook(useExpr, definition);
   var useIsDisabled = useEvalDisabledHook(useExpr, definition);
+  var useAllowedOptions = useEvalAllowedOptionsHook(useExpr, definition);
   var useCustomStyle = useEvalStyleHook(useExpr, exports.DynamicPropertyType.Style, definition);
   var useLayoutStyle = useEvalStyleHook(useExpr, exports.DynamicPropertyType.LayoutStyle, definition);
   var useDynamicDisplay = useEvalDisplayHook(useExpr, definition);
@@ -924,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,
@@ -933,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);
@@ -958,6 +970,7 @@ function useControlRenderer(definition, fields, renderer, options) {
           };
         });
       });
+      var allowedOptions = useAllowedOptions(dataContext);
       var defaultValueControl = useDefaultValue(dataContext);
       var _getControlData = getControlData(_schemaField, dataContext),
         control = _getControlData[0],
@@ -991,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;
@@ -1018,7 +1033,8 @@ function useControlRenderer(definition, fields, renderer, options) {
         control: displayControl != null ? displayControl : control,
         schemaField: _schemaField,
         displayControl: displayControl,
-        style: customStyle
+        style: customStyle,
+        allowedOptions: allowedOptions
       });
       var renderedControl = renderer.renderLayout(_extends({}, labelAndChildren, {
         adornments: adornments,
@@ -1031,7 +1047,7 @@ function useControlRenderer(definition, fields, renderer, options) {
     } finally {
       stopTracking();
     }
-  }, [r, dataProps, useIsVisible, useDefaultValue, useIsReadonly, useIsDisabled, useCustomStyle, useLayoutStyle, useDynamicDisplay, useValidation, renderer, schemaInterface]);
+  }, [r, dataProps, useIsVisible, useDefaultValue, useIsReadonly, useIsDisabled, useCustomStyle, useLayoutStyle, useAllowedOptions, useDynamicDisplay, useValidation, renderer, schemaInterface]);
   Component.displayName = "RenderControl";
   return Component;
 }
@@ -1042,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) {
@@ -1067,21 +1082,26 @@ function groupProps(renderOptions, childCount, _renderChild, control, className,
   };
 }
 function defaultDataProps(_ref3) {
-  var _field$options$length, _field$options, _definition$renderOpt;
+  var _field$options$length, _field$options, _allowedOptions$value, _definition$renderOpt;
   var definition = _ref3.definition,
     field = _ref3.field,
     control = _ref3.control,
     options = _ref3.options,
     elementRenderer = _ref3.elementRenderer,
     style = _ref3.style,
+    allowedOptions = _ref3.allowedOptions,
     props = _objectWithoutPropertiesLoose(_ref3, _excluded$1);
   var className = cc(definition.styleClass);
   var required = !!definition.required;
+  var fieldOptions = ((_field$options$length = (_field$options = field.options) == null ? void 0 : _field$options.length) != null ? _field$options$length : 0) === 0 ? null : field.options;
+  var allowed = (_allowedOptions$value = allowedOptions == null ? void 0 : allowedOptions.value) != null ? _allowedOptions$value : [];
   return _extends({
     control: control,
     field: field,
     id: "c" + control.uniqueId,
-    options: ((_field$options$length = (_field$options = field.options) == null ? void 0 : _field$options.length) != null ? _field$options$length : 0) === 0 ? null : field.options,
+    options: fieldOptions && allowed.length > 0 ? fieldOptions.filter(function (x) {
+      return allowed.includes(x.value);
+    }) : fieldOptions,
     readonly: !!options.readonly,
     renderOptions: (_definition$renderOpt = definition.renderOptions) != null ? _definition$renderOpt : {
       type: "Standard"
@@ -1141,7 +1161,8 @@ function renderControlLayout(_ref4) {
     dataOptions = _ref4.formOptions,
     dataProps = _ref4.createDataProps,
     displayControl = _ref4.displayControl,
-    style = _ref4.style;
+    style = _ref4.style,
+    allowedOptions = _ref4.allowedOptions;
   if (isDataControlDefinition(c)) {
     return renderData(c);
   }
@@ -1199,6 +1220,7 @@ function renderControlLayout(_ref4) {
       options: dataOptions,
       style: style,
       childCount: childCount,
+      allowedOptions: allowedOptions,
       renderChild: childRenderer,
       elementRenderer: elementControl == null && schemaField.collection ? function (element) {
         return renderLayoutParts(renderData(c, element), renderer).children;
@@ -2143,6 +2165,7 @@ exports.stringOptionsField = stringOptionsField;
 exports.textDisplayControl = textDisplayControl;
 exports.useControlDefinitionForSchema = useControlDefinitionForSchema;
 exports.useControlRenderer = useControlRenderer;
+exports.useEvalAllowedOptionsHook = useEvalAllowedOptionsHook;
 exports.useEvalDefaultValueHook = useEvalDefaultValueHook;
 exports.useEvalDisabledHook = useEvalDisabledHook;
 exports.useEvalDisplayHook = useEvalDisplayHook;