@rjsf/core 6.0.0-beta.2 → 6.0.0-beta.20

package/lib/components/Form.d.ts

@@ -1,5 +1,5 @@
 import { Component, ElementType, FormEvent, ReactNode, Ref, RefObject } from 'react';
-import { CustomValidator, ErrorSchema, ErrorTransformer, FormContextType, IdSchema, PathSchema, StrictRJSFSchema, Registry, RegistryFieldsType, RegistryWidgetsType, RJSFSchema, RJSFValidationError, SchemaUtilsType, TemplatesType, UiSchema, ValidationData, ValidatorType, Experimental_DefaultFormStateBehavior, Experimental_CustomMergeAllOf } from '@rjsf/utils';
+import { CustomValidator, ErrorSchema, ErrorTransformer, FieldPathId, FieldPathList, FormContextType, PathSchema, StrictRJSFSchema, Registry, RegistryFieldsType, RegistryWidgetsType, RJSFSchema, RJSFValidationError, SchemaUtilsType, TemplatesType, UiSchema, ValidationData, ValidatorType, Experimental_DefaultFormStateBehavior, Experimental_CustomMergeAllOf } from '@rjsf/utils';
 /** The properties that are passed to the `Form` */
 export interface FormProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> {
     /** The JSON schema object for the form */
@@ -144,6 +144,17 @@ export interface FormProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F e
      * `emptyObjectFields`
      */
     experimental_defaultFormStateBehavior?: Experimental_DefaultFormStateBehavior;
+    /**
+     * Controls the component update strategy used by the Form's `shouldComponentUpdate` lifecycle method.
+     *
+     * - `'customDeep'`: Uses RJSF's custom deep equality checks via the `deepEquals` utility function,
+     *   which treats all functions as equivalent and provides optimized performance for form data comparisons.
+     * - `'shallow'`: Uses shallow comparison of props and state (only compares direct properties). This matches React's PureComponent behavior.
+     * - `'always'`: Always rerenders when called. This matches React's Component behavior.
+     *
+     * @default 'customDeep'
+     */
+    experimental_componentUpdateStrategy?: 'customDeep' | 'shallow' | 'always';
     /** Optional function that allows for custom merging of `allOf` schemas
      */
     experimental_customMergeAllOf?: Experimental_CustomMergeAllOf<S>;
@@ -173,10 +184,10 @@ export interface FormState<T = any, S extends StrictRJSFSchema = RJSFSchema, F e
     schema: S;
     /** The uiSchema for the form */
     uiSchema: UiSchema<T, S, F>;
-    /** The `IdSchema` for the form, computed from the `schema`, the `rootFieldId`, the `formData` and the `idPrefix` and
+    /** The `FieldPathId` for the form, computed from the `schema`, the `rootFieldId`, the `idPrefix` and
      * `idSeparator` props.
      */
-    idSchema: IdSchema<T>;
+    fieldPathId: FieldPathId;
     /** The schemaUtils implementation used by the `Form`, created from the `validator` and the `schema` */
     schemaUtils: SchemaUtilsType<T, S, F>;
     /** The current data for the form, computed from the `formData` prop and the changes made by the user */
@@ -203,12 +214,27 @@ export interface IChangeEvent<T = any, S extends StrictRJSFSchema = RJSFSchema,
     /** The status of the form when submitted */
     status?: 'submitted';
 }
