@rjsf/core 6.0.0 → 6.0.2

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/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('lodash/unset'), 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/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', 'lodash/unset', '@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.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.unset, global.validator));
-})(this, (function (exports, react, utils, cloneDeep, get, isEmpty, _pick, set, _toPath, isObject, uniqueId, jsxRuntime, each, flatten, has, includes, intersection, isFunction, isEqual, isPlainObject, isString, isUndefined, last, noop, omit3, Markdown, unset, validator) { 'use strict';
+  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';
 
   // src/components/Form.tsx
   function generateRowId() {
@@ -53,9 +53,11 @@
     }
   }
   function getNewFormDataRow(registry, schema) {
-    const { schemaUtils } = registry;
+    const { schemaUtils, globalFormOptions } = registry;
     let itemSchema = schema.items;
-    if (utils.isFixedItems(schema) && utils.allowAdditionalItems(schema)) {
+    if (globalFormOptions.useFallbackUiForUnsupportedType && !itemSchema) {
+      itemSchema = {};
+    } else if (utils.isFixedItems(schema) && utils.allowAdditionalItems(schema)) {
       itemSchema = schema.additionalItems;
     }
     return schemaUtils.getDefaultFormState(itemSchema);
@@ -590,7 +592,7 @@
   }
   function ArrayField(props) {
     const { schema, uiSchema, errorSchema, fieldPathId, registry, formData, onChange } = props;
-    const { schemaUtils, translateString } = registry;
+    const { globalFormOptions, schemaUtils, translateString } = registry;
     const { keyedFormData, updateKeyedFormData } = useKeyedFormData(formData);
     const childFieldPathId = props.childFieldPathId ?? fieldPathId;
     const handleAddItem = react.useCallback(
@@ -727,24 +729,14 @@
       },
       [onChange, childFieldPathId]
     );
-    if (!(utils.ITEMS_KEY in schema)) {
-      const uiOptions = utils.getUiOptions(uiSchema);
-      const UnsupportedFieldTemplate = utils.getTemplate(
-        "UnsupportedFieldTemplate",
-        registry,
-        uiOptions
-      );
-      return /* @__PURE__ */ jsxRuntime.jsx(
-        UnsupportedFieldTemplate,
-        {
-          schema,
-          fieldPathId,
-          reason: translateString(utils.TranslatableString.MissingItems),
-          registry
-        }
-      );
-    }
+    const arrayAsMultiProps = {
+      ...props,
+      formData,
+      fieldPathId: childFieldPathId,
+      onSelectChange
+    };
     const arrayProps = {
+      ...props,
       handleAddItem,
       handleCopyItem,
       handleRemoveItem,
@@ -752,19 +744,41 @@
       keyedFormData,
       onChange: handleChange
     };
-    if (schemaUtils.isMultiSelect(schema)) {
-      return /* @__PURE__ */ jsxRuntime.jsx(ArrayAsMultiSelect, { ...props, fieldPathId: childFieldPathId, onSelectChange });
+    if (!(utils.ITEMS_KEY in schema)) {
+      if (!globalFormOptions.useFallbackUiForUnsupportedType) {
+        const uiOptions = utils.getUiOptions(uiSchema);
+        const UnsupportedFieldTemplate = utils.getTemplate(
+          "UnsupportedFieldTemplate",
+          registry,
+          uiOptions
+        );
+        return /* @__PURE__ */ jsxRuntime.jsx(
+          UnsupportedFieldTemplate,
+          {
+            schema,
+            fieldPathId,
+            reason: translateString(utils.TranslatableString.MissingItems),
+            registry
+          }
+        );
+      }
+      const fallbackSchema = { ...schema, [utils.ITEMS_KEY]: { type: void 0 } };
+      arrayAsMultiProps.schema = fallbackSchema;
+      arrayProps.schema = fallbackSchema;
+    }
+    if (schemaUtils.isMultiSelect(arrayAsMultiProps.schema)) {
+      return /* @__PURE__ */ jsxRuntime.jsx(ArrayAsMultiSelect, { ...arrayAsMultiProps });
     }
     if (utils.isCustomWidget(uiSchema)) {
-      return /* @__PURE__ */ jsxRuntime.jsx(ArrayAsCustomWidget, { ...props, fieldPathId: childFieldPathId, onSelectChange });
+      return /* @__PURE__ */ jsxRuntime.jsx(ArrayAsCustomWidget, { ...arrayAsMultiProps });
     }
-    if (utils.isFixedItems(schema)) {
-      return /* @__PURE__ */ jsxRuntime.jsx(FixedArray, { ...props, ...arrayProps });
+    if (utils.isFixedItems(arrayAsMultiProps.schema)) {
+      return /* @__PURE__ */ jsxRuntime.jsx(FixedArray, { ...arrayProps });
     }
-    if (schemaUtils.isFilesArray(schema, uiSchema)) {
-      return /* @__PURE__ */ jsxRuntime.jsx(ArrayAsFiles, { ...props, fieldPathId: childFieldPathId, onSelectChange });
+    if (schemaUtils.isFilesArray(arrayAsMultiProps.schema, uiSchema)) {
+      return /* @__PURE__ */ jsxRuntime.jsx(ArrayAsFiles, { ...arrayAsMultiProps });
     }
-    return /* @__PURE__ */ jsxRuntime.jsx(NormalArray, { ...props, ...arrayProps });
+    return /* @__PURE__ */ jsxRuntime.jsx(NormalArray, { ...arrayProps });
   }
   function BooleanField(props) {
     const {
@@ -868,7 +882,7 @@
   function getFallbackTypeSelectionSchema(title) {
     return {
       type: "string",
-      enum: ["string", "number", "boolean"],
+      enum: ["string", "number", "boolean", "object", "array"],
       default: "string",
       title
     };
@@ -878,6 +892,9 @@
     if (dataType === "string" || dataType === "number" || dataType === "boolean") {
       return dataType;
     }
+    if (dataType === "object") {
+      return Array.isArray(formData) ? "array" : "object";
+    }
     return "string";
   }
   function castToNewType(formData, newType) {
@@ -927,20 +944,13 @@
       }
     };
     if (!globalFormOptions.useFallbackUiForUnsupportedType) {
+      const { reason = translateString(utils.TranslatableString.UnknownFieldType, [String(schema.type)]) } = props;
       const UnsupportedFieldTemplate = utils.getTemplate(
         "UnsupportedFieldTemplate",
         registry,
         uiOptions
       );
-      return /* @__PURE__ */ jsxRuntime.jsx(
-        UnsupportedFieldTemplate,
-        {
-          schema,
-          fieldPathId,
-          reason: translateString(utils.TranslatableString.UnknownFieldType, [String(schema.type)]),
-          registry
-        }
-      );
+      return /* @__PURE__ */ jsxRuntime.jsx(UnsupportedFieldTemplate, { schema, fieldPathId, reason, registry });
     }
     const FallbackFieldTemplate2 = utils.getTemplate(
       "FallbackFieldTemplate",
@@ -971,7 +981,17 @@
           },
           formData ? utils.hashObject(formData) : "__empty__"
         ),
-        schemaField: /* @__PURE__ */ jsxRuntime.jsx(SchemaField2, { ...props, schema: { type, title: translateString(utils.TranslatableString.Value) } })
+        schemaField: /* @__PURE__ */ jsxRuntime.jsx(
+          SchemaField2,
+          {
+            ...props,
+            schema: {
+              type,
+              title: translateString(utils.TranslatableString.Value),
+              ...type === "object" && { additionalProperties: true }
+            }
+          }
+        )
       }
     );
   }
@@ -1704,6 +1724,10 @@
     return /* @__PURE__ */ jsxRuntime.jsx(StringField2, { ...props, formData: value, onChange: handleChange });
   }
   var NumberField_default = NumberField;
+
+  // src/components/constants.ts
+  var ADDITIONAL_PROPERTY_KEY_REMOVE = Symbol("remove-this-key");
+  var IS_RESET = Symbol("reset");
   function isRequired(schema, name) {
     return Array.isArray(schema.required) && schema.required.indexOf(name) !== -1;
   }
@@ -1827,7 +1851,6 @@
     const schema = schemaUtils.retrieveSchema(rawSchema, formData, true);
     const uiOptions = utils.getUiOptions(uiSchema, globalUiOptions);
     const { properties: schemaProperties = {} } = schema;
-    const formDataHash = utils.hashObject(formData || {});
     const childFieldPathId = props.childFieldPathId ?? fieldPathId;
     const templateTitle = uiOptions.title ?? schema.title ?? title ?? name;
     const description = uiOptions.description ?? schema.description;
@@ -1900,11 +1923,9 @@
     );
     const handleRemoveProperty = react.useCallback(
       (key) => {
-        const copiedFormData = { ...formData };
-        unset(copiedFormData, key);
-        onChange(copiedFormData, childFieldPathId.path);
+        onChange(ADDITIONAL_PROPERTY_KEY_REMOVE, [...childFieldPathId.path, key]);
       },
-      [onChange, childFieldPathId, formData]
+      [onChange, childFieldPathId]
     );
     if (!renderOptionalField || hasFormData) {
       try {
@@ -1948,7 +1969,7 @@
             readonly,
             hideError
           },
-          addedByAdditionalProperties ? `${name2}-${formDataHash}` : name2
+          name2
         );
         return {
           content,
@@ -2781,8 +2802,9 @@
     if (hidden) {
       return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "hidden", children });
     }
