@luomus/laji-form 15.1.15 → 15.1.16

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luomus/laji-form",
-  "version": "15.1.15",
+  "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",