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

fix event trigger flow. close #989

Browse Source
This commit is contained in:
Anton Lavrenov
2020-09-25 09:49:00 -05:00
parent 160b44b94d
commit 58f18c268a
4 changed files with 73 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
konva.js
View File

@@ -4508,7 +4508,7 @@
// if no cache for listeners, we need to pre calculate it
if (!listeners) {
listeners = {};
var obj = this;
var obj = Object.getPrototypeOf(this);
while (obj) {
if (!obj.eventListeners) {
obj = Object.getPrototypeOf(obj);
@@ -4526,13 +4526,21 @@
return listeners[eventType];
};
Node.prototype._fire = function (eventType, evt) {
var events = this._getListeners(eventType), i;
if (events) {
evt = evt || {};
evt.currentTarget = this;
evt.type = eventType;
for (i = 0; i < events.length; i++) {
events[i].handler.call(this, evt);
evt = evt || {};
evt.currentTarget = this;
evt.type = eventType;
var topListeners = this._getListeners(eventType);
if (topListeners) {
for (var i = 0; i < topListeners.length; i++) {
topListeners[i].handler.call(this, evt);
}
}
// it is important to iterate over self listeners without cache
// because events can be added/removed while firing
var selfListeners = this.eventListeners[eventType];
if (selfListeners) {
for (var i = 0; i < selfListeners.length; i++) {
selfListeners[i].handler.call(this, evt);
}
}
};

2
konva.min.js vendored
View File

File diff suppressed because one or more lines are too long

25
src/Node.ts
View File

@@ -2285,7 +2285,7 @@ export abstract class Node<Config extends NodeConfig = NodeConfig> {
// if no cache for listeners, we need to pre calculate it
if (!listeners) {
listeners = {};
let obj = this;
let obj = Object.getPrototypeOf(this);
while (obj) {
if (!obj.eventListeners) {
obj = Object.getPrototypeOf(obj);
@@ -2305,16 +2305,23 @@ export abstract class Node<Config extends NodeConfig = NodeConfig> {
return listeners[eventType];
}
_fire(eventType, evt) {
var events = this._getListeners(eventType),
i;
evt = evt || {};
evt.currentTarget = this;
evt.type = eventType;
if (events) {
evt = evt || {};
evt.currentTarget = this;
evt.type = eventType;
const topListeners = this._getListeners(eventType);
if (topListeners) {
for (var i = 0; i < topListeners.length; i++) {
topListeners[i].handler.call(this, evt);
}
}
for (i = 0; i < events.length; i++) {
events[i].handler.call(this, evt);
// it is important to iterate over self listeners without cache
// because events can be added/removed while firing
const selfListeners = this.eventListeners[eventType];
if (selfListeners) {
for (var i = 0; i < selfListeners.length; i++) {
selfListeners[i].handler.call(this, evt);
}
}
}

40
test/unit/DragAndDrop-test.js
View File

@@ -144,6 +144,46 @@ suite('DragAndDrop', function () {
Konva.dragButtons = [0];
});
// ======================================================
test('changing draggable on mousedown should take effect', function () {
var stage = addStage();
var layer = new Konva.Layer();
var circle = new Konva.Circle({
x: stage.getWidth() / 2,
y: stage.getHeight() / 2,
radius: 70,
fill: 'green',
stroke: 'black',
strokeWidth: 4,
name: 'myCircle',
});
layer.add(circle);
stage.add(layer);
circle.on('mousedown', () => {
circle.draggable(true);
});
stage.simulateMouseDown({
x: circle.x(),
y: circle.y(),
});
stage.simulateMouseMove({
x: circle.x() + 10,
y: circle.y() + 10,
});
assert.equal(circle.isDragging(), true);
stage.simulateMouseUp({
x: circle.x() + 10,
y: circle.y() + 10,
});
});
// ======================================================
test('while dragging do not draw hit', function () {
var stage = addStage();