+    const isCheckbox = uiOptions.widget === "checkbox";
     return /* @__PURE__ */ jsxRuntime.jsxs(WrapIfAdditionalTemplate2, { ...props, children: [
-      displayLabel && /* @__PURE__ */ jsxRuntime.jsx(Label, { label, required, id }),
+      displayLabel && !isCheckbox && /* @__PURE__ */ jsxRuntime.jsx(Label, { label, required, id }),
       displayLabel && description ? description : null,
       children,
       errors,
@@ -3101,7 +3123,9 @@
       (event) => onFocus(id, event.target.checked),
       [onFocus, id]
     );
-    const description = options.description ?? schema.description;
+    const uiOptions = utils.getUiOptions(uiSchema);
+    const isCheckboxWidget = uiOptions.widget === "checkbox";
+    const description = isCheckboxWidget ? void 0 : options.description ?? schema.description;
     return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: `checkbox ${disabled || readonly ? "disabled" : ""}`, children: [
       !hideLabel && description && /* @__PURE__ */ jsxRuntime.jsx(
         DescriptionFieldTemplate,
@@ -3659,7 +3683,6 @@
       }
     };
   }
-  var IS_RESET = Symbol("reset");
   function toIChangeEvent(state, status) {
     return {
       ..._pick(state, ["schema", "uiSchema", "fieldPathId", "schemaUtils", "formData", "edit", "errors", "errorSchema"]),
@@ -4091,7 +4114,9 @@
       let retrievedSchema = this.state.retrievedSchema;
       let formData = isRootPath ? newValue : cloneDeep(oldFormData);
       if (utils.isObject(formData) || Array.isArray(formData)) {
-        if (!isRootPath) {
+        if (newValue === ADDITIONAL_PROPERTY_KEY_REMOVE) {
+          _unset(formData, path);
+        } else if (!isRootPath) {
           set(formData, path, newValue);
         }
         const newState = this.getStateFromProps(this.props, formData, void 0, void 0, void 0, true);

package/dist/index.cjs

@@ -47,6 +47,7 @@ var import_isEmpty4 = __toESM(require("lodash/isEmpty"), 1);
 var import_pick = __toESM(require("lodash/pick"), 1);
 var import_set5 = __toESM(require("lodash/set"), 1);
 var import_toPath = __toESM(require("lodash/toPath"), 1);
+var import_unset = __toESM(require("lodash/unset"), 1);
 
 // src/getDefaultRegistry.ts
 var import_utils47 = require("@rjsf/utils");
@@ -107,9 +108,11 @@ function computeItemUiSchema(uiSchema, item, index, formContext) {
   }
 }
 function getNewFormDataRow(registry, schema) {
-  const { schemaUtils } = registry;
+  const { schemaUtils, globalFormOptions } = registry;
   let itemSchema = schema.items;
-  if ((0, import_utils.isFixedItems)(schema) && (0, import_utils.allowAdditionalItems)(schema)) {
+  if (globalFormOptions.useFallbackUiForUnsupportedType && !itemSchema) {
+    itemSchema = {};
+  } else if ((0, import_utils.isFixedItems)(schema) && (0, import_utils.allowAdditionalItems)(schema)) {
     itemSchema = schema.additionalItems;
   }
   return schemaUtils.getDefaultFormState(itemSchema);
@@ -644,7 +647,7 @@ function useKeyedFormData(formData = []) {
 }
 function ArrayField(props) {
   const { schema, uiSchema, errorSchema, fieldPathId, registry, formData, onChange } = props;
-  const { schemaUtils, translateString } = registry;
+  const { globalFormOptions, schemaUtils, translateString } = registry;
   const { keyedFormData, updateKeyedFormData } = useKeyedFormData(formData);
   const childFieldPathId = props.childFieldPathId ?? fieldPathId;
   const handleAddItem = (0, import_react.useCallback)(
@@ -781,24 +784,14 @@ function ArrayField(props) {
     },
     [onChange, childFieldPathId]
   );
-  if (!(import_utils.ITEMS_KEY in schema)) {
-    const uiOptions = (0, import_utils.getUiOptions)(uiSchema);
-    const UnsupportedFieldTemplate = (0, import_utils.getTemplate)(
-      "UnsupportedFieldTemplate",
-      registry,
-      uiOptions
-    );
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-      UnsupportedFieldTemplate,
-      {
-        schema,
-        fieldPathId,
-        reason: translateString(import_utils.TranslatableString.MissingItems),
-        registry
-      }
-    );
-  }
+  const arrayAsMultiProps = {
+    ...props,
+    formData,
+    fieldPathId: childFieldPathId,
+    onSelectChange
+  };
   const arrayProps = {
+    ...props,
     handleAddItem,
     handleCopyItem,
     handleRemoveItem,
@@ -806,19 +799,41 @@ function ArrayField(props) {
     keyedFormData,
     onChange: handleChange
   };
-  if (schemaUtils.isMultiSelect(schema)) {
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ArrayAsMultiSelect, { ...props, fieldPathId: childFieldPathId, onSelectChange });
+  if (!(import_utils.ITEMS_KEY in schema)) {
+    if (!globalFormOptions.useFallbackUiForUnsupportedType) {
+      const uiOptions = (0, import_utils.getUiOptions)(uiSchema);
+      const UnsupportedFieldTemplate = (0, import_utils.getTemplate)(
+        "UnsupportedFieldTemplate",
+        registry,
+        uiOptions
+      );
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+        UnsupportedFieldTemplate,
+        {
+          schema,
+          fieldPathId,
+          reason: translateString(import_utils.TranslatableString.MissingItems),
+          registry
+        }
+      );
+    }
+    const fallbackSchema = { ...schema, [import_utils.ITEMS_KEY]: { type: void 0 } };
+    arrayAsMultiProps.schema = fallbackSchema;
+    arrayProps.schema = fallbackSchema;
+  }
+  if (schemaUtils.isMultiSelect(arrayAsMultiProps.schema)) {
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ArrayAsMultiSelect, { ...arrayAsMultiProps });
   }
   if ((0, import_utils.isCustomWidget)(uiSchema)) {
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ArrayAsCustomWidget, { ...props, fieldPathId: childFieldPathId, onSelectChange });
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ArrayAsCustomWidget, { ...arrayAsMultiProps });
   }
-  if ((0, import_utils.isFixedItems)(schema)) {
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(FixedArray, { ...props, ...arrayProps });
+  if ((0, import_utils.isFixedItems)(arrayAsMultiProps.schema)) {
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(FixedArray, { ...arrayProps });
   }
-  if (schemaUtils.isFilesArray(schema, uiSchema)) {
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ArrayAsFiles, { ...props, fieldPathId: childFieldPathId, onSelectChange });
+  if (schemaUtils.isFilesArray(arrayAsMultiProps.schema, uiSchema)) {
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ArrayAsFiles, { ...arrayAsMultiProps });
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(NormalArray, { ...props, ...arrayProps });
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(NormalArray, { ...arrayProps });
 }
 
 // src/components/fields/BooleanField.tsx
@@ -933,7 +948,7 @@ var import_jsx_runtime3 = require("react/jsx-runtime");
 function getFallbackTypeSelectionSchema(title) {
   return {
     type: "string",
-    enum: ["string", "number", "boolean"],
+    enum: ["string", "number", "boolean", "object", "array"],
     default: "string",
     title
   };
@@ -943,6 +958,9 @@ function getTypeOfFormData(formData) {
   if (dataType === "string" || dataType === "number" || dataType === "boolean") {
     return dataType;
   }
+  if (dataType === "object") {
+    return Array.isArray(formData) ? "array" : "object";
+  }
   return "string";
 }
 function castToNewType(formData, newType) {
@@ -992,20 +1010,13 @@ function FallbackField(props) {
     }
   };
   if (!globalFormOptions.useFallbackUiForUnsupportedType) {
+    const { reason = translateString(import_utils3.TranslatableString.UnknownFieldType, [String(schema.type)]) } = props;
     const UnsupportedFieldTemplate = (0, import_utils3.getTemplate)(
       "UnsupportedFieldTemplate",
       registry,
       uiOptions
     );
-    return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
-      UnsupportedFieldTemplate,
-      {
-        schema,
-        fieldPathId,
-        reason: translateString(import_utils3.TranslatableString.UnknownFieldType, [String(schema.type)]),
-        registry
-      }
-    );
+    return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(UnsupportedFieldTemplate, { schema, fieldPathId, reason, registry });
   }
   const FallbackFieldTemplate2 = (0, import_utils3.getTemplate)(
     "FallbackFieldTemplate",
@@ -1036,7 +1047,17 @@ function FallbackField(props) {
         },
         formData ? (0, import_utils3.hashObject)(formData) : "__empty__"
       ),
-      schemaField: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(SchemaField2, { ...props, schema: { type, title: translateString(import_utils3.TranslatableString.Value) } })
+      schemaField: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
+        SchemaField2,
+        {
+          ...props,
+          schema: {
+            type,
+            title: translateString(import_utils3.TranslatableString.Value),
+            ...type === "object" && { additionalProperties: true }
+          }
+        }
+      )
     }
   );
 }
