@react-typed-forms/schemas 11.16.0 → 11.18.0

package/lib/components/DefaultArrayRenderer.d.ts

@@ -1,8 +1,9 @@
 import { ArrayRendererRegistration, DataRendererRegistration } from "../renderers";
 import { ActionRendererProps, ArrayRendererProps } from "../controlRender";
 import React, { ReactNode } from "react";
+import { ArrayActionOptions } from "../types";
 export declare function createDefaultArrayDataRenderer(): DataRendererRegistration;
-export interface DefaultArrayRendererOptions {
+export interface DefaultArrayRendererOptions extends ArrayActionOptions {
     className?: string;
     removableClass?: string;
     childClass?: string;

package/lib/controlRender.d.ts

@@ -1,6 +1,6 @@
 import React, { FC, Key, ReactElement, ReactNode } from "react";
 import { Control } from "@react-typed-forms/core";
-import { AdornmentPlacement, ControlAdornment, ControlDefinition, DataControlDefinition, DisplayData, FieldOption, GroupRenderOptions, RenderOptions, SchemaField, SchemaInterface, SchemaValidator } from "./types";
+import { AdornmentPlacement, ArrayRenderOptions, ControlAdornment, ControlDefinition, DataControlDefinition, DisplayData, FieldOption, GroupRenderOptions, RenderOptions, SchemaField, SchemaInterface, SchemaValidator } from "./types";
 import { ControlDataContext, JsonPath } from "./util";
 import { EvalExpressionHook, UseEvalExpressionHook } from "./hooks";
 import { ValidationContext } from "./validators";
@@ -214,6 +214,11 @@ export declare function appendMarkupAt(pos: AdornmentPlacement, markup: ReactNod
 export declare function wrapMarkupAt(pos: AdornmentPlacement, wrap: (ex: ReactNode) => ReactNode): (layout: RenderedLayout) => void;
 export declare function renderLayoutParts(props: ControlLayoutProps, renderer: FormRenderer): RenderedLayout;
 export declare function controlTitle(title: string | undefined | null, field: SchemaField): string;
+export declare function getLengthRestrictions(definition: DataControlDefinition): {
+    min: number | null | undefined;
+    max: number | null | undefined;
+};
+export declare function createArrayActions(control: Control<any[]>, field: SchemaField, options?: Pick<ArrayRenderOptions, "addText" | "removeText" | "noAdd" | "noRemove" | "addActionId" | "removeActionId">): Pick<ArrayRendererProps, "addAction" | "removeAction" | "arrayControl">;
 export declare function applyArrayLengthRestrictions({ arrayControl, min, max, addAction: aa, removeAction: ra, required, }: Pick<ArrayRendererProps, "addAction" | "removeAction" | "arrayControl" | "min" | "max" | "required">, disable?: boolean): Pick<ArrayRendererProps, "addAction" | "removeAction"> & {
     addDisabled: boolean;
     removeDisabled: boolean;

package/lib/index.js

@@ -683,6 +683,24 @@ function findFieldPath(fields, fieldPath) {
   }
   return foundFields.length === fieldNames.length ? foundFields : undefined;
 }
+function mergeObjects(o1, o2, doMerge) {
+  if (doMerge === void 0) {
+    doMerge = function doMerge(_, v1, v2) {
+      return v1 != null ? v1 : v2;
+    };
+  }
+  if (!o1) return o2;
+  if (!o2) return o1;
+  var result = _extends({}, o1);
+  for (var key in o2) {
+    if (o2.hasOwnProperty(key)) {
+      var value1 = o1[key];
+      var value2 = o2[key];
+      result[key] = doMerge(key, value1, value2);
+    }
+  }
+  return result;
+}
 
 function buildSchema(def) {
   return Object.entries(def).map(function (x) {
@@ -1911,14 +1929,54 @@ function renderLayoutParts(props, renderer) {
 function controlTitle(title, field) {
   return title ? title : fieldDisplayName(field);
 }
-function applyArrayLengthRestrictions(_ref7, disable) {
+function getLengthRestrictions(definition) {
+  var _definition$validator;
+  var lengthVal = (_definition$validator = definition.validators) == null ? void 0 : _definition$validator.find(function (x) {
+    return x.type === exports.ValidatorType.Length;
+  });
+  return {
+    min: lengthVal == null ? void 0 : lengthVal.min,
+    max: lengthVal == null ? void 0 : lengthVal.max
+  };
+}
+function createArrayActions(control, field, options) {
+  var _field$displayName;
+  var noun = (_field$displayName = field.displayName) != null ? _field$displayName : field.field;
+  var _ref7 = options != null ? options : {},
+    addText = _ref7.addText,
+    noAdd = _ref7.noAdd,
+    removeText = _ref7.removeText,
+    noRemove = _ref7.noRemove,
+    removeActionId = _ref7.removeActionId,
+    addActionId = _ref7.addActionId;
+  return {
+    arrayControl: control,
+    addAction: !noAdd ? {
+      actionId: addActionId ? addActionId : "add",
+      actionText: addText ? addText : "Add " + noun,
+      onClick: function onClick() {
+        return core.addElement(control, elementValueForField(field));
+      }
+    } : undefined,
+    removeAction: !noRemove ? function (i) {
+      return {
+        actionId: removeActionId ? removeActionId : "remove",
+        actionText: removeText ? removeText : "Remove",
+        onClick: function onClick() {
+          return core.removeElement(control, i);
+        }
+      };
+    } : undefined
+  };
+}
+function applyArrayLengthRestrictions(_ref8, disable) {
   var _arrayControl$element, _arrayControl$element2;
-  var arrayControl = _ref7.arrayControl,
-    min = _ref7.min,
-    max = _ref7.max,
-    aa = _ref7.addAction,
-    ra = _ref7.removeAction,
-    required = _ref7.required;
+  var arrayControl = _ref8.arrayControl,
+    min = _ref8.min,
+    max = _ref8.max,
+    aa = _ref8.addAction,
+    ra = _ref8.removeAction,
+    required = _ref8.required;
   var _applyLengthRestricti = applyLengthRestrictions((_arrayControl$element = (_arrayControl$element2 = arrayControl.elements) == null ? void 0 : _arrayControl$element2.length) != null ? _arrayControl$element : 0, min == null && required ? 1 : min, max, true, true),
     removeAllowed = _applyLengthRestricti[0],
     addAllowed = _applyLengthRestricti[1];
@@ -2341,7 +2399,6 @@ function createInputConversion(ft) {
 
 function createDefaultArrayDataRenderer() {
   return createDataRenderer(function (_ref, renderers) {
-    var _definition$validator, _field$displayName;
     var definition = _ref.definition,
       control = _ref.control,
       required = _ref.required,
@@ -2351,35 +2408,19 @@ function createDefaultArrayDataRenderer() {
       className = _ref.className,
       style = _ref.style,
       renderOptions = _ref.renderOptions;
-    var lengthVal = (_definition$validator = definition.validators) == null ? void 0 : _definition$validator.find(function (x) {
-      return x.type === exports.ValidatorType.Length;
-    });
     var _ref2 = isArrayRenderer(renderOptions) ? renderOptions : {},
       addText = _ref2.addText,
       noAdd = _ref2.noAdd,
       noRemove = _ref2.noRemove,
       removeText = _ref2.removeText;
     var childOptions = isArrayRenderer(renderOptions) ? renderOptions.childOptions : undefined;
-    var noun = (_field$displayName = field.displayName) != null ? _field$displayName : field.field;
-    var arrayProps = {
-      arrayControl: control,
+    var arrayProps = _extends({}, createArrayActions(control, field, {
+      addText: addText,
+      removeText: removeText,
+      noAdd: noAdd,
+      noRemove: noRemove
+    }), {
       required: required,
-      addAction: !noAdd ? {
-        actionId: "add",
-        actionText: addText ? addText : "Add " + noun,
-        onClick: function onClick() {
-          return core.addElement(control, elementValueForField(field));
-        }
-      } : undefined,
-      removeAction: !noRemove ? function (i) {
-        return {
-          actionId: "",
-          actionText: removeText ? removeText : "Remove",
-          onClick: function onClick() {
-            return core.removeElement(control, i);
-          }
-        };
-      } : undefined,
       renderElement: function renderElement(i) {
         var _control$elements$i$u, _control$elements;
         return renderChild((_control$elements$i$u = (_control$elements = control.elements) == null ? void 0 : _control$elements[i].uniqueId) != null ? _control$elements$i$u : i, {
@@ -2396,10 +2437,8 @@ function createDefaultArrayDataRenderer() {
         });
       },
       className: cc(className),
-      style: style,
-      min: lengthVal == null ? void 0 : lengthVal.min,
-      max: lengthVal == null ? void 0 : lengthVal.max
-    };
+      style: style
+    }, getLengthRestrictions(definition));
     return renderers.renderArray(arrayProps);
   });
 }
@@ -3254,6 +3293,7 @@ exports.controlTitle = controlTitle;
 exports.createAction = createAction;
 exports.createActionRenderer = createActionRenderer;
 exports.createAdornmentRenderer = createAdornmentRenderer;
+exports.createArrayActions = createArrayActions;
 exports.createArrayRenderer = createArrayRenderer;
 exports.createButtonActionRenderer = createButtonActionRenderer;
 exports.createCheckListRenderer = createCheckListRenderer;
@@ -3313,6 +3353,7 @@ exports.findScalarField = findScalarField;
 exports.getAllReferencedClasses = getAllReferencedClasses;
 exports.getControlData = getControlData;
 exports.getDisplayOnlyOptions = getDisplayOnlyOptions;
+exports.getLengthRestrictions = getLengthRestrictions;
 exports.getOverrideClass = getOverrideClass;
 exports.getTypeField = getTypeField;
 exports.groupedControl = groupedControl;
@@ -3353,6 +3394,7 @@ exports.makeScalarField = makeScalarField;
 exports.matchesType = matchesType;
 exports.mergeField = mergeField;
 exports.mergeFields = mergeFields;
+exports.mergeObjects = mergeObjects;
 exports.renderControlLayout = renderControlLayout;
 exports.renderLayoutParts = renderLayoutParts;
 exports.rendererClass = rendererClass;