@flashist/flibs 0.0.367 → 0.0.368
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -25,6 +25,8 @@ export declare class DragHelper extends BaseObject {
|
|
|
25
25
|
protected updateHitAreaListeners(): void;
|
|
26
26
|
protected addHitAreaListeners(dispatcher: Container): void;
|
|
27
27
|
protected removeHitAreaListeners(): void;
|
|
28
|
+
minDistanceToStartDrag: number;
|
|
29
|
+
protected lastPointerDownEvent: FederatedPointerEvent;
|
|
28
30
|
protected onPointerDown(event: FederatedPointerEvent): void;
|
|
29
31
|
protected onPointerMove(event: FederatedPointerEvent): void;
|
|
30
32
|
protected onPointerUp(event: FederatedPointerEvent): void;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { BaseObject, EventListenerHelper } from "@flashist/fcore";
|
|
1
|
+
import { BaseObject, EventListenerHelper, NumberTools } from "@flashist/fcore";
|
|
2
2
|
import { InteractiveEvent, Point } from "../../index";
|
|
3
3
|
import { DragHelperEvent } from "./DragHelperEvent";
|
|
4
4
|
export class DragHelper extends BaseObject {
|
|
@@ -17,6 +17,7 @@ export class DragHelper extends BaseObject {
|
|
|
17
17
|
// Might be useful to prevent too quick/too small drags
|
|
18
18
|
this.dragUpdateDelay = 0;
|
|
19
19
|
this.dragStartTime = 0;
|
|
20
|
+
this.minDistanceToStartDrag = 0;
|
|
20
21
|
}
|
|
21
22
|
construction() {
|
|
22
23
|
super.construction();
|
|
@@ -62,11 +63,50 @@ export class DragHelper extends BaseObject {
|
|
|
62
63
|
// FApp.instance.ticker.remove(this.onTick, this);
|
|
63
64
|
}
|
|
64
65
|
onPointerDown(event) {
|
|
65
|
-
this.
|
|
66
|
+
this.lastPointerDownEvent = event;
|
|
67
|
+
if (this.minDistanceToStartDrag <= 0) {
|
|
68
|
+
this.startDrag(event.pointerId, event.globalX, event.globalY);
|
|
69
|
+
}
|
|
66
70
|
}
|
|
67
71
|
onPointerMove(event) {
|
|
68
72
|
if (event.pointerId === this.activePointerId) {
|
|
69
|
-
|
|
73
|
+
let shouldStartDrag = false;
|
|
74
|
+
let shouldUpdateDrag = false;
|
|
75
|
+
if (this.isDragActive) {
|
|
76
|
+
shouldUpdateDrag = true;
|
|
77
|
+
}
|
|
78
|
+
else {
|
|
79
|
+
const tempDistance = NumberTools.getDistance(event.globalX, event.globalY, this.lastPointerDownEvent.globalX, this.lastPointerDownEvent.globalY);
|
|
80
|
+
if (tempDistance > this.minDistanceToStartDrag) {
|
|
81
|
+
shouldStartDrag = true;
|
|
82
|
+
shouldUpdateDrag = true;
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
if (shouldStartDrag) {
|
|
86
|
+
this.startDrag(this.lastPointerDownEvent.pointerId, this.lastPointerDownEvent.globalX, this.lastPointerDownEvent.globalY);
|
|
87
|
+
}
|
|
88
|
+
if (shouldUpdateDrag) {
|
|
89
|
+
this.updateDrag(event.pointerId, event.globalX, event.globalY);
|
|
90
|
+
}
|
|
91
|
+
// if (this.isDragActive) {
|
|
92
|
+
// this.updateDrag(event.pointerId, event.globalX, event.globalY);
|
|
93
|
+
// } else if (this.minDistanceToStartDrag > 0) {
|
|
94
|
+
// const tempDistance: number = NumberTools.getDistance(
|
|
95
|
+
// event.globalX,
|
|
96
|
+
// event.globalY,
|
|
97
|
+
// this.lastPointerDownEvent.globalX,
|
|
98
|
+
// this.lastPointerDownEvent.globalY
|
|
99
|
+
// );
|
|
100
|
+
// if (tempDistance > this.minDistanceToStartDrag) {
|
|
101
|
+
// // this.isDragActive = true;
|
|
102
|
+
// this.startDrag(
|
|
103
|
+
// this.lastPointerDownEvent.pointerId,
|
|
104
|
+
// this.lastPointerDownEvent.globalX,
|
|
105
|
+
// this.lastPointerDownEvent.globalY
|
|
106
|
+
// );
|
|
107
|
+
// this.updateDrag(event.pointerId, event.globalX, event.globalY);
|
|
108
|
+
// }
|
|
109
|
+
// }
|
|
70
110
|
}
|
|
71
111
|
else {
|
|
72
112
|
// If there are more than 1 pointer ID (or something is wrong with the original poitner id),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DragHelper.js","sourceRoot":"","sources":["../../../src/other/dragHelper/DragHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"DragHelper.js","sourceRoot":"","sources":["../../../src/other/dragHelper/DragHelper.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@flashist/flibs",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.368",
|
|
4
4
|
"scripts": {},
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"private": false,
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"main": "index.js",
|
|
12
12
|
"typings": "index.d.ts",
|
|
13
13
|
"dependencies": {
|
|
14
|
-
"@flashist/fcore": "^0.0.
|
|
14
|
+
"@flashist/fcore": "^0.0.185",
|
|
15
15
|
"@types/howler": "^2.2.12",
|
|
16
16
|
"webfontloader": "^1.6.28"
|
|
17
17
|
},
|