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

package/lib/components/fields/LayoutGridField.js

@@ -1,7 +1,7 @@
 import { createElement as _createElement } from "react";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { PureComponent } from 'react';
-import { ANY_OF_KEY, getDiscriminatorFieldFromSchema, getTemplate, getTestIds, getUiOptions, hashObject, ID_KEY, lookupFromFormContext, mergeObjects, ONE_OF_KEY, PROPERTIES_KEY, READONLY_KEY, UI_OPTIONS_KEY, UI_GLOBAL_OPTIONS_KEY, } from '@rjsf/utils';
+import { ANY_OF_KEY, getDiscriminatorFieldFromSchema, getTemplate, getTestIds, getUiOptions, hashObject, ID_KEY, lookupFromFormContext, mergeObjects, ONE_OF_KEY, PROPERTIES_KEY, READONLY_KEY, UI_OPTIONS_KEY, UI_GLOBAL_OPTIONS_KEY, ITEMS_KEY, } from '@rjsf/utils';
 import cloneDeep from 'lodash-es/cloneDeep.js';
 import each from 'lodash-es/each.js';
 import flatten from 'lodash-es/flatten.js';
@@ -16,6 +16,7 @@ import isObject from 'lodash-es/isObject.js';
 import isPlainObject from 'lodash-es/isPlainObject.js';
 import isString from 'lodash-es/isString.js';
 import isUndefined from 'lodash-es/isUndefined.js';
+import last from 'lodash-es/last.js';
 import set from 'lodash-es/set.js';
 /** The enumeration of the three different Layout GridTemplate type values
  */
@@ -52,6 +53,14 @@ export const LAYOUT_GRID_OPTION = `ui:${LAYOUT_GRID_UI_OPTION}`;
 function getNonNullishValue(value, fallback) {
     return value ?? fallback;
 }
