@react-typed-forms/schemas 14.3.0 → 14.3.1

package/lib/index.js

@@ -2791,25 +2791,26 @@ function createFormRenderer(customRenderers = [], defaultRenderers) {
     return renderer.render(props, labelStart, labelEnd, formRenderers);
   }
   function renderData(props) {
-    var _dataRegistrations$fi;
     const {
       renderOptions,
       field
     } = props;
     const options = hasOptions(props);
     const renderType = renderOptions.type;
-    const renderer = (_dataRegistrations$fi = dataRegistrations.find(matchesRenderer)) != null ? _dataRegistrations$fi : defaultRenderers.data;
-    const result = renderer.render(props, formRenderers);
+    const renderer = dataRegistrations.find(matchesRenderer);
+    const result = (renderer != null ? renderer : defaultRenderers.data).render(props, formRenderers);
     if (typeof result === "function") return result;
     return l => _extends({}, l, {
       children: result
     });
     function matchesRenderer(x) {
       var _x$collection, _field$collection, _x$options;
+      const noMatch = x.match ? !x.match(props, renderOptions) : undefined;
+      if (noMatch === true) return false;
       const matchCollection = ((_x$collection = x.collection) != null ? _x$collection : false) === (props.elementIndex == null && ((_field$collection = field.collection) != null ? _field$collection : false));
-      const matchSchemaType = x.schemaType && renderType == DataRenderType.Standard && isOneOf(x.schemaType, field.type);
-      const matchRenderType = !x.renderType || isOneOf(x.renderType, renderType);
-      return matchCollection && ((_x$options = x.options) != null ? _x$options : false) === options && (matchSchemaType || matchRenderType) && (!x.match || x.match(props, renderOptions));
+      const isSchemaAllowed = !!x.schemaType && renderType == DataRenderType.Standard ? isOneOf(x.schemaType, field.type) : undefined;
+      const isRendererAllowed = !!x.renderType && isOneOf(x.renderType, renderType);
+      return matchCollection && ((_x$options = x.options) != null ? _x$options : false) === options && (isSchemaAllowed || isRendererAllowed || !x.renderType && !x.schemaType && noMatch === false);
     }
   }
   function renderGroup(props) {