@react-typed-forms/schemas 11.0.0 → 11.0.2

package/lib/controlRender.d.ts

@@ -155,7 +155,7 @@ export interface ControlRenderOptions extends FormContextOptions {
 }
 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(fieldPath: SchemaField[] | undefined, parentContext: ControlDataContext, elementIndex: number | undefined): [Control<any> | undefined, Control<any> | undefined, ControlDataContext];
+export declare function getControlData(fieldPath: SchemaField[] | undefined, parentContext: ControlDataContext, elementIndex: number | undefined): [Control<any>, Control<any> | undefined, ControlDataContext];
 export declare function ControlRenderer({ definition, fields, renderer, options, control, parentPath, }: {
     definition: ControlDefinition;
     fields: SchemaField[];

package/lib/index.js

@@ -1077,14 +1077,15 @@ function useJsonataExpression(jExpr, dataContext, bindings, coerce) {
   }, [fullExpr]);
   var control = core.useControl();
   var listenerRef = React.useRef();
+  var updateRef = React.useRef(0);
   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;
+            l();
           });
         }
       });
@@ -1097,13 +1098,14 @@ function useJsonataExpression(jExpr, dataContext, bindings, coerce) {
           collect = _ref$current[0],
           updateSubscriptions = _ref$current[1];
         var _temp = _finallyRethrows(function () {
+          updateRef.current++;
           var bindingData = bindings ? core.collectChanges(collect, bindings) : undefined;
           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();
+          if (! --updateRef.current) updateSubscriptions();
           if (_wasThrown) throw _result;
           return _result;
         });
@@ -1366,7 +1368,7 @@ function useControlRenderer(definition, fields, renderer, options) {
         control = _getControlData[1],
         controlDataContext = _getControlData[2];
       core.useControlEffect(function () {
-        return [visibility.value, defaultValueControl.value, control, isDataControlDefinition(definition) && definition.dontClearHidden, parentControl == null ? void 0 : parentControl.isNull, _options.hidden];
+        return [visibility.value, defaultValueControl.value, control, isDataControlDefinition(definition) && definition.dontClearHidden, parentControl.isNull, _options.hidden];
       }, function (_ref2) {
         var vc = _ref2[0],
           dv = _ref2[1],
@@ -1383,8 +1385,10 @@ function useControlRenderer(definition, fields, renderer, options) {
             cd.value = dv;
           }
         }
-        if (parentNull && parentControl != null && parentControl.isNull) {
-          parentControl.value = {};
+        if (parentNull) {
+          parentControl.setValue(function (x) {
+            return x != null ? x : {};
+          });
         }
       }, true);
       var myOptions = core.useCalculatedControl(function () {
@@ -1402,7 +1406,7 @@ function useControlRenderer(definition, fields, renderer, options) {
       React.useEffect(function () {
         if (control && typeof myOptions.disabled === "boolean") control.disabled = myOptions.disabled;
       }, [control, myOptions.disabled]);
-      if (parentControl != null && parentControl.isNull) return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null);
+      if (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
@@ -1472,14 +1476,35 @@ function getControlData(fieldPath, parentContext, elementIndex) {
   })) != null ? _fieldPath$slice$map : [];
   var path = [].concat(pp, extraPath);
   var schemaField = fieldPath == null ? void 0 : fieldPath.at(-1);
-  var parentControl = data.lookupControl(path);
+  var _lookupControl = lookupControl(data, path),
+    parentControl = _lookupControl[0],
+    found = _lookupControl[1];
   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;
+  var childControl = schemaField && found ? (_parentControl$fields = parentControl.fields) == null ? void 0 : _parentControl$fields[schemaField.field] : undefined;
   return [parentControl, childControl && elementIndex != null ? (_childControl$element = childControl.elements) == null ? void 0 : _childControl$element[elementIndex] : childControl, schemaField ? _extends({}, parentContext, {
     path: childPath,
     fields: isCompoundField(schemaField) ? schemaField.children : parentContext.fields
   }) : parentContext];
 }
+function lookupControl(control, path) {
+  var _base;
+  var base = control;
+  var index = 0;
+  while (index < path.length && base) {
+    control = base;
+    var childId = path[index];
+    var c = base.current;
+    if (typeof childId === "string") {
+      var _c$fields;
+      base = (_c$fields = c.fields) == null ? void 0 : _c$fields[childId];
+    } else {
+      var _c$elements;
+      base = (_c$elements = c.elements) == null ? void 0 : _c$elements[childId];
+    }
+    index++;
+  }
+  return [(_base = base) != null ? _base : control, !!base];
+}
 function ControlRenderer(_ref3) {
   var _effect = core.useComponentTracking();
   try {