@luomus/laji-form 15.1.31 → 15.1.33

package/lib/components/VirtualSchemaField.js

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

package/lib/components/templates/ErrorListTemplate.js

@@ -71,7 +71,7 @@ class ErrorListTemplate extends React.Component {
                     _path = `${_path}/items`;
                 else
                     _path = `${_path}/properties/${prop}`;
-                const _defaultTitle = uiSchema["ui:multiLanguage"] ? `${title} (${prop})` : prop;
+                const _defaultTitle = _schema.type === "array" || uiSchema["ui:multiLanguage"] ? `${title} (${prop})` : prop;
                 const childErrors = walkErrors(_path, `${id}_${prop}`, errorSchema[prop], uiSchema[prop] || {}, _defaultTitle);
                 errors = [...errors, ...childErrors.errors];
                 warnings = [...warnings, ...childErrors.warnings];

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

@@ -37,7 +37,7 @@ export class Autosuggest extends React.Component<any, any, any> {
     getSuggestionValue: (suggestion: any) => any;
     renderSuggestion: (suggestion: any) => JSX.Element;
     selectSuggestion: (suggestion: any) => void;
-    selectUnsuggested: (value: any) => void;
+    selectUnsuggested: (inputValue: any) => void;
     onSuggestionSelected: (suggestion: any) => void;
     onUnsuggestedSelected: (inputValue: any) => void;
     findExactMatch: (suggestions: any, inputValue?: string) => any;

package/lib/components/widgets/AutosuggestWidget.js

@@ -469,16 +469,17 @@ class Autosuggest extends React.Component {
                 ? this.setState(state, afterStateChange)
                 : afterStateChange();
         };
-        this.selectUnsuggested = (value) => {
-            if (utils_1.isEmptyString(value) && utils_1.isEmptyString(this.props.value))
+        this.selectUnsuggested = (inputValue) => {
+            if (utils_1.isEmptyString(inputValue) && utils_1.isEmptyString(this.props.value))
                 return;
+            const value = !utils_1.isEmptyString(inputValue) ? inputValue : undefined;
             const { onUnsuggestedSelected, onChange } = this.props;
             const afterStateChange = () => {
                 onUnsuggestedSelected ?
                     onUnsuggestedSelected(value) :
                     onChange(value);
             };
-            const state = { inputValue: value, suggestion: undefined, suggestionForValue: value };
+            const state = { inputValue, suggestion: undefined, suggestionForValue: inputValue };
             this.mounted
                 ? this.setState(state, afterStateChange)
                 : afterStateChange();
@@ -607,7 +608,7 @@ class Autosuggest extends React.Component {
                 this.selectUnsuggested(parsedInputValue);
             }
             else if (!allowNonsuggestedValue) {
-                this.setState({ inputValue: "" }, () => this.props.onChange && this.props.onChange(""));
+                this.setState({ inputValue: "" }, () => this.props.onChange && this.props.onChange(undefined));
             }
             callback && callback();
         };
@@ -747,7 +748,7 @@ class Autosuggest extends React.Component {
     render() {
         const { props } = this;
         let { suggestions, inputValue = "" } = this.state;
-        const inputProps = Object.assign(Object.assign({ id: this.props.id, value: inputValue, readonly: props.readonly, disabled: props.disabled, placeholder: props.placeholder }, (this.props.inputProps || {})), { onChange: this.onInputChange, onBlur: this.onBlur, onFocus: this.onFocus, autoComplete: "off" });
+        const inputProps = Object.assign(Object.assign({ id: this.props.id, value: inputValue, disabled: props.disabled || props.readonly, placeholder: props.placeholder }, (this.props.inputProps || {})), { onChange: this.onInputChange, onBlur: this.onBlur, onFocus: this.onFocus, autoComplete: "off" });
         let cssClasses = {
             suggestionsContainer: "rw-popup-container rw-popup-transition",
             suggestionsContainerOpen: "rw-popup",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luomus/laji-form",
-  "version": "15.1.31",
+  "version": "15.1.33",
   "description": "React module capable of building dynamic forms from Laji form json schemas",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/test-export/test-utils.d.ts

@@ -148,6 +148,7 @@ export declare class Form {
         $input: Locator;
         $suggestionsContainer: Locator;
         $suggestions: Locator;
+        $loadingSpinner: Locator;
     };
     getTaxonAutosuggestWidget: (lajiFormLocator: string) => {
         $powerUserButton: Locator;
@@ -156,12 +157,14 @@ export declare class Form {
         $input: Locator;
         $suggestionsContainer: Locator;
         $suggestions: Locator;
+        $loadingSpinner: Locator;
     };
     getPersonAutosuggestWidget: (lajiFormLocator: string) => {
         $suggestedGlyph: Locator;
         $input: Locator;
         $suggestionsContainer: Locator;
         $suggestions: Locator;
+        $loadingSpinner: Locator;
     };
     getScopeField: (lajiFormLocator: string) => {
         $button: Locator;

package/test-export/test-utils.js

@@ -88,6 +88,7 @@ class Form {
                 $input: this.$locate(lajiFormLocator).locator("input"),
                 $suggestionsContainer: this.$locate(lajiFormLocator).locator(".rw-list"),
                 $suggestions: this.$locate(lajiFormLocator).locator(".rw-list-option"),
+                $loadingSpinner: this.$locate(lajiFormLocator).locator(".react-spinner"),
             };
         };
         this.getTaxonAutosuggestWidget = (lajiFormLocator) => {