@luomus/laji-form 15.1.57 → 15.1.59

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

@@ -14,20 +14,20 @@ export default class NamedPlaceSaverField extends React.Component<any, any, any>
     getStateFromProps(props: any): {
         uiSchema: {
             "ui:options": any;
-            "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:ArrayFieldTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldTemplateProps<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:ArrayFieldDescriptionTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldDescriptionProps<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:ArrayFieldItemTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldTemplateItemType<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:ArrayFieldTitleTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldTitleProps<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:BaseInputTemplate"?: React.ComponentType<import("@rjsf/utils").WidgetProps<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:DescriptionFieldTemplate"?: React.ComponentType<import("@rjsf/utils").DescriptionFieldProps<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:ErrorListTemplate"?: React.ComponentType<import("@rjsf/utils").ErrorListProps<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:FieldErrorTemplate"?: React.ComponentType<import("@rjsf/utils").FieldErrorProps<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:FieldHelpTemplate"?: React.ComponentType<import("@rjsf/utils").FieldHelpProps<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:FieldTemplate"?: React.ComponentType<import("@rjsf/utils").FieldTemplateProps<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:ObjectFieldTemplate"?: React.ComponentType<import("@rjsf/utils").ObjectFieldTemplateProps<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:TitleFieldTemplate"?: React.ComponentType<import("@rjsf/utils").TitleFieldProps<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:UnsupportedFieldTemplate"?: React.ComponentType<import("@rjsf/utils").UnsupportedFieldProps<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:WrapIfAdditionalTemplate"?: React.ComponentType<import("@rjsf/utils").WrapIfAdditionalTemplateProps<any, any, import("../LajiForm").FormContext>> | undefined;
             "ui:classNames"?: string | undefined;
             "ui:style"?: React.StyleHTMLAttributes<any> | undefined;
             "ui:title"?: string | undefined;
@@ -50,10 +50,10 @@ export default class NamedPlaceSaverField extends React.Component<any, any, any>
             "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:widget"?: string | import("@rjsf/utils").Widget<any, any, 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:field"?: string | import("@rjsf/utils").Field<any, any, import("../LajiForm").FormContext> | undefined;
             "ui:fieldReplacesAnyOrOneOf"?: boolean | undefined;
         };
     };

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

@@ -1,7 +1,7 @@
 import * as React from "react";
 import { FieldProps, JSONSchemaArray, JSONSchemaObject } from "../../types";
 import { MediaArrayState } from "./ImageArrayField";
