@react-typed-forms/schemas 14.3.0 → 14.4.0

package/lib/controlDefinition.d.ts

@@ -284,8 +284,9 @@ export interface GridRenderer extends GroupRenderOptions {
     type: GroupRenderType.Grid;
     columns?: number | null;
 }
-export interface TabsGroupRenderer extends GroupRenderOptions {
+export interface TabsRenderOptions extends GroupRenderOptions {
     type: GroupRenderType.Tabs;
+    contentClass?: string;
 }
 export interface SelectChildRenderer extends GroupRenderOptions {
     type: GroupRenderType.SelectChild;
@@ -334,7 +335,7 @@ export interface ControlVisitor<A> {
 export declare function visitControlDefinition<A>(x: ControlDefinition, visitor: ControlVisitor<A>, defaultValue: (c: ControlDefinition) => A): A;
 export declare function isGridRenderer(options: GroupRenderOptions): options is GridRenderer;
 export declare function isSelectChildRenderer(options: GroupRenderOptions): options is SelectChildRenderer;
-export declare function isTabsRenderer(options: GroupRenderOptions): options is TabsGroupRenderer;
+export declare function isTabsRenderer(options: GroupRenderOptions): options is TabsRenderOptions;
 export declare function isFlexRenderer(options: GroupRenderOptions): options is FlexRenderer;
 export declare function isDisplayOnlyRenderer(options: RenderOptions): options is DisplayOnlyRenderOptions;
 export declare function isTextfieldRenderer(options: RenderOptions): options is TextfieldRenderOptions;
@@ -352,26 +353,29 @@ export declare function isCheckEntryClasses(options?: RenderOptions | null): opt
 export type ControlMap = {
     [k: string]: ControlDefinition;
 };
-export declare class FormNode {
+export interface FormNode {
     id: string;
     definition: ControlDefinition;
     tree: FormTree;
-    parent?: FormNode | undefined;
-    overrideChildren?: FormNode[] | undefined;
-    constructor(id: string, definition: ControlDefinition, tree: FormTree, parent?: FormNode | undefined, overrideChildren?: FormNode[] | undefined);
-    getChildNodes(): FormNode[];
-    withOverrideChildren(children: ControlDefinition[]): FormNode;
+    parent?: FormNode;
+    getChildNodes(dontFollowRef?: boolean): FormNode[];
 }
-export interface FormTreeLookup<A = string> {
-    getForm(formId: A): FormTree | undefined;
+export declare function defaultGetChildNodes(parent: FormNode, children?: ControlDefinition[] | null): FormNode[];
+export interface FormTreeLookup {
+    getForm(formId: string): FormTree | undefined;
 }
 export interface FormTree extends FormTreeLookup {
     rootNode: FormNode;
-    controlMap: ControlMap;
+    getChildrenForId(id: string, parent: FormNode): FormNode[];
 }
+export declare function wrapFormNode(node: FormNode, getChildren?: (dontFollowRef?: boolean) => FormNode[]): FormNode;
 export declare function nodeForControl(definition: ControlDefinition, tree: FormTree, indexOrId?: number | string, parent?: FormNode): FormNode;
 export declare function legacyFormNode(definition: ControlDefinition): FormNode;
-export declare function createFormLookup<A extends Record<string, ControlDefinition[]>>(formMap: A): FormTreeLookup<keyof A>;
+export declare function createFormTreeWithRoot(createRootNode: (tree: FormTree) => FormNode, getChildrenForId: (id: string, parent: FormNode) => FormNode[], getForm?: FormTreeLookup): FormTree;
+export declare function createFormTree(controls: ControlDefinition[], getForm?: FormTreeLookup): FormTree;
+export declare function createFormLookup<A extends Record<string, ControlDefinition[]>>(formMap: A): {
+    getForm(formId: keyof A): FormTree;
+};
 export declare function fieldPathForDefinition(c: ControlDefinition): string[] | undefined;
 export declare function lookupDataNode(c: ControlDefinition, parentNode: SchemaDataNode): SchemaDataNode | undefined;
 export declare function traverseParents<A, B extends {

package/lib/controlRender.d.ts

@@ -53,7 +53,7 @@ export interface FormRenderer {
      * @param labelEnd - React node to render at the end of the label.
      * @returns A React node.
      */
-    renderLabel: (props: LabelRendererProps, labelStart: ReactNode, labelEnd: ReactNode) => ReactNode;
+    renderLabel: (props: LabelRendererProps, labelStart?: ReactNode, labelEnd?: ReactNode) => ReactNode;
     /**
      * Renders layout.
      * @param props - Properties for control layout.
@@ -72,6 +72,8 @@ export interface FormRenderer {
      * @returns A React node.
      */
     renderLabelText: (props: ReactNode) => ReactNode;
+    renderText: (props: ReactNode) => ReactNode;
+    h: (type: any, props: any, ...children: any[]) => ReactElement;
 }
 export interface AdornmentProps {
     adornment: ControlAdornment;

package/lib/index.cjs

@@ -451,46 +451,33 @@ function isCheckEntryClasses(options) {
       return false;
   }
 }
-var FormNode = /*#__PURE__*/function () {
-  function FormNode(id, definition, tree, parent, overrideChildren) {
-    this.id = void 0;
-    this.definition = void 0;
-    this.tree = void 0;
-    this.parent = void 0;
-    this.overrideChildren = void 0;
-    this.id = id;
-    this.definition = definition;
-    this.tree = tree;
-    this.parent = parent;
-    this.overrideChildren = overrideChildren;
-    this.id = id;
-    this.definition = definition;
-  }
-  var _proto = FormNode.prototype;
-  _proto.getChildNodes = function getChildNodes() {
-    var _children$map,
-      _children,
-      _this = this;
-    if (this.overrideChildren) return this.overrideChildren;
-    var children = this.definition.children;
-    if (this.definition.childRefId) {
-      var ref = this.tree.controlMap[this.definition.childRefId];
-      children = ref == null ? void 0 : ref.children;
+function defaultGetChildNodes(parent, children) {
+  var _children$map;
+  return (_children$map = children == null ? void 0 : children.map(function (x, i) {
+    return nodeForControl(x, parent.tree, i, parent);
+  })) != null ? _children$map : [];
+}
+function wrapFormNode(node, getChildren) {
+  return _extends({}, node, {
+    getChildNodes: getChildren != null ? getChildren : function (dfr) {
+      return node.getChildNodes(dfr);
     }
-    return (_children$map = (_children = children) == null ? void 0 : _children.map(function (x, i) {
-      return new FormNode(_this.id + "/" + i, x, _this.tree, _this);
-    })) != null ? _children$map : [];
-  };
-  _proto.withOverrideChildren = function withOverrideChildren(children) {
-    var _this2 = this;
-    return new FormNode(this.id, this.definition, this.tree, this.parent, children.map(function (x) {
-      return nodeForControl(x, _this2.tree);
-    }));
-  };
-  return FormNode;
-}();
+  });
+}
 function nodeForControl(definition, tree, indexOrId, parent) {
-  return new FormNode(parent ? parent.id + "/" + indexOrId : "", definition, tree, parent);
+  return {
+    id: parent ? parent.id + "/" + indexOrId : "",
+    definition: definition,
+    tree: tree,
+    parent: parent,
+    getChildNodes: function getChildNodes(dontFollowRef) {
+      var children = this.definition.children;
+      if (!dontFollowRef && this.definition.childRefId) {
+        return this.tree.getChildrenForId(this.definition.childRefId, this);
+      }
+      return defaultGetChildNodes(this, children);
+    }
+  };
 }
 function legacyFormNode(definition) {
   return createFormLookup({
@@ -502,17 +489,42 @@ function getControlIds(definition) {
   var childEntries = (_definition$children$ = (_definition$children = definition.children) == null ? void 0 : _definition$children.flatMap(getControlIds)) != null ? _definition$children$ : [];
   return !definition.id ? childEntries : [[definition.id, definition]].concat(childEntries);
 }
-function makeFormTree(controls, getForm) {
-  var tree = {
-    getForm: getForm,
-    controlMap: Object.fromEntries(controls.flatMap(getControlIds))
-  };
-  tree.rootNode = nodeForControl({
-    children: controls,
-    type: exports.ControlDefinitionType.Group
-  }, tree);
+function createFormTreeWithRoot(createRootNode, getChildrenForId, getForm) {
+  if (getForm === void 0) {
+    getForm = {
+      getForm: function getForm() {
+        return undefined;
+      }
+    };
+  }
+  var tree = _extends({}, getForm, {
+    getChildrenForId: getChildrenForId,
+    rootNode: undefined
+  });
+  tree.rootNode = createRootNode(tree);
   return tree;
 }
+function createFormTree(controls, getForm) {
+  if (getForm === void 0) {
+    getForm = {
+      getForm: function getForm() {
+        return undefined;
+      }
+    };
+  }
+  var controlMap = Object.fromEntries(controls.flatMap(getControlIds));
+  return createFormTreeWithRoot(function (tree) {
+    return nodeForControl({
+      children: controls,
+      type: exports.ControlDefinitionType.Group
+    }, tree);
+  }, function (id, parent) {
+    var _controlMap$id$childr, _controlMap$id;
+    return (_controlMap$id$childr = (_controlMap$id = controlMap[id]) == null || (_controlMap$id = _controlMap$id.children) == null ? void 0 : _controlMap$id.map(function (x, i) {
+      return nodeForControl(x, parent.tree, i, parent);
+    })) != null ? _controlMap$id$childr : [];
+  }, getForm);
+}
 function createFormLookup(formMap) {
   var lookup = {
     getForm: getForm
@@ -520,7 +532,7 @@ function createFormLookup(formMap) {
   var forms = Object.fromEntries(Object.entries(formMap).map(function (_ref) {
     var k = _ref[0],
       v = _ref[1];
-    return [k, makeFormTree(v, lookup)];
+    return [k, createFormTree(v, lookup)];
   }));
   return lookup;
   function getForm(formId) {
@@ -2389,7 +2401,7 @@ function useControlRenderer(definition, fields, renderer, options) {
   return React.useCallback(function (_ref) {
     var control = _ref.control,
       parentPath = _ref.parentPath;
-    return React__default["default"].createElement(ControlRenderer, _extends({}, r.current, {
+    return /*#__PURE__*/React__default["default"].createElement(ControlRenderer, _extends({}, r.current, {
       control: control,
       parentPath: parentPath
     }));
@@ -2400,7 +2412,7 @@ function useControlRendererComponent(controlOrFormNode, renderer, options, paren
   if (options === void 0) {
     options = {};
   }
-  var _ref2 = controlOrFormNode instanceof FormNode ? [controlOrFormNode.definition, controlOrFormNode] : [controlOrFormNode, legacyFormNode(controlOrFormNode)],
+  var _ref2 = "definition" in controlOrFormNode ? [controlOrFormNode.definition, controlOrFormNode] : [controlOrFormNode, legacyFormNode(controlOrFormNode)],
     definition = _ref2[0],
     formNode = _ref2[1];
   var dataProps = (_options$useDataHook = options.useDataHook == null ? void 0 : options.useDataHook(definition)) != null ? _options$useDataHook : defaultDataProps;
@@ -2536,7 +2548,7 @@ function useControlRendererComponent(controlOrFormNode, renderer, options, paren
       React.useEffect(function () {
         if (control && typeof myOptions.disabled === "boolean" && control.disabled != myOptions.disabled) control.disabled = myOptions.disabled;
       }, [control, myOptions.disabled]);
-      if (parentControl.isNull) return 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$adornment2 = (_definition$adornment3 = definition.adornments) == null ? void 0 : _definition$adornment3.map(function (x) {
         return renderer.renderAdornment({
           adornment: x,
@@ -2556,7 +2568,7 @@ function useControlRendererComponent(controlOrFormNode, renderer, options, paren
             parentDataNode = _ref4.parentDataNode,
             renderOptions = _objectWithoutPropertiesLoose(_ref4, _excluded);
           var dContext = (_ref5 = parentDataNode != null ? parentDataNode : dataContext.dataNode) != null ? _ref5 : dataContext.parentNode;
-          return React__default["default"].createElement(NewControlRenderer, {
+          return /*#__PURE__*/React__default["default"].createElement(NewControlRenderer, {
             key: k,
             definition: child,
             renderer: renderer,
@@ -2602,24 +2614,35 @@ function useControlRendererComponent(controlOrFormNode, renderer, options, paren
   return Component;
 }
 function ControlRenderer(_ref7) {
-  var definition = _ref7.definition,
-    fields = _ref7.fields,
-    renderer = _ref7.renderer,
-    options = _ref7.options,
-    control = _ref7.control;
-  var schemaDataNode = makeSchemaDataNode(createSchemaLookup({
-    "": fields
-  }).getSchema(""), control);
-  var Render = useControlRendererComponent(definition, renderer, options, schemaDataNode);
-  return React__default["default"].createElement(Render, null);
+  var _effect = core.useComponentTracking();
+  try {
+    var definition = _ref7.definition,
+      fields = _ref7.fields,
+      renderer = _ref7.renderer,
+      options = _ref7.options,
+      control = _ref7.control,
+      parentPath = _ref7.parentPath;
+    var schemaDataNode = makeSchemaDataNode(createSchemaLookup({
+      "": fields
+    }).getSchema(""), control);
+    var Render = useControlRendererComponent(definition, renderer, options, schemaDataNode);
+    return /*#__PURE__*/React__default["default"].createElement(Render, null);
+  } finally {
+    _effect();
+  }
 }
 function NewControlRenderer(_ref8) {
-  var definition = _ref8.definition,
-    renderer = _ref8.renderer,
-    options = _ref8.options,
-    parentDataNode = _ref8.parentDataNode;
-  var Render = useControlRendererComponent(definition, renderer, options, parentDataNode);
-  return React__default["default"].createElement(Render, null);
+  var _effect2 = core.useComponentTracking();
+  try {
+    var definition = _ref8.definition,
+      renderer = _ref8.renderer,
+      options = _ref8.options,
+      parentDataNode = _ref8.parentDataNode;
+    var Render = useControlRendererComponent(definition, renderer, options, parentDataNode);
+    return /*#__PURE__*/React__default["default"].createElement(Render, null);
+  } finally {
+    _effect2();
+  }
 }
 function defaultDataProps(_ref9) {
   var _allowedOptions$value, _definition$renderOpt2;
@@ -2777,7 +2800,7 @@ function renderControlLayout(props) {
 }
 function appendMarkup(k, markup) {
   return function (layout) {
-    return layout[k] = React__default["default"].createElement(React__default["default"].Fragment, null, layout[k], markup);
+    return layout[k] = /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, layout[k], markup);
   };
 }
 function wrapMarkup(k, wrap) {
@@ -2963,7 +2986,7 @@ function applyArrayLengthRestrictions(_ref13, disable) {
 }
 function fieldOptionAdornment(p) {
   return function (o, i, selected) {
-    return React__default["default"].createElement(core.RenderArrayElements, {
+    return /*#__PURE__*/React__default["default"].createElement(core.RenderArrayElements, {
       array: p.formNode.getChildNodes()
     }, function (cd, i) {
       return p.renderChild(i, cd, {
@@ -3069,9 +3092,14 @@ function createFormRenderer(customRenderers, defaultRenderers) {
     renderArray: renderArray,
     renderAdornment: renderAdornment,
     renderLayout: renderLayout,
-    renderVisibility: visibilityRenderer.render,
-    renderLabelText: renderLabelText
+    renderVisibility: renderVisibility,
+    renderLabelText: renderLabelText,
+    renderText: defaultRenderers.renderText,
+    h: defaultRenderers.h
   };
+  function renderVisibility(props) {
+    return visibilityRenderer.render(props, formRenderers);
+  }
   function renderLabelText(label) {
     return renderLabel({
       label: label,
@@ -3104,13 +3132,12 @@ function createFormRenderer(customRenderers, defaultRenderers) {
     return renderer.render(props, labelStart, labelEnd, formRenderers);
   }
   function renderData(props) {
-    var _dataRegistrations$fi;
     var renderOptions = props.renderOptions,
       field = props.field;
     var options = hasOptions(props);
     var renderType = renderOptions.type;
-    var renderer = (_dataRegistrations$fi = dataRegistrations.find(matchesRenderer)) != null ? _dataRegistrations$fi : defaultRenderers.data;
-    var result = renderer.render(props, formRenderers);
+    var renderer = dataRegistrations.find(matchesRenderer);
+    var result = (renderer != null ? renderer : defaultRenderers.data).render(props, formRenderers);
     if (typeof result === "function") return result;
     return function (l) {
       return _extends({}, l, {
@@ -3119,10 +3146,12 @@ function createFormRenderer(customRenderers, defaultRenderers) {
     };
     function matchesRenderer(x) {
       var _x$collection, _field$collection, _x$options;
+      var noMatch = x.match ? !x.match(props, renderOptions) : undefined;
+      if (noMatch === true) return false;
       var matchCollection = ((_x$collection = x.collection) != null ? _x$collection : false) === (props.elementIndex == null && ((_field$collection = field.collection) != null ? _field$collection : false));
-      var matchSchemaType = x.schemaType && renderType == exports.DataRenderType.Standard && isOneOf(x.schemaType, field.type);
-      var 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));
+      var isSchemaAllowed = !!x.schemaType && renderType == exports.DataRenderType.Standard ? isOneOf(x.schemaType, field.type) : undefined;
+      var 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) {
@@ -3190,7 +3219,6 @@ function isArrayRegistration(x) {
 exports.AppendAdornmentPriority = AppendAdornmentPriority;
 exports.ControlRenderer = ControlRenderer;
 exports.DefaultSchemaInterface = DefaultSchemaInterface;
-exports.FormNode = FormNode;
 exports.NewControlRenderer = NewControlRenderer;
 exports.WrapAdornmentPriority = WrapAdornmentPriority;
 exports.accordionOptions = accordionOptions;
@@ -3228,6 +3256,8 @@ exports.createDataRenderer = createDataRenderer;
 exports.createDisplayRenderer = createDisplayRenderer;
 exports.createFormLookup = createFormLookup;
 exports.createFormRenderer = createFormRenderer;
+exports.createFormTree = createFormTree;
+exports.createFormTreeWithRoot = createFormTreeWithRoot;
 exports.createGroupRenderer = createGroupRenderer;
 exports.createLabelRenderer = createLabelRenderer;
 exports.createLayoutRenderer = createLayoutRenderer;
@@ -3241,6 +3271,7 @@ exports.defaultCompoundField = defaultCompoundField;
 exports.defaultControlForField = defaultControlForField;
 exports.defaultDataProps = defaultDataProps;
 exports.defaultEvalHooks = defaultEvalHooks;
+exports.defaultGetChildNodes = defaultGetChildNodes;
 exports.defaultScalarField = defaultScalarField;
 exports.defaultSchemaInterface = defaultSchemaInterface;
 exports.defaultUseEvalExpressionHook = defaultUseEvalExpressionHook;
@@ -3387,6 +3418,7 @@ exports.visitControlDefinition = visitControlDefinition;
 exports.visitFormData = visitFormData;
 exports.visitFormDataInContext = visitFormDataInContext;
 exports.withScalarOptions = withScalarOptions;
+exports.wrapFormNode = wrapFormNode;
 exports.wrapLayout = wrapLayout;
 exports.wrapMarkup = wrapMarkup;
 exports.wrapMarkupAt = wrapMarkupAt;