@refinitiv-ui/efx-grid 6.0.65 → 6.0.67

package/lib/core/es6/data/DataView.d.ts

@@ -278,6 +278,8 @@ declare class DataView extends EventDispatcher {
 
     public enableEmptySegmentFiltering(enabled?: boolean|null): void;
 
+    public enableSeparatorFiltering(enabled?: boolean|null): void;
+
     public setSegmentClassification(segmentRef: string|number|null, fields: string|(string)[]|null): boolean;
 
     public getWrapSize(): number;

package/lib/core/es6/data/DataView.js

@@ -131,6 +131,10 @@ DataView.prototype._excludedRids = null;
 * @type {boolean}
 */
 DataView.prototype._emptySegmentFiltering = false;
+/** @private
+* @type {boolean}
+*/
+DataView.prototype._separatorFiltering = false;
 
 /** @private
 * @type {Object.<string, number>}
@@ -2566,7 +2570,7 @@ DataView.prototype.sortSeparators = function (sortLogics, sortOrders, cids) {
 DataView.prototype.sortSegments = function (compare) {
 	this._dt.sortSegments(compare);
 };
-/** Automatically hide empty segment when all of its member are filtered out. An empty segment will not be hidden, if there is no active filter. Collapsed segment does not count as filtering.
+/** Automatically hide empty segment when all of its member are filtered out. An empty segment will NOT be hidden, if there is no active filter. Collapsed segment does not count as filtering. A segment with no child is treated the same way as an empty segment.
 * @public
 * @param {boolean=} enabled
 */
@@ -2579,6 +2583,19 @@ DataView.prototype.enableEmptySegmentFiltering = function (enabled) {
 		}
 	}
 };
