Merge pull request #1205 from palantir/release-0.33.1

Release 0.33.1 - Layout hotfix (--> master)

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "plottable",
   "description": "A library for creating charts out of D3",
-  "version": "0.33.0",
+  "version": "0.33.1",
   "main": ["plottable.js", "plottable.css"],
   "license": "MIT",
   "ignore": [

package.json

@@ -1,7 +1,7 @@
 {
   "name": "plottable.js",
   "description": "A library for creating charts out of D3",
-  "version": "0.33.0",
+  "version": "0.33.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/palantir/plottable.git"

plottable.js

@@ -1,5 +1,5 @@
 /*!
-Plottable 0.33.0 (https://github.com/palantir/plottable)
+Plottable 0.33.1 (https://github.com/palantir/plottable)
 Copyright 2014 Palantir Technologies
 Licensed under MIT (https://github.com/palantir/plottable/blob/master/LICENSE)
 */
@@ -1310,7 +1310,7 @@ var Plottable;
 ///<reference path="../reference.ts" />
 var Plottable;
 (function (Plottable) {
-    Plottable.version = "0.33.0";
+    Plottable.version = "0.33.1";
 })(Plottable || (Plottable = {}));
 
 ///<reference path="../reference.ts" />
@@ -3242,22 +3242,13 @@ var Plottable;
                 }
                 this.xOrigin = xOrigin;
                 this.yOrigin = yOrigin;
-                var xPosition = this.xOrigin;
-                var yPosition = this.yOrigin;
                 var requestedSpace = this._requestedSpace(availableWidth, availableHeight);
-                xPosition += this._xOffset;
-                if (this._isFixedWidth()) {
-                    xPosition += (availableWidth - requestedSpace.width) * this._xAlignProportion;
-                    // Decrease size so hitbox / bounding box and children are sized correctly
-                    availableWidth = Math.min(availableWidth, requestedSpace.width);
-                }
-                yPosition += this._yOffset;
-                if (this._isFixedHeight()) {
-                    yPosition += (availableHeight - requestedSpace.height) * this._yAlignProportion;
-                    availableHeight = Math.min(availableHeight, requestedSpace.height);
-                }
-                this._width = availableWidth;
-                this._height = availableHeight;
+                this._width = this._isFixedWidth() ? Math.min(availableWidth, requestedSpace.width) : availableWidth;
+                this._height = this._isFixedHeight() ? Math.min(availableHeight, requestedSpace.height) : availableHeight;
+                var xPosition = this.xOrigin + this._xOffset;
+                var yPosition = this.yOrigin + this._yOffset;
+                xPosition += (availableWidth - this.width()) * this._xAlignProportion;
+                yPosition += (availableHeight - requestedSpace.height) * this._yAlignProportion;
                 this._element.attr("transform", "translate(" + xPosition + "," + yPosition + ")");
                 this.boxes.forEach(function (b) { return b.attr("width", _this.width()).attr("height", _this.height()); });
             };

src/components/abstractComponent.ts

@@ -138,27 +138,15 @@ export module Component {
       }
       this.xOrigin = xOrigin;
       this.yOrigin = yOrigin;
-      var xPosition = this.xOrigin;
-      var yPosition = this.yOrigin;
+      var requestedSpace = this._requestedSpace(availableWidth, availableHeight);
+      this._width  = this._isFixedWidth()  ? Math.min(availableWidth , requestedSpace.width)  : availableWidth ;
+      this._height = this._isFixedHeight() ? Math.min(availableHeight, requestedSpace.height) : availableHeight;
 
-      var requestedSpace = this._requestedSpace(availableWidth , availableHeight);
+      var xPosition = this.xOrigin + this._xOffset;
+      var yPosition = this.yOrigin + this._yOffset;
+      xPosition += (availableWidth - this.width()) * this._xAlignProportion;
+      yPosition += (availableHeight - requestedSpace.height) * this._yAlignProportion;
 
-      xPosition += this._xOffset;
-      if (this._isFixedWidth()) {
-        xPosition += (availableWidth - requestedSpace.width) * this._xAlignProportion;
-
-        // Decrease size so hitbox / bounding box and children are sized correctly
-        availableWidth  = Math.min(availableWidth, requestedSpace.width);
-      }
-
-      yPosition += this._yOffset;
-      if (this._isFixedHeight()) {
-        yPosition += (availableHeight - requestedSpace.height) * this._yAlignProportion;
-        availableHeight = Math.min(availableHeight, requestedSpace.height);
-      }
-
-      this._width  = availableWidth;
-      this._height = availableHeight;
       this._element.attr("transform", "translate(" + xPosition + "," + yPosition + ")");
       this.boxes.forEach((b: D3.Selection) => b.attr("width", this.width()).attr("height", this.height()));
     }

test/core/componentTests.ts

@@ -385,4 +385,19 @@ it("components can be offset relative to their alignment, and throw errors if th
 
     svg.remove();
   });
+
+  it("Components will not translate if they are fixed width/height and request more space than offered", () => {
+    // catches #1188
+    var c: any = new Plottable.Component.AbstractComponent();
+    c._requestedSpace = () => {return {width: 500, height: 500, wantsWidth: true, wantsHeight: true};};
+    c._fixedWidthFlag = true;
+    c._fixedHeightFlag = true;
+    c.xAlign("left");
+    var t = new Plottable.Component.Table([[c]]);
+    t.renderTo(svg);
+
+    var transform = d3.transform(c._element.attr("transform"));
+    assert.deepEqual(transform.translate, [0, 0], "the element was not translated");
+    svg.remove();
+  });
 });

test/tests.js

@@ -3912,6 +3912,21 @@ describe("Component behavior", function () {
         assertBBoxInclusion(t.boxContainer.select(".bounding-box"), horizontalComponent._element.select(".bounding-box"));
         svg.remove();
     });
+    it("Components will not translate if they are fixed width/height and request more space than offered", function () {
+        // catches #1188
+        var c = new Plottable.Component.AbstractComponent();
+        c._requestedSpace = function () {
+            return { width: 500, height: 500, wantsWidth: true, wantsHeight: true };
+        };
+        c._fixedWidthFlag = true;
+        c._fixedHeightFlag = true;
+        c.xAlign("left");
+        var t = new Plottable.Component.Table([[c]]);
+        t.renderTo(svg);
+        var transform = d3.transform(c._element.attr("transform"));
+        assert.deepEqual(transform.translate, [0, 0], "the element was not translated");
+        svg.remove();
+    });
 });
 
 ///<reference path="../testReference.ts" />