mirror of
https://github.com/konvajs/konva.git
synced 2025-04-05 20:48:28 +08:00
fix dblclick events
This commit is contained in:
Anton Lavrenov
parent
ff4aae2b02
commit
81153546a9
38
konva.js
38
konva.js
@ -8,7 +8,7 @@
|
||||
* Konva JavaScript Framework v8.1.3
|
||||
* http://konvajs.org/
|
||||
* Licensed under the MIT
|
||||
* Date: Wed Aug 04 2021
|
||||
* Date: Wed Sep 15 2021
|
||||
*
|
||||
* Original work Copyright (C) 2011 - 2013 by Eric Rowell (KineticJS)
|
||||
* Modified work Copyright (C) 2014 - present by Anton Lavrenov (Konva)
|
||||
@ -6185,8 +6185,8 @@
|
||||
const event = { evt: evt, pointerId };
|
||||
var differentTarget = targetShape !== shape;
|
||||
if (differentTarget && targetShape) {
|
||||
targetShape._fireAndBubble(events.pointerout, event, shape);
|
||||
targetShape._fireAndBubble(events.pointerleave, event, shape);
|
||||
targetShape._fireAndBubble(events.pointerout, Object.assign({}, event), shape);
|
||||
targetShape._fireAndBubble(events.pointerleave, Object.assign({}, event), shape);
|
||||
}
|
||||
if (shape) {
|
||||
if (processedShapesIds[shape._id]) {
|
||||
@ -6197,11 +6197,11 @@
|
||||
if (shape && shape.isListening()) {
|
||||
triggeredOnShape = true;
|
||||
if (differentTarget) {
|
||||
shape._fireAndBubble(events.pointerover, event, targetShape);
|
||||
shape._fireAndBubble(events.pointerenter, event, targetShape);
|
||||
shape._fireAndBubble(events.pointerover, Object.assign({}, event), targetShape);
|
||||
shape._fireAndBubble(events.pointerenter, Object.assign({}, event), targetShape);
|
||||
this[eventType + 'targetShape'] = shape;
|
||||
}
|
||||
shape._fireAndBubble(events.pointermove, event);
|
||||
shape._fireAndBubble(events.pointermove, Object.assign({}, event));
|
||||
}
|
||||
else {
|
||||
if (targetShape) {
|
||||
@ -6263,14 +6263,14 @@
|
||||
if (shape && shape.isListening()) {
|
||||
triggeredOnShape = true;
|
||||
this[eventType + 'ClickEndShape'] = shape;
|
||||
shape._fireAndBubble(events.pointerup, event);
|
||||
shape._fireAndBubble(events.pointerup, Object.assign({}, event));
|
||||
// detect if click or double click occurred
|
||||
if (Konva$2['_' + eventType + 'ListenClick'] &&
|
||||
clickStartShape &&
|
||||
clickStartShape === shape) {
|
||||
shape._fireAndBubble(events.pointerclick, event);
|
||||
shape._fireAndBubble(events.pointerclick, Object.assign({}, event));
|
||||
if (fireDblClick && clickEndShape && clickEndShape === shape) {
|
||||
shape._fireAndBubble(events.pointerdblclick, event);
|
||||
shape._fireAndBubble(events.pointerdblclick, Object.assign({}, event));
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -8204,25 +8204,7 @@
|
||||
getContext() {
|
||||
return this.getCanvas().getContext();
|
||||
}
|
||||
/**
|
||||
* clear scene and hit canvas contexts tied to the layer.
|
||||
* This function doesn't remove any nodes. It just clear canvas element.
|
||||
* @method
|
||||
* @name Konva.Layer#clear
|
||||
* @param {Object} [bounds]
|
||||
* @param {Number} [bounds.x]
|
||||
* @param {Number} [bounds.y]
|
||||
* @param {Number} [bounds.width]
|
||||
* @param {Number} [bounds.height]
|
||||
* @example
|
||||
* layer.clear();
|
||||
* layer.clear({
|
||||
* x : 0,
|
||||
* y : 0,
|
||||
* width : 100,
|
||||
* height : 100
|
||||
* });
|
||||
*/
|
||||
// TODO: deprecate this method
|
||||
clear(bounds) {
|
||||
this.getContext().clear(bounds);
|
||||
this.getHitCanvas().getContext().clear(bounds);
|
||||
|
||||
4
konva.min.js
vendored
4
konva.min.js
vendored
File diff suppressed because one or more lines are too long
20
src/Layer.ts
20
src/Layer.ts
@ -107,25 +107,7 @@ export class Layer extends Container<Group | Shape> {
|
||||
getContext() {
|
||||
return this.getCanvas().getContext();
|
||||
}
|
||||
/**
|
||||
* clear scene and hit canvas contexts tied to the layer.
|
||||
* This function doesn't remove any nodes. It just clear canvas element.
|
||||
* @method
|
||||
* @name Konva.Layer#clear
|
||||
* @param {Object} [bounds]
|
||||
* @param {Number} [bounds.x]
|
||||
* @param {Number} [bounds.y]
|
||||
* @param {Number} [bounds.width]
|
||||
* @param {Number} [bounds.height]
|
||||
* @example
|
||||
* layer.clear();
|
||||
* layer.clear({
|
||||
* x : 0,
|
||||
* y : 0,
|
||||
* width : 100,
|
||||
* height : 100
|
||||
* });
|
||||
*/
|
||||
// TODO: deprecate this method
|
||||
clear(bounds?) {
|
||||
this.getContext().clear(bounds);
|
||||
this.getHitCanvas().getContext().clear(bounds);
|
||||
|
||||
17
src/Stage.ts
17
src/Stage.ts
@ -25,7 +25,6 @@ var STAGE = 'Stage',
|
||||
MOUSEMOVE = 'mousemove',
|
||||
MOUSEDOWN = 'mousedown',
|
||||
MOUSEUP = 'mouseup',
|
||||
|
||||
POINTERMOVE = 'pointermove',
|
||||
POINTERDOWN = 'pointerdown',
|
||||
POINTERUP = 'pointerup',
|
||||
@ -603,8 +602,8 @@ export class Stage extends Container<Layer> {
|
||||
var differentTarget = targetShape !== shape;
|
||||
|
||||
if (differentTarget && targetShape) {
|
||||
targetShape._fireAndBubble(events.pointerout, event, shape);
|
||||
targetShape._fireAndBubble(events.pointerleave, event, shape);
|
||||
targetShape._fireAndBubble(events.pointerout, { ...event }, shape);
|
||||
targetShape._fireAndBubble(events.pointerleave, { ...event }, shape);
|
||||
}
|
||||
|
||||
if (shape) {
|
||||
@ -617,11 +616,11 @@ export class Stage extends Container<Layer> {
|
||||
if (shape && shape.isListening()) {
|
||||
triggeredOnShape = true;
|
||||
if (differentTarget) {
|
||||
shape._fireAndBubble(events.pointerover, event, targetShape);
|
||||
shape._fireAndBubble(events.pointerenter, event, targetShape);
|
||||
shape._fireAndBubble(events.pointerover, { ...event }, targetShape);
|
||||
shape._fireAndBubble(events.pointerenter, { ...event }, targetShape);
|
||||
this[eventType + 'targetShape'] = shape;
|
||||
}
|
||||
shape._fireAndBubble(events.pointermove, event);
|
||||
shape._fireAndBubble(events.pointermove, { ...event });
|
||||
} else {
|
||||
if (targetShape) {
|
||||
this._fire(events.pointerover, {
|
||||
@ -688,7 +687,7 @@ export class Stage extends Container<Layer> {
|
||||
if (shape && shape.isListening()) {
|
||||
triggeredOnShape = true;
|
||||
this[eventType + 'ClickEndShape'] = shape;
|
||||
shape._fireAndBubble(events.pointerup, event);
|
||||
shape._fireAndBubble(events.pointerup, { ...event });
|
||||
|
||||
// detect if click or double click occurred
|
||||
if (
|
||||
@ -696,10 +695,10 @@ export class Stage extends Container<Layer> {
|
||||
clickStartShape &&
|
||||
clickStartShape === shape
|
||||
) {
|
||||
shape._fireAndBubble(events.pointerclick, event);
|
||||
shape._fireAndBubble(events.pointerclick, { ...event });
|
||||
|
||||
if (fireDblClick && clickEndShape && clickEndShape === shape) {
|
||||
shape._fireAndBubble(events.pointerdblclick, event);
|
||||
shape._fireAndBubble(events.pointerdblclick, { ...event });
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
||||
@ -1907,6 +1907,59 @@ describe('MouseEvents', function () {
|
||||
done();
|
||||
});
|
||||
|
||||
it('click and dblclick with cancel bubble on container', function (done) {
|
||||
var stage = addStage();
|
||||
var layer = new Konva.Layer();
|
||||
stage.add(layer);
|
||||
|
||||
var bigRect = new Konva.Rect({
|
||||
x: 50,
|
||||
y: 50,
|
||||
width: 200,
|
||||
height: 200,
|
||||
fill: 'yellow',
|
||||
});
|
||||
layer.add(bigRect);
|
||||
|
||||
layer.draw();
|
||||
|
||||
var clicks = 0;
|
||||
var dblclicks = 0;
|
||||
|
||||
layer.on('click', (e) => {
|
||||
e.cancelBubble = true;
|
||||
clicks += 1;
|
||||
});
|
||||
|
||||
layer.on('dblclick', (e) => {
|
||||
e.cancelBubble = true;
|
||||
dblclicks += 1;
|
||||
});
|
||||
|
||||
// make dblclick
|
||||
simulateMouseDown(stage, {
|
||||
x: 100,
|
||||
y: 100,
|
||||
});
|
||||
simulateMouseUp(stage, {
|
||||
x: 100,
|
||||
y: 100,
|
||||
});
|
||||
simulateMouseDown(stage, {
|
||||
x: 100,
|
||||
y: 100,
|
||||
});
|
||||
simulateMouseUp(stage, {
|
||||
x: 100,
|
||||
y: 100,
|
||||
});
|
||||
|
||||
assert.equal(clicks, 2);
|
||||
assert.equal(dblclicks, 1);
|
||||
|
||||
done();
|
||||
});
|
||||
|
||||
it('double click after drag should trigger event', function (done) {
|
||||
var stage = addStage();
|
||||
var layer = new Konva.Layer();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user