@luomus/laji-form 15.1.14 → 15.1.16

package/lib/components/LajiForm.js

@@ -479,7 +479,7 @@ class LajiForm extends React.Component {
         return state;
     }
     getMemoizedFormContext(props) {
-        const nextKey = ["lang", "topOffset", "bottomOffset", "formContext", "settings", "schema", "uiSchemaContext", "lajiGeoServerAddress"].reduce((key, prop) => {
+        const nextKey = ["lang", "topOffset", "bottomOffset", "formContext", "settings", "schema", "uiSchemaContext", "mediaMetadata", "lajiGeoServerAddress"].reduce((key, prop) => {
             key[prop] = props[prop];
             return key;
         }, {});

package/lib/components/components.d.ts

@@ -88,11 +88,9 @@ export class OverlayTrigger extends React.Component<any, any, any> {
     static contextType: React.Context<import("../ReactContext").ContextProps>;
     constructor(props: any);
     overlayTriggerMouseOver: () => void;
-    overlayTriggerMouseIn: boolean | undefined;
     overlayTriggerMouseOut: () => void;
     overlayTimeout: any;
     overlayMouseOver: () => void;
-    overlayMouseIn: boolean | undefined;
     overlayMouseOut: () => void;
 }
 export class Fullscreen extends React.Component<any, any, any> {

package/lib/components/components.js

@@ -473,35 +473,25 @@ class OverlayTrigger extends React.Component {
     constructor(props) {
         super(props);
         this.overlayTriggerMouseOver = () => {
-            this.overlayTriggerMouseIn = true;
-            this.setState({ show: true });
+            this.setState({ hoveringElem: true });
         };
         this.overlayTriggerMouseOut = () => {
-            this.overlayTriggerMouseIn = false;
             if (this.overlayTimeout) {
                 clearTimeout(this.overlayTimeout);
             }
             this.overlayTimeout = this.props.formContext.setTimeout(() => {
                 if (!this.popoverMouseIn && !this.overlayTriggerMouseIn) {
-                    this.setState({ show: false });
+                    this.setState({ hoveringElem: false });
                 }
             }, 200);
         };
         this.overlayMouseOver = () => {
-            this.overlayMouseIn = true;
+            this.setState({ hoveringOverlay: true });
         };
         this.overlayMouseOut = () => {
-            this.overlayMouseIn = false;
-            if (this.overlayTimeout) {
-                clearTimeout(this.overlayTimeout);
-            }
-            this.overlayTimeout = this.props.formContext.setTimeout(() => {
-                if (!this.overlayMouseIn && !this.overlayTriggerMouseIn) {
-                    this.setState({ show: false });
-                }
-            }, 200);
+            this.setState({ hoveringOverlay: false, hoveringElem: false });
         };
-        this.state = { show: false };
+        this.state = {};
     }
     componentWillUnmount() {
         if (this.overlayTimeout) {
@@ -515,8 +505,9 @@ class OverlayTrigger extends React.Component {
         if (!this.props.hoverable)
             return (React.createElement(OverlayTrigger, Object.assign({}, props, { overlay: overlay }), children));
         let _overlay = React.cloneElement(overlay, { onMouseOver: this.overlayMouseOver, onMouseOut: this.overlayMouseOut });
+        const show = this.state.hoveringElem || this.state.hoveringOverlay;
         return (React.createElement("div", { onMouseOver: this.overlayTriggerMouseOver, onMouseOut: this.overlayTriggerMouseOut },
-            React.createElement(OverlayTrigger, Object.assign({}, props, { delay: 1, trigger: [], placement: this.props.placement || "top", overlay: _overlay, show: this.state.show }), children)));
+            React.createElement(OverlayTrigger, Object.assign({}, props, { delay: 1, trigger: [], placement: this.props.placement || "top", overlay: _overlay, show: show }), children)));
     }
 }
 exports.OverlayTrigger = OverlayTrigger;

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

@@ -10,6 +10,12 @@ export default class DateTimeWidget extends React.Component<any, any, any> {
                     same: PropTypes.Requireable<boolean | PropTypes.InferProps<{
                         path: PropTypes.Requireable<string>;
                     }>>;
+                    plusSixMonths: PropTypes.Requireable<boolean | PropTypes.InferProps<{
+                        path: PropTypes.Requireable<string>;
+                    }>>;
+                    plusSixYear: PropTypes.Requireable<boolean | PropTypes.InferProps<{
+                        path: PropTypes.Requireable<string>;
+                    }>>;
                 }>>;
                 showTimeList: PropTypes.Requireable<boolean>;
                 allowOnlyYear: PropTypes.Requireable<boolean>;
@@ -59,7 +65,7 @@ export default class DateTimeWidget extends React.Component<any, any, any> {
     setPlusSixMonths: () => void;
     setPlusYear: () => void;
     formatValue(value: any, options: any, props: any): any;
-    getCurrentDateOrNow(): moment.Moment;
+    getCurrentDateOrPathDate(path: any): moment.Moment | undefined;
 }
 import * as React from "react";
 import * as moment from "moment";

package/lib/components/widgets/DateTimeWidget.js

@@ -103,10 +103,20 @@ let DateTimeWidget = DateTimeWidget_1 = class DateTimeWidget extends React.Compo
             }
         };
         this.setPlusSixMonths = () => {
-            this.onChange(this.getCurrentDateOrNow().add(6, "M").format("YYYY-MM-DD"));
+            const plusSixMonthOptions = utils_1.getUiOptions(this.props).showButtons.plusSixMonths || {};
+            const { path } = plusSixMonthOptions;
+            const date = this.getCurrentDateOrPathDate(path);
+            if (date) {
+                this.onChange(date.add(6, "M").format("YYYY-MM-DD"));
+            }
         };
         this.setPlusYear = () => {
-            this.onChange(this.getCurrentDateOrNow().add(1, "y").format("YYYY-MM-DD"));
+            const plusYearOptions = utils_1.getUiOptions(this.props).showButtons.plusYear || {};
+            const { path } = plusYearOptions;
+            const date = this.getCurrentDateOrPathDate(path);
+            if (date) {
+                this.onChange(date.add(1, "y").format("YYYY-MM-DD"));
+            }
         };
         momentLocalizer(moment);
     }
@@ -225,12 +235,16 @@ let DateTimeWidget = DateTimeWidget_1 = class DateTimeWidget extends React.Compo
         const { inputFormat: format } = DateTimeWidget_1.prototype.getStateFromProps(Object.assign(Object.assign({}, props), { date: true, time: true, value }));
         return localizers_1.date.format(value, format, props.formContext.lang);
     }
