@refinitiv-ui/efx-grid 6.0.64 → 6.0.66

package/lib/rt-grid/es6/ColumnDefinition.d.ts

@@ -54,8 +54,6 @@ declare class ColumnDefinition {
 
     public dispose(): void;
 
-    public _initializeTimeSeriesChild(columnOption?: ColumnDefinition.Options|string|null): void;
-
     public initialize(columnOption?: ColumnDefinition.Options|null): void;
 
     public getId(): string;

package/lib/rt-grid/es6/ColumnDefinition.js

@@ -276,7 +276,7 @@ ColumnDefinition.prototype.dispose = function() {
 	// TODO: Remove any related reference from this._fnEngine
 };
 
-/** @public
+/** @private
 * @param {ColumnDefinition~Options|string=} columnOption
 */
 ColumnDefinition.prototype._initializeTimeSeriesChild = function(columnOption) {

package/lib/rt-grid/es6/Grid.d.ts

@@ -179,8 +179,6 @@ declare class Grid extends EventDispatcher {
 
     public setColumnSorter(colRef: Grid.ColumnReference|null, func?: ColumnDefinition.SortLogic|null): void;
 
-    public _initDuplicateRicData(rowDef: RowDefinition|null): void;
-
     public insertRow(rowOption?: (RowDefinition.Options|string)|null, rowRef?: Grid.RowReference|null): RowDefinition|null;
 
     public insertRows(rowOptions: (RowDefinition.Options|string)[]|null, rowRef?: Grid.RowReference|null, opt_fields?: (string)[]|null): void;

package/lib/rt-grid/es6/Grid.js

@@ -1544,7 +1544,7 @@ Grid.prototype.replaceColumn = function (columnOption, colRef) {
 		colConfig["minWidth"] = value;
 	}
 
-	value = core.isColumnVisible(colIndex);
+	value = core.getColumnVisibility(colIndex, 0); // flag 0 means get only core api hidden state
 	if(!value) {
 		colConfig["hidden"] = true;
 	}
@@ -2284,7 +2284,7 @@ Grid.prototype.setColumnSorter = function(colRef, func) {
 
 
 /** Initialize data for the given rowDef from another rowDef with the same RIC
-* @public
+* @private
 * @param {RowDefinition} rowDef
 */
 Grid.prototype._initDuplicateRicData = function(rowDef) {

package/lib/tr-grid-column-formatting/es6/ColumnFormatting.js

@@ -557,7 +557,7 @@ ColumnFormattingPlugin.prototype.getColumnAlignment = function(colIndex) {
 	}
 	return "default";
 };
-/** Return true if at lease one column is hidden
+/** Return true if at lease one column is hidden. If grid contains only columns hidden by stacking this will return false
 * @public
 * @return {boolean}
 */
@@ -570,7 +570,7 @@ ColumnFormattingPlugin.prototype.hasHiddenColumn = function() {
 	}
 	return false;
 };
-/** Check if the specified column is hidden
+/** Check if the specified column is hidden. Column hidden by stacking is not considered as hidden column.
 * @public
 * @param {number} colIndex
 * @return {boolean}
@@ -578,7 +578,8 @@ ColumnFormattingPlugin.prototype.hasHiddenColumn = function() {
 ColumnFormattingPlugin.prototype.isColumnHidden = function(colIndex) {
 	var grid = this._hosts[0];
 	if(grid) {
-		return !grid.isColumnVisible(colIndex);
+		var visible = grid.getColumnVisibility(colIndex, 0);
+		return !visible;
 	}
 	return false;
 };

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

@@ -142,7 +142,7 @@ declare class ColumnStackPlugin extends GridPlugin {
 
     public moveColumnById(srcCol: number|string|null, destCol?: (number|string)|null): boolean;
 
-    public hideStack(stackId: string): void;
+    public hideStack(stackId: string, hidden?: boolean|null): void;
 
     public showStack(stackId: string): void;
 

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

@@ -129,10 +129,12 @@ var ColumnStackPlugin = function () {
 	this._onStackButtonClicked = this._onStackButtonClicked.bind(this);
 	this._updateUI = this._updateUI.bind(this);
 	this._toColumnId = this._toColumnId.bind(this);
+	this._requestFilterRefresh = this._requestFilterRefresh.bind(this);
 
 	this._hosts = [];
 	this._groupDefs = new GroupDefinitions();
 
+	this._filterConflator = new Conflator(50, this._requestFilterRefresh);
 	this._conflator = new Conflator(50, this._updateUI);
 };
 
@@ -275,6 +277,7 @@ ColumnStackPlugin.prototype.unload = function (host) {
 
 	if(this._hosts.length <= 0) {
 		this._conflator.reset();
+		this._filterConflator.reset();
 		this._groupDefs.removeAllGroups();
 	}
 	this._dispose();
@@ -537,11 +540,26 @@ ColumnStackPlugin.prototype._hideStackedColumns = function(stack, colRefs, activ
 */
 ColumnStackPlugin.prototype._setColumnVisibility = function(colIndex, shown) {
 	if(colIndex >= 0) {
+		var dirty = false;
 		for(var g = this._hosts.length; --g >= 0;) {
-			this._hosts[g].setColumnVisibility(colIndex, shown, 2);
+			dirty |= this._hosts[g].setColumnVisibility(colIndex, shown, 2);
+		}
+
+		if(dirty){
+			this._requestFilterRefresh();
 		}
 	}
 };
+/** @private */
+ColumnStackPlugin.prototype._requestFilterRefresh = function() {
+	if(this._filterConflator.conflate()) {
+		return;
+	}
+	var rfp = this._getPlugin("RowFilteringPlugin");
+	if(rfp && rfp["refresh"]) {
+		rfp["refresh"]();
+	}
+};
 /** @private
 * @param {Array} colRefs Array of column index, id, or field
 */
@@ -1042,10 +1060,6 @@ ColumnStackPlugin.prototype.stackColumns = function(colRefs, stackId, options) {
 
 	this._groupDefs.setGroup(sid, stack);
 
-	var cfp = this._getPlugin("ColumnFilterPlugin");
-	if(cfp) {
-		cfp["refresh"]();
-	}
 	this._updateUI(); // asyncronuos
 	return true;
 };
@@ -1205,10 +1219,6 @@ ColumnStackPlugin.prototype.unstackColumns = function(colIndices) {
 		}
 	}
 	if(dirty) {
-		var cfp = this._getPlugin("ColumnFilterPlugin");
-		if(cfp) {
-			cfp["refresh"]();
-		}
 		this._updateUI(); // asyncronuos
 	}
 
@@ -1345,10 +1355,6 @@ ColumnStackPlugin.prototype._setActiveColumn = function(stack, newActiveColumn)
 			csp.dispatchSelectionChanged();
 		}
 	}