+/** Detects if a `str` is made up entirely of numeric characters
+ *
+ * @param str - The string to check to see if it is a numeric index
+ * @return - True if the string consists entirely of numeric characters
+ */
+function isNumericIndex(str) {
+    return /^\d+?$/.test(str); // Matches positive integers
+}
 /** The `LayoutGridField` will render a schema, uiSchema and formData combination out into a GridTemplate in the shape
  * described in the uiSchema. To define the grid to use to render the elements within a field in the schema, provide in
  * the uiSchema for that field the object contained under a `ui:layoutGrid` element. E.g. (as a JSON object):
@@ -395,6 +404,40 @@ export default class LayoutGridField extends PureComponent {
         const baseId = get(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_KEY)) {
+            const index = Number(potentialIndex);
+            const items = schema[ITEMS_KEY];
+            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
@@ -433,7 +476,9 @@ export default class LayoutGridField extends PureComponent {
                 idSchema = get(selectedIdSchema, part, {});
             }
             else {
-                rawSchema = {};
+                const result = LayoutGridField.computeArraySchemasIfPresent(schema, idSchema, part, idSeparator);
+                rawSchema = result.rawSchema ?? {};
+                idSchema = result.idSchema;
             }
             // Now drill into the innerData for the part, returning an empty object by default if it doesn't exist
             innerData = get(innerData, part, {});
@@ -458,11 +503,18 @@ export default class LayoutGridField extends PureComponent {
                 idSchema = mergeObjects(rawIdSchema, idSchema);
             }
             isRequired = schema !== undefined && Array.isArray(schema.required) && includes(schema.required, leafPath);
-            // Now grab the schema from the leafPath of the current schema properties
-            schema = get(schema, [PROPERTIES_KEY, leafPath]);
-            // Resolve any `$ref`s for the current schema
-            schema = schema ? schemaUtils.retrieveSchema(schema) : schema;
-            idSchema = get(idSchema, leafPath, {});
+            const result = LayoutGridField.computeArraySchemasIfPresent(schema, idSchema, leafPath, idSeparator);
+            if (result.rawSchema) {
+                schema = result.rawSchema;
+                idSchema = result.idSchema;
+            }
+            else {
+                // Now grab the schema from the leafPath of the current schema properties
+                schema = get(schema, [PROPERTIES_KEY, leafPath]);
+                // Resolve any `$ref`s for the current schema
+                schema = schema ? schemaUtils.retrieveSchema(schema) : schema;
+                idSchema = get(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;
@@ -545,16 +597,14 @@ export default 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 = cloneDeep(formData || {});
+        return (value, path, errSchema, id) => {
+            const { onChange, errorSchema } = this.props;
             let newErrorSchema = errorSchema;
             if (errSchema && errorSchema) {
                 newErrorSchema = cloneDeep(errorSchema);
                 set(newErrorSchema, dottedPath, errSchema);
             }
-            set(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

package/lib/components/fields/LayoutMultiSchemaField.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LayoutMultiSchemaField.d.ts","sourceRoot":"","sources":["../../../src/components/fields/LayoutMultiSchemaField.tsx"],"names":[],"mappings":"AACA,OAAO,EAIL,eAAe,EAEf,UAAU,EACV,eAAe,EAOf,UAAU,EAIV,eAAe,EACf,gBAAgB,EAChB,QAAQ,EACT,MAAM,aAAa,CAAC;AAQrB;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,gBAAgB,GAAG,UAAU,EACvE,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE,EAC7B,aAAa,EAAE,MAAM,EACrB,KAAK,EAAE,OAAO,GACb,CAAC,GAAG,SAAS,CAQf;AAED;;;;;;;;;GASG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,SAAS,gBAAgB,GAAG,UAAU,EAAE,CAAC,SAAS,eAAe,GAAG,GAAG,EAClH,MAAM,EAAE,CAAC,EACT,OAAO,EAAE,CAAC,EAAE,EACZ,WAAW,EAAE,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EACrC,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAC5B,QAAQ,CAAC,EAAE,CAAC,GACX,eAAe,CAAC,CAAC,CAAC,EAAE,CAatB;AAED;;;;;GAKG;AACH,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAC5C,CAAC,GAAG,GAAG,EACP,CAAC,SAAS,gBAAgB,GAAG,UAAU,EACvC,CAAC,SAAS,eAAe,GAAG,GAAG,EAC/B,KAAK,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,2CAuI3B"}
+{"version":3,"file":"LayoutMultiSchemaField.d.ts","sourceRoot":"","sources":["../../../src/components/fields/LayoutMultiSchemaField.tsx"],"names":[],"mappings":"AACA,OAAO,EAIL,eAAe,EAEf,UAAU,EACV,eAAe,EAOf,UAAU,EAIV,eAAe,EACf,gBAAgB,EAChB,QAAQ,EACT,MAAM,aAAa,CAAC;AAQrB;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,gBAAgB,GAAG,UAAU,EACvE,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE,EAC7B,aAAa,EAAE,MAAM,EACrB,KAAK,EAAE,OAAO,GACb,CAAC,GAAG,SAAS,CAQf;AAED;;;;;;;;;GASG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,SAAS,gBAAgB,GAAG,UAAU,EAAE,CAAC,SAAS,eAAe,GAAG,GAAG,EAClH,MAAM,EAAE,CAAC,EACT,OAAO,EAAE,CAAC,EAAE,EACZ,WAAW,EAAE,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EACrC,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAC5B,QAAQ,CAAC,EAAE,CAAC,GACX,eAAe,CAAC,CAAC,CAAC,EAAE,CAatB;AAED;;;;;GAKG;AACH,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAC5C,CAAC,GAAG,GAAG,EACP,CAAC,SAAS,gBAAgB,GAAG,UAAU,EACvC,CAAC,SAAS,eAAe,GAAG,GAAG,EAC/B,KAAK,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,2CAwI3B"}

package/lib/components/fields/LayoutMultiSchemaField.js

@@ -104,7 +104,8 @@ export default function LayoutMultiSchemaField(props) {
         if (newFormData) {
             set(newFormData, selectorField, opt);
         }
-        onChange(newFormData, undefined, id);
+        // Pass the component name in the path
+        onChange(newFormData, [name], undefined, id);
     };
     // filtering the options based on the type of widget because `selectField` does not recognize the `convertOther` prop
     const widgetOptions = { enumOptions, ...uiOptions };

package/lib/components/fields/MultiSchemaField.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MultiSchemaField.d.ts","sourceRoot":"","sources":["../../../src/components/fields/MultiSchemaField.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAIlC,OAAO,EAIL,UAAU,EACV,eAAe,EAOf,UAAU,EACV,gBAAgB,EAGjB,MAAM,aAAa,CAAC;AAErB,4DAA4D;AAC5D,KAAK,eAAe,CAAC,CAAC,SAAS,gBAAgB,GAAG,UAAU,IAAI;IAC9D,oCAAoC;IACpC,cAAc,EAAE,MAAM,CAAC;IACvB,oDAAoD;IACpD,gBAAgB,EAAE,CAAC,EAAE,CAAC;CACvB,CAAC;AAEF;;;;GAIG;AACH,cAAM,UAAU,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,SAAS,gBAAgB,GAAG,UAAU,EAAE,CAAC,SAAS,eAAe,GAAG,GAAG,CAAE,SAAQ,SAAS,CACnH,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EACnB,eAAe,CAAC,CAAC,CAAC,CACnB;IACC;;;OAGG;gBACS,KAAK,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAiBtC;;;;;OAKG;IACH,kBAAkB,CAAC,SAAS,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,QAAQ,CAAC,eAAe,CAAC;IAyBjG;;;;;OAKG;IACH,iBAAiB,CAAC,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,SAAS,EAAE,OAAO,EAAE,CAAC,EAAE;IAW/E;;;;;OAKG;IACH,cAAc,GAAI,SAAS,MAAM,UAqB/B;IAEF,UAAU;IAKV;OACG;IACH,MAAM;CAyHP;AAED,eAAe,UAAU,CAAC"}
+{"version":3,"file":"MultiSchemaField.d.ts","sourceRoot":"","sources":["../../../src/components/fields/MultiSchemaField.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAIlC,OAAO,EAIL,UAAU,EACV,eAAe,EAOf,UAAU,EACV,gBAAgB,EAGjB,MAAM,aAAa,CAAC;AAErB,4DAA4D;AAC5D,KAAK,eAAe,CAAC,CAAC,SAAS,gBAAgB,GAAG,UAAU,IAAI;IAC9D,oCAAoC;IACpC,cAAc,EAAE,MAAM,CAAC;IACvB,oDAAoD;IACpD,gBAAgB,EAAE,CAAC,EAAE,CAAC;CACvB,CAAC;AAEF;;;;GAIG;AACH,cAAM,UAAU,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,SAAS,gBAAgB,GAAG,UAAU,EAAE,CAAC,SAAS,eAAe,GAAG,GAAG,CAAE,SAAQ,SAAS,CACnH,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EACnB,eAAe,CAAC,CAAC,CAAC,CACnB;IACC;;;OAGG;gBACS,KAAK,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAiBtC;;;;;OAKG;IACH,kBAAkB,CAAC,SAAS,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,QAAQ,CAAC,eAAe,CAAC;IAyBjG;;;;;OAKG;IACH,iBAAiB,CAAC,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,SAAS,EAAE,OAAO,EAAE,CAAC,EAAE;IAW/E;;;;;OAKG;IACH,cAAc,GAAI,SAAS,MAAM,UAsB/B;IAEF,UAAU;IAKV;OACG;IACH,MAAM;CAyHP;AAED,eAAe,UAAU,CAAC"}

package/lib/components/fields/MultiSchemaField.js

@@ -86,7 +86,8 @@ class AnyOfField extends Component {
             newFormData = schemaUtils.getDefaultFormState(newOption, newFormData, 'excludeObjectChildren');
         }
         this.setState({ selectedOption: intOption }, () => {
-            onChange(newFormData, undefined, this.getFieldId());
+            // Changing the option will pass an empty path array to the parent field which will add the appropriate path
+            onChange(newFormData, [], undefined, this.getFieldId());
         });
     };
     getFieldId() {

package/lib/components/fields/NullField.js

@@ -5,12 +5,12 @@ import { useEffect } from 'react';
  * @param props - The `FieldProps` for this template
  */
 function NullField(props) {
-    const { formData, onChange } = props;
+    const { name, formData, onChange } = props;
     useEffect(() => {
         if (formData === undefined) {
-            onChange(null);
+            onChange(null, [name]);
         }
-    }, [formData, onChange]);
+    }, [name, formData, onChange]);
     return null;
 }
 export default NullField;