+/** Allow filtering of segment separators as if they were normal rows. Note that even if a separator row is filtered out, its child row may remain in the view and not be filtered out.
+* @public
+* @param {boolean=} enabled
+*/
+DataView.prototype.enableSeparatorFiltering = function (enabled) {
+	enabled = enabled !== false;
+	if(this._separatorFiltering !== enabled) {
+		this._separatorFiltering = enabled;
+		if(this._userFilter) {
+			this._refreshAndNotify();
+		}
+	}
+};
 /**
 * @public
 * @param {string|number} segmentRef Row id or row index
@@ -2746,14 +2763,19 @@ DataView.prototype._updateRowIds = function(opt_rowIds) {
 
 	// Segment separators should not be filtered out (hidden)
 	var segments = this._dt._getSegmentSeparators();
-	var filterExceptions = segments ? segments.getSegments() : null;
-	var userRemoval = this._getRemovalMap(this._excludedRids, this._userFilter, this._filteringOut, filterExceptions);
+	var segmentIds = segments ? segments.getSegments() : null;
+	var userRemoval = this._getRemovalMap(
+		this._excludedRids,
+		this._userFilter,
+		this._filteringOut,
+		this._separatorFiltering ? null : segmentIds
+	);
 	exclusionCount += userRemoval;
 
 	this._collapsedRids = null;
 	if(segments) {
 		if(userRemoval && this._emptySegmentFiltering) {
-			exclusionCount += this._getEmptySegments(this._excludedRids, filterExceptions);
+			exclusionCount += this._getEmptySegments(this._excludedRids, segmentIds);
 		}
 		this._collapsedRids = segments.getCollapsedRows();
 		 // Children of collapsed segments must be filtered out (hidden)

package/lib/core/es6/grid/Core.js

@@ -562,7 +562,7 @@ Core.prototype._batches = null;
 * @return {string}
 */
 Core.getVersion = function () {
-	return "5.1.75";
+	return "5.1.77";
 };
 /** {@link ElementWrapper#dispose}
 * @override
@@ -4482,6 +4482,10 @@ Core.prototype.startBatch = function (batchType) {
 		this._batches = {};
 	}
 	this._batches[batchType] = batchType;
+	// The "columnVisibilityChanged" event is blocked while the "reset" batch operation is in progress, so this event will not be fired until the batch operation succeeds.
+	if(batchType === "reset") {
+		this._disableEvent("columnVisibilityChanged", true);
+	}
 	this._dispatch("beforeBatchOperation", { batches: this._batches, batchType: batchType });
 	return true;
 };
@@ -4494,10 +4498,6 @@ Core.prototype.stopBatch = function (batchType) {
 	if(!batchType){
 		return false;
 	}
-	// The "columnVisibilityChanged" event is blocked while the "reset" batch operation is in progress, so this event will not be fired until the batch operation succeeds.
-	if(batchType === "reset") {
-		this._disableEvent("columnVisibilityChanged", true);
-	}
 	this._dispatch("afterBatchOperation", { batches: this._batches, batchType: batchType });
 	if(batchType === "reset") {
 		this._disableEvent("columnVisibilityChanged", false);

package/lib/grid/index.js

@@ -1,3 +1,3 @@
 import {Grid} from "./lib/efx-grid.js";
 export {Grid}
-window.EFX_GRID = { version: "6.0.65" };
+window.EFX_GRID = { version: "6.0.67" };

package/lib/rt-grid/dist/rt-grid.js

@@ -3030,7 +3030,8 @@ ElementObserver._getNewId = function () {
 	return id;
 };
 
-/** @private Observe any element
+/** Observe any element
+* @private
 * @param {Element} elem
 * @param {Function} listener
 * @param {Object=} opt_option
@@ -3082,7 +3083,8 @@ ElementObserver._addListener = function(elem, fn) {
 	}
 };
 
-/** @public Add a listener to a html lang attribute
+/** Add a listener to a html lang attribute
+* @public
 * @param {Element} element An element within the DOM tree to watch for changes
 */
 ElementObserver.addLanguageListener = function(element) {
@@ -3093,7 +3095,8 @@ ElementObserver.addLanguageListener = function(element) {
 	ElementObserver._addObserver(document.documentElement, _onLanguageMutated.bind(null, element));
 };
 
-/** @public Add a listener to a html attribute
+/** Add a listener to a html attribute
+* @public
 * @param {Element} element An element within the DOM tree to watch for changes
 * @param {Function} listener A function which will be called on each attribute change
 * @param {string=} attributeName If not specified, listener will be called on every attribute change
@@ -15330,7 +15333,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) {
@@ -36146,7 +36149,7 @@ Core.prototype._batches = null;
 * @return {string}
 */
 Core.getVersion = function () {
-	return "5.1.73";
+	return "5.1.76";
 };
 /** {@link ElementWrapper#dispose}
 * @override
@@ -40066,6 +40069,10 @@ Core.prototype.startBatch = function (batchType) {
 		this._batches = {};
 	}
 	this._batches[batchType] = batchType;
+	// The "columnVisibilityChanged" event is blocked while the "reset" batch operation is in progress, so this event will not be fired until the batch operation succeeds.
+	if(batchType === "reset") {
+		this._disableEvent("columnVisibilityChanged", true);
+	}
 	this._dispatch("beforeBatchOperation", { batches: this._batches, batchType: batchType });
 	return true;
 };
@@ -40078,10 +40085,6 @@ Core.prototype.stopBatch = function (batchType) {
 	if(!batchType){
 		return false;
 	}
-	// The "columnVisibilityChanged" event is blocked while the "reset" batch operation is in progress, so this event will not be fired until the batch operation succeeds.
-	if(batchType === "reset") {
-		this._disableEvent("columnVisibilityChanged", true);
-	}
 	this._dispatch("afterBatchOperation", { batches: this._batches, batchType: batchType });
 	if(batchType === "reset") {
 		this._disableEvent("columnVisibilityChanged", false);
@@ -40655,14 +40658,10 @@ Core.prototype._onColInViewChanged = function (e) {
 	var last = pli > li ? pli : li; // INCLUSIVE
 
 	this._activateColumns(fi, li, first, last);
-
-	var rfi = this._rowVirtualizer.getFirstIndexInView();
-	var rli = this._rowVirtualizer.getLastIndexInView();
 	var sectionCount = this.getSectionCount();
 	for (var s = 0; s < sectionCount; ++s) { // For each section
 		var sectionSettings = this._settings[s];
-		var rowIndexOffset = sectionSettings.getRowOffset();
-		this.updateRowData(sectionSettings, rfi - rowIndexOffset, rli - rowIndexOffset);
+		this.updateRowData(sectionSettings); // It will be render all rows in view
 	}
 };
 /** @private
@@ -43087,9 +43086,9 @@ SortableTitlePlugin.prototype.sortColumns = function (sortOptions, opt_arg) {
 		var states = [];
 		for (var i = 0; i < sortOptions.length; i++) {
 			var opt = sortOptions[i];
-			var colRef = opt["colIndex"];
-			if(colRef < 0 || colRef == null) {
-				colRef = opt["colId"] || opt["field"];
+			var colRef = opt["colId"] || opt["field"];
+			if(colRef == null) {
+				colRef = opt["colIndex"];
 			}
 			var state = this._prepareSorting(
 				colRef,
@@ -45730,7 +45729,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;
 	}
@@ -46470,7 +46469,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) {
@@ -48674,6 +48673,26 @@ DataSet.country = [
 // CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/jet/DataGenerator.js
 
 
+/** @typedef {Object} DataGenerator~DataOptions
+* @description Options for generating data
+* @property {number=} seed Seed for randomization. If seed is not specified (default), new set of data will be generated every time. Otherwise, the same set of data will be generated.
+* @property {number=} numRows Number of rows to be generated
+* @property {number=} rowCount Alias to numRows
+*/
+
+/** @typedef {Object} DataGenerator~FieldInformation
+* @description Information object for defining how data are generated for a specific field
+* @property {string=} type Available types are number, float, boolean, set, function, and isoDate
+* @property {string=} prefix Add a text prefix to the data
+* @property {string=} suffix Add a text suffix to the data
+* @property {number=} min Minimum value of the numeric data
+* @property {number=} max Maximum value of the numeric data. This is exclusive (not included in the result).
+* @property {string=} prec Precision (place number after the decimal point) of the numeric data.
+* @property {string=} fixedValue Single/static/constant value
+* @property {Array=} members List of possible data when the type is "set"
+* @property {Function=} generate Function for generating data when the type is "function"
+*/
+
 /** @private
 * @param {Object} fInfo
 * @param {number=} seed
@@ -48700,8 +48719,7 @@ var _generateDate1 = function(fInfo, seed) {
 
 var POW10 = [1, 1e1, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8, 1e9, 1e10];
 
-/** to format data including type, suffix, prefix, min, max, prec, fixedValue, changeOnly, members, isoDate.
-* @type {Object}
+/** @type {Object.<string, DataGenerator~DataOptions>}
 * @private
 */
 var _fieldInfo = {
@@ -48774,7 +48792,7 @@ var getFieldInfo = function(field) {
 
 /** @public
 * @param {string} field
-* @param {Object|Function} options
+* @param {DataGenerator~FieldInformation|Function} options
 */
 var addFieldInfo = function(field, options) {
 	if(field) {
@@ -48973,9 +48991,10 @@ var getSeed = function() {
 	return DataGenerator.seed;
 };
 
-/** @public
+/** Generate 2 dimensional array of data from the specified field and options. Note that 2D array data structure is not recommended for usage due to the position of fields/columns can be changed at runtime.
+* @public
 * @param {string|Array.<string>} fields
-* @param {Object=} options
+* @param {DataGenerator~DataOptions=} options
 * @return {!Array.<Array>} 2D Array of data
 */
 var generate = function(fields, options) {
@@ -48988,7 +49007,7 @@ var generate = function(fields, options) {
 /** WARNING: This method does not modify global seed
 * @public
 * @param {string|Array.<string>} fields
-* @param {(number|Object)=} options Configuration object or seed number
+* @param {(number|DataGenerator~DataOptions)=} options Configuration object or seed number
 * @param {number=} seed
 * @return {!Object} Object with the given fields as its keys
 */
@@ -49016,7 +49035,7 @@ var generateRecord = function(fields, options, seed) {
 
 /** @public
 * @param {string|Array.<string>} fields
-* @param {(number|Object)=} options Configuration object or number of rows
+* @param {(number|DataGenerator~DataOptions)=} options Configuration object or number of rows
 * @return {!Array.<Object>} Array of object with the given fields as its keys
 */
 var generateRecords = function(fields, options) {
@@ -49040,7 +49059,7 @@ var generateRecords = function(fields, options) {
 /** WARNING: This method does not modify global seed
 * @public
 * @param {string} field
-* @param {Object=} options
+* @param {DataGenerator~DataOptions=} options
 * @param {number=} seed
 * @return {!Object} Object with value, formattedValue and other properties
 */
@@ -49136,7 +49155,7 @@ var _hash = function(str) {
 };
 /** @private
 * @param {string} field
-* @param {Object=} options
+* @param {DataGenerator~DataOptions=} options
 * @param {number=} seed
 * @return {!Object} Object with value and other properties
 */
@@ -49207,9 +49226,10 @@ var DataGenerator = function(seed) {
 */
 DataGenerator.prototype._seed = null;
 
-/** @public
+/** Generate 2 dimensional array of data from the specified field and options. Note that 2D array data structure is not recommended for usage due to the position of fields/columns can be changed at runtime.
+* @public
 * @param {string|Array.<string>} fields
-* @param {(number|Object)=} options
+* @param {(number|DataGenerator~DataOptions)=} options
 * @return {!Array.<Array>} 2D Array of data
 */
 DataGenerator.prototype.generate = function(fields, options) {
@@ -49244,7 +49264,7 @@ DataGenerator.prototype.generateRecords = function(fields, options) {
 
 /** @public
 * @param {string} field
-* @param {Object=} options
+* @param {DataGenerator~DataOptions=} options
 * @return {!Object} Object with value, formattedValue and other properties
 */
 DataGenerator.prototype.generateQuoteData = function(field, options) {
@@ -49374,33 +49394,35 @@ DataGenerator.prototype.randString = function(min, max) {
 
 /** @type {?number}
 * @public
+* @ignore
 */
 DataGenerator.seed = null;
-/** @public
+/** Generate 2 dimensional array of data from the specified field and options. Note that 2D array data structure is not recommended for usage due to the position of fields/columns can be changed at runtime.
+* @public
 * @function
 * @param {string|Array.<string>} fields
-* @param {Object=} options
+* @param {DataGenerator~DataOptions=} options
 * @return {!Array.<Array>} 2D Array of data
 */
 DataGenerator.generate = generate;
 /** @public
 * @function
 * @param {string|Array.<string>} fields
-* @param {Object=} options
+* @param {DataGenerator~DataOptions=} options
 * @return {Object} Object with the given fields as its keys
 */
 DataGenerator.generateRecord = generateRecord;
 /** @public
 * @function
 * @param {string|Array.<string>} fields
-* @param {(number|Object)=} options Configuration object or seed number
+* @param {(number|DataGenerator~DataOptions)=} options Configuration object or number of rows
 * @return {!Array.<Object>} Array of object with the given fields as its keys
 */
 DataGenerator.generateRecords = generateRecords;
 /** @public
 * @function
 * @param {string} field
-* @param {Object|Function} options
+* @param {DataGenerator~FieldInformation|Function} options
 */
 DataGenerator.addFieldInfo = addFieldInfo;
 /** Return a floating-point random number in the range min - max (inclusive of min, but not max) with prec digits of precision.
@@ -49475,6 +49497,8 @@ DataGenerator.randDate = randDate;
 DataGenerator.randString = randString;
 
 /** Convert 2D Array to Array of records
+* @public
+* @function
 * @param {Array.<Array>} data2D Array of values
 * @param {Array.<string>=} fields Keys to be mapped on the output records.
 * @return {Array.<Object>} records
@@ -51284,7 +51308,9 @@ var OperatorPrecedences = {
 	"-": 4,
 	"*": 5,
 	"%": 6,
-	"/": 6
+	"/": 6,
+	"!": 7,
+	"!!": 7
 };
 /** @type {Object.<string, Function>}
 * @private
@@ -51303,10 +51329,32 @@ var OperatorFunctions = {
 	"==": function(lhs, rhs){ return lhs == rhs; },
 	"!=": function(lhs, rhs){ return lhs != rhs; },
 	"&&": function(lhs, rhs){ return lhs && rhs; },
-	"||": function(lhs, rhs){ return lhs || rhs; }
+	"||": function(lhs, rhs){ return lhs || rhs; },
+	"!": function(lhs, rhs){ return !lhs; },
+	"!!": function(lhs, rhs){ return !!lhs; }
 };
 /** @type {Object.<string, Function>}
 * @private
+* @const
+*/
+var OperandRequirements = {
+	"+": 2,
+	"-": 2,
+	"*": 2,
+	"/": 2,
+	"%": 2,
+	"<": 2,
+	">": 2,
+	"<=": 2,
+	">=": 2,
+	"==": 2,
+	"!=": 2,
+	"&&": 2,
+	"||": 2,
+	"!": 1,
+	"!!": 1
+};
+/** @private
 * @function
 * @param {Array.<Object>} ary
 * @param {string|number} value
@@ -51324,10 +51372,20 @@ var _addToken = function(ary, value, type, dataType) {
 	}
 	if(type === "operator") {
 		tok.precedence = OperatorPrecedences[value];
+	} else if(type === "parenthesis") {
+		tok.precedence = 0;
 	}
 	ary.push(tok);
 	return ary.length - 1;
 };
+/** @private
+* @function
+* @param {Object} obj
+* @returns {*}
+*/
+var _toValue = function(obj) { // eslint-disable-line
+	return obj.value;
+};
 
 /** @public
 * @namespace
@@ -51441,8 +51499,9 @@ ExpressionParser._tester = function(ctx) {
 	for(var i = 0; i < inputCount; ++i) {
 		var tok = rpn[i];
 		if(tok.type !== "literal") {
-			if(operandCount >= 2) {
-				operandCount -= 2;
+			var requiredCount = OperandRequirements[tok.value];
+			if(operandCount >= requiredCount) {
+				operandCount -= requiredCount;
 			} else {
 				console.warn("Cannot parse an expression with insufficient number of operands");
 				return true;
@@ -51483,11 +51542,18 @@ ExpressionParser._filter = function(ctx, rowData) {
 				curRes = rowData ? rowData[tokValue] : null;
 			}
 		} else { // operator
-			curRes = OperatorFunctions[tokValue](
-				results[operandCount - 2],
-				results[operandCount - 1]
-			);
-			operandCount -= 2;
+			if(OperandRequirements[tokValue] === 1) {
+				curRes = OperatorFunctions[tokValue](
+					results[operandCount - 1]
+				);
+				operandCount -= 1;
+			} else { // 2
+				curRes = OperatorFunctions[tokValue](
+					results[operandCount - 2],
+					results[operandCount - 1]
+				);
+				operandCount -= 2;
+			}
 		}
 		results[operandCount++] = curRes;
 	}
@@ -51556,7 +51622,6 @@ ExpressionParser.parse = function(expression) {
 		}
 		infixTokens.push(tok);
 	}
-	// TODO: Handle the case where subtraction operator is in front of a variable
 	ExpressionParser._tokens.length = 0;
 
 	// Convert Infix notation to Reverse Polish Notation (Postfix)
@@ -51591,9 +51656,10 @@ ExpressionParser.parse = function(expression) {
 				}
 			}
 		} else { // operator
-			lastOp = operators[operators.length - 1];
-			var prevPrecedence = lastOp ? lastOp.precedence : null;
-			if(prevPrecedence != null && tok.precedence <= prevPrecedence) {
+			while(operators.length) {
+				if(tok.precedence > operators[operators.length - 1].precedence) {
+					break;
+				}
 				rpn.push(operators.pop());
 			}
 			operators.push(tok);
@@ -51639,14 +51705,16 @@ ExpressionParser.parse = function(expression) {
 
 
 /** @typedef {Object} CellPainter~Expression
+* @ignore
+* @description This form of expression is deprecated
 * @property {string=} name
 * @property {string} text Text describes condition e.g. [FIELD] > 10
 * @property {Array=} values
 */
 
 /** @typedef {Object} CellPainter~Condition
-* @property {string} field Field to be used in the condition
-* @property {CellPainter~Expression|string} expression Text describes condition e.g. [FIELD] > 10
+* @property {string|Function} expression A function, text, or an object with text property that describes the condition
+* @property {string=} field Field to be used in the condition
 * @property {string=} backgroundColor CSS color string
 * @property {string=} color CSS color string
 * @property {string=} fontSize
@@ -51697,6 +51765,10 @@ CellPainter.prototype._conditions = null;
 /** @type {Object}
 * @private
 */
+CellPainter.prototype._effectiveStyles = null;
+/** @type {Object}
+* @private
+*/
 CellPainter.prototype._blinkCondition = null;
 /** @type {!Array}
 * @private
@@ -51710,17 +51782,16 @@ CellPainter.prototype._columnStats = null;
 * @private
 */
 CellPainter.prototype._levelColorDisabled = false;
-
 /** @type {number}
 * @private
 */
-CellPainter._runningBlinkId = 0;
-
+CellPainter.prototype._blinkingDuration = 250;
 
 /** @type {number}
 * @private
 */
-CellPainter._blinkingDuration = 250;
+CellPainter._runningBlinkId = 0;
+
 /** @type {Array.<CellPainter>}
 * @private
 * @const
@@ -51820,6 +51891,7 @@ CellPainter.prototype.reset = function() {
 CellPainter.prototype.resetColoring = function() {
 	// reset coloring type to allow other extensions to be able to set their new mode
 	this._setColoringType(0);
+	this._effectiveStyles = null;
 	this._conditions.length = 0;
 };
 
@@ -51919,6 +51991,18 @@ CellPainter.prototype._setColoringType = function(enumType) {
 	}
 };
 /** @public
+* @param {Object} mapping Effective styles mapping
+*/
+CellPainter.prototype.setEffectiveStyles = function(mapping) {
+	this._effectiveStyles = mapping;
+};
+/** @public
+* @return {Object}
+*/
+CellPainter.prototype.getEffectiveStyles = function() {
+	return this._effectiveStyles;
+};
+/** @public
 * @param {Array.<CellPainter~Condition>} conditions
 */
 CellPainter.prototype.setConditions = function(conditions) {
@@ -51943,7 +52027,7 @@ CellPainter.prototype.getColumnStats = function() {
 	return this._columnStats;
 };
 /** @private
-* @param {CellPainter~Condition|Object} condition
+* @param {CellPainter~Condition} condition
 */
 CellPainter.prototype._addCondition = function(condition) {
 	var exp = condition["expression"];
@@ -52536,9 +52620,17 @@ CellPainter.clearCellStyle = function(cell, styles) {
 		elem.classList.remove(elem._coloringCssClass);
 	}
 
-	styles = styles || CellPainter.supportedStyles;
-	for(var i = styles.length; --i >= 0;) {
-		elem.style[styles[i]] = "";  // WARNING: Very slow
+	if(!styles){
+		styles = CellPainter.supportedStyles;
+	}
+	if(Array.isArray(styles)){
+		for(var i = styles.length; --i >= 0;) {
+			elem.style[styles[i]] = "";  // WARNING: Very slow
+		}
+	} else {
+		for(var key in styles) {
+			elem.style[key] = "";  // WARNING: Very slow
+		}
 	}
 };
 /** @private
@@ -52660,26 +52752,29 @@ CellPainter.prototype._paintCell = function(cell, rowData, min, max) {
 	}
 
 	var styles = this._getStyles(rowData, min, max);
+
+	var elStyle = elem.style;
+
 	var cssClass = styles["cssClass"]; // Can be an empty string
+	if (elem._coloringCssClass && elem._coloringCssClass !== cssClass) {
+		elem.classList.remove(elem._coloringCssClass);
+		elem._coloringCssClass = null;
+	}
 	if (cssClass != null) { // Predefined colors mode
-		if (elem._coloringCssClass && elem._coloringCssClass !== cssClass) {
-			elem.classList.remove(elem._coloringCssClass);
-			elem._coloringCssClass = null;
-		}
 		if (cssClass) {
 			elem.classList.add(cssClass);
 			elem._coloringCssClass = cssClass;
 		}
 	} else {
-		if (elem._coloringCssClass) {
-			elem.classList.remove(elem._coloringCssClass);
-			elem._coloringCssClass = null;
+		if(styles["backgroundColor"]){
+			elStyle.backgroundColor = styles["backgroundColor"];
+		} else if(!this._effectiveStyles || this._effectiveStyles["backgroundColor"]){
+			elStyle.backgroundColor = "";
 		}
-		var ss = CellPainter.bgStyles;
-		var elStyle = elem.style;
-		for (var n = ss.length; --n >= 0;) {
-			var styleName = ss[n];
-			elStyle[styleName] = styles[styleName] || "";
+		if(styles["color"]){
+			elStyle.color = styles["color"];
+		} else if(!this._effectiveStyles || this._effectiveStyles["color"]){
+			elStyle.color = "";
 		}
 	}
 };
@@ -52772,7 +52867,7 @@ CellPainter.prototype._blinkCell = function(cell, rowData, blinkSignal) {
 	}
 
 	CellPainter._clearBlinkTimer(scope);
-	scope["blinkTimer"] = setTimeout(scope._restorer, CellPainter._blinkingDuration);
+	scope["blinkTimer"] = setTimeout(scope._restorer, this._blinkingDuration);
 
 	return bgBlinking;
 };
@@ -52800,6 +52895,15 @@ CellPainter.prototype.verifyBlinking = function(cell, rowData) {
 CellPainter.prototype.disableLevelColor = function(disabled) {
 	this._levelColorDisabled = disabled !== false;
 };
+/**
+* @public
+* @param {number} duration
+*/
+CellPainter.prototype.setBlinkingDuration = function(duration) {
+	if(typeof duration === "number"){
+		this._blinkingDuration = duration;
+	}
+};
 
 /* harmony default export */ var es6_CellPainter = (CellPainter);