@rjsf/core 5.12.1 → 5.13.1

package/dist/core.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('react'), require('@rjsf/utils'), require('lodash/get'), require('lodash/isEmpty'), require('lodash/pick'), require('lodash/toPath'), require('lodash/cloneDeep'), require('lodash/isObject'), require('lodash/set'), require('nanoid'), require('react/jsx-runtime'), require('lodash/omit'), require('lodash/unset'), require('markdown-to-jsx'), require('lodash/has')) :
-  typeof define === 'function' && define.amd ? define(['exports', 'react', '@rjsf/utils', 'lodash/get', 'lodash/isEmpty', 'lodash/pick', 'lodash/toPath', 'lodash/cloneDeep', 'lodash/isObject', 'lodash/set', 'nanoid', 'react/jsx-runtime', 'lodash/omit', 'lodash/unset', 'markdown-to-jsx', 'lodash/has'], factory) :
-  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.JSONSchemaForm = {}, global.react, global.utils, global.get3, global.isEmpty, global._pick, global._toPath, global.cloneDeep, global.isObject, global.set, global.nanoid, global.jsxRuntime, global.omit2, global.unset, global.Markdown, global.has));
-})(this, (function (exports, react, utils, get3, isEmpty, _pick, _toPath, cloneDeep, isObject, set, nanoid, jsxRuntime, omit2, unset, Markdown, has) { 'use strict';
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('react'), require('@rjsf/utils'), require('lodash/get'), require('lodash/isEmpty'), require('lodash/pick'), require('lodash/toPath'), require('lodash/cloneDeep'), require('lodash/isObject'), require('lodash/set'), require('nanoid'), require('react/jsx-runtime'), require('lodash/omit'), require('markdown-to-jsx'), require('lodash/has'), require('lodash/unset')) :
+  typeof define === 'function' && define.amd ? define(['exports', 'react', '@rjsf/utils', 'lodash/get', 'lodash/isEmpty', 'lodash/pick', 'lodash/toPath', 'lodash/cloneDeep', 'lodash/isObject', 'lodash/set', 'nanoid', 'react/jsx-runtime', 'lodash/omit', 'markdown-to-jsx', 'lodash/has', 'lodash/unset'], factory) :
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.JSONSchemaForm = {}, global.react, global.utils, global.get3, global.isEmpty, global._pick, global._toPath, global.cloneDeep, global.isObject, global.set, global.nanoid, global.jsxRuntime, global.omit2, global.Markdown, global.has, global.unset));
+})(this, (function (exports, react, utils, get3, isEmpty, _pick, _toPath, cloneDeep, isObject, set, nanoid, jsxRuntime, omit2, Markdown, has, unset) { 'use strict';
 
   // src/components/Form.tsx
   function generateRowId() {
@@ -72,8 +72,20 @@
           if (event) {
             event.preventDefault();
           }
-          const { onChange } = this.props;
+          const { onChange, errorSchema } = this.props;
           const { keyedFormData } = this.state;
+          let newErrorSchema;
+          if (errorSchema) {
+            newErrorSchema = {};
+            for (const idx in errorSchema) {
+              const i = parseInt(idx);
+              if (i <= index) {
+                set(newErrorSchema, [i], errorSchema[idx]);
+              } else if (i > index) {
+                set(newErrorSchema, [i + 1], errorSchema[idx]);
+              }
+            }
+          }
           const newKeyedFormDataRow = {
             key: generateRowId(),
             item: cloneDeep(keyedFormData[index].item)
@@ -89,7 +101,7 @@
               keyedFormData: newKeyedFormData,
               updatedKeyedFormData: true
             },
-            () => onChange(keyedToPlainFormData(newKeyedFormData))
+            () => onChange(keyedToPlainFormData(newKeyedFormData), newErrorSchema)
           );
         };
       };
@@ -285,8 +297,20 @@
       if (event) {
         event.preventDefault();
       }
-      const { onChange } = this.props;
+      const { onChange, errorSchema } = this.props;
       const { keyedFormData } = this.state;
+      let newErrorSchema;
+      if (errorSchema) {
+        newErrorSchema = {};
+        for (const idx in errorSchema) {
+          const i = parseInt(idx);
+          if (index === void 0 || i < index) {
+            set(newErrorSchema, [i], errorSchema[idx]);
+          } else if (i >= index) {
+            set(newErrorSchema, [i + 1], errorSchema[idx]);
+          }
+        }
+      }
       const newKeyedFormDataRow = {
         key: generateRowId(),
         item: this._getNewFormDataRow()
@@ -302,7 +326,7 @@
           keyedFormData: newKeyedFormData,
           updatedKeyedFormData: true
         },
-        () => onChange(keyedToPlainFormData(newKeyedFormData))
+        () => onChange(keyedToPlainFormData(newKeyedFormData), newErrorSchema)
       );
     }
     /** Renders the `ArrayField` depending on the specific needs of the schema and uischema elements
@@ -950,9 +974,8 @@
       const option = selectedOption >= 0 ? retrievedOptions[selectedOption] || null : null;
       let optionSchema;
       if (option) {
-        const { oneOf, anyOf, properties, ...remaining } = schema;
-        unset(remaining, utils.ADDITIONAL_PROPERTY_FLAG);
-        optionSchema = !isEmpty(remaining) ? utils.mergeSchemas(remaining, option) : option;
+        const { required } = schema;
+        optionSchema = required ? utils.mergeSchemas({ required }, option) : option;
       }
       const translateEnum = title ? utils.TranslatableString.TitleOptionPrefix : utils.TranslatableString.OptionPrefix;
       const translateParams = title ? [title] : [];
@@ -3305,13 +3328,14 @@
      */
     validateForm() {
       const { extraErrors, extraErrorsBlockSubmit, focusOnFirstError, onError } = this.props;
-      const { formData } = this.state;
+      const { formData, errors: prevErrors } = this.state;
       const schemaValidation = this.validate(formData);
       let errors = schemaValidation.errors;
       let errorSchema = schemaValidation.errorSchema;
       const schemaValidationErrors = errors;
       const schemaValidationErrorSchema = errorSchema;
-      if (errors.length > 0 || extraErrors && extraErrorsBlockSubmit) {
+      const hasError = errors.length > 0 || extraErrors && extraErrorsBlockSubmit;
+      if (hasError) {
         if (extraErrors) {
           const merged = utils.validationDataMerge(schemaValidation, extraErrors);
           errorSchema = merged.errorSchema;
@@ -3339,9 +3363,15 @@
             }
           }
         );
-        return false;
+      } else if (prevErrors.length > 0) {
+        this.setState({
+          errors: [],
+          errorSchema: {},
+          schemaValidationErrors: [],
+          schemaValidationErrorSchema: {}
+        });
       }
