Fix click stage event on dragend, Fix some Transformer cursor behavior. fix #463

This commit is contained in:
Anton Lavrenov
2018-09-27 10:59:27 +03:00
parent c0911572e7
commit 15b9d66b20
8 changed files with 144 additions and 20 deletions

View File

@@ -2346,7 +2346,7 @@ suite('Container', function() {
});
});
test.only('getClientRect - nested group with a hidden shapes', function() {
test('getClientRect - nested group with a hidden shapes', function() {
var stage = addStage();
var layer = new Konva.Layer();
@@ -2376,8 +2376,6 @@ suite('Container', function() {
visible: false
});
group1.add(rect2);
assert.deepEqual(layer.getClientRect(), {
x: 50,

View File

@@ -733,6 +733,52 @@ suite('Stage', function() {
assert.equal(Konva.DD.node, undefined);
});
// ======================================================
test('do not trigger stage click after dragend', function() {
var stage = addStage();
var layer = new Konva.Layer();
var rect = new Konva.Rect({
x: 0,
y: 0,
width: 50,
height: 50,
fill: 'red',
draggable: true
});
layer.add(rect);
stage.add(layer);
var clicks = 0;
stage.on('click', function() {
debugger;
clicks += 1;
});
// simulate dragging
stage.simulateMouseDown({
x: 25,
y: 25
});
stage.simulateMouseMove({
x: 100,
y: 100
});
// move rect out of mouse
rect.x(-30);
rect.y(-30);
stage.simulateMouseUp({
x: 100,
y: 100
});
assert.equal(clicks, 0);
});
test('can listen click on empty areas', function() {
var stage = addStage();
var layer = new Konva.Layer();

View File

@@ -1036,6 +1036,67 @@ suite('Transformer', function() {
assert.equal(stage.content.style.cursor, 'nwse-resize');
});
test('check correct cursor off on Transformer destroy', function() {
var stage = addStage();
var layer = new Konva.Layer();
stage.add(layer);
var rect = new Konva.Rect({
x: 0,
y: 0,
draggable: true,
width: 100,
height: 100,
fill: 'yellow'
});
layer.add(rect);
var tr = new Konva.Transformer({
node: rect
});
layer.add(tr);
layer.draw();
stage.simulateMouseMove({
x: 100,
y: 100
});
stage.simulateMouseDown({
x: 100,
y: 100
});
assert.equal(stage.content.style.cursor, 'nwse-resize');
var target = stage.getIntersection({
x: 100,
y: 100
});
var top = stage.content.getBoundingClientRect().top;
tr._handleMouseMove({
target: target,
clientX: 120,
clientY: 100 + top
});
// here is duplicate, because transformer is listening window events
tr._handleMouseUp({
clientX: 120,
clientY: 100 + top
});
stage.simulateMouseUp({
x: 120,
y: 100
});
tr.destroy();
stage.simulateMouseMove({
x: 140,
y: 100
});
assert.equal(stage.content.style.cursor, '');
});
test('check correct cursor on scaled parent', function() {
var stage = addStage();
var layer = new Konva.Layer({