@rjsf/core 6.8.0 → 6.10.0

package/dist/index.esm.js

@@ -1,8 +1,12 @@
 // src/components/Form.tsx
 import { Component, createRef } from "react";
 import {
+  getByPath as getByPath4,
+  setByPath as setByPath4,
+  toPath as toPath2,
+  unsetByPath,
   createSchemaUtils,
-  deepEquals as deepEquals3,
+  deepEquals as deepEquals5,
   ErrorSchemaBuilder,
   getChangedFields,
   getTemplate as getTemplate29,
@@ -27,13 +31,6 @@ import {
   ANY_OF_KEY as ANY_OF_KEY6,
   ONE_OF_KEY as ONE_OF_KEY6
 } from "@rjsf/utils";
-import _cloneDeep from "lodash/cloneDeep";
-import _get from "lodash/get";
-import _isEmpty from "lodash/isEmpty";
-import _pick from "lodash/pick";
-import _set from "lodash/set";
-import _toPath from "lodash/toPath";
-import _unset from "lodash/unset";
 
 // src/getDefaultRegistry.ts
 import { DEFAULT_ID_PREFIX, DEFAULT_ID_SEPARATOR, englishStringTranslator } from "@rjsf/utils";
@@ -41,6 +38,7 @@ import { DEFAULT_ID_PREFIX, DEFAULT_ID_SEPARATOR, englishStringTranslator } from
 // src/components/fields/ArrayField.tsx
 import { memo, useCallback, useMemo, useRef, useState } from "react";
 import {
+  setByPath,
   allowAdditionalItems,
   getTemplate,
   getUiOptions,
@@ -49,6 +47,7 @@ import {
   isCustomWidget,
   isFixedItems,
   isFormDataAvailable,
+  isObject,
   optionsList,
   shouldRenderOptionalField,
   toFieldPathId,
@@ -57,13 +56,11 @@ import {
   ID_KEY,
   TranslatableString
 } from "@rjsf/utils";
-import cloneDeep from "lodash/cloneDeep";
-import isObject from "lodash/isObject";
-import set from "lodash/set";
-import uniqueId from "lodash/uniqueId";
 import { jsx } from "react/jsx-runtime";
+var rowIdCounter = 0;
 function generateRowId() {
-  return uniqueId("rjsf-array-item-");
+  rowIdCounter += 1;
+  return `rjsf-array-item-${rowIdCounter}`;
 }
 function generateKeyedFormData(formData) {
   return !Array.isArray(formData) ? [] : formData.map((item) => ({
@@ -326,14 +323,14 @@ function ArrayFieldItemInner(props) {
   const { description } = getUiOptions(itemUiSchema);
   const hasDescription = !!description || !!itemSchema.description;
   const { orderable = true, removable = true, copyable = false } = uiOptions;
-  const has4 = {
+  const has = {
     moveUp: orderable && canMoveUp,
     moveDown: orderable && canMoveDown,
     copy: copyable && canAdd,
     remove: removable && canRemove,
     toolbar: false
   };
-  has4.toolbar = Object.keys(has4).some((key) => has4[key]);
+  has.toolbar = Object.keys(has).some((key) => has[key]);
   const onAddItem = useCallback(
     (event) => {
       handleAddItem(event, index + 1);
@@ -393,10 +390,10 @@ function ArrayFieldItemInner(props) {
       disabled,
       readonly,
       canAdd,
-      hasCopy: has4.copy,
-      hasMoveUp: has4.moveUp,
-      hasMoveDown: has4.moveDown,
-      hasRemove: has4.remove,
+      hasCopy: has.copy,
+      hasMoveUp: has.moveUp,
+      hasMoveDown: has.moveDown,
+      hasRemove: has.remove,
       index,
       totalItems,
       onAddItem,
@@ -411,7 +408,7 @@ function ArrayFieldItemInner(props) {
     itemKey,
     className: "rjsf-array-item",
     disabled,
-    hasToolbar: has4.toolbar,
+    hasToolbar: has.toolbar,
     index,
     totalItems,
     readonly,
@@ -556,10 +553,7 @@ function FixedArray(props) {
   const { OptionalDataControlsField: OptionalDataControlsField2 } = fields2;
   const renderOptionalField = shouldRenderOptionalField(registry, schema, required, uiSchema);
   const hasFormData = isFormDataAvailable(formData);
-  const schemaItems = useMemo(
-    () => isObject(schema.items) ? schema.items : [],
-    [schema.items]
-  );
+  const schemaItems = useMemo(() => Array.isArray(schema.items) ? schema.items : [], [schema.items]);
   const hasAdditionalItems = isObject(schema.additionalItems);
   const childFieldPathId = props.childFieldPathId ?? fieldPathId;
   if (items.length < schemaItems.length) {
@@ -682,9 +676,9 @@ function ArrayField(props) {
         for (const idx of Object.keys(errorSchemaRef.current)) {
           const i = parseInt(idx, 10);
           if (index === void 0 || i < index) {
-            set(newErrorSchema, [i], errorSchemaRef.current[i]);
+            setByPath(newErrorSchema, i, errorSchemaRef.current[i]);
           } else if (i >= index) {
-            set(newErrorSchema, [i + 1], errorSchemaRef.current[i]);
+            setByPath(newErrorSchema, i + 1, errorSchemaRef.current[i]);
           }
         }
       }
@@ -713,15 +707,15 @@ function ArrayField(props) {
         for (const idx of Object.keys(errorSchemaRef.current)) {
           const i = parseInt(idx, 10);
           if (i <= index) {
-            set(newErrorSchema, [i], errorSchemaRef.current[i]);
+            setByPath(newErrorSchema, i, errorSchemaRef.current[i]);
           } else if (i > index) {
-            set(newErrorSchema, [i + 1], errorSchemaRef.current[i]);
+            setByPath(newErrorSchema, i + 1, errorSchemaRef.current[i]);
           }
         }
       }
       const newKeyedFormDataRow = {
         key: generateRowId(),
-        item: cloneDeep(keyedFormDataRef.current[index].item)
+        item: structuredClone(keyedFormDataRef.current[index].item)
       };
       const newKeyedFormData = [...keyedFormDataRef.current];
       if (index !== void 0) {
@@ -744,9 +738,9 @@ function ArrayField(props) {
         for (const idx of Object.keys(errorSchemaRef.current)) {
           const i = parseInt(idx, 10);
           if (i < index) {
-            set(newErrorSchema, [i], errorSchemaRef.current[i]);
+            setByPath(newErrorSchema, i, errorSchemaRef.current[i]);
           } else if (i > index) {
-            set(newErrorSchema, [i - 1], errorSchemaRef.current[i]);
+            setByPath(newErrorSchema, i - 1, errorSchemaRef.current[i]);
           }
         }
       }
@@ -767,11 +761,11 @@ function ArrayField(props) {
         for (const idx of Object.keys(errorSchemaRef.current)) {
           const i = parseInt(idx, 10);
           if (i === index) {
-            set(newErrorSchema, [newIndex], errorSchemaRef.current[index]);
+            setByPath(newErrorSchema, newIndex, errorSchemaRef.current[index]);
           } else if (i === newIndex) {
-            set(newErrorSchema, [index], errorSchemaRef.current[newIndex]);
+            setByPath(newErrorSchema, index, errorSchemaRef.current[newIndex]);
           } else {
-            set(newErrorSchema, [idx], errorSchemaRef.current[i]);
+            setByPath(newErrorSchema, idx, errorSchemaRef.current[i]);
           }
         }
       }
@@ -861,8 +855,7 @@ function ArrayField(props) {
 
 // src/components/fields/BooleanField.tsx
 import { useCallback as useCallback2 } from "react";
-import { getWidget as getWidget2, getUiOptions as getUiOptions2, optionsList as optionsList2, TranslatableString as TranslatableString2 } from "@rjsf/utils";
-import isObject2 from "lodash/isObject";
+import { getWidget as getWidget2, getUiOptions as getUiOptions2, isObject as isObject2, optionsList as optionsList2, TranslatableString as TranslatableString2 } from "@rjsf/utils";
 import { jsx as jsx2 } from "react/jsx-runtime";
 function BooleanField(props) {
   const {
@@ -1124,13 +1117,19 @@ function FallbackField(props) {
 
 // src/components/fields/LayoutGridField.tsx
 import {
+  getByPath,
+  toPath,
   ANY_OF_KEY,
+  deepEquals,
   getDiscriminatorFieldFromSchema,
   getTemplate as getTemplate4,
   getTestIds,
+  getPropertySchema,
   getUiOptions as getUiOptions5,
   hashObject as hashObject3,
   ID_KEY as ID_KEY2,
+  isObject as isObject3,
+  isPlainObject,
   lookupFromFormContext,
   ONE_OF_KEY,
   PROPERTIES_KEY,
@@ -1141,21 +1140,6 @@ import {
   ITEMS_KEY as ITEMS_KEY2,
   useDeepCompareMemo as useDeepCompareMemo3
 } from "@rjsf/utils";
-import each from "lodash/each";
-import flatten from "lodash/flatten";
-import get from "lodash/get";
-import has from "lodash/has";
-import includes from "lodash/includes";
-import intersection from "lodash/intersection";
-import isEmpty from "lodash/isEmpty";
-import isEqual from "lodash/isEqual";
-import isFunction from "lodash/isFunction";
-import isObject3 from "lodash/isObject";
-import isPlainObject from "lodash/isPlainObject";
-import isString from "lodash/isString";
-import isUndefined from "lodash/isUndefined";
-import last from "lodash/last";
-import set2 from "lodash/set";
 import { jsx as jsx5 } from "react/jsx-runtime";
 import { createElement } from "react";
 var LOOKUP_REGEX = /^\$lookup=(.+)/;
@@ -1169,37 +1153,38 @@ function isNumericIndex(str) {
 }
 var LAYOUT_GRID_FIELD_TEST_IDS = getTestIds();
 function computeFieldUiSchema(field, uiProps, uiSchema, schemaReadonly, forceReadonly) {
-  const globalUiOptions = get(uiSchema, [UI_GLOBAL_OPTIONS_KEY], {});
-  const localUiSchema = get(uiSchema, field);
-  const localUiOptions = { ...get(localUiSchema, [UI_OPTIONS_KEY], {}), ...uiProps, ...globalUiOptions };
+  const globalUiOptions = uiSchema?.[UI_GLOBAL_OPTIONS_KEY] ?? {};
+  const localUiSchema = getByPath(uiSchema, toPath(field));
+  const localUiOptions = { ...localUiSchema?.[UI_OPTIONS_KEY] ?? {}, ...uiProps, ...globalUiOptions };
   const fieldUiSchema = { ...localUiSchema };
-  if (!isEmpty(localUiOptions)) {
-    set2(fieldUiSchema, [UI_OPTIONS_KEY], localUiOptions);
+  if (Object.keys(localUiOptions).length > 0) {
+    fieldUiSchema[UI_OPTIONS_KEY] = localUiOptions;
   }
-  if (!isEmpty(globalUiOptions)) {
-    set2(fieldUiSchema, [UI_GLOBAL_OPTIONS_KEY], globalUiOptions);
+  if (Object.keys(globalUiOptions).length > 0) {
+    fieldUiSchema[UI_GLOBAL_OPTIONS_KEY] = globalUiOptions;
   }
   let { readonly: uiReadonly } = getUiOptions5(fieldUiSchema);
-  if (forceReadonly === true || isUndefined(uiReadonly) && schemaReadonly === true) {
+  if (forceReadonly === true || uiReadonly === void 0 && schemaReadonly === true) {
     uiReadonly = true;
-    if (has(localUiOptions, READONLY_KEY)) {
-      set2(fieldUiSchema, [UI_OPTIONS_KEY, READONLY_KEY], true);
+    const fieldUiOptions = fieldUiSchema[UI_OPTIONS_KEY];
+    if (fieldUiOptions && READONLY_KEY in fieldUiOptions) {
+      fieldUiOptions[READONLY_KEY] = true;
     } else {
-      set2(fieldUiSchema, `ui:${READONLY_KEY}`, true);
+      fieldUiSchema[`ui:${READONLY_KEY}`] = true;
     }
   }
   return { fieldUiSchema, uiReadonly };
 }
 function conditionMatches(operator, datum, value = "$0m3tH1nG Un3xP3cT3d") {
-  const data = flatten([datum]).sort();
-  const values = flatten([value]).sort();
+  const data = [datum].flat().sort();
+  const values = [value].flat().sort();
   switch (operator) {
     case "all" /* ALL */:
-      return isEqual(data, values);
+      return deepEquals(data, values);
     case "some" /* SOME */:
-      return intersection(data, values).length > 0;
+      return data.some((entry) => values.includes(entry));
     case "none" /* NONE */:
-      return intersection(data, values).length === 0;
+      return !data.some((entry) => values.includes(entry));
     default:
       return false;
   }
@@ -1226,12 +1211,12 @@ function findChildrenAndProps(layoutGridSchema, schemaKey, registry) {
 function computeArraySchemasIfPresent(schema, fieldPathId, potentialIndex) {
   let rawSchema;
   let resultPathId = fieldPathId;
-  if (isNumericIndex(potentialIndex) && schema && schema?.type === "array" && has(schema, ITEMS_KEY2)) {
+  if (isNumericIndex(potentialIndex) && schema && schema?.type === "array" && ITEMS_KEY2 in schema) {
     const index = Number(potentialIndex);
     const items = schema[ITEMS_KEY2];
     if (Array.isArray(items)) {
       if (index > items.length) {
-        rawSchema = last(items);
+        rawSchema = items.at(-1);
       } else {
         rawSchema = items[index];
       }
@@ -1256,44 +1241,45 @@ function getSchemaDetailsForField(registry, dottedPath, initialSchema, formData,
   let isReadonly = schema.readOnly;
   parts.forEach((part) => {
     fieldPathId = toFieldPathId3(part, globalFormOptions, fieldPathId);
-    if (has(schema, PROPERTIES_KEY)) {
-      rawSchema = get(schema, [PROPERTIES_KEY, part], {});
-    } else 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;
+    const schemaProperties = schema?.[PROPERTIES_KEY];
+    if (schemaProperties) {
+      rawSchema = schemaProperties[part] ?? {};
+    } else if (schema && (ONE_OF_KEY in schema || ANY_OF_KEY in schema)) {
+      const xxx = ONE_OF_KEY in schema ? ONE_OF_KEY : ANY_OF_KEY;
       const selectedSchema = schemaUtils.findSelectedOptionInXxxOf(schema, part, xxx, innerData);
-      rawSchema = get(selectedSchema, [PROPERTIES_KEY, part], {});
+      rawSchema = getPropertySchema(selectedSchema, part);
     } else {
       const result = computeArraySchemasIfPresent(schema, fieldPathId, part);
       rawSchema = result.rawSchema ?? {};
       fieldPathId = result.fieldPathId;
     }
-    innerData = get(innerData, part, {});
+    innerData = getByPath(innerData, part, {});
     schema = schemaUtils.retrieveSchema(rawSchema, innerData);
     isReadonly = getNonNullishValue(schema.readOnly, isReadonly);
   });
   let optionsInfo;
   let isRequired2 = false;
-  if (isEmpty(schema)) {
+  if (!schema || Object.keys(schema).length === 0) {
     schema = void 0;
   }
   if (schema && leafPath) {
-    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;
+    if (schema && (ONE_OF_KEY in schema || ANY_OF_KEY in schema)) {
+      const xxx = ONE_OF_KEY in schema ? ONE_OF_KEY : ANY_OF_KEY;
       schema = schemaUtils.findSelectedOptionInXxxOf(schema, leafPath, xxx, innerData);
     }
     fieldPathId = toFieldPathId3(leafPath, globalFormOptions, fieldPathId);
-    isRequired2 = schema !== void 0 && Array.isArray(schema.required) && includes(schema.required, leafPath);
+    isRequired2 = schema !== void 0 && Array.isArray(schema.required) && schema.required.includes(leafPath);
     const result = computeArraySchemasIfPresent(schema, fieldPathId, leafPath);
     if (result.rawSchema) {
       schema = result.rawSchema;
       fieldPathId = result.fieldPathId;
     } else {
-      schema = get(schema, [PROPERTIES_KEY, leafPath]);
+      schema = schema?.[PROPERTIES_KEY]?.[leafPath];
       schema = schema ? schemaUtils.retrieveSchema(schema) : schema;
     }
     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;
+    if (schema && (ONE_OF_KEY in schema || ANY_OF_KEY in schema)) {
+      const xxx = ONE_OF_KEY in schema ? ONE_OF_KEY : ANY_OF_KEY;
       const discriminator = getDiscriminatorFieldFromSchema(schema);
       optionsInfo = { options: schema[xxx], hasDiscriminator: !!discriminator };
     }
@@ -1302,10 +1288,10 @@ function getSchemaDetailsForField(registry, dottedPath, initialSchema, formData,
 }
 function getCustomRenderComponent(render, registry) {
   let customRenderer = render;
-  if (isString(customRenderer)) {
+  if (typeof customRenderer === "string") {
     customRenderer = lookupFromFormContext(registry, customRenderer);
   }
-  if (isFunction(customRenderer)) {
+  if (typeof customRenderer === "function") {
     return customRenderer;
   }
   return null;
@@ -1315,23 +1301,21 @@ function computeUIComponentPropsFromGridSchema(registry, gridSchema) {
   let UIComponent = null;
   let uiProps = {};
   let rendered;
-  if (isString(gridSchema) || isUndefined(gridSchema)) {
+  if (typeof gridSchema === "string" || gridSchema === void 0) {
     name = gridSchema ?? "";
   } else {
     const { name: innerName = "", render, ...innerProps } = gridSchema;
     name = innerName;
     uiProps = innerProps;
-    if (!isEmpty(uiProps)) {
-      each(uiProps, (prop, key) => {
-        if (isString(prop)) {
-          const match = LOOKUP_REGEX.exec(prop);
-          if (Array.isArray(match) && match.length > 1) {
-            const lookupName = match[1];
-            uiProps[key] = lookupFromFormContext(registry, lookupName, lookupName);
-          }
+    Object.entries(uiProps).forEach(([key, prop]) => {
+      if (typeof prop === "string") {
+        const match = LOOKUP_REGEX.exec(prop);
+        if (Array.isArray(match) && match.length > 1) {
+          const lookupName = match[1];
+          uiProps[key] = lookupFromFormContext(registry, lookupName, lookupName);
         }
-      });
-    }
+      }
+    });
     UIComponent = getCustomRenderComponent(render, registry);
     if (!innerName && UIComponent) {
       rendered = /* @__PURE__ */ jsx5(UIComponent, { ...innerProps, "data-testid": LAYOUT_GRID_FIELD_TEST_IDS.uiComponent });
@@ -1359,7 +1343,7 @@ function LayoutGridCondition(props) {
   const { formData, registry } = layoutGridFieldProps;
   const { children, gridProps } = findChildrenAndProps(layoutGridSchema, "ui:condition" /* CONDITION */, registry);
   const { operator, field = "", value } = gridProps;
-  const fieldData = get(formData, field, null);
+  const fieldData = getByPath(formData, toPath(field), null);
   if (conditionMatches(operator, fieldData, value)) {
     return /* @__PURE__ */ jsx5(LayoutGridFieldChildren, { ...layoutGridFieldProps, childrenLayoutGridSchemaId: children });
   }
@@ -1433,6 +1417,7 @@ function LayoutGridFieldComponent(props) {
   if (schema) {
     const Field = optionsInfo?.hasDiscriminator ? LayoutMultiSchemaField2 : SchemaField2;
     const { fieldUiSchema, uiReadonly } = computeFieldUiSchema(name, uiProps, uiSchema, isReadonly, readonly);
+    const namePath = toPath(name);
     return /* @__PURE__ */ jsx5(
       Field,
       {
@@ -1443,9 +1428,9 @@ function LayoutGridFieldComponent(props) {
         readonly: uiReadonly,
         schema,
         uiSchema: fieldUiSchema,
-        errorSchema: get(errorSchema, name),
+        errorSchema: getByPath(errorSchema, namePath),
         fieldPathId: memoFieldPathId,
-        formData: get(formData, name),
+        formData: getByPath(formData, namePath),
         onChange,
         onBlur,
         onFocus,
@@ -1535,6 +1520,8 @@ function LayoutHeaderField(props) {
 // src/components/fields/LayoutMultiSchemaField.tsx
 import { useState as useState4, useEffect } from "react";
 import {
+  getByPath as getByPath2,
+  setByPath as setByPath2,
   ANY_OF_KEY as ANY_OF_KEY2,
   CONST_KEY,
   DEFAULT_KEY,
@@ -1546,31 +1533,27 @@ import {
   optionsList as optionsList3,
   PROPERTIES_KEY as PROPERTIES_KEY2,
   getTemplate as getTemplate6,
+  getPropertySchema as getPropertySchema2,
   getUiOptions as getUiOptions7,
-  getWidget as getWidget3
+  getWidget as getWidget3,
+  noop
 } from "@rjsf/utils";
-import get2 from "lodash/get";
-import has2 from "lodash/has";
-import isEmpty2 from "lodash/isEmpty";
-import noop from "lodash/noop";
-import omit from "lodash/omit";
-import set3 from "lodash/set";
 import { jsx as jsx7 } from "react/jsx-runtime";
 function getSelectedOption(options, selectorField, value) {
   const defaultValue = "!@#!@$@#$!@$#";
   const schemaOptions = options.map(({ schema }) => schema);
   return schemaOptions.find((option) => {
-    const selector = get2(option, [PROPERTIES_KEY2, selectorField]);
-    const result = get2(selector, DEFAULT_KEY, get2(selector, CONST_KEY, defaultValue));
+    const selector = option[PROPERTIES_KEY2]?.[selectorField];
+    const result = getByPath2(selector, DEFAULT_KEY, getByPath2(selector, CONST_KEY, defaultValue));
     return result === value;
   });
 }
 function computeEnumOptions(schema, options, schemaUtils, uiSchema, formData) {
   const realOptions = options.map((opt) => schemaUtils.retrieveSchema(opt, formData));
   let tempSchema = schema;
-  if (has2(schema, ONE_OF_KEY2)) {
+  if (ONE_OF_KEY2 in schema) {
     tempSchema = { ...schema, [ONE_OF_KEY2]: realOptions };
-  } else if (has2(schema, ANY_OF_KEY2)) {
+  } else if (ANY_OF_KEY2 in schema) {
     tempSchema = { ...schema, [ANY_OF_KEY2]: realOptions };
   }
   const enumOptions = optionsList3(tempSchema, uiSchema);
@@ -1601,7 +1584,7 @@ function LayoutMultiSchemaField(props) {
   } = props;
   const { widgets: widgets2, schemaUtils, globalUiOptions } = registry;
   const [enumOptions, setEnumOptions] = useState4(computeEnumOptions(schema, options, schemaUtils, uiSchema, formData));
-  const id = get2(fieldPathId, ID_KEY3);
+  const id = fieldPathId[ID_KEY3];
   const discriminator = getDiscriminatorFieldFromSchema2(schema);
   const FieldErrorTemplate2 = getTemplate6("FieldErrorTemplate", registry, options);
   const FieldTemplate2 = getTemplate6("FieldTemplate", registry, options);
@@ -1623,14 +1606,15 @@ function LayoutMultiSchemaField(props) {
   if (!selectorField) {
     throw new Error("No selector field provided for the LayoutMultiSchemaField");
   }
-  const selectedOption = get2(formData, selectorField);
-  let optionSchema = get2(enumOptions[0]?.schema, [PROPERTIES_KEY2, selectorField], {});
+  const selectedOption = getByPath2(formData, selectorField);
+  let optionSchema = getPropertySchema2(enumOptions[0]?.schema, selectorField);
   const option = getSelectedOption(enumOptions, selectorField, selectedOption);
   optionSchema = optionSchema?.type ? optionSchema : { ...optionSchema, type: option?.type || baseType };
   const Widget = getWidget3(optionSchema, widget, widgets2);
   const hideFieldError = uiSchemaHideError === void 0 ? hideError : Boolean(uiSchemaHideError);
-  const rawErrors = get2(errorSchema, [ERRORS_KEY], []);
-  const fieldErrorSchema = omit(errorSchema, [ERRORS_KEY]);
+  const rawErrors = errorSchema?.[ERRORS_KEY] ?? [];
+  const fieldErrorSchema = { ...errorSchema };
+  delete fieldErrorSchema[ERRORS_KEY];
   const displayLabel = schemaUtils.getDisplayLabel(schema, uiSchema, globalUiOptions);
   const onOptionChange = (opt) => {
     if (disabled || readonly) {
@@ -1643,7 +1627,7 @@ function LayoutMultiSchemaField(props) {
       newFormData = schemaUtils.getDefaultFormState(newOption, newFormData, "excludeObjectChildren");
     }
     if (newFormData) {
-      set3(newFormData, selectorField, opt);
+      setByPath2(newFormData, selectorField, opt);
     }
     onChange(newFormData, fieldPathId.path, void 0, id);
   };
@@ -1656,7 +1640,7 @@ function LayoutMultiSchemaField(props) {
       id,
       schema,
       label: (title || schema.title) ?? "",
-      disabled: disabled || Array.isArray(enumOptions) && isEmpty2(enumOptions),
+      disabled: disabled || Array.isArray(enumOptions) && enumOptions.length === 0,
       uiSchema,
       required,
       readonly: !!readonly,
@@ -1674,7 +1658,7 @@ function LayoutMultiSchemaField(props) {
           name,
           schema,
           label: (title || schema.title) ?? "",
-          disabled: disabled || Array.isArray(enumOptions) && isEmpty2(enumOptions),
+          disabled: disabled || Array.isArray(enumOptions) && enumOptions.length === 0,
           uiSchema,
           autofocus,
           readonly,
@@ -1702,7 +1686,7 @@ function LayoutMultiSchemaField(props) {
 import { useCallback as useCallback3, useEffect as useEffect2, useMemo as useMemo3, useRef as useRef2, useState as useState5 } from "react";
 import {
   ANY_OF_KEY as ANY_OF_KEY3,
-  deepEquals,
+  deepEquals as deepEquals2,
   ERRORS_KEY as ERRORS_KEY2,
   getDiscriminatorFieldFromSchema as getDiscriminatorFieldFromSchema3,
   getTemplate as getTemplate7,
@@ -1715,15 +1699,12 @@ import {
   shouldRenderOptionalField as shouldRenderOptionalField2,
   TranslatableString as TranslatableString4
 } from "@rjsf/utils";
-import get3 from "lodash/get";
-import isEmpty3 from "lodash/isEmpty";
-import omit2 from "lodash/omit";
 import { jsx as jsx8 } from "react/jsx-runtime";
 function AnyOfField(props) {
   const {
     name,
     disabled = false,
-    errorSchema = {},
+    errorSchema,
     formData,
     fieldPathId,
     onBlur,
@@ -1755,7 +1736,7 @@ function AnyOfField(props) {
     const prevFieldId = prevFieldIdRef.current;
     prevFormDataRef.current = formData;
     prevFieldIdRef.current = fieldPathId.$id;
-    if (!deepEquals(formData, prevFormData) && fieldPathId.$id === prevFieldId) {
+    if (!deepEquals2(formData, prevFormData) && fieldPathId.$id === prevFieldId) {
       if (skipNextOptionRecalculation.current) {
         skipNextOptionRecalculation.current = false;
         return;
@@ -1813,8 +1794,9 @@ function AnyOfField(props) {
     ...uiOptions
   } = getUiOptions8(uiSchema, globalUiOptions);
   const Widget = getWidget4({ type: "number" }, widget, widgets2);
-  const rawErrors = get3(errorSchema, ERRORS_KEY2, []);
-  const fieldErrorSchema = omit2(errorSchema, [ERRORS_KEY2]);
+  const rawErrors = errorSchema?.[ERRORS_KEY2] ?? [];
+  const fieldErrorSchema = { ...errorSchema };
+  delete fieldErrorSchema[ERRORS_KEY2];
   const displayLabel = schemaUtils.getDisplayLabel(schema, uiSchema, globalUiOptions);
   const option = selectedOption >= 0 ? retrievedOptions[selectedOption] || null : null;
   let optionSchema;
@@ -1865,7 +1847,7 @@ function AnyOfField(props) {
       onChange: onOptionChange,
       onBlur,
       onFocus,
-      disabled: disabled || isEmpty3(enumOptions),
+      disabled: disabled || enumOptions.length === 0,
       multiple: false,
       rawErrors,
       errorSchema: fieldErrorSchema,
@@ -1954,9 +1936,14 @@ var NumberField_default = NumberField;
 // src/components/fields/ObjectField.tsx
 import { memo as memo2, useCallback as useCallback5, useMemo as useMemo4, useRef as useRef3, useState as useState7 } from "react";
 import {
+  getByPath as getByPath3,
+  hasByPath,
+  setByPath as setByPath3,
   ADDITIONAL_PROPERTY_FLAG,
   ANY_OF_KEY as ANY_OF_KEY4,
+  deepEquals as deepEquals3,
   getTemplate as getTemplate8,
+  getPropertySchema as getPropertySchema3,
   getUiOptions as getUiOptions10,
   isFormDataAvailable as isFormDataAvailable3,
   orderProperties,
@@ -1964,14 +1951,10 @@ import {
   toFieldPathId as toFieldPathId4,
   useDeepCompareMemo as useDeepCompareMemo4,
   ONE_OF_KEY as ONE_OF_KEY4,
-  PROPERTIES_KEY as PROPERTIES_KEY3,
   REF_KEY,
+  isObject as isObject4,
   TranslatableString as TranslatableString5
 } from "@rjsf/utils";
-import get4 from "lodash/get";
-import has3 from "lodash/has";
-import isObject4 from "lodash/isObject";
-import set4 from "lodash/set";
 import { Markdown } from "markdown-to-jsx/react";
 
 // src/components/constants.ts
@@ -2035,12 +2018,12 @@ function ObjectFieldPropertyFn(props) {
   const onPropertyChange = useCallback5(
     (value, path, newErrorSchema, id) => {
       let normalizedValue = value;
-      if (value === void 0 && addedByAdditionalProperties) {
+      if (value === void 0 && addedByAdditionalProperties && deepEquals3(path, innerFieldIdPathId.path)) {
         normalizedValue = "";
       }
       onChange(normalizedValue, path, newErrorSchema, id);
     },
-    [onChange, addedByAdditionalProperties]
+    [onChange, addedByAdditionalProperties, innerFieldIdPathId]
   );
   const onKeyRename = useCallback5(
     (value) => {
@@ -2135,7 +2118,7 @@ function ObjectField(props) {
       const { duplicateKeySuffixSeparator = "-" } = getUiOptions10(uiSchema, globalUiOptions);
       let index = 0;
       let newKey = preferredKey;
-      while (has3(existingFormData, newKey)) {
+      while (hasByPath(existingFormData, newKey)) {
         index += 1;
         newKey = `${preferredKey}${duplicateKeySuffixSeparator}${index}`;
       }
@@ -2150,7 +2133,7 @@ function ObjectField(props) {
     const newFormData = { ...formData };
     const newKey = getAvailableKey("newKey", newFormData);
     if (schema.patternProperties) {
-      set4(newFormData, newKey, null);
+      setByPath3(newFormData, newKey, null);
     } else {
       let type = void 0;
       let constValue = void 0;
@@ -2171,7 +2154,7 @@ function ObjectField(props) {
         }
       }
       const newValue = constValue ?? defaultValue ?? getDefaultValue(translateString, type);
-      set4(newFormData, newKey, newValue);
+      setByPath3(newFormData, newKey, newValue);
     }
     if (lastRenamedProperty.current.previousKey === newKey) {
       lastRenamedProperty.current.currentKey = newKey;
@@ -2247,11 +2230,11 @@ function ObjectField(props) {
         {
           propertyName,
           required: isRequired(schema, propertyName),
-          schema: get4(schema, [PROPERTIES_KEY3, propertyName], {}),
+          schema: getPropertySchema3(schema, propertyName),
           uiSchema: fieldUiSchema,
-          errorSchema: get4(errorSchema, [propertyName]),
+          errorSchema: getByPath3(errorSchema, propertyName),
           fieldPathId: childFieldPathId,
-          formData: get4(formData, [propertyName]),
+          formData: getByPath3(formData, propertyName),
           handleKeyRename,
           handleRemoveProperty,
           addedByAdditionalProperties,
@@ -2362,7 +2345,7 @@ import { useCallback as useCallback6, memo as memo3 } from "react";
 import {
   ADDITIONAL_PROPERTY_FLAG as ADDITIONAL_PROPERTY_FLAG2,
   ANY_OF_KEY as ANY_OF_KEY5,
-  deepEquals as deepEquals2,
+  deepEquals as deepEquals4,
   descriptionId,
   getSchemaType as getSchemaType2,
   getTemplate as getTemplate10,
@@ -2375,11 +2358,10 @@ import {
   shallowEquals,
   shouldRenderOptionalField as shouldRenderOptionalField4,
   toFieldPathId as toFieldPathId5,
+  isObject as isObject5,
   TranslatableString as TranslatableString7,
   UI_OPTIONS_KEY as UI_OPTIONS_KEY2
 } from "@rjsf/utils";
-import isObject5 from "lodash/isObject";
-import omit3 from "lodash/omit";
 import { Fragment, jsx as jsx12, jsxs as jsxs2 } from "react/jsx-runtime";
 var COMPONENT_TYPES = {
   array: "ArrayField",
@@ -2490,9 +2472,19 @@ function SchemaFieldRender(props) {
     };
   }
   const { __errors, ...fieldErrorSchema } = errorSchema || {};
-  const fieldUiSchema = omit3(uiSchema, ["ui:classNames", "classNames", "ui:style"]);
+  const {
+    "ui:classNames": consumedUiClassNames,
+    classNames: consumedClassNames,
+    "ui:style": consumedUiStyle,
+    ...fieldUiSchema
+  } = uiSchema;
   if (UI_OPTIONS_KEY2 in fieldUiSchema) {
-    fieldUiSchema[UI_OPTIONS_KEY2] = omit3(fieldUiSchema[UI_OPTIONS_KEY2], ["classNames", "style"]);
+    const {
+      classNames: consumedOptionClassNames,
+      style: consumedOptionStyle,
+      ...fieldUiOptions
+    } = fieldUiSchema[UI_OPTIONS_KEY2];
+    fieldUiSchema[UI_OPTIONS_KEY2] = fieldUiOptions;
   }
   const field = /* @__PURE__ */ jsx12(
     FieldComponent,
@@ -2620,7 +2612,7 @@ var SchemaField = memo3(SchemaFieldRender, (prevProps, nextProps) => {
   if (experimental_componentUpdateStrategy === "shallow") {
     return shallowEquals(prevProps, nextProps);
   }
-  return deepEquals2(prevProps, nextProps);
+  return deepEquals4(prevProps, nextProps);
 });
 var SchemaField_default = SchemaField;
 
@@ -3013,7 +3005,7 @@ function BaseInputTemplate(props) {
     (e) => {
       e.preventDefault();
       e.stopPropagation();
-      onChange(options.emptyValue ?? "");
+      onChange(options.emptyValue);
     },
     [onChange, options.emptyValue]
   );
@@ -3738,14 +3730,15 @@ function CheckboxWidget({
   onFocus,
   onChange,
   registry,
-  htmlName
+  htmlName,
+  required
 }) {
   const DescriptionFieldTemplate = getTemplate18(
     "DescriptionFieldTemplate",
     registry,
     options
   );
-  const required = schemaRequiresTrueValue(schema);
+  const trueValueRequired = schemaRequiresTrueValue(schema) && required;
   const handleChange = useCallback10(
     (event) => onChange(event.target.checked),
     [onChange]
@@ -3789,7 +3782,13 @@ function CheckboxWidget({
           "aria-describedby": ariaDescribedByIds3(id)
         }
       ),
-      labelValue(/* @__PURE__ */ jsx44("span", { children: label }), hideLabel)
+      labelValue(
+        /* @__PURE__ */ jsxs18("span", { children: [
+          label,
+          trueValueRequired && /* @__PURE__ */ jsx44("span", { className: "required", children: "*" })
+        ] }),
+        hideLabel
+      )
     ] })
   ] });
 }
@@ -4032,7 +4031,6 @@ function RatingWidget({
   required,
   disabled,
   readonly,
-  autofocus,
   onChange,
   onFocus,
   onBlur,
@@ -4389,8 +4387,16 @@ function getDefaultRegistry() {
 // src/components/Form.tsx
 import { jsx as jsx61, jsxs as jsxs24 } from "react/jsx-runtime";
 function toIChangeEvent(state, status) {
+  const { schema, uiSchema, fieldPathId, schemaUtils, formData, edit, errors, errorSchema } = state;
   return {
-    ..._pick(state, ["schema", "uiSchema", "fieldPathId", "schemaUtils", "formData", "edit", "errors", "errorSchema"]),
+    schema,
+    uiSchema,
+    fieldPathId,
+    schemaUtils,
+    formData,
+    edit,
+    errors,
+    errorSchema,
     ...status !== void 0 && { status }
   };
 }
@@ -4451,7 +4457,7 @@ var Form = class _Form extends Component {
       ...this.getStateFromProps(props, formData, void 0, void 0, void 0, true),
       prevExtraErrors: props.extraErrors
     };
-    if (onChange && !deepEquals3(this.state.formData, formData)) {
+    if (onChange && !deepEquals5(this.state.formData, formData)) {
       onChange(toIChangeEvent(this.state));
     }
     this.formElement = createRef();
@@ -4475,12 +4481,12 @@ var Form = class _Form extends Component {
    *        with a flag indicating that an update is not necessary.
    */
   getSnapshotBeforeUpdate(prevProps, prevState) {
-    if (!deepEquals3(this.props, prevProps)) {
+    if (!deepEquals5(this.props, prevProps)) {
       const formDataChangedFields = getChangedFields(this.props.formData, prevProps.formData);
       const stateDataChangedFields = getChangedFields(this.props.formData, this.state.formData);
-      const isSchemaChanged = !deepEquals3(prevProps.schema, this.props.schema);
-      const isFormDataChanged = formDataChangedFields.length > 0 || !deepEquals3(prevProps.formData, this.props.formData);
-      const isStateDataChanged = stateDataChangedFields.length > 0 || !deepEquals3(this.state.formData, this.props.formData);
+      const isSchemaChanged = !deepEquals5(prevProps.schema, this.props.schema);
+      const isFormDataChanged = formDataChangedFields.length > 0 || !deepEquals5(prevProps.formData, this.props.formData);
+      const isStateDataChanged = stateDataChangedFields.length > 0 || !deepEquals5(this.state.formData, this.props.formData);
       const nextState = this.getStateFromProps(
         this.props,
         this.props.formData,
@@ -4489,11 +4495,13 @@ var Form = class _Form extends Component {
         //  match one of the subSchemas, the retrieved schema must be updated.
         isSchemaChanged || isFormDataChanged ? void 0 : this.state.retrievedSchema,
         isSchemaChanged,
-        formDataChangedFields,
+        // Only the error clearing needs the path of each changed field, and it runs only when live validation does
+        // not, so the walk that produces them is left for `getStateFromProps` to ask for
+        () => getChangedFields(this.props.formData, prevProps.formData, true),
         // Skip live validation for this request if no form data has changed from the last state
         !isStateDataChanged
       );
-      const shouldUpdate = !deepEquals3(nextState, prevState);
+      const shouldUpdate = !deepEquals5(nextState, prevState);
       return { nextState, shouldUpdate };
     }
     return { shouldUpdate: false };
@@ -4513,13 +4521,13 @@ var Form = class _Form extends Component {
   componentDidUpdate(_, prevState, snapshot) {
     if (snapshot.shouldUpdate) {
       const { nextState } = snapshot;
-      const nextStateDiffersFromProps = !deepEquals3(nextState.formData, this.props.formData);
+      const nextStateDiffersFromProps = !deepEquals5(nextState.formData, this.props.formData);
       const wasProcessingUserChange = this.isProcessingUserChange;
       this.isProcessingUserChange = false;
       if (wasProcessingUserChange && nextStateDiffersFromProps) {
         return;
       }
-      if (nextStateDiffersFromProps && !deepEquals3(nextState.formData, prevState.formData) && this.props.onChange) {
+      if (nextStateDiffersFromProps && !deepEquals5(nextState.formData, prevState.formData) && this.props.onChange) {
         this.props.onChange(toIChangeEvent(nextState));
       }
       this.setState(nextState);
@@ -4533,12 +4541,13 @@ var Form = class _Form extends Component {
    * @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=false] - A flag indicating whether the schema has changed.
-   * @param [formDataChangedFields=[]] - The changed fields of `formData`
+   * @param [getFormDataChangedFields=() => []] - Optional function returning the path of each `formData` field that
+   *          changed, only called when those paths are needed, which is when live validation is not going to run
    * @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, shouldSanitize = false) {
+  getStateFromProps(props, inputFormData, retrievedSchema, isSchemaChanged = false, getFormDataChangedFields = () => [], skipLiveValidate = false, shouldSanitize = false) {
     const state = this.state || {};
     const schema = "schema" in props ? props.schema : this.props.schema;
     const validator2 = "validator" in props ? props.validator : this.props.validator;
@@ -4585,13 +4594,13 @@ var Form = class _Form extends Component {
       computedRetrievedSchema = this.updateRetrievedSchema(
         retrievedSchema ?? schemaUtils.retrieveSchema(rootSchema, formData)
       );
-      if (shouldSanitize && !preventInfiniteSanitize.includes(formHash) && !deepEquals3(computedRetrievedSchema, state.retrievedSchema)) {
+      if (shouldSanitize && !preventInfiniteSanitize.includes(formHash) && !deepEquals5(computedRetrievedSchema, state.retrievedSchema)) {
         const sanitizedFormData = schemaUtils.sanitizeDataForNewSchema(
           computedRetrievedSchema,
           state.retrievedSchema,
           formData
         );
-        wasSanitized = !deepEquals3(sanitizedFormData, formData);
+        wasSanitized = !deepEquals5(sanitizedFormData, formData);
         if (wasSanitized) {
           formData = sanitizedFormData;
           defaultsFormData = sanitizedFormData;
@@ -4643,24 +4652,30 @@ var Form = class _Form extends Component {
       const currentErrors = getCurrentErrors();
       errors = currentErrors.errors;
       errorSchema = currentErrors.errorSchema;
-      if (formDataChangedFields.length > 0 && !mustValidate) {
-        const newErrorSchema = formDataChangedFields.reduce((acc, key) => {
-          acc[key] = void 0;
-          return acc;
-        }, {});
-        schemaValidationErrorSchema = mergeObjects(
-          currentErrors.errorSchema,
-          newErrorSchema,
-          "preventDuplicates"
-        );
-        errorSchema = schemaValidationErrorSchema;
+      if (!mustValidate) {
+        const formDataChangedFields = getFormDataChangedFields();
+        if (formDataChangedFields.length > 0) {
+          const newErrorSchema = formDataChangedFields.reduce((acc, path) => {
+            const pathOfField = toPath2(path);
+            for (let i = 1; i < pathOfField.length; i++) {
+              setByPath4(acc, [...pathOfField.slice(0, i), ERRORS_KEY3], void 0, true);
+            }
+            return setByPath4(acc, pathOfField, void 0, true);
+          }, {});
+          schemaValidationErrorSchema = mergeObjects(
+            currentErrors.errorSchema,
+            newErrorSchema,
+            "preventDuplicates"
+          );
+          errorSchema = schemaValidationErrorSchema;
+        }
       }
       const mergedErrors = _Form.mergeErrors({ errorSchema, errors }, props.extraErrors, state.customErrors);
       errors = mergedErrors.errors;
       errorSchema = mergedErrors.errorSchema;
     }
     const newRegistry = _Form.getRegistry(props, rootSchema, schemaUtils);
-    const registry = deepEquals3(state.registry, newRegistry) ? state.registry : newRegistry;
+    const registry = deepEquals5(state.registry, newRegistry) ? state.registry : newRegistry;
     const fieldPathId = state.fieldPathId && state.fieldPathId?.[ID_KEY6] === registry.globalFormOptions.idPrefix ? state.fieldPathId : toFieldPathId6("", registry.globalFormOptions);
     const nextState = {
       schemaUtils,
@@ -4851,14 +4866,14 @@ var Form = class _Form extends Component {
     let mergeBaseErrorSchema = schemaValidationErrorSchema;
     const rootPathId = fieldPathId.path[0] || "";
     const isRootPath = !path || path.length === 0 || path.length === 1 && path[0] === rootPathId;
-    let formData = isRootPath ? newValue : _cloneDeep(oldFormData);
+    let formData = isRootPath ? newValue : structuredClone(oldFormData);
     const hasOnlyUndefinedValues = isObject6(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;
     if (isObject6(formData) || Array.isArray(formData)) {
       let plainLeafWasCleared = false;
       if (newValue === ADDITIONAL_PROPERTY_KEY_REMOVE) {
-        _unset(formData, path);
+        unsetByPath(formData, path);
       } else if (!isRootPath) {
         let valueForPath = newValue;
         if (newValue === void 0) {
@@ -4875,9 +4890,9 @@ var Form = class _Form extends Component {
           }
         }
         if (plainLeafWasCleared) {
-          _set(formData, path, void 0);
+          setByPath4(formData, path, void 0);
         } else {
-          _set(formData, path, valueForPath);
+          setByPath4(formData, path, valueForPath);
         }
       }
       const shouldSanitize = retrievedSchema && !isRootPath && !isObject6(newValue) && !Array.isArray(newValue) && !disabled && !readonly;
@@ -4893,7 +4908,7 @@ var Form = class _Form extends Component {
       formData = newState.formData;
       retrievedSchema = newState.retrievedSchema;
       if (plainLeafWasCleared && formData) {
-        _set(formData, path, void 0);
+        setByPath4(formData, path, void 0);
       }
     }
     const mustValidate = !noValidate && (liveValidate === true || liveValidate === "onChange");
@@ -4904,11 +4919,11 @@ var Form = class _Form extends Component {
       state = { ...state, formData: newFormData };
     }
     if (newErrorSchema) {
-      const oldValidationError = !isRootPath ? _get(schemaValidationErrorSchema, path) : schemaValidationErrorSchema;
-      if (!_isEmpty(oldValidationError)) {
+      const oldValidationError = !isRootPath ? getByPath4(schemaValidationErrorSchema, path) : schemaValidationErrorSchema;
+      if (oldValidationError && Object.keys(oldValidationError).length > 0) {
         if (!isRootPath) {
-          mergeBaseErrorSchema = _cloneDeep(schemaValidationErrorSchema);
-          _set(mergeBaseErrorSchema, path, newErrorSchema);
+          mergeBaseErrorSchema = structuredClone(schemaValidationErrorSchema);
+          setByPath4(mergeBaseErrorSchema, path, newErrorSchema, true);
         } else {
           mergeBaseErrorSchema = newErrorSchema;
         }
@@ -4917,15 +4932,15 @@ var Form = class _Form extends Component {
           customErrors = new ErrorSchemaBuilder();
         }
         if (isRootPath) {
-          const pathErrors = _get(newErrorSchema, ERRORS_KEY3);
+          const pathErrors = newErrorSchema[ERRORS_KEY3];
           if (pathErrors) {
             customErrors.setErrors(pathErrors);
           }
         } else {
-          _set(customErrors.ErrorSchema, path, newErrorSchema);
+          setByPath4(customErrors.ErrorSchema, path, newErrorSchema, true);
         }
       }
-    } else if (customErrors && _get(customErrors.ErrorSchema, [...path, ERRORS_KEY3])) {
+    } else if (customErrors && getByPath4(customErrors.ErrorSchema, [...path, ERRORS_KEY3])) {
       customErrors.clearErrors(path);
     }
     if (mustValidate && this.pendingChanges.length === 1) {
@@ -4965,7 +4980,7 @@ var Form = class _Form extends Component {
    * @returns The new retrieved schema if it has changed, else the old retrieved schema.
    */
   updateRetrievedSchema(retrievedSchema) {
-    const isTheSame = deepEquals3(retrievedSchema, this.state?.retrievedSchema);
+    const isTheSame = deepEquals5(retrievedSchema, this.state?.retrievedSchema);
     return isTheSame ? this.state.retrievedSchema : retrievedSchema;
   }
   /**
@@ -5031,9 +5046,9 @@ var Form = class _Form extends Component {
         state = { formData: newFormData, ...liveValidation, customErrors };
       }
       const hasChanges = Object.keys(state).filter((key) => !key.startsWith("schemaValidation")).some((key) => {
-        const oldData = _get(this.state, key);
-        const newData = _get(state, key);
-        return !deepEquals3(oldData, newData);
+        const oldData = this.state[key];
+        const newData = state[key];
+        return !deepEquals5(oldData, newData);
       });
       this.setState(state, () => {
         if (onChange && hasChanges) {
@@ -5160,12 +5175,8 @@ var Form = class _Form extends Component {
   focusOnError(error) {
     const { idPrefix = "root", idSeparator = "_" } = this.props;
     const { property } = error;
-    const path = _toPath(property);
-    if (path[0] === "") {
-      path[0] = idPrefix;
-    } else {
-      path.unshift(idPrefix);
-    }
+    const path = toPath2(property ?? "");
+    path.unshift(idPrefix);
     const elementId = path.join(idSeparator);
     let field = this.formElement.current.elements[elementId];
     if (!field) {