From 46e8c6f6b3b3e228f510529c82c1ca6dbd50a060 Mon Sep 17 00:00:00 2001
From: D31T4 <chinpokleung123@gmail.com>
Date: Thu, 2 Mar 2023 23:42:21 +1100
Subject: [PATCH] added test in `transformer.nodes()`

---
 src/shapes/Transformer.ts     | 32 +++++++++++++++++++++++++++++++-
 test/unit/Transformer-test.ts | 28 ++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/src/shapes/Transformer.ts b/src/shapes/Transformer.ts
index 42e67062..97951840 100644
--- a/src/shapes/Transformer.ts
+++ b/src/shapes/Transformer.ts
@@ -288,7 +288,37 @@ export class Transformer extends Group {
     if (this._nodes && this._nodes.length) {
       this.detach();
     }
-    this._nodes = nodes;
+
+    const ancestors = this.getAncestors();
+
+    const filteredNodes = nodes.filter(node => {
+      // check if ancestor of the transformer
+      if (ancestors.includes(node))
+        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());
     } else {
diff --git a/test/unit/Transformer-test.ts b/test/unit/Transformer-test.ts
index 8cdfcf57..4fb42cd0 100644
--- a/test/unit/Transformer-test.ts
+++ b/test/unit/Transformer-test.ts
@@ -4769,4 +4769,32 @@ describe('Transformer', function () {
     assert.equal(clone.getChildren().length, tr.getChildren().length);
     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();
+      
+      const layer = new Konva.Layer();
+      stage.add(layer);
+
+      const tr = new Konva.Transformer();
+      layer.add(tr);
+
+      tr.nodes([layer]);
+      assert.equal(tr.nodes().length, 0);
+    });
+  });
 });