@luomus/laji-form 15.1.92 → 15.1.94

package/lib/components/LajiForm.d.ts

@@ -19,6 +19,9 @@ import RootInstanceService from "../services/root-instance-service";
 import SingletonMapService from "../services/singleton-map-service";
 import { FieldProps, HasMaybeChildren, Lang } from "../types";
 import MultiActiveArrayService from "../services/multi-active-array-service";
+import * as fields from "./fields";
+import * as widgets from "./widgets";
+import * as templates from "./templates";
 export interface LajiFormProps extends HasMaybeChildren {
     apiClient?: ApiClientImplementation;
     lang?: Lang;
@@ -191,17 +194,266 @@ export default class LajiForm extends React.Component<LajiFormProps, LajiFormSta
     getFields: (_fields?: {
         [name: string]: Field;
     }) => {
-        [x: string]: Field;
+        SchemaField: typeof fields.SchemaField;
+        ArrayField: typeof fields.ArrayField;
+        ObjectField: (props: any) => JSX.Element;
+        NestField: typeof fields.NestField;
+        ArrayPropertySumField: typeof fields.ArrayPropertySumField;
+        ScopeField: typeof fields.ScopeField;
+        SelectTreeField: typeof fields.SelectTreeField;
+        GridLayoutField: {
+            (props: any): JSX.Element;
+            propTypes: {
+                uiSchema: PropTypes.Requireable<PropTypes.InferProps<{
+                    "ui:grid": PropTypes.Requireable<PropTypes.InferProps<{
+                        lg: PropTypes.Requireable<NonNullable<number | object | null | undefined>>;
+                        md: PropTypes.Requireable<NonNullable<number | object | null | undefined>>;
+                        sm: PropTypes.Requireable<NonNullable<number | object | null | undefined>>;
+                        xs: PropTypes.Requireable<NonNullable<number | object | null | undefined>>;
+                    }>>;
+                }>>;
+                schema: PropTypes.Validator<NonNullable<PropTypes.InferProps<{
+                    type: PropTypes.Requireable<string>;
+                }>>>;
+            };
+        };
+        TableField: typeof fields.TableField;
+        InjectField: typeof fields.InjectField;
+        InjectDefaultValueField: typeof fields.InjectDefaultValueField;
+        ArrayCombinerField: typeof fields.ArrayCombinerField;
+        DependentBooleanField: typeof fields.DependentBooleanField;
+        DependentDisableField: typeof fields.DependentDisableField;
+        MapArrayField: typeof fields.MapArrayField;
+        AutoArrayField: typeof fields.AutoArrayField;
+        AutosuggestField: typeof fields.AutosuggestField;
+        HiddenField: {
+            (): JSX.Element;
+            propTypes: {
+                schema: PropTypes.Validator<NonNullable<PropTypes.InferProps<{
+                    type: PropTypes.Requireable<string>;
+                }>>>;
+            };
+        };
+        HiddenWithTextField: {
+            (props: FieldProps<import("../types").JSONSchemaArray<import("../types").JSONSchemaString>>): JSX.Element;
+            propTypes: {
+                uiSchema: PropTypes.Validator<NonNullable<PropTypes.InferProps<{
+                    "ui:options": PropTypes.Validator<NonNullable<PropTypes.InferProps<{
+                        altText: PropTypes.Validator<string>;
+                    }>>>;
+                    uiSchema: PropTypes.Requireable<object>;
+                }>>>;
+                schema: PropTypes.Validator<NonNullable<PropTypes.InferProps<{
+                    type: PropTypes.Requireable<string>;
+                }>>>;
+            };
+        };
+        InitiallyHiddenField: typeof fields.InitiallyHiddenField;
+        ContextInjectionField: typeof fields.ContextInjectionField;
+        ImageArrayField: typeof fields.ImageArrayField;
+        SplitField: typeof fields.SplitField;
+        FlatField: typeof fields.FlatField;
+        SingleActiveArrayField: typeof fields.SingleActiveArrayField;
+        SingleItemArrayField: typeof fields.SingleItemArrayField;
+        UnitShorthandField: typeof fields.UnitShorthandField;
+        CombinedValueDisplayField: typeof fields.CombinedValueDisplayField;
+        UiFieldMapperArrayField: typeof fields.UiFieldMapperArrayField;
+        ExtraLabelRowField: typeof fields.ExtraLabelRowField;
+        SumField: typeof fields.SumField;
+        NamedPlaceChooserField: typeof fields.NamedPlaceChooserField;
+        NamedPlaceSaverField: typeof fields.NamedPlaceSaverField;
+        MapField: typeof fields.MapField;
+        GeocoderField: typeof fields.GeocoderField;
+        TagArrayField: typeof fields.TagArrayField;
+        StringToArrayField: typeof fields.StringToArrayField;
+        ConditionalOnChangeField: typeof fields.ConditionalOnChangeField;
+        ConditionalUiSchemaField: typeof fields.ConditionalUiSchemaField;
+        AnnotationField: typeof fields.AnnotationField;
+        PrefillingArrayField: typeof fields.PrefillingArrayField;
+        AnyToBooleanField: {
+            (props: FieldProps): JSX.Element;
+            propTypes: {
+                uiSchema: PropTypes.Requireable<PropTypes.InferProps<{
+                    "ui:options": PropTypes.Requireable<PropTypes.InferProps<{
+                        trueValue: PropTypes.Validator<object>;
+                        falseValue: PropTypes.Requireable<object>;
+                        allowUndefined: PropTypes.Requireable<boolean>;
+                    }>>;
+                }>>;
+                schema: PropTypes.Validator<NonNullable<PropTypes.InferProps<{
+                    type: PropTypes.Requireable<string>;
+                }>>>;
+                formData: PropTypes.Requireable<object>;
+            };
+        };
+        EnumRangeArrayField: typeof fields.EnumRangeArrayField;
+        UnitListShorthandArrayField: typeof fields.UnitListShorthandArrayField;
+        LocationChooserField: typeof fields.LocationChooserField;
+        DataLeakerField: typeof fields.DataLeakerField;
+        LocalityField: typeof fields.LocalityField;
+        ImageDisplayField: typeof fields.ImageDisplayField;
+        FakePropertyField: typeof fields.FakePropertyField;
+        SectionArrayField: typeof fields.SectionArrayField;
+        MultiArrayField: typeof fields.MultiArrayField;
+        AudioArrayField: typeof fields.AudioArrayField;
+        FilterArrayField: typeof fields.FilterArrayField;
+        MultiAnyToBooleanField: typeof fields.MultiAnyToBooleanField;
+        UnitCountShorthandField: typeof fields.UnitCountShorthandField;
+        ToggleAdditionalArrayFieldsField: typeof fields.ToggleAdditionalArrayFieldsField;
+        DefaultValueArrayField: typeof fields.DefaultValueArrayField;
+        UiFieldApplierField: typeof fields.UiFieldApplierField;
+        MultiLanguageField: typeof fields.MultiLanguageField;
+        SortArrayField: typeof fields.SortArrayField;
+        InputWithDefaultValueButtonField: typeof fields.InputWithDefaultValueButtonField;
+        MultiTagArrayField: typeof fields.MultiTagArrayField;
+        PdfArrayField: typeof fields.PdfArrayField;
+        AsArrayField: typeof fields.AsArrayField;
+        CondensedObjectField: typeof fields.CondensedObjectField;
+        MultiActiveArrayField: typeof fields.MultiActiveArrayField;
+        PrefixArrayField: typeof fields.PrefixArrayField;
+        FillDateRangeField: typeof fields.FillDateRangeField;
+        TaxonSetPopulatorField: typeof fields.TaxonSetPopulatorField;
+        ScientificNameTaxonAutosuggestField: typeof fields.ScientificNameTaxonAutosuggestField;
+        ArraySchemaField: typeof fields.SchemaField;
+        InputTransformerField: typeof fields.ConditionalOnChangeField;
+        ConditionalField: typeof fields.ConditionalUiSchemaField;
+        UnitRapidField: typeof fields.UnitShorthandField;
+        AccordionArrayField: typeof fields.SingleActiveArrayField;
     };
     getWidgets: (_widgets?: {
         [name: string]: Widget;
     }) => {
-        [x: string]: Widget;
+        CheckboxWidget: typeof widgets.CheckboxWidget;
+        SelectWidget: <T extends string | number>(props: (Omit<import("../types").WidgetProps<import("../types").JSONSchemaEnum>, "value" | "onChange"> & {
+            value?: T | undefined;
+            onChange: (value?: T | undefined) => void;
+        } & {
+            includeEmpty?: boolean;
+            getEnumOptionsAsync?: (() => Promise<(Omit<import("@rjsf/utils").EnumOptionsType, "value"> & {
+                value: T;
+            })[]>) | undefined;
+        }) | (Omit<import("../types").WidgetProps<import("../types").JSONSchemaArray<import("../types").JSONSchemaEnumOneOf>>, "value" | "onChange"> & {
+            value?: T[] | undefined;
+            onChange: (value?: T[] | undefined) => void;
+        } & {
+            includeEmpty?: boolean;
+            getEnumOptionsAsync?: (() => Promise<(Omit<import("@rjsf/utils").EnumOptionsType, "value"> & {
+                value: T;
+            })[]>) | undefined;
+        })) => JSX.Element;
+        TextareaWidget: typeof widgets.TextareaWidget;
+        DateTimeWidget: typeof widgets.DateTimeWidget;
+        DateWidget: {
+            (props: any): JSX.Element;
+            propTypes: {
+                uiSchema: PropTypes.Requireable<PropTypes.InferProps<{
+                    "ui:options": PropTypes.Requireable<PropTypes.InferProps<{
+                        showButtons: PropTypes.Requireable<NonNullable<boolean | PropTypes.InferProps<{
+                            today: PropTypes.Requireable<boolean>;
+                            yesterday: PropTypes.Requireable<boolean>;
+                            same: PropTypes.Requireable<NonNullable<boolean | PropTypes.InferProps<{
+                                path: PropTypes.Requireable<string>;
+                            }> | null | undefined>>;
+                            plusSixMonths: PropTypes.Requireable<NonNullable<boolean | PropTypes.InferProps<{
+                                path: PropTypes.Requireable<string>;
+                            }> | null | undefined>>;
+                            plusSixYear: PropTypes.Requireable<NonNullable<boolean | PropTypes.InferProps<{
+                                path: PropTypes.Requireable<string>;
+                            }> | null | undefined>>;
+                        }> | null | undefined>>;
+                        allowOnlyYear: PropTypes.Requireable<boolean>;
+                    }>>;
+                }>>;
+                schema: PropTypes.Requireable<PropTypes.InferProps<{
+                    type: PropTypes.Requireable<string>;
+                }>>;
+                value: PropTypes.Requireable<string>;
+            };
+        };
+        TimeWidget: {
+            (props: any): JSX.Element;
+            propTypes: {
+                schema: PropTypes.Requireable<PropTypes.InferProps<{
+                    type: PropTypes.Requireable<string>;
+                }>>;
+                value: PropTypes.Requireable<string>;
+            };
+        };
+        SeparatedDateTimeWidget: typeof widgets.SeparatedDateTimeWidget;
+        AutosuggestWidget: typeof widgets.AutosuggestWidget;
+        HiddenWidget: typeof widgets.HiddenWidget;
+        PlainTextWidget: typeof widgets.PlainTextWidget;
+        TextSelectWidget: typeof widgets.TextSelectWidget;
+        ImageSelectWidget: typeof widgets.ImageSelectWidget;
+        AnyToBooleanWidget: {
+            (props: import("../types").WidgetProps): JSX.Element;
+            propTypes: {
+                uiSchema: PropTypes.Requireable<PropTypes.InferProps<{
+                    "ui:options": PropTypes.Requireable<PropTypes.InferProps<{
+                        trueValue: PropTypes.Validator<NonNullable<NonNullable<string | number | boolean | null | undefined>>>;
+                        falseValue: PropTypes.Requireable<NonNullable<string | number | boolean | null | undefined>>;
+                        allowUndefined: PropTypes.Requireable<boolean>;
+                    }>>;
+                }>>;
+                schema: PropTypes.Validator<NonNullable<PropTypes.InferProps<{
+                    type: PropTypes.Requireable<string>;
+                }>>>;
+                formData: PropTypes.Requireable<NonNullable<string | number | boolean | null | undefined>>;
+            };
+        };
+        URLWidget: {
+            ({ value, options }: {
+                value: any;
+                options?: {} | undefined;
+            }): JSX.Element;
+            propTypes: {
+                schema: PropTypes.Requireable<PropTypes.InferProps<{
+                    type: PropTypes.Requireable<string>;
+                }>>;
+                value: PropTypes.Requireable<string>;
+            };
+        };
+        InformalTaxonGroupChooserWidget: typeof widgets.InformalTaxonGroupChooserWidget;
+        TaxonImageWidget: typeof widgets.TaxonImageWidget;
+        UpperCaseWidget: typeof widgets.UpperCaseWidget;
+        NumberWidget: typeof widgets.NumberWidget;
+        InputGroupWidget: typeof widgets.InputGroupWidget;
+        InputWithDefaultValueButtonWidget: typeof widgets.InputWithDefaultValueButtonWidget;
     };
     getTemplates: (_templates?: {
         [name: string]: TemplatesType;
     }) => {
-        [x: string]: TemplatesType<any, import("@rjsf/utils").RJSFSchema, any>;
+        BaseInputTemplate: typeof templates.BaseInputTemplate;
+        DescriptionField: typeof templates.DescriptionField;
+        FieldTemplate: typeof templates.FieldTemplate;
+        ArrayFieldTemplate: {
+            new (): {
+                [x: string]: any;
+                componentDidMount(): void;
+                componentDidUpdate(prevProps: any, prevState: any): void;
+                componentWillUnmount(): void;
+                addKeyHandlers(): void;
+                arrayKeyFunctions: any;
+                removeKeyHandlers(props: any): void;
+                getKeyHandlers(props: any): any[];
+                addChildKeyHandlers(props: any): void;
+                childKeyHandlers: any;
+                removeChildKeyHandlers(): void;
+                getChildKeyHandlers(props: any): any;
+                onFocus: (target: any) => void;
+                onCopy: (options?: {}) => void;
+                getCustomEventListeners(): (string | ((target: any) => void))[][];
+                addCustomEventListeners(props: any): void;
+                customEventListeners: any;
+                removeCustomEventListeners(props: any): void;
+            };
+            [x: string]: any;
+            displayName: string;
+        };
+        ErrorListTemplate: typeof templates.ErrorListTemplate;
+        ObjectFieldTemplate: typeof templates.ObjectFieldTemplate;
+        TitleFieldTemplate: (props: any) => JSX.Element | null;
+        DescriptionFieldTemplate: typeof templates.DescriptionField;
     };
     getContext: (props: LajiFormProps, context: ContextProps) => ContextProps;
     render(): JSX.Element | null;

package/lib/components/LajiForm.js

@@ -74,134 +74,9 @@ const id_service_1 = __importDefault(require("../services/id-service"));
 const root_instance_service_1 = __importDefault(require("../services/root-instance-service"));
 const singleton_map_service_1 = __importDefault(require("../services/singleton-map-service"));
 const multi_active_array_service_1 = __importDefault(require("../services/multi-active-array-service"));
-const fields = importLocalComponents("fields", [
-    "SchemaField",
-    { "ArraySchemaField": "SchemaField" },
-    "ArrayField",
-    "ObjectField",
-    "NestField",
-    "ArrayBulkField",
-    "ArrayBulkField",
-    "ArrayPropertySumField",
-    "ScopeField",
-    "SelectTreeField",
-    "GridLayoutField",
-    "TableField",
-    "InjectField",
-    "InjectDefaultValueField",
-    "ArrayCombinerField",
-    "DependentBooleanField",
-    "DependentDisableField",
-    "MapArrayField",
-    "AutoArrayField",
-    "AutosuggestField",
-    "HiddenField",
-    "HiddenWithTextField",
-    "InitiallyHiddenField",
-    "ContextInjectionField",
-    "ImageArrayField",
-    "SplitField",
-    "FlatField",
-    "SingleActiveArrayField",
-    "SingleItemArrayField",
-    "UnitShorthandField",
-    "CombinedValueDisplayField",
-    "UiFieldMapperArrayField",
-    "ExtraLabelRowField",
-    "SumField",
-    "NamedPlaceChooserField",
-    "NamedPlaceSaverField",
-    "MapField",
-    "GeocoderField",
-    "TagArrayField",
-    "StringToArrayField",
-    "ConditionalOnChangeField",
-    "ConditionalUiSchemaField",
-    "AnnotationField",
-    "PrefillingArrayField",
-    "AnyToBooleanField",
-    "EnumRangeArrayField",
-    "UnitListShorthandArrayField",
-    "LocationChooserField",
-    "DataLeakerField",
-    "LocalityField",
-    "ImageDisplayField",
-    "FakePropertyField",
-    "SectionArrayField",
-    "MultiArrayField",
-    "AudioArrayField",
-    "FilterArrayField",
-    "MultiAnyToBooleanField",
-    "UnitCountShorthandField",
-    "ToggleAdditionalArrayFieldsField",
-    "DefaultValueArrayField",
-    "UiFieldApplierField",
-    "MultiLanguageField",
-    "SortArrayField",
-    "InputWithDefaultValueButtonField",
-    "MultiTagArrayField",
-    "PdfArrayField",
-    "AsArrayField",
-    "CondensedObjectField",
-    "MultiActiveArrayField",
-    "PrefixArrayField",
-    "FillDateRangeField",
-    "TaxonSetPopulatorField",
-    "ScientificNameTaxonAutosuggestField",
-    { "InputTransformerField": "ConditionalOnChangeField" }, // Alias for backward compatibility.
-    { "ConditionalField": "ConditionalUiSchemaField" }, // Alias for backward compatibility.
-    { "UnitRapidField": "UnitShorthandField" }, // Alias for backward compatibility.
-    { "AccordionArrayField": "SingleActiveArrayField" } // Alias for backward compatibility.
-]);
-const widgets = importLocalComponents("widgets", [
-    "CheckboxWidget",
-    "SelectWidget",
-    "TextareaWidget",
-    "DateTimeWidget",
-    "DateWidget",
-    "TimeWidget",
-    "SeparatedDateTimeWidget",
-    "AutosuggestWidget",
-    "HiddenWidget",
-    "PlainTextWidget",
-    "TextSelectWidget",
-    "ImageSelectWidget",
-    "AnyToBooleanWidget",
-    "URLWidget",
-    "InformalTaxonGroupChooserWidget",
-    "TaxonImageWidget",
-    "UpperCaseWidget",
-    "NumberWidget",
-    "InputGroupWidget",
-    "InputWithDefaultValueButtonWidget"
-]);
-const templates = importLocalComponents("templates", [
-    "BaseInputTemplate",
-    "DescriptionField",
-    { "TitleFieldTemplate": "TitleField" },
-    { "DescriptionFieldTemplate": "DescriptionField" },
-    "FieldTemplate",
-    "ArrayFieldTemplate",
-    "ErrorListTemplate",
-    "ObjectFieldTemplate"
-]);
-function importLocalComponents(dir, fieldNames) {
-    return fieldNames.reduce((fields, field) => {
-        if (typeof field === "string") {
-            fields[field] = require(`./${dir}/${field}`).default;
-        }
-        else {
-            const fieldName = Object.keys(field)[0];
-            if (typeof field[fieldName] === "string") {
-                fields[fieldName] = require(`./${dir}/${field[fieldName]}`).default;
-            }
-            else {
-                fields[fieldName] = field[fieldName];
-            }
-        }
-        return fields;
-    }, {});
-}
+const fields = __importStar(require("./fields"));
+const widgets = __importStar(require("./widgets"));
+const templates = __importStar(require("./templates"));
 // Each form should have a unique id to keep Context private.
 let id = 0;
 function getNewId() {

package/lib/components/VirtualSchemaField.d.ts

@@ -11,6 +11,7 @@ interface LajiFormComponentForVirtualSchemaField extends Omit<React.Component<Fi
  */
 export default function VirtualSchemaField<LFC extends Constructor<LajiFormComponentForVirtualSchemaField>>(ComposedComponent: LFC): {
     new (...args: any[]): {
+        UNSAFE_componentWillReceiveProps: (props: any, nextContext: any) => void;
         getUiOptions(): any;
         getStateFromProps: (props: FieldProps) => any;
         render: () => React.ReactNode;
@@ -33,7 +34,6 @@ export default function VirtualSchemaField<LFC extends Constructor<LajiFormCompo
         componentWillMount?: (() => void) | undefined;
         UNSAFE_componentWillMount?: (() => void) | undefined;
         componentWillReceiveProps?: ((nextProps: Readonly<FieldProps>, nextContext: any) => void) | undefined;
-        UNSAFE_componentWillReceiveProps?: ((nextProps: Readonly<FieldProps>, nextContext: any) => void) | undefined;
         componentWillUpdate?: ((nextProps: Readonly<FieldProps>, nextState: Readonly<{}>, nextContext: any) => void) | undefined;
         UNSAFE_componentWillUpdate?: ((nextProps: Readonly<FieldProps>, nextState: Readonly<{}>, nextContext: any) => void) | undefined;
     };

package/lib/components/VirtualSchemaField.js

@@ -15,12 +15,6 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
 var __importStar = (this && this.__importStar) || (function () {
     var ownKeys = function(o) {
         ownKeys = Object.getOwnPropertyNames || function (o) {
@@ -46,7 +40,6 @@ exports.getPropsWithInnerUiSchema = getPropsWithInnerUiSchema;
 exports.default = VirtualSchemaField;
 const React = __importStar(require("react"));
 const utils_1 = require("../utils");
-const BaseComponent_1 = __importDefault(require("./BaseComponent"));
 const Context_1 = __importDefault(require("../Context"));
 function getPropsWithInnerUiSchema(props) {
     return Object.assign(Object.assign({}, props), { uiSchema: (0, utils_1.getInnerUiSchema)(props.uiSchema) });
@@ -55,9 +48,19 @@ function getPropsWithInnerUiSchema(props) {
  * Virtual SchemaFields are components which are just state transforming machines.
  */
 function VirtualSchemaField(ComposedComponent) {
-    let VirtualSchemaField = class VirtualSchemaField extends ComposedComponent {
+    class VirtualSchemaField extends ComposedComponent {
         constructor(...args) {
             super(...args);
+            this.UNSAFE_componentWillReceiveProps = (props, nextContext) => {
+                if (super.UNSAFE_componentWillReceiveProps) {
+                    super.UNSAFE_componentWillReceiveProps(props, nextContext);
+                }
+                else if (this.getStateFromProps) {
+                    const state = this.getStateFromProps(props);
+                    if (state)
+                        this.setState(state);
+                }
+            };
             this.getStateFromProps = (props) => {
                 const propsWithInnerUiSchema = getPropsWithInnerUiSchema(props);
                 const state = super.getStateFromProps ? super.getStateFromProps(propsWithInnerUiSchema, props) : propsWithInnerUiSchema;
@@ -86,16 +89,14 @@ function VirtualSchemaField(ComposedComponent) {
                 return (React.createElement(SchemaField, Object.assign({}, filterProps(Object.assign(Object.assign({}, this.props), this.state)))));
             };
             this.getStateFromProps = this.getStateFromProps.bind(this);
+            this.state = this.getStateFromProps(args[0]);
             this.render = this.render.bind(this);
         }
         getUiOptions() {
             return (0, utils_1.getUiOptions)(this.props.uiSchema);
         }
-    };
+    }
     VirtualSchemaField.displayName = (0, utils_1.getReactComponentName)(ComposedComponent);
-    VirtualSchemaField = __decorate([
-        BaseComponent_1.default
-    ], VirtualSchemaField);
     if (ComposedComponent.getName) {
         const name = ComposedComponent.getName();
         (0, Context_1.default)("VIRTUAL_SCHEMA_NAMES")[name] = true;

package/lib/components/components/Button.d.ts

@@ -11,4 +11,4 @@ export declare const Button: React.ForwardRefExoticComponent<Pick<ThemedButtonPr
     tooltipPlacement?: string;
     tooltipTrigger?: string;
     tooltipClass?: string;
-}, "small" | "variant" | "key" | "block" | "id" | "active" | "style" | "className" | "children" | "disabled" | "tooltip" | "onKeyDown" | "onClick" | "tooltipPlacement" | "tooltipTrigger" | "tooltipClass"> & React.RefAttributes<unknown>>;
+}, "small" | "variant" | "type" | "key" | "block" | "id" | "active" | "style" | "className" | "children" | "disabled" | "tooltip" | "onKeyDown" | "onClick" | "tooltipPlacement" | "tooltipTrigger" | "tooltipClass"> & React.RefAttributes<unknown>>;

package/lib/components/components/GlyphButton.d.ts

@@ -7,4 +7,4 @@ export declare const GlyphButton: React.ForwardRefExoticComponent<Pick<import(".
     tooltipClass?: string;
 } & {
     glyph: Glyph;
-}, "small" | "variant" | "key" | "block" | "id" | "active" | "style" | "className" | "children" | "disabled" | "tooltip" | "onKeyDown" | "onClick" | "glyph" | "tooltipPlacement" | "tooltipTrigger" | "tooltipClass"> & React.RefAttributes<unknown>>;
+}, "small" | "variant" | "type" | "key" | "block" | "id" | "active" | "style" | "className" | "children" | "disabled" | "tooltip" | "onKeyDown" | "onClick" | "glyph" | "tooltipPlacement" | "tooltipTrigger" | "tooltipClass"> & React.RefAttributes<unknown>>;

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

@@ -1,4 +1,11 @@
-export default class AnnotationField extends React.Component<any, any, any> {
+import * as React from "react";
+import * as PropTypes from "prop-types";
+import { FieldProps } from "../../types";
+import memoize from "memoizee";
+type State = {
+    show: boolean;
+};
+export default class AnnotationField extends React.Component<FieldProps, State> {
     static contextType: React.Context<import("../../ReactContext").ContextProps>;
     static propTypes: {
         uiSchema: PropTypes.Validator<NonNullable<PropTypes.InferProps<{
@@ -18,21 +25,19 @@ export default class AnnotationField extends React.Component<any, any, any> {
         }>>>;
         formData: PropTypes.Validator<object>;
     };
-    constructor(props: any);
     state: {
         show: boolean;
     };
     getButton: () => {
         glyph: string;
-        tooltip: any;
+        tooltip: string;
         tooltipPlacement: string;
-        fn: () => () => void;
+        fn: (() => () => void) & memoize.Memoized<() => () => void>;
         variant: string;
     };
-    onClick: () => () => void;
+    onClick: (() => () => void) & memoize.Memoized<() => () => void>;
     onHide: () => void;
     getAnnotations: () => any;
     render(): JSX.Element;
 }
-import * as React from "react";
-import * as PropTypes from "prop-types";
+export {};

package/lib/components/fields/AnnotationField.js

@@ -15,12 +15,6 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
 var __importStar = (this && this.__importStar) || (function () {
     var ownKeys = function(o) {
         ownKeys = Object.getOwnPropertyNames || function (o) {
@@ -55,15 +49,16 @@ const React = __importStar(require("react"));
 const PropTypes = __importStar(require("prop-types"));
 const utils_1 = require("../../utils");
 const LajiForm_1 = __importDefault(require("../LajiForm"));
-const BaseComponent_1 = __importDefault(require("../BaseComponent"));
 const Context_1 = __importDefault(require("../../Context"));
 const ReactContext_1 = __importDefault(require("../../ReactContext"));
 const components_1 = require("../components");
 const react_spinner_1 = __importDefault(require("react-spinner"));
 const utils_2 = require("@luomus/laji-map/lib/utils");
-let AnnotationField = class AnnotationField extends React.Component {
-    constructor(props) {
-        super(props);
+const memoizee_1 = __importDefault(require("memoizee"));
+class AnnotationField extends React.Component {
+    constructor() {
+        super(...arguments);
+        this.state = { show: false };
         this.getButton = () => {
             const annotations = this.getAnnotations();
             return {
@@ -74,9 +69,9 @@ let AnnotationField = class AnnotationField extends React.Component {
                 variant: annotations && annotations.length ? "primary" : "default"
             };
         };
-        this.onClick = () => () => {
+        this.onClick = (0, memoizee_1.default)(() => () => {
             this.setState({ show: !this.state.show });
-        };
+        });
         this.onHide = () => {
             this.setState({ show: false });
         };
@@ -85,7 +80,6 @@ let AnnotationField = class AnnotationField extends React.Component {
             const { id } = this.props.formData;
             return (0, Context_1.default)(`${this.props.formContext.contextId}_ANNOTATIONS`)[id] || annotations[id];
         };
-        this.state = { show: false };
     }
     render() {
         const { adminOnly, container, add, filter, uiSchema: annotationUiSchema, buttonsPath = "/", formId } = (0, utils_1.getUiOptions)(this.props.uiSchema);
@@ -115,7 +109,7 @@ let AnnotationField = class AnnotationField extends React.Component {
                 React.createElement(Container, null,
                     React.createElement(AnnotationBox, { id: this.props.formData.id, annotations: this.getAnnotations(), lang: this.props.formContext.lang, formContext: this.props.formContext, add: add, uiSchema: annotationUiSchema, filter: filter, formId: formId }))));
     }
-};
+}
 AnnotationField.contextType = ReactContext_1.default;
 AnnotationField.propTypes = {
     uiSchema: PropTypes.shape({
@@ -135,9 +129,6 @@ AnnotationField.propTypes = {
     }).isRequired,
     formData: PropTypes.object.isRequired
 };
-AnnotationField = __decorate([
-    BaseComponent_1.default
-], AnnotationField);
 exports.default = AnnotationField;
 (0, Context_1.default)("SCHEMA_FIELD_WRAPPERS").AnnotationField = true;
 class AnnotationBox extends React.Component {
@@ -173,6 +164,9 @@ class AnnotationBox extends React.Component {
             state.addFormData = formData;
             this.setState(state);
         };
+        this.onAnnotationSubmitClick = () => {
+            this.onAnnotationSubmit({ formData: this.state.addFormData });
+        };
         this.getAddOptions = () => {
             const { add, formContext: { uiSchemaContext: { isAdmin } } } = this.props;
             let addOptions = (0, utils_2.isObject)(add) ? add : {};
@@ -194,7 +188,7 @@ class AnnotationBox extends React.Component {
             let submitOnChange = undefined;
             let addFormData = undefined;
             if (add && metadataForm && metadataForm.schema) {
-                const { adminOnly, filter: _filter, uiSchema: _addUiSchema, _submitOnChange, formData } = this.getAddOptions();
+                const { adminOnly, filter: _filter, uiSchema: _addUiSchema, submitOnChange: _submitOnChange, formData } = this.getAddOptions();
                 if (adminOnly && !formContext.uiSchemaContext.isAdmin) {
                     return null;
                 }
@@ -217,12 +211,12 @@ class AnnotationBox extends React.Component {
             return add && addSchema ? (React.createElement(LajiForm_1.default, Object.assign({}, metadataForm, { schema: addSchema, uiSchema: addUiSchema || _uiSchema, onSubmit: this.onAnnotationSubmit, onChange: this.onAnnotationChange, renderSubmit: renderSubmit, formData: addFormData, lang: lang, apiClient: this.props.formContext.apiClient.apiClient, uiSchemaContext: this.props.formContext.uiSchemaContext }), React.createElement("div", null,
                 this.state.fail !== undefined &&
                     React.createElement(Alert, { variant: this.state.fail ? "danger" : "success" }, translations[this.state.fail ? "SaveFail" : "SaveSuccess"]),
-                renderSubmit && React.createElement(components_1.Button, { id: "submit", type: "submit", onClick: this.onAnnotationSubmit }, translations.Submit)))) : null;
+                renderSubmit && React.createElement(components_1.Button, { id: "submit", type: "submit", onClick: this.onAnnotationSubmitClick }, translations.Submit)))) : null;
         };
         this.getUiSchema = () => {
             const { uiSchema } = this.props;
-            const { metadataForm = {} } = this.state;
-            return uiSchema || Object.assign(Object.assign({}, metadataForm.uiSchema), { "ui:shortcuts": Object.assign(Object.assign({}, ((metadataForm.uiSchema || {})["ui:shorcuts"] || {})), (this.props.formContext.services.keyHandler.shortcuts)), "ui:showShortcutsButton": false });
+            const metadataForm = this.state.metadataForm || {};
+            return uiSchema || Object.assign(Object.assign({}, (metadataForm.uiSchema || {})), { "ui:shortcuts": Object.assign(Object.assign({}, ((metadataForm.uiSchema || {})["ui:shorcuts"] || {})), (this.props.formContext.services.keyHandler.shortcuts)), "ui:showShortcutsButton": false });
         };
         this.onDelete = (id) => () => __awaiter(this, void 0, void 0, function* () {
             try {
@@ -240,7 +234,7 @@ class AnnotationBox extends React.Component {
     }
     componentDidMount() {
         this.mounted = true;
-        this.props.formContext.apiClient.get(`/forms/${this.props.formId}`, { query: { format: "schema" } })
+        this.props.formContext.apiClient.get("/forms/{id}", { path: { id: this.props.formId }, query: { format: "schema" } })
             .then(metadataForm => {
             if (!this.mounted)
                 return;