@react-typed-forms/schemas 11.2.1 → 11.3.2

package/lib/components/DefaultLayout.d.ts

@@ -1,9 +1,10 @@
 import { RenderedLayout } from "../controlRender";
-import React from "react";
+import React, { ReactNode } from "react";
 export interface DefaultLayoutRendererOptions {
     className?: string;
     errorClass?: string;
+    renderError?: (errorText: string | null | undefined) => ReactNode;
 }
-export declare function DefaultLayout({ errorClass, layout: { controlEnd, controlStart, label, children, errorControl }, }: DefaultLayoutRendererOptions & {
+export declare function DefaultLayout({ errorClass, renderError, layout: { controlEnd, controlStart, label, children, errorControl }, }: DefaultLayoutRendererOptions & {
     layout: RenderedLayout;
 }): React.JSX.Element;

package/lib/index.js

@@ -462,9 +462,10 @@ function visitControlData(definition, ctx, cb) {
     if (!fieldData) return !fieldName ? visitControlDataArray(children, ctx, cb) : undefined;
     var thisPath = [].concat(ctx.path, [fieldData.field]);
     var control = ctx.data.lookupControl(thisPath);
-    if (!control) throw "No control for field";
+    if (!control) return undefined;
     var result = def ? cb(def, fieldData, control, false) : undefined;
     if (result !== undefined) return result;
+    var compound = isCompoundField(fieldData);
     if (fieldData.collection) {
       var cIndex = 0;
       for (var _iterator3 = _createForOfIteratorHelperLoose((_control$elements = control.elements) != null ? _control$elements : []), _step3; !(_step3 = _iterator3()).done;) {
@@ -472,7 +473,7 @@ function visitControlData(definition, ctx, cb) {
         var c = _step3.value;
         var elemResult = def ? cb(def, fieldData, c, true) : undefined;
         if (elemResult !== undefined) return elemResult;
-        if (isCompoundField(fieldData)) {
+        if (compound) {
           var cfResult = visitControlDataArray(children, _extends({}, ctx, {
             fields: fieldData.children,
             path: [].concat(thisPath, [cIndex])
@@ -481,7 +482,13 @@ function visitControlData(definition, ctx, cb) {
         }
         cIndex++;
       }
+    } else if (compound) {
+      return visitControlDataArray(children, _extends({}, ctx, {
+        fields: fieldData.children,
+        path: thisPath
+      }), cb);
     }
+    return undefined;
   }
 }
 function lookupChildControl(data, path) {
@@ -1935,6 +1942,12 @@ function DefaultLayout(_ref) {
   var _effect = core.useComponentTracking();
   try {
     var errorClass = _ref.errorClass,
+      _ref$renderError = _ref.renderError,
+      renderError = _ref$renderError === void 0 ? function (e) {
+        return e && /*#__PURE__*/React__default["default"].createElement("div", {
+          className: errorClass
+        }, e);
+      } : _ref$renderError,
       _ref$layout = _ref.layout,
       controlEnd = _ref$layout.controlEnd,
       controlStart = _ref$layout.controlStart,
@@ -1943,9 +1956,7 @@ function DefaultLayout(_ref) {
       errorControl = _ref$layout.errorControl;
     var ec = errorControl;
     var errorText = ec && ec.touched ? ec.error : undefined;
-    return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, label, controlStart, children, errorText && /*#__PURE__*/React__default["default"].createElement("div", {
-      className: errorClass
-    }, errorText), controlEnd);
+    return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, label, controlStart, children, renderError(errorText), controlEnd);
   } finally {
     _effect();
   }