fixed drag bug in safari

kode-team · Sep 15, 2018 · f3816af · f3816af
1 parent 83b6400
commit f3816af
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 8 deletions.
diff --git a/addon/codemirror-colorpicker.js b/addon/codemirror-colorpicker.js
@@ -5684,9 +5684,10 @@ var Dom = function () {
         key: 'offset',
         value: function offset() {
             var rect = this.el.getBoundingClientRect();
+
             return {
-                top: rect.top + document.documentElement.scrollTop,
-                left: rect.left + document.documentElement.scrollLeft
+                top: rect.top + Dom.getScrollTop(),
+                left: rect.left + Dom.getScrollLeft()
             };
         }
     }, {
@@ -5859,6 +5860,16 @@ var Dom = function () {
 
             return this;
         }
+    }], [{
+        key: 'getScrollTop',
+        value: function getScrollTop() {
+            return Math.max(window.pageYOffset, document.documentElement.scrollTop, document.body.scrollTop);
+        }
+    }, {
+        key: 'getScrollLeft',
+        value: function getScrollLeft() {
+            return Math.max(window.pageXOffset, document.documentElement.scrollLeft, document.body.scrollLeft);
+        }
     }]);
     return Dom;
 }();

diff --git a/dist/codemirror-colorpicker.js b/dist/codemirror-colorpicker.js
@@ -5817,9 +5817,10 @@ var Dom = function () {
         key: 'offset',
         value: function offset() {
             var rect = this.el.getBoundingClientRect();
+
             return {
-                top: rect.top + document.documentElement.scrollTop,
-                left: rect.left + document.documentElement.scrollLeft
+                top: rect.top + Dom.getScrollTop(),
+                left: rect.left + Dom.getScrollLeft()
             };
         }
     }, {
@@ -5992,6 +5993,16 @@ var Dom = function () {
 
             return this;
         }
+    }], [{
+        key: 'getScrollTop',
+        value: function getScrollTop() {
+            return Math.max(window.pageYOffset, document.documentElement.scrollTop, document.body.scrollTop);
+        }
+    }, {
+        key: 'getScrollLeft',
+        value: function getScrollLeft() {
+            return Math.max(window.pageXOffset, document.documentElement.scrollLeft, document.body.scrollLeft);
+        }
     }]);
     return Dom;
 }();

diff --git a/dist/codemirror-colorpicker.min.js b/dist/codemirror-colorpicker.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror-colorpicker",
-  "version": "1.9.31",
+  "version": "1.9.32",
   "description": "simple colorpicker used anywhere",
   "main": "./dist/codemirror-colorpicker.js",
   "scripts": {

diff --git a/src/util/Dom.js b/src/util/Dom.js
@@ -30,6 +30,13 @@ export default class Dom {
         }
     }
 
+    static getScrollTop () {
+        return Math.max(window.pageYOffset, document.documentElement.scrollTop, document.body.scrollTop)
+    }
+
+    static getScrollLeft () {
+        return Math.max(window.pageXOffset, document.documentElement.scrollLeft, document.body.scrollLeft)
+    }
 
     attr (key, value) {
         if (arguments.length == 1) {
@@ -178,9 +185,10 @@ export default class Dom {
 
     offset () {
         var rect = this.el.getBoundingClientRect();
+
         return {
-            top: rect.top + document.documentElement.scrollTop,
-            left: rect.left + document.documentElement.scrollLeft
+            top: rect.top + Dom.getScrollTop(),
+            left: rect.left + Dom.getScrollLeft()
         };
     }