@lemonadejs/modal 2.7.0 → 2.7.2

package/dist/index.js

@@ -215,10 +215,8 @@ if (!lemonade && typeof (require) === 'function') {
         // Minimize modals
         minimizedModals.push(self);
 
-        let rect = self.el.getBoundingClientRect();
-
-        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';
@@ -259,13 +257,13 @@ if (!lemonade && typeof (require) === 'function') {
 
     const removeMargin = function(self) {
         if (self.el.style.marginLeft) {
-            let y = self.left + parseInt(self.el.style.marginLeft);
+            let y = self.el.offsetLeft;
             self.el.style.marginLeft = '';
             self.left = y;
         }
 
         if (self.el.style.marginTop) {
-            let x = self.top + parseInt(self.el.style.marginTop);
+            let x = self.el.offsetTop;
             self.el.style.marginTop = '';
             self.top = x;
         }
@@ -277,25 +275,32 @@ if (!lemonade && typeof (require) === 'function') {
         }
 
         self.el.style.marginLeft = '';
-        let rect = self.el.getBoundingClientRect();
         let viewportWidth = window.innerWidth;
         let margin = 10;
 
         if (self.position) {
             if (self.position === 'absolute') {
-                viewportWidth = document.documentElement.clientWidth;
-            } else {
+                viewportWidth = document.documentElement.offsetWidth;
+            } else if (self.position !== 'center') {
                 margin = 0;
             }
         }
 
-        let rightEdgeDistance = viewportWidth - (rect.right);
+        let rightEdgeDistance = viewportWidth - (self.el.offsetLeft + self.el.offsetWidth);
         let transformX = 0;
-        if (rightEdgeDistance < margin) {
-            transformX = rightEdgeDistance - margin;
+
+        if (self.position === 'absolute') {
+            if (rightEdgeDistance < 5) {
+                transformX = (-1 * self.el.offsetWidth) - margin;
+            }
+        } else {
+            if (rightEdgeDistance < 0) {
+                transformX = rightEdgeDistance - margin;
+            }
         }
-        if (rect.left < margin) {
-            transformX = margin - rect.left;
+
+        if (self.el.offsetLeft < 0) {
+            transformX = margin - self.el.offsetLeft;
         }
         if (transformX !== 0) {
             self.el.style.marginLeft = transformX + 'px';
@@ -308,25 +313,32 @@ if (!lemonade && typeof (require) === 'function') {
         }
 
         self.el.style.marginTop = '';
-        let rect = self.el.getBoundingClientRect();
         let viewportHeight = window.innerHeight;
         let margin = 10;
 
         if (self.position) {
             if (self.position === 'absolute') {
-                viewportHeight = document.documentElement.clientHeight;
-            } else {
+                viewportHeight = document.documentElement.offsetHeight;
+            } else if (self.position !== 'center') {
                 margin = 0;
             }
         }
 
-        let bottomEdgeDistance = viewportHeight - (rect.bottom);
+        let bottomEdgeDistance = viewportHeight - (self.el.offsetTop + self.el.offsetHeight);
         let transformY = 0;
-        if (bottomEdgeDistance < margin) {
-            transformY = bottomEdgeDistance - margin;
+
+        if (self.position === 'absolute') {
+            if (bottomEdgeDistance < 5) {
+                transformY = (-1 * self.el.offsetHeight) - margin;
+            }
+        } else {
+            if (bottomEdgeDistance < 0) {
+                transformY = bottomEdgeDistance - margin;
+            }
         }
-        if (rect.top < margin) {
-            transformY = margin - rect.top;
+
+        if (self.el.offsetTop < 0) {
+            transformY = margin - self.el.offsetTop;
         }
         if (transformY !== 0) {
             self.el.style.marginTop = transformY + 'px';

package/package.json

@@ -13,9 +13,9 @@
         "modal js"
     ],
     "dependencies": {
-        "lemonadejs": "^4.0.7"
+        "lemonadejs": "^4.1.1"
     },
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
-    "version": "2.7.0"
+    "version": "2.7.2"
 }