@luomus/laji-form 15.1.57 → 15.1.59

package/lib/components/LajiForm.d.ts

@@ -17,7 +17,7 @@ import DOMIdService from "../services/dom-id-service";
 import IdService from "../services/id-service";
 import RootInstanceService from "../services/root-instance-service";
 import SingletonMapService from "../services/singleton-map-service";
-import { HasMaybeChildren, Lang } from "../types";
+import { FieldProps, HasMaybeChildren, Lang } from "../types";
 export interface LajiFormProps extends HasMaybeChildren {
     apiClient?: ApiClientImplementation;
     lang?: Lang;
@@ -90,7 +90,11 @@ export interface FormContext {
         uiSchema?: any;
         required?: boolean;
     }>;
-    formDataTransformers?: any[];
+    formDataTransformers?: {
+        props: FieldProps;
+        "ui:field": string;
+        targets: string[];
+    }[];
     _parentLajiFormId?: number;
     mediaMetadata?: MediaMetadata;
     contextId: number;

package/lib/components/VirtualSchemaField.d.ts

@@ -14,28 +14,28 @@ export default function VirtualSchemaField<LFC extends Constructor<LajiFormCompo
         getUiOptions(): any;
         getStateFromProps: (props: FieldProps) => any;
         render: () => React.ReactNode;
-        readonly props: Readonly<FieldProps<import("../types").JSONSchema<any>>> & Readonly<{
+        readonly props: Readonly<FieldProps<any, import("../types").JSONSchemaObject>> & Readonly<{
             children?: React.ReactNode;
         }>;
         context: any;
         state: Readonly<{}>;
         componentDidMount?: (() => void) | undefined;
-        setState: <K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<FieldProps<import("../types").JSONSchema<any>>>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined) => void;
+        setState: <K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<FieldProps<any, import("../types").JSONSchemaObject>>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined) => void;
         forceUpdate: (callback?: (() => void) | undefined) => void;
         refs: {
             [key: string]: React.ReactInstance;
         };
-        shouldComponentUpdate?: ((nextProps: Readonly<FieldProps<import("../types").JSONSchema<any>>>, nextState: Readonly<{}>, nextContext: any) => boolean) | undefined;
+        shouldComponentUpdate?: ((nextProps: Readonly<FieldProps<any, import("../types").JSONSchemaObject>>, nextState: Readonly<{}>, nextContext: any) => boolean) | undefined;
         componentWillUnmount?: (() => void) | undefined;
         componentDidCatch?: ((error: Error, errorInfo: React.ErrorInfo) => void) | undefined;
-        getSnapshotBeforeUpdate?: ((prevProps: Readonly<FieldProps<import("../types").JSONSchema<any>>>, prevState: Readonly<{}>) => any) | undefined;
-        componentDidUpdate?: ((prevProps: Readonly<FieldProps<import("../types").JSONSchema<any>>>, prevState: Readonly<{}>, snapshot?: any) => void) | undefined;
+        getSnapshotBeforeUpdate?: ((prevProps: Readonly<FieldProps<any, import("../types").JSONSchemaObject>>, prevState: Readonly<{}>) => any) | undefined;
+        componentDidUpdate?: ((prevProps: Readonly<FieldProps<any, import("../types").JSONSchemaObject>>, prevState: Readonly<{}>, snapshot?: any) => void) | undefined;
         componentWillMount?: (() => void) | undefined;
         UNSAFE_componentWillMount?: (() => void) | undefined;
-        componentWillReceiveProps?: ((nextProps: Readonly<FieldProps<import("../types").JSONSchema<any>>>, nextContext: any) => void) | undefined;
-        UNSAFE_componentWillReceiveProps?: ((nextProps: Readonly<FieldProps<import("../types").JSONSchema<any>>>, nextContext: any) => void) | undefined;
-        componentWillUpdate?: ((nextProps: Readonly<FieldProps<import("../types").JSONSchema<any>>>, nextState: Readonly<{}>, nextContext: any) => void) | undefined;
-        UNSAFE_componentWillUpdate?: ((nextProps: Readonly<FieldProps<import("../types").JSONSchema<any>>>, nextState: Readonly<{}>, nextContext: any) => void) | undefined;
+        componentWillReceiveProps?: ((nextProps: Readonly<FieldProps<any, import("../types").JSONSchemaObject>>, nextContext: any) => void) | undefined;
+        UNSAFE_componentWillReceiveProps?: ((nextProps: Readonly<FieldProps<any, import("../types").JSONSchemaObject>>, nextContext: any) => void) | undefined;
+        componentWillUpdate?: ((nextProps: Readonly<FieldProps<any, import("../types").JSONSchemaObject>>, nextState: Readonly<{}>, nextContext: any) => void) | undefined;
+        UNSAFE_componentWillUpdate?: ((nextProps: Readonly<FieldProps<any, import("../types").JSONSchemaObject>>, nextState: Readonly<{}>, nextContext: any) => void) | undefined;
     };
     displayName: string;
 } & LFC;

package/lib/components/VirtualSchemaField.js

