@rjsf/core 5.19.3 → 5.20.0

package/dist/index.js

@@ -39,6 +39,7 @@ module.exports = __toCommonJS(src_exports);
 // src/components/Form.tsx
 var import_react17 = require("react");
 var import_utils39 = require("@rjsf/utils");
+var import_forEach = __toESM(require("lodash/forEach"));
 var import_get4 = __toESM(require("lodash/get"));
 var import_isEmpty2 = __toESM(require("lodash/isEmpty"));
 var import_pick = __toESM(require("lodash/pick"));
@@ -564,7 +565,7 @@ var ArrayField = class extends import_react.Component {
     } = this.props;
     const { widgets: widgets2, schemaUtils, formContext, globalUiOptions } = registry;
     const itemsSchema = schemaUtils.retrieveSchema(schema.items, items);
-    const enumOptions = (0, import_utils.optionsList)(itemsSchema);
+    const enumOptions = (0, import_utils.optionsList)(itemsSchema, uiSchema);
     const { widget = "select", title: uiTitle, ...options } = (0, import_utils.getUiOptions)(uiSchema, globalUiOptions);
     const Widget = (0, import_utils.getWidget)(schema, widget, widgets2);
     const label = uiTitle ?? schema.title ?? name;
@@ -860,18 +861,21 @@ function BooleanField(props) {
   let enumOptions;
   const label = uiTitle ?? schemaTitle ?? title ?? name;
   if (Array.isArray(schema.oneOf)) {
-    enumOptions = (0, import_utils2.optionsList)({
-      oneOf: schema.oneOf.map((option) => {
-        if ((0, import_isObject2.default)(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 = (0, import_utils2.optionsList)(
+      {
+        oneOf: schema.oneOf.map((option) => {
+          if ((0, import_isObject2.default)(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];
@@ -887,11 +891,14 @@ function BooleanField(props) {
         }
       ];
     } else {
-      enumOptions = (0, import_utils2.optionsList)({
-        enum: enums,
-        // NOTE: enumNames is deprecated, but still supported for now.
-        enumNames: schemaWithEnumNames.enumNames
-      });
+      enumOptions = (0, import_utils2.optionsList)(
+        {
+          enum: enums,
+          // NOTE: enumNames is deprecated, but still supported for now.
+          enumNames: schemaWithEnumNames.enumNames
+        },
+        uiSchema
+      );
     }
   }
   return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
@@ -1347,7 +1354,7 @@ var ObjectField = class extends import_react4.Component {
       orderedProperties = (0, import_utils5.orderProperties)(properties, uiOptions.order);
     } catch (err) {
       return /* @__PURE__ */ (0, import_jsx_runtime5.jsxs)("div", { children: [
-        /* @__PURE__ */ (0, import_jsx_runtime5.jsx)("p", { className: "config-error", style: { color: "red" }, children: /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(import_markdown_to_jsx.default, { children: translateString(import_utils5.TranslatableString.InvalidObjectField, [name || "root", err.message]) }) }),
+        /* @__PURE__ */ (0, import_jsx_runtime5.jsx)("p", { className: "config-error", style: { color: "red" }, children: /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(import_markdown_to_jsx.default, { options: { disableParsingRawHTML: true }, children: translateString(import_utils5.TranslatableString.InvalidObjectField, [name || "root", err.message]) }) }),
         /* @__PURE__ */ (0, import_jsx_runtime5.jsx)("pre", { children: JSON.stringify(schema) })
       ] });
     }
@@ -1543,7 +1550,7 @@ function SchemaFieldRender(props) {
     label = import_utils6.ADDITIONAL_PROPERTY_FLAG in schema ? name : uiOptions.title || props.schema.title || schema.title || props.title || name;
   }
   const description = uiOptions.description || props.schema.description || schema.description || "";
-  const richDescription = uiOptions.enableMarkdownInDescription ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_markdown_to_jsx2.default, { children: description }) : description;
+  const richDescription = uiOptions.enableMarkdownInDescription ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_markdown_to_jsx2.default, { options: { disableParsingRawHTML: true }, children: description }) : description;
   const help = uiOptions.help;
   const hidden = uiOptions.widget === "hidden";
   const classNames = ["form-group", "field", `field-${(0, import_utils6.getSchemaType)(schema)}`];
@@ -1706,7 +1713,7 @@ function StringField(props) {
   } = props;
   const { title, format } = schema;
   const { widgets: widgets2, formContext, schemaUtils, globalUiOptions } = registry;
-  const enumOptions = schemaUtils.isSelect(schema) ? (0, import_utils7.optionsList)(schema) : void 0;
+  const enumOptions = schemaUtils.isSelect(schema) ? (0, import_utils7.optionsList)(schema, uiSchema) : void 0;
   let defaultWidget = enumOptions ? "select" : "text";
   if (format && (0, import_utils7.hasWidget)(schema, format, widgets2)) {
     defaultWidget = format;
@@ -2375,7 +2382,7 @@ function UnsupportedField(props) {
     translateParams.push(reason);
   }
   return /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)("div", { className: "unsupported-field", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("p", { children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(import_markdown_to_jsx3.default, { children: translateString(translateEnum, translateParams) }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("p", { children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(import_markdown_to_jsx3.default, { options: { disableParsingRawHTML: true }, children: translateString(translateEnum, translateParams) }) }),
     schema && /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("pre", { children: JSON.stringify(schema, null, 2) })
   ] });
 }
@@ -3331,6 +3338,10 @@ var Form = class extends import_react17.Component {
           errorSchema = merged.errorSchema;
           errors = merged.errors;
         }
+        if (newErrorSchema) {
+          const filteredErrors = this.filterErrorsBasedOnSchema(newErrorSchema, retrievedSchema, newFormData);
+          errorSchema = (0, import_utils39.mergeObjects)(errorSchema, filteredErrors, "preventDuplicates");
+        }
         state = {
           formData: newFormData,
           errors,
@@ -3611,7 +3622,15 @@ var Form = class extends import_react17.Component {
     if (mustValidate) {
       const schemaValidation = this.validate(formData, schema, schemaUtils, _retrievedSchema);
       errors = schemaValidation.errors;
-      errorSchema = schemaValidation.errorSchema;
+      if (isSchemaChanged) {
+        errorSchema = schemaValidation.errorSchema;
+      } else {
+        errorSchema = (0, import_utils39.mergeObjects)(
+          this.state?.errorSchema,
+          schemaValidation.errorSchema,
+          "preventDuplicates"
+        );
+      }
       schemaValidationErrors = errors;
       schemaValidationErrorSchema = errorSchema;
     } else {
@@ -3689,6 +3708,28 @@ var Form = class extends import_react17.Component {
     }
     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 = (0, import_pick.default)(schemaErrors, fieldNames);
+    if (resolvedSchema?.type !== "object" && resolvedSchema?.type !== "array") {
+      filteredErrors.__errors = schemaErrors.__errors;
+    }
+    const filterUndefinedErrors = (errors) => {
+      (0, import_forEach.default)(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;