@rjsf/core 5.19.4 → 5.20.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('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';
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('react'), require('@rjsf/utils'), require('lodash/forEach'), 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/forEach', '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._forEach, 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, _forEach, get3, isEmpty, _pick, _toPath, cloneDeep, isObject, set, nanoid, jsxRuntime, omit2, Markdown, has, unset) { 'use strict';
 
   // src/components/Form.tsx
   function generateRowId() {
@@ -513,7 +513,7 @@
       } = this.props;
       const { widgets: widgets2, schemaUtils, formContext, globalUiOptions } = registry;
       const itemsSchema = schemaUtils.retrieveSchema(schema.items, items);
-      const enumOptions = utils.optionsList(itemsSchema);
+      const enumOptions = utils.optionsList(itemsSchema, uiSchema);
       const { widget = "select", title: uiTitle, ...options } = utils.getUiOptions(uiSchema, globalUiOptions);
       const Widget = utils.getWidget(schema, widget, widgets2);
       const label = uiTitle ?? schema.title ?? name;
@@ -804,18 +804,21 @@
     let enumOptions;
     const label = uiTitle ?? schemaTitle ?? title ?? name;
     if (Array.isArray(schema.oneOf)) {
-      enumOptions = utils.optionsList({
-        oneOf: schema.oneOf.map((option) => {
-          if (isObject(option)) {
-            return {
-              ...option,
-              title: option.title || (option.const === true ? yes : no)
-            };
-          }
-          return void 0;
-        }).filter((o) => o)
-        // cast away the error that typescript can't grok is fixed
-      });
+      enumOptions = utils.optionsList(
+        {
+          oneOf: schema.oneOf.map((option) => {
+            if (isObject(option)) {
+              return {
+                ...option,
+                title: option.title || (option.const === true ? yes : no)
+              };
+            }
+            return void 0;
+          }).filter((o) => o)
+          // cast away the error that typescript can't grok is fixed
+        },
+        uiSchema
+      );
     } else {
       const schemaWithEnumNames = schema;
       const enums = schema.enum ?? [true, false];
@@ -831,11 +834,14 @@
           }
         ];
       } else {
-        enumOptions = utils.optionsList({
-          enum: enums,
-          // NOTE: enumNames is deprecated, but still supported for now.
-          enumNames: schemaWithEnumNames.enumNames
-        });
+        enumOptions = utils.optionsList(
+          {
+            enum: enums,
+            // NOTE: enumNames is deprecated, but still supported for now.
+            enumNames: schemaWithEnumNames.enumNames
+          },
+          uiSchema
+        );
       }
     }
     return /* @__PURE__ */ jsxRuntime.jsx(
@@ -1614,7 +1620,7 @@
     } = props;
     const { title, format } = schema;
     const { widgets: widgets2, formContext, schemaUtils, globalUiOptions } = registry;
-    const enumOptions = schemaUtils.isSelect(schema) ? utils.optionsList(schema) : void 0;
+    const enumOptions = schemaUtils.isSelect(schema) ? utils.optionsList(schema, uiSchema) : void 0;
     let defaultWidget = enumOptions ? "select" : "text";
     if (format && utils.hasWidget(schema, format, widgets2)) {
       defaultWidget = format;
@@ -3075,6 +3081,10 @@
             errorSchema = merged.errorSchema;
             errors = merged.errors;
           }
+          if (newErrorSchema) {
+            const filteredErrors = this.filterErrorsBasedOnSchema(newErrorSchema, retrievedSchema, newFormData);
+            errorSchema = utils.mergeObjects(errorSchema, filteredErrors, "preventDuplicates");
+          }
           state = {
             formData: newFormData,
             errors,
@@ -3352,7 +3362,15 @@
       if (mustValidate) {
         const schemaValidation = this.validate(formData, schema, schemaUtils, _retrievedSchema);
         errors = schemaValidation.errors;
-        errorSchema = schemaValidation.errorSchema;
+        if (isSchemaChanged) {
+          errorSchema = schemaValidation.errorSchema;
+        } else {
+          errorSchema = utils.mergeObjects(
+            this.state?.errorSchema,
+            schemaValidation.errorSchema,
+            "preventDuplicates"
+          );
+        }
         schemaValidationErrors = errors;
         schemaValidationErrorSchema = errorSchema;
       } else {
@@ -3430,6 +3448,28 @@
       }
       return null;
     }
