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

package/dist/index.cjs

@@ -59,10 +59,10 @@ function AddButton({
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
     import_Button.default,
     {
+      title: translateString(import_utils.TranslatableString.AddItemButton),
       ...props,
       style: { width: "100%" },
       className: `ml-1 ${props.className}`,
-      title: translateString(import_utils.TranslatableString.AddItemButton),
       children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_BsPlus.BsPlus, {})
     }
   );
@@ -100,7 +100,20 @@ var import_Container = __toESM(require("react-bootstrap/Container"), 1);
 var import_utils3 = require("@rjsf/utils");
 var import_jsx_runtime3 = require("react/jsx-runtime");
 function ArrayFieldTemplate(props) {
-  const { canAdd, disabled, fieldPathId, 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 = (0, import_utils3.getUiOptions)(uiSchema);
   const ArrayFieldDescriptionTemplate = (0, import_utils3.getTemplate)(
     "ArrayFieldDescriptionTemplate",
@@ -117,6 +130,7 @@ function ArrayFieldTemplate(props) {
     registry,
     uiOptions
   );
+  const showOptionalDataControlInTitle = !readonly && !disabled;
   const {
     ButtonTemplates: { AddButton: AddButton2 }
   } = registry.templates;
@@ -129,7 +143,8 @@ function ArrayFieldTemplate(props) {
         schema,
         uiSchema,
         required,
-        registry
+        registry,
+        optionalDataControl: showOptionalDataControlInTitle ? optionalDataControl : void 0
       }
     ),
     /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
@@ -143,7 +158,8 @@ function ArrayFieldTemplate(props) {
       }
     ),
     /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_Container.default, { fluid: true, className: "p-0 m-0", children: [
-      items && items.map(({ key, ...itemProps }) => /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(ArrayFieldItemTemplate2, { ...itemProps }, key)),
+      !showOptionalDataControlInTitle ? optionalDataControl : void 0,
+      items.map(({ key, ...itemProps }) => /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(ArrayFieldItemTemplate2, { ...itemProps }, key)),
       canAdd && /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_Container.default, { className: "", children: /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_Row2.default, { className: "mt-2", children: [
         /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_Col2.default, { xs: 9 }),
         /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_Col2.default, { xs: 3, className: "py-4 col-lg-3 col-3", children: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
@@ -286,8 +302,8 @@ function RemoveButton(props) {
     IconButton,
     {
       title: translateString(import_utils6.TranslatableString.RemoveButton),
-      ...props,
       variant: "danger",
+      ...props,
       icon: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_IoIosRemove.IoIosRemove, {})
     }
   );
@@ -422,6 +438,7 @@ function ObjectFieldTemplate({
   fieldPathId,
   schema,
   formData,
+  optionalDataControl,
   onAddClick,
   disabled,
   readonly,
@@ -434,6 +451,7 @@ function ObjectFieldTemplate({
     registry,
     uiOptions
   );
+  const showOptionalDataControlInTitle = !readonly && !disabled;
   const {
     ButtonTemplates: { AddButton: AddButton2 }
   } = registry.templates;
@@ -446,7 +464,8 @@ function ObjectFieldTemplate({
         required,
         schema,
         uiSchema,
-        registry
+        registry,
+        optionalDataControl: showOptionalDataControlInTitle ? optionalDataControl : void 0
       }
     ),
     description && /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
@@ -460,6 +479,7 @@ function ObjectFieldTemplate({
       }
     ),
     /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)(import_Container2.default, { fluid: true, className: "p-0", children: [
+      !showOptionalDataControlInTitle ? optionalDataControl : void 0,
       properties.map((element, index) => /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(import_Row4.default, { style: { marginBottom: "10px" }, className: element.hidden ? "d-none" : void 0, children: /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)(import_Col4.default, { xs: 12, children: [
         " ",
         element.content
@@ -479,39 +499,86 @@ function ObjectFieldTemplate({
   ] });
 }
 
+// src/OptionalDataControlsTemplate/OptionalDataControlsTemplate.tsx
+var import_BsPlus2 = require("@react-icons/all-files/bs/BsPlus");
+var import_jsx_runtime14 = require("react/jsx-runtime");
+function OptionalDataControlsTemplate(props) {
+  const { id, registry, label, onAddClick, onRemoveClick } = props;
+  if (onAddClick) {
+    return /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
+      IconButton,
+      {
+        id,
+        registry,
+        className: "rjsf-add-optional-data",
+        icon: /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(import_BsPlus2.BsPlus, {}),
+        onClick: onAddClick,
+        title: label,
+        size: "sm",
+        variant: "secondary"
+      }
+    );
+  } else if (onRemoveClick) {
+    return /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
+      RemoveButton,
+      {
+        id,
+        registry,
+        className: "rjsf-remove-optional-data",
+        onClick: onRemoveClick,
+        title: label,
+        size: "sm",
+        variant: "secondary"
+      }
+    );
+  }
+  return /* @__PURE__ */ (0, import_jsx_runtime14.jsx)("em", { id, children: label });
+}
+
 // src/SubmitButton/SubmitButton.tsx
 var import_Button3 = __toESM(require("react-bootstrap/Button"), 1);
 var import_utils11 = require("@rjsf/utils");
-var import_jsx_runtime14 = require("react/jsx-runtime");
+var import_jsx_runtime15 = require("react/jsx-runtime");
 function SubmitButton(props) {
   const { submitText, norender, props: submitButtonProps } = (0, import_utils11.getSubmitButtonOptions)(props.uiSchema);
   if (norender) {
     return null;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime14.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(import_Button3.default, { variant: "primary", type: "submit", ...submitButtonProps, children: submitText }) });
+  return /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(import_Button3.default, { variant: "primary", type: "submit", ...submitButtonProps, children: submitText }) });
 }
 
 // src/TitleField/TitleField.tsx
 var import_utils12 = require("@rjsf/utils");
-var import_jsx_runtime15 = require("react/jsx-runtime");
+var import_Row5 = __toESM(require("react-bootstrap/Row"), 1);
+var import_Col5 = __toESM(require("react-bootstrap/Col"), 1);
+var import_Container3 = __toESM(require("react-bootstrap/Container"), 1);
+var import_jsx_runtime16 = require("react/jsx-runtime");
 function TitleField({
   id,
   title,
-  uiSchema
+  uiSchema,
+  optionalDataControl
 }) {
   const uiOptions = (0, import_utils12.getUiOptions)(uiSchema);
-  return /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)("div", { id, className: "my-1", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("h5", { children: uiOptions.title || title }),
-    /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("hr", { className: "border-0 bg-secondary", style: { height: "1px" } })
+  let heading = /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("h5", { children: uiOptions.title || title });
+  if (optionalDataControl) {
+    heading = /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(import_Container3.default, { fluid: true, className: "p-0", children: /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)(import_Row5.default, { children: [
+      /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(import_Col5.default, { xs: "11", children: heading }),
+      /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(import_Col5.default, { xs: "1", style: { marginLeft: "-5px" }, children: optionalDataControl })
+    ] }) });
+  }
+  return /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)("div", { id, className: "my-1", children: [
+    heading,
+    /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("hr", { className: "border-0 bg-secondary mt-0", style: { height: "1px" } })
   ] });
 }
 
 // src/WrapIfAdditionalTemplate/WrapIfAdditionalTemplate.tsx
 var import_utils13 = require("@rjsf/utils");
-var import_Row5 = __toESM(require("react-bootstrap/Row"), 1);
-var import_Col5 = __toESM(require("react-bootstrap/Col"), 1);
+var import_Row6 = __toESM(require("react-bootstrap/Row"), 1);
+var import_Col6 = __toESM(require("react-bootstrap/Col"), 1);
 var import_Form4 = __toESM(require("react-bootstrap/Form"), 1);
-var import_jsx_runtime16 = require("react/jsx-runtime");
+var import_jsx_runtime17 = require("react/jsx-runtime");
 function WrapIfAdditionalTemplate({
   classNames,
   style,
@@ -532,14 +599,14 @@ function WrapIfAdditionalTemplate({
   const keyLabel = translateString(import_utils13.TranslatableString.KeyLabel, [label]);
   const additional = import_utils13.ADDITIONAL_PROPERTY_FLAG in schema;
   if (!additional) {
-    return /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("div", { className: classNames, style, children });
+    return /* @__PURE__ */ (0, import_jsx_runtime17.jsx)("div", { className: classNames, style, children });
   }
   const handleBlur = ({ target }) => onKeyChange(target.value);
   const keyId = `${id}-key`;
-  return /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)(import_Row5.default, { className: classNames, style, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(import_Col5.default, { xs: 5, children: /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)(import_Form4.default.Group, { children: [
-      /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(import_Form4.default.Label, { htmlFor: keyId, children: keyLabel }),
-      /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime17.jsxs)(import_Row6.default, { className: classNames, style, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(import_Col6.default, { xs: 5, children: /* @__PURE__ */ (0, import_jsx_runtime17.jsxs)(import_Form4.default.Group, { children: [
+      /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(import_Form4.default.Label, { htmlFor: keyId, children: keyLabel }),
+      /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
         import_Form4.default.Control,
         {
           required,
@@ -552,8 +619,8 @@ function WrapIfAdditionalTemplate({
         }
       )
     ] }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(import_Col5.default, { xs: 5, children }),
-    /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(import_Col5.default, { xs: 2, className: "py-4 d-grid gap-2", children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(import_Col6.default, { xs: 5, children }),
+    /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(import_Col6.default, { xs: 2, className: "py-4 d-grid gap-2", children: /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
       RemoveButton2,
       {
         id: (0, import_utils13.buttonId)(id, "remove"),
@@ -589,6 +656,7 @@ function generateTemplates() {
     GridTemplate,
     MultiSchemaFieldTemplate,
     ObjectFieldTemplate,
+    OptionalDataControlsTemplate,
     TitleFieldTemplate: TitleField,
     WrapIfAdditionalTemplate
   };
@@ -598,7 +666,7 @@ var Templates_default = generateTemplates();
 // src/CheckboxWidget/CheckboxWidget.tsx
 var import_utils14 = require("@rjsf/utils");
 var import_Form5 = __toESM(require("react-bootstrap/Form"), 1);
-var import_jsx_runtime17 = require("react/jsx-runtime");
+var import_jsx_runtime18 = require("react/jsx-runtime");
 function CheckboxWidget(props) {
   const {
     id,
@@ -626,8 +694,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__ */ (0, import_jsx_runtime17.jsxs)(import_Form5.default.Group, { className: disabled || readonly ? "disabled" : "", "aria-describedby": (0, import_utils14.ariaDescribedByIds)(id), children: [
-    !hideLabel && description && /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)(import_Form5.default.Group, { className: disabled || readonly ? "disabled" : "", "aria-describedby": (0, import_utils14.ariaDescribedByIds)(id), children: [
+    !hideLabel && description && /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
       DescriptionFieldTemplate,
       {
         id: (0, import_utils14.descriptionId)(id),
@@ -637,7 +705,7 @@ function CheckboxWidget(props) {
         registry
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
       import_Form5.default.Check,
       {
         id,
@@ -659,7 +727,7 @@ function CheckboxWidget(props) {
 // src/CheckboxesWidget/CheckboxesWidget.tsx
 var import_Form6 = __toESM(require("react-bootstrap/Form"), 1);
 var import_utils15 = require("@rjsf/utils");
-var import_jsx_runtime18 = require("react/jsx-runtime");
+var import_jsx_runtime19 = require("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];
@@ -672,10 +740,10 @@ function CheckboxesWidget({ id, disabled, options, value, autofocus, readonly, r
   };
   const _onBlur = ({ target }) => onBlur(id, (0, import_utils15.enumOptionsValueForIndex)(target && target.value, enumOptions, emptyValue));
   const _onFocus = ({ target }) => onFocus(id, (0, import_utils15.enumOptionsValueForIndex)(target && target.value, enumOptions, emptyValue));
-  return /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(import_Form6.default.Group, { children: Array.isArray(enumOptions) && enumOptions.map((option, index) => {
+  return /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(import_Form6.default.Group, { children: Array.isArray(enumOptions) && enumOptions.map((option, index) => {
     const checked = (0, import_utils15.enumOptionsIsSelected)(option.value, checkboxesValues);
     const itemDisabled = Array.isArray(enumDisabled) && enumDisabled.indexOf(option.value) !== -1;
-    return /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(
       import_Form6.default.Check,
       {
         inline,
@@ -701,7 +769,7 @@ function CheckboxesWidget({ id, disabled, options, value, autofocus, readonly, r
 // src/RadioWidget/RadioWidget.tsx
 var import_Form7 = __toESM(require("react-bootstrap/Form"), 1);
 var import_utils16 = require("@rjsf/utils");
-var import_jsx_runtime19 = require("react/jsx-runtime");
+var import_jsx_runtime20 = require("react/jsx-runtime");
 function RadioWidget({
   id,
   options,
@@ -718,10 +786,10 @@ function RadioWidget({
   const _onBlur = ({ target }) => onBlur(id, (0, import_utils16.enumOptionsValueForIndex)(target && target.value, enumOptions, emptyValue));
   const _onFocus = ({ target }) => onFocus(id, (0, import_utils16.enumOptionsValueForIndex)(target && target.value, enumOptions, emptyValue));
   const inline = Boolean(options && options.inline);
-  return /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(import_Form7.default.Group, { className: "mb-0", children: Array.isArray(enumOptions) && enumOptions.map((option, index) => {
+  return /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(import_Form7.default.Group, { className: "mb-0", children: Array.isArray(enumOptions) && enumOptions.map((option, index) => {
     const itemDisabled = Array.isArray(enumDisabled) && enumDisabled.indexOf(option.value) !== -1;
     const checked = (0, import_utils16.enumOptionsIsSelected)(option.value, value);
-    const radio = /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(
+    const radio = /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
       import_Form7.default.Check,
       {
         inline,
@@ -747,7 +815,7 @@ function RadioWidget({
 // src/RangeWidget/RangeWidget.tsx
 var import_utils17 = require("@rjsf/utils");
 var import_FormRange = __toESM(require("react-bootstrap/FormRange"), 1);
-var import_jsx_runtime20 = require("react/jsx-runtime");
+var import_jsx_runtime21 = require("react/jsx-runtime");
 function RangeWidget(props) {
   const { id, value, disabled, onChange, onBlur, onFocus, schema } = props;
   const _onChange = ({ target: { value: value2 } }) => onChange(value2);
@@ -763,16 +831,16 @@ function RangeWidget(props) {
     onFocus: _onFocus,
     ...(0, import_utils17.rangeSpec)(schema)
   };
-  return /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(import_jsx_runtime20.Fragment, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(import_FormRange.default, { ...rangeProps }),
-    /* @__PURE__ */ (0, import_jsx_runtime20.jsx)("span", { className: "range-view", children: value })
+  return /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(import_jsx_runtime21.Fragment, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(import_FormRange.default, { ...rangeProps }),
+    /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("span", { className: "range-view", children: value })
   ] });
 }
 
 // src/SelectWidget/SelectWidget.tsx
 var import_FormSelect = __toESM(require("react-bootstrap/FormSelect"), 1);
 var import_utils18 = require("@rjsf/utils");
-var import_jsx_runtime21 = require("react/jsx-runtime");
+var import_jsx_runtime22 = require("react/jsx-runtime");
 function SelectWidget({
   schema,
   id,
@@ -800,7 +868,7 @@ function SelectWidget({
   }
   const selectedIndexes = (0, import_utils18.enumOptionsIndexForValue)(value, enumOptions, multiple);
   const showPlaceholderOption = !multiple && schema.default === void 0;
-  return /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)(
     import_FormSelect.default,
     {
       id,
@@ -825,10 +893,10 @@ function SelectWidget({
       },
       "aria-describedby": (0, import_utils18.ariaDescribedByIds)(id),
       children: [
-        showPlaceholderOption && /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("option", { value: "", children: placeholder }),
+        showPlaceholderOption && /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("option", { value: "", children: placeholder }),
         enumOptions.map(({ value: value2, label }, i) => {
           const disabled2 = Array.isArray(enumDisabled) && enumDisabled.indexOf(value2) != -1;
-          return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("option", { id: label, value: String(i), disabled: disabled2, children: label }, i);
+          return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("option", { id: label, value: String(i), disabled: disabled2, children: label }, i);
         })
       ]
     }
@@ -839,7 +907,7 @@ function SelectWidget({
 var import_utils19 = require("@rjsf/utils");
 var import_FormControl = __toESM(require("react-bootstrap/FormControl"), 1);
 var import_InputGroup = __toESM(require("react-bootstrap/InputGroup"), 1);
-var import_jsx_runtime22 = require("react/jsx-runtime");
+var import_jsx_runtime23 = require("react/jsx-runtime");
 function TextareaWidget({
   id,
   placeholder,
@@ -856,7 +924,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__ */ (0, import_jsx_runtime22.jsx)(import_InputGroup.default, { children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(import_InputGroup.default, { children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
     import_FormControl.default,
     {
       id,