@rjsf/utils 6.0.0-alpha.0 → 6.0.0-beta.10

package/lib/types.d.ts

@@ -1,6 +1,6 @@
 import type { ButtonHTMLAttributes, ChangeEvent, ComponentType, HTMLAttributes, ReactElement, ReactNode, StyleHTMLAttributes } from 'react';
 import { JSONSchema7 } from 'json-schema';
-import { TranslatableString } from './enums';
+import { TranslatableString } from './enums.js';
 /** The representation of any generic object type, usually used as an intersection on other types to make them more
  * flexible in the properties they support (i.e. anything else)
  */
@@ -17,6 +17,9 @@ export type RJSFSchema = StrictRJSFSchema & GenericObjectType;
 /** Alias GenericObjectType as FormContextType to allow us to remap this at some future date
  */
 export type FormContextType = GenericObjectType;
+/** The interface for the test ID proxy objects that are returned by the `getTestId` utility function.
+ */
+export type TestIdShape = Record<string, string>;
 /** Experimental feature that specifies the Array `minItems` default form state behavior
  */
 export type Experimental_ArrayMinItems = {
@@ -47,7 +50,8 @@ export type Experimental_ArrayMinItems = {
 };
 /** Experimental features to specify different default form state behaviors. Currently, this affects the
  * handling of optional array fields where `minItems` is set and handling of setting defaults based on the
- * value of `emptyObjectFields`.
+ * value of `emptyObjectFields`. It also affects how `allOf` fields are handled and how to handle merging defaults into
+ * the formData in relation to explicit `undefined` values via `mergeDefaultsIntoFormData`.
  */
 export type Experimental_DefaultFormStateBehavior = {
     /** Optional object, that controls how the default form state for arrays with `minItems` is handled. When not provided
@@ -67,7 +71,33 @@ export type Experimental_DefaultFormStateBehavior = {
      * Optional flag to compute the default form state using allOf and if/then/else schemas. Defaults to `skipDefaults'.
      */
     allOf?: 'populateDefaults' | 'skipDefaults';
+    /** Optional enumerated flag controlling how the defaults are merged into the form data when dealing with undefined
+     * values, defaulting to `useFormDataIfPresent`.
+     * NOTE: If there is a default for a field and the `formData` is unspecified, the default ALWAYS merges.
+     * - `useFormDataIfPresent`: Legacy behavior - Do not merge defaults if there is a value for a field in `formData`,
+     *        even if that value is explicitly set to `undefined`
+     * - `useDefaultIfFormDataUndefined`: - If the value of a field within the `formData` is `undefined`, then use the
+     *        default value instead
+     */
+    mergeDefaultsIntoFormData?: 'useFormDataIfPresent' | 'useDefaultIfFormDataUndefined';
+    /** Optional enumerated flag controlling how const values are merged into the form data as defaults when dealing with
+     * undefined values, defaulting to `always`. The defaulting behavior for this flag will always be controlled by the
+     * `emptyObjectField` flag value. For instance, if `populateRequiredDefaults` is set and the const value is not
+     * required, it will not be set.
+     * - `always`: A const value will always be merged into the form as a default. If there is are const values in a
+     *        `oneOf` (for instance to create an enumeration with title different from the values), the first const value
+     *        will be defaulted
+     * - `skipOneOf`: If const is in a `oneOf` it will NOT pick the first value as a default
+     * - `never`: A const value will never be used as a default
+     *
+     */
+    constAsDefaults?: 'always' | 'skipOneOf' | 'never';
 };
+/** Optional function that allows for custom merging of `allOf` schemas
+ * @param schema - Schema with `allOf` that needs to be merged
+ * @returns The merged schema
+ */
+export type Experimental_CustomMergeAllOf<S extends StrictRJSFSchema = RJSFSchema> = (schema: S) => S;
 /** The interface representing a Date object that contains an optional time */
 export interface DateObject {
     /** The year of the Date */
@@ -100,6 +130,8 @@ export type InputPropsType = Omit<RangeSpecType, 'step'> & {
     step?: number | 'any';
     /** Specifies the `autoComplete` value for an <input> element */
     autoComplete?: HTMLInputElement['autocomplete'];
+    /** Specifies a filter for what file types the user can upload. */
+    accept?: HTMLInputElement['accept'];
 };
 /** Type describing an id used for a field in the `IdSchema` */
 export type FieldId = {
@@ -163,51 +195,51 @@ export type FieldValidation = FieldErrors & {
 export type FormValidation<T = any> = FieldValidation & {
     [key in keyof T]?: FormValidation<T[key]>;
 };
+/** The base properties passed to various RJSF components. */
+export type RJSFBaseProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = {
+    /** The schema object for the field being described */
+    schema: S;
+    /** The uiSchema object for this base component */
+    uiSchema?: UiSchema<T, S, F>;
+    /** The `registry` object */
+    registry: Registry<T, S, F>;
+};
 /** The properties that are passed to an `ErrorListTemplate` implementation */
-export type ErrorListProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = {
+export type ErrorListProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = RJSFBaseProps<T, S, F> & {
     /** The errorSchema constructed by `Form` */
     errorSchema: ErrorSchema<T>;
     /** An array of the errors */
     errors: RJSFValidationError[];
     /** The `formContext` object that was passed to `Form` */
     formContext?: F;
-    /** The schema that was passed to `Form` */
-    schema: S;
-    /** The uiSchema that was passed to `Form` */
-    uiSchema?: UiSchema<T, S, F>;
-    /** The `registry` object */
-    registry: Registry<T, S, F>;
 };
 /** The properties that are passed to an `FieldErrorTemplate` implementation */
-export type FieldErrorProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = {
+export type FieldErrorProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = RJSFBaseProps<T, S, F> & {
     /** The errorSchema constructed by `Form` */
     errorSchema?: ErrorSchema<T>;
     /** An array of the errors */
     errors?: Array<string | ReactElement>;
     /** The tree of unique ids for every child field */
     idSchema: IdSchema<T>;
-    /** The schema that was passed to field */
-    schema: S;
-    /** The uiSchema that was passed to field */
-    uiSchema?: UiSchema<T, S, F>;
-    /** The `registry` object */
-    registry: Registry<T, S, F>;
 };
 /** The properties that are passed to an `FieldHelpTemplate` implementation */
-export type FieldHelpProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = {
+export type FieldHelpProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = RJSFBaseProps<T, S, F> & {
     /** The help information to be rendered */
     help?: string | ReactElement;
     /** The tree of unique ids for every child field */
     idSchema: IdSchema<T>;
-    /** The schema that was passed to field */
-    schema: S;
-    /** The uiSchema that was passed to field */
-    uiSchema?: UiSchema<T, S, F>;
     /** Flag indicating whether there are errors associated with this field */
     hasErrors?: boolean;
-    /** The `registry` object */
-    registry: Registry<T, S, F>;
 };
+/** The properties that are passed to a `GridTemplate` */
+export interface GridTemplateProps extends GenericObjectType {
+    /** The contents of the grid template */
+    children?: ReactNode;
+    /** Optional flag indicating whether the grid element represents a column, necessary for themes which have components
+     * for Rows vs Columns. NOTE: This is falsy by default when not specified
+     */
+    column?: boolean;
+}
 /** The set of `Fields` stored in the `Registry` */
 export type RegistryFieldsType<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = {
     /** A `Field` indexed by `name` */
@@ -219,13 +251,15 @@ export type RegistryWidgetsType<T = any, S extends StrictRJSFSchema = RJSFSchema
     [name: string]: Widget<T, S, F>;
 };
 /** The set of RJSF templates that can be overridden by themes or users */
-export interface TemplatesType<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> {
+export type TemplatesType<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = {
     /** The template to use while rendering normal or fixed array fields */
     ArrayFieldTemplate: ComponentType<ArrayFieldTemplateProps<T, S, F>>;
     /** The template to use while rendering the description for an array field */
     ArrayFieldDescriptionTemplate: ComponentType<ArrayFieldDescriptionProps<T, S, F>>;
+    /** The template to use while rendering the buttons for an item in an array field */
+    ArrayFieldItemButtonsTemplate: ComponentType<ArrayFieldItemButtonsTemplateType<T, S, F>>;
     /** The template to use while rendering an item in an array field */
-    ArrayFieldItemTemplate: ComponentType<ArrayFieldTemplateItemType<T, S, F>>;
+    ArrayFieldItemTemplate: ComponentType<ArrayFieldItemTemplateType<T, S, F>>;
     /** The template to use while rendering the title for an array field */
     ArrayFieldTitleTemplate: ComponentType<ArrayFieldTitleProps<T, S, F>>;
     /** The template to use while rendering the standard html input */
@@ -240,6 +274,8 @@ export interface TemplatesType<T = any, S extends StrictRJSFSchema = RJSFSchema,
     FieldHelpTemplate: ComponentType<FieldHelpProps<T, S, F>>;
     /** The template to use while rendering a field */
     FieldTemplate: ComponentType<FieldTemplateProps<T, S, F>>;
+    /** The template to use to render a Grid element */
+    GridTemplate: ComponentType<GridTemplateProps>;
     /** The template to use while rendering an object */
     ObjectFieldTemplate: ComponentType<ObjectFieldTemplateProps<T, S, F>>;
     /** The template to use for rendering the title of a field */
@@ -263,11 +299,17 @@ export interface TemplatesType<T = any, S extends StrictRJSFSchema = RJSFSchema,
         /** The template to use for the Remove button used for AdditionalProperties and Array items */
         RemoveButton: ComponentType<IconButtonProps<T, S, F>>;
     };
-}
+} & {
+    /** Allow this to support any named `ComponentType` or an object of named `ComponentType`s */
+    [key: string]: ComponentType<any> | {
+        [key: string]: ComponentType<any>;
+    } | undefined;
+};
 /** The set of UiSchema options that can be set globally and used as fallbacks at an individual template, field or
- * widget level when no field-level value of the option is provided.
+ * widget level when no field-level value of the option is provided. Extends GenericObjectType to support allowing users
+ * to provide any value they need for their customizations.
  */
-export type GlobalUISchemaOptions = {
+export type GlobalUISchemaOptions = GenericObjectType & {
     /** Flag, if set to `false`, new items cannot be added to array fields, unless overridden (defaults to true) */
     addable?: boolean;
     /** Flag, if set to `true`, array items can be copied (defaults to false) */
@@ -282,6 +324,9 @@ export type GlobalUISchemaOptions = {
      * This option allows you to change the separator between the original key name and the integer. Default is "-"
      */
     duplicateKeySuffixSeparator?: string;
+    /** Enables the displaying of description text that contains markdown
+     */
+    enableMarkdownInDescription?: boolean;
 };
 /** The object containing the registered core, theme and custom fields and widgets as well as the root schema, form
  * context, schema utils and templates.
@@ -313,11 +358,7 @@ export interface Registry<T = any, S extends StrictRJSFSchema = RJSFSchema, F ex
     globalUiOptions?: GlobalUISchemaOptions;
 }
 /** The properties that are passed to a Field implementation */
-export interface FieldProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> extends GenericObjectType, Pick<HTMLAttributes<HTMLElement>, Exclude<keyof HTMLAttributes<HTMLElement>, 'onBlur' | 'onFocus' | 'onChange'>> {
-    /** The JSON subschema object for this field */
-    schema: S;
-    /** The uiSchema for this field */
-    uiSchema?: UiSchema<T, S, F>;
+export interface FieldProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> extends GenericObjectType, RJSFBaseProps<T, S, F>, Pick<HTMLAttributes<HTMLElement>, Exclude<keyof HTMLAttributes<HTMLElement>, 'onBlur' | 'onFocus' | 'onChange'>> {
     /** The tree of unique ids for every child field */
     idSchema: IdSchema<T>;
     /** The data for this field */
@@ -354,13 +395,14 @@ export interface FieldProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F
     idSeparator?: string;
     /** An array of strings listing all generated error messages from encountered errors for this field */
     rawErrors?: string[];
-    /** The `registry` object */
-    registry: Registry<T, S, F>;
 }
 /** The definition of a React-based Field component */
-export type Field<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = ComponentType<FieldProps<T, S, F>>;
+export type Field<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = ComponentType<FieldProps<T, S, F>> & {
+    /** The optional TEST_IDS block that some fields contain, exported for testing purposes */
+    TEST_IDS?: TestIdShape;
+};
 /** The properties that are passed to a FieldTemplate implementation */
-export type FieldTemplateProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = {
+export type FieldTemplateProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = RJSFBaseProps<T, S, F> & {
     /** The id of the field in the hierarchy. You can use it to render a label targeting the wrapped widget */
     id: string;
     /** A string containing the base CSS classes, merged with any custom ones defined in your uiSchema */
@@ -401,10 +443,6 @@ export type FieldTemplateProps<T = any, S extends StrictRJSFSchema = RJSFSchema,
      * you don't want to clutter the UI
      */
     displayLabel?: boolean;
-    /** The schema object for this field */
-    schema: S;
-    /** The uiSchema object for this field */
-    uiSchema?: UiSchema<T, S, F>;
     /** The `formContext` object that was passed to `Form` */
     formContext?: F;
     /** The formData for this field */
@@ -415,47 +453,29 @@ export type FieldTemplateProps<T = any, S extends StrictRJSFSchema = RJSFSchema,
     onKeyChange: (value: string) => () => void;
     /** The property drop/removal event handler; Called when a field is removed in an additionalProperty context */
     onDropPropertyClick: (value: string) => () => void;
-    /** The `registry` object */
-    registry: Registry<T, S, F>;
 };
 /** The properties that are passed to the `UnsupportedFieldTemplate` implementation */
-export type UnsupportedFieldProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = {
-    /** The schema object for this field */
-    schema: S;
+export type UnsupportedFieldProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = RJSFBaseProps<T, S, F> & {
     /** The tree of unique ids for every child field */
     idSchema?: IdSchema<T>;
     /** The reason why the schema field has an unsupported type */
     reason: string;
-    /** The `registry` object */
-    registry: Registry<T, S, F>;
 };
 /** The properties that are passed to a `TitleFieldTemplate` implementation */
-export type TitleFieldProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = {
+export type TitleFieldProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = RJSFBaseProps<T, S, F> & {
     /** The id of the field title in the hierarchy */
     id: string;
     /** The title for the field being rendered */
     title: string;
-    /** The schema object for the field being titled */
-    schema: S;
-    /** The uiSchema object for this title field */
-    uiSchema?: UiSchema<T, S, F>;
     /** A boolean value stating if the field is required */
     required?: boolean;
-    /** The `registry` object */
-    registry: Registry<T, S, F>;
 };
 /** The properties that are passed to a `DescriptionFieldTemplate` implementation */
-export type DescriptionFieldProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = {
+export type DescriptionFieldProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = RJSFBaseProps<T, S, F> & {
     /** The id of the field description in the hierarchy */
     id: string;
-    /** The schema object for the field being described */
-    schema: S;
-    /** The uiSchema object for this description field */
-    uiSchema?: UiSchema<T, S, F>;
     /** The description of the field being rendered */
     description: string | ReactElement;
-    /** The `registry` object */
-    registry: Registry<T, S, F>;
 };
 /** The properties that are passed to a `ArrayFieldTitleTemplate` implementation */
 export type ArrayFieldTitleProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = Omit<TitleFieldProps<T, S, F>, 'id' | 'title'> & {
@@ -471,12 +491,14 @@ export type ArrayFieldDescriptionProps<T = any, S extends StrictRJSFSchema = RJS
     /** The idSchema of the field in the hierarchy */
     idSchema: IdSchema<T>;
 };
-/** The properties of each element in the ArrayFieldTemplateProps.items array */
-export type ArrayFieldTemplateItemType<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = {
-    /** The html for the item's content */
-    children: ReactElement;
+/** The properties of the buttons to render for each element in the ArrayFieldTemplateProps.items array */
+export type ArrayFieldItemButtonsTemplateType<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = RJSFBaseProps<T, S, F> & {
+    /** The idSchema of the item for which buttons are being rendered */
+    idSchema: IdSchema<T>;
     /** The className string */
-    className: string;
+    className?: string;
+    /** Any optional style attributes */
+    style?: ButtonHTMLAttributes<HTMLButtonElement>['style'];
     /** A boolean value stating if the array item is disabled */
     disabled?: boolean;
     /** A boolean value stating whether new items can be added to the array */
@@ -489,8 +511,6 @@ export type ArrayFieldTemplateItemType<T = any, S extends StrictRJSFSchema = RJS
     hasMoveUp: boolean;
     /** A boolean value stating whether the array item can be removed */
     hasRemove: boolean;
-    /** A boolean value stating whether the array item has a toolbar */
-    hasToolbar: boolean;
     /** A number stating the index the array item occurs in `items` */
     index: number;
     /** A number stating the total number `items` in the array */
@@ -505,17 +525,34 @@ export type ArrayFieldTemplateItemType<T = any, S extends StrictRJSFSchema = RJS
     onReorderClick: (index: number, newIndex: number) => (event?: any) => void;
     /** A boolean value stating if the array item is read-only */
     readonly?: boolean;
+};
+/** The properties of each element in the ArrayFieldTemplateProps.items array */
+export type ArrayFieldItemTemplateType<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = RJSFBaseProps<T, S, F> & {
+    /** The html for the item's content */
+    children: ReactNode;
+    /** The props to pass to the `ArrayFieldItemButtonTemplate` */
+    buttonsProps: ArrayFieldItemButtonsTemplateType<T, S, F>;
+    /** The className string */
+    className: string;
+    /** A boolean value stating if the array item is disabled */
+    disabled?: boolean;
+    /** A boolean value stating whether the array item has a toolbar */
+    hasToolbar: boolean;
+    /** A number stating the index the array item occurs in `items` */
+    index: number;
+    /** A number stating the total number `items` in the array */
+    totalItems: number;
+    /** A boolean value stating if the array item is read-only */
+    readonly?: boolean;
     /** A stable, unique key for the array item */
     key: string;
-    /** The schema object for this array item */
-    schema: S;
-    /** The uiSchema object for this array item */
-    uiSchema?: UiSchema<T, S, F>;
-    /** The `registry` object */
-    registry: Registry<T, S, F>;
 };
+/**
+ * @deprecated - Use `ArrayFieldItemTemplateType` instead
+ */
+export type ArrayFieldTemplateItemType<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = ArrayFieldItemTemplateType<T, S, F>;
 /** The properties that are passed to an ArrayFieldTemplate implementation */
-export type ArrayFieldTemplateProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = {
+export type ArrayFieldTemplateProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = RJSFBaseProps<T, S, F> & {
     /** A boolean value stating whether new elements can be added to the array */
     canAdd?: boolean;
     /** The className string */
@@ -525,7 +562,7 @@ export type ArrayFieldTemplateProps<T = any, S extends StrictRJSFSchema = RJSFSc
     /** An object containing the id for this object & ids for its properties */
     idSchema: IdSchema<T>;
     /** An array of objects representing the items in the array */
-    items: ArrayFieldTemplateItemType<T, S, F>[];
+    items: ArrayFieldItemTemplateType<T, S, F>[];
     /** A function that adds a new item to the array */
     onAddClick: (event?: any) => void;
     /** A boolean value stating if the array is read-only */
@@ -534,10 +571,6 @@ export type ArrayFieldTemplateProps<T = any, S extends StrictRJSFSchema = RJSFSc
     required?: boolean;
     /** A boolean value stating if the field is hiding its errors */
     hideError?: boolean;
-    /** The schema object for this array */
-    schema: S;
-    /** The uiSchema object for this array field */
-    uiSchema?: UiSchema<T, S, F>;
     /** A string value containing the title for the array */
     title: string;
     /** The `formContext` object that was passed to Form */
@@ -548,8 +581,6 @@ export type ArrayFieldTemplateProps<T = any, S extends StrictRJSFSchema = RJSFSc
     errorSchema?: ErrorSchema<T>;
     /** An array of strings listing all generated error messages from encountered errors for this widget */
     rawErrors?: string[];
-    /** The `registry` object */
-    registry: Registry<T, S, F>;
 };
 /** The properties of each element in the ObjectFieldTemplateProps.properties array */
 export type ObjectFieldTemplatePropertyType = {
@@ -565,11 +596,11 @@ export type ObjectFieldTemplatePropertyType = {
     hidden: boolean;
 };
 /** The properties that are passed to an ObjectFieldTemplate implementation */
-export type ObjectFieldTemplateProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = {
+export type ObjectFieldTemplateProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = RJSFBaseProps<T, S, F> & {
     /** A string value containing the title for the object */
     title: string;
     /** A string value containing the description for the object */
-    description?: string;
+    description?: string | ReactElement;
     /** A boolean value stating if the object is disabled */
     disabled?: boolean;
     /** An array of objects representing the properties in the object */
@@ -582,10 +613,6 @@ export type ObjectFieldTemplateProps<T = any, S extends StrictRJSFSchema = RJSFS
     required?: boolean;
     /** A boolean value stating if the field is hiding its errors */
     hideError?: boolean;
-    /** The schema object for this object */
-    schema: S;
-    /** The uiSchema object for this object field */
-    uiSchema?: UiSchema<T, S, F>;
     /** An object containing the id for this object & ids for its properties */
     idSchema: IdSchema<T>;
     /** The optional validation errors in the form of an `ErrorSchema` */
@@ -594,16 +621,14 @@ export type ObjectFieldTemplateProps<T = any, S extends StrictRJSFSchema = RJSFS
     formData?: T;
     /** The `formContext` object that was passed to Form */
     formContext?: F;
-    /** The `registry` object */
-    registry: Registry<T, S, F>;
 };
 /** The properties that are passed to a WrapIfAdditionalTemplate implementation */
-export type WrapIfAdditionalTemplateProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = {
+export type WrapIfAdditionalTemplateProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = RJSFBaseProps<T, S, F> & {
     /** The field or widget component instance for this field row */
     children: ReactNode;
-} & Pick<FieldTemplateProps<T, S, F>, 'id' | 'classNames' | 'style' | 'label' | 'required' | 'readonly' | 'disabled' | 'schema' | 'uiSchema' | 'onKeyChange' | 'onDropPropertyClick' | 'registry'>;
+} & Pick<FieldTemplateProps<T, S, F>, 'id' | 'classNames' | 'hideError' | 'rawErrors' | 'style' | 'label' | 'required' | 'readonly' | 'disabled' | 'schema' | 'uiSchema' | 'onKeyChange' | 'onDropPropertyClick' | 'registry'>;
 /** The properties that are passed to a Widget implementation */
-export interface WidgetProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> extends GenericObjectType, Pick<HTMLAttributes<HTMLElement>, Exclude<keyof HTMLAttributes<HTMLElement>, 'onBlur' | 'onFocus'>> {
+export interface WidgetProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> extends GenericObjectType, RJSFBaseProps<T, S, F>, Pick<HTMLAttributes<HTMLElement>, Exclude<keyof HTMLAttributes<HTMLElement>, 'onBlur' | 'onFocus'>> {
     /** The generated id for this widget, used to provide unique `name`s and `id`s for the HTML field elements rendered by
      * widgets
      */
@@ -612,10 +637,6 @@ export interface WidgetProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F
      * of custom widgets.
      */
     name: string;
-    /** The JSONSchema subschema object for this widget */
-    schema: S;
-    /** The uiSchema for this widget */
-    uiSchema?: UiSchema<T, S, F>;
     /** The current value for this widget */
     value: any;
     /** The required status of this widget */
@@ -655,8 +676,6 @@ export interface WidgetProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F
     multiple?: boolean;
     /** An array of strings listing all generated error messages from encountered errors for this widget */
     rawErrors?: string[];
-    /** The `registry` object */
-    registry: Registry<T, S, F>;
 }
 /** The definition of a React-based Widget component */
 export type Widget<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = ComponentType<WidgetProps<T, S, F>>;
@@ -676,15 +695,11 @@ export type SubmitButtonProps<T = any, S extends StrictRJSFSchema = RJSFSchema,
     registry: Registry<T, S, F>;
 };
 /** The type that defines the props for an Icon button, extending from a basic HTML button attributes */
-export type IconButtonProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = ButtonHTMLAttributes<HTMLButtonElement> & {
+export type IconButtonProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = ButtonHTMLAttributes<HTMLButtonElement> & Omit<RJSFBaseProps<T, S, F>, 'schema'> & {
     /** An alternative specification for the type of the icon button */
     iconType?: string;
     /** The name representation or actual react element implementation for the icon */
     icon?: string | ReactElement;
-    /** The uiSchema for this widget */
-    uiSchema?: UiSchema<T, S, F>;
-    /** The `registry` object */
-    registry: Registry<T, S, F>;
 };
 /** The type that defines how to change the behavior of the submit button for the form */
 export type UISchemaSubmitButtonOptions = {
@@ -716,7 +731,11 @@ type MakeUIType<Type> = {
 /** This type represents all the known supported options in the `ui:options` property, kept separate in order to
  * remap the keys. It also contains all the properties, optionally, of `TemplatesType` except "ButtonTemplates"
  */
-type UIOptionsBaseType<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = Partial<Omit<TemplatesType<T, S, F>, 'ButtonTemplates'>> & GlobalUISchemaOptions & {
+type UIOptionsBaseType<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = Partial<Pick<TemplatesType<T, S, F>, 'ArrayFieldDescriptionTemplate' | 'ArrayFieldItemTemplate' | 'ArrayFieldTemplate' | 'ArrayFieldTitleTemplate' | 'BaseInputTemplate' | 'DescriptionFieldTemplate' | 'ErrorListTemplate' | 'FieldErrorTemplate' | 'FieldHelpTemplate' | 'FieldTemplate' | 'ObjectFieldTemplate' | 'TitleFieldTemplate' | 'UnsupportedFieldTemplate' | 'WrapIfAdditionalTemplate'>> & GlobalUISchemaOptions & {
+    /** Allows RJSF to override the default field implementation by specifying either the name of a field that is used
+     * to look up an implementation from the `fields` list or an actual one-off `Field` component implementation itself
+     */
+    field?: Field<T, S, F> | string;
     /** Any classnames that the user wants to be applied to a field in the ui */
     classNames?: string;
     /** Any custom style that the user wants to apply to a field in the ui, applied on the same element as classNames */
@@ -739,6 +758,12 @@ type UIOptionsBaseType<T = any, S extends StrictRJSFSchema = RJSFSchema, F exten
     emptyValue?: any;
     /** Will disable any of the enum options specified in the array (by value) */
     enumDisabled?: Array<string | number | boolean>;
+    /** Allows a user to provide a list of labels for enum values in the schema */
+    enumNames?: string[];
+    /** Provides an optional field within a schema to be used as the oneOf/anyOf selector when there isn't a
+     * discriminator
+     */
+    optionsSchemaSelector?: string;
     /** Flag, if set to `true`, will hide the default error display for the given field AND all of its child fields in the
      * hierarchy
      */
@@ -761,8 +786,6 @@ type UIOptionsBaseType<T = any, S extends StrictRJSFSchema = RJSFSchema, F exten
      * to look up an implementation from the `widgets` list or an actual one-off widget implementation itself
      */
     widget?: Widget<T, S, F> | string;
-    /** Allows a user to provide a list of labels for enum values in the schema */
-    enumNames?: string[];
 };
 /** The type that represents the Options potentially provided by `ui:options` */
 export type UIOptionsType<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = UIOptionsBaseType<T, S, F> & {
@@ -779,10 +802,6 @@ export type UiSchema<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends
     'ui:globalOptions'?: GlobalUISchemaOptions;
     /** Allows the form to generate a unique prefix for the `Form`'s root prefix  */
     'ui:rootFieldId'?: string;
-    /** Allows RJSF to override the default field implementation by specifying either the name of a field that is used
-     * to look up an implementation from the `fields` list or an actual one-off `Field` component implementation itself
-     */
-    'ui:field'?: Field<T, S, F> | string;
     /** By default, any field that is rendered for an `anyOf`/`oneOf` schema will be wrapped inside the `AnyOfField` or
      * `OneOfField` component. This default behavior may be undesirable if your custom field already handles behavior
      * related to choosing one or more subschemas contained in the `anyOf`/`oneOf` schema.
@@ -825,14 +844,6 @@ export interface ValidatorType<T = any, S extends StrictRJSFSchema = RJSFSchema,
      * @param [uiSchema] - An optional uiSchema that is passed to `transformErrors` and `customValidate`
      */
     validateFormData(formData: T | undefined, schema: S, customValidate?: CustomValidator<T, S, F>, transformErrors?: ErrorTransformer<T, S, F>, uiSchema?: UiSchema<T, S, F>): ValidationData<T>;
-    /** Converts an `errorSchema` into a list of `RJSFValidationErrors`
-     *
-     * @param errorSchema - The `ErrorSchema` instance to convert
-     * @param [fieldPath=[]] - The current field path, defaults to [] if not specified
-     * @deprecated - Use the `toErrorList()` function provided by `@rjsf/utils` instead. This function will be removed in
-     *        the next major release.
-     */
-    toErrorList(errorSchema?: ErrorSchema<T>, fieldPath?: string[]): RJSFValidationError[];
     /** Validates data against a schema, returning true if the data is valid, or
      * false otherwise. If the schema is invalid, then this function will return
      * false.
@@ -857,6 +868,14 @@ export interface ValidatorType<T = any, S extends StrictRJSFSchema = RJSFSchema,
      */
     reset?: () => void;
 }
+/** The interface for the return value of the `findFieldInSchema` function
+ */
+export interface FoundFieldType<S extends StrictRJSFSchema = RJSFSchema> {
+    /** The field that was found, or undefined if it wasn't */
+    field?: S;
+    /** The requiredness of the field found or undefined if it wasn't */
+    isRequired?: boolean;
+}
 /** The `SchemaUtilsType` interface provides a wrapper around the publicly exported APIs in the `@rjsf/utils/schema`
  * directory such that one does not have to explicitly pass the `validator` or `rootSchema` to each method. Since both
  * the `validator` and `rootSchema` generally does not change across a `Form`, this allows for providing a simplified
@@ -875,9 +894,32 @@ export interface SchemaUtilsType<T = any, S extends StrictRJSFSchema = RJSFSchem
      * @param validator - An implementation of the `ValidatorType` interface that will be compared against the current one
      * @param rootSchema - The root schema that will be compared against the current one
      * @param [experimental_defaultFormStateBehavior] - Optional configuration object, if provided, allows users to override default form state behavior
+     * @param [experimental_customMergeAllOf] - Optional function that allows for custom merging of `allOf` schemas
      * @returns - True if the `SchemaUtilsType` differs from the given `validator` or `rootSchema`
      */
-    doesSchemaUtilsDiffer(validator: ValidatorType<T, S, F>, rootSchema: S, experimental_defaultFormStateBehavior?: Experimental_DefaultFormStateBehavior): boolean;
+    doesSchemaUtilsDiffer(validator: ValidatorType<T, S, F>, rootSchema: S, experimental_defaultFormStateBehavior?: Experimental_DefaultFormStateBehavior, experimental_customMergeAllOf?: Experimental_CustomMergeAllOf<S>): boolean;
+    /** Finds the field specified by the `path` within the root or recursed `schema`. If there is no field for the specified
+     * `path`, then the default `{ field: undefined, isRequired: undefined }` is returned. It determines whether a leaf
+     * field is in the `required` list for its parent and if so, it is marked as required on return.
+     *
+     * @param schema - The current node within the JSON schema
+     * @param path - The remaining keys in the path to the desired field
+     * @param [formData] - The form data that is used to determine which oneOf option
+     * @returns - An object that contains the field and its required state. If no field can be found then
+     *            `{ field: undefined, isRequired: undefined }` is returned.
+     */
+    findFieldInSchema(schema: S, path: string | string[], formData?: T): FoundFieldType<S>;
+    /** Finds the oneOf option inside the `schema['any/oneOf']` list which has the `properties[selectorField].default` that
+     * matches the `formData[selectorField]` value. For the purposes of this function, `selectorField` is either
+     * `schema.discriminator.propertyName` or `fallbackField`.
+     *
+     * @param schema - The schema element in which to search for the selected oneOf option
+     * @param fallbackField - The field to use as a backup selector field if the schema does not have a required field
+     * @param xxx - Either `oneOf` or `anyOf`, defines which value is being sought
+     * @param [formData] - The form data that is used to determine which oneOf option
+     * @returns - The anyOf/oneOf option that matches the selector field in the schema or undefined if nothing is selected
+     */
+    findSelectedOptionInXxxOf(schema: S, fallbackField: string, xxx: 'anyOf' | `oneOf`, formData?: T): S | undefined;
     /** Returns the superset of `formData` that includes the given set updated to include any missing fields that have
      * computed to have defaults provided in the `schema`.
      *
@@ -922,17 +964,17 @@ export interface SchemaUtilsType<T = any, S extends StrictRJSFSchema = RJSFSchem
      * @returns - The firstindex of the matched option or 0 if none is available
      */
     getFirstMatchingOption(formData: T | undefined, options: S[], discriminatorField?: string): number;
-    /** Given the `formData` and list of `options`, attempts to find the index of the option that best matches the data.
-     * Deprecated, use `getFirstMatchingOption()` instead.
+    /** Helper that acts like lodash's `get` but additionally retrieves `$ref`s as needed to get the path for schemas
+     * containing potentially nested `$ref`s.
      *
-     * @param formData - The current formData, if any, onto which to provide any missing defaults
-     * @param options - The list of options to find a matching options from
-     * @param [discriminatorField] - The optional name of the field within the options object whose value is used to
-     *          determine which option is selected
-     * @returns - The index of the matched option or 0 if none is available
-     * @deprecated
+     * @param schema - The current node within the JSON schema recursion
+     * @param path - The remaining keys in the path to the desired property
+     * @param defaultValue - The value to return if a value is not found for the `pathList` path
+     * @returns - The internal schema from the `schema` for the given `path` or the `defaultValue` if not found
      */
-    getMatchingOption(formData: T | undefined, options: S[], discriminatorField?: string): number;
+    getFromSchema(schema: S, path: string | string[], defaultValue: T): T;
+    getFromSchema(schema: S, path: string | string[], defaultValue: S): S;
+    getFromSchema(schema: S, path: string | string[], defaultValue: T | S): S | T;
     /** Checks to see if the `schema` and `uiSchema` combination represents an array of files
      *
      * @param schema - The schema for which check for array of files flag is desired
@@ -952,18 +994,6 @@ export interface SchemaUtilsType<T = any, S extends StrictRJSFSchema = RJSFSchem
      * @returns - True if schema contains a select, otherwise false
      */
     isSelect(schema: S): boolean;
-    /** Merges the errors in `additionalErrorSchema` into the existing `validationData` by combining the hierarchies in
-     * the two `ErrorSchema`s and then appending the error list from the `additionalErrorSchema` obtained by calling
-     * `validator.toErrorList()` onto the `errors` in the `validationData`. If no `additionalErrorSchema` is passed, then
-     * `validationData` is returned.
-     *
-     * @param validationData - The current `ValidationData` into which to merge the additional errors
-     * @param [additionalErrorSchema] - The additional set of errors
-     * @returns - The `validationData` with the additional errors from `additionalErrorSchema` merged into it, if provided
-     * @deprecated - Use the `validationDataMerge()` function exported from `@rjsf/utils` instead. This function will be
-     *        removed in the next major release.
-     */
-    mergeValidationData(validationData: ValidationData<T>, additionalErrorSchema?: ErrorSchema<T>): ValidationData<T>;
     /** Retrieves an expanded schema that has had all of its conditions, additional properties, references and
      * dependencies resolved and merged into the `schema` given a `rawFormData` that is used to do the potentially
      * recursive resolution.

package/lib/unwrapErrorHandler.d.ts

@@ -1,4 +1,4 @@
-import { ErrorSchema, FormValidation } from './types';
+import { ErrorSchema, FormValidation } from './types.js';
 /** Unwraps the `errorHandler` structure into the associated `ErrorSchema`, stripping the `addError()` functions from it
  *
  * @param errorHandler - The `FormValidation` error handling structure

package/lib/unwrapErrorHandler.js

@@ -1,4 +1,4 @@
-import isPlainObject from 'lodash/isPlainObject';
+import isPlainObject from 'lodash-es/isPlainObject.js';
 /** Unwraps the `errorHandler` structure into the associated `ErrorSchema`, stripping the `addError()` functions from it
  *
  * @param errorHandler - The `FormValidation` error handling structure