-export default class PdfArrayField extends React.Component<FieldProps<JSONSchemaArray<JSONSchemaObject>>, MediaArrayState> {
+export default class PdfArrayField extends React.Component<FieldProps<any, JSONSchemaArray<JSONSchemaObject>>, MediaArrayState> {
     ALLOWED_FILE_TYPES: string[];
     ACCEPT_FILE_TYPES: string[];
     MAX_FILE_SIZE: number;

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

@@ -1,7 +1,6 @@
-export default class _SchemaField extends React.Component<any, any, any> {
-    constructor(props: any);
-    updateVirtualInstance: (props: any, initial: any) => void;
-    functionOutputProps: any;
-    applyFunction(props: any): any;
-}
 import * as React from "react";
+import { FieldProps } from "../../types";
+export default class _SchemaField extends React.Component<FieldProps> {
+    applyFunction(props: FieldProps): FieldProps<any, import("../../types").JSONSchemaObject>;
+    render(): JSX.Element;
+}

package/lib/components/fields/SchemaField.js

@@ -34,32 +34,12 @@ const React = __importStar(require("react"));
 const utils_1 = require("../../utils");
 const utils_2 = require("@luomus/laji-map/lib/utils");
 const ContextInjectionField_1 = require("./ContextInjectionField");
-const utils_3 = require("@rjsf/utils");
 const core_1 = require("@rjsf/core");
+const types_1 = require("../../types");
 class _SchemaField extends React.Component {
-    constructor(props) {
-        super(props);
-        this.updateVirtualInstance = (props, initial) => {
-            const virtualizedProps = ["ui:functions", "ui:childFunctions", "ui:annotations", "ui:multiLanguage"];
-            if ([props, this.props].some(_props => _props.uiSchema && virtualizedProps.some(prop => _props.uiSchema[prop])) &&
-                (initial || !utils_3.deepEquals(this.props, props))) {
-                this.functionOutputProps = this.applyFunction(props);
-            }
-        };
-        this.updateVirtualInstance(props, !!"initial");
-        this.state = { showAnnotations: false };
-    }
-    UNSAFE_componentWillReceiveProps(props) {
-        this.updateVirtualInstance(props);
-    }
     applyFunction(props) {
         let _a = (props.uiSchema || {}), { "ui:functions": functions, "ui:childFunctions": childFunctions, "ui:annotations": annotations, "ui:multiLanguage": multiLanguage } = _a, _uiSchema = __rest(_a, ["ui:functions", "ui:childFunctions", "ui:annotations", "ui:multiLanguage"]);
-        const objectOrArrayAsArray = item => (item
-            ? (Array.isArray(item)
-                ? item
-                : [item])
-            : []);
-        functions = objectOrArrayAsArray(functions);
+        functions = functions ? utils_1.asArray(functions) : [];
         if (childFunctions) {
             functions = [
                 { "ui:field": "UiFieldMapperArrayField", "ui:options": { functions: childFunctions } },
@@ -97,13 +77,13 @@ class _SchemaField extends React.Component {
         return Object.assign(Object.assign({}, _props), { uiSchema: Object.assign(Object.assign({}, _props.uiSchema), { "ui:functions": restUiFns }) });
     }
     render() {
-        const props = this.functionOutputProps || this.props;
+        const props = this.applyFunction(this.props);
         let { schema, uiSchema = {}, formContext, registry } = props, _props = __rest(props, ["schema", "uiSchema", "formContext", "registry"]); // eslint-disable-line @typescript-eslint/no-unused-vars
         const { formContext: _formContext } = registry;
         // rjsf displays a duplicate label if 'uniqueItems' is true in some cases. We prevent that here.
         // Example of when it shows duplicate is http://localhost:8083/?id=JX.652&local=true, "Elinympäristö" on gathering
         // level.
-        if (props.schema.type === "array" && props.uiSchema && props.uiSchema.items && props.uiSchema.items["ui:field"]) {
+        if (types_1.isJSONSchemaArray(schema) && uiSchema && uiSchema.items && uiSchema.items["ui:field"]) {
             schema = Object.assign(Object.assign({}, schema), { uniqueItems: false });
         }
         const options = utils_1.getUiOptions(uiSchema);

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

@@ -60,7 +60,7 @@ export default class ScopeField extends React.Component<any, any, any> {
     _globals: any;
     getSchemasAndAdditionals: (props: any, state: any) => {
         schema: any;
-        uiSchema: import("../../types").UiSchema;
+        uiSchema: import("../../types").UiSchema<any>;
         additionalFields: any;
         defaultFields: any;
         fieldsToShow: {};

package/lib/components/fields/SelectTreeField.js

@@ -58,7 +58,7 @@ const getChildProps = (props) => {
     let formData = {};
     let idSchema = { $id: props.idSchema.$id };
     let dictionarifiedEnums = {};
-    props.schema.oneOf.forEach(e => {
+    props.schema.oneOf.forEach((e) => {
         dictionarifiedEnums[e.const] = e.title;
     });
     const tree = utils_1.getUiOptions(props.uiSchema).tree;

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

@@ -60,20 +60,20 @@ export default class SortArrayField extends React.Component<FieldProps<JSONSchem
     syncColumns(): void;
     getUiShema(props: FieldProps<JSONSchemaArray<JSONSchemaObject>>, { sortCols }: State, sortedData: any[]): {
         "ui:options": any;
-        "ui:ArrayFieldTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldTemplateProps<any, JSONSchemaObject, FormContext>> | undefined;
-        "ui:ArrayFieldDescriptionTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldDescriptionProps<any, JSONSchemaObject, FormContext>> | undefined;
-        "ui:ArrayFieldItemTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldTemplateItemType<any, JSONSchemaObject, FormContext>> | undefined;
-        "ui:ArrayFieldTitleTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldTitleProps<any, JSONSchemaObject, FormContext>> | undefined;
-        "ui:BaseInputTemplate"?: React.ComponentType<import("@rjsf/utils").WidgetProps<any, JSONSchemaObject, FormContext>> | undefined;
-        "ui:DescriptionFieldTemplate"?: React.ComponentType<import("@rjsf/utils").DescriptionFieldProps<any, JSONSchemaObject, FormContext>> | undefined;
-        "ui:ErrorListTemplate"?: React.ComponentType<import("@rjsf/utils").ErrorListProps<any, JSONSchemaObject, FormContext>> | undefined;
-        "ui:FieldErrorTemplate"?: React.ComponentType<import("@rjsf/utils").FieldErrorProps<any, JSONSchemaObject, FormContext>> | undefined;
-        "ui:FieldHelpTemplate"?: React.ComponentType<import("@rjsf/utils").FieldHelpProps<any, JSONSchemaObject, FormContext>> | undefined;
-        "ui:FieldTemplate"?: React.ComponentType<import("@rjsf/utils").FieldTemplateProps<any, JSONSchemaObject, FormContext>> | undefined;
-        "ui:ObjectFieldTemplate"?: React.ComponentType<import("@rjsf/utils").ObjectFieldTemplateProps<any, JSONSchemaObject, FormContext>> | undefined;
-        "ui:TitleFieldTemplate"?: React.ComponentType<import("@rjsf/utils").TitleFieldProps<any, JSONSchemaObject, FormContext>> | undefined;
-        "ui:UnsupportedFieldTemplate"?: React.ComponentType<import("@rjsf/utils").UnsupportedFieldProps<any, JSONSchemaObject, FormContext>> | undefined;
-        "ui:WrapIfAdditionalTemplate"?: React.ComponentType<import("@rjsf/utils").WrapIfAdditionalTemplateProps<any, JSONSchemaObject, FormContext>> | undefined;
+        "ui:ArrayFieldTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldTemplateProps<any, any, FormContext>> | undefined;
+        "ui:ArrayFieldDescriptionTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldDescriptionProps<any, any, FormContext>> | undefined;
+        "ui:ArrayFieldItemTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldTemplateItemType<any, any, FormContext>> | undefined;
+        "ui:ArrayFieldTitleTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldTitleProps<any, any, FormContext>> | undefined;
+        "ui:BaseInputTemplate"?: React.ComponentType<import("@rjsf/utils").WidgetProps<any, any, FormContext>> | undefined;
+        "ui:DescriptionFieldTemplate"?: React.ComponentType<import("@rjsf/utils").DescriptionFieldProps<any, any, FormContext>> | undefined;
+        "ui:ErrorListTemplate"?: React.ComponentType<import("@rjsf/utils").ErrorListProps<any, any, FormContext>> | undefined;
+        "ui:FieldErrorTemplate"?: React.ComponentType<import("@rjsf/utils").FieldErrorProps<any, any, FormContext>> | undefined;
+        "ui:FieldHelpTemplate"?: React.ComponentType<import("@rjsf/utils").FieldHelpProps<any, any, FormContext>> | undefined;
+        "ui:FieldTemplate"?: React.ComponentType<import("@rjsf/utils").FieldTemplateProps<any, any, FormContext>> | undefined;
+        "ui:ObjectFieldTemplate"?: React.ComponentType<import("@rjsf/utils").ObjectFieldTemplateProps<any, any, FormContext>> | undefined;
+        "ui:TitleFieldTemplate"?: React.ComponentType<import("@rjsf/utils").TitleFieldProps<any, any, FormContext>> | undefined;
+        "ui:UnsupportedFieldTemplate"?: React.ComponentType<import("@rjsf/utils").UnsupportedFieldProps<any, any, FormContext>> | undefined;
+        "ui:WrapIfAdditionalTemplate"?: React.ComponentType<import("@rjsf/utils").WrapIfAdditionalTemplateProps<any, any, FormContext>> | undefined;
         "ui:classNames"?: string | undefined;
         "ui:style"?: React.StyleHTMLAttributes<any> | undefined;
         "ui:title"?: string | undefined;
@@ -96,30 +96,30 @@ export default class SortArrayField extends React.Component<FieldProps<JSONSchem
         "ui:label"?: boolean | undefined;
         "ui:rows"?: number | undefined;
         "ui:submitButtonOptions"?: import("@rjsf/utils").UISchemaSubmitButtonOptions | undefined;
-        "ui:widget"?: string | import("@rjsf/utils").Widget<any, JSONSchemaObject, FormContext> | undefined;
+        "ui:widget"?: string | import("@rjsf/utils").Widget<any, any, FormContext> | undefined;
         "ui:duplicateKeySuffixSeparator"?: string | undefined;
         "ui:rootFieldId"?: string | undefined;
-        "ui:field"?: string | import("@rjsf/utils").Field<any, JSONSchemaObject, FormContext> | undefined;
+        "ui:field"?: string | import("@rjsf/utils").Field<any, any, FormContext> | undefined;
         "ui:fieldReplacesAnyOrOneOf"?: boolean | undefined;
     };
     getSortableColumns(props: FieldProps<JSONSchemaArray<JSONSchemaObject>>): string[] | undefined;
     getNextComponentProps(props: any, state: State): {
         uiSchema: {
             "ui:options": any;
-            "ui:ArrayFieldTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldTemplateProps<any, JSONSchemaObject, FormContext>> | undefined;
-            "ui:ArrayFieldDescriptionTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldDescriptionProps<any, JSONSchemaObject, FormContext>> | undefined;
-            "ui:ArrayFieldItemTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldTemplateItemType<any, JSONSchemaObject, FormContext>> | undefined;
-            "ui:ArrayFieldTitleTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldTitleProps<any, JSONSchemaObject, FormContext>> | undefined;
-            "ui:BaseInputTemplate"?: React.ComponentType<import("@rjsf/utils").WidgetProps<any, JSONSchemaObject, FormContext>> | undefined;
-            "ui:DescriptionFieldTemplate"?: React.ComponentType<import("@rjsf/utils").DescriptionFieldProps<any, JSONSchemaObject, FormContext>> | undefined;
-            "ui:ErrorListTemplate"?: React.ComponentType<import("@rjsf/utils").ErrorListProps<any, JSONSchemaObject, FormContext>> | undefined;
-            "ui:FieldErrorTemplate"?: React.ComponentType<import("@rjsf/utils").FieldErrorProps<any, JSONSchemaObject, FormContext>> | undefined;
-            "ui:FieldHelpTemplate"?: React.ComponentType<import("@rjsf/utils").FieldHelpProps<any, JSONSchemaObject, FormContext>> | undefined;
-            "ui:FieldTemplate"?: React.ComponentType<import("@rjsf/utils").FieldTemplateProps<any, JSONSchemaObject, FormContext>> | undefined;
-            "ui:ObjectFieldTemplate"?: React.ComponentType<import("@rjsf/utils").ObjectFieldTemplateProps<any, JSONSchemaObject, FormContext>> | undefined;
-            "ui:TitleFieldTemplate"?: React.ComponentType<import("@rjsf/utils").TitleFieldProps<any, JSONSchemaObject, FormContext>> | undefined;
-            "ui:UnsupportedFieldTemplate"?: React.ComponentType<import("@rjsf/utils").UnsupportedFieldProps<any, JSONSchemaObject, FormContext>> | undefined;
-            "ui:WrapIfAdditionalTemplate"?: React.ComponentType<import("@rjsf/utils").WrapIfAdditionalTemplateProps<any, JSONSchemaObject, FormContext>> | undefined;
+            "ui:ArrayFieldTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldTemplateProps<any, any, FormContext>> | undefined;
+            "ui:ArrayFieldDescriptionTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldDescriptionProps<any, any, FormContext>> | undefined;
+            "ui:ArrayFieldItemTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldTemplateItemType<any, any, FormContext>> | undefined;
+            "ui:ArrayFieldTitleTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldTitleProps<any, any, FormContext>> | undefined;
+            "ui:BaseInputTemplate"?: React.ComponentType<import("@rjsf/utils").WidgetProps<any, any, FormContext>> | undefined;
+            "ui:DescriptionFieldTemplate"?: React.ComponentType<import("@rjsf/utils").DescriptionFieldProps<any, any, FormContext>> | undefined;
+            "ui:ErrorListTemplate"?: React.ComponentType<import("@rjsf/utils").ErrorListProps<any, any, FormContext>> | undefined;
+            "ui:FieldErrorTemplate"?: React.ComponentType<import("@rjsf/utils").FieldErrorProps<any, any, FormContext>> | undefined;
+            "ui:FieldHelpTemplate"?: React.ComponentType<import("@rjsf/utils").FieldHelpProps<any, any, FormContext>> | undefined;
+            "ui:FieldTemplate"?: React.ComponentType<import("@rjsf/utils").FieldTemplateProps<any, any, FormContext>> | undefined;
+            "ui:ObjectFieldTemplate"?: React.ComponentType<import("@rjsf/utils").ObjectFieldTemplateProps<any, any, FormContext>> | undefined;
+            "ui:TitleFieldTemplate"?: React.ComponentType<import("@rjsf/utils").TitleFieldProps<any, any, FormContext>> | undefined;
+            "ui:UnsupportedFieldTemplate"?: React.ComponentType<import("@rjsf/utils").UnsupportedFieldProps<any, any, FormContext>> | undefined;
+            "ui:WrapIfAdditionalTemplate"?: React.ComponentType<import("@rjsf/utils").WrapIfAdditionalTemplateProps<any, any, FormContext>> | undefined;
             "ui:classNames"?: string | undefined;
             "ui:style"?: React.StyleHTMLAttributes<any> | undefined;
             "ui:title"?: string | undefined;
@@ -142,10 +142,10 @@ export default class SortArrayField extends React.Component<FieldProps<JSONSchem
             "ui:label"?: boolean | undefined;
             "ui:rows"?: number | undefined;
             "ui:submitButtonOptions"?: import("@rjsf/utils").UISchemaSubmitButtonOptions | undefined;
-            "ui:widget"?: string | import("@rjsf/utils").Widget<any, JSONSchemaObject, FormContext> | undefined;
+            "ui:widget"?: string | import("@rjsf/utils").Widget<any, any, FormContext> | undefined;
             "ui:duplicateKeySuffixSeparator"?: string | undefined;
             "ui:rootFieldId"?: string | undefined;
-            "ui:field"?: string | import("@rjsf/utils").Field<any, JSONSchemaObject, FormContext> | undefined;
+            "ui:field"?: string | import("@rjsf/utils").Field<any, any, FormContext> | undefined;
             "ui:fieldReplacesAnyOrOneOf"?: boolean | undefined;
         };
         formData: any[];

package/lib/components/fields/SplitField.js

@@ -42,7 +42,7 @@ let SplitField = class SplitField extends React.Component {
             const { SchemaField } = this.props.registry.fields;
             // TODO TS fix typing after NestField ts conversion.
             const _props = NestField_1.getPropsForFields(this.props, fields);
-            return (React.createElement(SchemaField, Object.assign({}, this.props, _props, { onChange: this.onChange(fields), name: "" })));
+            return (React.createElement(SchemaField, Object.assign({}, this.props, _props, { onChange: this.onChange(fields), name: "", onBlur: this.props.onBlur, onFocus: this.props.onFocus, disabled: this.props.disabled, readonly: this.props.readonly })));
         };
         this.onChange = (fields) => (formData) => {
             this.props.onChange(fields.reduce((updatedFormData, field) => {

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

@@ -16,20 +16,20 @@ export default class StringToArrayField extends React.Component<any, any, any> {
         };
         formData: any;
         uiSchema: {
-            "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:ArrayFieldTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldTemplateProps<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:ArrayFieldDescriptionTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldDescriptionProps<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:ArrayFieldItemTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldTemplateItemType<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:ArrayFieldTitleTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldTitleProps<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:BaseInputTemplate"?: React.ComponentType<import("@rjsf/utils").WidgetProps<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:DescriptionFieldTemplate"?: React.ComponentType<import("@rjsf/utils").DescriptionFieldProps<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:ErrorListTemplate"?: React.ComponentType<import("@rjsf/utils").ErrorListProps<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:FieldErrorTemplate"?: React.ComponentType<import("@rjsf/utils").FieldErrorProps<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:FieldHelpTemplate"?: React.ComponentType<import("@rjsf/utils").FieldHelpProps<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:FieldTemplate"?: React.ComponentType<import("@rjsf/utils").FieldTemplateProps<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:ObjectFieldTemplate"?: React.ComponentType<import("@rjsf/utils").ObjectFieldTemplateProps<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:TitleFieldTemplate"?: React.ComponentType<import("@rjsf/utils").TitleFieldProps<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:UnsupportedFieldTemplate"?: React.ComponentType<import("@rjsf/utils").UnsupportedFieldProps<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:WrapIfAdditionalTemplate"?: React.ComponentType<import("@rjsf/utils").WrapIfAdditionalTemplateProps<any, any, import("../LajiForm").FormContext>> | undefined;
             "ui:classNames"?: string | undefined;
             "ui:style"?: React.StyleHTMLAttributes<any> | undefined;
             "ui:title"?: string | undefined;
@@ -52,12 +52,12 @@ export default class StringToArrayField extends React.Component<any, any, any> {
             "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:widget"?: string | import("@rjsf/utils").Widget<any, any, 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:field"?: string | import("@rjsf/utils").Field<any, any, import("../LajiForm").FormContext> | undefined;
             "ui:fieldReplacesAnyOrOneOf"?: boolean | undefined;
-            "ui:options"?: import("@rjsf/utils").UIOptionsType<any, import("../../types").JSONSchemaObject, import("../LajiForm").FormContext> | undefined;
+            "ui:options"?: import("@rjsf/utils").UIOptionsType<any, any, import("../LajiForm").FormContext> | undefined;
         };
         onChange: (formData: any) => void;
     };

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

@@ -18,7 +18,7 @@ export default class ToggleAdditionalArrayFieldsField extends React.Component<an
     getTogglePersistenceContextKey: (props: any) => string;
     getInitialVisible(props: any): unknown;
     getStateFromProps(props: any): {
-        uiSchema: import("../../types").UiSchema;
+        uiSchema: import("../../types").UiSchema<any>;
     };
     toggleVisibility: () => void;
 }

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

@@ -14,20 +14,20 @@ export default class UnitListShorthandArrayField extends React.Component<any, an
     getStateFromProps(props: any): {
         uiSchema: {
             "ui:options": any;
-            "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:ArrayFieldTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldTemplateProps<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:ArrayFieldDescriptionTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldDescriptionProps<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:ArrayFieldItemTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldTemplateItemType<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:ArrayFieldTitleTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldTitleProps<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:BaseInputTemplate"?: React.ComponentType<import("@rjsf/utils").WidgetProps<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:DescriptionFieldTemplate"?: React.ComponentType<import("@rjsf/utils").DescriptionFieldProps<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:ErrorListTemplate"?: React.ComponentType<import("@rjsf/utils").ErrorListProps<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:FieldErrorTemplate"?: React.ComponentType<import("@rjsf/utils").FieldErrorProps<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:FieldHelpTemplate"?: React.ComponentType<import("@rjsf/utils").FieldHelpProps<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:FieldTemplate"?: React.ComponentType<import("@rjsf/utils").FieldTemplateProps<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:ObjectFieldTemplate"?: React.ComponentType<import("@rjsf/utils").ObjectFieldTemplateProps<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:TitleFieldTemplate"?: React.ComponentType<import("@rjsf/utils").TitleFieldProps<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:UnsupportedFieldTemplate"?: React.ComponentType<import("@rjsf/utils").UnsupportedFieldProps<any, any, import("../LajiForm").FormContext>> | undefined;
+            "ui:WrapIfAdditionalTemplate"?: React.ComponentType<import("@rjsf/utils").WrapIfAdditionalTemplateProps<any, any, import("../LajiForm").FormContext>> | undefined;
             "ui:classNames"?: string | undefined;
             "ui:style"?: React.StyleHTMLAttributes<any> | undefined;
             "ui:title"?: string | undefined;
@@ -50,10 +50,10 @@ export default class UnitListShorthandArrayField extends React.Component<any, an
             "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:widget"?: string | import("@rjsf/utils").Widget<any, any, 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:field"?: string | import("@rjsf/utils").Field<any, any, import("../LajiForm").FormContext> | undefined;
             "ui:fieldReplacesAnyOrOneOf"?: boolean | undefined;
         };
     };

package/lib/components/widgets/SelectWidget.d.ts

@@ -1,21 +1,22 @@
 /// <reference types="react" />
 import { EnumOptionsType as _EnumOptionsType } from "@rjsf/utils";
 import { JSONSchemaArray, JSONSchemaEnum, JSONSchemaEnumOneOf, WidgetProps } from "../../types";
-declare type EnumOptionsType<T = string | undefined> = Omit<_EnumOptionsType, "value"> & {
+declare type EnumOptionsType<T = string | number | undefined> = Omit<_EnumOptionsType, "value"> & {
     value: T;
 };
-declare type SelectWidgetCustomProps = {
+declare type SelectWidgetCustomProps<T> = {
     includeEmpty?: boolean;
-    getEnumOptionsAsync?: () => Promise<EnumOptionsType<string>[]>;
+    getEnumOptionsAsync?: () => Promise<EnumOptionsType<T>[]>;
 };
-declare type SingleSelectWidgetProps = Omit<WidgetProps<JSONSchemaEnum>, "value" | "onChange"> & {
-    value?: string;
-    onChange: (value?: string) => void;
-} & SelectWidgetCustomProps;
-declare type MultiSelectWidgetProps = Omit<WidgetProps<JSONSchemaArray<JSONSchemaEnumOneOf>>, "value" | "onChange"> & {
-    value?: string[];
-    onChange: (value?: string[]) => void;
-} & SelectWidgetCustomProps;
-declare type SelectWidgetProps = SingleSelectWidgetProps | MultiSelectWidgetProps;
-export default function SelectWidget(props: SelectWidgetProps): JSX.Element | null;
-export {};
+declare type SingleSelectWidgetProps<T extends string | number> = Omit<WidgetProps<JSONSchemaEnum>, "value" | "onChange"> & {
+    value?: T;
+    onChange: (value?: T) => void;
+} & SelectWidgetCustomProps<T>;
+declare type MultiSelectWidgetProps<T extends string | number> = Omit<WidgetProps<JSONSchemaArray<JSONSchemaEnumOneOf>>, "value" | "onChange"> & {
+    value?: T[];
+    onChange: (value?: T[]) => void;
+} & SelectWidgetCustomProps<T>;
+declare type SelectWidgetProps<T extends string | number> = SingleSelectWidgetProps<T> | MultiSelectWidgetProps<T>;
+declare const SelectWidget: <T extends string | number>(props: SelectWidgetProps<T>) => JSX.Element;
+export default SelectWidget;
+export declare function SearchableDrowndown<T extends string | number>(props: SingleSelectWidgetProps<T>): JSX.Element;

package/lib/components/widgets/SelectWidget.js

@@ -31,8 +31,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.SearchableDrowndown = void 0;
 const React = __importStar(require("react"));
-// import * as PropTypes from "prop-types";
 const ReactContext_1 = __importDefault(require("../../ReactContext"));
 const utils_1 = require("../../utils");
 const react_1 = require("react");
@@ -71,9 +71,9 @@ function getEnumOptions(enumOptions, uiSchema, includeEmpty = true) {
             : [{ value: undefined, label: "" }, ...enums];
     }
 }
-function SelectWidget(props) {
-    return props.schema.type === "array" ? React.createElement(SearchableMultiDrowndown, Object.assign({}, props)) : React.createElement(SearchableDrowndown, Object.assign({}, props));
-}
+const SelectWidget = (props) => props.schema.type === "array"
+    ? React.createElement(SearchableMultiDrowndown, Object.assign({}, props))
+    : React.createElement(SearchableDrowndown, Object.assign({}, props));
 exports.default = SelectWidget;
 function SearchableDrowndown(props) {
     const { id, disabled, readonly, value, uiSchema, options, onChange, includeEmpty = true } = props;
@@ -109,11 +109,14 @@ function SearchableDrowndown(props) {
         setActiveIdx(0);
     }, [setActiveIdx]);
     const onItemSelected = react_1.useCallback((item) => {
+        if (item.value === value) {
+            return;
+        }
         onChange(item.value);
         setFilterTerm(undefined);
         setActiveIdx(enumOptions.findIndex(enu => enu.value === item.value));
         hide();
-    }, [enumOptions, hide, onChange, setActiveIdx]);
+    }, [enumOptions, hide, onChange, setActiveIdx, value]);
     const onBlur = react_1.useCallback((e) => {
         // Fixes the issue that when user tries to click an enum item, `setOpen(false)`
         // hides the enum list, so the elem list item is hidden before the click, thus never
@@ -170,25 +173,19 @@ function SearchableDrowndown(props) {
             return (React.createElement(ListItem, { key: (_a = oneOf.value) !== null && _a !== void 0 ? _a : "", onSelected: onItemSelected, active: idx === activeIdx }, oneOf));
         }))));
 }
+exports.SearchableDrowndown = SearchableDrowndown;
 function SearchableMultiDrowndown(props) {
     const { id, disabled, readonly, value, uiSchema, options, onChange, getEnumOptionsAsync } = props;
     const [enumOptions, setEnumOptions] = react_1.useState(getEnumOptionsAsync
         ? undefined
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         : getEnumOptions(options.enumOptions, uiSchema, false));
-    const [inputValue, setUserTypedInputValue] = react_1.useState("");
-    const [filterTerm, setFilterTerm] = react_1.useState("");
+    const [filterTerm, setFilterTerm] = react_1.useState();
     const [loading, setLoading] = react_1.useState(undefined);
     const [isOpen, show, hide] = utils_1.useBooleanSetter(false);
+    const inputValue = filterTerm !== null && filterTerm !== void 0 ? filterTerm : "";
     const containerRef = React.useRef(null);
     const inputRef = React.useRef(null);
-    const onInputChange = react_1.useCallback((e) => {
-        const { value } = e.target;
-        setUserTypedInputValue(value);
-    }, []);
-    React.useEffect(() => {
-        setFilterTerm(inputValue);
-    }, [inputValue]);
     const filteredEnums = React.useMemo(() => {
         if (!enumOptions) {
             return [];
@@ -196,20 +193,27 @@ function SearchableMultiDrowndown(props) {
         const notAlreadySelected = (value === null || value === void 0 ? void 0 : value.length)
             ? enumOptions.filter(({ value: enumValue }) => !value.includes(enumValue))
             : enumOptions;
-        return filterTerm !== ""
+        return filterTerm !== undefined && filterTerm !== ""
             ? notAlreadySelected.filter(({ label, value: enumValue }) => (value || []).includes(enumValue)
                 || label.toLowerCase().match(filterTerm.toLowerCase()))
             : notAlreadySelected;
     }, [filterTerm, enumOptions, value]);
     const [activeIdx, activeIdxUp, activeIdxDown, setActiveIdx] = useRangeIncrementor((filteredEnums || []).length, undefined);
+    const onInputChange = react_1.useCallback((e) => {
+        const { value } = e.target;
+        setFilterTerm(value);
+        setActiveIdx(undefined);
+    }, [setActiveIdx]);
     const onItemSelected = react_1.useCallback((item) => {
         var _a;
         onChange([...(value || []), item.value]);
+        setFilterTerm(undefined);
         (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
         setActiveIdx(undefined);
     }, [onChange, setActiveIdx, value]);
     const onItemSelectedByBlur = react_1.useCallback((item) => {
         onChange([...(value || []), item.value]);
+        setFilterTerm(undefined);
         setActiveIdx(undefined);
     }, [onChange, setActiveIdx, value]);
     const [isFocused, setFocused, setBlurred] = utils_1.useBooleanSetter(false);
@@ -267,7 +271,7 @@ function SearchableMultiDrowndown(props) {
             onItemSelectedByBlur(filteredEnums[activeIdx]);
         }
         else {
-            setUserTypedInputValue("");
+            setFilterTerm(undefined);
         }
     }, [activeIdx, filteredEnums, hide, onItemSelectedByBlur, setBlurred]);
     const onKeyDown = react_1.useCallback((e) => {
@@ -285,8 +289,9 @@ function SearchableMultiDrowndown(props) {
                 e.preventDefault();
                 break;
             case "Escape":
-                setUserTypedInputValue("");
-                setActiveIdx(undefined);
+                if (activeIdx !== undefined && filteredEnums) {
+                    onItemSelected(filteredEnums[activeIdx]);
+                }
                 e.preventDefault();
                 break;
             case "Backspace":
@@ -297,12 +302,16 @@ function SearchableMultiDrowndown(props) {
                 }
                 break;
         }
-    }, [activeIdx, activeIdxDown, activeIdxUp, filteredEnums, inputValue, onChange, onItemSelected, setActiveIdx, value]);
+    }, [activeIdx, activeIdxDown, activeIdxUp, filteredEnums, inputValue, onChange, onItemSelected, value]);
     /* eslint-disable @typescript-eslint/no-non-null-assertion */
     const onDelete = react_1.useCallback((enu) => {
+        var _a;
         const filtered = value.filter(v => v !== enu.value);
         onChange(value.length === 0 ? undefined : filtered);
-    }, [onChange, value]);
+        if (isOpen) {
+            (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+        }
+    }, [isOpen, onChange, value]);
     /* eslint-enable @typescript-eslint/no-non-null-assertion */
     const redirectFocusToInput = react_1.useCallback((e) => {
         var _a;
@@ -315,7 +324,7 @@ function SearchableMultiDrowndown(props) {
     const wrapperClassNames = utils_1.classNames("laji-form-multiselect-input-wrapper", isOpen && "laji-form-multiselect-input-wrapper-focus", isOpen && "input-highlight", (readonly || disabled) && "laji-form-multiselect-input-wrapper-readonly");
     return (React.createElement("div", { onBlur: onBlur, onKeyDown: onKeyDown, ref: containerRef, className: "laji-form-multiselect", style: { position: "relative" } },
         React.createElement("div", { className: wrapperClassNames, tabIndex: -1, onFocus: redirectFocusToInput, style: { cursor: "text" } },
-            React.createElement("ul", { style: { listStyle: "none", display: "inline-block" } }, value && enumOptions && value.map(v => enumOptions.find(({ value: _value }) => v === _value) || ({ value: v, label: v }))
+            React.createElement("ul", { style: { listStyle: "none", display: "inline-block" } }, value && enumOptions && value.map(v => enumOptions.find(({ value: _value }) => v === _value) || ({ value: v, label: "" + v }))
                 .map(enu => React.createElement(SelectedMultiValue, { key: enu.value, onDelete: onDelete, readonly: readonly || disabled }, enu))),
             React.createElement("input", { disabled: disabled || readonly, id: id, onFocus: onFocus, value: inputValue, onChange: onInputChange, autoComplete: "off", ref: inputRef }),
             loading && React.createElement(react_spinner_1.default, null)),
@@ -325,12 +334,12 @@ function SearchableMultiDrowndown(props) {
             return (React.createElement(ListItem, { key: (_a = oneOf.value) !== null && _a !== void 0 ? _a : "", onSelected: onItemSelected, active: idx === activeIdx }, oneOf));
         }))));
 }
-const SelectedMultiValue = ({ children: enu, onDelete, readonly }) => {
+function SelectedMultiValue({ children: enu, onDelete, readonly }) {
     const onDeleteClick = react_1.useCallback(() => !readonly && onDelete(enu), [enu, onDelete, readonly]);
     return (React.createElement("li", { key: enu.value, style: { display: "inline-table" }, className: "laji-form-multiselect-tag" },
         enu.label,
         React.createElement("span", { tabIndex: readonly ? undefined : 0, role: readonly ? undefined : "button", onClick: onDeleteClick }, "\u00D7")));
-};
+}
 const Caret = () => (React.createElement("div", { className: "laji-form-dropdown-caret-container", style: { position: "absolute", pointerEvents: "none" } },
     React.createElement("span", { className: "laji-form-dropdown-caret" },
         React.createElement("img", { src: "https://cdn.laji.fi/images/icons/caret-down.svg" }))));
@@ -340,6 +349,8 @@ function ListItem({ onSelected, active, children }) {
     }, [children, onSelected]);
     return (React.createElement("div", { onClick: onClick, className: utils_1.classNames("laji-form-dropdown-item", active && "active"), tabIndex: -1 }, children.label));
 }
-const getDefaultActiveIdx = (filteredEnums, value) => value !== undefined && value !== ""
-    ? filteredEnums.findIndex(item => item.value === value)
-    : 0;
+function getDefaultActiveIdx(filteredEnums, value) {
+    return value !== undefined && value !== ""
+        ? filteredEnums.findIndex(item => item.value === value)
+        : 0;
+}