@rjsf/core 5.21.1 → 5.22.0

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/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';
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('react'), require('@rjsf/utils'), require('lodash/forEach'), require('lodash/get'), require('lodash/isEmpty'), require('lodash/isNil'), 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/isNil', '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._isNil, 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, _isNil, _pick, _toPath, cloneDeep, isObject, set, nanoid, jsxRuntime, omit2, Markdown, has, unset) { 'use strict';
 
   // src/components/Form.tsx
   function generateRowId() {
@@ -897,8 +897,9 @@
         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,
@@ -1186,15 +1187,18 @@
         const { formData, onChange, registry } = this.props;
         const newFormData = { ...formData };
         let type = void 0;
+        let constValue = void 0;
         let defaultValue = void 0;
         if (isObject(schema.additionalProperties)) {
           type = schema.additionalProperties.type;
+          constValue = schema.additionalProperties.const;
           defaultValue = schema.additionalProperties.default;
           let apSchema = schema.additionalProperties;
           if (utils.REF_KEY in apSchema) {
             const { schemaUtils } = registry;
             apSchema = schemaUtils.retrieveSchema({ $ref: apSchema[utils.REF_KEY] }, formData);
             type = apSchema.type;
+            constValue = apSchema.const;
             defaultValue = apSchema.default;
           }
           if (!type && (utils.ANY_OF_KEY in apSchema || utils.ONE_OF_KEY in apSchema)) {
@@ -1202,7 +1206,8 @@
           }
         }
         const newKey = this.getAvailableKey("newKey", newFormData);
-        set(newFormData, newKey, defaultValue ?? this.getDefaultValue(type));
+        const newValue = constValue ?? defaultValue ?? this.getDefaultValue(type);
+        set(newFormData, newKey, newValue);
         onChange(newFormData);
       };
     }
@@ -1423,7 +1428,9 @@
     );
     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);
@@ -1561,6 +1568,7 @@
             (_schema2) => schemaUtils.retrieveSchema(isObject(_schema2) ? _schema2 : {}, formData)
           ),
           registry,
+          required,
           schema,
           uiSchema
         }
@@ -1585,6 +1593,7 @@
             (_schema2) => schemaUtils.retrieveSchema(isObject(_schema2) ? _schema2 : {}, formData)
           ),
           registry,
+          required,
           schema,
           uiSchema
         }
@@ -3335,9 +3344,20 @@
       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 = utils.createSchemaUtils(props.validator, rootSchema, experimental_defaultFormStateBehavior);
+      if (!schemaUtils || schemaUtils.doesSchemaUtilsDiffer(
+        props.validator,
+        rootSchema,
+        experimental_defaultFormStateBehavior,
+        experimental_customMergeAllOf
+      )) {
+        schemaUtils = utils.createSchemaUtils(
+          props.validator,
+          rootSchema,
+          experimental_defaultFormStateBehavior,
+          experimental_customMergeAllOf
+        );
       }
       const formData = schemaUtils.getDefaultFormState(schema, inputFormData);
       const _retrievedSchema = retrievedSchema ?? schemaUtils.retrieveSchema(schema, formData);
@@ -3458,17 +3478,17 @@
       if (resolvedSchema?.type !== "object" && resolvedSchema?.type !== "array") {
         filteredErrors.__errors = schemaErrors.__errors;
       }