-	var cfp = this._getPlugin("ColumnFilterPlugin");
-	if(cfp) {
-		cfp["refresh"]();
-	}
 	return true;
 };
 
@@ -1975,29 +1981,6 @@ ColumnStackPlugin.prototype.moveColumnById = function(srcCol, destCol) {
 	return this._moveColumnById(srcCol, destCol);
 };
 
-/** @private
-* @description Set stack visibility to the specific stack
-* @param {string} stackId
-* @param {boolean} visible
-*/
-ColumnStackPlugin.prototype._setStackVisibility = function(stackId, visible) {
-	var stackOption = this._groupDefs.getGroup(stackId);
-	if(!stackOption){
-		return;
-	}
-
-	if(stackOption.spreading && !stackOption.collapsed){
-		var children = stackOption.children;
-		for(var i = 0; i < children.length; i++){
-			this._setColumnVisibility(this.getColumnIndex(children[i]), visible);
-		}
-	} else {
-		var activeColIndex = this.getColumnIndex(stackOption.activeColumn);
-		this._setColumnVisibility(activeColIndex, visible);
-	}
-};
-
-
 /** @private
 * @description Check for active column in a stack if it needs an update.
 * @param {Object} stackOpt
@@ -2016,12 +1999,26 @@ ColumnStackPlugin.prototype._updateActiveColumn = function(stackOpt) {
 /** @public
 * @description Hide specific stack from grid
 * @param {string} stackId
+* @param {boolean=} hidden
 */
