@react-typed-forms/schemas 7.2.0 → 7.3.0

package/lib/index.js

@@ -434,11 +434,10 @@ function getDisplayOnlyOptions(d) {
   return isDataControlDefinition(d) && d.renderOptions && isDisplayOnlyRenderer(d.renderOptions) ? d.renderOptions : undefined;
 }
 function getTypeField(context) {
-  var _context$groupControl;
   var typeSchemaField = context.fields.find(function (x) {
     return x.isTypeField;
   });
-  return typeSchemaField ? (_context$groupControl = context.groupControl.fields) == null ? void 0 : _context$groupControl[typeSchemaField.field] : undefined;
+  return typeSchemaField ? lookupChildControl(context, typeSchemaField.field) : undefined;
 }
 function visitControlDataArray(controls, context, cb) {
   if (!controls) return undefined;
@@ -469,10 +468,13 @@ function visitControlData(definition, ctx, cb) {
   function processData(def, fieldName, children) {
     var fieldData = fieldName ? findField(ctx.fields, fieldName) : undefined;
     if (!fieldData) return !fieldName ? visitControlDataArray(children, ctx, cb) : undefined;
-    var control = ctx.groupControl.fields[fieldData.field];
+    var thisPath = [].concat(ctx.path, [fieldData.field]);
+    var control = ctx.data.lookupControl(thisPath);
+    if (!control) throw "No control for field";
     var result = def ? cb(def, fieldData, control, false) : undefined;
     if (result !== undefined) return result;
     if (fieldData.collection) {
+      var cIndex = 0;
       for (var _iterator3 = _createForOfIteratorHelperLoose((_control$elements = control.elements) != null ? _control$elements : []), _step3; !(_step3 = _iterator3()).done;) {
         var _control$elements;
         var c = _step3.value;
@@ -481,14 +483,19 @@ function visitControlData(definition, ctx, cb) {
         if (isCompoundField(fieldData)) {
           var cfResult = visitControlDataArray(children, _extends({}, ctx, {
             fields: fieldData.children,
-            groupControl: c
+            path: [].concat(thisPath, [cIndex])
           }), cb);
           if (cfResult !== undefined) return cfResult;
         }
+        cIndex++;
       }
     }
   }
 }
+function lookupChildControl(data, child) {
+  var childPath = [].concat(data.path, [child]);
+  return data.data.lookupControl(childPath);
+}
 function cleanDataForSchema(v, fields) {
   if (!v) return v;
   var typeField = fields.find(function (x) {
@@ -538,6 +545,18 @@ function getAllReferencedClasses(c) {
   if (childClasses) return [tc].concat(childClasses);
   return [tc];
 }
+function jsonPathString(jsonPath) {
+  var out = "";
+  jsonPath.forEach(function (v, i) {
+    if (typeof v === "number") {
+      out += "[" + v + "]";
+    } else {
+      if (i > 0) out += ".";
+      out += v;
+    }
+  });
+  return out;
+}
 
 function dataControl(field, title, options) {
   return _extends({
@@ -660,7 +679,44 @@ function useCalculatedControl(calculate) {
 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 cv) return trackedStructure(cc.fields[p], tracker);
+      return undefined;
+    }
+  });
+}
 
+function _finallyRethrows(body, finalizer) {
+  try {
+    var result = body();
+  } catch (e) {
+    return finalizer(true, e);
+  }
+  if (result && result.then) {
+    return result.then(finalizer.bind(null, false), finalizer.bind(null, true));
+  }
+  return finalizer(false, result);
+}
 function useEvalVisibilityHook(useEvalExpressionHook, definition, schemaField) {
   var dynamicVisibility = useEvalDynamicHook(definition, exports.DynamicPropertyType.Visible, useEvalExpressionHook);
   var r = useUpdatedRef({
@@ -736,14 +792,14 @@ function useEvalDefaultValueHook(useEvalExpressionHook, definition, schemaField)
 }
 function useDataExpression(fvExpr, fields, data) {
   var refField = findField(fields, fvExpr.field);
-  var otherField = refField ? data.fields[refField.field] : undefined;
+  var otherField = refField ? lookupChildControl(data, refField.field) : undefined;
   return useCalculatedControl(function () {
     return otherField == null ? void 0 : otherField.value;
   });
 }
 function useDataMatchExpression(fvExpr, fields, data) {
   var refField = findField(fields, fvExpr.field);
-  var otherField = refField ? data.fields[refField.field] : undefined;
+  var otherField = refField ? lookupChildControl(data, refField.field) : undefined;
   return core.useComputed(function () {
     var fv = otherField == null ? void 0 : otherField.value;
     return Array.isArray(fv) ? fv.includes(fvExpr.value) : fv === fvExpr.value;
@@ -752,11 +808,11 @@ function useDataMatchExpression(fvExpr, fields, data) {
 function defaultEvalHooks(expr, context) {
   switch (expr.type) {
     case exports.ExpressionType.Jsonata:
-      return useJsonataExpression(expr.expression, context.groupControl, context.root);
+      return useJsonataExpression(expr.expression, context);
     case exports.ExpressionType.Data:
-      return useDataExpression(expr, context.fields, context.groupControl);
+      return useDataExpression(expr, context.fields, context);
     case exports.ExpressionType.DataMatch:
-      return useDataMatchExpression(expr, context.fields, context.groupControl);
+      return useDataMatchExpression(expr, context.fields, context);
     default:
       return core.useControl(undefined);
   }
@@ -785,34 +841,62 @@ function matchesType(context, types) {
   return typeField && types.includes(typeField.value);
 }
 function hideDisplayOnly(context, field, definition, schemaInterface) {
+  var _lookupChildControl;
   var displayOptions = getDisplayOnlyOptions(definition);
-  return displayOptions && !displayOptions.emptyText && schemaInterface.isEmptyValue(field, context.groupControl.fields[field.field].value);
+  return displayOptions && !displayOptions.emptyText && schemaInterface.isEmptyValue(field, (_lookupChildControl = lookupChildControl(context, field.field)) == null ? void 0 : _lookupChildControl.value);
 }
-function useJsonataExpression(jExpr, data, root) {
+function useJsonataExpression(jExpr, dataContext, bindings) {
+  var pathString = jsonPathString(dataContext.path);
   var compiledExpr = React.useMemo(function () {
     try {
-      return jsonata__default["default"](jExpr);
+      return jsonata__default["default"](pathString ? pathString + ".(" + jExpr + ")" : jExpr);
     } catch (e) {
       console.error(e);
       return jsonata__default["default"]("null");
     }
-  }, [jExpr]);
+  }, [jExpr, pathString]);
   var control = core.useControl();
-  core.useControlEffect(function () {
-    return [data.value, root.value];
-  }, function (_ref2) {
-    var v = _ref2[0],
-      rv = _ref2[1];
-    try {
-      return Promise.resolve(compiledExpr.evaluate(v, {
-        root: rv
-      })).then(function (_compiledExpr$evaluat) {
-        control.value = _compiledExpr$evaluat;
+  var listenerRef = React.useRef();
+  var _useRefState = core.useRefState(function () {
+      return core.makeChangeTracker(function () {
+        var l = listenerRef.current;
+        if (l) {
+          listenerRef.current = undefined;
+          core.addAfterChangesCallback(function () {
+            l();
+            listenerRef.current = l;
+          });
+        }
       });
-    } catch (e) {
-      return Promise.reject(e);
-    }
-  }, true);
+    }),
+    ref = _useRefState[0];
+  React.useEffect(function () {
+    var apply = function apply() {
+      try {
+        var _ref$current = ref.current,
+          collect = _ref$current[0],
+          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;
+          });
+        }, function (_wasThrown, _result) {
+          updateSubscriptions();
+          if (_wasThrown) throw _result;
+          return _result;
+        });
+        return Promise.resolve(_temp && _temp.then ? _temp.then(function () {}) : void 0);
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    };
+    listenerRef.current = apply;
+    apply();
+    return function () {
+      return ref.current[1](true);
+    };
+  }, [compiledExpr]);
   return control;
 }
 
@@ -843,7 +927,7 @@ function useValidationHook(definition) {
   }, validatorTypes ? validatorTypes : [null]);
 }
 function useJsonataValidator(control, context, expr, hidden, i) {
-  var errorMsg = useJsonataExpression(expr.expression, context.groupControl, context.root);
+  var errorMsg = useJsonataExpression(expr.expression, context);
   core.useControlEffect(function () {
     return [hidden, errorMsg.value];
   }, function (_ref) {
@@ -932,27 +1016,29 @@ function useControlRenderer(definition, fields, renderer, options) {
     schemaField: schemaField
   });
   var Component = React.useCallback(function (_ref) {
-    var parentControl = _ref.control;
+    var rootControl = _ref.control,
+      _ref$parentPath = _ref.parentPath,
+      parentPath = _ref$parentPath === void 0 ? [] : _ref$parentPath;
     var stopTracking = core.useComponentTracking();
     try {
-      var _options$dataRoot, _c$children$map, _c$children, _definition$adornment, _definition$adornment2;
+      var _c$children$map, _c$children, _definition$adornment, _definition$adornment2;
       var _r$current = r.current,
         c = _r$current.definition,
         _options = _r$current.options,
         _fields = _r$current.fields,
         _schemaField = _r$current.schemaField;
-      var dataContext = {
-        groupControl: parentControl,
+      var parentDataContext = {
         fields: _fields,
         schemaInterface: schemaInterface,
-        root: (_options$dataRoot = _options.dataRoot) != null ? _options$dataRoot : parentControl
+        data: rootControl,
+        path: parentPath
       };
-      var readonlyControl = useIsReadonly(dataContext);
-      var disabledControl = useIsDisabled(dataContext);
-      var visibleControl = useIsVisible(dataContext);
-      var displayControl = useDynamicDisplay(dataContext);
-      var customStyle = useCustomStyle(dataContext).value;
-      var layoutStyle = useLayoutStyle(dataContext).value;
+      var readonlyControl = useIsReadonly(parentDataContext);
+      var disabledControl = useIsDisabled(parentDataContext);
+      var visibleControl = useIsVisible(parentDataContext);
+      var displayControl = useDynamicDisplay(parentDataContext);
+      var customStyle = useCustomStyle(parentDataContext).value;
+      var layoutStyle = useLayoutStyle(parentDataContext).value;
       var visible = visibleControl.current.value;
       var visibility = core.useControl(function () {
         return visible != null ? {
@@ -970,29 +1056,34 @@ function useControlRenderer(definition, fields, renderer, options) {
           };
         });
       });
-      var allowedOptions = useAllowedOptions(dataContext);
-      var defaultValueControl = useDefaultValue(dataContext);
-      var _getControlData = getControlData(_schemaField, dataContext),
-        control = _getControlData[0],
-        childContext = _getControlData[1];
+      var allowedOptions = useAllowedOptions(parentDataContext);
+      var defaultValueControl = useDefaultValue(parentDataContext);
+      var _getControlData = getControlData(_schemaField, parentDataContext),
+        parentControl = _getControlData[0],
+        control = _getControlData[1],
+        controlDataContext = _getControlData[2];
       core.useControlEffect(function () {
-        return [visibility.value, defaultValueControl.value, control, parentControl.isNull, isDataControlDefinition(definition) && definition.dontClearHidden];
+        return [visibility.value, defaultValueControl.value, control, isDataControlDefinition(definition) && definition.dontClearHidden, parentControl == null ? void 0 : parentControl.isNull];
       }, function (_ref2) {
         var vc = _ref2[0],
           dv = _ref2[1],
           cd = _ref2[2],
-          pn = _ref2[3],
-          dontClear = _ref2[4];
-        if (pn) {
-          parentControl.value = {};
-        }
+          dontClear = _ref2[3],
+          parentNull = _ref2[4];
         if (vc && cd && vc.visible === vc.showing) {
           if (!vc.visible) {
-            if (_options.clearHidden && !dontClear) cd.value = undefined;
+            if (_options.clearHidden && !dontClear) {
+              console.log("Clearing ", _schemaField == null ? void 0 : _schemaField.field);
+              cd.value = undefined;
+            }
           } else if (cd.value == null) {
+            console.log("Defaulting ", _schemaField == null ? void 0 : _schemaField.field, dv);
             cd.value = dv;
           }
         }
+        if (parentNull && parentControl != null && parentControl.isNull) {
+          parentControl.value = {};
+        }
       }, true);
       var myOptions = useCalculatedControl(function () {
         var _visibility$fields;
@@ -1002,16 +1093,14 @@ function useControlRenderer(definition, fields, renderer, options) {
           disabled: _options.disabled || disabledControl.value
         };
       }).value;
-      useValidation(control, !!myOptions.hidden, dataContext);
+      useValidation(control != null ? control : core.newControl(null), !!myOptions.hidden, parentDataContext);
       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, {
-          dataRoot: dataContext.root
-        }));
+        return useControlRenderer(cd, controlDataContext.fields, renderer, _extends({}, _options, myOptions));
       })) != null ? _c$children$map : [];
       React.useEffect(function () {
         if (control && typeof myOptions.disabled === "boolean") control.disabled = myOptions.disabled;
       }, [control, myOptions.disabled]);
-      if (parentControl.isNull) return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null);
+      if (parentControl != null && parentControl.isNull) return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null);
       var adornments = (_definition$adornment = (_definition$adornment2 = definition.adornments) == null ? void 0 : _definition$adornment2.map(function (x) {
         return renderer.renderAdornment({
           adornment: x
@@ -1029,7 +1118,7 @@ function useControlRenderer(definition, fields, renderer, options) {
         },
         createDataProps: dataProps,
         formOptions: myOptions,
-        dataContext: dataContext,
+        dataContext: controlDataContext,
         control: displayControl != null ? displayControl : control,
         schemaField: _schemaField,
         displayControl: displayControl,
@@ -1056,14 +1145,17 @@ function lookupSchemaField(c, fields) {
   return fieldName ? findField(fields, fieldName) : undefined;
 }
 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) ? _extends({}, parentContext, {
-    groupControl: childControl,
-    fields: schemaField.children
+  var data = parentContext.data,
+    path = parentContext.path;
+  var parentControl = data.lookupControl(path);
+  var childPath = schemaField ? [].concat(path, [schemaField.field]) : path;
+  var childControl = schemaField && parentControl ? parentControl.fields[schemaField.field] : undefined;
+  return [parentControl, childControl, schemaField ? _extends({}, parentContext, {
+    path: childPath,
+    fields: isCompoundField(schemaField) ? schemaField.children : parentContext.fields
   }) : parentContext];
 }
-function groupProps(renderOptions, childCount, _renderChild, control, className, style) {
+function groupProps(renderOptions, childCount, _renderChild, data, className, style) {
   if (renderOptions === void 0) {
     renderOptions = {
       type: "Standard"
@@ -1073,7 +1165,8 @@ function groupProps(renderOptions, childCount, _renderChild, control, className,
     childCount: childCount,
     renderChild: function renderChild(i) {
       return _renderChild(i, i, {
-        control: control
+        control: data.data,
+        parentPath: data.path
       });
     },
     renderOptions: renderOptions,
@@ -1096,6 +1189,7 @@ function defaultDataProps(_ref3) {
   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({
+    definition: definition,
     control: control,
     field: field,
     id: "c" + control.uniqueId,
@@ -1144,7 +1238,7 @@ function defaultArrayProps(arrayControl, field, required, style, className, _ren
       };
     },
     renderElement: function renderElement(i) {
-      return _renderElement(elems[i]);
+      return _renderElement(i);
     },
     className: cc(className),
     style: style
@@ -1176,7 +1270,7 @@ function renderControlLayout(_ref4) {
       }));
     }
     return {
-      processLayout: renderer.renderGroup(groupProps(c.groupOptions, childCount, childRenderer, dataContext.groupControl, c.styleClass, style)),
+      processLayout: renderer.renderGroup(groupProps(c.groupOptions, childCount, childRenderer, dataContext, c.styleClass, style)),
       label: {
         label: c.title,
         type: exports.LabelType.Group,
@@ -1208,22 +1302,27 @@ function renderControlLayout(_ref4) {
     };
   }
   return {};
-  function renderData(c, elementControl) {
+  function renderData(c, elemIndex) {
     if (!schemaField) return {
       children: "No schema field for: " + c.field
     };
+    if (!childControl) return {
+      children: "No control for: " + c.field
+    };
     var props = dataProps({
       definition: c,
       field: schemaField,
-      dataContext: dataContext,
-      control: elementControl != null ? elementControl : childControl,
+      dataContext: elemIndex != null ? _extends({}, dataContext, {
+        path: [].concat(dataContext.path, [elemIndex])
+      }) : dataContext,
+      control: elemIndex != null ? childControl.elements[elemIndex] : childControl,
       options: dataOptions,
       style: style,
       childCount: childCount,
       allowedOptions: allowedOptions,
       renderChild: childRenderer,
-      elementRenderer: elementControl == null && schemaField.collection ? function (element) {
-        return renderLayoutParts(renderData(c, element), renderer).children;
+      elementRenderer: elemIndex == null && schemaField.collection ? function (ei) {
+        return renderLayoutParts(renderData(c, ei), renderer).children;
       } : undefined
     });
     var labelText = !c.hideTitle ? controlTitle(c.title, schemaField) : undefined;
@@ -1623,7 +1722,8 @@ function createDefaultDataRenderer(options) {
         },
         renderChild: function renderChild(i) {
           return props.renderChild(i, i, {
-            control: props.control
+            control: props.dataContext.data,
+            parentPath: props.dataContext.path
           });
         },
         childCount: props.childCount
@@ -2151,8 +2251,10 @@ exports.isGroupControl = isGroupControl;
 exports.isGroupControlsDefinition = isGroupControlsDefinition;
 exports.isIconAdornment = isIconAdornment;
 exports.isScalarField = isScalarField;
+exports.jsonPathString = jsonPathString;
 exports.jsonataExpr = jsonataExpr;
 exports.layoutKeyForPlacement = layoutKeyForPlacement;
+exports.lookupChildControl = lookupChildControl;
 exports.lookupSchemaField = lookupSchemaField;
 exports.makeCompoundField = makeCompoundField;
 exports.makeEvalExpressionHook = makeEvalExpressionHook;