From 885a39027789cda27347e25aeab9140c6d2468ab Mon Sep 17 00:00:00 2001
From: Anton Lavrenov <lavrton@gmail.com>
Date: Fri, 8 Jul 2016 10:44:15 +0700
Subject: [PATCH] `Konva.Text` will interpret undefined `width` and `height` as
 `AUTO`

---
 CHANGELOG.md                  |  6 ++++++
 src/shapes/Text.js            | 22 +++++++++++-----------
 test/unit/shapes/Text-test.js | 22 +++++++++++++++++++++-
 3 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6535d4bc..b10cd9b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Not released][Not released]
 
+## [1.0.2][2016-07-08]
+
+## Changed
+- `Konva.Text` will interpret undefined `width` and `height` as `AUTO`
+
+
 ## [1.0.1][2016-07-05]
 
 ### Changed
diff --git a/src/shapes/Text.js b/src/shapes/Text.js
index 074435ba..fcc28b61 100644
--- a/src/shapes/Text.js
+++ b/src/shapes/Text.js
@@ -39,8 +39,6 @@
      * @param {String} config.text
      * @param {String} [config.align] can be left, center, or right
      * @param {Number} [config.padding]
-     * @param {Number} [config.width] default is auto
-     * @param {Number} [config.height] default is auto
      * @param {Number} [config.lineHeight] default is 1
      * @param {String} [config.wrap] can be word, char, or none. Default is word
      * @@shapeParams
@@ -73,13 +71,13 @@
             if (!config.fillLinearGradientColorStops && !config.fillRadialGradientColorStops) {
                 config.fill = config.fill || 'black';
             }
-
-            if (config.width === undefined) {
-                config.width = AUTO;
-            }
-            if (config.height === undefined) {
-                config.height = AUTO;
-            }
+            //
+            // if (config.width === undefined) {
+            //     config.width = AUTO;
+            // }
+            // if (config.height === undefined) {
+            //     config.height = AUTO;
+            // }
 
             // call super constructor
             Konva.Shape.call(this, config);
@@ -163,7 +161,8 @@
          * @returns {Number}
          */
         getWidth: function() {
-            return this.attrs.width === AUTO ? this.getTextWidth() + this.getPadding() * 2 : this.attrs.width;
+            var isAuto = (this.attrs.width === AUTO) || (this.attrs.width === undefined);
+            return isAuto ? this.getTextWidth() + this.getPadding() * 2 : this.attrs.width;
         },
         /**
          * get the height of the text area, which takes into account multi-line text, line heights, and padding
@@ -172,7 +171,8 @@
          * @returns {Number}
          */
         getHeight: function() {
-            return this.attrs.height === AUTO ? (this.getTextHeight() * this.textArr.length * this.getLineHeight()) + this.getPadding() * 2 : this.attrs.height;
+          var isAuto = (this.attrs.height === AUTO) || (this.attrs.height === undefined);
+          return isAuto ? (this.getTextHeight() * this.textArr.length * this.getLineHeight()) + this.getPadding() * 2 : this.attrs.height;
         },
         /**
          * get text width
diff --git a/test/unit/shapes/Text-test.js b/test/unit/shapes/Text-test.js
index 6e228751..b5fa5afe 100644
--- a/test/unit/shapes/Text-test.js
+++ b/test/unit/shapes/Text-test.js
@@ -168,6 +168,26 @@ suite('Text', function(){
 
     });
 
+    // ======================================================
+    test('reset text auto width', function() {
+        var stage = addStage();
+        var layer = new Konva.Layer();
+
+        var text = new Konva.Text({
+            text: 'Hello World!',
+            fontSize: 50,
+            draggable: true,
+            width: 10
+        });
+
+        assert.equal(text.width(), 10);
+        text.setAttr('width', undefined);
+        assert.equal(text.width() > 100, true);
+
+        layer.add(text);
+        stage.add(layer);
+    });
+
     // ======================================================
     test('text multi line', function() {
         var stage = addStage();
@@ -424,4 +444,4 @@ suite('Text', function(){
     });
 
 
-});
\ No newline at end of file
+});