@rjsf/core 6.8.0 → 6.10.0

package/dist/core.umd.js

@@ -1,12 +1,14 @@
 (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/isEqual'), require('lodash/isFunction'), require('lodash/isPlainObject'), require('lodash/isString'), require('lodash/isUndefined'), require('lodash/last'), require('lodash/noop'), require('lodash/omit'), require('markdown-to-jsx/react'), 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/isEqual', 'lodash/isFunction', 'lodash/isPlainObject', 'lodash/isString', 'lodash/isUndefined', 'lodash/last', 'lodash/noop', 'lodash/omit', 'markdown-to-jsx/react', '@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.isEqual, global.isFunction, global.isPlainObject, global.isString, global.isUndefined, global.last, global.noop, global.omit3, global.react$1, global.validator));
-})(this, (function (exports, react, utils, _cloneDeep, get, isEmpty, _pick, set, _toPath, _unset, isObject, uniqueId, jsxRuntime, each, flatten, has, includes, intersection, isEqual, isFunction, isPlainObject, isString, isUndefined, last, noop, omit3, react$1, validator) { 'use strict';
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('react'), require('@rjsf/utils'), require('react/jsx-runtime'), require('markdown-to-jsx/react'), require('@rjsf/validator-ajv8')) :
+  typeof define === 'function' && define.amd ? define(['exports', 'react', '@rjsf/utils', 'react/jsx-runtime', 'markdown-to-jsx/react', '@rjsf/validator-ajv8'], factory) :
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.JSONSchemaForm = {}, global.react, global.utils, global.jsxRuntime, global.react$1, global.validator));
+})(this, (function (exports, react, utils, jsxRuntime, react$1, validator) { 'use strict';
 
   // src/components/Form.tsx
+  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) => ({
@@ -269,14 +271,14 @@
     const { description } = utils.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 = react.useCallback(
       (event) => {
         handleAddItem(event, index + 1);
@@ -336,10 +338,10 @@
         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,
@@ -354,7 +356,7 @@
       itemKey,
       className: "rjsf-array-item",
       disabled,
-      hasToolbar: has4.toolbar,
+      hasToolbar: has.toolbar,
       index,
       totalItems,
       readonly,
@@ -397,7 +399,7 @@
     const { schemaUtils, fields: fields2, formContext, globalUiOptions } = registry;
     const { OptionalDataControlsField: OptionalDataControlsField2 } = fields2;
     const uiOptions = react.useMemo(() => utils.getUiOptions(uiSchema, globalUiOptions), [uiSchema, globalUiOptions]);
-    const schemaItems = react.useMemo(() => isObject(schema.items) ? schema.items : {}, [schema.items]);
+    const schemaItems = react.useMemo(() => utils.isObject(schema.items) ? schema.items : {}, [schema.items]);
     const itemsSchema = react.useMemo(() => schemaUtils.retrieveSchema(schemaItems), [schemaUtils, schemaItems]);
     const formData = react.useMemo(() => keyedToPlainFormData(keyedFormData), [keyedFormData]);
     const renderOptionalField = utils.shouldRenderOptionalField(registry, schema, required, uiSchema);
@@ -499,11 +501,8 @@
     const { OptionalDataControlsField: OptionalDataControlsField2 } = fields2;
     const renderOptionalField = utils.shouldRenderOptionalField(registry, schema, required, uiSchema);
     const hasFormData = utils.isFormDataAvailable(formData);
-    const schemaItems = react.useMemo(
-      () => isObject(schema.items) ? schema.items : [],
-      [schema.items]
-    );
-    const hasAdditionalItems = isObject(schema.additionalItems);
+    const schemaItems = react.useMemo(() => Array.isArray(schema.items) ? schema.items : [], [schema.items]);
+    const hasAdditionalItems = utils.isObject(schema.additionalItems);
     const childFieldPathId = props.childFieldPathId ?? fieldPathId;
     if (items.length < schemaItems.length) {
       items = items.concat(new Array(schemaItems.length - items.length));
@@ -522,7 +521,7 @@
         const { key, item } = keyedItem;
         const itemCast = item;
         const additional = index >= schemaItems.length;
-        const rawItemSchema = (additional && isObject(schema.additionalItems) ? schema.additionalItems : schemaItems[index]) || {};
+        const rawItemSchema = (additional && utils.isObject(schema.additionalItems) ? schema.additionalItems : schemaItems[index]) || {};
         let itemUiSchema;
         if (additional) {
           itemUiSchema = uiSchema.additionalItems;
@@ -625,9 +624,9 @@
           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]);
+              utils.setByPath(newErrorSchema, i, errorSchemaRef.current[i]);
             } else if (i >= index) {
-              set(newErrorSchema, [i + 1], errorSchemaRef.current[i]);
+              utils.setByPath(newErrorSchema, i + 1, errorSchemaRef.current[i]);
             }
           }
         }
@@ -656,15 +655,15 @@
           for (const idx of Object.keys(errorSchemaRef.current)) {
             const i = parseInt(idx, 10);
             if (i <= index) {
-              set(newErrorSchema, [i], errorSchemaRef.current[i]);
+              utils.setByPath(newErrorSchema, i, errorSchemaRef.current[i]);
             } else if (i > index) {
-              set(newErrorSchema, [i + 1], errorSchemaRef.current[i]);
+              utils.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) {
@@ -687,9 +686,9 @@
           for (const idx of Object.keys(errorSchemaRef.current)) {
             const i = parseInt(idx, 10);
             if (i < index) {
-              set(newErrorSchema, [i], errorSchemaRef.current[i]);
+              utils.setByPath(newErrorSchema, i, errorSchemaRef.current[i]);
             } else if (i > index) {
-              set(newErrorSchema, [i - 1], errorSchemaRef.current[i]);
+              utils.setByPath(newErrorSchema, i - 1, errorSchemaRef.current[i]);
             }
           }
         }
@@ -710,11 +709,11 @@
           for (const idx of Object.keys(errorSchemaRef.current)) {
             const i = parseInt(idx, 10);
             if (i === index) {
-              set(newErrorSchema, [newIndex], errorSchemaRef.current[index]);
+              utils.setByPath(newErrorSchema, newIndex, errorSchemaRef.current[index]);
             } else if (i === newIndex) {
-              set(newErrorSchema, [index], errorSchemaRef.current[newIndex]);
+              utils.setByPath(newErrorSchema, index, errorSchemaRef.current[newIndex]);
             } else {
-              set(newErrorSchema, [idx], errorSchemaRef.current[i]);
+              utils.setByPath(newErrorSchema, idx, errorSchemaRef.current[i]);
             }
           }
         }
@@ -839,7 +838,7 @@
       enumOptions = utils.optionsList(
         {
           oneOf: schema.oneOf.map((option) => {
-            if (isObject(option)) {
+            if (utils.isObject(option)) {
               return {
                 ...option,
                 title: option.title || (option.const === true ? yes : no)
@@ -1051,37 +1050,38 @@
   }
   var LAYOUT_GRID_FIELD_TEST_IDS = utils.getTestIds();
   function computeFieldUiSchema(field, uiProps, uiSchema, schemaReadonly, forceReadonly) {
-    const globalUiOptions = get(uiSchema, [utils.UI_GLOBAL_OPTIONS_KEY], {});
-    const localUiSchema = get(uiSchema, field);
-    const localUiOptions = { ...get(localUiSchema, [utils.UI_OPTIONS_KEY], {}), ...uiProps, ...globalUiOptions };
+    const globalUiOptions = uiSchema?.[utils.UI_GLOBAL_OPTIONS_KEY] ?? {};
+    const localUiSchema = utils.getByPath(uiSchema, utils.toPath(field));
+    const localUiOptions = { ...localUiSchema?.[utils.UI_OPTIONS_KEY] ?? {}, ...uiProps, ...globalUiOptions };
     const fieldUiSchema = { ...localUiSchema };
-    if (!isEmpty(localUiOptions)) {
-      set(fieldUiSchema, [utils.UI_OPTIONS_KEY], localUiOptions);
+    if (Object.keys(localUiOptions).length > 0) {
+      fieldUiSchema[utils.UI_OPTIONS_KEY] = localUiOptions;
     }
-    if (!isEmpty(globalUiOptions)) {
-      set(fieldUiSchema, [utils.UI_GLOBAL_OPTIONS_KEY], globalUiOptions);
+    if (Object.keys(globalUiOptions).length > 0) {
+      fieldUiSchema[utils.UI_GLOBAL_OPTIONS_KEY] = globalUiOptions;
     }
     let { readonly: uiReadonly } = utils.getUiOptions(fieldUiSchema);
-    if (forceReadonly === true || isUndefined(uiReadonly) && schemaReadonly === true) {
+    if (forceReadonly === true || uiReadonly === void 0 && schemaReadonly === true) {
       uiReadonly = true;
-      if (has(localUiOptions, utils.READONLY_KEY)) {
-        set(fieldUiSchema, [utils.UI_OPTIONS_KEY, utils.READONLY_KEY], true);
+      const fieldUiOptions = fieldUiSchema[utils.UI_OPTIONS_KEY];
+      if (fieldUiOptions && utils.READONLY_KEY in fieldUiOptions) {
+        fieldUiOptions[utils.READONLY_KEY] = true;
       } else {
-        set(fieldUiSchema, `ui:${utils.READONLY_KEY}`, true);
+        fieldUiSchema[`ui:${utils.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 utils.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;
     }
@@ -1089,7 +1089,7 @@
   function findChildrenAndProps(layoutGridSchema, schemaKey, registry) {
     let gridProps = {};
     let children = layoutGridSchema[schemaKey];
-    if (isPlainObject(children)) {
+    if (utils.isPlainObject(children)) {
       const { children: elements, className: toMapClassNames, ...otherProps } = children;
       children = elements;
       if (toMapClassNames) {
@@ -1108,12 +1108,12 @@
   function computeArraySchemasIfPresent(schema, fieldPathId, potentialIndex) {
     let rawSchema;
     let resultPathId = fieldPathId;
-    if (isNumericIndex(potentialIndex) && schema && schema?.type === "array" && has(schema, utils.ITEMS_KEY)) {
+    if (isNumericIndex(potentialIndex) && schema && schema?.type === "array" && utils.ITEMS_KEY in schema) {
       const index = Number(potentialIndex);
       const items = schema[utils.ITEMS_KEY];
       if (Array.isArray(items)) {
         if (index > items.length) {
-          rawSchema = last(items);
+          rawSchema = items.at(-1);
         } else {
           rawSchema = items[index];
         }
@@ -1138,44 +1138,45 @@
     let isReadonly = schema.readOnly;
     parts.forEach((part) => {
       fieldPathId = utils.toFieldPathId(part, globalFormOptions, fieldPathId);
-      if (has(schema, utils.PROPERTIES_KEY)) {
-        rawSchema = get(schema, [utils.PROPERTIES_KEY, part], {});
-      } else if (schema && (has(schema, utils.ONE_OF_KEY) || has(schema, utils.ANY_OF_KEY))) {
-        const xxx = has(schema, utils.ONE_OF_KEY) ? utils.ONE_OF_KEY : utils.ANY_OF_KEY;
+      const schemaProperties = schema?.[utils.PROPERTIES_KEY];
+      if (schemaProperties) {
+        rawSchema = schemaProperties[part] ?? {};
+      } else if (schema && (utils.ONE_OF_KEY in schema || utils.ANY_OF_KEY in schema)) {
+        const xxx = utils.ONE_OF_KEY in schema ? utils.ONE_OF_KEY : utils.ANY_OF_KEY;
         const selectedSchema = schemaUtils.findSelectedOptionInXxxOf(schema, part, xxx, innerData);
-        rawSchema = get(selectedSchema, [utils.PROPERTIES_KEY, part], {});
+        rawSchema = utils.getPropertySchema(selectedSchema, part);
       } else {
         const result = computeArraySchemasIfPresent(schema, fieldPathId, part);
         rawSchema = result.rawSchema ?? {};
         fieldPathId = result.fieldPathId;
       }
-      innerData = get(innerData, part, {});
+      innerData = utils.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, utils.ONE_OF_KEY) || has(schema, utils.ANY_OF_KEY))) {
-        const xxx = has(schema, utils.ONE_OF_KEY) ? utils.ONE_OF_KEY : utils.ANY_OF_KEY;
+      if (schema && (utils.ONE_OF_KEY in schema || utils.ANY_OF_KEY in schema)) {
+        const xxx = utils.ONE_OF_KEY in schema ? utils.ONE_OF_KEY : utils.ANY_OF_KEY;
         schema = schemaUtils.findSelectedOptionInXxxOf(schema, leafPath, xxx, innerData);
       }
       fieldPathId = utils.toFieldPathId(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, [utils.PROPERTIES_KEY, leafPath]);
+        schema = schema?.[utils.PROPERTIES_KEY]?.[leafPath];
         schema = schema ? schemaUtils.retrieveSchema(schema) : schema;
       }
       isReadonly = getNonNullishValue(schema?.readOnly, isReadonly);
-      if (schema && (has(schema, utils.ONE_OF_KEY) || has(schema, utils.ANY_OF_KEY))) {
-        const xxx = has(schema, utils.ONE_OF_KEY) ? utils.ONE_OF_KEY : utils.ANY_OF_KEY;
+      if (schema && (utils.ONE_OF_KEY in schema || utils.ANY_OF_KEY in schema)) {
+        const xxx = utils.ONE_OF_KEY in schema ? utils.ONE_OF_KEY : utils.ANY_OF_KEY;
         const discriminator = utils.getDiscriminatorFieldFromSchema(schema);
         optionsInfo = { options: schema[xxx], hasDiscriminator: !!discriminator };
       }
@@ -1184,10 +1185,10 @@
   }
   function getCustomRenderComponent(render, registry) {
     let customRenderer = render;
-    if (isString(customRenderer)) {
+    if (typeof customRenderer === "string") {
       customRenderer = utils.lookupFromFormContext(registry, customRenderer);
     }
-    if (isFunction(customRenderer)) {
+    if (typeof customRenderer === "function") {
       return customRenderer;
     }
     return null;
@@ -1197,23 +1198,21 @@
     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] = utils.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] = utils.lookupFromFormContext(registry, lookupName, lookupName);
           }
-        });
-      }
+        }
+      });
       UIComponent = getCustomRenderComponent(render, registry);
       if (!innerName && UIComponent) {
         rendered = /* @__PURE__ */ jsxRuntime.jsx(UIComponent, { ...innerProps, "data-testid": LAYOUT_GRID_FIELD_TEST_IDS.uiComponent });
@@ -1241,7 +1240,7 @@
     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 = utils.getByPath(formData, utils.toPath(field), null);
     if (conditionMatches(operator, fieldData, value)) {
       return /* @__PURE__ */ jsxRuntime.jsx(LayoutGridFieldChildren, { ...layoutGridFieldProps, childrenLayoutGridSchemaId: children });
     }
@@ -1315,6 +1314,7 @@
     if (schema) {
       const Field = optionsInfo?.hasDiscriminator ? LayoutMultiSchemaField2 : SchemaField2;
       const { fieldUiSchema, uiReadonly } = computeFieldUiSchema(name, uiProps, uiSchema, isReadonly, readonly);
+      const namePath = utils.toPath(name);
       return /* @__PURE__ */ jsxRuntime.jsx(
         Field,
         {
@@ -1325,9 +1325,9 @@
           readonly: uiReadonly,
           schema,
           uiSchema: fieldUiSchema,
-          errorSchema: get(errorSchema, name),
+          errorSchema: utils.getByPath(errorSchema, namePath),
           fieldPathId: memoFieldPathId,
-          formData: get(formData, name),
+          formData: utils.getByPath(formData, namePath),
           onChange,
           onBlur,
           onFocus,
@@ -1363,10 +1363,10 @@
     const { uiSchema } = props;
     let { layoutGridSchema } = props;
     const uiOptions = utils.getUiOptions(uiSchema);
-    if (!layoutGridSchema && LAYOUT_GRID_UI_OPTION in uiOptions && isObject(uiOptions[LAYOUT_GRID_UI_OPTION])) {
+    if (!layoutGridSchema && LAYOUT_GRID_UI_OPTION in uiOptions && utils.isObject(uiOptions[LAYOUT_GRID_UI_OPTION])) {
       layoutGridSchema = uiOptions[LAYOUT_GRID_UI_OPTION];
     }
-    if (isObject(layoutGridSchema)) {
+    if (utils.isObject(layoutGridSchema)) {
       if ("ui:row" /* ROW */ in layoutGridSchema) {
         return /* @__PURE__ */ jsxRuntime.jsx(LayoutGridRow, { ...props, layoutGridSchema });
       }
@@ -1413,17 +1413,17 @@
     const defaultValue = "!@#!@$@#$!@$#";
     const schemaOptions = options.map(({ schema }) => schema);
     return schemaOptions.find((option) => {
-      const selector = get(option, [utils.PROPERTIES_KEY, selectorField]);
-      const result = get(selector, utils.DEFAULT_KEY, get(selector, utils.CONST_KEY, defaultValue));
+      const selector = option[utils.PROPERTIES_KEY]?.[selectorField];
+      const result = utils.getByPath(selector, utils.DEFAULT_KEY, utils.getByPath(selector, utils.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 (has(schema, utils.ONE_OF_KEY)) {
+    if (utils.ONE_OF_KEY in schema) {
       tempSchema = { ...schema, [utils.ONE_OF_KEY]: realOptions };
-    } else if (has(schema, utils.ANY_OF_KEY)) {
+    } else if (utils.ANY_OF_KEY in schema) {
       tempSchema = { ...schema, [utils.ANY_OF_KEY]: realOptions };
     }
     const enumOptions = utils.optionsList(tempSchema, uiSchema);
@@ -1454,7 +1454,7 @@
     } = props;
     const { widgets: widgets2, schemaUtils, globalUiOptions } = registry;
     const [enumOptions, setEnumOptions] = react.useState(computeEnumOptions(schema, options, schemaUtils, uiSchema, formData));
-    const id = get(fieldPathId, utils.ID_KEY);
+    const id = fieldPathId[utils.ID_KEY];
     const discriminator = utils.getDiscriminatorFieldFromSchema(schema);
     const FieldErrorTemplate2 = utils.getTemplate("FieldErrorTemplate", registry, options);
     const FieldTemplate2 = utils.getTemplate("FieldTemplate", registry, options);
@@ -1476,14 +1476,15 @@
     if (!selectorField) {
       throw new Error("No selector field provided for the LayoutMultiSchemaField");
     }
-    const selectedOption = get(formData, selectorField);
-    let optionSchema = get(enumOptions[0]?.schema, [utils.PROPERTIES_KEY, selectorField], {});
+    const selectedOption = utils.getByPath(formData, selectorField);
+    let optionSchema = utils.getPropertySchema(enumOptions[0]?.schema, selectorField);
     const option = getSelectedOption(enumOptions, selectorField, selectedOption);
     optionSchema = optionSchema?.type ? optionSchema : { ...optionSchema, type: option?.type || baseType };
     const Widget = utils.getWidget(optionSchema, widget, widgets2);
     const hideFieldError = uiSchemaHideError === void 0 ? hideError : Boolean(uiSchemaHideError);
-    const rawErrors = get(errorSchema, [utils.ERRORS_KEY], []);
-    const fieldErrorSchema = omit3(errorSchema, [utils.ERRORS_KEY]);
+    const rawErrors = errorSchema?.[utils.ERRORS_KEY] ?? [];
+    const fieldErrorSchema = { ...errorSchema };
+    delete fieldErrorSchema[utils.ERRORS_KEY];
     const displayLabel = schemaUtils.getDisplayLabel(schema, uiSchema, globalUiOptions);
     const onOptionChange = (opt) => {
       if (disabled || readonly) {
@@ -1496,7 +1497,7 @@
         newFormData = schemaUtils.getDefaultFormState(newOption, newFormData, "excludeObjectChildren");
       }
       if (newFormData) {
-        set(newFormData, selectorField, opt);
+        utils.setByPath(newFormData, selectorField, opt);
       }
       onChange(newFormData, fieldPathId.path, void 0, id);
     };
@@ -1509,7 +1510,7 @@
         id,
         schema,
         label: (title || schema.title) ?? "",
-        disabled: disabled || Array.isArray(enumOptions) && isEmpty(enumOptions),
+        disabled: disabled || Array.isArray(enumOptions) && enumOptions.length === 0,
         uiSchema,
         required,
         readonly: !!readonly,
@@ -1517,9 +1518,9 @@
         displayLabel,
         errors,
         onChange,
-        onKeyRename: noop,
-        onKeyRenameBlur: noop,
-        onRemoveProperty: noop,
+        onKeyRename: utils.noop,
+        onKeyRenameBlur: utils.noop,
+        onRemoveProperty: utils.noop,
         children: /* @__PURE__ */ jsxRuntime.jsx(
           Widget,
           {
@@ -1527,7 +1528,7 @@
             name,
             schema,
             label: (title || schema.title) ?? "",
-            disabled: disabled || Array.isArray(enumOptions) && isEmpty(enumOptions),
+            disabled: disabled || Array.isArray(enumOptions) && enumOptions.length === 0,
             uiSchema,
             autofocus,
             readonly,
@@ -1554,7 +1555,7 @@
     const {
       name,
       disabled = false,
-      errorSchema = {},
+      errorSchema,
       formData,
       fieldPathId,
       onBlur,
@@ -1644,8 +1645,9 @@
       ...uiOptions
     } = utils.getUiOptions(uiSchema, globalUiOptions);
     const Widget = utils.getWidget({ type: "number" }, widget, widgets2);
-    const rawErrors = get(errorSchema, utils.ERRORS_KEY, []);
-    const fieldErrorSchema = omit3(errorSchema, [utils.ERRORS_KEY]);
+    const rawErrors = errorSchema?.[utils.ERRORS_KEY] ?? [];
+    const fieldErrorSchema = { ...errorSchema };
+    delete fieldErrorSchema[utils.ERRORS_KEY];
     const displayLabel = schemaUtils.getDisplayLabel(schema, uiSchema, globalUiOptions);
     const option = selectedOption >= 0 ? retrievedOptions[selectedOption] || null : null;
     let optionSchema;
@@ -1696,7 +1698,7 @@
         onChange: onOptionChange,
         onBlur,
         onFocus,
-        disabled: disabled || isEmpty(enumOptions),
+        disabled: disabled || enumOptions.length === 0,
         multiple: false,
         rawErrors,
         errorSchema: fieldErrorSchema,
@@ -1832,12 +1834,12 @@
     const onPropertyChange = react.useCallback(
       (value, path, newErrorSchema, id) => {
         let normalizedValue = value;
-        if (value === void 0 && addedByAdditionalProperties) {
+        if (value === void 0 && addedByAdditionalProperties && utils.deepEquals(path, innerFieldIdPathId.path)) {
           normalizedValue = "";
         }
         onChange(normalizedValue, path, newErrorSchema, id);
       },
-      [onChange, addedByAdditionalProperties]
+      [onChange, addedByAdditionalProperties, innerFieldIdPathId]
     );
     const onKeyRename = react.useCallback(
       (value) => {
@@ -1932,7 +1934,7 @@
         const { duplicateKeySuffixSeparator = "-" } = utils.getUiOptions(uiSchema, globalUiOptions);
         let index = 0;
         let newKey = preferredKey;
-        while (has(existingFormData, newKey)) {
+        while (utils.hasByPath(existingFormData, newKey)) {
           index += 1;
           newKey = `${preferredKey}${duplicateKeySuffixSeparator}${index}`;
         }
@@ -1947,12 +1949,12 @@
       const newFormData = { ...formData };
       const newKey = getAvailableKey("newKey", newFormData);
       if (schema.patternProperties) {
-        set(newFormData, newKey, null);
+        utils.setByPath(newFormData, newKey, null);
       } else {
         let type = void 0;
         let constValue = void 0;
         let defaultValue = void 0;
-        if (isObject(schema.additionalProperties)) {
+        if (utils.isObject(schema.additionalProperties)) {
           type = schema.additionalProperties.type;
           constValue = schema.additionalProperties.const;
           defaultValue = schema.additionalProperties.default;
@@ -1968,7 +1970,7 @@
           }
         }
         const newValue = constValue ?? defaultValue ?? getDefaultValue(translateString, type);
-        set(newFormData, newKey, newValue);
+        utils.setByPath(newFormData, newKey, newValue);
       }
       if (lastRenamedProperty.current.previousKey === newKey) {
         lastRenamedProperty.current.currentKey = newKey;
@@ -2044,11 +2046,11 @@
           {
             propertyName,
             required: isRequired(schema, propertyName),
-            schema: get(schema, [utils.PROPERTIES_KEY, propertyName], {}),
+            schema: utils.getPropertySchema(schema, propertyName),
             uiSchema: fieldUiSchema,
-            errorSchema: get(errorSchema, [propertyName]),
+            errorSchema: utils.getByPath(errorSchema, propertyName),
             fieldPathId: childFieldPathId,
-            formData: get(formData, [propertyName]),
+            formData: utils.getByPath(formData, propertyName),
             handleKeyRename,
             handleRemoveProperty,
             addedByAdditionalProperties,
@@ -2232,12 +2234,12 @@
       if (schema[utils.ANY_OF_KEY]) {
         XxxOfField = _AnyOfField;
         XxxOfOptions = schema[utils.ANY_OF_KEY].map(
-          (xxxOfSchema) => schemaUtils.retrieveSchema(isObject(xxxOfSchema) ? xxxOfSchema : {}, formData)
+          (xxxOfSchema) => schemaUtils.retrieveSchema(utils.isObject(xxxOfSchema) ? xxxOfSchema : {}, formData)
         );
       } else if (schema[utils.ONE_OF_KEY]) {
         XxxOfField = _OneOfField;
         XxxOfOptions = schema[utils.ONE_OF_KEY].map(
-          (xxxOfSchema) => schemaUtils.retrieveSchema(isObject(xxxOfSchema) ? xxxOfSchema : {}, formData)
+          (xxxOfSchema) => schemaUtils.retrieveSchema(utils.isObject(xxxOfSchema) ? xxxOfSchema : {}, formData)
         );
       }
       const isOptionalRender = utils.shouldRenderOptionalField(registry, schema, required, uiSchema);
@@ -2251,9 +2253,19 @@
       };
     }
     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 (utils.UI_OPTIONS_KEY in fieldUiSchema) {
-      fieldUiSchema[utils.UI_OPTIONS_KEY] = omit3(fieldUiSchema[utils.UI_OPTIONS_KEY], ["classNames", "style"]);
+      const {
+        classNames: consumedOptionClassNames,
+        style: consumedOptionStyle,
+        ...fieldUiOptions
+      } = fieldUiSchema[utils.UI_OPTIONS_KEY];
+      fieldUiSchema[utils.UI_OPTIONS_KEY] = fieldUiOptions;
     }
     const field = /* @__PURE__ */ jsxRuntime.jsx(
       FieldComponent,
@@ -2738,7 +2750,7 @@
       (e) => {
         e.preventDefault();
         e.stopPropagation();
-        onChange(options.emptyValue ?? "");
+        onChange(options.emptyValue);
       },
       [onChange, options.emptyValue]
     );
@@ -3346,14 +3358,15 @@
     onFocus,
     onChange,
     registry,
-    htmlName
+    htmlName,
+    required
   }) {
     const DescriptionFieldTemplate = utils.getTemplate(
       "DescriptionFieldTemplate",
       registry,
       options
     );
-    const required = utils.schemaRequiresTrueValue(schema);
+    const trueValueRequired = utils.schemaRequiresTrueValue(schema) && required;
     const handleChange = react.useCallback(
       (event) => onChange(event.target.checked),
       [onChange]
@@ -3397,7 +3410,13 @@
             "aria-describedby": utils.ariaDescribedByIds(id)
           }
         ),
-        utils.labelValue(/* @__PURE__ */ jsxRuntime.jsx("span", { children: label }), hideLabel)
+        utils.labelValue(
+          /* @__PURE__ */ jsxRuntime.jsxs("span", { children: [
+            label,
+            trueValueRequired && /* @__PURE__ */ jsxRuntime.jsx("span", { className: "required", children: "*" })
+          ] }),
+          hideLabel
+        )
       ] })
     ] });
   }
@@ -3592,7 +3611,6 @@
     required,
     disabled,
     readonly,
-    autofocus,
     onChange,
     onFocus,
     onBlur,
@@ -3911,8 +3929,16 @@
     };
   }
   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 }
     };
   }
@@ -4011,7 +4037,9 @@
           //  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
+          () => utils.getChangedFields(this.props.formData, prevProps.formData, true),
           // Skip live validation for this request if no form data has changed from the last state
           !isStateDataChanged
         );
@@ -4055,12 +4083,13 @@
      * @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;
@@ -4165,17 +4194,23 @@
         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 = utils.mergeObjects(
-            currentErrors.errorSchema,
-            newErrorSchema,
-            "preventDuplicates"
-          );
-          errorSchema = schemaValidationErrorSchema;
+        if (!mustValidate) {
+          const formDataChangedFields = getFormDataChangedFields();
+          if (formDataChangedFields.length > 0) {
+            const newErrorSchema = formDataChangedFields.reduce((acc, path) => {
+              const pathOfField = utils.toPath(path);
+              for (let i = 1; i < pathOfField.length; i++) {
+                utils.setByPath(acc, [...pathOfField.slice(0, i), utils.ERRORS_KEY], void 0, true);
+              }
+              return utils.setByPath(acc, pathOfField, void 0, true);
+            }, {});
+            schemaValidationErrorSchema = utils.mergeObjects(
+              currentErrors.errorSchema,
+              newErrorSchema,
+              "preventDuplicates"
+            );
+            errorSchema = schemaValidationErrorSchema;
+          }
         }
         const mergedErrors = _Form.mergeErrors({ errorSchema, errors }, props.extraErrors, state.customErrors);
         errors = mergedErrors.errors;
@@ -4373,14 +4408,14 @@
       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 = 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;
       if (utils.isObject(formData) || Array.isArray(formData)) {
         let plainLeafWasCleared = false;
         if (newValue === ADDITIONAL_PROPERTY_KEY_REMOVE) {
-          _unset(formData, path);
+          utils.unsetByPath(formData, path);
         } else if (!isRootPath) {
           let valueForPath = newValue;
           if (newValue === void 0) {
@@ -4397,9 +4432,9 @@
             }
           }
           if (plainLeafWasCleared) {
-            set(formData, path, void 0);
+            utils.setByPath(formData, path, void 0);
           } else {
-            set(formData, path, valueForPath);
+            utils.setByPath(formData, path, valueForPath);
           }
         }
         const shouldSanitize = retrievedSchema && !isRootPath && !utils.isObject(newValue) && !Array.isArray(newValue) && !disabled && !readonly;
@@ -4415,7 +4450,7 @@
         formData = newState.formData;
         retrievedSchema = newState.retrievedSchema;
         if (plainLeafWasCleared && formData) {
-          set(formData, path, void 0);
+          utils.setByPath(formData, path, void 0);
         }
       }
       const mustValidate = !noValidate && (liveValidate === true || liveValidate === "onChange");
@@ -4426,11 +4461,11 @@
         state = { ...state, formData: newFormData };
       }
       if (newErrorSchema) {
-        const oldValidationError = !isRootPath ? get(schemaValidationErrorSchema, path) : schemaValidationErrorSchema;
-        if (!isEmpty(oldValidationError)) {
+        const oldValidationError = !isRootPath ? utils.getByPath(schemaValidationErrorSchema, path) : schemaValidationErrorSchema;
+        if (oldValidationError && Object.keys(oldValidationError).length > 0) {
           if (!isRootPath) {
-            mergeBaseErrorSchema = _cloneDeep(schemaValidationErrorSchema);
-            set(mergeBaseErrorSchema, path, newErrorSchema);
+            mergeBaseErrorSchema = structuredClone(schemaValidationErrorSchema);
+            utils.setByPath(mergeBaseErrorSchema, path, newErrorSchema, true);
           } else {
             mergeBaseErrorSchema = newErrorSchema;
           }
@@ -4439,15 +4474,15 @@
             customErrors = new utils.ErrorSchemaBuilder();
           }
           if (isRootPath) {
-            const pathErrors = get(newErrorSchema, utils.ERRORS_KEY);
+            const pathErrors = newErrorSchema[utils.ERRORS_KEY];
             if (pathErrors) {
               customErrors.setErrors(pathErrors);
             }
           } else {
-            set(customErrors.ErrorSchema, path, newErrorSchema);
+            utils.setByPath(customErrors.ErrorSchema, path, newErrorSchema, true);
           }
         }
-      } else if (customErrors && get(customErrors.ErrorSchema, [...path, utils.ERRORS_KEY])) {
+      } else if (customErrors && utils.getByPath(customErrors.ErrorSchema, [...path, utils.ERRORS_KEY])) {
         customErrors.clearErrors(path);
       }
       if (mustValidate && this.pendingChanges.length === 1) {
@@ -4553,8 +4588,8 @@
           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);
+          const oldData = this.state[key];
+          const newData = state[key];
           return !utils.deepEquals(oldData, newData);
         });
         this.setState(state, () => {
@@ -4682,12 +4717,8 @@
     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 = utils.toPath(property ?? "");
+      path.unshift(idPrefix);
       const elementId = path.join(idSeparator);
       let field = this.formElement.current.elements[elementId];
       if (!field) {