bugs fixes

konva.js

@@ -2,7 +2,7 @@
  * Konva JavaScript Framework v2.4.0
  * http://konvajs.github.io/
  * Licensed under the MIT
- * Date: Wed Sep 19 2018
+ * Date: Sat Sep 22 2018
  *
  * Original work Copyright (C) 2011 - 2013 by Eric Rowell (KineticJS)
  * Modified work Copyright (C) 2014 - present by Anton Lavrenov (Konva)
@@ -3304,15 +3304,20 @@
     isVisible: function() {
       return this._getCache(VISIBLE, this._isVisible);
     },
-    _isVisible: function() {
+    _isVisible: function(relativeTo) {
       var visible = this.getVisible(),
         parent = this.getParent();
 
+      if (relativeTo === parent && visible === 'inherit') {
+        return true;
+      } else if (relativeTo === parent) {
+        return visible;
+      }
       // the following conditions are a simplification of the truth table above.
       // please modify carefully
       if (visible === 'inherit') {
         if (parent) {
-          return parent.isVisible();
+          return parent._isVisible(relativeTo);
         } else {
           return true;
         }
@@ -8419,7 +8424,7 @@
       var hasVisible = false;
       for (var i = 0; i < shapes.length; i++) {
         var shape = shapes[i];
-        if (shape.getVisible()) {
+        if (shape._isVisible(this)) {
           hasVisible = true;
           break;
         }
@@ -19856,6 +19861,8 @@
 
       var keepProportion = this.keepRatio() || e.shiftKey;
 
+      // console.log(keepProportion);
+
       if (this.movingResizer === 'top-left') {
         if (keepProportion) {
           newHypotenuse = Math.sqrt(
@@ -20013,6 +20020,8 @@
         var bottomOffsetX = this.getWidth() - bottomRight.x();
         var bottomOffsetY = this.getHeight() - bottomRight.y();
 
+        console.log(topOffsetX, topOffsetY, bottomOffsetX, bottomOffsetY);
+
         bottomRight.move({
           x: -topOffsetX,
           y: -topOffsetY
@@ -20034,6 +20043,8 @@
       var height =
         this.findOne('.bottom-right').y() - this.findOne('.top-left').y();
 
+      // console.log(x, y, width, height);
+
       this._fitNodeInto(
         {
           x: x + this.offsetX(),

src/Container.js

@@ -533,7 +533,7 @@
       var hasVisible = false;
       for (var i = 0; i < shapes.length; i++) {
         var shape = shapes[i];
-        if (shape.getVisible()) {
+        if (shape._isVisible(this)) {
           hasVisible = true;
           break;
         }

src/Node.js

@@ -781,15 +781,20 @@
     isVisible: function() {
       return this._getCache(VISIBLE, this._isVisible);
     },
-    _isVisible: function() {
+    _isVisible: function(relativeTo) {
       var visible = this.getVisible(),
         parent = this.getParent();
 
+      if (relativeTo === parent && visible === 'inherit') {
+        return true;
+      } else if (relativeTo === parent) {
+        return visible;
+      }
       // the following conditions are a simplification of the truth table above.
       // please modify carefully
       if (visible === 'inherit') {
         if (parent) {
-          return parent.isVisible();
+          return parent._isVisible(relativeTo);
         } else {
           return true;
         }

src/shapes/Transformer.js

@@ -429,6 +429,8 @@
 
       var keepProportion = this.keepRatio() || e.shiftKey;
 
+      // console.log(keepProportion);
+
       if (this.movingResizer === 'top-left') {
         if (keepProportion) {
           newHypotenuse = Math.sqrt(
@@ -586,6 +588,8 @@
         var bottomOffsetX = this.getWidth() - bottomRight.x();
         var bottomOffsetY = this.getHeight() - bottomRight.y();
 
+        console.log(topOffsetX, topOffsetY, bottomOffsetX, bottomOffsetY);
+
         bottomRight.move({
           x: -topOffsetX,
           y: -topOffsetY
@@ -607,6 +611,8 @@
       var height =
         this.findOne('.bottom-right').y() - this.findOne('.top-left').y();
 
+      // console.log(x, y, width, height);
+
       this._fitNodeInto(
         {
           x: x + this.offsetX(),

test/unit/Container-test.js

@@ -2295,6 +2295,32 @@ suite('Container', function() {
     });
   });
 
+  test('get client rect with deep nested hidden shape 2', function() {
+    var layer = new Konva.Layer();
+    var group = new Konva.Group({
+      visible: false,
+      x: 100,
+      y: 40
+    });
+
+    var rect = new Konva.Rect({
+      height: 100,
+      width: 100,
+      fill: 'red'
+    });
+    group.add(rect);
+    layer.add(group);
+
+    var clientRect = layer.getClientRect();
+
+    assert.deepEqual(clientRect, {
+      x: 0,
+      y: 0,
+      width: 0,
+      height: 0
+    });
+  });
+
   test('getClientRect - test layer', function() {
     var stage = addStage();
     var layer = new Konva.Layer();