-      const filterUndefinedErrors = (errors) => {
+      const filterNilOrEmptyErrors = (errors) => {
         _forEach(errors, (errorAtKey, errorKey) => {
-          if (errorAtKey === void 0) {
+          if (_isNil(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() {

package/dist/index.esm.js

@@ -19,6 +19,7 @@ import {
 import _forEach from "lodash/forEach";
 import _get from "lodash/get";
 import _isEmpty from "lodash/isEmpty";
+import _isNil from "lodash/isNil";
 import _pick from "lodash/pick";
 import _toPath from "lodash/toPath";
 
@@ -964,8 +965,9 @@ var AnyOfField = class extends Component2 {
       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,
@@ -1279,15 +1281,18 @@ var ObjectField = class extends Component3 {
       const { formData, onChange, registry } = this.props;
       const newFormData = { ...formData };
       let type = void 0;
+      let constValue = void 0;
       let defaultValue = void 0;
       if (isObject3(schema.additionalProperties)) {
         type = schema.additionalProperties.type;
+        constValue = schema.additionalProperties.const;
         defaultValue = schema.additionalProperties.default;
         let apSchema = schema.additionalProperties;
         if (REF_KEY in apSchema) {
           const { schemaUtils } = registry;
           apSchema = schemaUtils.retrieveSchema({ $ref: apSchema[REF_KEY] }, formData);
           type = apSchema.type;
+          constValue = apSchema.const;
           defaultValue = apSchema.default;
         }
         if (!type && (ANY_OF_KEY2 in apSchema || ONE_OF_KEY2 in apSchema)) {
@@ -1295,7 +1300,8 @@ var ObjectField = class extends Component3 {
         }
       }
       const newKey = this.getAvailableKey("newKey", newFormData);
-      set2(newFormData, newKey, defaultValue ?? this.getDefaultValue(type));
+      const newValue = constValue ?? defaultValue ?? this.getDefaultValue(type);
+      set2(newFormData, newKey, newValue);
       onChange(newFormData);
     };
   }
@@ -1535,7 +1541,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);
@@ -1673,6 +1681,7 @@ function SchemaFieldRender(props) {
           (_schema2) => schemaUtils.retrieveSchema(isObject4(_schema2) ? _schema2 : {}, formData)
         ),
         registry,
+        required,
         schema,
         uiSchema
       }
@@ -1697,6 +1706,7 @@ function SchemaFieldRender(props) {
           (_schema2) => schemaUtils.retrieveSchema(isObject4(_schema2) ? _schema2 : {}, formData)
         ),
         registry,
+        required,
         schema,
         uiSchema
       }
@@ -3414,7 +3424,6 @@ var Form = class extends Component5 {
       const mustValidate = !noValidate && liveValidate;
       let state = { formData, schema };
       let newFormData = formData;
-      let _retrievedSchema;
       if (omitExtraData === true && liveOmit === true) {
         newFormData = this.omitExtraData(formData);
         state = {
@@ -3451,9 +3460,6 @@ var Form = class extends Component5 {
           errors: toErrorList(errorSchema)
         };
       }
-      if (_retrievedSchema) {
-        state.retrievedSchema = _retrievedSchema;
-      }
       this.setState(state, () => onChange && onChange({ ...this.state, ...state }, id));
     };
     /**
@@ -3689,9 +3695,20 @@ var Form = class extends Component5 {
     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 = createSchemaUtils(props.validator, rootSchema, experimental_defaultFormStateBehavior);
+    if (!schemaUtils || schemaUtils.doesSchemaUtilsDiffer(
+      props.validator,
+      rootSchema,
+      experimental_defaultFormStateBehavior,
+      experimental_customMergeAllOf
+    )) {
+      schemaUtils = createSchemaUtils(
+        props.validator,
+        rootSchema,
+        experimental_defaultFormStateBehavior,
+        experimental_customMergeAllOf
+      );
     }
     const formData = schemaUtils.getDefaultFormState(schema, inputFormData);
     const _retrievedSchema = retrievedSchema ?? schemaUtils.retrieveSchema(schema, formData);
@@ -3812,17 +3829,17 @@ var Form = class extends Component5 {
     if (resolvedSchema?.type !== "object" && resolvedSchema?.type !== "array") {
       filteredErrors.__errors = schemaErrors.__errors;
     }
-    const filterUndefinedErrors = (errors) => {
+    const filterNilOrEmptyErrors = (errors) => {
       _forEach(errors, (errorAtKey, errorKey) => {
-        if (errorAtKey === void 0) {
+        if (_isNil(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() {