+    // Filtering errors based on your retrieved schema to only show errors for properties in the selected branch.
+    filterErrorsBasedOnSchema(schemaErrors, resolvedSchema, formData) {
+      const { retrievedSchema, schemaUtils } = this.state;
+      const _retrievedSchema = resolvedSchema ?? retrievedSchema;
+      const pathSchema = schemaUtils.toPathSchema(_retrievedSchema, "", formData);
+      const fieldNames = this.getFieldNames(pathSchema, formData);
+      const filteredErrors = _pick(schemaErrors, fieldNames);
+      if (resolvedSchema?.type !== "object" && resolvedSchema?.type !== "array") {
+        filteredErrors.__errors = schemaErrors.__errors;
+      }
+      const filterUndefinedErrors = (errors) => {
+        _forEach(errors, (errorAtKey, errorKey) => {
+          if (errorAtKey === void 0) {
+            delete errors[errorKey];
+          } else if (typeof errorAtKey === "object" && !Array.isArray(errorAtKey.__errors)) {
+            filterUndefinedErrors(errorAtKey);
+          }
+        });
+        return errors;
+      };
+      return filterUndefinedErrors(filteredErrors);
+    }
     /** Returns the registry for the form */
     getRegistry() {
       const { translateString: customTranslateString, uiSchema = {} } = this.props;

package/dist/index.esm.js

@@ -16,6 +16,7 @@ import {
   UI_OPTIONS_KEY as UI_OPTIONS_KEY2,
   validationDataMerge
 } from "@rjsf/utils";
+import _forEach from "lodash/forEach";
 import _get from "lodash/get";
 import _isEmpty from "lodash/isEmpty";
 import _pick from "lodash/pick";
@@ -551,7 +552,7 @@ var ArrayField = class extends Component {
     } = this.props;
     const { widgets: widgets2, schemaUtils, formContext, globalUiOptions } = registry;
     const itemsSchema = schemaUtils.retrieveSchema(schema.items, items);
-    const enumOptions = optionsList(itemsSchema);
+    const enumOptions = optionsList(itemsSchema, uiSchema);
     const { widget = "select", title: uiTitle, ...options } = getUiOptions(uiSchema, globalUiOptions);
     const Widget = getWidget(schema, widget, widgets2);
     const label = uiTitle ?? schema.title ?? name;
@@ -852,18 +853,21 @@ function BooleanField(props) {
   let enumOptions;
   const label = uiTitle ?? schemaTitle ?? title ?? name;
   if (Array.isArray(schema.oneOf)) {
-    enumOptions = optionsList2({
-      oneOf: schema.oneOf.map((option) => {
-        if (isObject2(option)) {
-          return {
-            ...option,
-            title: option.title || (option.const === true ? yes : no)
-          };
-        }
-        return void 0;
-      }).filter((o) => o)
-      // cast away the error that typescript can't grok is fixed
-    });
+    enumOptions = optionsList2(
+      {
+        oneOf: schema.oneOf.map((option) => {
+          if (isObject2(option)) {
+            return {
+              ...option,
+              title: option.title || (option.const === true ? yes : no)
+            };
+          }
+          return void 0;
+        }).filter((o) => o)
+        // cast away the error that typescript can't grok is fixed
+      },
+      uiSchema
+    );
   } else {
     const schemaWithEnumNames = schema;
     const enums = schema.enum ?? [true, false];
@@ -879,11 +883,14 @@ function BooleanField(props) {
         }
       ];
     } else {
-      enumOptions = optionsList2({
-        enum: enums,
-        // NOTE: enumNames is deprecated, but still supported for now.
-        enumNames: schemaWithEnumNames.enumNames
-      });
+      enumOptions = optionsList2(
+        {
+          enum: enums,
+          // NOTE: enumNames is deprecated, but still supported for now.
+          enumNames: schemaWithEnumNames.enumNames
+        },
+        uiSchema
+      );
     }
   }
   return /* @__PURE__ */ jsx2(
@@ -1734,7 +1741,7 @@ function StringField(props) {
   } = props;
   const { title, format } = schema;
   const { widgets: widgets2, formContext, schemaUtils, globalUiOptions } = registry;
-  const enumOptions = schemaUtils.isSelect(schema) ? optionsList3(schema) : void 0;
+  const enumOptions = schemaUtils.isSelect(schema) ? optionsList3(schema, uiSchema) : void 0;
   let defaultWidget = enumOptions ? "select" : "text";
   if (format && hasWidget(schema, format, widgets2)) {
     defaultWidget = format;
@@ -3425,6 +3432,10 @@ var Form = class extends Component5 {
           errorSchema = merged.errorSchema;
           errors = merged.errors;
         }
+        if (newErrorSchema) {
+          const filteredErrors = this.filterErrorsBasedOnSchema(newErrorSchema, retrievedSchema, newFormData);
+          errorSchema = mergeObjects2(errorSchema, filteredErrors, "preventDuplicates");
+        }
         state = {
           formData: newFormData,
           errors,
@@ -3705,7 +3716,15 @@ var Form = class extends Component5 {
     if (mustValidate) {
       const schemaValidation = this.validate(formData, schema, schemaUtils, _retrievedSchema);
       errors = schemaValidation.errors;
-      errorSchema = schemaValidation.errorSchema;
+      if (isSchemaChanged) {
+        errorSchema = schemaValidation.errorSchema;
+      } else {
+        errorSchema = mergeObjects2(
+          this.state?.errorSchema,
+          schemaValidation.errorSchema,
+          "preventDuplicates"
+        );
+      }
       schemaValidationErrors = errors;
       schemaValidationErrorSchema = errorSchema;
     } else {
@@ -3783,6 +3802,28 @@ var Form = class extends Component5 {
     }
     return null;
   }
+  // Filtering errors based on your retrieved schema to only show errors for properties in the selected branch.
+  filterErrorsBasedOnSchema(schemaErrors, resolvedSchema, formData) {
+    const { retrievedSchema, schemaUtils } = this.state;
+    const _retrievedSchema = resolvedSchema ?? retrievedSchema;
+    const pathSchema = schemaUtils.toPathSchema(_retrievedSchema, "", formData);
+    const fieldNames = this.getFieldNames(pathSchema, formData);
+    const filteredErrors = _pick(schemaErrors, fieldNames);
+    if (resolvedSchema?.type !== "object" && resolvedSchema?.type !== "array") {
+      filteredErrors.__errors = schemaErrors.__errors;
+    }
+    const filterUndefinedErrors = (errors) => {
+      _forEach(errors, (errorAtKey, errorKey) => {
+        if (errorAtKey === void 0) {
+          delete errors[errorKey];
+        } else if (typeof errorAtKey === "object" && !Array.isArray(errorAtKey.__errors)) {
+          filterUndefinedErrors(errorAtKey);
+        }
+      });
+      return errors;
+    };
+    return filterUndefinedErrors(filteredErrors);
+  }
   /** Returns the registry for the form */
   getRegistry() {
     const { translateString: customTranslateString, uiSchema = {} } = this.props;