@react-typed-forms/schemas 11.17.0 → 11.18.1

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";
-export declare function createDefaultArrayDataRenderer(): DataRendererRegistration;
-export interface DefaultArrayRendererOptions {
+import { ArrayActionOptions } from "../types";
+export declare function createDefaultArrayDataRenderer(defaultActions?: ArrayActionOptions): DataRendererRegistration;
+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";
@@ -218,7 +218,7 @@ export declare function getLengthRestrictions(definition: DataControlDefinition)
     min: number | null | undefined;
     max: number | null | undefined;
 };
-export declare function createArrayActions(control: Control<any[]>, field: SchemaField, addText?: string | null, removeText?: string | null, noAdd?: boolean | null, noRemove?: boolean | null): Pick<ArrayRendererProps, "addAction" | "removeAction" | "arrayControl">;
+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/createDefaultRenderers.d.ts

@@ -2,7 +2,7 @@ import { DefaultDisplayRendererOptions } from "./components/DefaultDisplay";
 import { DefaultLayoutRendererOptions } from "./components/DefaultLayout";
 import { ActionRendererRegistration, AdornmentRendererRegistration, DataRendererRegistration, DefaultRenderers, GroupRendererRegistration, LabelRendererRegistration } from "./renderers";
 import { CSSProperties, ReactElement, ReactNode } from "react";
-import { FieldOption, GridRenderer } from "./types";
+import { ArrayActionOptions, FieldOption, GridRenderer } from "./types";
 import { SelectRendererOptions } from "./components/SelectDataRenderer";
 import { Control } from "@react-typed-forms/core";
 import { DefaultArrayRendererOptions } from "./components/DefaultArrayRenderer";
@@ -49,6 +49,7 @@ interface DefaultDataRendererOptions {
     optionRenderer?: DataRendererRegistration;
     multilineClass?: string;
     jsonataClass?: string;
+    arrayOptions?: ArrayActionOptions;
 }
 export declare function createDefaultDataRenderer(options?: DefaultDataRendererOptions): DataRendererRegistration;
 export interface DefaultAccordionRendererOptions {

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) {
@@ -1921,13 +1939,20 @@ function getLengthRestrictions(definition) {
     max: lengthVal == null ? void 0 : lengthVal.max
   };
 }
-function createArrayActions(control, field, addText, removeText, noAdd, noRemove) {
+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: "add",
+      actionId: addActionId ? addActionId : "add",
       actionText: addText ? addText : "Add " + noun,
       onClick: function onClick() {
         return core.addElement(control, elementValueForField(field));
@@ -1935,7 +1960,7 @@ function createArrayActions(control, field, addText, removeText, noAdd, noRemove
     } : undefined,
     removeAction: !noRemove ? function (i) {
       return {
-        actionId: "remove",
+        actionId: removeActionId ? removeActionId : "remove",
         actionText: removeText ? removeText : "Remove",
         onClick: function onClick() {
           return core.removeElement(control, i);
@@ -1944,14 +1969,14 @@ function createArrayActions(control, field, addText, removeText, noAdd, noRemove
     } : undefined
   };
 }
-function applyArrayLengthRestrictions(_ref7, disable) {
+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];
@@ -2372,7 +2397,7 @@ function createInputConversion(ft) {
   }
 }
 
-function createDefaultArrayDataRenderer() {
+function createDefaultArrayDataRenderer(defaultActions) {
   return createDataRenderer(function (_ref, renderers) {
     var definition = _ref.definition,
       control = _ref.control,
@@ -2383,13 +2408,18 @@ function createDefaultArrayDataRenderer() {
       className = _ref.className,
       style = _ref.style,
       renderOptions = _ref.renderOptions;
-    var _ref2 = isArrayRenderer(renderOptions) ? renderOptions : {},
-      addText = _ref2.addText,
-      noAdd = _ref2.noAdd,
-      noRemove = _ref2.noRemove,
-      removeText = _ref2.removeText;
+    var _mergeObjects = mergeObjects(isArrayRenderer(renderOptions) ? renderOptions : {}, defaultActions),
+      addText = _mergeObjects.addText,
+      noAdd = _mergeObjects.noAdd,
+      noRemove = _mergeObjects.noRemove,
+      removeText = _mergeObjects.removeText;
     var childOptions = isArrayRenderer(renderOptions) ? renderOptions.childOptions : undefined;
-    var arrayProps = _extends({}, createArrayActions(control, field, addText, removeText, noAdd, noRemove), {
+    var arrayProps = _extends({}, createArrayActions(control, field, {
+      addText: addText,
+      removeText: removeText,
+      noAdd: noAdd,
+      noRemove: noRemove
+    }), {
       required: required,
       renderElement: function renderElement(i) {
         var _control$elements$i$u, _control$elements;
@@ -2414,8 +2444,8 @@ function createDefaultArrayDataRenderer() {
 }
 function createDefaultArrayRenderer(options) {
   return {
-    render: function render(props, _ref3) {
-      var renderAction = _ref3.renderAction;
+    render: function render(props, _ref2) {
+      var renderAction = _ref2.renderAction;
       return /*#__PURE__*/React__default["default"].createElement(DefaultArrayRenderer, _extends({}, props, options, {
         renderAction: renderAction
       }));
@@ -2868,13 +2898,15 @@ function createDefaultDataRenderer(options) {
     booleanOptions = _optionRenderer$boole.booleanOptions,
     optionRenderer = _optionRenderer$boole.optionRenderer,
     displayOnlyClass = _optionRenderer$boole.displayOnlyClass;
-  var arrayRenderer = createDefaultArrayDataRenderer();
+  var arrayRenderer = createDefaultArrayDataRenderer(options.arrayOptions);
   return createDataRenderer(function (props, renderers) {
     var field = props.field;
     var fieldType = field.type;
     var renderOptions = props.renderOptions;
-    if (field.collection && props.elementIndex == null) return arrayRenderer.render(props, renderers);
     var renderType = renderOptions.type;
+    if (field.collection && props.elementIndex == null && renderType == exports.DataRenderType.Standard) {
+      return arrayRenderer.render(props, renderers);
+    }
     if (fieldType === exports.FieldType.Compound) {
       var _ref5;
       var groupOptions = (_ref5 = isDataGroupRenderer(renderOptions) ? renderOptions.groupOptions : undefined) != null ? _ref5 : {
@@ -3364,6 +3396,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;