@rjsf/react-bootstrap 6.0.0-beta.2 → 6.0.0-beta.21

package/dist/react-bootstrap.esm.js

@@ -15,10 +15,10 @@ function AddButton({
   return /* @__PURE__ */ jsx(
     Button,
     {
+      title: translateString(TranslatableString.AddItemButton),
       ...props,
       style: { width: "100%" },
       className: `ml-1 ${props.className}`,
-      title: translateString(TranslatableString.AddItemButton),
       children: /* @__PURE__ */ jsx(BsPlus, {})
     }
   );
@@ -63,7 +63,20 @@ import {
 } from "@rjsf/utils";
 import { jsx as jsx3, jsxs as jsxs2 } from "react/jsx-runtime";
 function ArrayFieldTemplate(props) {
-  const { canAdd, disabled, idSchema, uiSchema, items, onAddClick, readonly, registry, required, schema, title } = props;
+  const {
+    canAdd,
+    disabled,
+    fieldPathId,
+    uiSchema,
+    items,
+    optionalDataControl,
+    onAddClick,
+    readonly,
+    registry,
+    required,
+    schema,
+    title
+  } = props;
   const uiOptions = getUiOptions2(uiSchema);
   const ArrayFieldDescriptionTemplate = getTemplate2(
     "ArrayFieldDescriptionTemplate",
@@ -80,6 +93,7 @@ function ArrayFieldTemplate(props) {
     registry,
     uiOptions
   );
+  const showOptionalDataControlInTitle = !readonly && !disabled;
   const {
     ButtonTemplates: { AddButton: AddButton2 }
   } = registry.templates;
@@ -87,18 +101,19 @@ function ArrayFieldTemplate(props) {
     /* @__PURE__ */ jsx3(
       ArrayFieldTitleTemplate,
       {
-        idSchema,
+        fieldPathId,
         title: uiOptions.title || title,
         schema,
         uiSchema,
         required,
-        registry
+        registry,
+        optionalDataControl: showOptionalDataControlInTitle ? optionalDataControl : void 0
       }
     ),
     /* @__PURE__ */ jsx3(
       ArrayFieldDescriptionTemplate,
       {
-        idSchema,
+        fieldPathId,
         description: uiOptions.description || schema.description,
         schema,
         uiSchema,
@@ -106,13 +121,14 @@ function ArrayFieldTemplate(props) {
       }
     ),
     /* @__PURE__ */ jsxs2(Container, { fluid: true, className: "p-0 m-0", children: [
-      items && items.map(({ key, ...itemProps }) => /* @__PURE__ */ jsx3(ArrayFieldItemTemplate2, { ...itemProps }, key)),
+      !showOptionalDataControlInTitle ? optionalDataControl : void 0,
+      items.map(({ key, ...itemProps }) => /* @__PURE__ */ jsx3(ArrayFieldItemTemplate2, { ...itemProps }, key)),
       canAdd && /* @__PURE__ */ jsx3(Container, { className: "", children: /* @__PURE__ */ jsxs2(Row2, { className: "mt-2", children: [
         /* @__PURE__ */ jsx3(Col2, { xs: 9 }),
         /* @__PURE__ */ jsx3(Col2, { xs: 3, className: "py-4 col-lg-3 col-3", children: /* @__PURE__ */ jsx3(
           AddButton2,
           {
-            id: buttonId(idSchema, "add"),
+            id: buttonId(fieldPathId, "add"),
             className: "rjsf-array-item-add",
             onClick: onAddClick,
             disabled: disabled || readonly,
@@ -121,7 +137,7 @@ function ArrayFieldTemplate(props) {
           }
         ) })
       ] }) })
-    ] }, `array-item-list-${idSchema.$id}`)
+    ] }, `array-item-list-${fieldPathId.$id}`)
   ] }) }) });
 }
 
@@ -253,8 +269,8 @@ function RemoveButton(props) {
     IconButton,
     {
       title: translateString(TranslatableString3.RemoveButton),
-      ...props,
       variant: "danger",
+      ...props,
       icon: /* @__PURE__ */ jsx7(IoIosRemove, {})
     }
   );