-ColumnStackPlugin.prototype.hideStack = function(stackId) {
+ColumnStackPlugin.prototype.hideStack = function(stackId, hidden) {
 	if(!stackId){
 		return;
 	}
-	this._setStackVisibility(stackId, false);
+	var stackOption = this._groupDefs.getGroup(stackId);
+	if(!stackOption){
+		return;
+	}
+
+	if(hidden == null){
+		hidden = true;
+	}
+	var children = stackOption.children;
+	for(var i = 0; i < children.length; i++){
+		for(var g = this._hosts.length; --g >= 0;) {
+			this._hosts[g].hideColumn(this.getColumnIndex(children[i]), hidden);
+		}
+	}
 };
 
 /** @public
@@ -2032,7 +2029,7 @@ ColumnStackPlugin.prototype.showStack = function(stackId) {
 	if(!stackId){
 		return;
 	}
-	this._setStackVisibility(stackId, true);
+	this.hideStack(stackId, false);
 };
 
 /** @public

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

@@ -8,7 +8,8 @@ import {ElfUtil} from '../../tr-grid-util/es6/ElfUtil.js';
 declare namespace ConditionalColoringPlugin {
 
     type Options = {
-        predefinedColors?: any
+        predefinedColors?: any,
+        blinkingDuration?: number|null
     };
 
     type ColumnOptions = {
@@ -27,10 +28,11 @@ declare namespace ConditionalColoringPlugin {
     };
 
     type Condition = {
-        expression?: (string|((...params: any[]) => any))|null,
+        expression?: (string|((...params: any[]) => any)|any[])|null,
         backgroundColor?: string|null,
         color?: string|null,
-        cssClass?: string|null
+        cssClass?: string|null,
+        field?: string|null
     };
 
     type Blinking = {
@@ -38,7 +40,8 @@ declare namespace ConditionalColoringPlugin {
         field?: string|null,
         up?: string|null,
         down?: string|null,
-        level?: (string|boolean)|null
+        level?: (string|boolean)|null,
+        duration?: number|null
     };
 
     type ColorText = {
@@ -70,7 +73,7 @@ declare class ConditionalColoringPlugin extends GridPlugin {
 
     public setColumnColoring(colIndex: number, columnOptions?: (ConditionalColoringPlugin.ColumnOptions|null)|null): void;
 
-    public setConditionalColoring(colIndex: number, coloringOptions?: (ConditionalColoringPlugin.ConditionalColoringOptions|null)|null): void;
+    public setConditionalColoring(colIndex: number, coloringOptions?: ConditionalColoringPlugin.ConditionalColoringOptions|null): void;
 
     public setColumnBlinking(colIndex: number, blinkingOptions?: (boolean|ConditionalColoringPlugin.Blinking)|null, field?: string|null): void;
 

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

@@ -8,31 +8,49 @@ import {ElfUtil} from '../../tr-grid-util/es6/ElfUtil.js';
 /** @typedef {Object} ConditionalColoringPlugin~Options
 * @description The options can be specified by `conditionalColoring` property of the main grid's options
 * @property {Object=} predefinedColors Predefined color object map for conditional coloring
+* @property {number=} blinkingDuration=250 Blinking  duration in milliseconds
 */
 
 /** @typedef {Object} ConditionalColoringPlugin~ColumnOptions
-* @description Extension column options that can be specified on each individual grid's column option:
+* @description Extension column options that can be specified on each Grid column configuration object
 * @property {Array.<ConditionalColoringPlugin~Condition>=} conditions=null List of condition options
 * @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
+* @property {string=} field Field for Grid column configuration object
 */
 
 /** @typedef {Object} ConditionalColoringPlugin~ConditionalColoringOptions
-* @description Extension column options that can be specified on each individual grid's column option:
+* @description Available options for changing conditional coloring at runtime
 * @property {Array.<ConditionalColoringPlugin~Condition>=} conditions=null List of condition options
 * @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
+* @property {(string|boolean|ConditionalColoringPlugin~ColorText)=} tickColor=null Alias of colorText
+* @property {string=} field Field to be used for all conditions, overriding the field defined in ColumnOptions
 */
 
 /** @typedef {Object} ConditionalColoringPlugin~Condition
-* @description Available options describing `condition` object
-* @property {(string|Function)=} expression Expression could be `[FIELD_1] > 0`
+* @description Properties defining colors and conditioning
+* @property {(string|Function|Array)=} expression The expression can be in the following forms: text, function, and 2 dimentional array
 * @property {string=} backgroundColor="" CSS color (e.g. #ffffff, black)
 * @property {string=} color CSS="" color (e.g. #000000, white)
 * @property {string=} cssClass cssClass="" Predefined color class name
+* @property {string=} field Field to be used for this specific condition, overriding the field defined in ConditionalColoringOptions
+* @example
+* var conditions1 = [ // Add cssClass for any value that is greater than or equal to 10, and less than or equal to 20
+*   {expression: [["GTE", 10, "AND"], ["LTE", 20]], cssClass: "predefinedColors"}
+* ];
+* var conditions2 = [ // Add background color for any fieldA value that is not blank value (e.g., null, undefined, 0, false, empty string)
+*   {
+*     expression: function(rowData) {
+*       return rowData["fieldA"] ? true : false;
+*     },
+*     backgroundColor: "blue",
+*     field: "fieldA"
+*   }
+* ];
+* var conditions3 = [ // Add text color for any fieldA value that is not equal to 10
+*   {expression: "[fieldA] != 10", color: "red"}
+* ];
 */
 
 /** @typedef {(string|boolean|Object)} ConditionalColoringPlugin~Blinking
@@ -43,6 +61,7 @@ import {ElfUtil} from '../../tr-grid-util/es6/ElfUtil.js';
 * @property {string=} up CSS color (e.g. #00ff00, green)
 * @property {string=} down CSS color (e.g. #ff0000, red)
 * @property {(string|boolean)=} level CSS color (e.g. #33333, grey). If false value is specified, blinking for level color is disabled.
+* @property {number=} duration If specified, this will override blinking duration from extension option. Blinking duration in milliseconds
 */
 
 /** @typedef {(string|boolean|Object)} ConditionalColoringPlugin~ColorText
@@ -126,6 +145,10 @@ ConditionalColoringPlugin.prototype._pendingFields;
 * @private
 */
 ConditionalColoringPlugin.prototype._predefinedColors = null;
+/** @type {number}
+* @private
+*/
+ConditionalColoringPlugin.prototype._blinkingDuration = 250;
 /** @type {string}
 * @private
 */
@@ -171,6 +194,10 @@ ConditionalColoringPlugin.prototype.initialize = function (host, options) {
 			this._injectPredefinedColors(host);
 			host.enableClass(ConditionalColoringPlugin._controlClass);
 		}
+		var blinkingDuration = extOptions["blinkingDuration"];
+		if(blinkingDuration != null  && typeof blinkingDuration === "number"){
+			this._blinkingDuration = blinkingDuration;
+		}
 	}
 
 	if(hosts.length === 1) {
@@ -303,15 +330,24 @@ ConditionalColoringPlugin.prototype.getColumnColoring = function(colIndex, optio
 	if (Array.isArray(conditions) && conditions.length > 0) {
 		options.conditions = [];
 
+		var returnedFields = [
+			"expression",
+			"backgroundColor",
+			"color",
+			"cssClass",
+			"field"
+		];
 		var count = conditions.length;
 		for (var n = 0; n < count; n++) {
 			var exCondition = {};
-			extendObject(exCondition, conditions[n], [
-				"expression",
-				"backgroundColor",
-				"color",
-				"cssClass"
-			]);
+			var cond = conditions[n];
+			extendObject(exCondition, cond, returnedFields);
+			if(typeof exCondition["expression"] === "function") {
+				var origExp = cond["origExpression"];
+				if(origExp) {
+					exCondition["expression"] = origExp;
+				}
+			}
 
 			options.conditions.push(exCondition);
 		}
@@ -555,18 +591,18 @@ ConditionalColoringPlugin.prototype.setColumnColoring = function (colIndex, colu
 
 /** @public
 * @param {number} colIndex
-* @param {(ConditionalColoringPlugin~ConditionalColoringOptions|null)=} coloringOptions
+* @param {ConditionalColoringPlugin~ConditionalColoringOptions=} coloringOptions
 */
 ConditionalColoringPlugin.prototype.setConditionalColoring = function (colIndex, coloringOptions) {
 	var colData = this._newColumnData(colIndex);
+
+	colData["conditions"] = null; // WARNING: This clears existing user states
 	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;
 	}
@@ -583,6 +619,7 @@ ConditionalColoringPlugin.prototype.setConditionalColoring = function (colIndex,
 	}
 
 	if(colorOptions.hasColor) { // Set new coloring
+		colData["conditions"] = coloringOptions["conditions"]; // WARNING: This stores user object
 		var newFieldsMap = colorOptions.fields;
 		if (!painter) {
 			painter = colData["painter"] = new CellPainter();
@@ -685,6 +722,8 @@ ConditionalColoringPlugin.prototype.setColumnBlinking = function (colIndex, blin
 				this._removeDataFields(prevField, colIndex, BLINKING_TYPE);
 			}
 		}
+		var blinkDuration = bOptions.duration || this._blinkingDuration;
+		painter.setBlinkingDuration(blinkDuration);
 		painter.disableLevelColor(bOptions.level === false);
 		if (bOptions.customColor) {
 			painter.addBlink(newBlinkingField, bOptions.up, bOptions.down, bOptions.level, bOptions.border);
@@ -774,6 +813,7 @@ ConditionalColoringPlugin.prototype._prepareBlinkingOptions = function (colIndex
 	} else if(typeof blinkingOptions === "object") {
 		blinkField = /** @type{string} */(blinkingOptions["field"]) || field;
 		bOptions.border = blinkingOptions["border"];
+		bOptions.duration = blinkingOptions["duration"];
 		if (blinkingOptions["up"] || blinkingOptions["down"] || blinkingOptions["level"]) {
 			bOptions.customColor = true;
 			bOptions.up = blinkingOptions["up"];
@@ -784,52 +824,81 @@ ConditionalColoringPlugin.prototype._prepareBlinkingOptions = function (colIndex
 			bOptions.level = false;
 		}
 	}
-
 	bOptions.field = ConditionalColoringPlugin._convertKeyword(blinkField, field);
 	bOptions.inputField = blinkField;
 	return bOptions;
 };
 
+/** @private
+* @param {Object} obj
+* @param {Array|string} entries
+*/
+var _addMapEntries = function(obj, entries) {
+	if(entries) {
+		if(Array.isArray(entries)) {
+			var len = entries.length;
+			for(var i = 0; i < len; ++i) {
+				obj[entries[i]] = true;
+			}
+		} else {
+			obj[entries] = true;
+		}
+	}
+};
 /** @private
 * @param {number} colIndex
 * @param {ConditionalColoringPlugin~ColumnOptions} columnOptions
 * @return {!Object}
 */
 ConditionalColoringPlugin.prototype._prepareColorOptions = function(colIndex, columnOptions) {
-	var colorOptions = {};
 	if(!columnOptions) {
-		return colorOptions;
+		return {};
 	}
 	var colField = this._getField(colIndex);
-	var field = /** @type{string} */(columnOptions["field"]) || colField;
 	var inputField = columnOptions["inputField"] || ""; // The value is from user so it can be "THIS_COLUMN" or null
-	colorOptions["inputField"] = inputField; // Used to retain state on Column Format Dialog
-	field = ConditionalColoringPlugin._convertKeyword(inputField, field);
+	var field = ConditionalColoringPlugin._convertKeyword(inputField, colField);
+	if(columnOptions["field"]) {
+		field = /** @type{string} */(columnOptions["field"]);
+	}
+
+	var hasColor = 0;
+	var fieldMap = {};
 
 	// Check if there is another type of coloring
-	// "colorText" option has more priority than "tickColor"
 	var colorText = columnOptions["colorText"] || columnOptions["tickColor"];
 	var conditions = columnOptions["conditions"];
 	var conditionCount = conditions ? conditions.length : 0;
+	var colorOptions = {};
 	if(conditionCount) {
-		colorOptions.hasColor = 1;
-		colorOptions.fields = {};
 		colorOptions.condColoring = {};
 		colorOptions.condColoring.conditions = conditions;
 
-		var formatter = (field == colField) ? columnOptions["textFormatter"] : null;
+		var formatter = (field == colField) ? columnOptions["textFormatter"] : null; // TODO: This text formatter is not used or defined any where
 		var builder = ConditionalColoringPlugin.getFilterBuilder();
 
-		// WARNING: Builder has to have field first
-		builder.setFieldDefinition(field, formatter, field);
-
 		for(var i = conditionCount; --i >= 0;) {
 			var cond = conditions[i];
-			var exp = cond["expression"];
-			if(!exp && field) { // Build Expression from condition
-				var oper = cond["condition"];
+			var exp = cond ? cond["expression"] : null;
+			if(Array.isArray(exp)) {
+				var fieldPerCon = cond["field"] || field;
+				cond["expression"] = builder.parse(exp, fieldPerCon, null, fieldPerCon); // WARNING: This alters user object
+				if(cond["expression"]) {
+					cond["origExpression"] = exp;
+					hasColor = 1;
+					fieldMap[fieldPerCon] = true;
+				}
+			} else if(typeof exp === "function") {
+				hasColor = 1;
+				_addMapEntries(fieldMap, cond["fields"] || cond["field"]);
+			} else if(typeof exp === "string") {
+				hasColor = 1;
+				_addMapEntries(fieldMap, _getFieldsFromExpression(exp));
+			} else if(field && cond["condition"]) {
+				hasColor = 1;
+				builder.setFieldDefinition(field, formatter, field); // TODO: Each condition could have different fields
+				var oper = cond["condition"]; // WARNING: This condition is used by Format dialog. It's undocumented
 				var value1 = cond["value1"];
-				var value2 = cond["value1"];
+				var value2 = cond["value2"];
 
 				if(oper !== "BTW") {
 					builder.addCondition(oper, value1);
@@ -837,26 +906,16 @@ ConditionalColoringPlugin.prototype._prepareColorOptions = function(colIndex, co
 					builder.addCondition("GTE", value1);
 					builder.addCondition("LTE", value2);
 				}
-				exp = builder.buildFilter();
-				cond["expression"] = exp;
-				colorOptions.fields[field] = true;
-			} else {
-				// Get fields from expression string
-				var expFields = _getFieldsFromExpression(exp);
-				for(var n = 0; n < expFields.length; n++) {
-					colorOptions.fields[expFields[n]] = true;
-				}
+				cond["expression"] = builder.buildFilter();
+				fieldMap[field] = true;
 			}
 		}
 	} else if(colorText) {
-		colorOptions.hasColor = 1;
-		colorOptions.fields = {};
 		colorOptions.colorText = {};
 		colorOptions.colorText.useThemeColors = true;
-		var type = typeof colorText;
-		if(type === "string") {
+		if(typeof colorText === "string") {
 			field = colorText;
-		} else if(type === "object") {
+		} else if(typeof colorText === "object") {
 			field = /** @type{string} */(colorText["field"]) || field;
 
 			if (colorText["upClass"] || colorText["downClass"] || colorText["levelClass"]) {
@@ -866,11 +925,22 @@ ConditionalColoringPlugin.prototype._prepareColorOptions = function(colIndex, co
 				colorOptions.colorText.levelClass = colorText["levelClass"];
 			}
 		}
-		colorOptions.colorText.field = field;
-		colorOptions.fields[field] = true;
+
+		if(field) {
+			colorOptions.colorText.field = field;
+			hasColor = 1;
+			fieldMap[field] = true;
+		}
+	}
+
+	if(hasColor) {
+		colorOptions.hasColor = 1;
+		colorOptions.fields = fieldMap;
+		colorOptions["inputField"] = inputField; // Used to retain state on Column Format Dialog
+		return colorOptions;
 	}
 
-	return colorOptions;
+	return {};
 };
 /** @private
 * @function
@@ -881,7 +951,7 @@ ConditionalColoringPlugin.prototype._prepareColorOptions = function(colIndex, co
 ConditionalColoringPlugin._convertKeyword = function(userInput, fallback) {
 	if(userInput) {
 		// Note that THIS_COLUMN is a special keyword that needs to be converted before usage
-		return userInput.indexOf("THIS_COLUMN") > -1 ? fallback : userInput;
+		return userInput.indexOf("THIS_COLUMN") < 0 ? userInput : fallback;
 	}
 	return fallback;
 };

package/lib/tr-grid-row-filtering/es6/RowFiltering.js

@@ -1301,38 +1301,23 @@ RowFilteringPlugin.prototype._setTimerForUpdatingIcons = function () {
 
 RowFilteringPlugin.prototype.refresh = function () {
   this._dvTimerId = 0;
+  this._activeColFilters = this._columnFilters; //check cstp
 
-  var cstkp = this._getPlugin("ColumnStackingPlugin");
+  var cstkp = this._getPlugin("ColumnStackPlugin");
 
-  this._activeColFilters = this._columnFilters;
-
-  if (cstkp && this._activeColFilters.length) {
+  if (cstkp) {
     var colIndex, cfo;
+    var host = this._hosts[0];
 
     var colCount = this._getColumnCount();
 
-    var hasInactiveColumn = false;
+    this._activeColFilters = [];
 
     for (colIndex = 0; colIndex < colCount; ++colIndex) {
       cfo = this._getColumnFilterOption(colIndex);
 
-      if (cfo) {
-        if (cstkp.isInactiveStackedColumn(colIndex)) {
-          hasInactiveColumn = true;
-          break;
-        }
-      }
-    }
-
-    if (hasInactiveColumn) {
-      this._activeColFilters = [];
-
-      for (colIndex = 0; colIndex < colCount; ++colIndex) {
-        cfo = this._getColumnFilterOption(colIndex);
-
-        if (cfo && !cstkp.isInactiveStackedColumn(colIndex)) {
-          this._activeColFilters.push(cfo);
-        }
+      if (cfo && host.getColumnVisibility(colIndex, 2)) {
+        this._activeColFilters.push(cfo);
       }
     }
   }

package/lib/tr-grid-util/es6/CellPainter.d.ts

@@ -12,8 +12,8 @@ declare namespace CellPainter {
     };
 
     type Condition = {
-        field: string,
-        expression: CellPainter.Expression|string|null,
+        expression: string|((...params: any[]) => any)|null,
+        field?: string|null,
         backgroundColor?: string|null,
         color?: string|null,
         fontSize?: string|null,
@@ -136,6 +136,8 @@ declare class CellPainter {
 
     public disableLevelColor(disabled?: boolean|null): void;
 
+    public setBlinkingDuration(duration: number): void;
+
 }
 
 export default CellPainter;