mascot-vis 1.12.1 → 1.12.2

package/dist/mascot.js

@@ -1,5 +1,5 @@
 /* eslint-disable */
-// version: 1.12.1
+// version: 1.12.2
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('d3'), require('pixi.js')) :
 	typeof define === 'function' && define.amd ? define(['exports', 'd3', 'pixi.js'], factory) :
@@ -1737,23 +1737,25 @@
 				htEncs = group.getInternalEncodings("height");
 			if (xEncs.length > 0) {
 				let xEnc = xEncs[xEncs.length -1];
-				cellWidth = xEnc.scale.rangeExtent;
+				let cw = xEnc.scale.rangeExtent;
 				leftOffset = xEnc.scale.range[0];
-				if (xEnc.scale.type === "point") {
-					//TODO: need to handle variable sizes
-					cellWidth += xEnc.anyItem.bounds.width;
-				}
+				// if (xEnc.scale.type === "point") {
+				// 	//TODO: need to handle variable sizes
+				// 	cw += xEnc.anyItem.bounds.width;
+				// }
+				cellWidth = Math.max(cw, cellWidth);
 			} else if (wdEncs.length > 0 && wdEncs[wdEncs.length -1]._rectNegativeValues) { //width encoding with negative values
 				cellWidth = wdEncs[wdEncs.length -1].scale.rangeExtent;
 				leftOffset = wdEncs[wdEncs.length -1].scale.range[0];
 			}
 			if (yEncs.length > 0) {
 				let yEnc = yEncs[yEncs.length -1];
-				cellHeight = yEnc.scale.rangeExtent;
-				if (yEnc.scale.type === "point") {
-					//TODO: need to handle variable sizes
-					cellHeight += yEnc.anyItem.bounds.height;
-				}
+				let ch = yEnc.scale.rangeExtent;
+				// if (yEnc.scale.type === "point") {
+				// 	//TODO: need to handle variable sizes
+				// 	ch += yEnc.anyItem.bounds.height;
+				// }
+				cellHeight = Math.max(ch, cellHeight);
 			} else if (htEncs.length > 0 &&  htEncs[htEncs.length -1]._rectNegativeValues) { //width encoding with negative values
 				cellHeight = htEncs[htEncs.length -1].scale.rangeExtent;
 			}
@@ -3029,12 +3031,10 @@
 			let scopes = rect2Scopes[p.id];
 			let bounds = p.bounds, left = bounds.left, top = bounds.top;
 
-			let wd = orientation == Orientation.Horizontal ? bounds.width/max : bounds.width,
-				ht = orientation == Orientation.Horizontal ? bounds.height : bounds.height/max;
-			// p.classId = compnt.id;
-			//p.resize(wd, ht);
-			//p.dataScope = scopes[0];
-			//coll.addChild(p);
+			// let wd = orientation == Orientation.Horizontal ? bounds.width/max : bounds.width,
+			// 	ht = orientation == Orientation.Horizontal ? bounds.height : bounds.height/max;
+			let wd = orientation == Orientation.Horizontal ? bounds.width/scopes.length : bounds.width,
+				ht = orientation == Orientation.Horizontal ? bounds.height : bounds.height/scopes.length;
 			
 			for (let i = 0; i < scopes.length; i++) {
 				let c = p.duplicate();
@@ -3991,8 +3991,6 @@
 				if (extent < 100) extent = 100;
 				else if (extent > 500) extent = 500;
 			}
-			if (this.rangeExtent)
-				extent = this.rangeExtent;
 
 			let min, max, domain, range;
 			switch (fieldType) {
@@ -4219,6 +4217,8 @@
 		};
 
 		encoding.run();
+		if (encoding.rangeExtent)
+			encoding.scale.rangeExtent = encoding.rangeExtent;
 		return encoding;
 	}
 
@@ -5120,7 +5120,10 @@
 					let cellBounds = layout.cellBounds;
 					let parentPeers = item.parent.parent.children;
 					let idx = parentPeers.findIndex(d => item.parent == d || item.parent.parent == d );
-					return [cellBounds[idx].bottom, cellBounds[idx].bottom - this.scale.rangeExtent];
+					// if (isMark(item)) //need to take into account of mark size, cannot based in bounds bottom alone (e.g., calendar heatmap)
+					// 	return [cellBounds[idx].bottom - item.bounds.height/2, cellBounds[idx].bottom - item.bounds.height/2 - this.scale.rangeExtent];
+					// else
+						return [cellBounds[idx].bottom, cellBounds[idx].bottom - this.scale.rangeExtent];
 				} else if (item.type == "vertex" || item.type == "segment") {
 					let offset = this.scale.offset;
 					return [offset+ this.scale.rangeExtent, offset];
@@ -11217,7 +11220,7 @@
 	    }
 
 	    clone() {
-	        return new TreemapLayout({});
+	        return new TreemapLayout({width: this._width, height: this._height, top: this._top, left: this._left});
 	    }
 
 	    run() {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mascot-vis",
-	"version": "1.12.1",
+	"version": "1.12.2",
 	"description": "Manipulable Semantic Components in Data Visualization",
 	"scripts": {
 		"build": "rollup --config",