@rjsf/core 5.21.1 → 5.22.0

package/dist/index.js

@@ -42,6 +42,7 @@ 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_isNil = __toESM(require("lodash/isNil"));
 var import_pick = __toESM(require("lodash/pick"));
 var import_toPath = __toESM(require("lodash/toPath"));
 
@@ -962,8 +963,9 @@ var AnyOfField = class extends import_react2.Component {
       if (newFormData && newOption) {
         newFormData = schemaUtils.getDefaultFormState(newOption, newFormData, "excludeObjectChildren");
       }
-      onChange(newFormData, void 0, this.getFieldId());
-      this.setState({ selectedOption: intOption });
+      this.setState({ selectedOption: intOption }, () => {
+        onChange(newFormData, void 0, this.getFieldId());
+      });
     };
     const {
       formData,
@@ -1267,15 +1269,18 @@ var ObjectField = class extends import_react4.Component {
       const { formData, onChange, registry } = this.props;
       const newFormData = { ...formData };
       let type = void 0;
+      let constValue = void 0;
       let defaultValue = void 0;
       if ((0, import_isObject3.default)(schema.additionalProperties)) {
         type = schema.additionalProperties.type;
+        constValue = schema.additionalProperties.const;
         defaultValue = schema.additionalProperties.default;
         let apSchema = schema.additionalProperties;
         if (import_utils5.REF_KEY in apSchema) {
           const { schemaUtils } = registry;
           apSchema = schemaUtils.retrieveSchema({ $ref: apSchema[import_utils5.REF_KEY] }, formData);
           type = apSchema.type;
+          constValue = apSchema.const;
           defaultValue = apSchema.default;
         }
         if (!type && (import_utils5.ANY_OF_KEY in apSchema || import_utils5.ONE_OF_KEY in apSchema)) {
@@ -1283,7 +1288,8 @@ var ObjectField = class extends import_react4.Component {
         }
       }
       const newKey = this.getAvailableKey("newKey", newFormData);
-      (0, import_set2.default)(newFormData, newKey, defaultValue ?? this.getDefaultValue(type));
+      const newValue = constValue ?? defaultValue ?? this.getDefaultValue(type);
+      (0, import_set2.default)(newFormData, newKey, newValue);
       onChange(newFormData);
     };
   }
@@ -1512,7 +1518,9 @@ function SchemaFieldRender(props) {
   );
   const FieldComponent = getFieldComponent(schema, uiOptions, idSchema, registry);
   const disabled = Boolean(uiOptions.disabled ?? props.disabled);
-  const readonly = Boolean(uiOptions.readonly ?? (props.readonly || props.schema.readOnly || schema.readOnly));
+  const readonly = Boolean(
+    uiOptions.readonly ?? (props.readonly || props.schema.const || props.schema.readOnly || schema.readOnly)
+  );
   const uiSchemaHideError = uiOptions.hideError;
   const hideError = uiSchemaHideError === void 0 ? props.hideError : Boolean(uiSchemaHideError);
   const autofocus = Boolean(uiOptions.autofocus ?? props.autofocus);
@@ -1650,6 +1658,7 @@ function SchemaFieldRender(props) {
           (_schema2) => schemaUtils.retrieveSchema((0, import_isObject4.default)(_schema2) ? _schema2 : {}, formData)
         ),
         registry,
+        required,
         schema,
         uiSchema
       }
@@ -1674,6 +1683,7 @@ function SchemaFieldRender(props) {
           (_schema2) => schemaUtils.retrieveSchema((0, import_isObject4.default)(_schema2) ? _schema2 : {}, formData)
         ),
         registry,
+        required,
         schema,
         uiSchema
       }
@@ -3320,7 +3330,6 @@ var Form = class extends import_react17.Component {
       const mustValidate = !noValidate && liveValidate;
       let state = { formData, schema };
       let newFormData = formData;
-      let _retrievedSchema;
       if (omitExtraData === true && liveOmit === true) {
         newFormData = this.omitExtraData(formData);
         state = {
@@ -3357,9 +3366,6 @@ var Form = class extends import_react17.Component {
           errors: (0, import_utils39.toErrorList)(errorSchema)
         };
       }
-      if (_retrievedSchema) {
-        state.retrievedSchema = _retrievedSchema;
-      }
       this.setState(state, () => onChange && onChange({ ...this.state, ...state }, id));
     };
     /**
@@ -3595,9 +3601,20 @@ var Form = class extends import_react17.Component {
     const mustValidate = edit && !props.noValidate && liveValidate;
     const rootSchema = schema;
     const experimental_defaultFormStateBehavior = "experimental_defaultFormStateBehavior" in props ? props.experimental_defaultFormStateBehavior : this.props.experimental_defaultFormStateBehavior;
+    const experimental_customMergeAllOf = "experimental_customMergeAllOf" in props ? props.experimental_customMergeAllOf : this.props.experimental_customMergeAllOf;
     let schemaUtils = state.schemaUtils;
-    if (!schemaUtils || schemaUtils.doesSchemaUtilsDiffer(props.validator, rootSchema, experimental_defaultFormStateBehavior)) {
-      schemaUtils = (0, import_utils39.createSchemaUtils)(props.validator, rootSchema, experimental_defaultFormStateBehavior);
+    if (!schemaUtils || schemaUtils.doesSchemaUtilsDiffer(
+      props.validator,
+      rootSchema,
+      experimental_defaultFormStateBehavior,
+      experimental_customMergeAllOf
+    )) {
+      schemaUtils = (0, import_utils39.createSchemaUtils)(
+        props.validator,
+        rootSchema,
+        experimental_defaultFormStateBehavior,
+        experimental_customMergeAllOf
+      );
     }
     const formData = schemaUtils.getDefaultFormState(schema, inputFormData);
     const _retrievedSchema = retrievedSchema ?? schemaUtils.retrieveSchema(schema, formData);
@@ -3718,17 +3735,17 @@ var Form = class extends import_react17.Component {
     if (resolvedSchema?.type !== "object" && resolvedSchema?.type !== "array") {
       filteredErrors.__errors = schemaErrors.__errors;
     }
-    const filterUndefinedErrors = (errors) => {
+    const filterNilOrEmptyErrors = (errors) => {
       (0, import_forEach.default)(errors, (errorAtKey, errorKey) => {
-        if (errorAtKey === void 0) {
+        if ((0, import_isNil.default)(errorAtKey)) {
           delete errors[errorKey];
         } else if (typeof errorAtKey === "object" && !Array.isArray(errorAtKey.__errors)) {
-          filterUndefinedErrors(errorAtKey);
+          filterNilOrEmptyErrors(errorAtKey);
         }
       });
       return errors;
     };
-    return filterUndefinedErrors(filteredErrors);
+    return filterNilOrEmptyErrors(filteredErrors);
   }
   /** Returns the registry for the form */
   getRegistry() {