@refinitiv-ui/efx-grid 6.0.132 → 6.0.134

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

@@ -6,11 +6,11 @@ import {ElfUtil} from '../../tr-grid-util/es6/ElfUtil.js';
 /** @typedef {Object} HeatMapPlugin~ColumnOptions
 * @description Extension column options that can be specified on each individual grid's column option:
 * @property {string} field Field used by the heat map
-* @property {HeatMapPlugin~Heatmap=} heatMap=null Heat map options
+* @property {HeatMapPlugin~HeatMap=} heatMap=null Heat map options
 */
 
-/** @typedef {boolean|Object} HeatMapPlugin~Heatmap
-* @description Available options describing `heatmap` object
+/** @typedef {Object} HeatMapPlugin~HeatMap
+* @description Available options describing `heatMap` object
 * @property {number=} midPoint=0 Middle point between values representing up and down colors
 * @property {string=} mode="cell" In cell mode, heat map color will be applied to the entire cell
 */
@@ -18,7 +18,7 @@ import {ElfUtil} from '../../tr-grid-util/es6/ElfUtil.js';
 /** @constructor
 * @extends {GridPlugin}
 */
-var HeatMapPlugin = function () {
+let HeatMapPlugin = function () {
 	this._onSectionBinding = this._onSectionBinding.bind(this);
 	this._onColumnAdded = this._onColumnAdded.bind(this);
 	this._onColumnRemoved = this._onColumnRemoved.bind(this);
@@ -78,9 +78,9 @@ HeatMapPlugin.prototype.initialize = function (host, options) {
 */
 HeatMapPlugin.prototype._afterInit = function () {
 	if(this._realTimeGrid) {
-		var colStats, painter;
-		var colCount = this.getColumnCount();
-		for(var c = 0; c < colCount; c++) {
+		let colStats, painter;
+		let colCount = this.getColumnCount();
+		for(let c = 0; c < colCount; c++) {
 			painter = this.getColumnHeatMap(c);
 			if(painter) {
 				colStats = painter.getColumnStats();
@@ -95,7 +95,7 @@ HeatMapPlugin.prototype._afterInit = function () {
 * @param {Object} host core grid object
 */
 HeatMapPlugin.prototype.unload = function (host) {
-	var at = this._hosts.indexOf(host);
+	let at = this._hosts.indexOf(host);
 	if(at < 0) { return; }
 
 	this._hosts.splice(at, 1);
@@ -114,12 +114,12 @@ HeatMapPlugin.prototype.unload = function (host) {
 HeatMapPlugin.prototype.config = function (options, opt_grid) {
 	if(!options) { return; }
 
-	var columns = options["columns"];
+	let columns = options["columns"];
 	if(!columns) { return; }
 
-	var len = columns.length;
-	for(var i = 0; i < len; ++i) {
-		var column = columns[i];
+	let len = columns.length;
+	for(let i = 0; i < len; ++i) {
+		let column = columns[i];
 		this.setColumnHeatMap(i, column, opt_grid);
 	}
 };
@@ -130,22 +130,22 @@ HeatMapPlugin.prototype.config = function (options, opt_grid) {
  * @returns {!Object}
  */
 HeatMapPlugin.prototype.getConfigObject = function (out_obj) {
-	var obj = out_obj || {};
+	let obj = out_obj || {};
 
-	var columns = obj.columns;
+	let columns = obj.columns;
 	if (!columns) {
 		columns = obj.columns = [];
 	}
 
-	var len = this.getColumnCount();
-	for(var i = 0; i < len; ++i) {
-		var col = columns[i];
+	let len = this.getColumnCount();
+	for(let i = 0; i < len; ++i) {
+		let col = columns[i];
 		if (!col) {
 			col = columns[i] = {};
 		}
 
 
-		var opt = this.getColumnHeatMap(i);
+		let opt = this.getColumnHeatMap(i);
 
 		if (!opt) { // We are only interested in the columns that have heat map informations
 			continue;
@@ -157,7 +157,7 @@ HeatMapPlugin.prototype.getConfigObject = function (out_obj) {
 			continue;
 		}
 
-		var heatMap = col.heatMap = {};
+		let heatMap = col.heatMap = {};
 
 		if (opt.midPoint != null) {
 			heatMap.midPoint = opt.midPoint;
@@ -177,7 +177,7 @@ HeatMapPlugin.prototype.getConfigObject = function (out_obj) {
 * @return {CellPainter}
 */
 HeatMapPlugin.prototype.getColumnHeatMap = function (colIndex, grid) {
-	var painter = this._getColumnOption(colIndex, "painter", grid);
+	let painter = this._getColumnOption(colIndex, "painter", grid);
 	if(painter && painter.getColoringType() === CellPainter.ColoringTypes.HEATMAP) {
 		return /** @type{CellPainter} */painter;
 	}
@@ -190,7 +190,7 @@ HeatMapPlugin.prototype.getColumnHeatMap = function (colIndex, grid) {
 * @param {Object=} opt_grid core grid object
 * @example
 * plugin.setColumnHeatMap(1, {
-*   "field": "CF_LAST"
+*   "field": "CF_LAST",
 *   "heatMap": {
 *     "midPoint": 0, // optional number
 *     "mode": "cell" // optional string (cell|text)
@@ -198,15 +198,15 @@ HeatMapPlugin.prototype.getColumnHeatMap = function (colIndex, grid) {
 * });
 */
 HeatMapPlugin.prototype.setColumnHeatMap = function (colIndex, columnDef, opt_grid) {
-	var hmMode = "";
-	var midPoint = 0;
-	var field = columnDef ? /** @type{string} */(columnDef["field"]) : "";
-	var hmOptions = field ? columnDef["heatMap"] || columnDef["heatmap"] : null;
+	let hmMode = "";
+	let midPoint = 0;
+	let field = columnDef ? /** @type{string} */(columnDef["field"]) : "";
+	let hmOptions = field ? columnDef["heatMap"] || columnDef["heatmap"] : null;
 	if(hmOptions) {
-		var userMode = hmOptions["mode"] || hmOptions["type"];
+		let userMode = hmOptions["mode"] || hmOptions["type"];
 		hmMode = (typeof userMode == "string") ? userMode : "cell";
 
-		var userMidPoint = /** @type{number} */(hmOptions["midPoint"]);
+		let userMidPoint = /** @type{number} */(hmOptions["midPoint"]);
 		if(typeof userMidPoint != "number") {
 			userMidPoint = +userMidPoint;
 		}
@@ -215,7 +215,7 @@ HeatMapPlugin.prototype.setColumnHeatMap = function (colIndex, columnDef, opt_gr
 	if(opt_grid) {
 		this._setColumnHeatMap(opt_grid, colIndex, hmMode, midPoint, field);
 	} else {
-		for(var i = this._hosts.length; --i >= 0;) {
+		for(let i = this._hosts.length; --i >= 0;) {
 			this._setColumnHeatMap(this._hosts[i], colIndex, hmMode, midPoint, field);
 		}
 	}
@@ -228,17 +228,16 @@ HeatMapPlugin.prototype.setColumnHeatMap = function (colIndex, columnDef, opt_gr
 * @param {string} field
 */
 HeatMapPlugin.prototype._setColumnHeatMap = function (grid, colIndex, hmMode, midPoint, field) {
-	var dv = grid.getDataSource();
+	let dv = grid.getDataSource();
 	if(!dv) {
-		console.log("Heat map requires a data source");
 		return;
 	}
 
-	var colData = this._newColumnData(colIndex);
-	var painter = /** @type{CellPainter} */(colData["painter"]);
+	let colData = this._newColumnData(colIndex);
+	let painter = /** @type{CellPainter} */(colData["painter"]);
 
-	var cond, sect, rowCount, r, cell;
-	if(hmMode && field) { // Update or create new painter for heatmap
+	let cond, sect, rowCount, r, cell;
+	if(hmMode && field) { // Update or create new painter for heatMap
 		if(painter) {
 			// Clear currrent style, blinking and existing styles related to blinking
 			sect = grid.getSection("content");
@@ -265,7 +264,7 @@ HeatMapPlugin.prototype._setColumnHeatMap = function (grid, colIndex, hmMode, mi
 		cond = painter.addHeatmapWithTheme(field, midPoint, (hmMode === "text"));
 		cond.refId = "_hm" + HeatMapPlugin._runningId++;
 
-		var colStats = dv.enableColumnStats(field, true, cond.refId);
+		let colStats = dv.enableColumnStats(field, true, cond.refId);
 		if(this._initializedGrid && this._realTimeGrid) {
 			colStats.setColumnDataGetter(colDataGetter);
 		}
@@ -276,7 +275,7 @@ HeatMapPlugin.prototype._setColumnHeatMap = function (grid, colIndex, hmMode, mi
 	} else {
 		if(painter) {
 			if(this._clearPainter(colData, grid)) {
-				// Clear existing heatmap styles
+				// Clear existing heatMap styles
 				grid.enableColumnClass(colIndex, "heat-map", false);
 				sect = grid.getSection("content");
 				rowCount = sect.getRowCount();
@@ -306,7 +305,7 @@ HeatMapPlugin.prototype._setColumnHeatMap = function (grid, colIndex, hmMode, mi
 HeatMapPlugin.prototype.getColumnHeatMapOptions = function(colIndex, options) {
 	if(!options) { options = {}; }
 
-	var hm = this.getColumnHeatMap(colIndex);
+	let hm = this.getColumnHeatMap(colIndex);
 	if(hm) {
 		options["midPoint"] = hm["midPoint"];
 		options["mode"] = hm["mode"];
@@ -321,11 +320,11 @@ HeatMapPlugin.prototype.getColumnHeatMapOptions = function(colIndex, options) {
 */
 HeatMapPlugin.prototype._clearPainter = function (colData, grid) {
 	if(colData) {
-		var painter = colData["painter"];
+		let painter = colData["painter"];
 		if(painter && painter.getColoringType() === CellPainter.ColoringTypes.HEATMAP) {
-			var cond = painter.getConditions()[0];
+			let cond = painter.getConditions()[0];
 			if(cond) {
-				var dv = grid.getDataSource();
+				let dv = grid.getDataSource();
 				dv.enableColumnStats(cond.field, false, cond.refId);
 			}
 			if(painter.clearHeatMap()) {
@@ -338,7 +337,7 @@ HeatMapPlugin.prototype._clearPainter = function (colData, grid) {
 };
 /** @private */
 HeatMapPlugin.prototype._onThemeLoaded = function () {
-	for(var i = this._hosts.length; --i >= 0;) {
+	for(let i = this._hosts.length; --i >= 0;) {
 		this._hosts[i].requestRowRefresh();
 	}
 };
@@ -350,21 +349,21 @@ HeatMapPlugin.prototype._onSectionBinding = function (e) {
 		return;
 	}
 
-	var grid = e["sender"];
-	var section = e["section"];
-	var dataRows = /** @type{Array.<Object>} */(e["dataRows"]);
-	var colCount = section.getColumnCount();
-	var fromR = /** @type{number} */(e["fromRowIndex"]);
-	var toR = /** @type{number} */(e["toRowIndex"]);
+	let grid = e["sender"];
+	let section = e["section"];
+	let dataRows = /** @type{Array.<Object>} */(e["dataRows"]);
+	let colCount = section.getColumnCount();
+	let fromR = /** @type{number} */(e["fromRowIndex"]);
+	let toR = /** @type{number} */(e["toRowIndex"]);
 
-	for (var c = 0; c < colCount; ++c) {
-		var painter = this.getColumnHeatMap(c, grid);
+	for (let c = 0; c < colCount; ++c) {
+		let painter = this.getColumnHeatMap(c, grid);
 		if(painter) {
-			var columnStats = painter.getColumnStats();
-			var min = columnStats.getMin();
-			var max = columnStats.getMax();
-			for (var r = fromR; r < toR; ++r) {
-				var cell = section.getCell(c, r, false);
+			let columnStats = painter.getColumnStats();
+			let min = columnStats.getMin();
+			let max = columnStats.getMax();
+			for (let r = fromR; r < toR; ++r) {
+				let cell = section.getCell(c, r, false);
 				if(cell) {
 					painter.renderHeatMap(cell, this._getRowData(dataRows[r]), min, max);
 				}
@@ -379,9 +378,9 @@ HeatMapPlugin.prototype._onColumnAdded = function(e) {
 	if(e.context) {
 		this.setColumnHeatMap(e.colIndex, e.context, e.sender);
 		if(this._realTimeGrid) {
-			var painter = this.getColumnHeatMap(e.colIndex);
+			let painter = this.getColumnHeatMap(e.colIndex);
 			if(painter) {
-				var colStats = painter.getColumnStats();
+				let colStats = painter.getColumnStats();
 				if(colStats) {
 					colStats.setColumnDataGetter(colDataGetter);
 				}

package/lib/tr-grid-row-filtering/es6/RowFiltering.d.ts

@@ -145,8 +145,6 @@ declare class RowFilteringPlugin extends GridPlugin {
 
 declare function colSettings(colIndex: number, exp: RowFilteringPlugin.Expression|null, ctx?: (any|string)|null): boolean;
 
-declare function selCount(sortOrder: string): void;
-
 declare function crf(enabled?: boolean|null): void;
 
 export default RowFilteringPlugin;

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

@@ -231,6 +231,9 @@ let RowFilteringPlugin = function () {
 	t.refresh = t.refresh.bind(t);
 	t._requestFilterRefresh = t._requestFilterRefresh.bind(t);
 
+	t._onDialogSortChanged = t._onDialogSortChanged.bind(t);
+	t._onDialogFilterChanged = t._onDialogFilterChanged.bind(t);
+	t._onDialogClosed = t._onDialogClosed.bind(t);
 
 	t._globalFilters = [];
 	t._globalContexts = [];
@@ -1779,11 +1782,11 @@ RowFilteringPlugin.prototype.openDialog = function(colIndex, runtimeDialogOption
 			if(!stp) {
 				this._filterDialog.hideSortUI();
 			} else {
-				this._filterDialog.addEventListener("sortChanged", this._onDialogSortChanged.bind(this));
+				this._filterDialog.addEventListener("sortChanged", this._onDialogSortChanged);
 			}
-			this._filterDialog.addEventListener("filterChanged", this._onDialogFilterChanged.bind(this));
-			this._filterDialog.addEventListener("confirm", this._onDialogClosed.bind(this));
-			this._filterDialog.addEventListener("cancel", this._onDialogClosed.bind(this));
+			this._filterDialog.addEventListener("filterChanged", this._onDialogFilterChanged);
+			this._filterDialog.addEventListener("confirm", this._onDialogClosed);
+			this._filterDialog.addEventListener("cancel", this._onDialogClosed);
 		}
 	}
 
@@ -2185,44 +2188,34 @@ RowFilteringPlugin.prototype._onDialogClosed = function(e) {
 		this._hosts[0].focus();
 	}
 };
-/** @public
-* @ignore
-* @param {*} val
-*/
-RowFilteringPlugin.prototype.mockDialogFilterChange = function(val) {
-	if(this._filterDialog) {
-		let arg = {
-			detail: {}
-		};
-		if(Array.isArray(val)) {
-			if(Array.isArray(val[0])) {
-				arg.detail.conditions = val;
-			} else {
-				arg.detail.value = val;
-			}
-		} else {
-			arg.detail.value = val;
-		}
-		this._onDialogFilterChanged(arg);
-	}
-};
+
 /** @private
 * @param {Object} e
 */
 RowFilteringPlugin.prototype._onDialogFilterChanged = function(e) {
 	let colIndex = this._filterDialog._colIndex;
 	let cfo = this._getColumnFilterOption(colIndex);
-	let uniqueValues = cfo.uniqueValues; // Unique values have to be stored before the removal of the filter
-	let rawDataAccessor = cfo._rawDataAccessor;
-	let formattedDataAccessor = cfo._formattedDataAccessor;
+	let uniqueValues = null;
+	let rawDataAccessor = null;
+	let formattedDataAccessor = null;
 	let ctx = null;
-	if(rawDataAccessor || formattedDataAccessor) {
-		ctx = {
-			"rawDataAccessor": rawDataAccessor || null,
-			"formattedDataAccessor": formattedDataAccessor || null
-		};
+
+	if(cfo) {
+		// TODO: Move uniqueValues out from column filter option object
+		uniqueValues = cfo.uniqueValues; // Unique values have to be stored before the removal of the filter
+		rawDataAccessor = cfo._rawDataAccessor;
+		formattedDataAccessor = cfo._formattedDataAccessor;
+
+		if(rawDataAccessor || formattedDataAccessor) {
+			ctx = {
+				"rawDataAccessor": rawDataAccessor || null,
+				"formattedDataAccessor": formattedDataAccessor || null
+			};
+		}
+		this.removeColumnFilters(colIndex);
+	} else {
+		uniqueValues = e.uniqueValues || {};
 	}
-	this.removeColumnFilters(colIndex);
 
 	// Check inputs from advanced filter UIs
 	let conditions = e.detail.conditions;
@@ -2291,7 +2284,13 @@ RowFilteringPlugin.prototype._onDialogFilterChanged = function(e) {
 		let jLen = rawVals.length;
 		for(let j = 0; j < jLen; ++j) {
 			let rawVal = rawVals[j];
-			itemMap[rawVal] = (rawVal instanceof Date) ? rawVal.getTime() : rawVal;
+			if(rawVal) {
+				itemMap[rawVal] = (rawVal instanceof Date) ? rawVal.getTime() : rawVal;
+			} else if(rawVal === 0) {
+				itemMap["0"] = true;
+			} else if(rawVal === false) {
+				itemMap["false"] = true;
+			}
 		}
 	}
 	if(atLeastOne) {
@@ -2304,19 +2303,6 @@ RowFilteringPlugin.prototype._onDialogFilterChanged = function(e) {
 	});
 };
 
-/** @public
-* @ignore
-* @param {string} sortOrder
-*/
-RowFilteringPlugin.prototype.mockDialogSortChange = function(sortOrder) {
-	if(this._filterDialog) {
-		let arg = {
-			detail: {}
-		};
-		arg.detail.value = sortOrder;
-		this._onDialogSortChanged(arg);
-	}
-};
 /** @private
 * @param {Object} e
 */
@@ -2329,7 +2315,7 @@ RowFilteringPlugin.prototype._onDialogSortChanged = function(e) {
 		if(stp.getSortOrder(colIndex) === eDetail) {
 			stp.sortColumn(colIndex, "n", { "isUserAction": true });
 		} else {
-			stp.sortColumn(colIndex, eDetail, { "isUserAction": true }	);
+			stp.sortColumn(colIndex, eDetail, { "isUserAction": true });
 		}
 		this._dispatch("dialogCommitted", {
 			"sortOrder": e.detail.value,
@@ -2430,6 +2416,18 @@ RowFilteringPlugin.prototype.hideColumnFilterIcon = function(colIndex, hidden) {
 	}
 };
 
+/** @public
+* @ignore
+* @return {!Object}
+*/
+RowFilteringPlugin.prototype._getEventHandlers = function() {
+	return {
+		"dialogSortChanged": this._onDialogSortChanged,
+		"dialogFilterChanged": this._onDialogFilterChanged,
+		"dialogClosed": this._onDialogClosed
+	};
+};
+
 
 
 export default RowFilteringPlugin;

package/lib/tr-grid-textformatting/es6/TextFormatting.d.ts

@@ -8,7 +8,6 @@ declare namespace TextFormattingPlugin {
 
     type FormatOptions = {
         formatType?: string|null,
-        type?: string|null,
         field?: string|null,
         decimalPlaces?: (number|boolean)|null,
         precisionEnabled?: boolean|null,
@@ -17,7 +16,6 @@ declare namespace TextFormattingPlugin {
         percentSign?: boolean|null,
         scalingUnit?: string|null,
         multiplyBy100?: boolean|null,
-        mutiplyBy100?: boolean|null,
         dateTimeFormat?: string|null,
         useUTCTime?: boolean|null,
         autoTextFormatting?: boolean|null,