@luomus/laji-form 15.1.102 → 15.1.104

package/dist/styles.css

@@ -3231,6 +3231,16 @@ body .laji-form {
 .laji-form .shortcut-help {
 	bottom: 5px;
 }
+.laji-form-shortcut-keycombo-container {
+	display: inline-flex;
+	gap: 2px;
+}
+.laji-form-shortcut-keycombo-container span {
+	background: #efefef;
+	border: 1px solid #b1b1b3;
+	border-radius: 2px;
+	padding: 0px 3px;
+}
 .laji-form .hidden {
 	display: none;
 }

package/lib/ApiClient.d.ts

@@ -1,6 +1,6 @@
 import { Translations } from "./components/LajiForm";
 import { Lang } from "./types";
-import type { paths } from "generated/api";
+import type { paths } from "./generated/api";
 export declare class LajiApiError extends Error {
     statusCode: number;
     constructor(message: string, statusCode: number);

package/lib/components/LajiForm.js

@@ -32,17 +32,6 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -509,10 +498,6 @@ class LajiForm extends React.Component {
         const uiSchema = Object.assign(Object.assign({}, this.props.uiSchema), { "ui:submitButtonOptions": {
                 norender: true
             } });
-        const { Panel, Table } = this.getContext(this.props, this.context).theme;
-        const panelHeader = (React.createElement("h3", null,
-            translations.Shortcuts,
-            React.createElement("button", { type: "button", className: "close pull-right", onClick: this.dismissHelp }, "\u00D7")));
         return (React.createElement(ReactContext_1.default.Provider, { value: this.getContext(this.props, this.context) },
             React.createElement("div", { className: "laji-form" },
                 showShortcutsButton && this.props.showShortcutButton !== false && shortcuts && (React.createElement(components_1.TooltipComponent, { tooltip: this.getShorcutButtonTooltip() },
@@ -521,24 +506,7 @@ class LajiForm extends React.Component {
                 React.createElement(core_1.default, Object.assign({}, this.props, { formData: this.state.formData, uiSchema: uiSchema, ref: this.formRef, onChange: this.onChange, onSubmit: this.onSubmit, fields: this.getFields(this.props.fields), widgets: this.getWidgets(this.props.widgets), templates: this.getTemplates(this.props.templates), formContext: this.state.formContext, validator: validator_ajv6_1.default, noValidate: true, extraErrors: this.state.extraErrors || {}, noHtml5Validate: true, liveValidate: true, autoComplete: "off", tagName: "div", readonly: readonly, disabled: disabled }), this.props.children),
                 (!this.props.children && this.props.renderSubmit !== false) ? (React.createElement(components_1.Button, { id: "submit", onClick: this.submit, disabled: readonly || disabled }, this.props.submitText || translations.Submit)) : null,
                 shortcuts &&
-                    React.createElement(Panel, { ref: this.shortcutHelpRef, className: "shortcut-help laji-form-popped z-depth-3 hidden", style: { top: (this.props.topOffset || 0) + 5, bottom: (this.props.bottomOffset || 0) + 5 }, variant: "info" },
-                        React.createElement(Panel.Heading, null, panelHeader),
-                        React.createElement(Table, null,
-                            React.createElement("tbody", { className: "well" }, Object.keys(shortcuts).map((keyCombo, idx) => {
-                                const _a = shortcuts[keyCombo], { fn, targetLabel, label } = _a, rest = __rest(_a, ["fn", "targetLabel", "label"]);
-                                if (["help", "autosuggestToggle"].includes(fn) || fn === "navigateSection" && rest.goOverRow)
-                                    return;
-                                let translation = "";
-                                if (translation)
-                                    translation = label;
-                                else
-                                    translation = translations[[fn, ...Object.keys(rest)].map(utils_1.capitalizeFirstLetter).join("")];
-                                if (targetLabel)
-                                    translation = `${translation} ${targetLabel}`;
-                                return (React.createElement("tr", { key: idx },
-                                    React.createElement("td", null, (0, utils_1.stringifyKeyCombo)(keyCombo)),
-                                    React.createElement("td", null, translation)));
-                            })))),
+                    React.createElement(components_1.ShortcutsPanel, { ref: this.shortcutHelpRef, shortcuts: shortcuts, formContext: this.state.formContext, onClose: this.dismissHelp }),
                 this.renderSubmitHooks())));
     }
     getSettings() {

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

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { ButtonProps as ThemedButtonProps } from "src/themes/theme";
+import { ButtonProps as ThemedButtonProps } from "../../themes/theme";
 export type ButtonProps = ThemedButtonProps & {
     tooltip?: string;
     tooltipPlacement?: string;

package/lib/components/components/ShortcutsPanel.d.ts

@@ -0,0 +1,17 @@
+import * as React from "react";
+import { FormContext } from "../LajiForm";
+type Action = {
+    fn: string;
+    targetLabel: string;
+    label: string;
+    goOverRow?: boolean;
+};
+type Props = {
+    formContext: FormContext;
+    onClose: (e: Event | React.SyntheticEvent) => void;
+    shortcuts: {
+        [keyCombo: string]: Action;
+    };
+};
+export declare const ShortcutsPanel: React.ForwardRefExoticComponent<Props & React.RefAttributes<unknown>>;
+export {};

package/lib/components/components/ShortcutsPanel.js

@@ -0,0 +1,94 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ShortcutsPanel = void 0;
+const React = __importStar(require("react"));
+const utils_1 = require("../../utils");
+const ReactContext_1 = __importDefault(require("../../ReactContext"));
+const hash = (action) => JSON.stringify(action);
+exports.ShortcutsPanel = React.forwardRef(({ formContext, onClose, shortcuts }, ref) => {
+    const { translations, topOffset = 0, bottomOffset = 0 } = formContext;
+    const { Panel, Table } = React.useContext(ReactContext_1.default).theme;
+    const actionsToShortcuts = Object.keys(shortcuts).reduce((actionsToShortcuts, keyCombo) => {
+        const action = shortcuts[keyCombo];
+        const hashedAction = hash(action);
+        const existing = actionsToShortcuts.find(item => hash(item.action) === hashedAction);
+        if (existing) {
+            existing.keyCombos.push(keyCombo);
+        }
+        actionsToShortcuts.push({ action, keyCombos: [keyCombo] });
+        return actionsToShortcuts;
+    }, []);
+    return (React.createElement(Panel, { ref: ref, className: "shortcut-help laji-form-popped z-depth-3 hidden", style: { top: topOffset + 5, bottom: bottomOffset + 5 }, variant: "info" },
+        React.createElement(Panel.Heading, null,
+            React.createElement("h3", null,
+                translations.Shortcuts,
+                React.createElement("button", { type: "button", className: "close pull-right", onClick: onClose }, "\u00D7"))),
+        React.createElement(Table, null,
+            React.createElement("tbody", { className: "well" }, actionsToShortcuts.map((props, i) => React.createElement(ShortcutVisualization, Object.assign({}, props, { key: i, translations: translations })))))));
+});
+const ShortcutVisualization = ({ action, keyCombos, translations }) => {
+    const { fn, targetLabel, label } = action, rest = __rest(action, ["fn", "targetLabel", "label"]);
+    if (["help", "autosuggestToggle"].includes(fn) || fn === "navigateSection" && rest.goOverRow) {
+        return null;
+    }
+    let translation = "";
+    if (translation) {
+        translation = label;
+    }
+    else {
+        translation = translations[[fn, ...Object.keys(rest)].map(utils_1.capitalizeFirstLetter).join("")];
+    }
+    if (targetLabel) {
+        translation = `${translation} ${targetLabel}`;
+    }
+    return (React.createElement("tr", null,
+        React.createElement("td", { className: "laji-form-shortcut-keycombo-container" }, keyCombos.map(keyCombo => React.createElement("span", null, (0, utils_1.stringifyKeyCombo)(keyCombo)))),
+        React.createElement("td", null, translation)));
+};

package/lib/components/components/index.d.ts

@@ -11,3 +11,4 @@ export * from "./FetcherInput";
 export * from "./OverlayTrigger";
 export * from "./Fullscreen";
 export * from "./FailedBackgroundJobsPanel";
+export * from "./ShortcutsPanel";

package/lib/components/components/index.js

@@ -27,3 +27,4 @@ __exportStar(require("./FetcherInput"), exports);
 __exportStar(require("./OverlayTrigger"), exports);
 __exportStar(require("./Fullscreen"), exports);
 __exportStar(require("./FailedBackgroundJobsPanel"), exports);
+__exportStar(require("./ShortcutsPanel"), exports);

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

@@ -1,5 +1,5 @@
 import * as PropTypes from "prop-types";
-import { FieldProps } from "src/types";
+import { FieldProps } from "../../types";
 declare const _anyToBoolean: {
     (props: FieldProps): JSX.Element;
     propTypes: {

package/lib/components/fields/MapArrayField.js

@@ -643,9 +643,9 @@ let LineTransectMapArrayField = class LineTransectMapArrayField extends React.Co
                     formData = syncLineTransectStartEnd(formData);
                     this.props.onChange(addOrDelete ? (0, ArrayField_1.onArrayFieldChange)(formData, this.props) : formData);
                 }
-                if ("activeIdx" in state) {
-                    this.afterActiveChange(state.activeIdx);
-                }
+                // if ("activeIdx" in state) {
+                // 	this.afterActiveChange(state.activeIdx);
+                // }
             };
             Object.keys(state).length ? this.setState(state, afterState()) : afterState();
         };
@@ -672,18 +672,30 @@ let LineTransectMapArrayField = class LineTransectMapArrayField extends React.Co
                 content = `${content}<br/>${translations.LineTransectSegmentNotCounted}`;
             return content;
         };
-        this.focusOnMap = (idx) => {
+        this.focusOnMap = (idx, initialCall) => {
             if (!this.hasLineTransectFeature(this.props)) {
                 setTimeout(() => this.map.zoomToData({ paddingInMeters: 200 }));
                 return;
             }
             this.props.formContext.setTimeout(() => {
-                this.map && this.map.fitBounds(L.featureGroup(this.map._corridorLayers[idx]).getBounds(), { paddingInMeters: 100 });
+                if (!this.map) {
+                    return;
+                }
+                const bounds = L.featureGroup(this.map._corridorLayers[idx]).getBounds();
+                if (initialCall) {
+                    this.map.fitBounds(bounds, { paddingInMeters: 100 });
+                }
+                else if (bounds.isValid()) {
+                    this.map.map.panTo(bounds.getCenter());
+                }
             });
         };
         this.state = { showLTTools: false };
         this.props.onChange(syncLineTransectStartEnd(this.props.formData));
     }
+    componentDidMount() {
+        this.focusOnMap(this.state.idx);
+    }
     getOptions() {
         const { formData, disabled, readonly } = this.props;
         const { geometryField, placeholderGeometry } = (0, utils_2.getUiOptions)(this.props.uiSchema);
@@ -736,8 +748,8 @@ let LineTransectMapArrayField = class LineTransectMapArrayField extends React.Co
                 }]
         };
     }
-    afterActiveChange(idx) {
-        this.focusOnMap(idx);
+    afterActiveChange(idx, initialCall) {
+        this.focusOnMap(idx, initialCall);
     }
     hasLineTransectFeature(props) {
         const { geometryField } = (0, utils_2.getUiOptions)(props.uiSchema);
@@ -1296,8 +1308,8 @@ function _MapArrayField(ComposedComponent) {
                 this.afterActiveChange(this.state.activeIdx, !!"initial call");
             }
         }
-        afterActiveChange(idx) {
-            super.afterActiveChange && super.afterActiveChange(idx);
+        afterActiveChange(idx, initialCall) {
+            super.afterActiveChange && super.afterActiveChange(idx, initialCall);
             this.onLocateOrAddNew();
         }
         componentWillUnmount() {

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

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { FieldProps, JSONSchemaObject } from "src/types";
+import { FieldProps, JSONSchemaObject } from "../../types";
 import * as PropTypes from "prop-types";
 interface State {
     activeIdx: number[];

package/lib/components/fields/NamedPlaceChooserField/NamedPlaceChooser.d.ts

@@ -1,7 +1,7 @@
 import * as React from "react";
 import { ByLang, FormContext } from "../../LajiForm";
 import memoize from "memoizee";
-import type { components } from "generated/api.d";
+import type { components } from "../../../generated/api.d";
 type NamedPlace = components["schemas"]["store-namedPlace"];
 type Props = {
     places: NamedPlace[];

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

@@ -1,6 +1,6 @@
 import * as React from "react";
 import { FieldProps, JSONSchemaArray, JSONSchemaObject } from "../../../types";
-import type { components } from "generated/api.d";
+import type { components } from "../../../generated/api.d";
 type NamedPlace = components["schemas"]["store-namedPlace"];
 type Props = FieldProps<NamedPlace, JSONSchemaObject | JSONSchemaArray<JSONSchemaObject>>;
 type State = {

package/lib/components/fields/NamedPlaceChooserField/Popup.d.ts

@@ -1,6 +1,6 @@
 import * as React from "react";
 import { FormContext } from "src/components/LajiForm";
-import type { components } from "generated/api.d";
+import type { components } from "../../../generated/api.d";
 type NamedPlace = components["schemas"]["store-namedPlace"];
 type Props = {
     onPlaceSelected: (place: NamedPlace) => void;

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

@@ -1,5 +1,5 @@
 import * as PropTypes from "prop-types";
-import { FieldProps, WidgetProps } from "src/types";
+import { FieldProps, WidgetProps } from "../../types";
 export declare const AnyToBoolean: (props: FieldProps | (WidgetProps & {
     widget: true;
 })) => JSX.Element;