@refinitiv-ui/efx-grid 6.0.32 → 6.0.34

package/lib/tr-grid-column-grouping/es6/ColumnGrouping.js

@@ -661,9 +661,10 @@ ColumnGroupingPlugin.prototype._spanGroupHorizontally = function (titleSection)
     }
   }
 };
-/** @private
+/** Render all column group headers without affecting cell spans.
+* @public
 */
-ColumnGroupingPlugin.prototype._renderGroups = function () {
+ColumnGroupingPlugin.prototype.renderGroups = function () {
   var hostCount = this._hosts.length;
   var groupMap = this._visibleGroupMap;
   for (var i = 0; i < hostCount; ++i) {
@@ -671,35 +672,42 @@ ColumnGroupingPlugin.prototype._renderGroups = function () {
     if (!section) {
       continue;
     }
-    var arg = {};
     for (var id in groupMap) {
-      var node = groupMap[id];
-      var colIndex = node["colIndex"];
-      if (colIndex == null) {
-        continue;
-      }
-      var rowIndex = node["onRow"];
-      var cell = section.getCell(colIndex, rowIndex);
-      if (cell) {
-        // Overide the defaults
-        cell.setStyle("text-align", node["alignment"] || "");
-        cell.setTooltip(ColumnGroupingPlugin._getTooltip(node));
-        cell.setContent(node["title"] || node["name"]);
+      this._renderGroup(groupMap[id], section);
+    }
+  }
+};
+/** Render single column group header without affecting cell span.
+* @private
+* @param {Object} groupDef
+* @param {Object} section
+*/
+ColumnGroupingPlugin.prototype._renderGroup = function (groupDef, section) {
+  var colIndex = groupDef["colIndex"];
+  if (colIndex == null) {
+    return;
+  }
+  var rowIndex = groupDef["onRow"];
+  var cell = section.getCell(colIndex, rowIndex);
+  if (cell) {
+    // Overide the defaults
+    cell.setStyle("text-align", groupDef["alignment"] || "");
+    cell.setTooltip(ColumnGroupingPlugin._getTooltip(groupDef));
+    cell.setContent(groupDef["name"] || groupDef["title"]);
 
-        // Additional cell settings must be removed in the _applyGrouping() method
-        cell.addClass("no-sort");
-        cell.setAttribute("group-id", node["id"]);
-        if (node["legacyRender"]) {
-          // Built-in version if render receive colIndex, cell, groupDefinition as arguments
-          node["legacyRender"](colIndex, cell, node);
-        }
-        if (node["render"]) {
-          arg["cell"] = cell;
-          arg["colIndex"] = colIndex;
-          arg["groupNode"] = node;
-          node["render"](arg);
-        }
-      }
+    // Additional cell settings must be removed in the _applyGrouping() method
+    cell.addClass("no-sort");
+    cell.setAttribute("group-id", groupDef["id"]);
+    if (groupDef["legacyRender"]) {
+      // Built-in version if render receive colIndex, cell, groupDefinition as arguments
+      groupDef["legacyRender"](colIndex, cell, groupDef);
+    }
+    if (groupDef["render"]) {
+      var arg = {};
+      arg["cell"] = cell;
+      arg["colIndex"] = colIndex;
+      arg["groupNode"] = groupDef;
+      groupDef["render"](arg);
     }
   }
 };
@@ -709,7 +717,7 @@ ColumnGroupingPlugin.prototype._renderGroups = function () {
 */
 ColumnGroupingPlugin.prototype._onPostSectionRender = function (e) {
   if (e.sectionType === "title" && !this._restructuring) {
-    this._renderGroups();
+    this.renderGroups();
   }
 };
 
@@ -1029,6 +1037,26 @@ ColumnGroupingPlugin.prototype.setGroupChildren = function (groupId, newChildLis
   }
   return false;
 };
+/** @public
+* @param {string} groupId
+* @param {string} groupName
+*/
+ColumnGroupingPlugin.prototype.setGroupName = function (groupId, groupName) {
+  if (this._groupDefs.setGroupName(groupId, groupName)) {
+    var groupDef = this._visibleGroupMap[groupId];
+    if (groupDef) {
+      groupDef.name = groupName;
+      var hostCount = this._hosts.length;
+      for (var i = 0; i < hostCount; ++i) {
+        var section = this._hosts[i].getSection("title");
+        if (!section) {
+          continue;
+        }
+        this._renderGroup(groupDef, section);
+      }
+    }
+  }
+};
 /** @private
 * @param {string} groupId
 * @return {!Array.<string>} The list of immediate valid child, including invisible child groups

package/lib/tr-grid-column-stack/es6/ColumnStack.d.ts

@@ -119,6 +119,8 @@ declare class ColumnStackPlugin extends GridPlugin {
 
     public getActiveColumnField(stackId: string): string;
 
+    public getActiveColumnIndex(stackId: string): number;
+
     public addStackChild(stackId: string, colRef: number|string|null): void;
 
     public removeStackChild(stackId: string, colRef: number|string|null): void;

package/lib/tr-grid-column-stack/es6/ColumnStack.js

@@ -1045,8 +1045,22 @@ ColumnStackPlugin.prototype.stackColumns = function(colRefs, stackId, options) {
 		stack.activeColumn = stack.stackRefs[stack.stackRefs.length - 1]; // Right most column is the active column
 	} else {
 		var csp = this._getPlugin("ColumnSelectionPlugin");
-		if(csp && csp.isEnabled()) {
-			csp.selectSingleColumn(activeIndex);
+		if(csp && csp.isEnabled()){
+			var stackSelection = false;
+			for(i = 0; i < len; ++i){
+				colIndex = colRefs[i];
+				if(colIndex === activeIndex){
+					continue;
+				}
+				if(csp.isSelectedColumn(colIndex)){
+					stackSelection = true;
+					break;
+				}
+			}
+			if(stackSelection) {
+				csp.selectSingleColumn(activeIndex);
+				csp.dispatchSelectionChanged();
+			}
 		}
 	}
 
@@ -1113,7 +1127,6 @@ ColumnStackPlugin.prototype.unstackColumns = function(colIndices) {
 	}
 
 	var dirty = false;
-	var selFrom, selLen;
 
 	for(var sid in stacks) {
 		var stack = this._stacks[sid];
@@ -1124,8 +1137,6 @@ ColumnStackPlugin.prototype.unstackColumns = function(colIndices) {
 
 		var stackRefs = stack.stackRefs;
 		len = stackRefs.length;
-		selFrom = this._getColumnIndex(stack.stackRefs[0]);
-		selLen = len - 1;
 
 		for(i = 0; i < len; ++i) {
 			var stackRef = stackRefs[i];
@@ -1140,10 +1151,6 @@ ColumnStackPlugin.prototype.unstackColumns = function(colIndices) {
 		delete this._stacks[sid]; // Remove all reference to the stack
 	}
 	if(dirty) {
-		var csp = this._getPlugin("ColumnSelectionPlugin");
-		if(csp && csp.isEnabled()) {
-			csp.selectRange(selFrom, selLen);
-		}
 		var cfp = this._getPlugin("ColumnFilterPlugin");
 		if(cfp) {
 			cfp["refresh"]();
@@ -1256,6 +1263,7 @@ ColumnStackPlugin.prototype.swapColumn = function(colRef, swappingIndex) {
 	var csp = this._getPlugin("ColumnSelectionPlugin");
 	if(csp && csp.isEnabled()) {
 		csp.selectSingleColumn(newActiveColumnIndex);
+		csp.dispatchSelectionChanged();
 	}
 	var cfp = this._getPlugin("ColumnFilterPlugin");
 	if(cfp) {
@@ -1306,16 +1314,7 @@ ColumnStackPlugin.prototype._onColumnRemoved = function (e) {
 					delete this._stacks[stackOpt.stackId];
 				}
 			} else {
-				if(stackOpt.spreading) {
-					stackOpt.activeColumn = stackOpt.stackRefs[stackOpt.stackRefs.length - 1];
-				} else {
-					stackOpt.activeColumn = stackOpt.stackRefs[0];
-				}
-
-				// TODO: Add a proper way to set visibility to activeColumn when activeColumn is changed
-				var activeColIndex = this._getColumnIndex(stackOpt.activeColumn);
-				this._setColumnVisibility(activeColIndex, true);
-				this._updateUI();
+				this._updateActiveColumn(stackOpt);
 			}
 		}
 	}
@@ -1513,6 +1512,7 @@ ColumnStackPlugin.prototype._onStackButtonClicked = function(e) {
 	pos["columnIndices"] = colIndices;
 	pos["activeColIndex"] = this._getColumnIndex(colData.activeColumn);
 	pos["event"] = e;
+	pos["stackId"] = colData.stackId;
 
 	elem.focus();
 	this._dispatch("clicked", pos);
@@ -1809,15 +1809,29 @@ ColumnStackPlugin.prototype.getStackName = function(stackId) {
 */
 ColumnStackPlugin.prototype.getActiveColumnField = function(stackId) {
 	var field  = "";
+	var activeColIndex = this.getActiveColumnIndex(stackId);
+	if(activeColIndex !== -1){
+		field = this._getField(activeColIndex);
+	}
+	return field;
+};
+
+/** @public
+* @description Get active column index of specific stack
+* @param {string} stackId
+* @return {number} active column index
+*/
+ColumnStackPlugin.prototype.getActiveColumnIndex = function(stackId) {
+	var activeColIndex  = -1;
 	if(stackId !== null) {
 		var stack = this._stacks[stackId];
 		if(stack){
-			var activeColIndex = this._getColumnIndex(stack.activeColumn);
-			field = this._getField(activeColIndex);
+			activeColIndex = this._getColumnIndex(stack.activeColumn);
 		}
 	}
-	return field;
+	return activeColIndex;
 };
+//getActiveColumnIndex
 
 /** @public
 * @param {string} stackId
@@ -1899,6 +1913,26 @@ ColumnStackPlugin.prototype._setStackVisibility = function(stackId, visible) {
 	}
 };
 
+/** @private
+* @description Check for active column in a stack if it needs an update.
+* @param {Object} stackOpt
+*/
+ColumnStackPlugin.prototype._updateActiveColumn = function(stackOpt) {
+	if(!stackOpt) { return; }
+
+	var stackRefs = stackOpt["stackRefs"];
+	if(!stackRefs || !stackRefs.length) { return; }
+
+	if(stackRefs.indexOf(stackOpt.activeColumn) === -1) {
+		stackOpt.activeColumn = stackOpt["spreading"] ? stackRefs[stackRefs.length - 1] : stackRefs[0];
+
+		// TODO: Add a proper way to set visibility to activeColumn when activeColumn is changed
+		var activeColIndex = this._getColumnIndex(stackOpt.activeColumn);
+		this._setColumnVisibility(activeColIndex, true);
+		this._updateUI();
+	}
+};
+
 /** @public
 * @description Hide specific stack from grid
 * @param {string} stackId

package/lib/tr-grid-conditional-coloring/es6/ConditionalColoring.d.ts

@@ -13,16 +13,16 @@ declare namespace ConditionalColoringPlugin {
 
     type ColumnOptions = {
         conditions?: (ConditionalColoringPlugin.Condition)[]|null,
-        colorText?: (string|boolean)|null,
-        tickColor?: (string|boolean)|null,
-        blinking?: (ConditionalColoringPlugin.Blinking|boolean)|null,
+        colorText?: (string|boolean|ConditionalColoringPlugin.ColorText)|null,
+        tickColor?: (string|boolean|ConditionalColoringPlugin.ColorText)|null,
+        blinking?: (string|boolean|ConditionalColoringPlugin.Blinking)|null,
         field?: string|null
     };
 
     type ConditionalColoringOptions = {
         conditions?: (ConditionalColoringPlugin.Condition)[]|null,
-        colorText?: (string|boolean)|null,
-        tickColor?: (string|boolean)|null,
+        colorText?: (string|boolean|ConditionalColoringPlugin.ColorText)|null,
+        tickColor?: (string|boolean|ConditionalColoringPlugin.ColorText)|null,
         field?: string|null
     };
 
@@ -41,6 +41,13 @@ declare namespace ConditionalColoringPlugin {
         level?: (string|boolean)|null
     };
 
+    type ColorText = {
+        field?: string|null,
+        upClass?: string|null,
+        downClass?: string|null,
+        levelClass?: string|null
+    };
+
 }
 
 declare class ConditionalColoringPlugin extends GridPlugin {

package/lib/tr-grid-conditional-coloring/es6/ConditionalColoring.js

@@ -13,17 +13,17 @@ import {ElfUtil} from '../../tr-grid-util/es6/ElfUtil.js';
 /** @typedef {Object} ConditionalColoringPlugin~ColumnOptions
 * @description Extension column options that can be specified on each individual grid's column option:
 * @property {Array.<ConditionalColoringPlugin~Condition>=} conditions=null List of condition options
-* @property {(string|boolean)=} colorText=null A shorthand for specifying default condition based on the field.
-* @property {(string|boolean)=} tickColor=null Alias of colorText.
-* @property {(ConditionalColoringPlugin~Blinking|boolean)=} blinking=null Blink Options. If specified, the cell will be blinked on data change.
+* @property {(string|boolean|ConditionalColoringPlugin~ColorText)=} colorText=null A shorthand for specifying default condition based on the field.
+* @property {(string|boolean|ConditionalColoringPlugin~ColorText)=} tickColor=null Alias of colorText.
+* @property {(string|boolean|ConditionalColoringPlugin~Blinking)=} blinking=null Blink Options. If specified, the cell will be blinked on data change.
 * @property {string=} field
 */
 
 /** @typedef {Object} ConditionalColoringPlugin~ConditionalColoringOptions
 * @description Extension column options that can be specified on each individual grid's column option:
 * @property {Array.<ConditionalColoringPlugin~Condition>=} conditions=null List of condition options
-* @property {(string|boolean)=} colorText=null A shorthand for specifying default condition based on the field.
-* @property {(string|boolean)=} tickColor=null Alias of colorText.
+* @property {(string|boolean|ConditionalColoringPlugin~ColorText)=} colorText=null A shorthand for specifying default condition based on the field.
+* @property {(string|boolean|ConditionalColoringPlugin~ColorText)=} tickColor=null Alias of colorText.
 * @property {string=} field
 */
 
@@ -45,6 +45,15 @@ import {ElfUtil} from '../../tr-grid-util/es6/ElfUtil.js';
 * @property {(string|boolean)=} level CSS color (e.g. #33333, grey). If false value is specified, blinking for level color is disabled.
 */
 
+/** @typedef {(string|boolean|Object)} ConditionalColoringPlugin~ColorText
+* @description Available options describing `colorText` object. Additionally if specify colorText as string of field, colorText will base on the field. <br>
+* If specified true, field from column definition will be used.
+* @property {string=} field If not specified, field from column definition will be used
+* @property {string=} upClass CSS class name.
+* @property {string=} downClass CSS class name.
+* @property {string=} levelClass CSS class name.
+*/
+
 var COLORING_TYPE = "coloring";
 var BLINKING_TYPE = "blinking";
 
@@ -89,6 +98,10 @@ ConditionalColoringPlugin._cleanUpTimer = 0;
 * @private
 */
 ConditionalColoringPlugin._controlClass = "predefined-conditional-color";
+/** @type {string}
+* @private
+*/
+ConditionalColoringPlugin._colorTextStyles;
 
 /** @type {boolean}
 * @private
@@ -103,6 +116,10 @@ ConditionalColoringPlugin.prototype._pendingFields;
 * @private
 */
 ConditionalColoringPlugin.prototype._predefinedColors = null;
+/** @type {string}
+* @private
+*/
+ConditionalColoringPlugin._predefinedColorsStyles;
 
 /** @override
 * @return {string}
@@ -136,7 +153,12 @@ ConditionalColoringPlugin.prototype.initialize = function (host, options) {
 	if (extOptions) {
 		var predefinedColors = extOptions["predefinedColors"];
 		if (predefinedColors != null && typeof predefinedColors === "object") {
-			this._injectStyles(predefinedColors);
+			if (!this._predefinedColors) {
+				this._predefinedColors = predefinedColors;
+				this._predefinedColorsStyles = this._prepareStyles(predefinedColors);
+			}
+
+			this._injectPredefinedColors(host);
 			host.enableClass(ConditionalColoringPlugin._controlClass);
 		}
 	}
@@ -145,6 +167,7 @@ ConditionalColoringPlugin.prototype.initialize = function (host, options) {
 		this.config(options);
 	} else {
 		this._applyStyle(host, options);
+		this._injectColorTextStyles();
 	}
 
 	host.listen("postSectionDataBinding", this._onSectionBinding);
@@ -455,7 +478,7 @@ ConditionalColoringPlugin.prototype._removeDataFields = function(fieldRef, colRe
 };
 
 /** @private
-* @param {(Object|number)=} colRef
+* @param {(string|number)=} colRef
 * @param {string} type
 */
 ConditionalColoringPlugin.prototype._removeFieldReferrer = function(colRef, type) {
@@ -464,8 +487,15 @@ ConditionalColoringPlugin.prototype._removeFieldReferrer = function(colRef, type
 	}
 	var referrer = null;
 	if (colRef != null) {
-		var colDef = typeof colRef === "object" ? colRef : this._realTimeGrid.getColumnDefinition(colRef);
-		referrer = colDef ? colDef.getId() + "_" + type : null;
+		var colId = colRef;
+		if (typeof colRef === "number") {
+			var colDef = this._realTimeGrid.getColumnDefinition(colRef);
+			if (colDef) {
+				colId = colDef.getId();
+			}
+		}
+
+		referrer = colId ? colId + "_" + type : null;
 		this._realTimeGrid.removeFieldReferrer(referrer);
 	}
 };
@@ -496,25 +526,16 @@ ConditionalColoringPlugin.prototype._removeFieldReferrer = function(colRef, type
 * };
 */
 ConditionalColoringPlugin.prototype.setColumnColoring = function (colIndex, columnOptions) {
-	// Save column config state
-	var colData = this._newColumnData(colIndex);
 	var blinkingOptions, field;
 	if(columnOptions) {
-		colData["conditions"] = columnOptions["conditions"];
-		colData["colorText"] = columnOptions["colorText"];
-		colData["tickColor"] = columnOptions["tickColor"];
-		colData["blinking"] = blinkingOptions = columnOptions["blinking"];
-		colData["field"] = field = columnOptions["field"];
-	} else {
-		colData["conditions"] = null;
-		colData["colorText"] = null;
-		colData["tickColor"] = null;
-		colData["blinking"] = null;
+		blinkingOptions = columnOptions["blinking"];
+		field = columnOptions["field"];
 	}
 
 	this.setColumnBlinking(colIndex, blinkingOptions, field);
 	this.setConditionalColoring(colIndex, columnOptions);
 
+	var colData = this._newColumnData(colIndex);
 	if (colData["painter"] && !(colData["coloringFields"] || colData["blinkingField"])) { // Clear existing painter
 		this._clearPainter(colData);
 	}
@@ -526,6 +547,17 @@ ConditionalColoringPlugin.prototype.setColumnColoring = function (colIndex, colu
 */
 ConditionalColoringPlugin.prototype.setConditionalColoring = function (colIndex, coloringOptions) {
 	var colData = this._newColumnData(colIndex);
+	if(coloringOptions) {
+		// Save column config state
+		colData["conditions"] = coloringOptions["conditions"];
+		colData["colorText"] = coloringOptions["colorText"];
+		colData["tickColor"] = coloringOptions["tickColor"];
+		colData["field"] = coloringOptions["field"];
+	} else {
+		colData["conditions"] = null;
+		colData["colorText"] = null;
+		colData["tickColor"] = null;
+	}
 	var painter = colData["painter"];
 	var prevFields = colData["coloringFields"] ? Object.keys(colData["coloringFields"]) : null;
 	var colorOptions = this._prepareColorOptions(colIndex, coloringOptions);
@@ -552,7 +584,28 @@ ConditionalColoringPlugin.prototype.setConditionalColoring = function (colIndex,
 			painter.setConditions(colorOptions.condColoring.conditions);
 		} else if(colorOptions.colorText) {
 			painter.resetColoring(); //Clear conditions before add new color
-			painter.addColorTextWithTheme(colorOptions.colorText.field);
+			var options = colorOptions.colorText;
+			if (options.useThemeColors) {
+				if (!ConditionalColoringPlugin._colorTextStyles) {
+					var styles = {
+						positive: {
+							color: "var(--color-scheme-positive)"
+						},
+						negative: {
+							color: "var(--color-scheme-negative)"
+						},
+						neutral: {
+							color: "var(--color-scheme-neutral)"
+						}
+					};
+
+					ConditionalColoringPlugin._colorTextStyles = this._prepareStyles(styles);
+				}
+				this._injectColorTextStyles();
+				painter.addColorTextWithTheme(colorOptions.colorText.field);
+			} else {
+				painter.addColorText(options.field, options.upClass, options.downClass, options.levelClass);
+			}
 		}
 
 		var fields = Object.keys(newFieldsMap);
@@ -777,12 +830,19 @@ ConditionalColoringPlugin.prototype._prepareColorOptions = function(colIndex, co
 		colorOptions.hasColor = 1;
 		colorOptions.fields = {};
 		colorOptions.colorText = {};
-
+		colorOptions.colorText.useThemeColors = true;
 		var type = typeof colorText;
 		if(type === "string") {
 			field = colorText;
 		} else if(type === "object") {
 			field = /** @type{string} */(colorText["field"]) || field;
+
+			if (colorText["upClass"] || colorText["downClass"] || colorText["levelClass"]) {
+				colorOptions.colorText.useThemeColors = false;
+				colorOptions.colorText.upClass = colorText["upClass"];
+				colorOptions.colorText.downClass = colorText["downClass"];
+				colorOptions.colorText.levelClass = colorText["levelClass"];
+			}
 		}
 		colorOptions.colorText.field = field;
 		colorOptions.fields[field] = true;
@@ -856,16 +916,17 @@ ConditionalColoringPlugin._mergeUpdates = function(e) {
 	return changedRows;
 };
 /** @private
-* @param {Object} predefinedColors Predefined color object map
+* @param {Object} colors Predefined color object map
+* @return {string} prettified CSS string
 */
-ConditionalColoringPlugin.prototype._injectStyles = function(predefinedColors) {
-	var prefix = ".tr-grid." + ConditionalColoringPlugin._controlClass + " .tr-lg .cell";
+ConditionalColoringPlugin.prototype._prepareStyles = function(colors) {
+	var prefix = ".tr-grid." + ConditionalColoringPlugin._controlClass + " .cell";
 	var css = [];
 	var ss, styles, value;
-	for (var className in predefinedColors) {
+	for (var className in colors) {
 		css.push(prefix + "." + className);
 		ss = [];
-		styles = predefinedColors[className];
+		styles = colors[className];
 
 		value = styles["backgroundColor"];
 		if(value) {
@@ -880,22 +941,46 @@ ConditionalColoringPlugin.prototype._injectStyles = function(predefinedColors) {
 		css.push(ss);
 	}
 
-	// TODO: support multitable
-	var host = this._hosts[0];
-
-	if(this._styleTag) {
-		this._styleTag.parentNode.removeChild(this._styleTag);
-		this._styleTag = null;
+	return prettifyCss(css);
+};
+/** @private
+*/
+ConditionalColoringPlugin.prototype._injectColorTextStyles = function() {
+	if (ConditionalColoringPlugin._colorTextStyles) {
+		var hosts = this._hosts;
+		var len = hosts.length;
+		for (var i = 0; i < len; i++) {
+			var host = hosts[i];
+			host.enableClass(ConditionalColoringPlugin._controlClass);
+			if (!host._colorTextStyles) {
+				injectCss(ConditionalColoringPlugin._colorTextStyles, host.getElement());
+				host._colorTextStyles = true;
+			}
+		}
 	}
-	this._styleTag = injectCss(prettifyCss(css), host.getElement());
-	this._predefinedColors = predefinedColors;
+};
+/** @private
+* @param {Object} host
+*/
+ConditionalColoringPlugin.prototype._injectPredefinedColors = function(host) {
+	if(host._conditionalColoringStyleTag) {
+		host._conditionalColoringStyleTag.parentNode.removeChild(host._conditionalColoringStyleTag);
+		host._conditionalColoringStyleTag = null;
+	}
+	host._conditionalColoringStyleTag =	injectCss(this._predefinedColorsStyles, host.getElement());
 };
 /** @public
 * @param {Object} predefinedColors Predefined color object map
 */
 ConditionalColoringPlugin.prototype.setPredefinedColors = function(predefinedColors) {
-	if(predefinedColors != null && typeof predefinedColors === "object") {
-		this._injectStyles(predefinedColors);
+	if (predefinedColors != null && typeof predefinedColors === "object") {
+		this._predefinedColors = predefinedColors;
+		this._predefinedColorsStyles = this._prepareStyles(predefinedColors);
+		var hosts = this._hosts;
+		var len = hosts.length;
+		for (var i = 0; i < len; i++) {
+			this._injectPredefinedColors(hosts[i]);
+		}
 	}
 };
 /** @private
@@ -1073,19 +1158,20 @@ ConditionalColoringPlugin.prototype._onColumnRemoved = function(e) {
 	this._clearPainter(colData);
 
 	// Removed column
-	var colDef = colData["COL_DEF"];
-	if (colDef) {
+	var colId = e["colId"];
+	if (colId) {
 		if (colData["coloringFields"]) {
-			this._removeFieldReferrer(colDef, COLORING_TYPE);
+			this._removeFieldReferrer(colId, COLORING_TYPE);
 		}
 		if (colData["blinkingField"]) {
-			this._removeFieldReferrer(colDef, BLINKING_TYPE);
+			this._removeFieldReferrer(colId, BLINKING_TYPE);
 		}
 	}
 
 	// Another columns
 	var field = colData["field"];
 	if (field) {
+		var colDef = colData["COL_DEF"];
 		var isStaticField = colDef ? !colDef.isRealTimeField() : true;
 		if (isStaticField) {
 			var colCount = this.getColumnCount();

package/lib/tr-grid-heat-map/es6/HeatMap.d.ts

@@ -7,12 +7,12 @@ declare namespace HeatMapPlugin {
 
     type ColumnOptions = {
         field: string,
-        heatMap?: HeatMapPlugin.Heatmap
+        heatMap?: HeatMapPlugin.Heatmap|null
     };
 
     type Heatmap = {
-        midPoint?: number,
-        mode?: string
+        midPoint?: number|null,
+        mode?: string|null
     };
 
 }

package/lib/tr-grid-heat-map/es6/HeatMap.js

@@ -144,14 +144,25 @@ HeatMapPlugin.prototype.getConfigObject = function (out_obj) {
 			col = columns[i] = {};
 		}
 
-		var heatMap = col.heatMap = {};
 
 		var opt = this.getColumnHeatMap(i);
 
-		if (!opt) { continue; }
+		if (!opt) { // We are only interested in the columns that have heat map informations
+			continue;
+		}
+
+		// default value of midPoint and mode
+		if(opt.midPoint === 0 && opt.mode === "cell") {
+			col.heatMap = true;
+			continue;
+		}
+
+		var heatMap = col.heatMap = {};
+
 		if (opt.midPoint != null) {
 			heatMap.midPoint = opt.midPoint;
 		}
+
 		if (opt.mode != null) {
 			heatMap.mode = opt.mode;
 		}

package/lib/tr-grid-row-dragging/es6/RowDragging.d.ts

@@ -18,7 +18,8 @@ declare namespace RowDraggingPlugin {
         dragStart?: ((...params: any[]) => any)|null,
         drag?: ((...params: any[]) => any)|null,
         dragEnd?: ((...params: any[]) => any)|null,
-        dataMoved?: ((...params: any[]) => any)|null
+        dataMoved?: ((...params: any[]) => any)|null,
+        beforeDataMoved?: ((...params: any[]) => any)|null
     };
 
 }