+/** The definition of a pending change that will be processed in the `onChange` handler
+ */
+interface PendingChange<T> {
+    /** The path into the formData/errorSchema at which the `newValue`/`newErrorSchema` will be set */
+    path: FieldPathList;
+    /** The new value to set into the formData */
+    newValue?: T;
+    /** The new errors to be set into the errorSchema, if any */
+    newErrorSchema?: ErrorSchema<T>;
+    /** The optional id of the field for which the change is being made */
+    id?: string;
+}
 /** The `Form` component renders the outer form and all the fields defined in the `schema` */
 export default class Form<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> extends Component<FormProps<T, S, F>, FormState<T, S, F>> {
     /** The ref used to hold the `form` element, this needs to be `any` because `tagName` or `_internalFormWrapper` can
      * provide any possible type here
      */
     formElement: RefObject<any>;
+    /** The list of pending changes
+     */
+    pendingChanges: PendingChange<T>[];
     /** Constructs the `Form` from the `props`. Will setup the initial state from the props. It will also call the
      * `onChange` handler if the initially provided `formData` is modified to add missing default values as part of the
      * state construction.
@@ -267,9 +293,10 @@ export default class Form<T = any, S extends StrictRJSFSchema = RJSFSchema, F ex
      * @param retrievedSchema - An expanded schema, if not provided, it will be retrieved from the `schema` and `formData`.
      * @param isSchemaChanged - A flag indicating whether the schema has changed.
      * @param formDataChangedFields - The changed fields of `formData`
+     * @param skipLiveValidate - Optional flag, if true, means that we are not running live validation
      * @returns - The new state for the `Form`
      */
-    getStateFromProps(props: FormProps<T, S, F>, inputFormData?: T, retrievedSchema?: S, isSchemaChanged?: boolean, formDataChangedFields?: string[]): FormState<T, S, F>;
+    getStateFromProps(props: FormProps<T, S, F>, inputFormData?: T, retrievedSchema?: S, isSchemaChanged?: boolean, formDataChangedFields?: string[], skipLiveValidate?: boolean): FormState<T, S, F>;
     /** React lifecycle method that is used to determine whether component should be updated.
      *
      * @param nextProps - The next version of the props
@@ -287,7 +314,8 @@ export default class Form<T = any, S extends StrictRJSFSchema = RJSFSchema, F ex
      *
      * @param formData - The new form data to validate
      * @param schema - The schema used to validate against
-     * @param altSchemaUtils - The alternate schemaUtils to use for validation
+     * @param [altSchemaUtils] - The alternate schemaUtils to use for validation
+     * @param [retrievedSchema] - An optionally retrieved schema for per
      */
     validate(formData: T | undefined, schema?: S, altSchemaUtils?: SchemaUtilsType<T, S, F>, retrievedSchema?: S): ValidationData<T>;
     /** Renders any errors contained in the `state` in using the `ErrorList`, if not disabled by `showErrorList`. */
@@ -310,19 +338,33 @@ export default class Form<T = any, S extends StrictRJSFSchema = RJSFSchema, F ex
      * @returns The `formData` after omitting extra data
      */
     omitExtraData: (formData?: T) => T | undefined;
-    private filterErrorsBasedOnSchema;
-    /** Function to handle changes made to a field in the `Form`. This handler receives an entirely new copy of the
-     * `formData` along with a new `ErrorSchema`. It will first update the `formData` with any missing default fields and
-     * then, if `omitExtraData` and `liveOmit` are turned on, the `formData` will be filtered to remove any extra data not
-     * in a form field. Then, the resulting formData will be validated if required. The state will be updated with the new
-     * updated (potentially filtered) `formData`, any errors that resulted from validation. Finally the `onChange`
-     * callback will be called if specified with the updated state.
+    /** Filtering errors based on your retrieved schema to only show errors for properties in the selected branch.
      *
-     * @param formData - The new form data from a change to a field
-     * @param newErrorSchema - The new `ErrorSchema` based on the field change
-     * @param id - The id of the field that caused the change
+     * @param schemaErrors - The schema errors to filter
+     * @param [resolvedSchema] - An optionally resolved schema to use for performance reasons
+     * @param [formData] - The formData to help filter errors
+     * @private
      */
-    onChange: (formData: T | undefined, newErrorSchema?: ErrorSchema<T>, id?: string) => void;
+    private filterErrorsBasedOnSchema;
+    /** Pushes the given change information into the `pendingChanges` array and then calls `processPendingChanges()` if
+     * the array only contains a single pending change.
+     *
+     * @param newValue - The new form data from a change to a field
+     * @param path - The path to the change into which to set the formData
+     * @param [newErrorSchema] - The new `ErrorSchema` based on the field change
+     * @param [id] - The id of the field that caused the change
+     */
+    onChange: (newValue: T | undefined, path: FieldPathList, newErrorSchema?: ErrorSchema<T>, id?: string) => void;
+    /** Function to handle changes made to a field in the `Form`. This handler gets the first change from the
+     * `pendingChanges` list, containing the `newValue` for the `formData` and the `path` at which the `newValue` is to be
+     * updated, along with a new, optional `ErrorSchema` for that same `path` and potentially the `id` of the field being
+     * changed. It will first update the `formData` with any missing default fields and then, if `omitExtraData` and
+     * `liveOmit` are turned on, the `formData` will be filtered to remove any extra data not in a form field. Then, the
+     * resulting `formData` will be validated if required. The state will be updated with the new updated (potentially
+     * filtered) `formData`, any errors that resulted from validation. Finally the `onChange` callback will be called, if
+     * specified, with the updated state and the `processPendingChange()` function is called again.
+     */
+    processPendingChange(): void;
     /**
      * If the retrievedSchema has changed the new retrievedSchema is returned.
      * Otherwise, the old retrievedSchema is returned to persist reference.
@@ -363,6 +405,13 @@ export default class Form<T = any, S extends StrictRJSFSchema = RJSFSchema, F ex
      * @param event - The submit HTML form event
      */
     onSubmit: (event: FormEvent<any>) => void;
+    /** Extracts the `GlobalFormOptions` from the given Form `props`
+     *
+     * @param props - The form props to extract the global form options from
+     * @returns - The `GlobalFormOptions` from the props
+     * @private
+     */
+    private getGlobalFormOptions;
     /** Returns the registry for the form */
     getRegistry(): Registry<T, S, F>;
     /** Provides a function that can be used to programmatically submit the `Form` */
@@ -393,4 +442,5 @@ export default class Form<T = any, S extends StrictRJSFSchema = RJSFSchema, F ex
      */
     render(): import("react/jsx-runtime").JSX.Element;
 }
