@lemonadejs/modal 2.6.1 → 2.7.1

package/dist/index.js

@@ -157,6 +157,10 @@ if (!lemonade && typeof (require) === 'function') {
     document.addEventListener('mouseup', mouseUp);
     document.addEventListener('mousemove', mouseMove);
 
+    const isTrue = function(e) {
+        return e === true || e === 1 || e === 'true';
+    }
+
     // Dispatcher
     const Dispatch = function(type, option){
         if (typeof this[type] === 'function') {
@@ -184,23 +188,51 @@ if (!lemonade && typeof (require) === 'function') {
         }
     }
 
+    const delayAction = function(self, action) {
+        // Make sure to remove the transformation before minimize to preserve the animation
+        if (self.el.style.marginLeft || self.el.style.marginTop) {
+            // Make sure no animation during this process
+            self.el.classList.add('action');
+            // Remove adjustment
+            removeMargin(self);
+            // Make sure to continue with minimize
+            setTimeout(function() {
+                // Remove class
+                self.el.classList.remove('action');
+                // Call action
+                action(self);
+            },0)
+
+            return true;
+        }
+    }
+
     const setMini = function(self) {
+        if (delayAction(self, setMini)) {
+            return;
+        }
+
         // Minimize modals
         minimizedModals.push(self);
-        let rect = self.el.getBoundingClientRect();
-        self.minimized = true;
-        self.el.top = rect.top;
-        self.el.left = rect.left;
+
+        self.el.top = self.el.offsetTop;
+        self.el.left = self.el.offsetLeft;
+
         if (! self.el.style.top) {
             self.el.style.top = self.el.top + 'px';
         }
         if (! self.el.style.left) {
             self.el.style.left = self.el.left + 'px';
         }
+
+        self.el.translateY = 0;
+        self.el.translateX = 0;
+
         // Refresh positions
-        setTimeout(() => {
+        setTimeout(function() {
             refreshMinimized();
-        }, 10);
+            self.minimized = true;
+        },10)
     }
 
     const removeMini = function(self) {
@@ -223,58 +255,79 @@ if (!lemonade && typeof (require) === 'function') {
         }, 400);
     }
 
-    const adjustVertical = function() {
-        let self = this;
-        let rect = self.el.getBoundingClientRect();
-        let margin = rect.height >= window.innerHeight || self.position ? 0 : 10;
-        // Make sure component will be visible on page
-        let h = window.innerHeight;
-        if (self.position === 'absolute') {
-            h = document.body.offsetHeight;
-        }
-        let limit = h - (rect.top + rect.height);
-        if (limit < 0) {
-            return rect.top + (limit - margin);
-        } else if (rect.top < 0) {
-            return margin;
-        }
-        return false;
-    }
+    const removeMargin = function(self) {
+        if (self.el.style.marginLeft) {
+            let y = self.el.offsetLeft;
+            self.el.style.marginLeft = '';
+            self.left = y;
+        }
 
-    const adjustHorizontal = function() {
-        let self = this;
-        let rect = self.el.getBoundingClientRect();
-        let margin = rect.width >= window.innerWidth || self.position ? 0 : 10;
-        // Make sure component will be visible on page
-        let w = window.innerWidth;
-        if (self.position === 'absolute') {
-            w = document.body.offsetWidth;
-        }
-        let limit = w - (rect.left + rect.width);
-        if (limit < 0) {
-            return rect.left + (limit - margin);
-        } else if (rect.left < 0) {
-            return margin;
-        }
-        return false;
+        if (self.el.style.marginTop) {
+            let x = self.el.offsetTop;
+            self.el.style.marginTop = '';
+            self.top = x;
+        }
     }
 
-    const isTrue = function(e) {
-        return e === true || e === 1 || e === 'true';
-    }
+    const adjustHorizontal = function(self) {
+        if (! isTrue(self['auto-adjust'])) {
+            return false;
+        }
+
+        self.el.style.marginLeft = '';
+        let viewportWidth = window.innerWidth;
+        let margin = 10;
 
-    const autoAdjust = function(s) {
-        // Adjust position
-        if (isTrue(s['auto-adjust'])) {
-            let v = adjustVertical.call(s);
-            if (v !== false) {
-                s.top = v;
+        if (self.position) {
+            if (self.position === 'absolute') {
+                viewportWidth = document.documentElement.clientWidth;
+            } else if (self.position !== 'center') {
+                margin = 0;
             }
-            v = adjustHorizontal.call(s);
-            if (v !== false) {
-                s.left = v;
+        }
+
+        let rightEdgeDistance = viewportWidth - (self.el.offsetLeft + self.el.offsetWidth);
+        let transformX = 0;
+        if (rightEdgeDistance < 0) {
+            transformX = rightEdgeDistance - margin;
+        }
+        if (self.el.offsetLeft < 0) {
+            transformX = margin - self.el.offsetLeft;
+        }
+        if (transformX !== 0) {
+            self.el.style.marginLeft = transformX + 'px';
+        }
+    }
+
+    const adjustVertical = function(self) {
+        if (! isTrue(self['auto-adjust'])) {
+            return false;
+        }
+
+        self.el.style.marginTop = '';
+        let viewportHeight = window.innerHeight;
+        let margin = 10;
+
+        if (self.position) {
+            if (self.position === 'absolute') {
+                viewportHeight = document.documentElement.clientHeight;
+            } else if (self.position !== 'center') {
+                margin = 0;
             }
         }
+
+        let bottomEdgeDistance = viewportHeight - (self.el.offsetTop + self.el.offsetHeight);
+        let transformY = 0;
+        if (bottomEdgeDistance < 0) {
+            transformY = bottomEdgeDistance - margin;
+        }
+
+        if (self.el.offsetTop < 0) {
+            transformY = margin - self.el.offsetTop;
+        }
+        if (transformY !== 0) {
+            self.el.style.marginTop = transformY + 'px';
+        }
     }
 
     const Modal = function (template) {
@@ -345,17 +398,16 @@ if (!lemonade && typeof (require) === 'function') {
 
                 // Responsive
                 if (document.documentElement.clientWidth < 800) {
-                    if (self.responsive !== false) {
-                        self.el.setAttribute('data-responsive', true);
-                    }
-                    // Full screen
+                        // Full screen
                     if (self.height > 300) {
                         self.el.classList.add('fullscreen');
                     }
                 }
             }
 
-            autoAdjust(self);
+            // Auto adjust
+            adjustHorizontal(self);
+            adjustVertical(self);
 
             // Backdrop
             if (self.backdrop === true) {
@@ -411,8 +463,10 @@ if (!lemonade && typeof (require) === 'function') {
                     if (backdrop) {
                         self.el.parentNode.insertBefore(backdrop, self.el);
                     }
+
                     // Auto adjust
-                    autoAdjust(self);
+                    adjustHorizontal(self);
+                    adjustVertical(self);
                 } else {
                     // Hide backdrop
                     if (backdrop) {
@@ -428,10 +482,22 @@ if (!lemonade && typeof (require) === 'function') {
                 } else {
                     self.el.style[property] = '';
                 }
+
+                if (property === 'top') {
+                    adjustVertical(self);
+                }
+                if (property === 'left') {
+                    adjustHorizontal(self);
+                }
             } else if (property === 'position') {
-                if (self.position && self.position !== 'center') {
-                    self.top = '';
-                    self.left = '';
+                if (self.position) {
+                    if (self.position === 'center') {
+                        self.top = (window.innerHeight - self.el.offsetHeight) / 2;
+                        self.left = (window.innerWidth - self.el.offsetWidth) / 2;
+                    } else {
+                        self.top = '';
+                        self.left = '';
+                    }
                 } else {
                     if (! self.top) {
                         self.top = (window.innerHeight - self.el.offsetHeight) / 2;
@@ -541,27 +607,22 @@ if (!lemonade && typeof (require) === 'function') {
                     controls.action = function () {
                         self.width = parseInt(item.style.width);
                         self.height = parseInt(item.style.height);
-                        controls.e.classList.remove('resizing');
+                        controls.e.classList.remove('action');
                     }
-                    controls.e.classList.add('resizing');
+                    controls.e.classList.add('action');
                 } else if (isTrue(self.draggable) && self.title && y - rect.top < 40) {
                     // Action
                     controls.type = 'move';
                     // Callback
                     controls.action = function () {
-                        let v = adjustVertical.call(self);
-                        if (v === false) {
-                            v = parseInt(item.style.top);
-                        }
-                        let h = adjustHorizontal.call(self);
-                        if (v === false) {
-                            h = parseInt(item.style.left);
-                        }
-                        self.top = v;
-                        self.left = h;
-                        controls.e.classList.remove('moving');
+                        self.top = parseInt(item.style.top);
+                        self.left = parseInt(item.style.left);
+
+                        controls.e.classList.remove('action');
                     }
-                    controls.e.classList.add('moving');
+                    controls.e.classList.add('action');
+                    // Remove transform
+                    removeMargin(self);
                 }
             }
         }
@@ -578,7 +639,7 @@ if (!lemonade && typeof (require) === 'function') {
             }
         }
 
-        return `<div class="lm-modal" position="{{self.position}}" closed="{{self.closed}}" closable="{{self.closable}}" minimizable="{{self.minimizable}}" minimized="{{self.minimized}}" overflow="{{self.overflow}}" :top="self.top" :left="self.left" :width="self.width" :height="self.height" onmousedown="self.mousedown(e)" onmousemove="self.mousemove(e)" tabindex="-1">
+        return `<div class="lm-modal" animation="{{self.animation}}" position="{{self.position}}" closed="{{self.closed}}" closable="{{self.closable}}" minimizable="{{self.minimizable}}" minimized="{{self.minimized}}" overflow="{{self.overflow}}" :top="self.top" :left="self.left" :width="self.width" :height="self.height" onmousedown="self.mousedown(e)" onmousemove="self.mousemove(e)" tabindex="-1">
             <div class="lm-modal-title" data-icon="{{self.icon}}">{{self.title}}</div>
             <div>${template}</div>
         </div>`

package/dist/style.css

@@ -87,17 +87,11 @@
     z-index: 999;
 }
 
-.lm-modal[data-responsive].fullscreen {
-    top: 0;
-    height: 100% !important;
-}
-
-.lm-modal.moving {
-    cursor: move !important;
+.lm-modal[animation="false"] {
     transition: initial;
 }
 
-.lm-modal.resizing {
+.lm-modal.action {
     transition: initial;
 }
 
@@ -137,6 +131,7 @@
 
 .lm-modal[position="absolute"] {
     position: absolute;
+    transition: initial;
 }
 
 .lm-modal[position="left"] {

package/package.json

@@ -17,5 +17,5 @@
     },
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
-    "version": "2.6.1"
+    "version": "2.7.1"
 }