@rjsf/core 6.5.2 → 6.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rjsf/core",
-  "version": "6.5.2",
+  "version": "6.5.3",
   "description": "A simple React component capable of building HTML forms out of a JSON schema.",
   "scripts": {
     "compileReplacer": "tsc -p tsconfig.replacer.json && move-file lodashReplacer.js lodashReplacer.cjs",
@@ -76,9 +76,9 @@
     "prop-types": "^15.8.1"
   },
   "devDependencies": {
-    "@rjsf/snapshot-tests": "6.5.2",
-    "@rjsf/utils": "6.5.2",
-    "@rjsf/validator-ajv8": "6.5.2",
+    "@rjsf/snapshot-tests": "6.5.3",
+    "@rjsf/utils": "6.5.3",
+    "@rjsf/validator-ajv8": "6.5.3",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.2",
     "@testing-library/user-event": "^14.6.1",

package/src/components/Form.tsx

@@ -45,6 +45,8 @@ import {
   NameGeneratorFunction,
   getUsedFormData,
   getFieldNames,
+  ANY_OF_KEY,
+  ONE_OF_KEY,
 } from '@rjsf/utils';
 import _cloneDeep from 'lodash/cloneDeep';
 import _get from 'lodash/get';
@@ -924,7 +926,33 @@ export default class Form<
         _unset(formData, path);
       } else if (!isRootPath) {
         // If the newValue is not on the root path, then set it into the form data
-        _set(formData, path, newValue);
+        let unsetPath = false;
+        let valueForPath: T | null | undefined = newValue;
+
+        if (newValue === undefined) {
+          const lastSegment = path[path.length - 1];
+          if (typeof lastSegment === 'number') {
+            // Array items: match ArrayField `handleChange` — AJV needs `null`, not undefined.
+            valueForPath = null as unknown as T;
+          } else {
+            const { field } = schemaUtils.findFieldInSchema(schema, path, oldFormData);
+            const leaf = field as RJSFSchema | undefined;
+            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.
+            if (!isOneOfOrAnyOfLeaf && leaf !== undefined) {
+              unsetPath = true;
+            }
+          }
+        }
+
+        if (unsetPath) {
+          _unset(formData, path);
+        } 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);

package/src/components/fields/SchemaField.tsx

@@ -23,6 +23,7 @@ import {
   shouldRenderOptionalField,
   StrictRJSFSchema,
   toFieldPathId,
+  TranslatableString,
   UI_OPTIONS_KEY,
   UIOptionsType,
 } from '@rjsf/utils';
@@ -133,7 +134,11 @@ function SchemaFieldRender<T = any, S extends StrictRJSFSchema = RJSFSchema, F e
   );
 
   const FieldComponent = getFieldComponent<T, S, F>(schema, uiOptions, registry);
-  const disabled = Boolean(uiOptions.disabled ?? props.disabled);
+
+  const isDeprecated = Boolean(schema.deprecated);
+  const deprecatedHandling = isDeprecated ? (uiOptions.deprecatedHandling ?? 'label') : undefined;
+
+  const disabled = Boolean(uiOptions.disabled ?? props.disabled) || deprecatedHandling === 'disable';
   const readonly = Boolean(uiOptions.readonly ?? (props.readonly || props.schema.readOnly || schema.readOnly));
   const uiSchemaHideError = uiOptions.hideError;
   // Set hideError to the value provided in the uiSchema, otherwise stick with the prop to propagate to children
@@ -214,9 +219,13 @@ function SchemaFieldRender<T = any, S extends StrictRJSFSchema = RJSFSchema, F e
         : uiOptions.title || props.schema.title || schema.title || props.title || name;
   }
 
+  if (deprecatedHandling === 'label') {
+    label = registry.translateString(TranslatableString.DeprecatedLabel, [label]);
+  }
+
   const description = uiOptions.description || props.schema.description || schema.description || '';
   const help = uiOptions.help;
-  const hidden = uiOptions.widget === 'hidden';
+  const hidden = uiOptions.widget === 'hidden' || deprecatedHandling === 'hide';
 
   const classNames = ['rjsf-field', `rjsf-field-${getSchemaType(schema)}`];
   if (!hideError && __errors && __errors.length > 0) {