+export {};
 //# sourceMappingURL=Form.d.ts.map

package/lib/components/Form.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Form.d.ts","sourceRoot":"","sources":["../../src/components/Form.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Form.d.ts","sourceRoot":"","sources":["../../src/components/Form.tsx"],"names":[],"mappings":"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"}

package/lib/components/Form.js

@@ -1,11 +1,13 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Component, createRef } from 'react';
-import { createSchemaUtils, deepEquals, getChangedFields, getTemplate, getUiOptions, isObject, mergeObjects, NAME_KEY, RJSF_ADDITIONAL_PROPERTIES_FLAG, shouldRender, SUBMIT_BTN_OPTIONS_KEY, toErrorList, UI_GLOBAL_OPTIONS_KEY, UI_OPTIONS_KEY, validationDataMerge, createErrorHandler, unwrapErrorHandler, } from '@rjsf/utils';
+import { createSchemaUtils, deepEquals, ERRORS_KEY, getChangedFields, getTemplate, getUiOptions, isObject, mergeObjects, NAME_KEY, RJSF_ADDITIONAL_PROPERTIES_FLAG, shouldRender, SUBMIT_BTN_OPTIONS_KEY, toErrorList, toFieldPathId, UI_GLOBAL_OPTIONS_KEY, UI_OPTIONS_KEY, validationDataMerge, createErrorHandler, unwrapErrorHandler, DEFAULT_ID_SEPARATOR, DEFAULT_ID_PREFIX, } from '@rjsf/utils';
+import _cloneDeep from 'lodash-es/cloneDeep.js';
 import _forEach from 'lodash-es/forEach.js';
 import _get from 'lodash-es/get.js';
 import _isEmpty from 'lodash-es/isEmpty.js';
 import _isNil from 'lodash-es/isNil.js';
 import _pick from 'lodash-es/pick.js';
+import _set from 'lodash-es/set.js';
 import _toPath from 'lodash-es/toPath.js';
 import getDefaultRegistry from '../getDefaultRegistry.js';
 /** The `Form` component renders the outer form and all the fields defined in the `schema` */