@@ -265,11 +281,11 @@ import { errorId } from "@rjsf/utils";
 import ListGroup2 from "react-bootstrap/ListGroup";
 import { jsx as jsx8 } from "react/jsx-runtime";
 function FieldErrorTemplate(props) {
-  const { errors = [], idSchema } = props;
+  const { errors = [], fieldPathId } = props;
   if (errors.length === 0) {
     return null;
   }
-  const id = errorId(idSchema);
+  const id = errorId(fieldPathId);
   return /* @__PURE__ */ jsx8(ListGroup2, { as: "ul", id, children: errors.map((error, i) => {
     return /* @__PURE__ */ jsx8(ListGroup2.Item, { as: "li", className: "border-0 m-0 p-0", children: /* @__PURE__ */ jsx8("small", { className: "m-0 text-danger", children: error }) }, i);
   }) });
@@ -280,11 +296,11 @@ import { helpId } from "@rjsf/utils";
 import Form2 from "react-bootstrap/Form";
 import { jsx as jsx9 } from "react/jsx-runtime";
 function FieldHelpTemplate(props) {
-  const { idSchema, help, hasErrors } = props;
+  const { fieldPathId, help, hasErrors } = props;
   if (!help) {
     return null;
   }
-  const id = helpId(idSchema);
+  const id = helpId(fieldPathId);
   return /* @__PURE__ */ jsx9(Form2.Text, { className: hasErrors ? "text-danger" : "text-muted", id, children: help });
 }
 
@@ -367,6 +383,16 @@ function GridTemplate(props) {
   return /* @__PURE__ */ jsx11(Row3, { ...rest, children });
 }
 
+// src/MultiSchemaFieldTemplate/MultiSchemaFieldTemplate.tsx
+import Card2 from "react-bootstrap/Card";
+import { jsx as jsx12, jsxs as jsxs6 } from "react/jsx-runtime";
+function MultiSchemaFieldTemplate({ selector, optionSchemaField }) {
+  return /* @__PURE__ */ jsxs6(Card2, { style: { marginBottom: "1rem" }, children: [
+    /* @__PURE__ */ jsx12(Card2.Body, { children: selector }),
+    /* @__PURE__ */ jsx12(Card2.Body, { children: optionSchemaField })
+  ] });
+}
+
 // src/ObjectFieldTemplate/ObjectFieldTemplate.tsx
 import Row4 from "react-bootstrap/Row";
 import Col4 from "react-bootstrap/Col";
@@ -379,16 +405,17 @@ import {
   getUiOptions as getUiOptions4,
   titleId
 } from "@rjsf/utils";
-import { Fragment as Fragment2, jsx as jsx12, jsxs as jsxs6 } from "react/jsx-runtime";
+import { Fragment as Fragment2, jsx as jsx13, jsxs as jsxs7 } from "react/jsx-runtime";
 function ObjectFieldTemplate({
   description,
   title,
   properties,
   required,
   uiSchema,
-  idSchema,
+  fieldPathId,
   schema,
   formData,
+  optionalDataControl,
   onAddClick,
   disabled,
   readonly,
@@ -401,40 +428,43 @@ function ObjectFieldTemplate({
     registry,
     uiOptions
   );
+  const showOptionalDataControlInTitle = !readonly && !disabled;
   const {
     ButtonTemplates: { AddButton: AddButton2 }
   } = registry.templates;
-  return /* @__PURE__ */ jsxs6(Fragment2, { children: [
-    title && /* @__PURE__ */ jsx12(
+  return /* @__PURE__ */ jsxs7(Fragment2, { children: [
+    title && /* @__PURE__ */ jsx13(
       TitleFieldTemplate,
       {
-        id: titleId(idSchema),
+        id: titleId(fieldPathId),
         title,
         required,
         schema,
         uiSchema,
-        registry
+        registry,
+        optionalDataControl: showOptionalDataControlInTitle ? optionalDataControl : void 0
       }
     ),
-    description && /* @__PURE__ */ jsx12(
+    description && /* @__PURE__ */ jsx13(
       DescriptionFieldTemplate,
       {
-        id: descriptionId(idSchema),
+        id: descriptionId(fieldPathId),
         description,
         schema,
         uiSchema,
         registry
       }
     ),
-    /* @__PURE__ */ jsxs6(Container2, { fluid: true, className: "p-0", children: [
-      properties.map((element, index) => /* @__PURE__ */ jsx12(Row4, { style: { marginBottom: "10px" }, className: element.hidden ? "d-none" : void 0, children: /* @__PURE__ */ jsxs6(Col4, { xs: 12, children: [
+    /* @__PURE__ */ jsxs7(Container2, { fluid: true, className: "p-0", children: [
+      !showOptionalDataControlInTitle ? optionalDataControl : void 0,
+      properties.map((element, index) => /* @__PURE__ */ jsx13(Row4, { style: { marginBottom: "10px" }, className: element.hidden ? "d-none" : void 0, children: /* @__PURE__ */ jsxs7(Col4, { xs: 12, children: [
         " ",
         element.content
       ] }) }, index)),
-      canExpand(schema, uiSchema, formData) ? /* @__PURE__ */ jsx12(Row4, { children: /* @__PURE__ */ jsx12(Col4, { xs: { offset: 9, span: 3 }, className: "py-4", children: /* @__PURE__ */ jsx12(
+      canExpand(schema, uiSchema, formData) ? /* @__PURE__ */ jsx13(Row4, { children: /* @__PURE__ */ jsx13(Col4, { xs: { offset: 9, span: 3 }, className: "py-4", children: /* @__PURE__ */ jsx13(
         AddButton2,
         {
-          id: buttonId2(idSchema, "add"),
+          id: buttonId2(fieldPathId, "add"),
           onClick: onAddClick(schema),
           disabled: disabled || readonly,
           className: "rjsf-object-property-expand",
@@ -446,30 +476,77 @@ function ObjectFieldTemplate({
   ] });
 }
 
+// src/OptionalDataControlsTemplate/OptionalDataControlsTemplate.tsx
+import { BsPlus as BsPlus2 } from "@react-icons/all-files/bs/BsPlus";
+import { jsx as jsx14 } from "react/jsx-runtime";
+function OptionalDataControlsTemplate(props) {
+  const { id, registry, label, onAddClick, onRemoveClick } = props;
+  if (onAddClick) {
+    return /* @__PURE__ */ jsx14(
+      IconButton,
+      {
+        id,
+        registry,
+        className: "rjsf-add-optional-data",
+        icon: /* @__PURE__ */ jsx14(BsPlus2, {}),
+        onClick: onAddClick,
+        title: label,
+        size: "sm",
+        variant: "secondary"
+      }
+    );
+  } else if (onRemoveClick) {
+    return /* @__PURE__ */ jsx14(
+      RemoveButton,
+      {
+        id,
+        registry,
+        className: "rjsf-remove-optional-data",
+        onClick: onRemoveClick,
+        title: label,
+        size: "sm",
+        variant: "secondary"
+      }
+    );
+  }
+  return /* @__PURE__ */ jsx14("em", { id, children: label });
+}
+
 // src/SubmitButton/SubmitButton.tsx
 import Button3 from "react-bootstrap/Button";
 import { getSubmitButtonOptions } from "@rjsf/utils";
-import { jsx as jsx13 } from "react/jsx-runtime";
+import { jsx as jsx15 } from "react/jsx-runtime";
 function SubmitButton(props) {
   const { submitText, norender, props: submitButtonProps } = getSubmitButtonOptions(props.uiSchema);
   if (norender) {
     return null;
   }
-  return /* @__PURE__ */ jsx13("div", { children: /* @__PURE__ */ jsx13(Button3, { variant: "primary", type: "submit", ...submitButtonProps, children: submitText }) });
+  return /* @__PURE__ */ jsx15("div", { children: /* @__PURE__ */ jsx15(Button3, { variant: "primary", type: "submit", ...submitButtonProps, children: submitText }) });
 }
 
 // src/TitleField/TitleField.tsx
 import { getUiOptions as getUiOptions5 } from "@rjsf/utils";
-import { jsx as jsx14, jsxs as jsxs7 } from "react/jsx-runtime";
+import Row5 from "react-bootstrap/Row";
+import Col5 from "react-bootstrap/Col";
+import Container3 from "react-bootstrap/Container";
+import { jsx as jsx16, jsxs as jsxs8 } from "react/jsx-runtime";
 function TitleField({
   id,
   title,
-  uiSchema
+  uiSchema,
+  optionalDataControl
 }) {
   const uiOptions = getUiOptions5(uiSchema);
-  return /* @__PURE__ */ jsxs7("div", { id, className: "my-1", children: [
-    /* @__PURE__ */ jsx14("h5", { children: uiOptions.title || title }),
-    /* @__PURE__ */ jsx14("hr", { className: "border-0 bg-secondary", style: { height: "1px" } })
+  let heading = /* @__PURE__ */ jsx16("h5", { children: uiOptions.title || title });
+  if (optionalDataControl) {
+    heading = /* @__PURE__ */ jsx16(Container3, { fluid: true, className: "p-0", children: /* @__PURE__ */ jsxs8(Row5, { children: [
+      /* @__PURE__ */ jsx16(Col5, { xs: "11", children: heading }),
+      /* @__PURE__ */ jsx16(Col5, { xs: "1", style: { marginLeft: "-5px" }, children: optionalDataControl })
+    ] }) });
+  }
+  return /* @__PURE__ */ jsxs8("div", { id, className: "my-1", children: [
+    heading,
+    /* @__PURE__ */ jsx16("hr", { className: "border-0 bg-secondary mt-0", style: { height: "1px" } })
   ] });
 }
 
@@ -479,10 +556,10 @@ import {
   buttonId as buttonId3,
   TranslatableString as TranslatableString4
 } from "@rjsf/utils";
-import Row5 from "react-bootstrap/Row";
-import Col5 from "react-bootstrap/Col";
+import Row6 from "react-bootstrap/Row";
+import Col6 from "react-bootstrap/Col";
 import Form4 from "react-bootstrap/Form";
-import { jsx as jsx15, jsxs as jsxs8 } from "react/jsx-runtime";
+import { jsx as jsx17, jsxs as jsxs9 } from "react/jsx-runtime";
 function WrapIfAdditionalTemplate({
   classNames,
   style,
@@ -503,14 +580,14 @@ function WrapIfAdditionalTemplate({
   const keyLabel = translateString(TranslatableString4.KeyLabel, [label]);
   const additional = ADDITIONAL_PROPERTY_FLAG in schema;
   if (!additional) {
-    return /* @__PURE__ */ jsx15("div", { className: classNames, style, children });
+    return /* @__PURE__ */ jsx17("div", { className: classNames, style, children });
   }
   const handleBlur = ({ target }) => onKeyChange(target.value);
   const keyId = `${id}-key`;
-  return /* @__PURE__ */ jsxs8(Row5, { className: classNames, style, children: [
-    /* @__PURE__ */ jsx15(Col5, { xs: 5, children: /* @__PURE__ */ jsxs8(Form4.Group, { children: [
-      /* @__PURE__ */ jsx15(Form4.Label, { htmlFor: keyId, children: keyLabel }),
-      /* @__PURE__ */ jsx15(
+  return /* @__PURE__ */ jsxs9(Row6, { className: classNames, style, children: [
+    /* @__PURE__ */ jsx17(Col6, { xs: 5, children: /* @__PURE__ */ jsxs9(Form4.Group, { children: [
+      /* @__PURE__ */ jsx17(Form4.Label, { htmlFor: keyId, children: keyLabel }),
+      /* @__PURE__ */ jsx17(
         Form4.Control,
         {
           required,
@@ -523,8 +600,8 @@ function WrapIfAdditionalTemplate({
         }
       )
     ] }) }),
-    /* @__PURE__ */ jsx15(Col5, { xs: 5, children }),
-    /* @__PURE__ */ jsx15(Col5, { xs: 2, className: "py-4 d-grid gap-2", children: /* @__PURE__ */ jsx15(
+    /* @__PURE__ */ jsx17(Col6, { xs: 5, children }),
+    /* @__PURE__ */ jsx17(Col6, { xs: 2, className: "py-4 d-grid gap-2", children: /* @__PURE__ */ jsx17(
       RemoveButton2,
       {
         id: buttonId3(id, "remove"),
@@ -558,7 +635,9 @@ function generateTemplates() {
     FieldHelpTemplate,
     FieldTemplate,
     GridTemplate,
+    MultiSchemaFieldTemplate,
     ObjectFieldTemplate,
+    OptionalDataControlsTemplate,
     TitleFieldTemplate: TitleField,
     WrapIfAdditionalTemplate
   };
@@ -574,7 +653,7 @@ import {
   schemaRequiresTrueValue
 } from "@rjsf/utils";
 import Form5 from "react-bootstrap/Form";
-import { jsx as jsx16, jsxs as jsxs9 } from "react/jsx-runtime";
+import { jsx as jsx18, jsxs as jsxs10 } from "react/jsx-runtime";
 function CheckboxWidget(props) {
   const {
     id,
@@ -602,8 +681,8 @@ function CheckboxWidget(props) {
   const _onBlur = ({ target }) => onBlur(id, target && target.checked);
   const _onFocus = ({ target }) => onFocus(id, target && target.checked);
   const description = options.description || schema.description;
-  return /* @__PURE__ */ jsxs9(Form5.Group, { className: disabled || readonly ? "disabled" : "", "aria-describedby": ariaDescribedByIds2(id), children: [
-    !hideLabel && description && /* @__PURE__ */ jsx16(
+  return /* @__PURE__ */ jsxs10(Form5.Group, { className: disabled || readonly ? "disabled" : "", "aria-describedby": ariaDescribedByIds2(id), children: [
+    !hideLabel && description && /* @__PURE__ */ jsx18(
       DescriptionFieldTemplate,
       {
         id: descriptionId2(id),
@@ -613,7 +692,7 @@ function CheckboxWidget(props) {
         registry
       }
     ),
-    /* @__PURE__ */ jsx16(
+    /* @__PURE__ */ jsx18(
       Form5.Check,
       {
         id,
@@ -642,7 +721,7 @@ import {
   enumOptionsValueForIndex,
   optionId
 } from "@rjsf/utils";
-import { jsx as jsx17 } from "react/jsx-runtime";
+import { jsx as jsx19 } from "react/jsx-runtime";
 function CheckboxesWidget({ id, disabled, options, value, autofocus, readonly, required, onChange, onBlur, onFocus }) {
   const { enumOptions, enumDisabled, inline, emptyValue } = options;
   const checkboxesValues = Array.isArray(value) ? value : [value];
@@ -655,10 +734,10 @@ function CheckboxesWidget({ id, disabled, options, value, autofocus, readonly, r
   };
   const _onBlur = ({ target }) => onBlur(id, enumOptionsValueForIndex(target && target.value, enumOptions, emptyValue));
   const _onFocus = ({ target }) => onFocus(id, enumOptionsValueForIndex(target && target.value, enumOptions, emptyValue));
-  return /* @__PURE__ */ jsx17(Form6.Group, { children: Array.isArray(enumOptions) && enumOptions.map((option, index) => {
+  return /* @__PURE__ */ jsx19(Form6.Group, { children: Array.isArray(enumOptions) && enumOptions.map((option, index) => {
     const checked = enumOptionsIsSelected(option.value, checkboxesValues);
     const itemDisabled = Array.isArray(enumDisabled) && enumDisabled.indexOf(option.value) !== -1;
-    return /* @__PURE__ */ jsx17(
+    return /* @__PURE__ */ jsx19(
       Form6.Check,
       {
         inline,
@@ -689,7 +768,7 @@ import {
   enumOptionsValueForIndex as enumOptionsValueForIndex2,
   optionId as optionId2
 } from "@rjsf/utils";
-import { jsx as jsx18 } from "react/jsx-runtime";
+import { jsx as jsx20 } from "react/jsx-runtime";
 function RadioWidget({
   id,
   options,
@@ -706,10 +785,10 @@ function RadioWidget({
   const _onBlur = ({ target }) => onBlur(id, enumOptionsValueForIndex2(target && target.value, enumOptions, emptyValue));
   const _onFocus = ({ target }) => onFocus(id, enumOptionsValueForIndex2(target && target.value, enumOptions, emptyValue));
   const inline = Boolean(options && options.inline);
-  return /* @__PURE__ */ jsx18(Form7.Group, { className: "mb-0", children: Array.isArray(enumOptions) && enumOptions.map((option, index) => {
+  return /* @__PURE__ */ jsx20(Form7.Group, { className: "mb-0", children: Array.isArray(enumOptions) && enumOptions.map((option, index) => {
     const itemDisabled = Array.isArray(enumDisabled) && enumDisabled.indexOf(option.value) !== -1;
     const checked = enumOptionsIsSelected2(option.value, value);
-    const radio = /* @__PURE__ */ jsx18(
+    const radio = /* @__PURE__ */ jsx20(
       Form7.Check,
       {
         inline,
@@ -735,7 +814,7 @@ function RadioWidget({
 // src/RangeWidget/RangeWidget.tsx
 import { rangeSpec } from "@rjsf/utils";
 import FormRange from "react-bootstrap/FormRange";
-import { Fragment as Fragment3, jsx as jsx19, jsxs as jsxs10 } from "react/jsx-runtime";
+import { Fragment as Fragment3, jsx as jsx21, jsxs as jsxs11 } from "react/jsx-runtime";
 function RangeWidget(props) {
   const { id, value, disabled, onChange, onBlur, onFocus, schema } = props;
   const _onChange = ({ target: { value: value2 } }) => onChange(value2);
@@ -751,9 +830,9 @@ function RangeWidget(props) {
     onFocus: _onFocus,
     ...rangeSpec(schema)
   };
-  return /* @__PURE__ */ jsxs10(Fragment3, { children: [
-    /* @__PURE__ */ jsx19(FormRange, { ...rangeProps }),
-    /* @__PURE__ */ jsx19("span", { className: "range-view", children: value })
+  return /* @__PURE__ */ jsxs11(Fragment3, { children: [
+    /* @__PURE__ */ jsx21(FormRange, { ...rangeProps }),
+    /* @__PURE__ */ jsx21("span", { className: "range-view", children: value })
   ] });
 }
 
@@ -764,7 +843,7 @@ import {
   enumOptionsIndexForValue,
   enumOptionsValueForIndex as enumOptionsValueForIndex3
 } from "@rjsf/utils";
-import { jsx as jsx20, jsxs as jsxs11 } from "react/jsx-runtime";
+import { jsx as jsx22, jsxs as jsxs12 } from "react/jsx-runtime";
 function SelectWidget({
   schema,
   id,
@@ -792,7 +871,7 @@ function SelectWidget({
   }
   const selectedIndexes = enumOptionsIndexForValue(value, enumOptions, multiple);
   const showPlaceholderOption = !multiple && schema.default === void 0;
-  return /* @__PURE__ */ jsxs11(
+  return /* @__PURE__ */ jsxs12(
     FormSelect,
     {
       id,
@@ -817,10 +896,10 @@ function SelectWidget({
       },
       "aria-describedby": ariaDescribedByIds5(id),
       children: [
-        showPlaceholderOption && /* @__PURE__ */ jsx20("option", { value: "", children: placeholder }),
+        showPlaceholderOption && /* @__PURE__ */ jsx22("option", { value: "", children: placeholder }),
         enumOptions.map(({ value: value2, label }, i) => {
           const disabled2 = Array.isArray(enumDisabled) && enumDisabled.indexOf(value2) != -1;
-          return /* @__PURE__ */ jsx20("option", { id: label, value: String(i), disabled: disabled2, children: label }, i);
+          return /* @__PURE__ */ jsx22("option", { id: label, value: String(i), disabled: disabled2, children: label }, i);
         })
       ]
     }
@@ -831,7 +910,7 @@ function SelectWidget({
 import { ariaDescribedByIds as ariaDescribedByIds6 } from "@rjsf/utils";
 import FormControl from "react-bootstrap/FormControl";
 import InputGroup from "react-bootstrap/InputGroup";
-import { jsx as jsx21 } from "react/jsx-runtime";
+import { jsx as jsx23 } from "react/jsx-runtime";
 function TextareaWidget({
   id,
   placeholder,
@@ -848,7 +927,7 @@ function TextareaWidget({
   const _onChange = ({ target: { value: value2 } }) => onChange(value2 === "" ? options.emptyValue : value2);
   const _onBlur = ({ target }) => onBlur(id, target && target.value);
   const _onFocus = ({ target }) => onFocus(id, target && target.value);
-  return /* @__PURE__ */ jsx21(InputGroup, { children: /* @__PURE__ */ jsx21(
+  return /* @__PURE__ */ jsx23(InputGroup, { children: /* @__PURE__ */ jsx23(
     FormControl,
     {
       id,