lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2025-06-28 02:03:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

simlify code a bit

Browse Source
This commit is contained in:
Anton Lavrenov 2023-03-23 16:54:44 -05:00
parent 78c0bddafa
commit bfb6be6e6f
2 changed files with 14 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/shapes/Transformer.ts
View File

@ -289,35 +289,18 @@ export class Transformer extends Group {
this.detach();
}
const ancestors = this.getAncestors();
const filteredNodes = nodes.filter(node => {
const filteredNodes = nodes.filter((node) => {
// check if ancestor of the transformer
if (ancestors.includes(node))
if (node.isAncestorOf(this)) {
Util.error(
'Konva.Transformer cannot be an a child of the node you are trying to attach'
);
return false;
let pointer = node.parent;
// check if descendant of any transformer
while (pointer) {
const type = pointer.getType();
if (type != 'Group' && type != 'Shape')
break;
if (pointer.className == Transformer.prototype.className)
return false;
pointer = pointer.parent;
}
return true;
});
if (filteredNodes.length != nodes.length) {
Util.error('nodes should not be descendants of a transformer, or ancestors of this transformer.');
return;
}
this._nodes = nodes = filteredNodes;
if (nodes.length === 1 && this.useSingleNodeRotation()) {
this.rotation(nodes[0].getAbsoluteRotation());

33
test/unit/Transformer-test.ts
View File

@ -36,7 +36,7 @@ function simulateMouseUp(tr: Transformer, pos = { x: 0, y: 0 }) {
su(tr.getStage(), pos || { x: 1, y: 1 });
}
describe('Transformer', function () {
describe.only('Transformer', function () {
// ======================================================
it('init transformer on simple rectangle', function () {
var stage = addStage();
@ -4770,31 +4770,16 @@ describe('Transformer', function () {
assert.equal(clone.nodes().length, 0);
});
describe('`transformer.nodes( )` should filter invalid nodes if they are descendants of a transformer or parent of the transformer', function () {
it('should filter children of a transformer', function () {
const stage = addStage()!;
const layer = new Konva.Layer();
stage.add(layer);
const tr = new Konva.Transformer();
layer.add(tr);
tr.nodes([tr.children![0]]);
assert.equal(tr.nodes().length, 0);
});
it('should filter parent of the transformer', function () {
const stage = addStage();
it('should filter parent of the transformer', function () {
const stage = addStage();
const layer = new Konva.Layer();
stage.add(layer);
const layer = new Konva.Layer();
stage.add(layer);
const tr = new Konva.Transformer();
layer.add(tr);
const tr = new Konva.Transformer();
layer.add(tr);
tr.nodes([layer]);
assert.equal(tr.nodes().length, 0);
});
tr.nodes([layer]);
assert.equal(tr.nodes().length, 0);
});
});