@@ -14,6 +16,9 @@ export default class Form extends Component {
      * provide any possible type here
      */
     formElement;
+    /** The list of pending changes
+     */
+    pendingChanges = [];
     /** Constructs the `Form` from the `props`. Will setup the initial state from the props. It will also call the
      * `onChange` handler if the initially provided `formData` is modified to add missing default values as part of the
      * state construction.
@@ -51,16 +56,23 @@ export default class Form extends Component {
      */
     getSnapshotBeforeUpdate(prevProps, prevState) {
         if (!deepEquals(this.props, prevProps)) {
+            // Compare the previous props formData against the current props formData
             const formDataChangedFields = getChangedFields(this.props.formData, prevProps.formData);
+            // Compare the current props formData against the current state's formData to determine if the new props were the
+            // result of the onChange from the existing state formData
+            const stateDataChangedFields = getChangedFields(this.props.formData, this.state.formData);
             const isSchemaChanged = !deepEquals(prevProps.schema, this.props.schema);
             // When formData is not an object, getChangedFields returns an empty array.
             // In this case, deepEquals is most needed to check again.
             const isFormDataChanged = formDataChangedFields.length > 0 || !deepEquals(prevProps.formData, this.props.formData);
+            const isStateDataChanged = stateDataChangedFields.length > 0 || !deepEquals(this.state.formData, this.props.formData);
             const nextState = this.getStateFromProps(this.props, this.props.formData, 
             // If the `schema` has changed, we need to update the retrieved schema.
             // Or if the `formData` changes, for example in the case of a schema with dependencies that need to
             //  match one of the subSchemas, the retrieved schema must be updated.
-            isSchemaChanged || isFormDataChanged ? undefined : this.state.retrievedSchema, isSchemaChanged, formDataChangedFields);
+            isSchemaChanged || isFormDataChanged ? undefined : this.state.retrievedSchema, isSchemaChanged, formDataChangedFields, 
+            // Skip live validation for this request if no form data has changed from the last state
+            !isStateDataChanged);
             const shouldUpdate = !deepEquals(nextState, prevState);
             return { nextState, shouldUpdate };
         }
@@ -98,16 +110,17 @@ export default class Form extends Component {
      * @param retrievedSchema - An expanded schema, if not provided, it will be retrieved from the `schema` and `formData`.
      * @param isSchemaChanged - A flag indicating whether the schema has changed.
      * @param formDataChangedFields - The changed fields of `formData`
+     * @param skipLiveValidate - Optional flag, if true, means that we are not running live validation
      * @returns - The new state for the `Form`
      */
-    getStateFromProps(props, inputFormData, retrievedSchema, isSchemaChanged = false, formDataChangedFields = []) {
+    getStateFromProps(props, inputFormData, retrievedSchema, isSchemaChanged = false, formDataChangedFields = [], skipLiveValidate = false) {
         const state = this.state || {};
         const schema = 'schema' in props ? props.schema : this.props.schema;
+        const validator = 'validator' in props ? props.validator : this.props.validator;
         const uiSchema = ('uiSchema' in props ? props.uiSchema : this.props.uiSchema) || {};
         const edit = typeof inputFormData !== 'undefined';
         const liveValidate = 'liveValidate' in props ? props.liveValidate : this.props.liveValidate;
         const mustValidate = edit && !props.noValidate && liveValidate;
-        const rootSchema = schema;
         const experimental_defaultFormStateBehavior = 'experimental_defaultFormStateBehavior' in props
             ? props.experimental_defaultFormStateBehavior
             : this.props.experimental_defaultFormStateBehavior;
@@ -116,11 +129,12 @@ export default class Form extends Component {
             : this.props.experimental_customMergeAllOf;
         let schemaUtils = state.schemaUtils;
         if (!schemaUtils ||
-            schemaUtils.doesSchemaUtilsDiffer(props.validator, rootSchema, experimental_defaultFormStateBehavior, experimental_customMergeAllOf)) {
-            schemaUtils = createSchemaUtils(props.validator, rootSchema, experimental_defaultFormStateBehavior, experimental_customMergeAllOf);
+            schemaUtils.doesSchemaUtilsDiffer(validator, schema, experimental_defaultFormStateBehavior, experimental_customMergeAllOf)) {
+            schemaUtils = createSchemaUtils(validator, schema, experimental_defaultFormStateBehavior, experimental_customMergeAllOf);
         }
-        const formData = schemaUtils.getDefaultFormState(schema, inputFormData);
-        const _retrievedSchema = this.updateRetrievedSchema(retrievedSchema ?? schemaUtils.retrieveSchema(schema, formData));
+        const rootSchema = schemaUtils.getRootSchema();
+        const formData = schemaUtils.getDefaultFormState(rootSchema, inputFormData);
+        const _retrievedSchema = this.updateRetrievedSchema(retrievedSchema ?? schemaUtils.retrieveSchema(rootSchema, formData));
         const getCurrentErrors = () => {
             // If the `props.noValidate` option is set or the schema has changed, we reset the error state.
             if (props.noValidate || isSchemaChanged) {
@@ -141,8 +155,9 @@ export default class Form extends Component {
         let errorSchema;
         let schemaValidationErrors = state.schemaValidationErrors;
         let schemaValidationErrorSchema = state.schemaValidationErrorSchema;
-        if (mustValidate) {
-            const schemaValidation = this.validate(formData, schema, schemaUtils, _retrievedSchema);
+        // If we are skipping live validate, it means that the state has already been updated with live validation errors
+        if (mustValidate && !skipLiveValidate) {
+            const schemaValidation = this.validate(formData, rootSchema, schemaUtils, _retrievedSchema);
             errors = schemaValidation.errors;
             // If retrievedSchema is undefined which means the schema or formData has changed, we do not merge state.
             // Else in the case where it hasn't changed, we merge 'state.errorSchema' with 'schemaValidation.errorSchema.' This done to display the raised field error.
@@ -159,7 +174,8 @@ export default class Form extends Component {
             const currentErrors = getCurrentErrors();
             errors = currentErrors.errors;
             errorSchema = currentErrors.errorSchema;
-            if (formDataChangedFields.length > 0) {
+            // We only update the error schema for changed fields if mustValidate is false
+            if (formDataChangedFields.length > 0 && !mustValidate) {
                 const newErrorSchema = formDataChangedFields.reduce((acc, key) => {
                     acc[key] = undefined;
                     return acc;
@@ -172,12 +188,12 @@ export default class Form extends Component {
             errorSchema = merged.errorSchema;
             errors = merged.errors;
         }
-        const idSchema = schemaUtils.toIdSchema(_retrievedSchema, uiSchema['ui:rootFieldId'], formData, props.idPrefix, props.idSeparator);
+        const fieldPathId = toFieldPathId('', this.getGlobalFormOptions(this.props));
         const nextState = {
             schemaUtils,
-            schema,
+            schema: rootSchema,
             uiSchema,
-            idSchema,
+            fieldPathId,
             formData,
             edit,
             errors,
@@ -195,7 +211,8 @@ export default class Form extends Component {
      * @returns - True if the component should be updated, false otherwise
      */
     shouldComponentUpdate(nextProps, nextState) {
-        return shouldRender(this, nextProps, nextState);
+        const { experimental_componentUpdateStrategy = 'customDeep' } = this.props;
+        return shouldRender(this, nextProps, nextState, experimental_componentUpdateStrategy);
     }
     /** Gets the previously raised customValidate errors.
      *
@@ -207,8 +224,7 @@ export default class Form extends Component {
         let customValidateErrors = {};
         if (typeof customValidate === 'function') {
             const errorHandler = customValidate(prevFormData, createErrorHandler(prevFormData), uiSchema);
-            const userErrorSchema = unwrapErrorHandler(errorHandler);
-            customValidateErrors = userErrorSchema;
+            customValidateErrors = unwrapErrorHandler(errorHandler);
         }
         return customValidateErrors;
     }
@@ -217,9 +233,10 @@ export default class Form extends Component {
      *
      * @param formData - The new form data to validate
      * @param schema - The schema used to validate against
-     * @param altSchemaUtils - The alternate schemaUtils to use for validation
+     * @param [altSchemaUtils] - The alternate schemaUtils to use for validation
+     * @param [retrievedSchema] - An optionally retrieved schema for per
      */
-    validate(formData, schema = this.props.schema, altSchemaUtils, retrievedSchema) {
+    validate(formData, schema = this.state.schema, altSchemaUtils, retrievedSchema) {
         const schemaUtils = altSchemaUtils ? altSchemaUtils : this.state.schemaUtils;
         const { customValidate, transformErrors, uiSchema } = this.props;
         const resolvedSchema = retrievedSchema ?? schemaUtils.retrieveSchema(schema, formData);
@@ -230,11 +247,10 @@ export default class Form extends Component {
     /** Renders any errors contained in the `state` in using the `ErrorList`, if not disabled by `showErrorList`. */
     renderErrors(registry) {
         const { errors, errorSchema, schema, uiSchema } = this.state;
-        const { formContext } = this.props;
         const options = getUiOptions(uiSchema);
         const ErrorListTemplate = getTemplate('ErrorListTemplate', registry, options);
         if (errors && errors.length) {
-            return (_jsx(ErrorListTemplate, { errors: errors, errorSchema: errorSchema || {}, schema: schema, uiSchema: uiSchema, formContext: formContext, registry: registry }));
+            return (_jsx(ErrorListTemplate, { errors: errors, errorSchema: errorSchema || {}, schema: schema, uiSchema: uiSchema, registry: registry }));
         }
         return null;
     }
@@ -261,26 +277,28 @@ export default class Form extends Component {
      * @param [formData] - The form data to use while checking for empty objects/arrays
      */
     getFieldNames = (pathSchema, formData) => {
+        const formValueHasData = (value, isLeaf) => typeof value !== 'object' || _isEmpty(value) || (isLeaf && !_isEmpty(value));
         const getAllPaths = (_obj, acc = [], paths = [[]]) => {
-            Object.keys(_obj).forEach((key) => {
-                if (typeof _obj[key] === 'object') {
+            const objKeys = Object.keys(_obj);
+            objKeys.forEach((key) => {
+                const data = _obj[key];
+                if (typeof data === 'object') {
                     const newPaths = paths.map((path) => [...path, key]);
                     // If an object is marked with additionalProperties, all its keys are valid
-                    if (_obj[key][RJSF_ADDITIONAL_PROPERTIES_FLAG] && _obj[key][NAME_KEY] !== '') {
-                        acc.push(_obj[key][NAME_KEY]);
+                    if (data[RJSF_ADDITIONAL_PROPERTIES_FLAG] && data[NAME_KEY] !== '') {
+                        acc.push(data[NAME_KEY]);
                     }
                     else {
-                        getAllPaths(_obj[key], acc, newPaths);
+                        getAllPaths(data, acc, newPaths);
                     }
                 }
-                else if (key === NAME_KEY && _obj[key] !== '') {
+                else if (key === NAME_KEY && data !== '') {
                     paths.forEach((path) => {
                         const formValue = _get(formData, path);
-                        // adds path to fieldNames if it points to a value
-                        // or an empty object/array
-                        if (typeof formValue !== 'object' ||
-                            _isEmpty(formValue) ||
-                            (Array.isArray(formValue) && formValue.every((val) => typeof val !== 'object'))) {
+                        const isLeaf = objKeys.length === 1;
+                        // adds path to fieldNames if it points to a value or an empty object/array which is not a leaf
+                        if (formValueHasData(formValue, isLeaf) ||
+                            (Array.isArray(formValue) && formValue.every((val) => formValueHasData(val, isLeaf)))) {
                             acc.push(path);
                         }
                     });
@@ -300,10 +318,15 @@ export default class Form extends Component {
         const retrievedSchema = schemaUtils.retrieveSchema(schema, formData);
         const pathSchema = schemaUtils.toPathSchema(retrievedSchema, '', formData);
         const fieldNames = this.getFieldNames(pathSchema, formData);
-        const newFormData = this.getUsedFormData(formData, fieldNames);
-        return newFormData;
+        return this.getUsedFormData(formData, fieldNames);
     };
-    // Filtering errors based on your retrieved schema to only show errors for properties in the selected branch.
+    /** Filtering errors based on your retrieved schema to only show errors for properties in the selected branch.
+     *
+     * @param schemaErrors - The schema errors to filter
+     * @param [resolvedSchema] - An optionally resolved schema to use for performance reasons
+     * @param [formData] - The formData to help filter errors
+     * @private
+     */
     filterErrorsBasedOnSchema(schemaErrors, resolvedSchema, formData) {
         const { retrievedSchema, schemaUtils } = this.state;
         const _retrievedSchema = resolvedSchema ?? retrievedSchema;
@@ -312,7 +335,7 @@ export default class Form extends Component {
         const filteredErrors = _pick(schemaErrors, fieldNames);
         // If the root schema is of a primitive type, do not filter out the __errors
         if (resolvedSchema?.type !== 'object' && resolvedSchema?.type !== 'array') {
-            filteredErrors.__errors = schemaErrors.__errors;
+            filteredErrors[ERRORS_KEY] = schemaErrors[ERRORS_KEY];
         }
         const prevCustomValidateErrors = this.getPreviousCustomValidateErrors();
         // Filtering out the previous raised customValidate errors so that they are cleared when no longer valid.
@@ -333,11 +356,13 @@ export default class Form extends Component {
                 }
                 else if (isObject(errorAtKey) &&
                     isObject(prevCustomValidateErrorAtKey) &&
-                    Array.isArray(prevCustomValidateErrorAtKey?.__errors)) {
+                    Array.isArray(prevCustomValidateErrorAtKey?.[ERRORS_KEY])) {
                     // if previous customValidate error is an object and has __errors array, filter out the errors previous customValidate errors.
-                    errors[errorKey] = filterPreviousCustomErrors(errorAtKey.__errors, prevCustomValidateErrorAtKey.__errors);
+                    errors[errorKey] = {
+                        [ERRORS_KEY]: filterPreviousCustomErrors(errorAtKey[ERRORS_KEY], prevCustomValidateErrorAtKey?.[ERRORS_KEY]),
+                    };
                 }
-                else if (typeof errorAtKey === 'object' && !Array.isArray(errorAtKey.__errors)) {
+                else if (typeof errorAtKey === 'object' && !Array.isArray(errorAtKey[ERRORS_KEY])) {
                     filterNilOrEmptyErrors(errorAtKey, previousCustomValidateErrors[errorKey]);
                 }
             });
@@ -345,23 +370,48 @@ export default class Form extends Component {
         };
         return filterNilOrEmptyErrors(filteredErrors, prevCustomValidateErrors);
     }
-    /** Function to handle changes made to a field in the `Form`. This handler receives an entirely new copy of the
-     * `formData` along with a new `ErrorSchema`. It will first update the `formData` with any missing default fields and
-     * then, if `omitExtraData` and `liveOmit` are turned on, the `formData` will be filtered to remove any extra data not
-     * in a form field. Then, the resulting formData will be validated if required. The state will be updated with the new
-     * updated (potentially filtered) `formData`, any errors that resulted from validation. Finally the `onChange`
-     * callback will be called if specified with the updated state.
+    /** Pushes the given change information into the `pendingChanges` array and then calls `processPendingChanges()` if
+     * the array only contains a single pending change.
      *
-     * @param formData - The new form data from a change to a field
-     * @param newErrorSchema - The new `ErrorSchema` based on the field change
-     * @param id - The id of the field that caused the change
+     * @param newValue - The new form data from a change to a field
+     * @param path - The path to the change into which to set the formData
+     * @param [newErrorSchema] - The new `ErrorSchema` based on the field change
+     * @param [id] - The id of the field that caused the change
      */
-    onChange = (formData, newErrorSchema, id) => {
+    onChange = (newValue, path, newErrorSchema, id) => {
+        this.pendingChanges.push({ newValue, path, newErrorSchema, id });
+        if (this.pendingChanges.length === 1) {
+            this.processPendingChange();
+        }
+    };
+    /** Function to handle changes made to a field in the `Form`. This handler gets the first change from the
+     * `pendingChanges` list, containing the `newValue` for the `formData` and the `path` at which the `newValue` is to be
+     * updated, along with a new, optional `ErrorSchema` for that same `path` and potentially the `id` of the field being
+     * changed. It will first update the `formData` with any missing default fields and then, if `omitExtraData` and
+     * `liveOmit` are turned on, the `formData` will be filtered to remove any extra data not in a form field. Then, the
+     * resulting `formData` will be validated if required. The state will be updated with the new updated (potentially
+     * filtered) `formData`, any errors that resulted from validation. Finally the `onChange` callback will be called, if
+     * specified, with the updated state and the `processPendingChange()` function is called again.
+     */
+    processPendingChange() {
+        if (this.pendingChanges.length === 0) {
+            return;
+        }
+        const { newValue, path, id } = this.pendingChanges[0];
+        let { newErrorSchema } = this.pendingChanges[0];
         const { extraErrors, omitExtraData, liveOmit, noValidate, liveValidate, onChange } = this.props;
-        const { schemaUtils, schema } = this.state;
+        const { formData: oldFormData, schemaUtils, schema, errorSchema, fieldPathId } = this.state;
+        const rootPathId = fieldPathId.path[0] || '';
+        const isRootPath = !path || path.length === 0 || (path.length === 1 && path[0] === rootPathId);
         let retrievedSchema = this.state.retrievedSchema;
+        let formData = isRootPath ? newValue : _cloneDeep(oldFormData);
         if (isObject(formData) || Array.isArray(formData)) {
-            const newState = this.getStateFromProps(this.props, formData);
+            if (!isRootPath) {
+                // If the newValue is not on the root path, then set it into the form data
+                _set(formData, path, newValue);
+            }
+            // Pass true to skip live validation in `getStateFromProps()` since we will do it a bit later
+            const newState = this.getStateFromProps(this.props, formData, undefined, undefined, undefined, true);
             formData = newState.formData;
             retrievedSchema = newState.retrievedSchema;
         }
@@ -374,7 +424,15 @@ export default class Form extends Component {
                 formData: newFormData,
             };
         }
-        if (mustValidate) {
+        // First update the value in the newErrorSchema in a copy of the old error schema if it was specified and the path
+        // is not the root
+        if (newErrorSchema && !isRootPath) {
+            const errorSchemaCopy = _cloneDeep(errorSchema);
+            _set(errorSchemaCopy, path, newErrorSchema);
+            newErrorSchema = errorSchemaCopy;
+        }
+        // If there are pending changes in the queue, skip live validation since it will happen with the last change
+        if (mustValidate && this.pendingChanges.length === 1) {
             const schemaValidation = this.validate(newFormData, schema, schemaUtils, retrievedSchema);
             let errors = schemaValidation.errors;
             let errorSchema = schemaValidation.errorSchema;
@@ -399,6 +457,7 @@ export default class Form extends Component {
             };
         }
         else if (!noValidate && newErrorSchema) {
+            // Merging 'newErrorSchema' into 'errorSchema' to display the custom raised errors.
             const errorSchema = extraErrors
                 ? mergeObjects(newErrorSchema, extraErrors, 'preventDuplicates')
                 : newErrorSchema;
@@ -408,8 +467,15 @@ export default class Form extends Component {
                 errors: toErrorList(errorSchema),
             };
         }
-        this.setState(state, () => onChange && onChange({ ...this.state, ...state }, id));
-    };
+        this.setState(state, () => {
+            if (onChange) {
+                onChange({ ...this.state, ...state }, id);
+            }
+            // Now remove the change we just completed and call this again
+            this.pendingChanges.shift();
+            this.processPendingChange();
+        });
+    }
     /**
      * If the retrievedSchema has changed the new retrievedSchema is returned.
      * Otherwise, the old retrievedSchema is returned to persist reference.
@@ -503,10 +569,22 @@ export default class Form extends Component {
             });
         }
     };
+    /** Extracts the `GlobalFormOptions` from the given Form `props`
+     *
+     * @param props - The form props to extract the global form options from
+     * @returns - The `GlobalFormOptions` from the props
+     * @private
+     */
+    getGlobalFormOptions(props) {
+        const { uiSchema = {}, experimental_componentUpdateStrategy, idSeparator = DEFAULT_ID_SEPARATOR, idPrefix = DEFAULT_ID_PREFIX, } = props;
+        const rootFieldId = uiSchema['ui:rootFieldId'];
+        // Omit any options that are undefined or null
+        return { idPrefix: rootFieldId || idPrefix, idSeparator, experimental_componentUpdateStrategy };
+    }
     /** Returns the registry for the form */
     getRegistry() {
         const { translateString: customTranslateString, uiSchema = {} } = this.props;
-        const { schemaUtils } = this.state;
+        const { schema, schemaUtils } = this.state;
         const { fields, templates, widgets, formContext, translateString } = getDefaultRegistry();
         return {
             fields: { ...fields, ...this.props.fields },
@@ -519,11 +597,12 @@ export default class Form extends Component {
                 },
             },
             widgets: { ...widgets, ...this.props.widgets },
-            rootSchema: this.props.schema,
+            rootSchema: schema,
             formContext: this.props.formContext || formContext,
             schemaUtils,
             translateString: customTranslateString || translateString,
             globalUiOptions: uiSchema[UI_GLOBAL_OPTIONS_KEY],
+            globalFormOptions: this.getGlobalFormOptions(this.props),
         };
     }
     /** Provides a function that can be used to programmatically submit the `Form` */
@@ -640,8 +719,8 @@ export default class Form extends Component {
      * needed along with the submit button or any children of the form.
      */
     render() {
-        const { children, id, idPrefix, idSeparator, className = '', tagName, name, method, target, action, autoComplete, enctype, acceptCharset, noHtml5Validate = false, disabled, readonly, formContext, showErrorList = 'top', _internalFormWrapper, } = this.props;
-        const { schema, uiSchema, formData, errorSchema, idSchema } = this.state;
+        const { children, id, className = '', tagName, name, method, target, action, autoComplete, enctype, acceptCharset, noHtml5Validate = false, disabled, readonly, showErrorList = 'top', _internalFormWrapper, } = this.props;
+        const { schema, uiSchema, formData, errorSchema, fieldPathId } = this.state;
         const registry = this.getRegistry();
         const { SchemaField: _SchemaField } = registry.fields;
         const { SubmitButton } = registry.templates.ButtonTemplates;
@@ -655,6 +734,6 @@ export default class Form extends Component {
             submitOptions = { ...submitOptions, props: { ...submitOptions.props, disabled: true } };
         }
         const submitUiSchema = { [UI_OPTIONS_KEY]: { [SUBMIT_BTN_OPTIONS_KEY]: submitOptions } };
-        return (_jsxs(FormTag, { className: className ? className : 'rjsf', id: id, name: name, method: method, target: target, action: action, autoComplete: autoComplete, encType: enctype, acceptCharset: acceptCharset, noValidate: noHtml5Validate, onSubmit: this.onSubmit, as: as, ref: this.formElement, children: [showErrorList === 'top' && this.renderErrors(registry), _jsx(_SchemaField, { name: '', schema: schema, uiSchema: uiSchema, errorSchema: errorSchema, idSchema: idSchema, idPrefix: idPrefix, idSeparator: idSeparator, formContext: formContext, formData: formData, onChange: this.onChange, onBlur: this.onBlur, onFocus: this.onFocus, registry: registry, disabled: disabled, readonly: readonly }), children ? children : _jsx(SubmitButton, { uiSchema: submitUiSchema, registry: registry }), showErrorList === 'bottom' && this.renderErrors(registry)] }));
+        return (_jsxs(FormTag, { className: className ? className : 'rjsf', id: id, name: name, method: method, target: target, action: action, autoComplete: autoComplete, encType: enctype, acceptCharset: acceptCharset, noValidate: noHtml5Validate, onSubmit: this.onSubmit, as: as, ref: this.formElement, children: [showErrorList === 'top' && this.renderErrors(registry), _jsx(_SchemaField, { name: '', schema: schema, uiSchema: uiSchema, errorSchema: errorSchema, fieldPathId: fieldPathId, formData: formData, onChange: this.onChange, onBlur: this.onBlur, onFocus: this.onFocus, registry: registry, disabled: disabled, readonly: readonly }), children ? children : _jsx(SubmitButton, { uiSchema: submitUiSchema, registry: registry }), showErrorList === 'bottom' && this.renderErrors(registry)] }));
     }
 }