DVF-2444 hidden container problems fixed

Author: grasshoppergn

src/vector/PathBase.js

@@ -965,15 +965,11 @@ acgraph.vector.PathBase.prototype.createDomInternal = function() {
 //----------------------------------------------------------------------------------------------------------------------
 /** @inheritDoc */
 acgraph.vector.PathBase.prototype.renderInternal = function() {
+  goog.base(this, 'renderInternal');
   // If data is unsync  - recreate path data attribute
   if (this.hasDirtyState(acgraph.vector.Element.DirtyState.DATA)) {
     this.renderPath();
-    if (this.fill() && this.fill()['src']) {
-      this.setDirtyState(acgraph.vector.Element.DirtyState.FILL);
-    }
   }
-
-  goog.base(this, 'renderInternal');
 };
 
 

src/vector/Shape.js

@@ -27,6 +27,14 @@ acgraph.vector.Shape = function() {
    */
   this.stroke_ = 'black';
 
+  /**
+   * If the fill or stroke needs update on DATA invalidation.
+   * 0 - no need, 1 - fill needs to be update, 2 - stroke, 3 - both.
+   * @type {number}
+   * @private
+   */
+  this.boundsAffectedColors_ = 0;
+
   goog.base(this);
 };
 goog.inherits(acgraph.vector.Shape, acgraph.vector.Element);
@@ -73,7 +81,7 @@ acgraph.vector.Shape.prototype.fill = function(opt_fillOrColorOrKeys, opt_opacit
   // TODO(Anton Saukh): comparison must be more complex here
   if (this.fill_ != newFill) {
     this.fill_ = newFill;
-    // Flag to show that fill changed
+    this.boundsAffectedColors_ = (this.boundsAffectedColors_ & 2) | !!(newFill['mode'] || newFill['src']);
     this.setDirtyState(acgraph.vector.Element.DirtyState.FILL);
   }
   return this;
@@ -98,7 +106,7 @@ acgraph.vector.Shape.prototype.stroke = function(opt_strokeOrFill, opt_thickness
   // TODO(Anton Saukh): comparison must be more complex here
   if (this.stroke_ != newStroke) {
     this.stroke_ = /** @type {acgraph.vector.Stroke} */(newStroke);
-    // set flag that stroke has changed
+    this.boundsAffectedColors_ = (this.boundsAffectedColors_ & 1) | (newStroke['mode'] << 1);
     this.setDirtyState(acgraph.vector.Element.DirtyState.STROKE);
   }
   return this;
@@ -138,6 +146,13 @@ acgraph.vector.Shape.prototype.strokeThickness = function(opt_value) {
 //----------------------------------------------------------------------------------------------------------------------
 /** @inheritDoc */
 acgraph.vector.Shape.prototype.renderInternal = function() {
+  if (this.boundsAffectedColors_ && this.hasDirtyState(acgraph.vector.Element.DirtyState.DATA)) {
+    if (!!(this.boundsAffectedColors_ & 1))
+      this.setDirtyState(acgraph.vector.Element.DirtyState.FILL);
+    if (!!(this.boundsAffectedColors_ & 2))
+      this.setDirtyState(acgraph.vector.Element.DirtyState.STROKE);
+  }
+
   goog.base(this, 'renderInternal');
 
   // Apply stroke and fill settings if they were changed

src/vector/Text.js

@@ -515,8 +515,11 @@ acgraph.vector.Text.prototype.transformAfterChange = function() {
  */
 acgraph.vector.Text.prototype.width = function(opt_value) {
   if (goog.isDef(opt_value)) {
-    if (this.setStyleProperty('width') != opt_value)
-      this.width_ = opt_value = (Math.max(opt_value, 0) || 0);
+    if (this.setStyleProperty('width') != opt_value) {
+      if (!goog.isNull(opt_value))
+        opt_value = (Math.max(opt_value, 0) || 0);
+      this.width_ = opt_value;
+    }
   }
   return /** @type {number|string|acgraph.vector.Text} */ (this.setStyleProperty('width', opt_value));
 };
@@ -532,7 +535,9 @@ acgraph.vector.Text.prototype.width = function(opt_value) {
 acgraph.vector.Text.prototype.height = function(opt_value) {
   if (goog.isDef(opt_value)) {
     if (this.setStyleProperty('height') != opt_value)
-      this.height_ = opt_value = (Math.max(opt_value, 0) || 0);
+      if (!goog.isNull(opt_value))
+        opt_value = (Math.max(opt_value, 0) || 0);
+      this.height_ = opt_value;
   }
   return /** @type {number|string|acgraph.vector.Text} */ (this.setStyleProperty('height', opt_value));
 };