@@ -1827,7 +1848,12 @@ var import_get4 = __toESM(require("lodash/get"), 1);
 var import_has3 = __toESM(require("lodash/has"), 1);
 var import_isObject4 = __toESM(require("lodash/isObject"), 1);
 var import_set4 = __toESM(require("lodash/set"), 1);
-var import_unset = __toESM(require("lodash/unset"), 1);
+
+// src/components/constants.ts
+var ADDITIONAL_PROPERTY_KEY_REMOVE = Symbol("remove-this-key");
+var IS_RESET = Symbol("reset");
+
+// src/components/fields/ObjectField.tsx
 var import_jsx_runtime9 = require("react/jsx-runtime");
 function isRequired(schema, name) {
   return Array.isArray(schema.required) && schema.required.indexOf(name) !== -1;
@@ -1952,7 +1978,6 @@ function ObjectField(props) {
   const schema = schemaUtils.retrieveSchema(rawSchema, formData, true);
   const uiOptions = (0, import_utils9.getUiOptions)(uiSchema, globalUiOptions);
   const { properties: schemaProperties = {} } = schema;
-  const formDataHash = (0, import_utils9.hashObject)(formData || {});
   const childFieldPathId = props.childFieldPathId ?? fieldPathId;
   const templateTitle = uiOptions.title ?? schema.title ?? title ?? name;
   const description = uiOptions.description ?? schema.description;
@@ -2025,11 +2050,9 @@ function ObjectField(props) {
   );
   const handleRemoveProperty = (0, import_react8.useCallback)(
     (key) => {
-      const copiedFormData = { ...formData };
-      (0, import_unset.default)(copiedFormData, key);
-      onChange(copiedFormData, childFieldPathId.path);
+      onChange(ADDITIONAL_PROPERTY_KEY_REMOVE, [...childFieldPathId.path, key]);
     },
-    [onChange, childFieldPathId, formData]
+    [onChange, childFieldPathId]
   );
   if (!renderOptionalField || hasFormData) {
     try {
@@ -2073,7 +2096,7 @@ function ObjectField(props) {
           readonly,
           hideError
         },
-        addedByAdditionalProperties ? `${name2}-${formDataHash}` : name2
+        name2
       );
       return {
         content,
@@ -2989,8 +3012,9 @@ function FieldTemplate(props) {
   if (hidden) {
     return /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { className: "hidden", children });
   }
+  const isCheckbox = uiOptions.widget === "checkbox";
   return /* @__PURE__ */ (0, import_jsx_runtime27.jsxs)(WrapIfAdditionalTemplate2, { ...props, children: [
-    displayLabel && /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(Label, { label, required, id }),
+    displayLabel && !isCheckbox && /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(Label, { label, required, id }),
     displayLabel && description ? description : null,
     children,
     errors,
@@ -3354,7 +3378,9 @@ function CheckboxWidget({
     (event) => onFocus(id, event.target.checked),
     [onFocus, id]
   );
-  const description = options.description ?? schema.description;
+  const uiOptions = (0, import_utils32.getUiOptions)(uiSchema);
+  const isCheckboxWidget = uiOptions.widget === "checkbox";
+  const description = isCheckboxWidget ? void 0 : options.description ?? schema.description;
   return /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: `checkbox ${disabled || readonly ? "disabled" : ""}`, children: [
     !hideLabel && description && /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
       DescriptionFieldTemplate,
@@ -3988,7 +4014,6 @@ function getDefaultRegistry() {
 
 // src/components/Form.tsx
 var import_jsx_runtime57 = require("react/jsx-runtime");
-var IS_RESET = Symbol("reset");
 function toIChangeEvent(state, status) {
   return {
     ...(0, import_pick.default)(state, ["schema", "uiSchema", "fieldPathId", "schemaUtils", "formData", "edit", "errors", "errorSchema"]),
@@ -4420,7 +4445,9 @@ var Form = class extends import_react21.Component {
     let retrievedSchema = this.state.retrievedSchema;
     let formData = isRootPath ? newValue : (0, import_cloneDeep2.default)(oldFormData);
     if ((0, import_utils48.isObject)(formData) || Array.isArray(formData)) {
-      if (!isRootPath) {
+      if (newValue === ADDITIONAL_PROPERTY_KEY_REMOVE) {
+        (0, import_unset.default)(formData, path);
+      } else if (!isRootPath) {
         (0, import_set5.default)(formData, path, newValue);
       }
       const newState = this.getStateFromProps(this.props, formData, void 0, void 0, void 0, true);