@@ -63,7 +63,7 @@ function VirtualSchemaField(ComposedComponent) {
                     "onChange",
                     "disabled",
                     "readonly",
-                    "required"
+                    "required",
                 ].reduce((_props, prop) => {
                     if (prop in props)
                         _props[prop] = props[prop];

package/lib/components/fields/ArrayPropertySumField.d.ts

@@ -4,7 +4,7 @@ import { FieldProps, JSONSchemaObject } from "../../types";
 interface State {
     sum: number;
 }
-export default class ArrayPropertySumField extends React.Component<FieldProps<JSONSchemaObject>, State> {
+export default class ArrayPropertySumField extends React.Component<FieldProps<JSONSchemaObject[], JSONSchemaObject>, State> {
     static propTypes: {
         uiSchema: PropTypes.Validator<PropTypes.InferProps<{
             "ui:options": PropTypes.Requireable<PropTypes.InferProps<{

package/lib/components/fields/AsArrayField.d.ts

@@ -12,405 +12,15 @@ export default class AsArrayField extends React.Component<FieldProps> {
     getStateFromProps(props: FieldProps): {
         formData: any[];
         schema: {
-            title: string | undefined;
+            title: any;
             type: string;
-            items: {
-                title: undefined;
-                type: "object";
-                default?: Record<string, import("../../types").JSONObject> | undefined;
-                properties: Record<string, import("../../types").JSONSchema<any>>;
-                required?: string[] | undefined;
-            } | {
-                title: undefined;
-                type: "number";
-                default?: number | undefined;
-            } | {
-                title: undefined;
-                type: "integer";
-                default?: number | undefined;
-            } | {
-                title: undefined;
-                type: "boolean";
-                default?: boolean | undefined;
-            } | {
-                title: undefined;
-                type: "string";
-                default?: string | undefined;
-            } | {
-                title: undefined;
-                type: "string";
-                default?: string | undefined;
-                oneOf: import("../../types").JSONSchemaEnumOneOf[];
-            } | {
-                title: undefined;
-                type: "array";
-                default?: never[] | undefined;
-                items: any;
-                uniqueItems?: boolean | undefined;
-                maxItems?: number | undefined;
-            };
+            items: any;
             maxItems: number;
         };
         onChange: (formData: any[]) => void;
-        uiSchema: import("@rjsf/utils").GenericObjectType & {
-            "ui:ArrayFieldTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldTemplateProps<any, import("../../types").JSONSchema<any>, import("../LajiForm").FormContext>> | undefined;
-            "ui:ArrayFieldDescriptionTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldDescriptionProps<any, import("../../types").JSONSchema<any>, import("../LajiForm").FormContext>> | undefined;
-            "ui:ArrayFieldItemTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldTemplateItemType<any, import("../../types").JSONSchema<any>, import("../LajiForm").FormContext>> | undefined;
-            "ui:ArrayFieldTitleTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldTitleProps<any, import("../../types").JSONSchema<any>, import("../LajiForm").FormContext>> | undefined;
-            "ui:BaseInputTemplate"?: React.ComponentType<import("@rjsf/utils").WidgetProps<any, import("../../types").JSONSchema<any>, import("../LajiForm").FormContext>> | undefined;
-            "ui:DescriptionFieldTemplate"?: React.ComponentType<import("@rjsf/utils").DescriptionFieldProps<any, import("../../types").JSONSchema<any>, import("../LajiForm").FormContext>> | undefined;
-            "ui:ErrorListTemplate"?: React.ComponentType<import("@rjsf/utils").ErrorListProps<any, import("../../types").JSONSchema<any>, import("../LajiForm").FormContext>> | undefined;
-            "ui:FieldErrorTemplate"?: React.ComponentType<import("@rjsf/utils").FieldErrorProps<any, import("../../types").JSONSchema<any>, import("../LajiForm").FormContext>> | undefined;
-            "ui:FieldHelpTemplate"?: React.ComponentType<import("@rjsf/utils").FieldHelpProps<any, import("../../types").JSONSchema<any>, import("../LajiForm").FormContext>> | undefined;
-            "ui:FieldTemplate"?: React.ComponentType<import("@rjsf/utils").FieldTemplateProps<any, import("../../types").JSONSchema<any>, import("../LajiForm").FormContext>> | undefined;
-            "ui:ObjectFieldTemplate"?: React.ComponentType<import("@rjsf/utils").ObjectFieldTemplateProps<any, import("../../types").JSONSchema<any>, import("../LajiForm").FormContext>> | undefined;
-            "ui:TitleFieldTemplate"?: React.ComponentType<import("@rjsf/utils").TitleFieldProps<any, import("../../types").JSONSchema<any>, import("../LajiForm").FormContext>> | undefined;
-            "ui:UnsupportedFieldTemplate"?: React.ComponentType<import("@rjsf/utils").UnsupportedFieldProps<any, import("../../types").JSONSchema<any>, import("../LajiForm").FormContext>> | undefined;
-            "ui:WrapIfAdditionalTemplate"?: React.ComponentType<import("@rjsf/utils").WrapIfAdditionalTemplateProps<any, import("../../types").JSONSchema<any>, import("../LajiForm").FormContext>> | undefined;
-            "ui:classNames"?: string | undefined;
-            "ui:style"?: React.StyleHTMLAttributes<any> | undefined;
-            "ui:title"?: string | undefined;
-            "ui:description"?: string | undefined;
-            "ui:placeholder"?: string | undefined;
-            "ui:help"?: string | undefined;
-            "ui:autofocus"?: boolean | undefined;
-            "ui:autocomplete"?: string | undefined;
-            "ui:disabled"?: boolean | undefined;
-            "ui:emptyValue"?: any;
-            "ui:enumDisabled"?: (string | number | boolean)[] | undefined;
-            "ui:hideError"?: boolean | undefined;
-            "ui:readonly"?: boolean | undefined;
-            "ui:order"?: string[] | undefined;
-            "ui:addable"?: boolean | undefined;
-            "ui:orderable"?: boolean | undefined;
-            "ui:removable"?: boolean | undefined;
-            "ui:inline"?: boolean | undefined;
-            "ui:inputType"?: string | undefined;
-            "ui:label"?: boolean | undefined;
-            "ui:rows"?: number | undefined;
-            "ui:submitButtonOptions"?: import("@rjsf/utils").UISchemaSubmitButtonOptions | undefined;
-            "ui:widget"?: string | import("@rjsf/utils").Widget<any, import("../../types").JSONSchema<any>, import("../LajiForm").FormContext> | undefined;
-            "ui:duplicateKeySuffixSeparator"?: string | undefined;
-        } & {
-            "ui:rootFieldId"?: string | undefined;
-            "ui:field"?: string | import("@rjsf/utils").Field<any, import("../../types").JSONSchema<any>, import("../LajiForm").FormContext> | undefined;
-            "ui:fieldReplacesAnyOrOneOf"?: boolean | undefined;
-            "ui:options"?: import("@rjsf/utils").UIOptionsType<any, import("../../types").JSONSchema<any>, import("../LajiForm").FormContext> | undefined;
-        } & {
-            "ui:ArrayFieldTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldTemplateProps<any, import("../../types").JSONSchemaObject, import("../LajiForm").FormContext>> | undefined;
-            "ui:ArrayFieldDescriptionTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldDescriptionProps<any, import("../../types").JSONSchemaObject, import("../LajiForm").FormContext>> | undefined;
-            "ui:ArrayFieldItemTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldTemplateItemType<any, import("../../types").JSONSchemaObject, import("../LajiForm").FormContext>> | undefined;
-            "ui:ArrayFieldTitleTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldTitleProps<any, import("../../types").JSONSchemaObject, import("../LajiForm").FormContext>> | undefined;
-            "ui:BaseInputTemplate"?: React.ComponentType<import("@rjsf/utils").WidgetProps<any, import("../../types").JSONSchemaObject, import("../LajiForm").FormContext>> | undefined;
-            "ui:DescriptionFieldTemplate"?: React.ComponentType<import("@rjsf/utils").DescriptionFieldProps<any, import("../../types").JSONSchemaObject, import("../LajiForm").FormContext>> | undefined;
-            "ui:ErrorListTemplate"?: React.ComponentType<import("@rjsf/utils").ErrorListProps<any, import("../../types").JSONSchemaObject, import("../LajiForm").FormContext>> | undefined;
-            "ui:FieldErrorTemplate"?: React.ComponentType<import("@rjsf/utils").FieldErrorProps<any, import("../../types").JSONSchemaObject, import("../LajiForm").FormContext>> | undefined;
-            "ui:FieldHelpTemplate"?: React.ComponentType<import("@rjsf/utils").FieldHelpProps<any, import("../../types").JSONSchemaObject, import("../LajiForm").FormContext>> | undefined;
-            "ui:FieldTemplate"?: React.ComponentType<import("@rjsf/utils").FieldTemplateProps<any, import("../../types").JSONSchemaObject, import("../LajiForm").FormContext>> | undefined;
-            "ui:ObjectFieldTemplate"?: React.ComponentType<import("@rjsf/utils").ObjectFieldTemplateProps<any, import("../../types").JSONSchemaObject, import("../LajiForm").FormContext>> | undefined;
-            "ui:TitleFieldTemplate"?: React.ComponentType<import("@rjsf/utils").TitleFieldProps<any, import("../../types").JSONSchemaObject, import("../LajiForm").FormContext>> | undefined;
-            "ui:UnsupportedFieldTemplate"?: React.ComponentType<import("@rjsf/utils").UnsupportedFieldProps<any, import("../../types").JSONSchemaObject, import("../LajiForm").FormContext>> | undefined;
-            "ui:WrapIfAdditionalTemplate"?: React.ComponentType<import("@rjsf/utils").WrapIfAdditionalTemplateProps<any, import("../../types").JSONSchemaObject, import("../LajiForm").FormContext>> | undefined;
-            "ui:classNames"?: string | undefined;
-            "ui:style"?: React.StyleHTMLAttributes<any> | undefined;
-            "ui:title"?: string | undefined;
-            "ui:description"?: string | undefined;
-            "ui:placeholder"?: string | undefined;
-            "ui:help"?: string | undefined;
-            "ui:autofocus"?: boolean | undefined;
-            "ui:autocomplete"?: string | undefined;
-            "ui:disabled"?: boolean | undefined;
-            "ui:emptyValue"?: any;
-            "ui:enumDisabled"?: (string | number | boolean)[] | undefined;
-            "ui:hideError"?: boolean | undefined;
-            "ui:readonly"?: boolean | undefined;
-            "ui:order"?: string[] | undefined;
-            "ui:addable"?: boolean | undefined;
-            "ui:orderable"?: boolean | undefined;
-            "ui:removable"?: boolean | undefined;
-            "ui:inline"?: boolean | undefined;
-            "ui:inputType"?: string | undefined;
-            "ui:label"?: boolean | undefined;
-            "ui:rows"?: number | undefined;
-            "ui:submitButtonOptions"?: import("@rjsf/utils").UISchemaSubmitButtonOptions | undefined;
-            "ui:widget"?: string | import("@rjsf/utils").Widget<any, import("../../types").JSONSchemaObject, import("../LajiForm").FormContext> | undefined;
-            "ui:duplicateKeySuffixSeparator"?: string | undefined;
-        } & {
-            "ui:rootFieldId"?: string | undefined;
-            "ui:field"?: string | import("@rjsf/utils").Field<any, import("../../types").JSONSchemaObject, import("../LajiForm").FormContext> | undefined;
-            "ui:fieldReplacesAnyOrOneOf"?: boolean | undefined;
-            "ui:options"?: import("@rjsf/utils").UIOptionsType<any, import("../../types").JSONSchemaObject, import("../LajiForm").FormContext> | undefined;
-        };
-        idSchema: import("@rjsf/utils").IdSchema<any>;
-        errorSchema: import("@rjsf/utils").FieldErrors & {
-            [x: string]: import("@rjsf/utils").ErrorSchema<any> | undefined;
-        };
-        onBlur: (id: string, value: any) => void;
-        onFocus: (id: string, value: any) => void;
         formContext: import("../LajiForm").FormContext;
-        autofocus?: boolean | undefined;
-        disabled: boolean;
-        hideError?: boolean | undefined;
-        readonly: boolean;
-        required?: boolean | undefined;
-        name: string;
-        idPrefix?: string | undefined;
-        idSeparator?: string | undefined;
-        rawErrors?: string[] | undefined;
+        errorSchema: import("@rjsf/utils").ErrorSchema<any>;
         registry: import("@rjsf/utils").Registry<any, import("../../types").JSONSchema<any>, import("../LajiForm").FormContext>;
-        hidden?: boolean | undefined;
-        dir?: string | undefined;
-        slot?: string | undefined;
-        style?: React.CSSProperties | undefined;
-        title?: string | undefined;
-        color?: string | undefined;
-        translate?: "yes" | "no" | undefined;
-        prefix?: string | undefined;
-        children?: React.ReactNode;
-        id?: string | undefined;
-        defaultChecked?: boolean | undefined;
-        defaultValue?: string | number | readonly string[] | undefined;
-        suppressContentEditableWarning?: boolean | undefined;
-        suppressHydrationWarning?: boolean | undefined;
-        accessKey?: string | undefined;
-        className?: string | undefined;
-        contentEditable?: "inherit" | (boolean | "false" | "true") | undefined;
-        contextMenu?: string | undefined;
-        draggable?: (boolean | "false" | "true") | undefined;
-        lang?: string | undefined;
-        placeholder?: string | undefined;
-        spellCheck?: (boolean | "false" | "true") | undefined;
-        tabIndex?: number | undefined;
-        radioGroup?: string | undefined;
-        role?: React.AriaRole | undefined;
-        about?: string | undefined;
-        datatype?: string | undefined;
-        inlist?: any;
-        property?: string | undefined;
-        resource?: string | undefined;
-        typeof?: string | undefined;
-        vocab?: string | undefined;
-        autoCapitalize?: string | undefined;
-        autoCorrect?: string | undefined;
-        autoSave?: string | undefined;
-        itemProp?: string | undefined;
-        itemScope?: boolean | undefined;
-        itemType?: string | undefined;
-        itemID?: string | undefined;
-        itemRef?: string | undefined;
-        results?: number | undefined;
-        security?: string | undefined;
-        unselectable?: "on" | "off" | undefined;
-        inputMode?: "search" | "numeric" | "none" | "text" | "decimal" | "tel" | "url" | "email" | undefined;
-        is?: string | undefined;
-        'aria-activedescendant'?: string | undefined;
-        'aria-atomic'?: boolean | "false" | "true" | undefined;
-        'aria-autocomplete'?: "both" | "none" | "inline" | "list" | undefined;
-        'aria-busy'?: boolean | "false" | "true" | undefined;
-        'aria-checked'?: boolean | "mixed" | "false" | "true" | undefined;
-        'aria-colcount'?: number | undefined;
-        'aria-colindex'?: number | undefined;
-        'aria-colspan'?: number | undefined;
-        'aria-controls'?: string | undefined;
-        'aria-current'?: boolean | "time" | "page" | "false" | "true" | "step" | "location" | "date" | undefined;
-        'aria-describedby'?: string | undefined;
-        'aria-details'?: string | undefined;
-        'aria-disabled'?: boolean | "false" | "true" | undefined;
-        'aria-dropeffect'?: "link" | "none" | "copy" | "move" | "execute" | "popup" | undefined;
-        'aria-errormessage'?: string | undefined;
-        'aria-expanded'?: boolean | "false" | "true" | undefined;
-        'aria-flowto'?: string | undefined;
-        'aria-grabbed'?: boolean | "false" | "true" | undefined;
-        'aria-haspopup'?: boolean | "dialog" | "menu" | "listbox" | "grid" | "false" | "true" | "tree" | undefined;
-        'aria-hidden'?: boolean | "false" | "true" | undefined;
-        'aria-invalid'?: boolean | "false" | "true" | "grammar" | "spelling" | undefined;
-        'aria-keyshortcuts'?: string | undefined;
-        'aria-label'?: string | undefined;
-        'aria-labelledby'?: string | undefined;
-        'aria-level'?: number | undefined;
-        'aria-live'?: "off" | "assertive" | "polite" | undefined;
-        'aria-modal'?: boolean | "false" | "true" | undefined;
-        'aria-multiline'?: boolean | "false" | "true" | undefined;
-        'aria-multiselectable'?: boolean | "false" | "true" | undefined;
-        'aria-orientation'?: "horizontal" | "vertical" | undefined;
-        'aria-owns'?: string | undefined;
-        'aria-placeholder'?: string | undefined;
-        'aria-posinset'?: number | undefined;
-        'aria-pressed'?: boolean | "mixed" | "false" | "true" | undefined;
-        'aria-readonly'?: boolean | "false" | "true" | undefined;
-        'aria-relevant'?: "all" | "text" | "additions" | "additions removals" | "additions text" | "removals" | "removals additions" | "removals text" | "text additions" | "text removals" | undefined;
-        'aria-required'?: boolean | "false" | "true" | undefined;
-        'aria-roledescription'?: string | undefined;
-        'aria-rowcount'?: number | undefined;
-        'aria-rowindex'?: number | undefined;
-        'aria-rowspan'?: number | undefined;
-        'aria-selected'?: boolean | "false" | "true" | undefined;
-        'aria-setsize'?: number | undefined;
-        'aria-sort'?: "none" | "other" | "ascending" | "descending" | undefined;
-        'aria-valuemax'?: number | undefined;
-        'aria-valuemin'?: number | undefined;
-        'aria-valuenow'?: number | undefined;
-        'aria-valuetext'?: string | undefined;
-        dangerouslySetInnerHTML?: {
-            __html: string;
-        } | undefined;
-        onCopy?: React.ClipboardEventHandler<HTMLElement> | undefined;
-        onCopyCapture?: React.ClipboardEventHandler<HTMLElement> | undefined;
-        onCut?: React.ClipboardEventHandler<HTMLElement> | undefined;
-        onCutCapture?: React.ClipboardEventHandler<HTMLElement> | undefined;
-        onPaste?: React.ClipboardEventHandler<HTMLElement> | undefined;
-        onPasteCapture?: React.ClipboardEventHandler<HTMLElement> | undefined;
-        onCompositionEnd?: React.CompositionEventHandler<HTMLElement> | undefined;
-        onCompositionEndCapture?: React.CompositionEventHandler<HTMLElement> | undefined;
-        onCompositionStart?: React.CompositionEventHandler<HTMLElement> | undefined;
-        onCompositionStartCapture?: React.CompositionEventHandler<HTMLElement> | undefined;
-        onCompositionUpdate?: React.CompositionEventHandler<HTMLElement> | undefined;
-        onCompositionUpdateCapture?: React.CompositionEventHandler<HTMLElement> | undefined;
-        onFocusCapture?: React.FocusEventHandler<HTMLElement> | undefined;
-        onBlurCapture?: React.FocusEventHandler<HTMLElement> | undefined;
-        onChangeCapture?: React.FormEventHandler<HTMLElement> | undefined;
-        onBeforeInput?: React.FormEventHandler<HTMLElement> | undefined;
-        onBeforeInputCapture?: React.FormEventHandler<HTMLElement> | undefined;
-        onInput?: React.FormEventHandler<HTMLElement> | undefined;
-        onInputCapture?: React.FormEventHandler<HTMLElement> | undefined;
-        onReset?: React.FormEventHandler<HTMLElement> | undefined;
-        onResetCapture?: React.FormEventHandler<HTMLElement> | undefined;
-        onSubmit?: React.FormEventHandler<HTMLElement> | undefined;
-        onSubmitCapture?: React.FormEventHandler<HTMLElement> | undefined;
-        onInvalid?: React.FormEventHandler<HTMLElement> | undefined;
-        onInvalidCapture?: React.FormEventHandler<HTMLElement> | undefined;
-        onLoad?: React.ReactEventHandler<HTMLElement> | undefined;
-        onLoadCapture?: React.ReactEventHandler<HTMLElement> | undefined;
-        onError?: React.ReactEventHandler<HTMLElement> | undefined;
-        onErrorCapture?: React.ReactEventHandler<HTMLElement> | undefined;
-        onKeyDown?: React.KeyboardEventHandler<HTMLElement> | undefined;
-        onKeyDownCapture?: React.KeyboardEventHandler<HTMLElement> | undefined;
-        onKeyPress?: React.KeyboardEventHandler<HTMLElement> | undefined;
-        onKeyPressCapture?: React.KeyboardEventHandler<HTMLElement> | undefined;
-        onKeyUp?: React.KeyboardEventHandler<HTMLElement> | undefined;
-        onKeyUpCapture?: React.KeyboardEventHandler<HTMLElement> | undefined;
-        onAbort?: React.ReactEventHandler<HTMLElement> | undefined;
-        onAbortCapture?: React.ReactEventHandler<HTMLElement> | undefined;
-        onCanPlay?: React.ReactEventHandler<HTMLElement> | undefined;
-        onCanPlayCapture?: React.ReactEventHandler<HTMLElement> | undefined;
-        onCanPlayThrough?: React.ReactEventHandler<HTMLElement> | undefined;
-        onCanPlayThroughCapture?: React.ReactEventHandler<HTMLElement> | undefined;
-        onDurationChange?: React.ReactEventHandler<HTMLElement> | undefined;
-        onDurationChangeCapture?: React.ReactEventHandler<HTMLElement> | undefined;
-        onEmptied?: React.ReactEventHandler<HTMLElement> | undefined;
-        onEmptiedCapture?: React.ReactEventHandler<HTMLElement> | undefined;
-        onEncrypted?: React.ReactEventHandler<HTMLElement> | undefined;
-        onEncryptedCapture?: React.ReactEventHandler<HTMLElement> | undefined;
-        onEnded?: React.ReactEventHandler<HTMLElement> | undefined;
-        onEndedCapture?: React.ReactEventHandler<HTMLElement> | undefined;
-        onLoadedData?: React.ReactEventHandler<HTMLElement> | undefined;
-        onLoadedDataCapture?: React.ReactEventHandler<HTMLElement> | undefined;
-        onLoadedMetadata?: React.ReactEventHandler<HTMLElement> | undefined;
-        onLoadedMetadataCapture?: React.ReactEventHandler<HTMLElement> | undefined;
-        onLoadStart?: React.ReactEventHandler<HTMLElement> | undefined;
-        onLoadStartCapture?: React.ReactEventHandler<HTMLElement> | undefined;
-        onPause?: React.ReactEventHandler<HTMLElement> | undefined;
-        onPauseCapture?: React.ReactEventHandler<HTMLElement> | undefined;
-        onPlay?: React.ReactEventHandler<HTMLElement> | undefined;
-        onPlayCapture?: React.ReactEventHandler<HTMLElement> | undefined;
-        onPlaying?: React.ReactEventHandler<HTMLElement> | undefined;
-        onPlayingCapture?: React.ReactEventHandler<HTMLElement> | undefined;
-        onProgress?: React.ReactEventHandler<HTMLElement> | undefined;
-        onProgressCapture?: React.ReactEventHandler<HTMLElement> | undefined;
-        onRateChange?: React.ReactEventHandler<HTMLElement> | undefined;
-        onRateChangeCapture?: React.ReactEventHandler<HTMLElement> | undefined;
-        onSeeked?: React.ReactEventHandler<HTMLElement> | undefined;
-        onSeekedCapture?: React.ReactEventHandler<HTMLElement> | undefined;
-        onSeeking?: React.ReactEventHandler<HTMLElement> | undefined;
-        onSeekingCapture?: React.ReactEventHandler<HTMLElement> | undefined;
-        onStalled?: React.ReactEventHandler<HTMLElement> | undefined;
-        onStalledCapture?: React.ReactEventHandler<HTMLElement> | undefined;
-        onSuspend?: React.ReactEventHandler<HTMLElement> | undefined;
-        onSuspendCapture?: React.ReactEventHandler<HTMLElement> | undefined;
-        onTimeUpdate?: React.ReactEventHandler<HTMLElement> | undefined;
-        onTimeUpdateCapture?: React.ReactEventHandler<HTMLElement> | undefined;
-        onVolumeChange?: React.ReactEventHandler<HTMLElement> | undefined;
-        onVolumeChangeCapture?: React.ReactEventHandler<HTMLElement> | undefined;
-        onWaiting?: React.ReactEventHandler<HTMLElement> | undefined;
-        onWaitingCapture?: React.ReactEventHandler<HTMLElement> | undefined;
-        onAuxClick?: React.MouseEventHandler<HTMLElement> | undefined;
-        onAuxClickCapture?: React.MouseEventHandler<HTMLElement> | undefined;
-        onClick?: React.MouseEventHandler<HTMLElement> | undefined;
-        onClickCapture?: React.MouseEventHandler<HTMLElement> | undefined;
-        onContextMenu?: React.MouseEventHandler<HTMLElement> | undefined;
-        onContextMenuCapture?: React.MouseEventHandler<HTMLElement> | undefined;
-        onDoubleClick?: React.MouseEventHandler<HTMLElement> | undefined;
-        onDoubleClickCapture?: React.MouseEventHandler<HTMLElement> | undefined;
-        onDrag?: React.DragEventHandler<HTMLElement> | undefined;
-        onDragCapture?: React.DragEventHandler<HTMLElement> | undefined;
-        onDragEnd?: React.DragEventHandler<HTMLElement> | undefined;
-        onDragEndCapture?: React.DragEventHandler<HTMLElement> | undefined;
-        onDragEnter?: React.DragEventHandler<HTMLElement> | undefined;
-        onDragEnterCapture?: React.DragEventHandler<HTMLElement> | undefined;
-        onDragExit?: React.DragEventHandler<HTMLElement> | undefined;
-        onDragExitCapture?: React.DragEventHandler<HTMLElement> | undefined;
-        onDragLeave?: React.DragEventHandler<HTMLElement> | undefined;
-        onDragLeaveCapture?: React.DragEventHandler<HTMLElement> | undefined;
-        onDragOver?: React.DragEventHandler<HTMLElement> | undefined;
-        onDragOverCapture?: React.DragEventHandler<HTMLElement> | undefined;
-        onDragStart?: React.DragEventHandler<HTMLElement> | undefined;
-        onDragStartCapture?: React.DragEventHandler<HTMLElement> | undefined;
-        onDrop?: React.DragEventHandler<HTMLElement> | undefined;
-        onDropCapture?: React.DragEventHandler<HTMLElement> | undefined;
-        onMouseDown?: React.MouseEventHandler<HTMLElement> | undefined;
-        onMouseDownCapture?: React.MouseEventHandler<HTMLElement> | undefined;
-        onMouseEnter?: React.MouseEventHandler<HTMLElement> | undefined;
-        onMouseLeave?: React.MouseEventHandler<HTMLElement> | undefined;
-        onMouseMove?: React.MouseEventHandler<HTMLElement> | undefined;
-        onMouseMoveCapture?: React.MouseEventHandler<HTMLElement> | undefined;
-        onMouseOut?: React.MouseEventHandler<HTMLElement> | undefined;
-        onMouseOutCapture?: React.MouseEventHandler<HTMLElement> | undefined;
-        onMouseOver?: React.MouseEventHandler<HTMLElement> | undefined;
-        onMouseOverCapture?: React.MouseEventHandler<HTMLElement> | undefined;
-        onMouseUp?: React.MouseEventHandler<HTMLElement> | undefined;
-        onMouseUpCapture?: React.MouseEventHandler<HTMLElement> | undefined;
-        onSelect?: React.ReactEventHandler<HTMLElement> | undefined;
-        onSelectCapture?: React.ReactEventHandler<HTMLElement> | undefined;
-        onTouchCancel?: React.TouchEventHandler<HTMLElement> | undefined;
-        onTouchCancelCapture?: React.TouchEventHandler<HTMLElement> | undefined;
-        onTouchEnd?: React.TouchEventHandler<HTMLElement> | undefined;
-        onTouchEndCapture?: React.TouchEventHandler<HTMLElement> | undefined;
-        onTouchMove?: React.TouchEventHandler<HTMLElement> | undefined;
-        onTouchMoveCapture?: React.TouchEventHandler<HTMLElement> | undefined;
-        onTouchStart?: React.TouchEventHandler<HTMLElement> | undefined;
-        onTouchStartCapture?: React.TouchEventHandler<HTMLElement> | undefined;
-        onPointerDown?: React.PointerEventHandler<HTMLElement> | undefined;
-        onPointerDownCapture?: React.PointerEventHandler<HTMLElement> | undefined;
-        onPointerMove?: React.PointerEventHandler<HTMLElement> | undefined;
-        onPointerMoveCapture?: React.PointerEventHandler<HTMLElement> | undefined;
-        onPointerUp?: React.PointerEventHandler<HTMLElement> | undefined;
-        onPointerUpCapture?: React.PointerEventHandler<HTMLElement> | undefined;
-        onPointerCancel?: React.PointerEventHandler<HTMLElement> | undefined;
-        onPointerCancelCapture?: React.PointerEventHandler<HTMLElement> | undefined;
-        onPointerEnter?: React.PointerEventHandler<HTMLElement> | undefined;
-        onPointerEnterCapture?: React.PointerEventHandler<HTMLElement> | undefined;
-        onPointerLeave?: React.PointerEventHandler<HTMLElement> | undefined;
-        onPointerLeaveCapture?: React.PointerEventHandler<HTMLElement> | undefined;
-        onPointerOver?: React.PointerEventHandler<HTMLElement> | undefined;
-        onPointerOverCapture?: React.PointerEventHandler<HTMLElement> | undefined;
-        onPointerOut?: React.PointerEventHandler<HTMLElement> | undefined;
-        onPointerOutCapture?: React.PointerEventHandler<HTMLElement> | undefined;
-        onGotPointerCapture?: React.PointerEventHandler<HTMLElement> | undefined;
-        onGotPointerCaptureCapture?: React.PointerEventHandler<HTMLElement> | undefined;
-        onLostPointerCapture?: React.PointerEventHandler<HTMLElement> | undefined;
-        onLostPointerCaptureCapture?: React.PointerEventHandler<HTMLElement> | undefined;
-        onScroll?: React.UIEventHandler<HTMLElement> | undefined;
-        onScrollCapture?: React.UIEventHandler<HTMLElement> | undefined;
-        onWheel?: React.WheelEventHandler<HTMLElement> | undefined;
-        onWheelCapture?: React.WheelEventHandler<HTMLElement> | undefined;
-        onAnimationStart?: React.AnimationEventHandler<HTMLElement> | undefined;
-        onAnimationStartCapture?: React.AnimationEventHandler<HTMLElement> | undefined;
-        onAnimationEnd?: React.AnimationEventHandler<HTMLElement> | undefined;
-        onAnimationEndCapture?: React.AnimationEventHandler<HTMLElement> | undefined;
-        onAnimationIteration?: React.AnimationEventHandler<HTMLElement> | undefined;
-        onAnimationIterationCapture?: React.AnimationEventHandler<HTMLElement> | undefined;
-        onTransitionEnd?: React.TransitionEventHandler<HTMLElement> | undefined;
-        onTransitionEndCapture?: React.TransitionEventHandler<HTMLElement> | undefined;
     };
     onChange: (formData: any[]) => void;
 }

package/lib/components/fields/CondensedObjectField.d.ts

@@ -18,7 +18,7 @@ interface State {
     selectedFields: SelectedField[];
     formData: any;
 }
-export default class CondensedObjectField extends React.Component<FieldProps<JSONSchemaObject>, State> {
+export default class CondensedObjectField extends React.Component<FieldProps<JSONSchemaObject, JSONSchemaObject>, State> {
     static propTypes: {
         schema: PropTypes.Validator<PropTypes.InferProps<{
             type: PropTypes.Requireable<string>;
@@ -26,9 +26,9 @@ export default class CondensedObjectField extends React.Component<FieldProps<JSO
         formData: PropTypes.Requireable<object>;
     };
     static getName(): string;
-    constructor(props: FieldProps<JSONSchemaObject>);
+    constructor(props: FieldProps<JSONSchemaObject, JSONSchemaObject>);
     componentDidUpdate(): void;
-    getSelectedFieldsFromProps(props: FieldProps<JSONSchemaObject>): SelectedField[];
+    getSelectedFieldsFromProps(props: FieldProps<JSONSchemaObject, JSONSchemaObject>): SelectedField[];
     onSelectFieldChange: (name: string) => void;
     onFieldChange: ((idx: number) => (formData: any) => void) & memoize.Memoized<(idx: number) => (formData: any) => void>;
     onFieldDelete: ((idx: number) => () => void) & memoize.Memoized<(idx: number) => () => void>;

package/lib/components/fields/ExtraLabelRowField.d.ts

@@ -20,7 +20,7 @@ export default class ExtraLabelRowField extends React.Component<any, any, any> {
     constructor(props: any, context: any);
     getStateFromProps(props: any): {
         schema: any;
-        uiSchema: import("../../types").UiSchema;
+        uiSchema: import("../../types").UiSchema<any>;
         options: any;
     };
     containerRef: React.RefObject<any>;

package/lib/components/fields/ImageArrayField.d.ts

@@ -16,7 +16,7 @@ interface MediaMetadataSchema {
     intellectualOwner?: string;
     intellectualRights?: string;
 }
-export default class ImageArrayField extends React.Component<FieldProps<JSONSchemaArray<JSONSchemaObject>>, ImageArrayFieldState> {
+export default class ImageArrayField extends React.Component<FieldProps<any, JSONSchemaArray<JSONSchemaObject>>, ImageArrayFieldState> {
     ALLOWED_FILE_TYPES: string[];
     ACCEPT_FILE_TYPES: string[];
     MAX_FILE_SIZE: number;
@@ -48,7 +48,7 @@ export interface MediaArrayState {
     alertMsg?: string;
 }
 declare type Constructor<LFC> = new (...args: any[]) => LFC;
-export declare function MediaArrayField<LFC extends Constructor<React.Component<FieldProps<JSONSchemaArray<JSONSchemaObject>>, MediaArrayState>>>(ComposedComponent: LFC): {
+export declare function MediaArrayField<LFC extends Constructor<React.Component<FieldProps<any, JSONSchemaArray<JSONSchemaObject>>, MediaArrayState>>>(ComposedComponent: LFC): {
     new (...args: any[]): {
         ALLOWED_FILE_TYPES: string[];
         ACCEPT_FILE_TYPES: string[];
@@ -105,25 +105,25 @@ export declare function MediaArrayField<LFC extends Constructor<React.Component<
         getAllowedMediaFormatsTranslationKey: () => "AllowedFileFormat" | "AllowedFileFormats";
         getAllowedMediaFormatsAsString: () => string;
         context: any;
-        setState<K extends keyof MediaArrayState>(state: MediaArrayState | ((prevState: Readonly<MediaArrayState>, props: Readonly<FieldProps<JSONSchemaArray<JSONSchemaObject, never>>>) => MediaArrayState | Pick<MediaArrayState, K> | null) | Pick<MediaArrayState, K> | null, callback?: (() => void) | undefined): void;
+        setState<K extends keyof MediaArrayState>(state: MediaArrayState | ((prevState: Readonly<MediaArrayState>, props: Readonly<FieldProps<any, JSONSchemaArray<JSONSchemaObject, never>>>) => MediaArrayState | Pick<MediaArrayState, K> | null) | Pick<MediaArrayState, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<FieldProps<JSONSchemaArray<JSONSchemaObject, never>>> & Readonly<{
+        readonly props: Readonly<FieldProps<any, JSONSchemaArray<JSONSchemaObject, never>>> & Readonly<{
             children?: React.ReactNode;
         }>;
         state: Readonly<MediaArrayState>;
         refs: {
             [key: string]: React.ReactInstance;
         };
-        shouldComponentUpdate?(nextProps: Readonly<FieldProps<JSONSchemaArray<JSONSchemaObject, never>>>, nextState: Readonly<MediaArrayState>, nextContext: any): boolean;
+        shouldComponentUpdate?(nextProps: Readonly<FieldProps<any, JSONSchemaArray<JSONSchemaObject, never>>>, nextState: Readonly<MediaArrayState>, nextContext: any): boolean;
         componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
-        getSnapshotBeforeUpdate?(prevProps: Readonly<FieldProps<JSONSchemaArray<JSONSchemaObject, never>>>, prevState: Readonly<MediaArrayState>): any;
-        componentDidUpdate?(prevProps: Readonly<FieldProps<JSONSchemaArray<JSONSchemaObject, never>>>, prevState: Readonly<MediaArrayState>, snapshot?: any): void;
+        getSnapshotBeforeUpdate?(prevProps: Readonly<FieldProps<any, JSONSchemaArray<JSONSchemaObject, never>>>, prevState: Readonly<MediaArrayState>): any;
+        componentDidUpdate?(prevProps: Readonly<FieldProps<any, JSONSchemaArray<JSONSchemaObject, never>>>, prevState: Readonly<MediaArrayState>, snapshot?: any): void;
         componentWillMount?(): void;
         UNSAFE_componentWillMount?(): void;
-        componentWillReceiveProps?(nextProps: Readonly<FieldProps<JSONSchemaArray<JSONSchemaObject, never>>>, nextContext: any): void;
-        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<FieldProps<JSONSchemaArray<JSONSchemaObject, never>>>, nextContext: any): void;
-        componentWillUpdate?(nextProps: Readonly<FieldProps<JSONSchemaArray<JSONSchemaObject, never>>>, nextState: Readonly<MediaArrayState>, nextContext: any): void;
-        UNSAFE_componentWillUpdate?(nextProps: Readonly<FieldProps<JSONSchemaArray<JSONSchemaObject, never>>>, nextState: Readonly<MediaArrayState>, nextContext: any): void;
+        componentWillReceiveProps?(nextProps: Readonly<FieldProps<any, JSONSchemaArray<JSONSchemaObject, never>>>, nextContext: any): void;
+        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<FieldProps<any, JSONSchemaArray<JSONSchemaObject, never>>>, nextContext: any): void;
+        componentWillUpdate?(nextProps: Readonly<FieldProps<any, JSONSchemaArray<JSONSchemaObject, never>>>, nextState: Readonly<MediaArrayState>, nextContext: any): void;
+        UNSAFE_componentWillUpdate?(nextProps: Readonly<FieldProps<any, JSONSchemaArray<JSONSchemaObject, never>>>, nextState: Readonly<MediaArrayState>, nextContext: any): void;
     };
     contextType: React.Context<import("../../ReactContext").ContextProps>;
     propTypes: {

package/lib/components/fields/InitiallyHiddenField.d.ts

@@ -13,7 +13,7 @@ export default class InitiallyHiddenField extends React.Component<any, any, any>
     };
     constructor(props: any);
     getStateFromProps(props: any): {
-        uiSchema: import("../../types").UiSchema;
+        uiSchema: import("../../types").UiSchema<any>;
     };
     toggleVisibility: () => void;
 }

package/lib/components/fields/LocationChooserField.d.ts

@@ -20,7 +20,7 @@ export default class LocationChooserField extends React.Component<any, any, any>
     constructor(props: any);
     constructor(props: any, context: any);
     getStateFromProps(props: any): {
-        uiSchema: import("../../types").UiSchema;
+        uiSchema: import("../../types").UiSchema<any>;
     };
 }
 import * as React from "react";

package/lib/components/fields/MapArrayField.js

@@ -1555,7 +1555,12 @@ class MapComponent extends React.Component {
             this.setState({ mapOptions: Object.assign(Object.assign({}, this.state.mapOptions), { tileLayerOpacity }) });
         };
         this.locateToggle = ({ locate }) => {
-            this.setState({ mapOptions: Object.assign(Object.assign({}, this.state.mapOptions), { locate }) });
+            if (this.props.onLocateToggle) {
+                this.props.onLocateToggle(locate.on); // propagate to parent
+            }
+            else {
+                this.setState({ mapOptions: Object.assign(Object.assign({}, this.state.mapOptions), { locate }) });
+            }
         };
         this.grabFocus = () => {
             this.props.formContext.services.blocker.push();