-    getCurrentDateOrNow() {
-        const date = moment(this.props.value);
+    getCurrentDateOrPathDate(path) {
+        const formData = this.props.formContext.services.rootInstance.getFormData();
+        const value = this.props.value || (path ? utils_1.parseJSONPointer(formData, path, !!"safely") : undefined);
+        if (!value) {
+            return;
+        }
+        const date = moment(value);
         if (date.isValid()) {
             return date;
         }
-        return moment();
     }
 };
 DateTimeWidget.contextType = ReactContext_1.default;
@@ -247,6 +261,18 @@ DateTimeWidget.propTypes = {
                         PropTypes.shape({
                             path: PropTypes.string
                         })
+                    ]),
+                    plusSixMonths: PropTypes.oneOfType([
+                        PropTypes.bool,
+                        PropTypes.shape({
+                            path: PropTypes.string
+                        })
+                    ]),
+                    plusSixYear: PropTypes.oneOfType([
+                        PropTypes.bool,
+                        PropTypes.shape({
+                            path: PropTypes.string
+                        })
                     ])
                 })
             ]),

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

@@ -10,6 +10,12 @@ declare namespace DateWidget {
                     same: PropTypes.Requireable<boolean | PropTypes.InferProps<{
                         path: PropTypes.Requireable<string>;
                     }>>;
+                    plusSixMonths: PropTypes.Requireable<boolean | PropTypes.InferProps<{
+                        path: PropTypes.Requireable<string>;
+                    }>>;
+                    plusSixYear: PropTypes.Requireable<boolean | PropTypes.InferProps<{
+                        path: PropTypes.Requireable<string>;
+                    }>>;
                 }>>;
                 allowOnlyYear: PropTypes.Requireable<boolean>;
             }>>;

package/lib/components/widgets/DateWidget.js

@@ -27,6 +27,18 @@ DateWidget.propTypes = {
                         PropTypes.shape({
                             path: PropTypes.string
                         })
+                    ]),
+                    plusSixMonths: PropTypes.oneOfType([
+                        PropTypes.bool,
+                        PropTypes.shape({
+                            path: PropTypes.string
+                        })
+                    ]),
+                    plusSixYear: PropTypes.oneOfType([
+                        PropTypes.bool,
+                        PropTypes.shape({
+                            path: PropTypes.string
+                        })
                     ])
                 })
             ]),

package/package.json

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