package/lib/components/fields/NumberField.js

@@ -37,7 +37,7 @@ function NumberField(props) {
      *
      * @param value - The current value for the change occurring
      */
-    const handleChange = useCallback((value, errorSchema, id) => {
+    const handleChange = useCallback((value, path, errorSchema, id) => {
         // Cache the original value in component state
         setLastValue(value);
         // Normalize decimals that don't start with a zero character in advance so
@@ -51,7 +51,7 @@ function NumberField(props) {
         const processed = typeof value === 'string' && value.match(trailingCharMatcherWithPrefix)
             ? asNumber(value.replace(trailingCharMatcher, ''))
             : asNumber(value);
-        onChange(processed, errorSchema, id);
+        onChange(processed, path, errorSchema, id);
     }, [onChange]);
     if (typeof lastValue === 'string' && typeof value === 'number') {
         // Construct a regular expression that checks for a string that consists

package/lib/components/fields/ObjectField.d.ts

@@ -32,7 +32,7 @@ declare class ObjectField<T = any, S extends StrictRJSFSchema = RJSFSchema, F ex
      * @param addedByAdditionalProperties - Flag indicating whether this property is an additional property
      * @returns - The onPropertyChange callback for the `name` property
      */
-    onPropertyChange: (name: string, addedByAdditionalProperties?: boolean) => (value: T | undefined, newErrorSchema?: ErrorSchema<T>, id?: string) => void;
+    onPropertyChange: (name: string, addedByAdditionalProperties?: boolean) => (value: T | undefined, path?: (number | string)[], newErrorSchema?: ErrorSchema<T>, id?: string) => void;
     /** Returns a callback to handle the onDropPropertyClick event for the given `key` which removes the old `key` data
      * and calls the `onChange` callback with it
      *
@@ -54,7 +54,7 @@ declare class ObjectField<T = any, S extends StrictRJSFSchema = RJSFSchema, F ex
      * @param oldValue - The old value of a field
      * @returns - The key change callback function
      */
-    onKeyChange: (oldValue: any) => (value: any, newErrorSchema: ErrorSchema<T>) => void;
+    onKeyChange: (oldValue: any) => (value: any) => void;
     /** Returns a default value to be used for a new additional schema property of the given `type`
      *
      * @param type - The type of the new additional schema property

package/lib/components/fields/ObjectField.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ObjectField.d.ts","sourceRoot":"","sources":["../../../src/components/fields/ObjectField.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAIL,WAAW,EACX,UAAU,EACV,eAAe,EAGf,UAAU,EACV,gBAAgB,EAOjB,MAAM,aAAa,CAAC;AAQrB,6DAA6D;AAC7D,KAAK,gBAAgB,GAAG;IACtB,sEAAsE;IACtE,sBAAsB,EAAE,OAAO,CAAC;IAChC,uCAAuC;IACvC,oBAAoB,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF;;;;GAIG;AACH,cAAM,WAAW,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,SAAS,gBAAgB,GAAG,UAAU,EAAE,CAAC,SAAS,eAAe,GAAG,GAAG,CAAE,SAAQ,SAAS,CACpH,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EACnB,gBAAgB,CACjB;IACC,+BAA+B;IAC/B,KAAK;;;MAGH;IAEF;;;;OAIG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM;IAKvB;;;;;;;OAOG;IACH,gBAAgB,GAAI,MAAM,MAAM,EAAE,qCAAmC,MAC3D,OAAO,CAAC,GAAG,SAAS,EAAE,iBAAiB,WAAW,CAAC,CAAC,CAAC,EAAE,KAAK,MAAM,UAuB1E;IAEF;;;;;OAKG;IACH,mBAAmB,GAAI,KAAK,MAAM,MACxB,OAAO,SAAS,UAOxB;IAEF;;;;;;OAMG;IACH,eAAe,GAAI,cAAc,MAAM,EAAE,WAAW,CAAC,YAUnD;IAEF;;;;;OAKG;IACH,WAAW,GAAI,UAAU,GAAG,MAClB,OAAO,GAAG,EAAE,gBAAgB,WAAW,CAAC,CAAC,CAAC,UA4BlD;IAEF;;;OAGG;IACH,eAAe,CAAC,IAAI,CAAC,EAAE,UAAU,CAAC,MAAM,CAAC;IAsBzC;;;;OAIG;IACH,cAAc,GAAI,QAAQ,CAAC,gBAqCzB;IAEF;OACG;IACH,MAAM;CAuGP;AAED,eAAe,WAAW,CAAC"}
+{"version":3,"file":"ObjectField.d.ts","sourceRoot":"","sources":["../../../src/components/fields/ObjectField.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAIL,WAAW,EACX,UAAU,EACV,eAAe,EAGf,UAAU,EACV,gBAAgB,EAOjB,MAAM,aAAa,CAAC;AAQrB,6DAA6D;AAC7D,KAAK,gBAAgB,GAAG;IACtB,sEAAsE;IACtE,sBAAsB,EAAE,OAAO,CAAC;IAChC,uCAAuC;IACvC,oBAAoB,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF;;;;GAIG;AACH,cAAM,WAAW,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,SAAS,gBAAgB,GAAG,UAAU,EAAE,CAAC,SAAS,eAAe,GAAG,GAAG,CAAE,SAAQ,SAAS,CACpH,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EACnB,gBAAgB,CACjB;IACC,+BAA+B;IAC/B,KAAK;;;MAGH;IAEF;;;;OAIG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM;IAKvB;;;;;;;OAOG;IACH,gBAAgB,GAAI,MAAM,MAAM,EAAE,qCAAmC,MAC3D,OAAO,CAAC,GAAG,SAAS,EAAE,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,EAAE,iBAAiB,WAAW,CAAC,CAAC,CAAC,EAAE,KAAK,MAAM,UAiBtG;IAEF;;;;;OAKG;IACH,mBAAmB,GAAI,KAAK,MAAM,MACxB,OAAO,SAAS,UAQxB;IAEF;;;;;;OAMG;IACH,eAAe,GAAI,cAAc,MAAM,EAAE,WAAW,CAAC,YAUnD;IAEF;;;;;OAKG;IACH,WAAW,GAAI,UAAU,GAAG,MAClB,OAAO,GAAG,UAsBlB;IAEF;;;OAGG;IACH,eAAe,CAAC,IAAI,CAAC,EAAE,UAAU,CAAC,MAAM,CAAC;IAsBzC;;;;OAIG;IACH,cAAc,GAAI,QAAQ,CAAC,gBAsCzB;IAEF;OACG;IACH,MAAM;CAuGP;AAED,eAAe,WAAW,CAAC"}

package/lib/components/fields/ObjectField.js

@@ -36,8 +36,8 @@ class ObjectField extends Component {
      * @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 === undefined && addedByAdditionalProperties) {
                 // Don't set value = undefined for fields added by
                 // additionalProperties. Doing so removes them from the
@@ -48,12 +48,10 @@ class ObjectField extends Component {
                 // set empty values to the empty string.
                 value = '';
             }
-            const newFormData = { ...formData, [name]: value };
-            onChange(newFormData, errorSchema &&
-                errorSchema && {
-                ...errorSchema,
-                [name]: newErrorSchema,
-            }, id);
+            // Copy the current path and insert in the property name into the first location
+            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
@@ -65,10 +63,11 @@ class ObjectField extends Component {
     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);
+            // drop property will pass the name in `path` array
+            onChange(copiedFormData, [name]);
         };
     };
     /** Computes the next available key name from the `preferredKey`, indexing through the already existing keys until one
@@ -95,11 +94,11 @@ class ObjectField extends Component {
      * @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,
@@ -111,11 +110,8 @@ class ObjectField extends Component {
             });
             const renamedObj = Object.assign({}, ...keyValues);
             this.setState({ wasPropertyKeyModified: true });
-            onChange(renamedObj, errorSchema &&
-                errorSchema && {
-                ...errorSchema,
-                [value]: newErrorSchema,
-            });
+            // rename will pass an empty `path` array since the onPropertyChange also gets called
+            onChange(renamedObj, []);
         };
     };
     /** Returns a default value to be used for a new additional schema property of the given `type`
@@ -150,7 +146,7 @@ class ObjectField extends Component {
         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) {
@@ -181,7 +177,8 @@ class ObjectField extends Component {
             // Cast this to make the `set` work properly
             set(newFormData, newKey, newValue);
         }
-        onChange(newFormData);
+        // add will pass the name in `path` array
+        onChange(newFormData, [name]);
     };
     /** Renders the `ObjectField` from the given props
      */

package/lib/components/fields/SchemaField.js

@@ -71,9 +71,9 @@ function SchemaFieldRender(props) {
     /** Intermediary `onChange` handler for field components that will inject the `id` of the current field into the
      * `onChange` chain if it is not already being provided from a deeper level in the hierarchy
      */
-    const handleFieldComponentChange = useCallback((formData, newErrorSchema, id) => {
+    const handleFieldComponentChange = useCallback((formData, path, newErrorSchema, id) => {
         const theId = id || fieldId;
-        return onChange(formData, newErrorSchema, theId);
+        return onChange(formData, path, newErrorSchema, theId);
     }, [fieldId, onChange]);
     const FieldComponent = getFieldComponent(schema, uiOptions, idSchema, registry);
     const disabled = Boolean(uiOptions.disabled ?? props.disabled);

package/lib/components/fields/StringField.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StringField.d.ts","sourceRoot":"","sources":["../../../src/components/fields/StringField.tsx"],"names":[],"mappings":"AAAA,OAAO,EAKL,UAAU,EACV,eAAe,EACf,UAAU,EACV,gBAAgB,EACjB,MAAM,aAAa,CAAC;AAErB;;;GAGG;AACH,iBAAS,WAAW,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,SAAS,gBAAgB,GAAG,UAAU,EAAE,CAAC,SAAS,eAAe,GAAG,GAAG,EACpG,KAAK,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,2CAsD3B;AAED,eAAe,WAAW,CAAC"}
+{"version":3,"file":"StringField.d.ts","sourceRoot":"","sources":["../../../src/components/fields/StringField.tsx"],"names":[],"mappings":"AACA,OAAO,EAKL,UAAU,EACV,eAAe,EACf,UAAU,EACV,gBAAgB,EAEjB,MAAM,aAAa,CAAC;AAErB;;;GAGG;AACH,iBAAS,WAAW,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,SAAS,gBAAgB,GAAG,UAAU,EAAE,CAAC,SAAS,eAAe,GAAG,GAAG,EACpG,KAAK,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,2CA6D3B;AAED,eAAe,WAAW,CAAC"}

package/lib/components/fields/StringField.js

@@ -1,4 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
+import { useCallback } from 'react';
 import { getWidget, getUiOptions, optionsList, hasWidget, } from '@rjsf/utils';
 /** The `StringField` component is used to render a schema field that represents a string type
  *
@@ -17,6 +18,10 @@ function StringField(props) {
     const displayLabel = schemaUtils.getDisplayLabel(schema, uiSchema, globalUiOptions);
     const label = uiTitle ?? title ?? name;
     const Widget = getWidget(schema, widget, widgets);
-    return (_jsx(Widget, { options: { ...options, enumOptions }, schema: schema, uiSchema: uiSchema, id: idSchema.$id, name: name, label: label, hideLabel: !displayLabel, hideError: hideError, value: formData, onChange: onChange, onBlur: onBlur, onFocus: onFocus, required: required, disabled: disabled, readonly: readonly, formContext: formContext, autofocus: autofocus, registry: registry, placeholder: placeholder, rawErrors: rawErrors }));
+    const onWidgetChange = useCallback((value, errorSchema, id) => {
+        // String field change passes an empty path array to the parent field which adds the appropriate path
+        return onChange(value, [], errorSchema, id);
+    }, [onChange]);
+    return (_jsx(Widget, { options: { ...options, enumOptions }, schema: schema, uiSchema: uiSchema, id: idSchema.$id, name: name, label: label, hideLabel: !displayLabel, hideError: hideError, value: formData, onChange: onWidgetChange, onBlur: onBlur, onFocus: onFocus, required: required, disabled: disabled, readonly: readonly, formContext: formContext, autofocus: autofocus, registry: registry, placeholder: placeholder, rawErrors: rawErrors }));
 }
 export default StringField;

package/lib/components/widgets/AltDateWidget.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AltDateWidget.d.ts","sourceRoot":"","sources":["../../../src/components/widgets/AltDateWidget.tsx"],"names":[],"mappings":"AACA,OAAO,EAOL,eAAe,EACf,UAAU,EACV,gBAAgB,EAEhB,WAAW,EAEZ,MAAM,aAAa,CAAC;AAsDrB;;GAEG;AACH,iBAAS,aAAa,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,SAAS,gBAAgB,GAAG,UAAU,EAAE,CAAC,SAAS,eAAe,GAAG,GAAG,EAAE,EACxG,IAAY,EACZ,QAAgB,EAChB,QAAgB,EAChB,SAAiB,EACjB,OAAO,EACP,EAAE,EACF,IAAI,EACJ,QAAQ,EACR,MAAM,EACN,OAAO,EACP,QAAQ,EACR,KAAK,GACN,EAAE,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,2CAwFtB;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"AltDateWidget.d.ts","sourceRoot":"","sources":["../../../src/components/widgets/AltDateWidget.tsx"],"names":[],"mappings":"AACA,OAAO,EAOL,eAAe,EACf,UAAU,EACV,gBAAgB,EAEhB,WAAW,EAEZ,MAAM,aAAa,CAAC;AAsDrB;;GAEG;AACH,iBAAS,aAAa,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,SAAS,gBAAgB,GAAG,UAAU,EAAE,CAAC,SAAS,eAAe,GAAG,GAAG,EAAE,EACxG,IAAY,EACZ,QAAgB,EAChB,QAAgB,EAChB,SAAiB,EACjB,OAAO,EACP,EAAE,EACF,IAAI,EACJ,QAAQ,EACR,MAAM,EACN,OAAO,EACP,QAAQ,EACR,KAAK,GACN,EAAE,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,2CAsFtB;AAED,eAAe,aAAa,CAAC"}

package/lib/components/widgets/AltDateWidget.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useCallback, useEffect, useReducer, useState } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 import { ariaDescribedByIds, dateRangeOptions, parseDateString, toDateString, TranslatableString, getDateElementProps, } from '@rjsf/utils';
 function readyForChange(state) {
     return Object.values(state).every((value) => value !== -1);
@@ -14,25 +14,22 @@ function DateElement({ type, range, value, select, rootId, name, disabled, reado
  */
 function AltDateWidget({ time = false, disabled = false, readonly = false, autofocus = false, options, id, name, registry, onBlur, onFocus, onChange, value, }) {
     const { translateString } = registry;
-    const [lastValue, setLastValue] = useState(value);
-    const [state, setState] = useReducer((state, action) => {
-        return { ...state, ...action };
-    }, parseDateString(value, time));
+    const [state, setState] = useState(parseDateString(value, time));
     useEffect(() => {
-        const stateValue = toDateString(state, time);
-        if (readyForChange(state) && stateValue !== value) {
-            // The user changed the date to a new valid data via the comboboxes, so call onChange
-            onChange(stateValue);
+        setState(parseDateString(value, time));
+    }, [time, value]);
+    const handleChange = useCallback((property, value) => {
+        const nextState = {
+            ...state,
+            [property]: typeof value === 'undefined' ? -1 : value,
+        };
+        if (readyForChange(nextState)) {
+            onChange(toDateString(nextState, time));
         }
-        else if (lastValue !== value) {
-            // We got a new value in the props
-            setLastValue(value);
-            setState(parseDateString(value, time));
+        else {
+            setState(nextState);
         }
-    }, [time, value, onChange, state, lastValue]);
-    const handleChange = useCallback((property, value) => {
-        setState({ [property]: value });
-    }, []);
+    }, [state, onChange, time]);
     const handleSetNow = useCallback((event) => {
         event.preventDefault();
         if (disabled || readonly) {
@@ -40,7 +37,7 @@ function AltDateWidget({ time = false, disabled = false, readonly = false, autof
         }
         const nextState = parseDateString(new Date().toJSON(), time);
         onChange(toDateString(nextState, time));
-    }, [disabled, readonly, time]);
+    }, [disabled, readonly, time, onChange]);
     const handleClear = useCallback((event) => {
         event.preventDefault();
         if (disabled || readonly) {

package/lib/components/widgets/CheckboxesWidget.js

@@ -8,8 +8,8 @@ import { ariaDescribedByIds, enumOptionsDeselectValue, enumOptionsIsSelected, en
  */
 function CheckboxesWidget({ id, disabled, options: { inline = false, enumOptions, enumDisabled, emptyValue }, value, autofocus = false, readonly, onChange, onBlur, onFocus, }) {
     const checkboxesValues = Array.isArray(value) ? value : [value];
-    const handleBlur = useCallback(({ target }) => onBlur(id, enumOptionsValueForIndex(target && target.value, enumOptions, emptyValue)), [onBlur, id]);
-    const handleFocus = useCallback(({ target }) => onFocus(id, enumOptionsValueForIndex(target && target.value, enumOptions, emptyValue)), [onFocus, id]);
+    const handleBlur = useCallback(({ target }) => onBlur(id, enumOptionsValueForIndex(target && target.value, enumOptions, emptyValue)), [onBlur, id, enumOptions, emptyValue]);
+    const handleFocus = useCallback(({ target }) => onFocus(id, enumOptionsValueForIndex(target && target.value, enumOptions, emptyValue)), [onFocus, id, enumOptions, emptyValue]);
     return (_jsx("div", { className: 'checkboxes', id: id, children: Array.isArray(enumOptions) &&
             enumOptions.map((option, index) => {
                 const checked = enumOptionsIsSelected(option.value, checkboxesValues);