mascot-vis 1.11.0 → 1.11.1

package/dist/mascot.js

@@ -1,5 +1,5 @@
 /* eslint-disable */
-// version: 1.11.0
+// version: 1.11.1
 (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){
@@ -4161,7 +4173,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");
@@ -7073,6 +7094,12 @@
 	        return false;
 	    }
 
+	    _doTranslate(dx, dy) {
+	        super._doTranslate(dx, dy);
+	        this._x += dx;
+	        this._y += dy;
+	    }
+
 	}
 
 	class Glyph extends Group {
@@ -7335,7 +7362,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 +7381,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,
@@ -9524,6 +9557,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
 		// }
@@ -10639,7 +10690,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);
@@ -24040,8 +24091,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;
 		}

package/package.json

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