replace mouse events with a pointer events

retejs · Feb 2, 2019 · 64ca5dd · 64ca5dd
1 parent d78619c
commit 64ca5dd
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 27 deletions.
diff --git a/src/view/area.js b/src/view/area.js
@@ -18,8 +18,7 @@ export class Area extends Emitter {
         this._startPosition = null;
         this._zoom = new Zoom(container, el, 0.1, this.onZoom.bind(this));
         this._drag = new Drag(container, this.onTranslate.bind(this), this.onStart.bind(this));
-        this.container.addEventListener('mousemove', this.mousemove.bind(this));
-        this.container.addEventListener('touchmove', this.mousemove.bind(this));
+        this.container.addEventListener('pointermove', this.pointermove.bind(this));
 
         this.update();
     }
@@ -30,15 +29,15 @@ export class Area extends Emitter {
         this.el.style.transform = `translate(${t.x}px, ${t.y}px) scale(${t.k})`;
     }
 
-    mousemove(e) {
-        const { clientX, clientY } = e instanceof TouchEvent ? e.touches[0] : e;
+    pointermove(e) {
+        const { clientX, clientY } = e;
         const rect = this.el.getBoundingClientRect();
         const x = clientX - rect.left;
         const y = clientY - rect.top;
         const k = this.transform.k;
 
         this.mouse = { x: x / k, y: y / k };
-        this.trigger('mousemove', { ...this.mouse });
+        this.trigger('mousemove', { ...this.mouse }); // TODO rename on `pointermove`
     }
 
     onStart() {

diff --git a/src/view/drag.js b/src/view/drag.js
@@ -1,7 +1,7 @@
 export class Drag {
 
     constructor(el, onTranslate = () => {}, onStart = () => {}, onDrag = () => {}) {
-        this.mouseStart = null;
+        this.pointerStart = null;
 
         this.el = el;
         this.onTranslate = onTranslate;
@@ -12,46 +12,35 @@ export class Drag {
     }
 
     initEvents(el) {
-        el.addEventListener('mousedown', this.down.bind(this));
-        window.addEventListener('mousemove', this.move.bind(this));
-        window.addEventListener('mouseup', this.up.bind(this));
-
-        el.addEventListener('touchstart', this.down.bind(this));
-        window.addEventListener('touchmove', this.move.bind(this), {
-            passive: false
-        });
-        window.addEventListener('touchend', this.up.bind(this));
-    }
-
-    getCoords(e) {
-        const props = e.touches ? e.touches[0] : e;
+        el.style.touchAction = 'none';
 
-        return [props.pageX, props.pageY];
+        el.addEventListener('pointerdown', this.down.bind(this));
+        window.addEventListener('pointermove', this.move.bind(this));
+        window.addEventListener('pointerup', this.up.bind(this));
     }
 
     down(e) {
         e.stopPropagation();
-        this.mouseStart = this.getCoords(e);
+        this.pointerStart = [e.pageX, e.pageY]
 
         this.onStart(e);
     }
 
     move(e) {
-        if (!this.mouseStart) return;
+        if (!this.pointerStart) return;
         e.preventDefault();
-        e.stopPropagation();
 
-        let [x, y] = this.getCoords(e);
-        let delta = [x - this.mouseStart[0], y - this.mouseStart[1]];
+        let [x, y] = [e.pageX, e.pageY]
+        let delta = [x - this.pointerStart[0], y - this.pointerStart[1]];
         let zoom = this.el.getBoundingClientRect().width / this.el.offsetWidth;
 
         this.onTranslate(delta[0] / zoom, delta[1] / zoom, e);
     }
 
     up(e) {
-        if (!this.mouseStart) return;
+        if (!this.pointerStart) return;
 
-        this.mouseStart = null;
+        this.pointerStart = null;
         this.onDrag(e);
     }
 }