@rjsf/core 6.5.1 → 6.5.3

package/dist/index.esm.js

@@ -23,7 +23,9 @@ import {
   ERRORS_KEY as ERRORS_KEY3,
   ID_KEY as ID_KEY5,
   getUsedFormData,
-  getFieldNames
+  getFieldNames,
+  ANY_OF_KEY as ANY_OF_KEY6,
+  ONE_OF_KEY as ONE_OF_KEY6
 } from "@rjsf/utils";
 import _cloneDeep from "lodash/cloneDeep";
 import _get from "lodash/get";
@@ -781,10 +783,12 @@ function ArrayField(props) {
   );
   const handleChange = useCallback(
     (value, path, newErrorSchema, id) => {
+      const lastPathIsItemIndex = typeof path.at(-1) === "number";
       onChange(
         // We need to treat undefined items as nulls to have validation.
         // See https://github.com/tdegrunt/jsonschema/issues/206
-        value === void 0 ? null : value,
+        // Only set to null for array items, and not for object properties within array items
+        lastPathIsItemIndex && value === void 0 ? null : value,
         path,
         newErrorSchema,
         id
@@ -2316,6 +2320,7 @@ import {
   shouldRender,
   shouldRenderOptionalField as shouldRenderOptionalField4,
   toFieldPathId as toFieldPathId5,
+  TranslatableString as TranslatableString7,
   UI_OPTIONS_KEY as UI_OPTIONS_KEY2
 } from "@rjsf/utils";
 import isObject5 from "lodash/isObject";
@@ -2389,7 +2394,9 @@ function SchemaFieldRender(props) {
     [fieldId, onChange]
   );
   const FieldComponent = getFieldComponent(schema, uiOptions, registry);
-  const disabled = Boolean(uiOptions.disabled ?? props.disabled);
+  const isDeprecated = Boolean(schema.deprecated);
+  const deprecatedHandling = isDeprecated ? uiOptions.deprecatedHandling ?? "label" : void 0;
+  const disabled = Boolean(uiOptions.disabled ?? props.disabled) || deprecatedHandling === "disable";
   const readonly = Boolean(uiOptions.readonly ?? (props.readonly || props.schema.readOnly || schema.readOnly));
   const uiSchemaHideError = uiOptions.hideError;
   const hideError = uiSchemaHideError === void 0 ? props.hideError : Boolean(uiSchemaHideError);
@@ -2452,9 +2459,12 @@ function SchemaFieldRender(props) {
   } else {
     label = ADDITIONAL_PROPERTY_FLAG2 in schema ? name : uiOptions.title || props.schema.title || schema.title || props.title || name;
   }
+  if (deprecatedHandling === "label") {
+    label = registry.translateString(TranslatableString7.DeprecatedLabel, [label]);
+  }
   const description = uiOptions.description || props.schema.description || schema.description || "";
   const help = uiOptions.help;
-  const hidden = uiOptions.widget === "hidden";
+  const hidden = uiOptions.widget === "hidden" || deprecatedHandling === "hide";
   const classNames = ["rjsf-field", `rjsf-field-${getSchemaType2(schema)}`];
   if (!hideError && __errors && __errors.length > 0) {
     classNames.push("rjsf-field-error");
@@ -3029,10 +3039,10 @@ function SubmitButton({ uiSchema }) {
 }
 
 // src/components/templates/ButtonTemplates/AddButton.tsx
-import { TranslatableString as TranslatableString8 } from "@rjsf/utils";
+import { TranslatableString as TranslatableString9 } from "@rjsf/utils";
 
 // src/components/templates/ButtonTemplates/IconButton.tsx
-import { TranslatableString as TranslatableString7 } from "@rjsf/utils";
+import { TranslatableString as TranslatableString8 } from "@rjsf/utils";
 import { jsx as jsx21 } from "react/jsx-runtime";
 function IconButton(props) {
   const { iconType = "default", icon, className, uiSchema, registry, ...otherProps } = props;
@@ -3042,25 +3052,25 @@ function CopyButton(props) {
   const {
     registry: { translateString }
   } = props;
-  return /* @__PURE__ */ jsx21(IconButton, { title: translateString(TranslatableString7.CopyButton), ...props, icon: "copy" });
+  return /* @__PURE__ */ jsx21(IconButton, { title: translateString(TranslatableString8.CopyButton), ...props, icon: "copy" });
 }
 function MoveDownButton(props) {
   const {
     registry: { translateString }
   } = props;
-  return /* @__PURE__ */ jsx21(IconButton, { title: translateString(TranslatableString7.MoveDownButton), ...props, icon: "arrow-down" });
+  return /* @__PURE__ */ jsx21(IconButton, { title: translateString(TranslatableString8.MoveDownButton), ...props, icon: "arrow-down" });
 }
 function MoveUpButton(props) {
   const {
     registry: { translateString }
   } = props;
-  return /* @__PURE__ */ jsx21(IconButton, { title: translateString(TranslatableString7.MoveUpButton), ...props, icon: "arrow-up" });
+  return /* @__PURE__ */ jsx21(IconButton, { title: translateString(TranslatableString8.MoveUpButton), ...props, icon: "arrow-up" });
 }
 function RemoveButton(props) {
   const {
     registry: { translateString }
   } = props;
-  return /* @__PURE__ */ jsx21(IconButton, { title: translateString(TranslatableString7.RemoveButton), ...props, iconType: "danger", icon: "remove" });
+  return /* @__PURE__ */ jsx21(IconButton, { title: translateString(TranslatableString8.RemoveButton), ...props, iconType: "danger", icon: "remove" });
 }
 function ClearButton({
   id,
@@ -3078,7 +3088,7 @@ function ClearButton({
       iconType: "default",
       icon: "remove",
       className: "btn-clear col-xs-12",
-      title: translateString(TranslatableString7.ClearButton),
+      title: translateString(TranslatableString8.ClearButton),
       onClick,
       disabled,
       registry,
@@ -3108,7 +3118,7 @@ function AddButton({
           iconType: "info",
           icon: "plus",
           className: "btn-add col-xs-12",
-          title: translateString(TranslatableString8.AddButton),
+          title: translateString(TranslatableString9.AddButton),
           onClick,
           disabled,
           registry
@@ -3162,7 +3172,7 @@ function DescriptionField(props) {
 
 // src/components/templates/ErrorList.tsx
 import {
-  TranslatableString as TranslatableString9
+  TranslatableString as TranslatableString10
 } from "@rjsf/utils";
 import { jsx as jsx25, jsxs as jsxs7 } from "react/jsx-runtime";
 function ErrorList({
@@ -3171,7 +3181,7 @@ function ErrorList({
 }) {
   const { translateString } = registry;
   return /* @__PURE__ */ jsxs7("div", { className: "panel panel-danger errors", children: [
-    /* @__PURE__ */ jsx25("div", { className: "panel-heading", children: /* @__PURE__ */ jsx25("h3", { className: "panel-title", children: translateString(TranslatableString9.ErrorsLabel) }) }),
+    /* @__PURE__ */ jsx25("div", { className: "panel-heading", children: /* @__PURE__ */ jsx25("h3", { className: "panel-title", children: translateString(TranslatableString10.ErrorsLabel) }) }),
     /* @__PURE__ */ jsx25("ul", { className: "list-group", children: errors.map((error, i) => {
       return /* @__PURE__ */ jsx25("li", { className: "list-group-item text-danger", children: error.stack }, i);
     }) })
@@ -3436,20 +3446,20 @@ function TitleField(props) {
 }
 
 // src/components/templates/UnsupportedField.tsx
-import { TranslatableString as TranslatableString10 } from "@rjsf/utils";
+import { TranslatableString as TranslatableString11 } from "@rjsf/utils";
 import Markdown4 from "markdown-to-jsx";
 import { jsx as jsx37, jsxs as jsxs13 } from "react/jsx-runtime";
 function UnsupportedField(props) {
   const { schema, fieldPathId, reason, registry } = props;
   const { translateString } = registry;
-  let translateEnum = TranslatableString10.UnsupportedField;
+  let translateEnum = TranslatableString11.UnsupportedField;
   const translateParams = [];
   if (fieldPathId && fieldPathId.$id) {
-    translateEnum = TranslatableString10.UnsupportedFieldWithId;
+    translateEnum = TranslatableString11.UnsupportedFieldWithId;
     translateParams.push(fieldPathId.$id);
   }
   if (reason) {
-    translateEnum = translateEnum === TranslatableString10.UnsupportedField ? TranslatableString10.UnsupportedFieldWithReason : TranslatableString10.UnsupportedFieldWithIdAndReason;
+    translateEnum = translateEnum === TranslatableString11.UnsupportedField ? TranslatableString11.UnsupportedFieldWithReason : TranslatableString11.UnsupportedFieldWithIdAndReason;
     translateParams.push(reason);
   }
   return /* @__PURE__ */ jsxs13("div", { className: "unsupported-field", children: [
@@ -3463,7 +3473,7 @@ var UnsupportedField_default = UnsupportedField;
 import {
   ADDITIONAL_PROPERTY_FLAG as ADDITIONAL_PROPERTY_FLAG3,
   buttonId as buttonId4,
-  TranslatableString as TranslatableString11
+  TranslatableString as TranslatableString12
 } from "@rjsf/utils";
 import { jsx as jsx38, jsxs as jsxs14 } from "react/jsx-runtime";
 function WrapIfAdditionalTemplate(props) {
@@ -3488,7 +3498,7 @@ function WrapIfAdditionalTemplate(props) {
   } = props;
   const { templates: templates2, translateString } = registry;
   const { RemoveButton: RemoveButton2 } = templates2.ButtonTemplates;
-  const keyLabel = translateString(TranslatableString11.KeyLabel, [label]);
+  const keyLabel = translateString(TranslatableString12.KeyLabel, [label]);
   const additional = ADDITIONAL_PROPERTY_FLAG3 in schema;
   const hasDescription = !!rawDescription;
   const classNamesList = ["form-group", classNames];
@@ -3562,7 +3572,7 @@ var templates_default = templates;
 // src/components/widgets/AltDateWidget.tsx
 import {
   DateElement,
-  TranslatableString as TranslatableString12,
+  TranslatableString as TranslatableString13,
   useAltDateWidgetProps
 } from "@rjsf/utils";
 import { jsx as jsx39, jsxs as jsxs15 } from "react/jsx-runtime";
@@ -3586,8 +3596,8 @@ function AltDateWidget(props) {
         autofocus: autofocus && i === 0
       }
     ) }, i)),
-    (options.hideNowButton !== "undefined" ? !options.hideNowButton : true) && /* @__PURE__ */ jsx39("li", { className: "list-inline-item", children: /* @__PURE__ */ jsx39("a", { href: "#", className: "btn btn-info btn-now", onClick: handleSetNow, children: translateString(TranslatableString12.NowLabel) }) }),
-    (options.hideClearButton !== "undefined" ? !options.hideClearButton : true) && /* @__PURE__ */ jsx39("li", { className: "list-inline-item", children: /* @__PURE__ */ jsx39("a", { href: "#", className: "btn btn-warning btn-clear", onClick: handleClear, children: translateString(TranslatableString12.ClearLabel) }) })
+    (options.hideNowButton !== "undefined" ? !options.hideNowButton : true) && /* @__PURE__ */ jsx39("li", { className: "list-inline-item", children: /* @__PURE__ */ jsx39("a", { href: "#", className: "btn btn-info btn-now", onClick: handleSetNow, children: translateString(TranslatableString13.NowLabel) }) }),
+    (options.hideClearButton !== "undefined" ? !options.hideClearButton : true) && /* @__PURE__ */ jsx39("li", { className: "list-inline-item", children: /* @__PURE__ */ jsx39("a", { href: "#", className: "btn btn-warning btn-clear", onClick: handleClear, children: translateString(TranslatableString13.ClearLabel) }) })
   ] });
 }
 var AltDateWidget_default = AltDateWidget;
@@ -3810,7 +3820,7 @@ function EmailWidget(props) {
 // src/components/widgets/FileWidget.tsx
 import {
   getTemplate as getTemplate22,
-  TranslatableString as TranslatableString13,
+  TranslatableString as TranslatableString14,
   useFileWidgetProps
 } from "@rjsf/utils";
 import Markdown5 from "markdown-to-jsx";
@@ -3829,7 +3839,7 @@ function FileInfoPreview({
   }
   return /* @__PURE__ */ jsxs18(Fragment4, { children: [
     " ",
-    /* @__PURE__ */ jsx47("a", { download: `preview-${name}`, href: dataURL, className: "file-download", children: translateString(TranslatableString13.PreviewLabel) })
+    /* @__PURE__ */ jsx47("a", { download: `preview-${name}`, href: dataURL, className: "file-download", children: translateString(TranslatableString14.PreviewLabel) })
   ] });
 }
 function FilesInfo({
@@ -3848,7 +3858,7 @@ function FilesInfo({
     const { name, size, type } = fileInfo;
     const handleRemove = () => onRemove(key);
     return /* @__PURE__ */ jsxs18("li", { children: [
-      /* @__PURE__ */ jsx47(Markdown5, { children: translateString(TranslatableString13.FilesInfo, [name, type, String(size)]) }),
+      /* @__PURE__ */ jsx47(Markdown5, { children: translateString(TranslatableString14.FilesInfo, [name, type, String(size)]) }),
       preview && /* @__PURE__ */ jsx47(FileInfoPreview, { fileInfo, registry }),
       /* @__PURE__ */ jsx47(RemoveButton2, { onClick: handleRemove, registry })
     ] }, key);
@@ -4752,7 +4762,8 @@ var Form = class extends Component3 {
     const { newErrorSchema } = this.pendingChanges[0];
     const { extraErrors, omitExtraData, liveOmit, noValidate, liveValidate, onChange, removeEmptyOptionalObjects } = this.props;
     const { formData: oldFormData, schemaUtils, schema, fieldPathId, schemaValidationErrorSchema, errors } = this.state;
-    let { customErrors, errorSchema: originalErrorSchema } = this.state;
+    let { customErrors } = this.state;
+    let mergeBaseErrorSchema = schemaValidationErrorSchema;
     const rootPathId = fieldPathId.path[0] || "";
     const isRootPath = !path || path.length === 0 || path.length === 1 && path[0] === rootPathId;
     let retrievedSchema = this.state.retrievedSchema;
@@ -4764,7 +4775,26 @@ var Form = class extends Component3 {
       if (newValue === ADDITIONAL_PROPERTY_KEY_REMOVE) {
         _unset(formData, path);
       } else if (!isRootPath) {
-        _set(formData, path, newValue);
+        let unsetPath = false;
+        let valueForPath = newValue;
+        if (newValue === void 0) {
+          const lastSegment = path[path.length - 1];
+          if (typeof lastSegment === "number") {
+            valueForPath = null;
+          } else {
+            const { field } = schemaUtils.findFieldInSchema(schema, path, oldFormData);
+            const leaf = field;
+            const isOneOfOrAnyOfLeaf = leaf && (ONE_OF_KEY6 in leaf || ANY_OF_KEY6 in leaf);
+            if (!isOneOfOrAnyOfLeaf && leaf !== void 0) {
+              unsetPath = true;
+            }
+          }
+        }
+        if (unsetPath) {
+          _unset(formData, path);
+        } else {
+          _set(formData, path, valueForPath);
+        }
       }
       const newState = this.getStateFromProps(this.props, inputForDefaults, void 0, void 0, void 0, true);
       formData = newState.formData;
@@ -4795,9 +4825,10 @@ var Form = class extends Component3 {
       const oldValidationError = !isRootPath ? _get(schemaValidationErrorSchema, path) : schemaValidationErrorSchema;
       if (!_isEmpty(oldValidationError)) {
         if (!isRootPath) {
-          _set(originalErrorSchema, path, newErrorSchema);
+          mergeBaseErrorSchema = _cloneDeep(schemaValidationErrorSchema);
+          _set(mergeBaseErrorSchema, path, newErrorSchema);
         } else {
-          originalErrorSchema = newErrorSchema;
+          mergeBaseErrorSchema = newErrorSchema;
         }
       } else {
         if (!customErrors) {
@@ -4819,7 +4850,7 @@ var Form = class extends Component3 {
       const liveValidation = this.liveValidate(
         schema,
         schemaUtils,
-        originalErrorSchema,
+        mergeBaseErrorSchema,
         newFormData,
         extraErrors,
         customErrors,
@@ -4827,7 +4858,7 @@ var Form = class extends Component3 {
       );
       state = { formData: newFormData, ...liveValidation, customErrors };
     } else if (!noValidate && newErrorSchema) {
-      const mergedErrors = this.mergeErrors({ errorSchema: originalErrorSchema, errors }, extraErrors, customErrors);
+      const mergedErrors = this.mergeErrors({ errorSchema: mergeBaseErrorSchema, errors }, extraErrors, customErrors);
       state = {
         formData: newFormData,
         ...mergedErrors,