@rjsf/core 6.5.1 → 6.5.3

package/dist/core.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('react'), require('@rjsf/utils'), require('lodash/cloneDeep'), require('lodash/get'), require('lodash/isEmpty'), require('lodash/pick'), require('lodash/set'), require('lodash/toPath'), require('lodash/unset'), require('lodash/isObject'), require('lodash/uniqueId'), require('react/jsx-runtime'), require('lodash/each'), require('lodash/flatten'), require('lodash/has'), require('lodash/includes'), require('lodash/intersection'), require('lodash/isFunction'), require('lodash/isEqual'), require('lodash/isPlainObject'), require('lodash/isString'), require('lodash/isUndefined'), require('lodash/last'), require('lodash/noop'), require('lodash/omit'), require('markdown-to-jsx'), require('@rjsf/validator-ajv8')) :
   typeof define === 'function' && define.amd ? define(['exports', 'react', '@rjsf/utils', 'lodash/cloneDeep', 'lodash/get', 'lodash/isEmpty', 'lodash/pick', 'lodash/set', 'lodash/toPath', 'lodash/unset', 'lodash/isObject', 'lodash/uniqueId', 'react/jsx-runtime', 'lodash/each', 'lodash/flatten', 'lodash/has', 'lodash/includes', 'lodash/intersection', 'lodash/isFunction', 'lodash/isEqual', 'lodash/isPlainObject', 'lodash/isString', 'lodash/isUndefined', 'lodash/last', 'lodash/noop', 'lodash/omit', 'markdown-to-jsx', '@rjsf/validator-ajv8'], factory) :
