@rjsf/core 6.6.1 → 6.7.0

package/lib/components/Form.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Component, createRef } from 'react';
-import { createSchemaUtils, deepEquals, ErrorSchemaBuilder, getChangedFields, getTemplate, getUiOptions, isObject, mergeObjects, shouldRender, SUBMIT_BTN_OPTIONS_KEY, toErrorList, toFieldPathId, UI_DEFINITIONS_KEY, UI_GLOBAL_OPTIONS_KEY, UI_OPTIONS_KEY, validationDataMerge, DEFAULT_ID_SEPARATOR, DEFAULT_ID_PREFIX, ERRORS_KEY, ID_KEY, getUsedFormData, getFieldNames, ANY_OF_KEY, ONE_OF_KEY, } from '@rjsf/utils';
+import { createSchemaUtils, deepEquals, ErrorSchemaBuilder, getChangedFields, getTemplate, getUiOptions, hashObject, isObject, mergeObjects, shouldRender, SUBMIT_BTN_OPTIONS_KEY, toErrorList, toFieldPathId, UI_DEFINITIONS_KEY, UI_GLOBAL_OPTIONS_KEY, UI_OPTIONS_KEY, validationDataMerge, DEFAULT_ID_SEPARATOR, DEFAULT_ID_PREFIX, ERRORS_KEY, ID_KEY, getUsedFormData, getFieldNames, ANY_OF_KEY, ONE_OF_KEY, } from '@rjsf/utils';
 import _cloneDeep from 'lodash-es/cloneDeep.js';
 import _get from 'lodash-es/get.js';
 import _isEmpty from 'lodash-es/isEmpty.js';
