@luomus/laji-form 15.1.33 → 15.1.35

package/lib/components/fields/MapField.js

@@ -321,6 +321,9 @@ class MobileEditorMap extends React.Component {
         this.setOkButtonRef = (elem) => {
             this.okButtonElem = react_dom_1.findDOMNode(elem);
         };
+        this.updateDimensions = () => {
+            this.setState({ width: window.innerWidth, height: window.innerHeight });
+        };
         this.onChange = () => {
             const { map } = this.map;
             const centerLatLng = map.getCenter();
@@ -395,23 +398,31 @@ class MobileEditorMap extends React.Component {
             this.props.onClose(this.map.getOptions());
         };
         const { center, radius } = this.props;
-        this.state = { mapOptions: this.setViewFromCenterAndRadius(center, radius) };
+        this.state = {
+            mapOptions: this.setViewFromCenterAndRadius(center, radius),
+            width: window.innerWidth,
+            height: window.innerHeight
+        };
     }
     componentDidMount() {
         this.mounted = true;
         this.okButtonElem.focus();
+        window.addEventListener("resize", this.updateDimensions);
     }
     componenWillUnmount() {
         this.mounted = false;
+        window.removeEventListener("resize", this.updateDimensions);
     }
     getCircle(radiusPixels) {
-        return (React.createElement("svg", { width: "100%", height: "100%", style: { position: "absolute", zIndex: 1000, top: 0, pointerEvents: "none" } },
+        return (React.createElement("svg", { width: "100%", height: "100%", style: { position: "absolute", zIndex: 1000, top: 0, left: 0, pointerEvents: "none" } },
             React.createElement("defs", null,
                 React.createElement("mask", { id: "mask", x: "0", y: "0", width: "100%", height: "100%" },
                     React.createElement("rect", { x: "0", y: "0", width: "100%", height: "100%", fill: "#fff" }),
                     React.createElement("circle", { cx: "50%", cy: "50%", r: radiusPixels }))),
             React.createElement("rect", { x: "0", y: "0", width: "100%", height: "100%", mask: "url(#mask)", fillOpacity: "0.2" }),
-            React.createElement("circle", { cx: "50%", cy: "50%", r: radiusPixels, stroke: "black", strokeWidth: "2", fillOpacity: "0" })));
+            React.createElement("circle", { cx: "50%", cy: "50%", r: radiusPixels, stroke: "black", strokeWidth: "2", fillOpacity: "0" }),
+            React.createElement("line", { x1: this.state.width / 2, y1: this.state.height / 2 - radiusPixels, x2: this.state.width / 2, y2: this.state.height / 2 + radiusPixels, stroke: "black", strokeWidth: "2" }),
+            React.createElement("line", { x1: this.state.width / 2 - radiusPixels, y1: this.state.height / 2, x2: this.state.width / 2 + radiusPixels, y2: this.state.height / 2, stroke: "black", strokeWidth: "2" })));
     }
     render() {
         let _a = this.props.map.getOptions(), { rootElem, customControls, draw, data, zoomToData, zoom, center, locate } = _a, options = __rest(_a, ["rootElem", "customControls", "draw", "data", "zoomToData", "zoom", "center", "locate"]); // eslint-disable-line @typescript-eslint/no-unused-vars

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

@@ -20,10 +20,12 @@ export class Autosuggest extends React.Component<any, any, any> {
         uiSchema: PropTypes.Requireable<object>;
         informalTaxonGroups: PropTypes.Requireable<string>;
         onInformalTaxonGroupSelected: PropTypes.Requireable<(...args: any[]) => any>;
+        cache: PropTypes.Requireable<boolean>;
     };
     static defaultProps: {
         allowNonsuggestedValue: boolean;
         suggestionReceive: string;
+        cache: boolean;
     };
     constructor(props: any);
     isValueSuggested: (props: any) => any;

package/lib/components/widgets/AutosuggestWidget.js

@@ -320,19 +320,19 @@ class FriendsAutosuggestWidget extends React.Component {
 FriendsAutosuggestWidget.contextType = ReactContext_1.default;
 class OrganizationAutosuggestWidget extends React.Component {
     render() {
-        return (React.createElement(BasicAutosuggestWidget, Object.assign({}, this.props, this.props.options, { nameField: "fullName", validValueRegexp: "MOS.\\d+", Wrapper: OrganizationWrapper })));
+        return (React.createElement(BasicAutosuggestWidget, Object.assign({}, this.props, this.props.options, { nameField: "fullName", validValueRegexp: "MOS.\\d+", cache: false, Wrapper: OrganizationWrapper })));
     }
 }
 OrganizationAutosuggestWidget.contextType = ReactContext_1.default;
 class CollectionAutosuggestWidget extends React.Component {
     render() {
-        return (React.createElement(BasicAutosuggestWidget, Object.assign({}, this.props, this.props.options, { nameField: "collectionName", validValueRegexp: "HR.\\d+", Wrapper: CollectionWrapper })));
+        return (React.createElement(BasicAutosuggestWidget, Object.assign({}, this.props, this.props.options, { nameField: "collectionName", validValueRegexp: "HR.\\d+", cache: false, Wrapper: CollectionWrapper })));
     }
 }
 CollectionAutosuggestWidget.contextType = ReactContext_1.default;
 class DatasetAutosuggestWidget extends React.Component {
     render() {
-        return (React.createElement(BasicAutosuggestWidget, Object.assign({}, this.props, this.props.options, { nameField: "datasetName", validValueRegexp: "GX.\\d+", Wrapper: DatasetWrapper })));
+        return (React.createElement(BasicAutosuggestWidget, Object.assign({}, this.props, this.props.options, { nameField: "datasetName", validValueRegexp: "GX.\\d+", cache: false, Wrapper: DatasetWrapper })));
     }
 }
 DatasetAutosuggestWidget.contextType = ReactContext_1.default;
@@ -348,7 +348,9 @@ class BasicAutosuggestWidget extends React.Component {
     getSuggestionFromValue(value) {
         const { autosuggestField, nameField } = this.props;
         if (this.isValueSuggested(value)) {
-            return this.props.formContext.apiClient.fetchCached(`/${autosuggestField}/by-id/${value}`).then(result => {
+            const apiClient = this.props.formContext.apiClient;
+            const fetch = (this.props.cache ? apiClient.fetchCached : apiClient.fetch).bind(apiClient);
+            return fetch(`/${autosuggestField}/by-id/${value}`).then(result => {
                 if (result[nameField]) {
                     return {
                         value: result[nameField],
@@ -386,11 +388,13 @@ BasicAutosuggestWidget.propTypes = {
     uiSchema: PropTypes.object,
     nameField: PropTypes.string,
     validValueRegexp: PropTypes.string,
+    cache: PropTypes.bool,
     Wrapper: PropTypes.object
 };
 BasicAutosuggestWidget.defaultProps = {
     nameField: "name",
-    validValueRegexp: ""
+    validValueRegexp: "",
+    cache: true
 };
 class RangeAutosuggestWidget extends React.Component {
     render() {
@@ -535,7 +539,8 @@ class Autosuggest extends React.Component {
             const request = () => {
                 let timestamp = Date.now();
                 this.promiseTimestamp = timestamp;
-                this.apiClient.fetchCached("/autocomplete/" + autosuggestField, Object.assign({ q: value, includePayload: true, matchType: "exact,partial", includeHidden: false }, query)).then(suggestions => {
+                const fetch = (this.props.cache ? this.apiClient.fetchCached : this.apiClient.fetch).bind(this.apiClient);
+                fetch("/autocomplete/" + autosuggestField, Object.assign({ q: value, includePayload: true, matchType: "exact,partial", includeHidden: false }, query)).then(suggestions => {
                     if (this.props.prepareSuggestion) {
                         suggestions = suggestions.map(s => this.props.prepareSuggestion(s));
                     }
@@ -776,11 +781,13 @@ Autosuggest.propTypes = {
     onInputChange: PropTypes.func,
     uiSchema: PropTypes.object,
     informalTaxonGroups: PropTypes.string,
-    onInformalTaxonGroupSelected: PropTypes.func
+    onInformalTaxonGroupSelected: PropTypes.func,
+    cache: PropTypes.bool
 };
 Autosuggest.defaultProps = {
     allowNonsuggestedValue: true,
-    suggestionReceive: "key"
+    suggestionReceive: "key",
+    cache: true
 };
 class _TaxonWrapper extends React.Component {
     constructor(props) {

package/package.json

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