-  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.JSONSchemaForm = {}, global.react, global.utils, global.cloneDeep, global.get, global.isEmpty, global._pick, global.set, global._toPath, global._unset, global.isObject, global.uniqueId, global.jsxRuntime, global.each, global.flatten, global.has, global.includes, global.intersection, global.isFunction, global.isEqual, global.isPlainObject, global.isString, global.isUndefined, global.last, global.noop, global.omit3, global.Markdown, global.validator));
-})(this, (function (exports, react, utils, cloneDeep, get, isEmpty, _pick, set, _toPath, _unset, isObject, uniqueId, jsxRuntime, each, flatten, has, includes, intersection, isFunction, isEqual, isPlainObject, isString, isUndefined, last, noop, omit3, Markdown, validator) { 'use strict';
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.JSONSchemaForm = {}, global.react, global.utils, global._cloneDeep, global.get, global.isEmpty, global._pick, global.set, global._toPath, global._unset, global.isObject, global.uniqueId, global.jsxRuntime, global.each, global.flatten, global.has, global.includes, global.intersection, global.isFunction, global.isEqual, global.isPlainObject, global.isString, global.isUndefined, global.last, global.noop, global.omit3, global.Markdown, global.validator));
+})(this, (function (exports, react, utils, _cloneDeep, get, isEmpty, _pick, set, _toPath, _unset, isObject, uniqueId, jsxRuntime, each, flatten, has, includes, intersection, isFunction, isEqual, isPlainObject, isString, isUndefined, last, noop, omit3, Markdown, validator) { 'use strict';
 
   // src/components/Form.tsx
   function generateRowId() {
@@ -655,7 +655,7 @@
         }
         const newKeyedFormDataRow = {
           key: generateRowId(),
-          item: cloneDeep(keyedFormData[index].item)
+          item: _cloneDeep(keyedFormData[index].item)
         };
         const newKeyedFormData = [...keyedFormData];
         if (index !== void 0) {
@@ -722,10 +722,12 @@
     );
     const handleChange = react.useCallback(
       (value, path, newErrorSchema, id) => {
+        const lastPathIsItemIndex = typeof path.at(-1) === "number";
         onChange(
           // We need to treat undefined items as nulls to have validation.
           // See https://github.com/tdegrunt/jsonschema/issues/206
-          value === void 0 ? null : value,
+          // Only set to null for array items, and not for object properties within array items
+          lastPathIsItemIndex && value === void 0 ? null : value,
           path,
           newErrorSchema,
           id
@@ -2149,7 +2151,9 @@
       [fieldId, onChange]
     );
     const FieldComponent = getFieldComponent(schema, uiOptions, registry);
-    const disabled = Boolean(uiOptions.disabled ?? props.disabled);
+    const isDeprecated = Boolean(schema.deprecated);
+    const deprecatedHandling = isDeprecated ? uiOptions.deprecatedHandling ?? "label" : void 0;
+    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;
     const hideError = uiSchemaHideError === void 0 ? props.hideError : Boolean(uiSchemaHideError);
@@ -2212,9 +2216,12 @@
     } else {
       label = utils.ADDITIONAL_PROPERTY_FLAG in schema ? name : uiOptions.title || props.schema.title || schema.title || props.title || name;
     }
+    if (deprecatedHandling === "label") {
+      label = registry.translateString(utils.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-${utils.getSchemaType(schema)}`];
     if (!hideError && __errors && __errors.length > 0) {
       classNames.push("rjsf-field-error");
@@ -4217,11 +4224,12 @@
       const { newErrorSchema } = this.pendingChanges[0];
       const { extraErrors, omitExtraData, liveOmit, noValidate, liveValidate, onChange, removeEmptyOptionalObjects } = this.props;
       const { formData: oldFormData, schemaUtils, schema, fieldPathId, schemaValidationErrorSchema, errors } = this.state;
-      let { customErrors, errorSchema: originalErrorSchema } = this.state;
+      let { customErrors } = this.state;
+      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);
+      let formData = isRootPath ? newValue : _cloneDeep(oldFormData);
       const hasOnlyUndefinedValues = utils.isObject(formData) && Object.keys(formData).length > 0 && Object.values(formData).every((v) => v === void 0);
       const wasPreviouslyNull = oldFormData === null || oldFormData === void 0;
       const inputForDefaults = hasOnlyUndefinedValues && wasPreviouslyNull ? void 0 : formData;
@@ -4229,7 +4237,26 @@
         if (newValue === ADDITIONAL_PROPERTY_KEY_REMOVE) {
           _unset(formData, path);
         } else if (!isRootPath) {
-          set(formData, path, newValue);
+          let unsetPath = false;
+          let valueForPath = newValue;
+          if (newValue === void 0) {
+            const lastSegment = path[path.length - 1];
+            if (typeof lastSegment === "number") {
+              valueForPath = null;
+            } else {
+              const { field } = schemaUtils.findFieldInSchema(schema, path, oldFormData);
+              const leaf = field;
+              const isOneOfOrAnyOfLeaf = leaf && (utils.ONE_OF_KEY in leaf || utils.ANY_OF_KEY in leaf);
+              if (!isOneOfOrAnyOfLeaf && leaf !== void 0) {
+                unsetPath = true;
+              }
+            }
+          }
+          if (unsetPath) {
+            _unset(formData, path);
+          } else {
+            set(formData, path, valueForPath);
+          }
         }
         const newState = this.getStateFromProps(this.props, inputForDefaults, void 0, void 0, void 0, true);
         formData = newState.formData;
@@ -4260,9 +4287,10 @@
         const oldValidationError = !isRootPath ? get(schemaValidationErrorSchema, path) : schemaValidationErrorSchema;
         if (!isEmpty(oldValidationError)) {
           if (!isRootPath) {
-            set(originalErrorSchema, path, newErrorSchema);
+            mergeBaseErrorSchema = _cloneDeep(schemaValidationErrorSchema);
+            set(mergeBaseErrorSchema, path, newErrorSchema);
           } else {
-            originalErrorSchema = newErrorSchema;
+            mergeBaseErrorSchema = newErrorSchema;
           }
         } else {
           if (!customErrors) {
@@ -4284,7 +4312,7 @@
         const liveValidation = this.liveValidate(
           schema,
           schemaUtils,
-          originalErrorSchema,
+          mergeBaseErrorSchema,
           newFormData,
           extraErrors,
           customErrors,
@@ -4292,7 +4320,7 @@
         );
         state = { formData: newFormData, ...liveValidation, customErrors };
       } else if (!noValidate && newErrorSchema) {
-        const mergedErrors = this.mergeErrors({ errorSchema: originalErrorSchema, errors }, extraErrors, customErrors);
+        const mergedErrors = this.mergeErrors({ errorSchema: mergeBaseErrorSchema, errors }, extraErrors, customErrors);
         state = {
           formData: newFormData,
           ...mergedErrors,

package/dist/index.cjs

@@ -779,10 +779,12 @@ function ArrayField(props) {
   );
   const handleChange = (0, import_react.useCallback)(
     (value, path, newErrorSchema, id) => {
+      const lastPathIsItemIndex = typeof path.at(-1) === "number";
       onChange(
         // We need to treat undefined items as nulls to have validation.
         // See https://github.com/tdegrunt/jsonschema/issues/206
-        value === void 0 ? null : value,
+        // Only set to null for array items, and not for object properties within array items
+        lastPathIsItemIndex && value === void 0 ? null : value,
         path,
         newErrorSchema,
         id
@@ -2289,7 +2291,9 @@ function SchemaFieldRender(props) {
     [fieldId, onChange]
   );
   const FieldComponent = getFieldComponent(schema, uiOptions, registry);
-  const disabled = Boolean(uiOptions.disabled ?? props.disabled);
+  const isDeprecated = Boolean(schema.deprecated);
+  const deprecatedHandling = isDeprecated ? uiOptions.deprecatedHandling ?? "label" : void 0;
+  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;
   const hideError = uiSchemaHideError === void 0 ? props.hideError : Boolean(uiSchemaHideError);
@@ -2352,9 +2356,12 @@ function SchemaFieldRender(props) {
   } else {
     label = import_utils11.ADDITIONAL_PROPERTY_FLAG in schema ? name : uiOptions.title || props.schema.title || schema.title || props.title || name;
   }
+  if (deprecatedHandling === "label") {
+    label = registry.translateString(import_utils11.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-${(0, import_utils11.getSchemaType)(schema)}`];
   if (!hideError && __errors && __errors.length > 0) {
     classNames.push("rjsf-field-error");
@@ -4563,7 +4570,8 @@ var Form = class extends import_react21.Component {
     const { newErrorSchema } = this.pendingChanges[0];
     const { extraErrors, omitExtraData, liveOmit, noValidate, liveValidate, onChange, removeEmptyOptionalObjects } = this.props;
     const { formData: oldFormData, schemaUtils, schema, fieldPathId, schemaValidationErrorSchema, errors } = this.state;
-    let { customErrors, errorSchema: originalErrorSchema } = this.state;
+    let { customErrors } = this.state;
+    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;
@@ -4575,7 +4583,26 @@ var Form = class extends import_react21.Component {
       if (newValue === ADDITIONAL_PROPERTY_KEY_REMOVE) {
         (0, import_unset.default)(formData, path);
       } else if (!isRootPath) {
-        (0, import_set5.default)(formData, path, newValue);
+        let unsetPath = false;
+        let valueForPath = newValue;
+        if (newValue === void 0) {
+          const lastSegment = path[path.length - 1];
+          if (typeof lastSegment === "number") {
+            valueForPath = null;
+          } else {
+            const { field } = schemaUtils.findFieldInSchema(schema, path, oldFormData);
+            const leaf = field;
+            const isOneOfOrAnyOfLeaf = leaf && (import_utils50.ONE_OF_KEY in leaf || import_utils50.ANY_OF_KEY in leaf);
+            if (!isOneOfOrAnyOfLeaf && leaf !== void 0) {
+              unsetPath = true;
+            }
+          }
+        }
+        if (unsetPath) {
+          (0, import_unset.default)(formData, path);
+        } else {
+          (0, import_set5.default)(formData, path, valueForPath);
+        }
       }
       const newState = this.getStateFromProps(this.props, inputForDefaults, void 0, void 0, void 0, true);
       formData = newState.formData;
@@ -4606,9 +4633,10 @@ var Form = class extends import_react21.Component {
       const oldValidationError = !isRootPath ? (0, import_get5.default)(schemaValidationErrorSchema, path) : schemaValidationErrorSchema;
       if (!(0, import_isEmpty4.default)(oldValidationError)) {
         if (!isRootPath) {
-          (0, import_set5.default)(originalErrorSchema, path, newErrorSchema);
+          mergeBaseErrorSchema = (0, import_cloneDeep2.default)(schemaValidationErrorSchema);
+          (0, import_set5.default)(mergeBaseErrorSchema, path, newErrorSchema);
         } else {
-          originalErrorSchema = newErrorSchema;
+          mergeBaseErrorSchema = newErrorSchema;
         }
       } else {
         if (!customErrors) {
@@ -4630,7 +4658,7 @@ var Form = class extends import_react21.Component {
       const liveValidation = this.liveValidate(
         schema,
         schemaUtils,
-        originalErrorSchema,
+        mergeBaseErrorSchema,
         newFormData,
         extraErrors,
         customErrors,
@@ -4638,7 +4666,7 @@ var Form = class extends import_react21.Component {
       );
       state = { formData: newFormData, ...liveValidation, customErrors };
     } else if (!noValidate && newErrorSchema) {
-      const mergedErrors = this.mergeErrors({ errorSchema: originalErrorSchema, errors }, extraErrors, customErrors);
+      const mergedErrors = this.mergeErrors({ errorSchema: mergeBaseErrorSchema, errors }, extraErrors, customErrors);
       state = {
         formData: newFormData,
         ...mergedErrors,