@lemonadejs/modal 2.8.0 → 2.8.1

package/dist/index.js

@@ -282,19 +282,21 @@ if (!lemonade && typeof (require) === 'function') {
             if (self.position === 'absolute') {
                 let w = document.documentElement.offsetWidth;
                 if (w > viewportWidth) {
-                    viewportWidth = w;
+                    //viewportWidth = w;
                 }
             } else if (self.position !== 'center') {
                 margin = 0;
             }
         }
 
-        let rightEdgeDistance = viewportWidth - (self.el.offsetLeft + self.el.offsetWidth);
+        let el = self.el.getBoundingClientRect();
+
+        let rightEdgeDistance = viewportWidth - (el.left + el.width);
         let transformX = 0;
 
         if (self.position === 'absolute') {
-            if (rightEdgeDistance < 5) {
-                transformX = (-1 * self.el.offsetWidth) - margin;
+            if (rightEdgeDistance < 0) {
+                transformX = rightEdgeDistance - margin - 10; // 10 is the scroll width
             }
         } else {
             if (rightEdgeDistance < 0) {
@@ -302,8 +304,8 @@ if (!lemonade && typeof (require) === 'function') {
             }
         }
 
-        if (self.el.offsetLeft < 0) {
-            transformX = margin - self.el.offsetLeft;
+        if (el.left < 0) {
+            transformX = margin - el.left;
         }
         if (transformX !== 0) {
             self.el.style.marginLeft = transformX + 'px';
@@ -323,19 +325,21 @@ if (!lemonade && typeof (require) === 'function') {
             if (self.position === 'absolute') {
                 let h = document.documentElement.offsetHeight;
                 if (h > viewportHeight) {
-                    viewportHeight = h;
+                    //viewportHeight = h;
                 }
             } else if (self.position !== 'center') {
                 margin = 0;
             }
         }
 
-        let bottomEdgeDistance = viewportHeight - (self.el.offsetTop + self.el.offsetHeight);
+        let el = self.el.getBoundingClientRect();
+
+        let bottomEdgeDistance = viewportHeight - (el.top + el.height);
         let transformY = 0;
 
         if (self.position === 'absolute') {
             if (bottomEdgeDistance < 5) {
-                transformY = (-1 * self.el.offsetHeight) - margin;
+                transformY = (-1 * el.height) - margin - 20;
             }
         } else {
             if (bottomEdgeDistance < 0) {
@@ -343,8 +347,8 @@ if (!lemonade && typeof (require) === 'function') {
             }
         }
 
-        if (self.el.offsetTop < 0) {
-            transformY = margin - self.el.offsetTop;
+        if (el.top < 0) {
+            transformY = margin - el.top;
         }
         if (transformY !== 0) {
             self.el.style.marginTop = transformY + 'px';

package/package.json

@@ -13,9 +13,9 @@
         "modal js"
     ],
     "dependencies": {
-        "lemonadejs": "^4.2.1"
+        "lemonadejs": "^4.2.2"
     },
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
-    "version": "2.8.0"
+    "version": "2.8.1"
 }