@@ -34,7 +34,7 @@ export default class Form extends Component {
     /** Flag to track when we're processing a user-initiated field change.
      * This prevents componentDidUpdate from reverting oneOf/anyOf option switches.
      */
-    _isProcessingUserChange = false;
+    isProcessingUserChange = false;
     /** When the `extraErrors` prop changes, re-merges `schemaValidationErrors` + `extraErrors` + `customErrors` into
      * state before render, ensuring the updated errors are visible immediately in a single render cycle.
      *
@@ -43,10 +43,10 @@ export default class Form extends Component {
      * @returns Partial state with re-merged errors if `extraErrors` changed, or `null` if no update is needed
      */
     static getDerivedStateFromProps(props, state) {
-        if (props.extraErrors !== state._prevExtraErrors) {
+        if (props.extraErrors !== state.prevExtraErrors) {
             const baseErrors = {
                 errors: state.schemaValidationErrors || [],
-                errorSchema: (state.schemaValidationErrorSchema || {}),
+                errorSchema: state.schemaValidationErrorSchema || {},
             };
             let { errors, errorSchema } = baseErrors;
             if (props.extraErrors) {
@@ -55,7 +55,7 @@ export default class Form extends Component {
             if (state.customErrors) {
                 ({ errors, errorSchema } = validationDataMerge({ errors, errorSchema }, state.customErrors.ErrorSchema, true));
             }
-            return { _prevExtraErrors: props.extraErrors, errors, errorSchema };
+            return { prevExtraErrors: props.extraErrors, errors, errorSchema };
         }
         return null;
     }
@@ -74,7 +74,7 @@ export default class Form extends Component {
         const formData = propsFormData ?? initialFormData;
         this.state = {
             ...this.getStateFromProps(props, formData, undefined, undefined, undefined, true),
-            _prevExtraErrors: props.extraErrors,
+            prevExtraErrors: props.extraErrors,
         };
         if (onChange && !deepEquals(this.state.formData, formData)) {
             onChange(toIChangeEvent(this.state));
@@ -141,8 +141,8 @@ export default class Form extends Component {
             // Prevent oneOf/anyOf option switches from reverting when getStateFromProps
             // re-evaluates and produces stale formData.
             const nextStateDiffersFromProps = !deepEquals(nextState.formData, this.props.formData);
-            const wasProcessingUserChange = this._isProcessingUserChange;
-            this._isProcessingUserChange = false;
+            const wasProcessingUserChange = this.isProcessingUserChange;
+            this.isProcessingUserChange = false;
             if (wasProcessingUserChange && nextStateDiffersFromProps) {
                 // Skip - the user's option switch is already applied via processPendingChange
                 return;
@@ -150,6 +150,7 @@ export default class Form extends Component {
             if (nextStateDiffersFromProps && !deepEquals(nextState.formData, prevState.formData) && this.props.onChange) {
                 this.props.onChange(toIChangeEvent(nextState));
             }
+            // oxlint-disable-next-line react/no-did-update-set-state -- guarded to prevent infinite loop
             this.setState(nextState);
         }
     }
@@ -160,12 +161,13 @@ export default class Form extends Component {
      * @param props - The props passed to the `Form`
      * @param inputFormData - The new or current data for the `Form`
      * @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
+     * @param [isSchemaChanged=false] - A flag indicating whether the schema has changed.
+     * @param [formDataChangedFields=[]] - The changed fields of `formData`
+     * @param [skipLiveValidate=false] - Optional flag, if true, means that we are not running live validation
+     * @param [shouldSanitize=false] - Optional flag, if true, means that we should attempt to sanitize formData
      * @returns - The new state for the `Form`
      */
-    getStateFromProps(props, inputFormData, retrievedSchema, isSchemaChanged = false, formDataChangedFields = [], skipLiveValidate = false) {
+    getStateFromProps(props, inputFormData, retrievedSchema, isSchemaChanged = false, formDataChangedFields = [], skipLiveValidate = false, shouldSanitize = 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;
@@ -173,6 +175,7 @@ export default class Form extends Component {
         const isUncontrolled = props.formData === undefined && this.props.formData === undefined;
         const edit = typeof inputFormData !== 'undefined';
         const liveValidate = 'liveValidate' in props ? props.liveValidate : this.props.liveValidate;
+        // oxlint-disable-next-line typescript/no-deprecated
         const mustValidate = edit && !props.noValidate && liveValidate;
         const experimental_defaultFormStateBehavior = 'experimental_defaultFormStateBehavior' in props
             ? props.experimental_defaultFormStateBehavior
@@ -180,7 +183,7 @@ export default class Form extends Component {
         const experimental_customMergeAllOf = 'experimental_customMergeAllOf' in props
             ? props.experimental_customMergeAllOf
             : this.props.experimental_customMergeAllOf;
-        let schemaUtils = state.schemaUtils;
+        let { schemaUtils } = state;
         if (!schemaUtils ||
             schemaUtils.doesSchemaUtilsDiffer(validator, schema, experimental_defaultFormStateBehavior, experimental_customMergeAllOf)) {
             schemaUtils = createSchemaUtils(validator, schema, experimental_defaultFormStateBehavior, experimental_customMergeAllOf);
@@ -194,14 +197,44 @@ export default class Form extends Component {
         else if (inputFormData === undefined && isUncontrolled) {
             defaultsFormData = state.formData;
         }
-        const formData = schemaUtils.getDefaultFormState(rootSchema, defaultsFormData, false, state.initialDefaultsGenerated);
-        const _retrievedSchema = this.updateRetrievedSchema(retrievedSchema ?? schemaUtils.retrieveSchema(rootSchema, formData));
+        let formData;
+        let computedRetrievedSchema;
+        let wasSanitized = false;
+        const preventInfiniteSanitize = [];
+        do {
+            formData = schemaUtils.getDefaultFormState(rootSchema, defaultsFormData, false, state.initialDefaultsGenerated);
+            // Only hash when sanitizing, wrapping `formData` in an object to deal with a scalar/undefined value
+            const formHash = shouldSanitize ? hashObject({ formData }) : '';
+            computedRetrievedSchema = this.updateRetrievedSchema(retrievedSchema ?? schemaUtils.retrieveSchema(rootSchema, formData));
+            if (shouldSanitize &&
+                !preventInfiniteSanitize.includes(formHash) &&
+                !deepEquals(computedRetrievedSchema, state.retrievedSchema)) {
+                // Sanitize the form data if shouldSanitize is true, we haven't already processed this same formData AND
+                // we have a different retrieved schema from when we last ran the state
+                const sanitizedFormData = schemaUtils.sanitizeDataForNewSchema(computedRetrievedSchema, state.retrievedSchema, formData);
+                wasSanitized = !deepEquals(sanitizedFormData, formData);
+                if (wasSanitized) {
+                    // Update both the formData AND defaultsFormData due to the sanitize so the loop works with the new data
+                    formData = sanitizedFormData;
+                    defaultsFormData = sanitizedFormData;
+                    const sanitizedFormHash = hashObject({ formData: sanitizedFormData });
+                    // If we've seen the sanitized data before, we are done
+                    wasSanitized = !preventInfiniteSanitize.includes(sanitizedFormHash);
+                    preventInfiniteSanitize.push(sanitizedFormHash);
+                }
+                preventInfiniteSanitize.push(formHash);
+            }
+            else {
+                wasSanitized = false;
+            }
+        } while (wasSanitized);
         const getCurrentErrors = () => {
             // If the `props.noValidate` option is set or the schema has changed, we reset the error state.
+            // oxlint-disable-next-line typescript/no-deprecated
             if (props.noValidate || isSchemaChanged) {
                 return { errors: [], errorSchema: {} };
             }
-            else if (!props.liveValidate) {
+            if (!props.liveValidate) {
                 return {
                     errors: state.schemaValidationErrors || [],
                     errorSchema: state.schemaValidationErrorSchema || {},
@@ -214,8 +247,7 @@ export default class Form extends Component {
         };
         let errors;
         let errorSchema;
-        let schemaValidationErrors = state.schemaValidationErrors;
-        let schemaValidationErrorSchema = state.schemaValidationErrorSchema;
+        let { schemaValidationErrors, schemaValidationErrorSchema } = state;
         // If we are skipping live validate, it means that the state has already been updated with live validation errors
         if (mustValidate && !skipLiveValidate) {
             const liveValidation = this.liveValidate(rootSchema, schemaUtils, state.errorSchema, formData, undefined, state.customErrors, retrievedSchema, 
@@ -237,14 +269,15 @@ export default class Form extends Component {
                     acc[key] = undefined;
                     return acc;
                 }, {});
-                errorSchema = schemaValidationErrorSchema = mergeObjects(currentErrors.errorSchema, newErrorSchema, 'preventDuplicates');
+                schemaValidationErrorSchema = mergeObjects(currentErrors.errorSchema, newErrorSchema, 'preventDuplicates');
+                errorSchema = schemaValidationErrorSchema;
             }
-            const mergedErrors = this.mergeErrors({ errorSchema, errors }, props.extraErrors, state.customErrors);
+            const mergedErrors = Form.mergeErrors({ errorSchema, errors }, props.extraErrors, state.customErrors);
             errors = mergedErrors.errors;
             errorSchema = mergedErrors.errorSchema;
         }
         // Only store a new registry when the props cause a different one to be created
-        const newRegistry = this.getRegistry(props, rootSchema, schemaUtils);
+        const newRegistry = Form.getRegistry(props, rootSchema, schemaUtils);
         const registry = deepEquals(state.registry, newRegistry) ? state.registry : newRegistry;
         // Only compute a new `fieldPathId` when the `idPrefix` is different than the existing fieldPathId's ID_KEY
         const fieldPathId = state.fieldPathId && state.fieldPathId?.[ID_KEY] === registry.globalFormOptions.idPrefix
@@ -261,7 +294,7 @@ export default class Form extends Component {
             errorSchema,
             schemaValidationErrors,
             schemaValidationErrorSchema,
-            retrievedSchema: _retrievedSchema,
+            retrievedSchema: computedRetrievedSchema,
             initialDefaultsGenerated: true,
             registry,
         };
@@ -286,19 +319,24 @@ export default class Form extends Component {
      * @param [retrievedSchema] - An optionally retrieved schema for per
      */
     validate(formData, schema = this.state.schema, altSchemaUtils, retrievedSchema) {
-        const schemaUtils = altSchemaUtils ? altSchemaUtils : this.state.schemaUtils;
+        const schemaUtils = altSchemaUtils || this.state.schemaUtils;
         const { customValidate, transformErrors, uiSchema } = this.props;
-        const resolvedSchema = retrievedSchema ?? schemaUtils.retrieveSchema(schema, formData);
+        // When a pre-resolved schema is provided (e.g., from live validation), use it directly.
+        // Otherwise validate against the original schema so AJV sees the full constraint set.
+        const validationSchema = retrievedSchema ?? schema;
+        // JSON.stringify drops keys with `undefined` values; JSON.parse on the result gives AJV a clean
+        // object that avoids spurious type errors for `type: "string"` fields that were cleared (#4518).
+        const validationFormData = formData ? JSON.parse(JSON.stringify(formData)) : undefined;
         return schemaUtils
             .getValidator()
-            .validateFormData(formData, resolvedSchema, customValidate, transformErrors, uiSchema);
+            .validateFormData(validationFormData, validationSchema, customValidate, transformErrors, uiSchema);
     }
     /** 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 options = getUiOptions(uiSchema);
         const ErrorListTemplate = getTemplate('ErrorListTemplate', registry, options);
-        if (errors && errors.length) {
+        if (errors?.length) {
             return (_jsx(ErrorListTemplate, { errors: errors, errorSchema: errorSchema || {}, schema: schema, uiSchema: uiSchema, registry: registry }));
         }
         return null;
@@ -311,9 +349,8 @@ export default class Form extends Component {
      * @return - The `extraErrors` and `customErrors` merged into the `schemaValidation`
      * @private
      */
-    mergeErrors(schemaValidation, extraErrors, customErrors) {
-        let errorSchema = schemaValidation.errorSchema;
-        let errors = schemaValidation.errors;
+    static mergeErrors(schemaValidation, extraErrors, customErrors) {
+        let { errorSchema, errors } = schemaValidation;
         if (extraErrors) {
             const merged = validationDataMerge(schemaValidation, extraErrors);
             errorSchema = merged.errorSchema;
@@ -342,15 +379,15 @@ export default class Form extends Component {
      */
     liveValidate(rootSchema, schemaUtils, originalErrorSchema, formData, extraErrors, customErrors, retrievedSchema, mergeIntoOriginalErrorSchema = false) {
         const schemaValidation = this.validate(formData, rootSchema, schemaUtils, retrievedSchema);
-        const errors = schemaValidation.errors;
-        let errorSchema = schemaValidation.errorSchema;
+        const { errors } = schemaValidation;
+        let { errorSchema } = schemaValidation;
         // We merge 'originalErrorSchema' with 'schemaValidation.errorSchema.'; This done to display the raised field error.
         if (mergeIntoOriginalErrorSchema) {
             errorSchema = mergeObjects(originalErrorSchema, schemaValidation.errorSchema, 'preventDuplicates');
         }
         const schemaValidationErrors = errors;
         const schemaValidationErrorSchema = errorSchema;
-        const mergedErrors = this.mergeErrors({ errorSchema, errors }, extraErrors, customErrors);
+        const mergedErrors = Form.mergeErrors({ errorSchema, errors }, extraErrors, customErrors);
         return { ...mergedErrors, schemaValidationErrors, schemaValidationErrorSchema };
     }
     /** Returns the `formData` with only the elements specified in the `fields` list
@@ -359,18 +396,16 @@ export default class Form extends Component {
      * @param fields - The fields to keep while filtering
      * @deprecated - To be removed as an exported `Form` function in a future release; there isn't a planned replacement
      */
-    getUsedFormData = (formData, fields) => {
-        return getUsedFormData(formData, fields);
-    };
+    // oxlint-disable-next-line class-methods-use-this, typescript/no-deprecated
+    getUsedFormData = (formData, fields) => getUsedFormData(formData, fields);
     /** Returns the list of field names from inspecting the `pathSchema` as well as using the `formData`
      *
      * @param pathSchema - The `PathSchema` object for the form
      * @param [formData] - The form data to use while checking for empty objects/arrays
      * @deprecated - To be removed as an exported `Form` function in a future release; there isn't a planned replacement
      */
-    getFieldNames = (pathSchema, formData) => {
-        return getFieldNames(pathSchema, formData);
-    };
+    // oxlint-disable-next-line class-methods-use-this, typescript/no-deprecated
+    getFieldNames = (pathSchema, formData) => getFieldNames(pathSchema, formData);
     /** Returns the `formData` after filtering to remove any extra data not in a form field
      *
      * @param formData - The data for the `Form`
@@ -424,19 +459,19 @@ export default class Form extends Component {
         }
         // Mark that we're processing a user-initiated change.
         // This prevents componentDidUpdate from reverting oneOf/anyOf option switches.
-        this._isProcessingUserChange = true;
+        this.isProcessingUserChange = true;
         const { newValue, path, id } = this.pendingChanges[0];
         const { newErrorSchema } = this.pendingChanges[0];
-        const { extraErrors, omitExtraData, liveOmit, noValidate, liveValidate, onChange } = this.props;
+        // oxlint-disable-next-line typescript/no-deprecated
+        const { extraErrors, omitExtraData, liveOmit, noValidate, liveValidate, onChange, disabled, readonly } = this.props;
         const { formData: oldFormData, schemaUtils, schema, fieldPathId, schemaValidationErrorSchema, errors } = this.state;
-        let { customErrors } = this.state;
+        let { customErrors, retrievedSchema } = this.state;
         // Use the un-merged AJV-only schema as the base for re-merging extraErrors. Mirrors the
         // pattern in getStateFromProps/getDerivedStateFromProps and avoids the duplication that
         // happened when state.errorSchema (already containing merged extraErrors) was passed in.
         let mergeBaseErrorSchema = schemaValidationErrorSchema;
         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);
         // When switching from null to an object option in oneOf, MultiSchemaField sends
         // an object with property names but undefined values (e.g., {types: undefined, content: undefined}).
@@ -448,13 +483,18 @@ export default class Form extends Component {
         const wasPreviouslyNull = oldFormData === null || oldFormData === undefined;
         const inputForDefaults = hasOnlyUndefinedValues && wasPreviouslyNull ? undefined : formData;
         if (isObject(formData) || Array.isArray(formData)) {
+            // Tracks if the user cleared a plain (non-oneOf/anyOf) leaf field.
+            // The key is removed twice: once before getStateFromProps so inputForDefaults
+            // reflects an empty field for conditional schema resolution, and once after so
+            // the user's clear overrides any schema default getStateFromProps re-applied (#5125)
+            // and AJV never receives { key: undefined } for type:"string" fields (#4518).
+            let plainLeafWasCleared = false;
             if (newValue === ADDITIONAL_PROPERTY_KEY_REMOVE) {
-                // For additional properties, we were given the special remove this key value, so unset it
+                // For additional properties, this key was explicitly removed, so unset it
                 _unset(formData, path);
             }
             else if (!isRootPath) {
-                // If the newValue is not on the root path, then set it into the form data
-                let unsetPath = false;
+                // Set the new value at its path in the form data.
                 let valueForPath = newValue;
                 if (newValue === undefined) {
                     const lastSegment = path[path.length - 1];
@@ -466,35 +506,42 @@ export default class Form extends Component {
                         const { field } = schemaUtils.findFieldInSchema(schema, path, oldFormData);
                         const leaf = field;
                         const isOneOfOrAnyOfLeaf = leaf && (ONE_OF_KEY in leaf || ANY_OF_KEY in leaf);
-                        // Plain leaves: omit the key instead of `{ key: undefined }`, which breaks `type: "string"` validation in
-                        // AJV after clearing a text input (https://github.com/rjsf-team/react-jsonschema-form/issues/4518).
-                        // oneOf/anyOf leaves and unresolved leaves: keep `valueForPath === newValue` (already `undefined`) so
-                        // mergeDefaults does not immediately re-apply a branch default when clearing those widgets.
+                        // oneOf/anyOf and unresolved leaves keep `undefined` so mergeDefaults doesn't
+                        // re-apply a branch default when the user clears the widget.
+                        // Plain resolved leaves use plainLeafWasCleared instead (see below).
                         if (!isOneOfOrAnyOfLeaf && leaf !== undefined) {
-                            unsetPath = true;
+                            plainLeafWasCleared = true;
                         }
                     }
                 }
-                if (unsetPath) {
-                    _unset(formData, path);
+                if (plainLeafWasCleared) {
+                    _set(formData, path, undefined);
                 }
                 else {
                     _set(formData, path, valueForPath);
                 }
             }
-            // Pass true to skip live validation in `getStateFromProps()` since we will do it a bit later
-            const newState = this.getStateFromProps(this.props, inputForDefaults, undefined, undefined, undefined, true);
+            const shouldSanitize = retrievedSchema && !isRootPath && !isObject(newValue) && !Array.isArray(newValue) && !disabled && !readonly;
+            // Skip live validation here; it runs later in this function.
+            const newState = this.getStateFromProps(this.props, inputForDefaults, undefined, undefined, undefined, true, shouldSanitize);
             formData = newState.formData;
             retrievedSchema = newState.retrievedSchema;
+            // Re-set to undefined after merging defaults so the user's clear is preserved in
+            // state (#5125 regression: without this, clearing a second field re-applies the
+            // default to previously-cleared fields). The undefined key is stripped from the
+            // formData copy passed to AJV via JSON.parse(JSON.stringify(...)) so the validator never
+            // sees { [key]: undefined } for type:"string" or patternProperties fields (#4518).
+            if (plainLeafWasCleared && formData) {
+                _set(formData, path, undefined);
+            }
         }
         const mustValidate = !noValidate && (liveValidate === true || liveValidate === 'onChange');
-        let state = { formData, schema };
+        let state = { formData, retrievedSchema };
         let newFormData = formData;
         if (omitExtraData === true && (liveOmit === true || liveOmit === 'onChange')) {
+            // oxlint-disable-next-line typescript/no-deprecated
             newFormData = this.omitExtraData(formData);
-            state = {
-                formData: newFormData,
-            };
+            state = { ...state, formData: newFormData };
         }
         if (newErrorSchema) {
             // First check to see if there is an existing validation error on this path...
@@ -517,10 +564,10 @@ export default class Form extends Component {
                     customErrors = new ErrorSchemaBuilder();
                 }
                 if (isRootPath) {
-                    const errors = _get(newErrorSchema, ERRORS_KEY);
-                    if (errors) {
+                    const pathErrors = _get(newErrorSchema, ERRORS_KEY);
+                    if (pathErrors) {
                         // only set errors when there are some
-                        customErrors.setErrors(errors);
+                        customErrors.setErrors(pathErrors);
                     }
                 }
                 else {
@@ -535,16 +582,12 @@ export default class Form extends Component {
         // 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 liveValidation = this.liveValidate(schema, schemaUtils, mergeBaseErrorSchema, newFormData, extraErrors, customErrors, retrievedSchema);
-            state = { formData: newFormData, ...liveValidation, customErrors };
+            state = { ...state, formData: newFormData, ...liveValidation, customErrors };
         }
         else if (!noValidate && newErrorSchema) {
             // Merging 'newErrorSchema' into 'errorSchema' to display the custom raised errors.
-            const mergedErrors = this.mergeErrors({ errorSchema: mergeBaseErrorSchema, errors }, extraErrors, customErrors);
-            state = {
-                formData: newFormData,
-                ...mergedErrors,
-                customErrors,
-            };
+            const mergedErrors = Form.mergeErrors({ errorSchema: mergeBaseErrorSchema, errors }, extraErrors, customErrors);
+            state = { ...state, formData: newFormData, ...mergedErrors, customErrors };
         }
         this.setState(state, () => {
             if (onChange) {
@@ -588,7 +631,7 @@ export default class Form extends Component {
             initialDefaultsGenerated: false,
             customErrors: undefined,
         };
-        this.setState(state, () => onChange && onChange(toIChangeEvent({ ...this.state, ...state })));
+        this.setState(state, () => onChange?.(toIChangeEvent({ ...this.state, ...state })));
     };
     /** Callback function to handle when a field on the form is blurred. Calls the `onBlur` callback for the `Form` if it
      * was provided. Also runs any live validation and/or live omit operations if the flags indicate they should happen
@@ -608,6 +651,7 @@ export default class Form extends Component {
             let newFormData = formData;
             let state = { formData: newFormData };
             if (omitExtraData === true && liveOmit === 'onBlur') {
+                // oxlint-disable-next-line typescript/no-deprecated
                 newFormData = this.omitExtraData(formData);
                 state = { formData: newFormData };
             }
@@ -657,9 +701,11 @@ export default class Form extends Component {
             return;
         }
         event.persist();
+        // oxlint-disable-next-line typescript/no-deprecated
         const { omitExtraData, extraErrors, noValidate, onSubmit } = this.props;
         let { formData: newFormData } = this.state;
         if (omitExtraData === true) {
+            // oxlint-disable-next-line typescript/no-deprecated
             newFormData = this.omitExtraData(newFormData);
         }
         if (noValidate || this.validateFormWithFormData(newFormData)) {
@@ -686,8 +732,9 @@ export default class Form extends Component {
      * @returns - The `GlobalFormOptions` from the props
      * @private
      */
-    getGlobalFormOptions(props) {
+    static getGlobalFormOptions(props) {
         const { uiSchema = {}, experimental_componentUpdateStrategy, idSeparator = DEFAULT_ID_SEPARATOR, idPrefix = DEFAULT_ID_PREFIX, nameGenerator, useFallbackUiForUnsupportedType = false, } = props;
+        // oxlint-disable-next-line typescript/no-deprecated
         const rootFieldId = uiSchema['ui:rootFieldId'];
         // Omit any options that are undefined or null
         return {
@@ -699,7 +746,7 @@ export default class Form extends Component {
         };
     }
     /** Computed the registry for the form using the given `props`, `schema` and `schemaUtils` */
-    getRegistry(props, schema, schemaUtils) {
+    static getRegistry(props, schema, schemaUtils) {
         const { translateString: customTranslateString, uiSchema = {} } = props;
         const { fields, templates, widgets, formContext, translateString } = getDefaultRegistry();
         return {
@@ -718,7 +765,7 @@ export default class Form extends Component {
             schemaUtils,
             translateString: customTranslateString || translateString,
             globalUiOptions: uiSchema[UI_GLOBAL_OPTIONS_KEY],
-            globalFormOptions: this.getGlobalFormOptions(props),
+            globalFormOptions: Form.getGlobalFormOptions(props),
             uiSchemaDefinitions: uiSchema[UI_DEFINITIONS_KEY] ?? {},
         };
     }
@@ -758,8 +805,9 @@ export default class Form extends Component {
             // some themes (e.g. shadcn) use button elements instead of native inputs for radio groups
             field = this.formElement.current.querySelector(`input[id^="${elementId}"], button[id^="${elementId}"]`);
         }
-        if (field && field.length) {
+        if (field?.length) {
             // If we got a list with length > 0
+            // oxlint-disable-next-line prefer-destructuring
             field = field[0];
         }
         if (field) {
@@ -777,7 +825,7 @@ export default class Form extends Component {
         const { errors: prevErrors } = this.state;
         const schemaValidation = this.validate(formData);
         // Always merge extraErrors so they remain visible in state regardless of extraErrorsBlockSubmit.
-        const { errors, errorSchema } = extraErrors ? this.mergeErrors(schemaValidation, extraErrors) : schemaValidation;
+        const { errors, errorSchema } = extraErrors ? Form.mergeErrors(schemaValidation, extraErrors) : schemaValidation;
         // hasError gates submission: schema errors always block; extraErrors only block when
         // extraErrorsBlockSubmit is set (non-breaking default: extraErrors are informational only).
         const hasError = schemaValidation.errors.length > 0 || (extraErrors && extraErrorsBlockSubmit);
@@ -800,6 +848,7 @@ export default class Form extends Component {
                     onError(errors);
                 }
                 else {
+                    // oxlint-disable-next-line no-console
                     console.error('Form validation failed', errors);
                 }
             });
@@ -833,6 +882,7 @@ export default class Form extends Component {
         const { omitExtraData } = this.props;
         let { formData: newFormData } = this.state;
         if (omitExtraData === true) {
+            // oxlint-disable-next-line typescript/no-deprecated
             newFormData = this.omitExtraData(newFormData);
         }
         return this.validateFormWithFormData(newFormData);
@@ -843,7 +893,7 @@ export default class Form extends Component {
     render() {
         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, registry } = this.state;
-        const { SchemaField: _SchemaField } = registry.fields;
+        const { SchemaField: SchemaFieldComponent } = registry.fields;
         const { SubmitButton } = registry.templates.ButtonTemplates;
         // The `semantic-ui` and `material-ui` themes have `_internalFormWrapper`s that take an `as` prop that is the
         // PropTypes.elementType to use for the inner tag, so we'll need to pass `tagName` along if it is provided.
@@ -855,6 +905,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, 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)] }));
+        return (_jsxs(FormTag, { 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(SchemaFieldComponent, { 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 || _jsx(SubmitButton, { uiSchema: submitUiSchema, registry: registry }), showErrorList === 'bottom' && this.renderErrors(registry)] }));
     }
 }

package/lib/components/RichDescription.d.ts

@@ -1,5 +1,5 @@
-import { ReactElement } from 'react';
-import { FormContextType, Registry, RJSFSchema, StrictRJSFSchema, UiSchema } from '@rjsf/utils';
+import type { ReactElement } from 'react';
+import type { FormContextType, Registry, RJSFSchema, StrictRJSFSchema, UiSchema } from '@rjsf/utils';
 export interface RichDescriptionProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> {
     /** The description text for a field, potentially containing markdown */
     description: string | ReactElement;
@@ -12,7 +12,7 @@ export interface RichDescriptionProps<T = any, S extends StrictRJSFSchema = RJSF
  *
  * @param props - The `RichDescriptionProps` for this component
  */
-declare function RichDescription<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>({ description, registry, uiSchema }: RichDescriptionProps<T, S, F>): string | import("react/jsx-runtime").JSX.Element;
+declare function RichDescription<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>({ description, registry, uiSchema }: RichDescriptionProps<T, S, F>): string | import("react").JSX.Element;
 declare namespace RichDescription {
     var TEST_IDS: import("@rjsf/utils").TestIdShape;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"RichDescription.d.ts","sourceRoot":"","sources":["../../src/components/RichDescription.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AACrC,OAAO,EACL,eAAe,EACf,QAAQ,EACR,UAAU,EACV,gBAAgB,EAChB,QAAQ,EAGT,MAAM,aAAa,CAAC;AAKrB,MAAM,WAAW,oBAAoB,CACnC,CAAC,GAAG,GAAG,EACP,CAAC,SAAS,gBAAgB,GAAG,UAAU,EACvC,CAAC,SAAS,eAAe,GAAG,GAAG;IAE/B,wEAAwE;IACxE,WAAW,EAAE,MAAM,GAAG,YAAY,CAAC;IACnC,kDAAkD;IAClD,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7B,4BAA4B;IAC5B,QAAQ,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;CAC7B;AAED;;;GAGG;AACH,iBAAwB,eAAe,CACrC,CAAC,GAAG,GAAG,EACP,CAAC,SAAS,gBAAgB,GAAG,UAAU,EACvC,CAAC,SAAS,eAAe,GAAG,GAAG,EAC/B,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAa,EAAE,EAAE,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,oDAYxE;kBAhBuB,eAAe;;;eAAf,eAAe"}
+{"version":3,"file":"RichDescription.d.ts","sourceRoot":"","sources":["../../src/components/RichDescription.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,KAAK,EAAE,eAAe,EAAE,QAAQ,EAAE,UAAU,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAMrG,MAAM,WAAW,oBAAoB,CACnC,CAAC,GAAG,GAAG,EACP,CAAC,SAAS,gBAAgB,GAAG,UAAU,EACvC,CAAC,SAAS,eAAe,GAAG,GAAG;IAE/B,wEAAwE;IACxE,WAAW,EAAE,MAAM,GAAG,YAAY,CAAC;IACnC,kDAAkD;IAClD,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7B,4BAA4B;IAC5B,QAAQ,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;CAC7B;AAED;;;GAGG;AACH,iBAAwB,eAAe,CACrC,CAAC,GAAG,GAAG,EACP,CAAC,SAAS,gBAAgB,GAAG,UAAU,EACvC,CAAC,SAAS,eAAe,GAAG,GAAG,EAC/B,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAa,EAAE,EAAE,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,wCAYxE;kBAhBuB,eAAe;;;eAAf,eAAe"}

package/lib/components/RichDescription.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { getTestIds, getUiOptions, } from '@rjsf/utils';
+import { getTestIds, getUiOptions } from '@rjsf/utils';
 import { Markdown } from 'markdown-to-jsx/react';
 const TEST_IDS = getTestIds();
 /** Renders the given `description` in the props as

package/lib/components/RichHelp.d.ts

@@ -1,5 +1,5 @@
-import { ReactElement } from 'react';
-import { FormContextType, Registry, RJSFSchema, StrictRJSFSchema, UiSchema } from '@rjsf/utils';
+import type { ReactElement } from 'react';
+import type { FormContextType, Registry, RJSFSchema, StrictRJSFSchema, UiSchema } from '@rjsf/utils';
 export interface RichHelpProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> {
     /** The description text for a field, potentially containing markdown */
     help: string | ReactElement;
@@ -12,7 +12,7 @@ export interface RichHelpProps<T = any, S extends StrictRJSFSchema = RJSFSchema,
  *
  * @param props - The `RichHelpProps` for this component
  */
-declare function RichHelp<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>({ help, registry, uiSchema, }: RichHelpProps<T, S, F>): string | import("react/jsx-runtime").JSX.Element;
+declare function RichHelp<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>({ help, registry, uiSchema, }: RichHelpProps<T, S, F>): string | import("react").JSX.Element;
 declare namespace RichHelp {
     var TEST_IDS: import("@rjsf/utils").TestIdShape;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"RichHelp.d.ts","sourceRoot":"","sources":["../../src/components/RichHelp.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AACrC,OAAO,EACL,eAAe,EACf,QAAQ,EACR,UAAU,EACV,gBAAgB,EAChB,QAAQ,EAGT,MAAM,aAAa,CAAC;AAKrB,MAAM,WAAW,aAAa,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,SAAS,gBAAgB,GAAG,UAAU,EAAE,CAAC,SAAS,eAAe,GAAG,GAAG;IAC9G,wEAAwE;IACxE,IAAI,EAAE,MAAM,GAAG,YAAY,CAAC;IAC5B,kDAAkD;IAClD,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7B,4BAA4B;IAC5B,QAAQ,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;CAC7B;AAED;;;GAGG;AACH,iBAAwB,QAAQ,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,SAAS,gBAAgB,GAAG,UAAU,EAAE,CAAC,SAAS,eAAe,GAAG,GAAG,EAAE,EAClH,IAAI,EACJ,QAAQ,EACR,QAAa,GACd,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,oDAYxB;kBAhBuB,QAAQ;;;eAAR,QAAQ"}
+{"version":3,"file":"RichHelp.d.ts","sourceRoot":"","sources":["../../src/components/RichHelp.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,KAAK,EAAE,eAAe,EAAE,QAAQ,EAAE,UAAU,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAMrG,MAAM,WAAW,aAAa,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,SAAS,gBAAgB,GAAG,UAAU,EAAE,CAAC,SAAS,eAAe,GAAG,GAAG;IAC9G,wEAAwE;IACxE,IAAI,EAAE,MAAM,GAAG,YAAY,CAAC;IAC5B,kDAAkD;IAClD,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7B,4BAA4B;IAC5B,QAAQ,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;CAC7B;AAED;;;GAGG;AACH,iBAAwB,QAAQ,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,SAAS,gBAAgB,GAAG,UAAU,EAAE,CAAC,SAAS,eAAe,GAAG,GAAG,EAAE,EAClH,IAAI,EACJ,QAAQ,EACR,QAAa,GACd,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,wCAYxB;kBAhBuB,QAAQ;;;eAAR,QAAQ"}

package/lib/components/RichHelp.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { getTestIds, getUiOptions, } from '@rjsf/utils';
+import { getTestIds, getUiOptions } from '@rjsf/utils';
 import { Markdown } from 'markdown-to-jsx/react';
 const TEST_IDS = getTestIds();
 /** Renders the given `description` in the props as

package/lib/components/SchemaExamples.d.ts

@@ -1,4 +1,4 @@
-import { RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
+import type { RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
 export interface SchemaExamplesProps<S extends StrictRJSFSchema = RJSFSchema> {
     /** The id of the input element this datalist is for */
     id: string;
@@ -12,5 +12,5 @@ export interface SchemaExamplesProps<S extends StrictRJSFSchema = RJSFSchema> {
  *
  * @param props - The `SchemaExamplesProps` for this component
  */
-export default function SchemaExamples<S extends StrictRJSFSchema = RJSFSchema>(props: SchemaExamplesProps<S>): import("react/jsx-runtime").JSX.Element | null;
+export default function SchemaExamples<S extends StrictRJSFSchema = RJSFSchema>(props: SchemaExamplesProps<S>): import("react").JSX.Element | null;
 //# sourceMappingURL=SchemaExamples.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"SchemaExamples.d.ts","sourceRoot":"","sources":["../../src/components/SchemaExamples.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAc,UAAU,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEvE,MAAM,WAAW,mBAAmB,CAAC,CAAC,SAAS,gBAAgB,GAAG,UAAU;IAC1E,uDAAuD;IACvD,EAAE,EAAE,MAAM,CAAC;IACX,mEAAmE;IACnE,MAAM,EAAE,CAAC,CAAC;CACX;AAED;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,CAAC,SAAS,gBAAgB,GAAG,UAAU,EAAE,KAAK,EAAE,mBAAmB,CAAC,CAAC,CAAC,kDAmB5G"}
+{"version":3,"file":"SchemaExamples.d.ts","sourceRoot":"","sources":["../../src/components/SchemaExamples.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAGhE,MAAM,WAAW,mBAAmB,CAAC,CAAC,SAAS,gBAAgB,GAAG,UAAU;IAC1E,uDAAuD;IACvD,EAAE,EAAE,MAAM,CAAC;IACX,mEAAmE;IACnE,MAAM,EAAE,CAAC,CAAC;CACX;AAED;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,CAAC,SAAS,gBAAgB,GAAG,UAAU,EAAE,KAAK,EAAE,mBAAmB,CAAC,CAAC,CAAC,sCAoB5G"}

package/lib/components/SchemaExamples.js

@@ -17,7 +17,5 @@ export default function SchemaExamples(props) {
             .concat(schemaDefault !== undefined && !examples.map(String).includes(String(schemaDefault))
             ? [schemaDefault]
             : [])
-            .map((example) => {
-            return _jsx("option", { value: example }, String(example));
-        }) }, `datalist_${id}`));
+            .map((example) => (_jsx("option", { value: example }, String(example)))) }, `datalist_${id}`));
 }

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

@@ -1,6 +1,6 @@
-import { FieldProps, FormContextType, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
+import type { FieldProps, FormContextType, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
 /** The `ArrayField` component is used to render a field in the schema that is of type `array`. It supports both normal
  * and fixed array, allowing user to add and remove elements from the array data.
  */
-export default function ArrayField<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>(props: FieldProps<T[], S, F>): import("react/jsx-runtime").JSX.Element;
+export default function ArrayField<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>(props: FieldProps<T[], S, F>): import("react").JSX.Element;
 //# sourceMappingURL=ArrayField.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ArrayField.d.ts","sourceRoot":"","sources":["../../../src/components/fields/ArrayField.tsx"],"names":[],"mappings":"AACA,OAAO,EAmBL,UAAU,EACV,eAAe,EAEf,UAAU,EACV,gBAAgB,EAIjB,MAAM,aAAa,CAAC;AA4zBrB;;GAEG;AACH,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,SAAS,gBAAgB,GAAG,UAAU,EAAE,CAAC,SAAS,eAAe,GAAG,GAAG,EAClH,KAAK,EAAE,UAAU,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,2CAoP7B"}
+{"version":3,"file":"ArrayField.d.ts","sourceRoot":"","sources":["../../../src/components/fields/ArrayField.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAKV,UAAU,EACV,eAAe,EAEf,UAAU,EACV,gBAAgB,EAGjB,MAAM,aAAa,CAAC;AAs1BrB;;GAEG;AACH,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,SAAS,gBAAgB,GAAG,UAAU,EAAE,CAAC,SAAS,eAAe,GAAG,GAAG,EAClH,KAAK,EAAE,UAAU,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,+BAsP7B"}