-      return true;
+      return !hasError;
     }
     /** Renders the `Form` fields inside the <form> | `tagName` or `_internalFormWrapper`, rendering any errors if
      * needed along with the submit button or any children of the form.

package/dist/index.esm.js

@@ -110,8 +110,20 @@ var ArrayField = class extends Component {
         if (event) {
           event.preventDefault();
         }
-        const { onChange } = this.props;
+        const { onChange, errorSchema } = this.props;
         const { keyedFormData } = this.state;
+        let newErrorSchema;
+        if (errorSchema) {
+          newErrorSchema = {};
+          for (const idx in errorSchema) {
+            const i = parseInt(idx);
+            if (i <= index) {
+              set(newErrorSchema, [i], errorSchema[idx]);
+            } else if (i > index) {
+              set(newErrorSchema, [i + 1], errorSchema[idx]);
+            }
+          }
+        }
         const newKeyedFormDataRow = {
           key: generateRowId(),
           item: cloneDeep(keyedFormData[index].item)
@@ -127,7 +139,7 @@ var ArrayField = class extends Component {
             keyedFormData: newKeyedFormData,
             updatedKeyedFormData: true
           },
-          () => onChange(keyedToPlainFormData(newKeyedFormData))
+          () => onChange(keyedToPlainFormData(newKeyedFormData), newErrorSchema)
         );
       };
     };
@@ -323,8 +335,20 @@ var ArrayField = class extends Component {
     if (event) {
       event.preventDefault();
     }
-    const { onChange } = this.props;
+    const { onChange, errorSchema } = this.props;
     const { keyedFormData } = this.state;
+    let newErrorSchema;
+    if (errorSchema) {
+      newErrorSchema = {};
+      for (const idx in errorSchema) {
+        const i = parseInt(idx);
+        if (index === void 0 || i < index) {
+          set(newErrorSchema, [i], errorSchema[idx]);
+        } else if (i >= index) {
+          set(newErrorSchema, [i + 1], errorSchema[idx]);
+        }
+      }
+    }
     const newKeyedFormDataRow = {
       key: generateRowId(),
       item: this._getNewFormDataRow()
@@ -340,7 +364,7 @@ var ArrayField = class extends Component {
         keyedFormData: newKeyedFormData,
         updatedKeyedFormData: true
       },
-      () => onChange(keyedToPlainFormData(newKeyedFormData))
+      () => onChange(keyedToPlainFormData(newKeyedFormData), newErrorSchema)
     );
   }
   /** Renders the `ArrayField` depending on the specific needs of the schema and uischema elements
@@ -884,9 +908,7 @@ import { Component as Component2 } from "react";
 import get2 from "lodash/get";
 import isEmpty from "lodash/isEmpty";
 import omit from "lodash/omit";
-import unset from "lodash/unset";
 import {
-  ADDITIONAL_PROPERTY_FLAG,
   deepEquals,
   ERRORS_KEY,
   getDiscriminatorFieldFromSchema,
@@ -1016,9 +1038,8 @@ var AnyOfField = class extends Component2 {
     const option = selectedOption >= 0 ? retrievedOptions[selectedOption] || null : null;
     let optionSchema;
     if (option) {
-      const { oneOf, anyOf, properties, ...remaining } = schema;
-      unset(remaining, ADDITIONAL_PROPERTY_FLAG);
-      optionSchema = !isEmpty(remaining) ? mergeSchemas(remaining, option) : option;
+      const { required } = schema;
+      optionSchema = required ? mergeSchemas({ required }, option) : option;
     }
     const translateEnum = title ? TranslatableString3.TitleOptionPrefix : TranslatableString3.OptionPrefix;
     const translateParams = title ? [title] : [];
@@ -1096,7 +1117,7 @@ import {
   getUiOptions as getUiOptions4,
   orderProperties,
   TranslatableString as TranslatableString4,
-  ADDITIONAL_PROPERTY_FLAG as ADDITIONAL_PROPERTY_FLAG2,
+  ADDITIONAL_PROPERTY_FLAG,
   PROPERTIES_KEY,
   REF_KEY,
   ANY_OF_KEY,
@@ -1107,7 +1128,7 @@ import get3 from "lodash/get";
 import has from "lodash/has";
 import isObject3 from "lodash/isObject";
 import set2 from "lodash/set";
-import unset2 from "lodash/unset";
+import unset from "lodash/unset";
 import { jsx as jsx5, jsxs as jsxs2 } from "react/jsx-runtime";
 var ObjectField = class extends Component3 {
   constructor() {
@@ -1153,7 +1174,7 @@ var ObjectField = class extends Component3 {
         event.preventDefault();
         const { onChange, formData } = this.props;
         const copiedFormData = { ...formData };
-        unset2(copiedFormData, key);
+        unset(copiedFormData, key);
         onChange(copiedFormData);
       };
     };
@@ -1311,7 +1332,7 @@ var ObjectField = class extends Component3 {
       title: uiOptions.label === false ? "" : title,
       description: uiOptions.label === false ? void 0 : description,
       properties: orderedProperties.map((name2) => {
-        const addedByAdditionalProperties = has(schema, [PROPERTIES_KEY, name2, ADDITIONAL_PROPERTY_FLAG2]);
+        const addedByAdditionalProperties = has(schema, [PROPERTIES_KEY, name2, ADDITIONAL_PROPERTY_FLAG]);
         const fieldUiSchema = addedByAdditionalProperties ? uiSchema.additionalProperties : uiSchema[name2];
         const hidden = getUiOptions4(fieldUiSchema).widget === "hidden";
         const fieldIdSchema = get3(idSchema, [name2], {});
@@ -1368,7 +1389,7 @@ var ObjectField_default = ObjectField;
 // src/components/fields/SchemaField.tsx
 import { useCallback as useCallback2, Component as Component4 } from "react";
 import {
-  ADDITIONAL_PROPERTY_FLAG as ADDITIONAL_PROPERTY_FLAG3,
+  ADDITIONAL_PROPERTY_FLAG as ADDITIONAL_PROPERTY_FLAG2,
   deepEquals as deepEquals2,
   descriptionId,
   getSchemaType,
@@ -1505,7 +1526,7 @@ function SchemaFieldRender(props) {
   if (wasPropertyKeyModified) {
     label = name;
   } else {
-    label = ADDITIONAL_PROPERTY_FLAG3 in schema ? name : uiOptions.title || props.schema.title || schema.title || name;
+    label = ADDITIONAL_PROPERTY_FLAG2 in schema ? name : uiOptions.title || props.schema.title || schema.title || name;
   }
   const description = uiOptions.description || props.schema.description || schema.description || "";
   const richDescription = uiOptions.enableMarkdownInDescription ? /* @__PURE__ */ jsx6(Markdown2, { children: description }) : description;
