mascot-vis 1.11.0 → 1.11.2

package/dist/mascot.js

@@ -1,5 +1,5 @@
 /* eslint-disable */
-// version: 1.11.0
+// version: 1.11.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) :
@@ -260,6 +260,18 @@
 		CANNOT_CLASSIFY: "Cannot classify items in "
 	};
 
+	const categoricalColorSchemes = [
+		"schemeCategory10", "schemeAccent", "schemeDark2", "schemePaired", "schemePastel1", "schemePastel2", "schemeSet1", "schemeSet2", "schemeSet3", "schemeTableau10"
+	];
+
+	const divergingColorSchemes = [
+		"schemeBrBG", "schemePRGn", "schemePiYG", "schemePuOr", "schemeRdBu", "schemeRdGy", "schemeRdYlBu", "schemeRdYlGn", "schemeSpectral"
+	];
+
+	const sequentialColorSchemes = [
+		"schemeBlues", "schemeGreens", "schemeGreys", "schemeOranges", "schemePurples", "schemeReds", "schemeBuGn", "schemeBuPu", "schemeGnBu", "schemeOrRd", "schemePuBuGn", "schemePuBu", "schemePuRd", "schemeRdPu", "schemeYlGnBu", "schemeYlGn", "schemeYlOrBr", "schemeYlOrRd"
+	];
+
 	class Layout {
 
 	    constructor(args){
@@ -2169,9 +2181,12 @@
 			while(item) {
 				if (item.classId && classIds.indexOf(item.classId) < 0)
 					classIds.push(item.classId);
-				if (item.children)
+				if (item.type === ItemType.Glyph) {
+					item.children.forEach(d => classIds.push(d.classId));
+					break;
+				} else if (item.children) {
 					item = item.children[0];
-				else
+				} else
 					break;
 			}
 			let result = [];
@@ -3265,6 +3280,9 @@
 			let lineDS = p.dataScope ? p.dataScope : new DataScope(datatable);
 			let ds = datatable.getFieldSummary(field).unique.map(d => lineDS.cross(field, d));
 			ds = ds.filter(d => !d.isEmpty());
+			if (ds.length === 1) {
+				ds.push(ds[0].clone());
+			}
 
 			let args = Object.assign({}, p.styles);
 			for (let vs of Vertex.styles){
@@ -3314,6 +3332,9 @@
 			let areaDS = p.dataScope ? p.dataScope : new DataScope(datatable);
 			let ds = datatable.getFieldSummary(field).unique.map(d => areaDS.cross(field, d));
 			ds = ft == DataType.Number? ds : ds.filter(d => !d.isEmpty());
+			if (ds.length === 1) {
+				ds.push(ds[0].clone());
+			}
 			
 			if (ft == DataType.Number || ft == DataType.Date) {
 				// sorting ds
@@ -3883,7 +3904,11 @@
 					max = Math.max(...this.data);
 					domain = [min, max];
 					if (this.scale) {
-						let domainValues = domain.concat(this.scale.domain);
+						// let domainValues = domain.concat(this.scale.domain);
+						let domainValues = this.data;
+						for (let enc of this.scale.encodings) {
+							domainValues = domainValues.concat(enc.data);
+						}
 						domain = [Math.min(...domainValues), Math.max(...domainValues)];
 						//extent = Math.abs(this.scale.map(domain[0]) - this.scale.map(domain[1]));
 						range = this.scale.range;
@@ -3921,9 +3946,12 @@
 					
 					if (this.scale) {
 						//where zero is included depends on the existing scale
-						let domainValues = domain.concat(this.scale._scale.domain());
-						domain = [Math.min(...domainValues), Math.max(...domainValues)]; //Scale.mergeDomain(domain, this.scale.domain);
-						//extent = Math.abs(this.scale.map(domain[0]) - this.scale.map(domain[1]));
+						let domainValues = this.data;
+						for (let enc of this.scale.encodings) {
+							domainValues = domainValues.concat(enc.data);
+						}
+						// let domainValues = domain.concat(this.scale._scale.domain());
+						domain = [Math.min(...domainValues), Math.max(...domainValues)]; 
 
 						range = this.scale.range;
 					} else {
@@ -4161,7 +4189,16 @@
 					if (this.scale) {
 						this.scale.domain = Array.from(new Set(this.scale.domain.concat(this.data)));
 					} else {
-						this.scale = createScale("ordinalColor", this._scheme ? this._scheme: "schemeCategory10");
+						let args = {scheme: "schemeCategory10"};
+						if (this._scheme) {
+							if (categoricalColorSchemes.indexOf(this._scheme) >= 0) {
+								args.scheme = this._scheme;
+							} else if (divergingColorSchemes.indexOf(this._scheme) >= 0 || sequentialColorSchemes.indexOf(this._scheme) >= 0) {
+								args.scheme = this._scheme;
+								args.size = this.data.length;
+							}
+						}
+						this.scale = createScale("ordinalColor", args);
 						this.scale.domain = this.data;
 						if (this._mapping) {
 							let range = this.scale.domain.map(d => d in this._mapping ? this._mapping[d] : "black");
@@ -4718,7 +4755,7 @@
 
 		set aggregator(a) {
 			this._aggregator = a;
-			this.scale = undefined;
+			//this.scale = undefined;
 			this.run();
 		}
 
@@ -6387,7 +6424,7 @@
 	            }
 	        } 
 	        
-	        if (this._item.type == ItemType.Area)
+	        if (this._item.type === ItemType.Area || this._item.parent.type === ItemType.Area)
 	            c = getCellBoundsInGridLayout(this._item);
 
 	        if (c === undefined) {
@@ -7073,6 +7110,12 @@
 	        return false;
 	    }
 
+	    _doTranslate(dx, dy) {
+	        super._doTranslate(dx, dy);
+	        this._x += dx;
+	        this._y += dy;
+	    }
+
 	}
 
 	class Glyph extends Group {
@@ -7335,7 +7378,13 @@
 	        this.direction = d;
 	        this.items = items;
 	        this.type = ConstraintType.Align;
-	        this.id = this.type + "_" + [...new Set(this.items.map(d => d.classId))].join("_");
+	        this._orientation = [Alignment.Top, Alignment.Middle, Alignment.Bottom].indexOf(d) >= 0 ? Orientation.Vertical : Orientation.Horizontal;
+	        this._itemIds = this.items.map(d => d.classId).sort().join("_");
+	        this.id = this.type + "_" + this._itemIds + "_" + this._orientation;
+	    }
+
+	    get orientation() {
+	        return this._orientation;
 	    }
 
 	    apply() {
@@ -7348,7 +7397,7 @@
 	            baseline = d3__namespace.mean(this.items.map(d => d.bounds[dir]));
 	        
 	        let delta = this.items.map(d => baseline - d.bounds[dir]),
-	            axis = dir == Alignment.TOP || dir == Alignment.Middle || dir == Alignment.Bottom ? "y" : "x";
+	            axis = dir == Alignment.Top || dir == Alignment.Middle || dir == Alignment.Bottom ? "y" : "x";
 	        this.items.forEach((d,i) => {
 	            if (d.parent && d.parent.layout && d.parent.layout.type == LayoutType.Stack){
 	                let dx = axis == "x" ? delta[i] : 0,
@@ -8310,7 +8359,7 @@
 			}
 
 	        for (let enc of scale.encodings) {
-				enc.scene._updateAncestorBounds(enc.item, enc.items);
+				enc.scene._relayoutAncestors(enc.item, enc.items);
 			}
 			//reapply constraints
 			let items = scale.encodings.map( d => d.anyItem), classId2item = {};
@@ -9417,7 +9466,7 @@
 			if (!("datatable" in args))
 				args.datatable = item.dataScope ? item.dataScope.dataTable : item.parent.dataScope.dataTable;
 			if (!("aggregator" in args))
-				args.aggregator = "sum";
+				args.aggregator = "mean";
 			if (!("flipScale" in args))
 				args.flipScale = false;
 			if (!("includeZero" in args))
@@ -9524,6 +9573,24 @@
 			this.constraints = {};
 		}
 
+		removeConstraint(c) {
+			delete this.constraints[c.id];
+		}
+
+		getRelatedConstraints(items) {
+			let cstrs = [];
+			for (let cid in this.constraints) {
+				let c = this.constraints[cid];
+				switch (c.type) {
+					case ConstraintType.Align:
+						if (c._itemIds === items.map(d => d.classId).sort().join("_"))
+							cstrs.push(c);
+						break;
+				}
+			}
+			return cstrs;
+		}
+
 		// alignInCell(item, direction) {
 		// 	//TODO replace grid.vertCellAlignment and grid.horzCellAlignment
 		// }
@@ -9544,7 +9611,7 @@
 		axis(channel, field, params) {
 			//need to figure out if item has the corresponding encoding, or if item position is determined by layout
 			let args = params ? params : {}, enc = args.item ? this.getEncodingByItem(args.item, channel) : this.getEncodingByField(field, channel);
-			if (enc) {
+			if (enc && enc.field === field) {
 				if (enc.datatable.getFieldType(field) === DataType.Date && !("labelFormat" in args)) {
 					args.labelFormat = "%m/%d/%y";
 				}
@@ -9576,8 +9643,8 @@
 			let item = args.item? args.item : findItems(this, [{"field": field}])[0];
 			if (item === undefined) {
 				console.warn(Warnings.INCORRECT_AXIS_INFO + field);
+				return;
 			}
-
 			let layout = getClosestLayout(item);
 			if (!layout || (layout.type !== LayoutType.Grid && layout.type !== LayoutType.Stack)) return;
 
@@ -9623,7 +9690,7 @@
 				let p = c._item, found = false;
 				while (p.children && p.children.length > 0) {
 					for (let ic of p.children) {
-						if (ic.classId === item.classId) {
+						if (ic.classId === getEncodingKey(item).split("_")[0]) {
 							found = true;
 							axes.push(c);
 							break;
@@ -10639,7 +10706,7 @@
 					this._scale = d3__namespace.scaleOrdinal();
 					break;
 				case "ordinalColor":
-					this._scale = d3__namespace.scaleOrdinal(args && typeof(args) == "string"? d3__namespace[args] : d3__namespace.schemeCategory10);
+					this._scale = d3__namespace.scaleOrdinal(args? args.size ? d3__namespace[args.scheme][args.size] : d3__namespace[args.scheme] : d3__namespace.schemeCategory10);
 					break;
 				case "power":
 					this._scale = d3__namespace.scalePow().exponent(2);
@@ -11788,6 +11855,7 @@
 	        //let item = scene.getItem(enc.anyItem);
 	        let items = enc.items.map(d => scene.getItem(d));
 	        scene._doEncode(items, enc.args);
+	        scene._relayoutAncestors(items[0], items);
 	    }
 
 	    _createGuide(scene, guide) {
@@ -24040,8 +24108,13 @@
 		if (!item.children || item.children.length == 0) {
 			return item.contains(x, y) && item.type !== ItemType.Scene ? item : null
 		}
-		for (let i = item.children.length - 1; i >= 0; i--) {
-			let c = item.children[i];
+		let children = item.children;
+		if (item.type === ItemType.Scene) {
+			children = children.slice();
+			children.sort((a,b) => isGuide(a) ? 1 : isGuide(b) ? -1 : 0 );
+		}
+		for (let i = children.length - 1; i >= 0; i--) {
+			let c = children[i];
 			if (c.contains(x, y))
 				return c;
 		}
@@ -24059,7 +24132,13 @@
 	}
 
 	function canRepeat(compnt) {
-		if ((isMark(compnt) || compnt.type == ItemType.Glyph) && !compnt.dataScope) {
+		if (Array.isArray(compnt)) {
+			for (let c of compnt) {
+				if (!isMark(c) || c.dataScope)
+					return false;
+			}
+			return true;
+		} else if ((isMark(compnt) || compnt.type == ItemType.Glyph) && !compnt.dataScope) {
 			return true;
 		} else if (compnt.type == ItemType.Collection) {
 			//TODO: check if repeatable

package/package.json

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