@rjsf/core 6.0.0-beta.13 → 6.0.0-beta.15

package/dist/index.esm.js

@@ -19,11 +19,13 @@ import {
   createErrorHandler,
   unwrapErrorHandler
 } from "@rjsf/utils";
+import _cloneDeep from "lodash/cloneDeep";
 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 _set from "lodash/set";
 import _toPath from "lodash/toPath";
 
 // src/getDefaultRegistry.ts
@@ -46,10 +48,10 @@ import cloneDeep from "lodash/cloneDeep";
 import get from "lodash/get";
 import isObject from "lodash/isObject";
 import set from "lodash/set";
-import { nanoid } from "nanoid";
+import uniqueId from "lodash/uniqueId";
 import { jsx } from "react/jsx-runtime";
 function generateRowId() {
-  return nanoid();
+  return uniqueId("rjsf-array-item-");
 }
 function generateKeyedFormData(formData) {
   return !Array.isArray(formData) ? [] : formData.map((item) => {
@@ -198,7 +200,8 @@ var ArrayField = class extends Component {
         keyedFormData: newKeyedFormData,
         updatedKeyedFormData: true
       },
-      () => onChange(keyedToPlainFormData(newKeyedFormData), newErrorSchema)
+      // add click will pass the empty `path` array to the onChange which adds the appropriate path
+      () => onChange(keyedToPlainFormData(newKeyedFormData), [], newErrorSchema)
     );
   }
   /** Callback handler for when the user clicks on the add button. Creates a new row of keyed form data at the end of
@@ -261,7 +264,8 @@ var ArrayField = class extends Component {
           keyedFormData: newKeyedFormData,
           updatedKeyedFormData: true
         },
-        () => onChange(keyedToPlainFormData(newKeyedFormData), newErrorSchema)
+        // Copy index will pass the empty `path` array to the onChange which adds the appropriate path
+        () => onChange(keyedToPlainFormData(newKeyedFormData), [], newErrorSchema)
       );
     };
   };
@@ -296,7 +300,8 @@ var ArrayField = class extends Component {
           keyedFormData: newKeyedFormData,
           updatedKeyedFormData: true
         },
-        () => onChange(keyedToPlainFormData(newKeyedFormData), newErrorSchema)
+        // drop index will pass the empty `path` array to the onChange which adds the appropriate path
+        () => onChange(keyedToPlainFormData(newKeyedFormData), [], newErrorSchema)
       );
     };
   };
@@ -340,7 +345,8 @@ var ArrayField = class extends Component {
         {
           keyedFormData: newKeyedFormData
         },
-        () => onChange(keyedToPlainFormData(newKeyedFormData), newErrorSchema)
+        // reorder click will pass the empty `path` array to the onChange which adds the appropriate path
+        () => onChange(keyedToPlainFormData(newKeyedFormData), [], newErrorSchema)
       );
     };
   };
@@ -350,19 +356,16 @@ var ArrayField = class extends Component {
    * @param index - The index of the item being changed
    */
   onChangeForIndex = (index) => {
-    return (value, newErrorSchema, id) => {
-      const { formData, onChange, errorSchema } = this.props;
-      const arrayData = Array.isArray(formData) ? formData : [];
-      const newFormData = arrayData.map((item, i) => {
-        const jsonValue = typeof value === "undefined" ? null : value;
-        return index === i ? jsonValue : item;
-      });
+    return (value, path, newErrorSchema, id) => {
+      const { onChange } = this.props;
+      const changePath = Array.isArray(path) ? path.slice() : [];
+      changePath.unshift(index);
       onChange(
-        newFormData,
-        errorSchema && errorSchema && {
-          ...errorSchema,
-          [index]: newErrorSchema
-        },
+        // We need to treat undefined items as nulls to have validation.
+        // See https://github.com/tdegrunt/jsonschema/issues/206
+        value === void 0 ? null : value,
+        changePath,
+        newErrorSchema,
         id
       );
     };
@@ -370,8 +373,30 @@ var ArrayField = class extends Component {
   /** Callback handler used to change the value for a checkbox */
   onSelectChange = (value) => {
     const { onChange, idSchema } = this.props;
-    onChange(value, void 0, idSchema && idSchema.$id);
+    onChange(value, [], void 0, idSchema && idSchema.$id);
   };
+  /** Helper method to compute item UI schema for both normal and fixed arrays
+   * Handles both static object and dynamic function cases
+   *
+   * @param uiSchema - The parent UI schema containing items definition
+   * @param item - The item data
+   * @param index - The index of the item
+   * @param formContext - The form context
+   * @returns The computed UI schema for the item
+   */
+  computeItemUiSchema(uiSchema, item, index, formContext) {
+    if (typeof uiSchema.items === "function") {
+      try {
+        const result = uiSchema.items(item, index, formContext);
+        return result;
+      } catch (e) {
+        console.error(`Error executing dynamic uiSchema.items function for item at index ${index}:`, e);
+        return void 0;
+      }
+    } else {
+      return uiSchema.items;
+    }
+  }
   /** Renders the `ArrayField` depending on the specific needs of the schema and uischema elements
    */
   render() {
@@ -446,6 +471,7 @@ var ArrayField = class extends Component {
         const itemErrorSchema = errorSchema ? errorSchema[index] : void 0;
         const itemIdPrefix = idSchema.$id + idSeparator + index;
         const itemIdSchema = schemaUtils.toIdSchema(itemSchema, itemIdPrefix, itemCast, idPrefix, idSeparator);
+        const itemUiSchema = this.computeItemUiSchema(uiSchema, item, index, formContext);
         return this.renderArrayFieldItem({
           key,
           index,
@@ -458,7 +484,7 @@ var ArrayField = class extends Component {
           itemIdSchema,
           itemErrorSchema,
           itemData: itemCast,
-          itemUiSchema: uiSchema.items,
+          itemUiSchema,
           autofocus: autofocus && index === 0,
           onBlur,
           onFocus,
@@ -685,7 +711,16 @@ var ArrayField = class extends Component {
         const itemSchema = (additional && isObject(schema.additionalItems) ? schemaUtils.retrieveSchema(schema.additionalItems, itemCast) : itemSchemas[index]) || {};
         const itemIdPrefix = idSchema.$id + idSeparator + index;
         const itemIdSchema = schemaUtils.toIdSchema(itemSchema, itemIdPrefix, itemCast, idPrefix, idSeparator);
-        const itemUiSchema = additional ? uiSchema.additionalItems || {} : Array.isArray(uiSchema.items) ? uiSchema.items[index] : uiSchema.items || {};
+        let itemUiSchema;
+        if (additional) {
+          itemUiSchema = uiSchema.additionalItems;
+        } else {
+          if (Array.isArray(uiSchema.items)) {
+            itemUiSchema = uiSchema.items[index];
+          } else {
+            itemUiSchema = this.computeItemUiSchema(uiSchema, item, index, formContext);
+          }
+        }
         const itemErrorSchema = errorSchema ? errorSchema[index] : void 0;
         return this.renderArrayFieldItem({
           key,
@@ -825,6 +860,7 @@ var ArrayField = class extends Component {
 var ArrayField_default = ArrayField;
 
 // src/components/fields/BooleanField.tsx
+import { useCallback } from "react";
 import {
   getWidget as getWidget2,
   getUiOptions as getUiOptions2,
@@ -900,6 +936,12 @@ function BooleanField(props) {
       enumOptions = optionsList2({ enum: enums }, uiSchema);
     }
   }
+  const onWidgetChange = useCallback(
+    (value, errorSchema, id) => {
+      return onChange(value, [], errorSchema, id);
+    },
+    [onChange]
+  );
   return /* @__PURE__ */ jsx2(
     Widget,
     {
@@ -908,7 +950,7 @@ function BooleanField(props) {
       uiSchema,
       id: idSchema.$id,
       name,
-      onChange,
+      onChange: onWidgetChange,
       onFocus,
       onBlur,
       label,
@@ -943,7 +985,8 @@ import {
   PROPERTIES_KEY,
   READONLY_KEY,
   UI_OPTIONS_KEY,
-  UI_GLOBAL_OPTIONS_KEY
+  UI_GLOBAL_OPTIONS_KEY,
+  ITEMS_KEY as ITEMS_KEY2
 } from "@rjsf/utils";
 import cloneDeep2 from "lodash/cloneDeep";
 import each from "lodash/each";
@@ -959,6 +1002,7 @@ import isObject3 from "lodash/isObject";
 import isPlainObject from "lodash/isPlainObject";
 import isString from "lodash/isString";
 import isUndefined from "lodash/isUndefined";
+import last from "lodash/last";
 import set2 from "lodash/set";
 import { jsx as jsx3 } from "react/jsx-runtime";
 import { createElement } from "react";
@@ -968,6 +1012,9 @@ var LAYOUT_GRID_OPTION = `ui:${LAYOUT_GRID_UI_OPTION}`;
 function getNonNullishValue(value, fallback) {
   return value ?? fallback;
 }
+function isNumericIndex(str) {
+  return /^\d+?$/.test(str);
+}
 var LayoutGridField = class _LayoutGridField extends PureComponent {
   static defaultProps = {
     layoutGridSchema: void 0
@@ -1081,6 +1128,38 @@ var LayoutGridField = class _LayoutGridField extends PureComponent {
     const baseId = get2(baseIdSchema, ID_KEY);
     return schemaUtils.toIdSchema(schema, baseId, formData, baseId, idSeparator);
   }
+  /** Computes the `rawSchema` and `idSchema` for a `schema` and a `potentialIndex`. If the `schema` is of type array,
+   * has an `ITEMS_KEY` element and `potentialIndex` represents a numeric value, the element at `ITEMS_KEY` is checked
+   * to see if it is an array. If it is AND the `potentialIndex`th element is available, it is used as the `rawSchema`,
+   * otherwise the last value of the element is used. If it is not, then the element is used as the `rawSchema`. In
+   * either case, an `idSchema` is computed for the array index. If the `schema` does not represent an array or the
+   * `potentialIndex` is not a numeric value, then `rawSchema` is returned as undefined and given `idSchema` is returned
+   * as is.
+   *
+   * @param schema - The schema to generate the idSchema for
+   * @param idSchema - The IdSchema for the schema
+   * @param potentialIndex - A string containing a potential index
+   * @param [idSeparator] - The param to pass into the `toIdSchema` util which will use it to join the `idSchema` paths
+   * @returns - An object containing the `rawSchema` and `idSchema` of an array item, otherwise an undefined `rawSchema`
+   */
+  static computeArraySchemasIfPresent(schema, idSchema, potentialIndex, idSeparator) {
+    let rawSchema;
+    if (isNumericIndex(potentialIndex) && schema && schema?.type === "array" && has(schema, ITEMS_KEY2)) {
+      const index = Number(potentialIndex);
+      const items = schema[ITEMS_KEY2];
+      if (Array.isArray(items)) {
+        if (index > items.length) {
+          rawSchema = last(items);
+        } else {
+          rawSchema = items[index];
+        }
+      } else {
+        rawSchema = items;
+      }
+      idSchema = { [ID_KEY]: `${idSchema[ID_KEY]}${idSeparator ?? "_"}${index}` };
+    }
+    return { rawSchema, idSchema };
+  }
   /** Given a `dottedPath` to a field in the `initialSchema`, iterate through each individual path in the schema until
    * the leaf path is found and returned (along with whether that leaf path `isRequired`) OR no schema exists for an
    * element in the path. If the leaf schema element happens to be a oneOf/anyOf then also return the oneOf/anyOf as
@@ -1120,7 +1199,9 @@ var LayoutGridField = class _LayoutGridField extends PureComponent {
         rawSchema = get2(selectedSchema, [PROPERTIES_KEY, part], {});
         idSchema = get2(selectedIdSchema, part, {});
       } else {
-        rawSchema = {};
+        const result = _LayoutGridField.computeArraySchemasIfPresent(schema, idSchema, part, idSeparator);
+        rawSchema = result.rawSchema ?? {};
+        idSchema = result.idSchema;
       }
       innerData = get2(innerData, part, {});
       schema = schemaUtils.retrieveSchema(rawSchema, innerData);
@@ -1139,9 +1220,15 @@ var LayoutGridField = class _LayoutGridField extends PureComponent {
         idSchema = mergeObjects(rawIdSchema, idSchema);
       }
       isRequired = schema !== void 0 && Array.isArray(schema.required) && includes(schema.required, leafPath);
-      schema = get2(schema, [PROPERTIES_KEY, leafPath]);
-      schema = schema ? schemaUtils.retrieveSchema(schema) : schema;
-      idSchema = get2(idSchema, leafPath, {});
+      const result = _LayoutGridField.computeArraySchemasIfPresent(schema, idSchema, leafPath, idSeparator);
+      if (result.rawSchema) {
+        schema = result.rawSchema;
+        idSchema = result.idSchema;
+      } else {
+        schema = get2(schema, [PROPERTIES_KEY, leafPath]);
+        schema = schema ? schemaUtils.retrieveSchema(schema) : schema;
+        idSchema = get2(idSchema, leafPath, {});
+      }
       isReadonly = getNonNullishValue(schema?.readOnly, isReadonly);
       if (schema && (has(schema, ONE_OF_KEY) || has(schema, ANY_OF_KEY))) {
         const xxx = has(schema, ONE_OF_KEY) ? ONE_OF_KEY : ANY_OF_KEY;
@@ -1221,16 +1308,14 @@ var LayoutGridField = class _LayoutGridField extends PureComponent {
    * @returns - The `onChange` handling function for the `dottedPath` field
    */
   onFieldChange = (dottedPath) => {
-    return (value, errSchema, id) => {
-      const { onChange, errorSchema, formData } = this.props;
-      const newFormData = cloneDeep2(formData || {});
+    return (value, path, errSchema, id) => {
+      const { onChange, errorSchema } = this.props;
       let newErrorSchema = errorSchema;
       if (errSchema && errorSchema) {
         newErrorSchema = cloneDeep2(errorSchema);
         set2(newErrorSchema, dottedPath, errSchema);
       }
-      set2(newFormData, dottedPath, value);
-      onChange(newFormData, newErrorSchema, id);
+      onChange(value, dottedPath.split("."), newErrorSchema, id);
     };
   };
   /** Renders the `children` of the `GridType.CONDITION` if it passes. The `layoutGridSchema` for the
@@ -1625,7 +1710,7 @@ function LayoutMultiSchemaField(props) {
     if (newFormData) {
       set3(newFormData, selectorField, opt);
     }
-    onChange(newFormData, void 0, id);
+    onChange(newFormData, [name], void 0, id);
   };
   const widgetOptions = { enumOptions, ...uiOptions };
   const errors = !hideFieldError && rawErrors.length > 0 ? /* @__PURE__ */ jsx5(FieldErrorTemplate2, { idSchema, schema, errors: rawErrors, registry }) : void 0;
@@ -1778,7 +1863,7 @@ var AnyOfField = class extends Component2 {
       newFormData = schemaUtils.getDefaultFormState(newOption, newFormData, "excludeObjectChildren");
     }
     this.setState({ selectedOption: intOption }, () => {
-      onChange(newFormData, void 0, this.getFieldId());
+      onChange(newFormData, [], void 0, this.getFieldId());
     });
   };
   getFieldId() {
@@ -1894,7 +1979,7 @@ var AnyOfField = class extends Component2 {
 var MultiSchemaField_default = AnyOfField;
 
 // src/components/fields/NumberField.tsx
-import { useState as useState2, useCallback } from "react";
+import { useState as useState2, useCallback as useCallback2 } from "react";
 import { asNumber } from "@rjsf/utils";
 import { jsx as jsx7 } from "react/jsx-runtime";
 var trailingCharMatcherWithPrefix = /\.([0-9]*0)*$/;
@@ -1904,14 +1989,14 @@ function NumberField(props) {
   const [lastValue, setLastValue] = useState2(initialValue);
   const { StringField: StringField2 } = registry.fields;
   let value = formData;
-  const handleChange = useCallback(
-    (value2, errorSchema, id) => {
+  const handleChange = useCallback2(
+    (value2, path, errorSchema, id) => {
       setLastValue(value2);
       if (`${value2}`.charAt(0) === ".") {
         value2 = `0${value2}`;
       }
       const processed = typeof value2 === "string" && value2.match(trailingCharMatcherWithPrefix) ? asNumber(value2.replace(trailingCharMatcher, "")) : asNumber(value2);
-      onChange(processed, errorSchema, id);
+      onChange(processed, path, errorSchema, id);
     },
     [onChange]
   );
@@ -1969,20 +2054,14 @@ var ObjectField = class extends Component3 {
    * @returns - The onPropertyChange callback for the `name` property
    */
   onPropertyChange = (name, addedByAdditionalProperties = false) => {
-    return (value, newErrorSchema, id) => {
-      const { formData, onChange, errorSchema } = this.props;
+    return (value, path, newErrorSchema, id) => {
+      const { onChange } = this.props;
       if (value === void 0 && addedByAdditionalProperties) {
         value = "";
       }
-      const newFormData = { ...formData, [name]: value };
-      onChange(
-        newFormData,
-        errorSchema && errorSchema && {
-          ...errorSchema,
-          [name]: newErrorSchema
-        },
-        id
-      );
+      const changePath = Array.isArray(path) ? path.slice() : [];
+      changePath.unshift(name);
+      onChange(value, changePath, newErrorSchema, id);
     };
   };
   /** Returns a callback to handle the onDropPropertyClick event for the given `key` which removes the old `key` data
@@ -1994,10 +2073,10 @@ var ObjectField = class extends Component3 {
   onDropPropertyClick = (key) => {
     return (event) => {
       event.preventDefault();
-      const { onChange, formData } = this.props;
+      const { onChange, formData, name } = this.props;
       const copiedFormData = { ...formData };
       unset(copiedFormData, key);
-      onChange(copiedFormData);
+      onChange(copiedFormData, [name]);
     };
   };
   /** Computes the next available key name from the `preferredKey`, indexing through the already existing keys until one
@@ -2024,11 +2103,11 @@ var ObjectField = class extends Component3 {
    * @returns - The key change callback function
    */
   onKeyChange = (oldValue) => {
-    return (value, newErrorSchema) => {
+    return (value) => {
       if (oldValue === value) {
         return;
       }
-      const { formData, onChange, errorSchema } = this.props;
+      const { formData, onChange } = this.props;
       value = this.getAvailableKey(value, formData);
       const newFormData = {
         ...formData
@@ -2040,13 +2119,7 @@ var ObjectField = class extends Component3 {
       });
       const renamedObj = Object.assign({}, ...keyValues);
       this.setState({ wasPropertyKeyModified: true });
-      onChange(
-        renamedObj,
-        errorSchema && errorSchema && {
-          ...errorSchema,
-          [value]: newErrorSchema
-        }
-      );
+      onChange(renamedObj, []);
     };
   };
   /** Returns a default value to be used for a new additional schema property of the given `type`
@@ -2082,7 +2155,7 @@ var ObjectField = class extends Component3 {
     if (!(schema.additionalProperties || schema.patternProperties)) {
       return;
     }
-    const { formData, onChange, registry } = this.props;
+    const { formData, name, onChange, registry } = this.props;
     const newFormData = { ...formData };
     const newKey = this.getAvailableKey("newKey", newFormData);
     if (schema.patternProperties) {
@@ -2110,7 +2183,7 @@ var ObjectField = class extends Component3 {
       const newValue = constValue ?? defaultValue ?? this.getDefaultValue(type);
       set4(newFormData, newKey, newValue);
     }
-    onChange(newFormData);
+    onChange(newFormData, [name]);
   };
   /** Renders the `ObjectField` from the given props
    */
@@ -2211,7 +2284,7 @@ var ObjectField = class extends Component3 {
 var ObjectField_default = ObjectField;
 
 // src/components/fields/SchemaField.tsx
-import { useCallback as useCallback2, Component as Component4 } from "react";
+import { useCallback as useCallback3, Component as Component4 } from "react";
 import {
   ADDITIONAL_PROPERTY_FLAG as ADDITIONAL_PROPERTY_FLAG2,
   descriptionId,
@@ -2305,10 +2378,10 @@ function SchemaFieldRender(props) {
     schemaUtils.toIdSchema(schema, fieldId, formData, idPrefix, idSeparator),
     _idSchema
   );
-  const handleFieldComponentChange = useCallback2(
-    (formData2, newErrorSchema, id2) => {
+  const handleFieldComponentChange = useCallback3(
+    (formData2, path, newErrorSchema, id2) => {
       const theId = id2 || fieldId;
-      return onChange(formData2, newErrorSchema, theId);
+      return onChange(formData2, path, newErrorSchema, theId);
     },
     [fieldId, onChange]
   );
@@ -2487,6 +2560,7 @@ var SchemaField = class extends Component4 {
 var SchemaField_default = SchemaField;
 
 // src/components/fields/StringField.tsx
+import { useCallback as useCallback4 } from "react";
 import {
   getWidget as getWidget5,
   getUiOptions as getUiOptions9,
@@ -2523,6 +2597,12 @@ function StringField(props) {
   const displayLabel = schemaUtils.getDisplayLabel(schema, uiSchema, globalUiOptions);
   const label = uiTitle ?? title ?? name;
   const Widget = getWidget5(schema, widget, widgets2);
+  const onWidgetChange = useCallback4(
+    (value, errorSchema, id) => {
+      return onChange(value, [], errorSchema, id);
+    },
+    [onChange]
+  );
   return /* @__PURE__ */ jsx10(
     Widget,
     {
@@ -2535,7 +2615,7 @@ function StringField(props) {
       hideLabel: !displayLabel,
       hideError,
       value: formData,
-      onChange,
+      onChange: onWidgetChange,
       onBlur,
       onFocus,
       required,
@@ -2554,12 +2634,12 @@ var StringField_default = StringField;
 // src/components/fields/NullField.tsx
 import { useEffect as useEffect2 } from "react";
 function NullField(props) {
-  const { formData, onChange } = props;
+  const { name, formData, onChange } = props;
   useEffect2(() => {
     if (formData === void 0) {
-      onChange(null);
+      onChange(null, [name]);
     }
-  }, [formData, onChange]);
+  }, [name, formData, onChange]);
   return null;
 }
 var NullField_default = NullField;
@@ -2837,7 +2917,7 @@ function ArrayFieldTitleTemplate(props) {
 }
 
 // src/components/templates/BaseInputTemplate.tsx
-import { useCallback as useCallback3 } from "react";
+import { useCallback as useCallback5 } from "react";
 import {
   ariaDescribedByIds,
   examplesId,
@@ -2884,15 +2964,15 @@ function BaseInputTemplate(props) {
   } else {
     inputValue = value == null ? "" : value;
   }
-  const _onChange = useCallback3(
+  const _onChange = useCallback5(
     ({ target: { value: value2 } }) => onChange(value2 === "" ? options.emptyValue : value2),
     [onChange, options]
   );
-  const _onBlur = useCallback3(
+  const _onBlur = useCallback5(
     ({ target }) => onBlur(id, target && target.value),
     [onBlur, id]
   );
-  const _onFocus = useCallback3(
+  const _onFocus = useCallback5(
     ({ target }) => onFocus(id, target && target.value),
     [onFocus, id]
   );
@@ -3340,7 +3420,7 @@ function templates() {
 var templates_default = templates;
 
 // src/components/widgets/AltDateWidget.tsx
-import { useCallback as useCallback4, useEffect as useEffect3, useReducer, useState as useState3 } from "react";
+import { useCallback as useCallback6, useEffect as useEffect3, useState as useState3 } from "react";
 import {
   ariaDescribedByIds as ariaDescribedByIds2,
   dateRangeOptions,
@@ -3406,26 +3486,25 @@ function AltDateWidget({
   value
 }) {
   const { translateString } = registry;
-  const [lastValue, setLastValue] = useState3(value);
-  const [state, setState] = useReducer(
-    (state2, action) => {
-      return { ...state2, ...action };
+  const [state, setState] = useState3(parseDateString(value, time));
+  useEffect3(() => {
+    setState(parseDateString(value, time));
+  }, [time, value]);
+  const handleChange = useCallback6(
+    (property, value2) => {
+      const nextState = {
+        ...state,
+        [property]: typeof value2 === "undefined" ? -1 : value2
+      };
+      if (readyForChange(nextState)) {
+        onChange(toDateString(nextState, time));
+      } else {
+        setState(nextState);
+      }
     },
-    parseDateString(value, time)
+    [state, onChange, time]
   );
-  useEffect3(() => {
-    const stateValue = toDateString(state, time);
-    if (readyForChange(state) && stateValue !== value) {
-      onChange(stateValue);
-    } else if (lastValue !== value) {
-      setLastValue(value);
-      setState(parseDateString(value, time));
-    }
-  }, [time, value, onChange, state, lastValue]);
-  const handleChange = useCallback4((property, value2) => {
-    setState({ [property]: value2 });
-  }, []);
-  const handleSetNow = useCallback4(
+  const handleSetNow = useCallback6(
     (event) => {
       event.preventDefault();
       if (disabled || readonly) {
@@ -3434,9 +3513,9 @@ function AltDateWidget({
       const nextState = parseDateString((/* @__PURE__ */ new Date()).toJSON(), time);
       onChange(toDateString(nextState, time));
     },
-    [disabled, readonly, time]
+    [disabled, readonly, time, onChange]
   );
-  const handleClear = useCallback4(
+  const handleClear = useCallback6(
     (event) => {
       event.preventDefault();
       if (disabled || readonly) {
@@ -3485,7 +3564,7 @@ function AltDateTimeWidget({
 var AltDateTimeWidget_default = AltDateTimeWidget;
 
 // src/components/widgets/CheckboxWidget.tsx
-import { useCallback as useCallback5 } from "react";
+import { useCallback as useCallback7 } from "react";
 import {
   ariaDescribedByIds as ariaDescribedByIds3,
   descriptionId as descriptionId4,
@@ -3516,15 +3595,15 @@ function CheckboxWidget({
     options
   );
   const required = schemaRequiresTrueValue(schema);
-  const handleChange = useCallback5(
+  const handleChange = useCallback7(
     (event) => onChange(event.target.checked),
     [onChange]
   );
-  const handleBlur = useCallback5(
+  const handleBlur = useCallback7(
     (event) => onBlur(id, event.target.checked),
     [onBlur, id]
   );
-  const handleFocus = useCallback5(
+  const handleFocus = useCallback7(
     (event) => onFocus(id, event.target.checked),
     [onFocus, id]
   );
@@ -3564,7 +3643,7 @@ function CheckboxWidget({
 var CheckboxWidget_default = CheckboxWidget;
 
 // src/components/widgets/CheckboxesWidget.tsx
-import { useCallback as useCallback6 } from "react";
+import { useCallback as useCallback8 } from "react";
 import {
   ariaDescribedByIds as ariaDescribedByIds4,
   enumOptionsDeselectValue,
@@ -3586,13 +3665,13 @@ function CheckboxesWidget({
   onFocus
 }) {
   const checkboxesValues = Array.isArray(value) ? value : [value];
-  const handleBlur = useCallback6(
+  const handleBlur = useCallback8(
     ({ target }) => onBlur(id, enumOptionsValueForIndex(target && target.value, enumOptions, emptyValue)),
-    [onBlur, id]
+    [onBlur, id, enumOptions, emptyValue]
   );
-  const handleFocus = useCallback6(
+  const handleFocus = useCallback8(
     ({ target }) => onFocus(id, enumOptionsValueForIndex(target && target.value, enumOptions, emptyValue)),
-    [onFocus, id]
+    [onFocus, id, enumOptions, emptyValue]
   );
   return /* @__PURE__ */ jsx36("div", { className: "checkboxes", id, children: Array.isArray(enumOptions) && enumOptions.map((option, index) => {
     const checked = enumOptionsIsSelected(option.value, checkboxesValues);
@@ -3639,13 +3718,13 @@ function ColorWidget(props) {
 }
 
 // src/components/widgets/DateWidget.tsx
-import { useCallback as useCallback7 } from "react";
+import { useCallback as useCallback9 } from "react";
 import { getTemplate as getTemplate16 } from "@rjsf/utils";
 import { jsx as jsx38 } from "react/jsx-runtime";
 function DateWidget(props) {
   const { onChange, options, registry } = props;
   const BaseInputTemplate2 = getTemplate16("BaseInputTemplate", registry, options);
-  const handleChange = useCallback7((value) => onChange(value || void 0), [onChange]);
+  const handleChange = useCallback9((value) => onChange(value || void 0), [onChange]);
   return /* @__PURE__ */ jsx38(BaseInputTemplate2, { type: "date", ...props, onChange: handleChange });
 }
 
@@ -3680,7 +3759,7 @@ function EmailWidget(props) {
 }
 
 // src/components/widgets/FileWidget.tsx
-import { useCallback as useCallback8, useMemo as useMemo2 } from "react";
+import { useCallback as useCallback10, useMemo as useMemo2 } from "react";
 import {
   dataURItoBlob,
   getTemplate as getTemplate19,
@@ -3785,7 +3864,7 @@ function extractFileInfo(dataURLs) {
 function FileWidget(props) {
   const { disabled, readonly, required, multiple, onChange, value, options, registry } = props;
   const BaseInputTemplate2 = getTemplate19("BaseInputTemplate", registry, options);
-  const handleChange = useCallback8(
+  const handleChange = useCallback10(
     (event) => {
       if (!event.target.files) {
         return;
@@ -3802,7 +3881,7 @@ function FileWidget(props) {
     [multiple, value, onChange]
   );
   const filesInfo = useMemo2(() => extractFileInfo(Array.isArray(value) ? value : [value]), [value]);
-  const rmFile = useCallback8(
+  const rmFile = useCallback10(
     (index) => {
       if (multiple) {
         const newValue = value.filter((_, i) => i !== index);
@@ -3860,7 +3939,7 @@ function PasswordWidget(props) {
 }
 
 // src/components/widgets/RadioWidget.tsx
-import { useCallback as useCallback9 } from "react";
+import { useCallback as useCallback11 } from "react";
 import {
   ariaDescribedByIds as ariaDescribedByIds5,
   enumOptionsIsSelected as enumOptionsIsSelected2,
@@ -3881,11 +3960,11 @@ function RadioWidget({
   id
 }) {
   const { enumOptions, enumDisabled, inline, emptyValue } = options;
-  const handleBlur = useCallback9(
+  const handleBlur = useCallback11(
     ({ target }) => onBlur(id, enumOptionsValueForIndex2(target && target.value, enumOptions, emptyValue)),
     [onBlur, enumOptions, emptyValue, id]
   );
-  const handleFocus = useCallback9(
+  const handleFocus = useCallback11(
     ({ target }) => onFocus(id, enumOptionsValueForIndex2(target && target.value, enumOptions, emptyValue)),
     [onFocus, enumOptions, emptyValue, id]
   );
@@ -3935,7 +4014,7 @@ function RangeWidget(props) {
 }
 
 // src/components/widgets/RatingWidget.tsx
-import { useCallback as useCallback10 } from "react";
+import { useCallback as useCallback12 } from "react";
 import { Fragment as Fragment5, jsx as jsx46, jsxs as jsxs21 } from "react/jsx-runtime";
 function RatingWidget({
   id,
@@ -3953,7 +4032,7 @@ function RatingWidget({
   const { stars = 5, shape = "star" } = options;
   const numStars = schema.maximum ? Math.min(schema.maximum, 5) : Math.min(Math.max(stars, 1), 5);
   const min = schema.minimum || 0;
-  const handleStarClick = useCallback10(
+  const handleStarClick = useCallback12(
     (starValue) => {
       if (!disabled && !readonly) {
         onChange(starValue);
@@ -3961,7 +4040,7 @@ function RatingWidget({
     },
     [onChange, disabled, readonly]
   );
-  const handleFocus = useCallback10(
+  const handleFocus = useCallback12(
     (event) => {
       if (onFocus) {
         const starValue = Number(event.target.dataset.value);
@@ -3970,7 +4049,7 @@ function RatingWidget({
     },
     [onFocus, id]
   );
-  const handleBlur = useCallback10(
+  const handleBlur = useCallback12(
     (event) => {
       if (onBlur) {
         const starValue = Number(event.target.dataset.value);
@@ -4038,7 +4117,7 @@ function RatingWidget({
 }
 
 // src/components/widgets/SelectWidget.tsx
-import { useCallback as useCallback11 } from "react";
+import { useCallback as useCallback13 } from "react";
 import {
   ariaDescribedByIds as ariaDescribedByIds6,
   enumOptionsIndexForValue,
@@ -4068,21 +4147,21 @@ function SelectWidget({
 }) {
   const { enumOptions, enumDisabled, emptyValue: optEmptyVal } = options;
   const emptyValue = multiple ? [] : "";
-  const handleFocus = useCallback11(
+  const handleFocus = useCallback13(
     (event) => {
       const newValue = getValue(event, multiple);
       return onFocus(id, enumOptionsValueForIndex3(newValue, enumOptions, optEmptyVal));
     },
     [onFocus, id, multiple, enumOptions, optEmptyVal]
   );
-  const handleBlur = useCallback11(
+  const handleBlur = useCallback13(
     (event) => {
       const newValue = getValue(event, multiple);
       return onBlur(id, enumOptionsValueForIndex3(newValue, enumOptions, optEmptyVal));
     },
     [onBlur, id, multiple, enumOptions, optEmptyVal]
   );
-  const handleChange = useCallback11(
+  const handleChange = useCallback13(
     (event) => {
       const newValue = getValue(event, multiple);
       return onChange(enumOptionsValueForIndex3(newValue, enumOptions, optEmptyVal));
@@ -4120,7 +4199,7 @@ function SelectWidget({
 var SelectWidget_default = SelectWidget;
 
 // src/components/widgets/TextareaWidget.tsx
-import { useCallback as useCallback12 } from "react";
+import { useCallback as useCallback14 } from "react";
 import { ariaDescribedByIds as ariaDescribedByIds7 } from "@rjsf/utils";
 import { jsx as jsx48 } from "react/jsx-runtime";
 function TextareaWidget({
@@ -4136,15 +4215,15 @@ function TextareaWidget({
   onBlur,
   onFocus
 }) {
-  const handleChange = useCallback12(
+  const handleChange = useCallback14(
     ({ target: { value: value2 } }) => onChange(value2 === "" ? options.emptyValue : value2),
     [onChange, options.emptyValue]
   );
-  const handleBlur = useCallback12(
+  const handleBlur = useCallback14(
     ({ target }) => onBlur(id, target && target.value),
     [onBlur, id]
   );
-  const handleFocus = useCallback12(
+  const handleFocus = useCallback14(
     ({ target }) => onFocus(id, target && target.value),
     [id, onFocus]
   );
@@ -4184,13 +4263,13 @@ function TextWidget(props) {
 }
 
 // src/components/widgets/TimeWidget.tsx
-import { useCallback as useCallback13 } from "react";
+import { useCallback as useCallback15 } from "react";
 import { getTemplate as getTemplate22 } from "@rjsf/utils";
 import { jsx as jsx50 } from "react/jsx-runtime";
 function TimeWidget(props) {
   const { onChange, options, registry } = props;
   const BaseInputTemplate2 = getTemplate22("BaseInputTemplate", registry, options);
-  const handleChange = useCallback13((value) => onChange(value ? `${value}:00` : void 0), [onChange]);
+  const handleChange = useCallback15((value) => onChange(value ? `${value}:00` : void 0), [onChange]);
   return /* @__PURE__ */ jsx50(BaseInputTemplate2, { type: "time", ...props, onChange: handleChange });
 }
 
@@ -4258,6 +4337,9 @@ var Form = class extends Component5 {
    * 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.
@@ -4296,8 +4378,10 @@ var Form = class extends Component5 {
   getSnapshotBeforeUpdate(prevProps, prevState) {
     if (!deepEquals2(this.props, prevProps)) {
       const formDataChangedFields = getChangedFields(this.props.formData, prevProps.formData);
+      const stateDataChangedFields = getChangedFields(this.props.formData, this.state.formData);
       const isSchemaChanged = !deepEquals2(prevProps.schema, this.props.schema);
       const isFormDataChanged = formDataChangedFields.length > 0 || !deepEquals2(prevProps.formData, this.props.formData);
+      const isStateDataChanged = stateDataChangedFields.length > 0 || !deepEquals2(this.state.formData, this.props.formData);
       const nextState = this.getStateFromProps(
         this.props,
         this.props.formData,
@@ -4306,7 +4390,9 @@ var Form = class extends Component5 {
         //  match one of the subSchemas, the retrieved schema must be updated.
         isSchemaChanged || isFormDataChanged ? void 0 : this.state.retrievedSchema,
         isSchemaChanged,
-        formDataChangedFields
+        formDataChangedFields,
+        // Skip live validation for this request if no form data has changed from the last state
+        !isStateDataChanged
       );
       const shouldUpdate = !deepEquals2(nextState, prevState);
       return { nextState, shouldUpdate };
@@ -4345,14 +4431,14 @@ var Form = class extends Component5 {
    * @param formDataChangedFields - The changed fields of `formData`
    * @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 mustValidate = edit && !props.noValidate && liveValidate && !skipLiveValidate;
     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;
@@ -4472,8 +4558,7 @@ var Form = class extends Component5 {
     let customValidateErrors = {};
     if (typeof customValidate === "function") {
       const errorHandler = customValidate(prevFormData, createErrorHandler(prevFormData), uiSchema);
-      const userErrorSchema = unwrapErrorHandler(errorHandler);
-      customValidateErrors = userErrorSchema;
+      customValidateErrors = unwrapErrorHandler(errorHandler);
     }
     return customValidateErrors;
   }
@@ -4482,7 +4567,8 @@ var Form = class extends Component5 {
    *
    * @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.state.schema, altSchemaUtils, retrievedSchema) {
     const schemaUtils = altSchemaUtils ? altSchemaUtils : this.state.schemaUtils;
@@ -4564,10 +4650,15 @@ var Form = class extends Component5 {
     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;
@@ -4601,23 +4692,45 @@ var Form = class extends Component5 {
     };
     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) => {
-    const { extraErrors, omitExtraData, liveOmit, noValidate, liveValidate, onChange } = this.props;
-    const { schemaUtils, schema } = this.state;
+  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, idPrefix = "" } = this.props;
+    const { formData: oldFormData, schemaUtils, schema, errorSchema } = this.state;
+    const isRootPath = !path || path.length === 0 || path.length === 1 && path[0] === idPrefix;
     let retrievedSchema = this.state.retrievedSchema;
+    let formData = isRootPath ? newValue : _cloneDeep(oldFormData);
     if (isObject6(formData) || Array.isArray(formData)) {
-      const newState = this.getStateFromProps(this.props, formData);
+      if (!isRootPath) {
+        _set(formData, path, newValue);
+      }
+      const newState = this.getStateFromProps(this.props, formData, void 0, void 0, void 0, true);
       formData = newState.formData;
       retrievedSchema = newState.retrievedSchema;
     }
@@ -4630,38 +4743,49 @@ var Form = class extends Component5 {
         formData: newFormData
       };
     }
-    if (mustValidate) {
+    if (newErrorSchema && !isRootPath) {
+      const errorSchemaCopy = _cloneDeep(errorSchema);
+      _set(errorSchemaCopy, path, newErrorSchema);
+      newErrorSchema = errorSchemaCopy;
+    }
+    if (mustValidate && this.pendingChanges.length === 1) {
       const schemaValidation = this.validate(newFormData, schema, schemaUtils, retrievedSchema);
       let errors = schemaValidation.errors;
-      let errorSchema = schemaValidation.errorSchema;
+      let errorSchema2 = schemaValidation.errorSchema;
       const schemaValidationErrors = errors;
-      const schemaValidationErrorSchema = errorSchema;
+      const schemaValidationErrorSchema = errorSchema2;
       if (extraErrors) {
         const merged = validationDataMerge(schemaValidation, extraErrors);
-        errorSchema = merged.errorSchema;
+        errorSchema2 = merged.errorSchema;
         errors = merged.errors;
       }
       if (newErrorSchema) {
         const filteredErrors = this.filterErrorsBasedOnSchema(newErrorSchema, retrievedSchema, newFormData);
-        errorSchema = mergeObjects3(errorSchema, filteredErrors, "preventDuplicates");
+        errorSchema2 = mergeObjects3(errorSchema2, filteredErrors, "preventDuplicates");
       }
       state = {
         formData: newFormData,
         errors,
-        errorSchema,
+        errorSchema: errorSchema2,
         schemaValidationErrors,
         schemaValidationErrorSchema
       };
     } else if (!noValidate && newErrorSchema) {
-      const errorSchema = extraErrors ? mergeObjects3(newErrorSchema, extraErrors, "preventDuplicates") : newErrorSchema;
+      const errorSchema2 = extraErrors ? mergeObjects3(newErrorSchema, extraErrors, "preventDuplicates") : newErrorSchema;
       state = {
         formData: newFormData,
-        errorSchema,
-        errors: toErrorList(errorSchema)
+        errorSchema: errorSchema2,
+        errors: toErrorList(errorSchema2)
       };
     }
-    this.setState(state, () => onChange && onChange({ ...this.state, ...state }, id));
-  };
+    this.setState(state, () => {
+      if (onChange) {
+        onChange({ ...this.state, ...state }, id);
+      }
+      this.pendingChanges.shift();
+      this.processPendingChange();
+    });
+  }
   /**
    * If the retrievedSchema has changed the new retrievedSchema is returned.
    * Otherwise, the old retrievedSchema is returned to persist reference.
@@ -4896,7 +5020,7 @@ var Form = class extends Component5 {
     const {
       children,
       id,
-      idPrefix,
+      idPrefix = "",
       idSeparator,
       className = "",
       tagName,
@@ -4946,7 +5070,7 @@ var Form = class extends Component5 {
           /* @__PURE__ */ jsx53(
             _SchemaField,
             {
-              name: "",
+              name: idPrefix,
               schema,
               uiSchema,
               errorSchema,