mol_plot_all 1.2.132 → 1.2.136

package/node.test.js

@@ -3313,11 +3313,21 @@ var $;
                 return val;
             return null;
         }
+        draw_start(event) {
+            if (event !== undefined)
+                return event;
+            return null;
+        }
         draw(event) {
             if (event !== undefined)
                 return event;
             return null;
         }
+        draw_end(event) {
+            if (event !== undefined)
+                return event;
+            return null;
+        }
         style() {
             return {
                 ...super.style(),
@@ -3331,7 +3341,7 @@ var $;
                 pointerdown: (event) => this.event_start(event),
                 pointermove: (event) => this.event_move(event),
                 pointerup: (event) => this.event_end(event),
-                pointerleave: (event) => this.event_end(event),
+                pointerleave: (event) => this.event_leave(event),
                 wheel: (event) => this.event_wheel(event)
             };
         }
@@ -3350,6 +3360,11 @@ var $;
                 return event;
             return null;
         }
+        event_leave(event) {
+            if (event !== undefined)
+                return event;
+            return null;
+        }
         event_wheel(event) {
             if (event !== undefined)
                 return event;
@@ -3419,9 +3434,15 @@ var $;
     __decorate([
         $.$mol_mem
     ], $mol_touch.prototype, "swipe_to_top", null);
+    __decorate([
+        $.$mol_mem
+    ], $mol_touch.prototype, "draw_start", null);
     __decorate([
         $.$mol_mem
     ], $mol_touch.prototype, "draw", null);
+    __decorate([
+        $.$mol_mem
+    ], $mol_touch.prototype, "draw_end", null);
     __decorate([
         $.$mol_mem
     ], $mol_touch.prototype, "event_start", null);
@@ -3431,6 +3452,9 @@ var $;
     __decorate([
         $.$mol_mem
     ], $mol_touch.prototype, "event_end", null);
+    __decorate([
+        $.$mol_mem
+    ], $mol_touch.prototype, "event_leave", null);
     __decorate([
         $.$mol_mem
     ], $mol_touch.prototype, "event_wheel", null);
@@ -3454,7 +3478,7 @@ var $;
                 const events = this.pointer_events();
                 const touches = events.filter(e => e.pointerType === 'touch');
                 const pens = events.filter(e => e.pointerType === 'pen');
-                const mouses = events.filter(e => e.pointerType === 'mouse');
+                const mouses = events.filter(e => !e.pointerType || e.pointerType === 'mouse');
                 const choosen = touches.length ? touches : pens.length ? pens : mouses;
                 return new $.$mol_vector(...choosen.map(event => this.event_coords(event)));
             }
@@ -3476,11 +3500,17 @@ var $;
             }
             event_eat(event) {
                 if (event instanceof PointerEvent) {
-                    const events = this.pointer_events().filter(e => e.pointerId !== event.pointerId);
-                    if (event.type !== 'pointerleave')
+                    const events = this.pointer_events()
+                        .filter(e => e instanceof PointerEvent)
+                        .filter(e => e.pointerId !== event.pointerId);
+                    if (event.type !== 'pointerup' && event.type !== 'pointerleave')
                         events.push(event);
                     this.pointer_events(events);
-                    if (this.allow_zoom() && events.filter(e => e.pointerType === 'touch').length === 2) {
+                    const touch_count = events.filter(e => e.pointerType === 'touch').length;
+                    if (this.allow_zoom() && touch_count === 2) {
+                        return this.action_type('zoom');
+                    }
+                    if (this.action_type() === 'zoom' && touch_count === 1) {
                         return this.action_type('zoom');
                     }
                     let button;
@@ -3500,6 +3530,7 @@ var $;
                     return this.action_type('');
                 }
                 if (event instanceof WheelEvent) {
+                    this.pointer_events([event]);
                     if (event.ctrlKey)
                         return this.action_type('zoom');
                     return this.action_type('pan');
@@ -3513,10 +3544,12 @@ var $;
                 const action_type = this.event_eat(event);
                 if (!action_type)
                     return;
-                if (action_type === 'draw')
-                    return;
                 const coords = this.pointer_coords();
                 this.start_pos(coords.center());
+                if (action_type === 'draw') {
+                    this.draw_start(event);
+                    return;
+                }
                 this.start_distance(coords.distance());
                 this.start_zoom(this.zoom());
             }
@@ -3528,14 +3561,17 @@ var $;
                     return;
                 const start_pan = this.start_pan();
                 const action_type = this.event_eat(event);
+                const start_pos = this.start_pos();
                 let pos = this.pointer_center();
                 if (!action_type)
                     return;
                 if (action_type === 'draw') {
-                    this.draw(event);
+                    const distance = new $.$mol_vector(start_pos, pos).distance();
+                    if (distance >= 4) {
+                        this.draw(event);
+                    }
                     return;
                 }
-                const start_pos = this.start_pos();
                 if (!start_pos)
                     return;
                 if (action_type === 'pan') {
@@ -3584,12 +3620,15 @@ var $;
                 }
             }
             event_end(event) {
+                const action = this.action_type();
+                if (action === 'draw') {
+                    this.draw_end(event);
+                }
+                this.event_leave(event);
+            }
+            event_leave(event) {
                 this.event_eat(event);
                 this.dom_node().releasePointerCapture(event.pointerId);
-                if (!this.start_pos()) {
-                    this.draw(event);
-                    return;
-                }
                 this.start_pos(null);
             }
             swipe_left(event) {
@@ -3832,11 +3871,21 @@ var $;
         allow_zoom() {
             return true;
         }
+        draw_start(event) {
+            if (event !== undefined)
+                return event;
+            return null;
+        }
         draw(event) {
             if (event !== undefined)
                 return event;
             return null;
         }
+        draw_end(event) {
+            if (event !== undefined)
+                return event;
+            return null;
+        }
         cursor_position() {
             return this.Touch().pointer_center();
         }
@@ -3853,7 +3902,9 @@ var $;
             obj.allow_draw = () => this.allow_draw();
             obj.allow_pan = () => this.allow_pan();
             obj.allow_zoom = () => this.allow_zoom();
+            obj.draw_start = (event) => this.draw_start(event);
             obj.draw = (event) => this.draw(event);
+            obj.draw_end = (event) => this.draw_end(event);
             return obj;
         }
     }
@@ -3935,9 +3986,15 @@ var $;
     __decorate([
         $.$mol_mem
     ], $mol_plot_pane.prototype, "zoom", null);
+    __decorate([
+        $.$mol_mem
+    ], $mol_plot_pane.prototype, "draw_start", null);
     __decorate([
         $.$mol_mem
     ], $mol_plot_pane.prototype, "draw", null);
+    __decorate([
+        $.$mol_mem
+    ], $mol_plot_pane.prototype, "draw_end", null);
     __decorate([
         $.$mol_mem
     ], $mol_plot_pane.prototype, "Touch", null);