@@ -2374,7 +2395,7 @@ var UnsupportedField_default = UnsupportedField;
 
 // src/components/templates/WrapIfAdditionalTemplate.tsx
 import {
-  ADDITIONAL_PROPERTY_FLAG as ADDITIONAL_PROPERTY_FLAG4,
+  ADDITIONAL_PROPERTY_FLAG as ADDITIONAL_PROPERTY_FLAG3,
   TranslatableString as TranslatableString10
 } from "@rjsf/utils";
 import { jsx as jsx25, jsxs as jsxs13 } from "react/jsx-runtime";
@@ -2397,7 +2418,7 @@ function WrapIfAdditionalTemplate(props) {
   const { templates: templates2, translateString } = registry;
   const { RemoveButton: RemoveButton2 } = templates2.ButtonTemplates;
   const keyLabel = translateString(TranslatableString10.KeyLabel, [label]);
-  const additional = ADDITIONAL_PROPERTY_FLAG4 in schema;
+  const additional = ADDITIONAL_PROPERTY_FLAG3 in schema;
   if (!additional) {
     return /* @__PURE__ */ jsx25("div", { className: classNames, style, children });
   }
@@ -3653,13 +3674,14 @@ var Form = class extends Component5 {
    */
   validateForm() {
     const { extraErrors, extraErrorsBlockSubmit, focusOnFirstError, onError } = this.props;
-    const { formData } = this.state;
+    const { formData, errors: prevErrors } = this.state;
     const schemaValidation = this.validate(formData);
     let errors = schemaValidation.errors;
     let errorSchema = schemaValidation.errorSchema;
     const schemaValidationErrors = errors;
     const schemaValidationErrorSchema = errorSchema;
-    if (errors.length > 0 || extraErrors && extraErrorsBlockSubmit) {
+    const hasError = errors.length > 0 || extraErrors && extraErrorsBlockSubmit;
+    if (hasError) {
       if (extraErrors) {
         const merged = validationDataMerge(schemaValidation, extraErrors);
         errorSchema = merged.errorSchema;
@@ -3687,9 +3709,15 @@ var Form = class extends Component5 {
           }
         }
       );
-      return false;
+    } else if (prevErrors.length > 0) {
+      this.setState({
+        errors: [],
+        errorSchema: {},
+        schemaValidationErrors: [],
+        schemaValidationErrorSchema: {}
+      });
     }
-    return true;
+    return !hasError;
   }
   /** Renders the `Form` fields inside the <form> | `tagName` or `_internalFormWrapper`, rendering any errors if
    * needed along with the submit button or any children of the form.