lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2025-10-15 12:34:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

events fixes

Browse Source
This commit is contained in:
Anton Lavrenov
2019-08-08 16:24:55 +07:00
parent b9afbd0e41
commit 0975848dd7
5 changed files with 116 additions and 1344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Stage.ts
View File

@@ -433,11 +433,12 @@ export class Stage extends Container<BaseLayer> {
this.setPointersPositions(evt);
var targetShape = this.targetShape;
if (targetShape && !DD.isDragging) {
var eventsEnabled = !DD.isDragging || Konva.hitOnDragEnabled;
if (targetShape && eventsEnabled) {
targetShape._fireAndBubble(MOUSEOUT, { evt: evt });
targetShape._fireAndBubble(MOUSELEAVE, { evt: evt });
this.targetShape = null;
} else if (!DD.isDragging) {
} else if (eventsEnabled) {
this._fire(MOUSELEAVE, {
evt: evt,
target: this,
@@ -463,11 +464,12 @@ export class Stage extends Container<BaseLayer> {
var pointerId = Util._getFirstPointerId(evt);
var shape: Shape;
if (!DD.isDragging) {
var eventsEnabled = !DD.isDragging || Konva.hitOnDragEnabled;
if (eventsEnabled) {
shape = this.getIntersection(this.getPointerPosition());
if (shape && shape.isListening()) {
var differentTarget = !this.targetShape || this.targetShape !== shape;
if (!DD.isDragging && differentTarget) {
if (eventsEnabled && differentTarget) {
if (this.targetShape) {
this.targetShape._fireAndBubble(
MOUSEOUT,
@@ -490,6 +492,7 @@ export class Stage extends Container<BaseLayer> {
{ evt: evt, pointerId },
this.targetShape
);
shape._fireAndBubble(MOUSEMOVE, { evt: evt, pointerId });
this.targetShape = shape;
} else {
shape._fireAndBubble(MOUSEMOVE, { evt: evt, pointerId });
@@ -499,7 +502,7 @@ export class Stage extends Container<BaseLayer> {
* if no shape was detected, clear target shape and try
* to run mouseout from previous target shape
*/
if (this.targetShape && !DD.isDragging) {
if (this.targetShape && eventsEnabled) {
this.targetShape._fireAndBubble(MOUSEOUT, { evt: evt, pointerId });
this.targetShape._fireAndBubble(MOUSELEAVE, { evt: evt, pointerId });
this._fire(MOUSEOVER, {
@@ -701,7 +704,8 @@ export class Stage extends Container<BaseLayer> {
}
_touchmove(evt) {
this.setPointersPositions(evt);
if (!DD.isDragging || Konva.hitOnDragEnabled) {
var eventsEnabled = !DD.isDragging || Konva.hitOnDragEnabled;
if (eventsEnabled) {
var triggeredOnShape = false;
var processedShapesIds = {};
this._changedPointerPositions.forEach(pos => {