@refinitiv-ui/efx-grid 6.0.112 → 6.0.113

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

@@ -4237,12 +4237,12 @@ Grid.prototype._focusNextCellContent = function(args) {
 	let grid = this._grid;
 	let section = grid.getSection("content");
 	let viewInfo = grid.getVerticalViewInfo();
-	let bottomRowIndex = viewInfo.bottomRowIndex;
+	let lastFullRow = viewInfo.lastFullRow;
 	let rowCount = this.getRowCount();
 	for(let r = rowIndex; r < rowCount; r++) {
 		for(i = startIdx; i < len; i++) {
 			let c = focusableColIndices[i];
-			if(r > bottomRowIndex) {
+			if(r > lastFullRow) {
 				this._requestScroll(args, c, r);
 				return;
 			} else {
@@ -4292,11 +4292,11 @@ Grid.prototype._focusPrevCellContent = function(args) {
 	let grid = this._grid;
 	let section = grid.getSection("content");
 	let viewInfo = grid.getVerticalViewInfo();
-	let topRowIndex = viewInfo.topRowIndex;
+	let firstFullRow = viewInfo.firstFullRow;
 	for(let r = rowIndex; r >= 0; r--) {
 		for(i = startIdx; i >= 0; i--) {
 			let c = focusableColIndices[i];
-			if(r < topRowIndex) {
+			if(r < firstFullRow) {
 				this._requestScroll(args, c, r);
 				return;
 			} else {
@@ -4350,7 +4350,7 @@ Grid.prototype._onTabNavigation = function(e) {
 	}
 	let startingRowIndex = pos["rowIndex"];
 	if(e.onTheEdge) {
-		let viewInfo = this._grid.getVScrollView();
+		let viewInfo = this._grid.getVerticalViewInfo();
 		startingRowIndex = keyEvt.shiftKey ? viewInfo.lastFullRow : viewInfo.firstFullRow;
 	}
 	let args = {

package/lib/tr-grid-contextmenu/es6/ContextMenu.d.ts

@@ -3,7 +3,7 @@ import Ext from "../../tr-grid-util/es6/Ext.js";
 import MenuEventAPI from "./MenuEventAPI.js";
 import PopupMenu from "./PopupMenu.js";
 import { prettifyCss } from "../../tr-grid-util/es6/Util.js";
-import CellPainter from "../../tr-grid-util/es6/CellPainter.js";
+import { rgb2Hex, num2Hex, hex2Num, blendColor, getContrastColor } from "../../tr-grid-util/es6/Color.js";
 
 declare namespace ContextMenuPlugin {
 

package/lib/tr-grid-contextmenu/es6/ContextMenu.js

@@ -3,7 +3,7 @@ import Ext from "../../tr-grid-util/es6/Ext.js";
 import MenuEventAPI from "./MenuEventAPI.js";
 import PopupMenu from "./PopupMenu.js";
 import { prettifyCss } from "../../tr-grid-util/es6/Util.js";
-import CellPainter from "../../tr-grid-util/es6/CellPainter.js";
+import { rgb2Hex, num2Hex, hex2Num, blendColor, getContrastColor } from "../../tr-grid-util/es6/Color.js";
 
 /** @typedef {"header" | "content" | "footer" | "filterRow"} ContextMenuPlugin~Context
 * @description All available context types for the extension
@@ -71,8 +71,8 @@ import CellPainter from "../../tr-grid-util/es6/CellPainter.js";
 * @extends {GridPlugin}
 * @param {(ContextMenuPlugin~Options|ContextMenuPlugin~OnMenuEvent)=} options
 */
-var ContextMenuPlugin = function (options) {
-	var t = this;
+let ContextMenuPlugin = function (options) {
+	let t = this;
 	t._hosts = [];
 
 	t._onItemClicked = t._onItemClicked.bind(t);
@@ -126,7 +126,7 @@ ContextMenuPlugin.prototype._contextMenu = null;
 * @return {string}
 */
 ContextMenuPlugin._styleCalculator = function (colors) {
-	var css = prettifyCss([
+	let css = prettifyCss([
 		".tr-contextmenu", [
 			"outline: none;",
 			"box-sizing: border-box;",
@@ -197,10 +197,10 @@ ContextMenuPlugin._styleCalculator = function (colors) {
 		]
 	]);
 
-	var hex = CellPainter.rgb2Hex(colors.tableBg);
-	var triplet = CellPainter.hex2Num(hex);
-	var bw = CellPainter.blackAndWhite(triplet);
-	var blendRatio;
+	let hex = rgb2Hex(colors.tableBg);
+	let triplet = hex2Num(hex);
+	let bw = getContrastColor(triplet);
+	let blendRatio;
 	if (bw === "#000000") { // Light theme
 		blendRatio = 0.1;
 		css = css.replace(/disabledColor/g, "lightgrey");
@@ -208,7 +208,7 @@ ContextMenuPlugin._styleCalculator = function (colors) {
 		blendRatio = 0.2;
 		css = css.replace(/disabledColor/g, "gray");
 	}
-	var hoverd = CellPainter.num2Hex(CellPainter.blendColor(hex, bw, blendRatio));
+	let hoverd = num2Hex(blendColor(hex, bw, blendRatio));
 	css = css.replace(/hoveredColor/g, hoverd);
 	css = css.replace(/backgroundColor/g, colors.tableBg);
 	css = css.replace(/fontColor/g, colors.tableText);
@@ -229,7 +229,7 @@ ContextMenuPlugin.prototype.getName = function () {
 * @param {Object=} options
 */
 ContextMenuPlugin.prototype.initialize = function (host, options) {
-	var t = this;
+	let t = this;
 	if (t._hosts.indexOf(host) >= 0) { return; }
 	t._hosts.push(host);
 
@@ -245,7 +245,7 @@ ContextMenuPlugin.prototype.initialize = function (host, options) {
 * @param {Object} host core grid object
 */
 ContextMenuPlugin.prototype.unload = function (host) {
-	var at = this._hosts.indexOf(host);
+	let at = this._hosts.indexOf(host);
 	if (at < 0) { return; }
 
 	host.unlisten("postSectionRender", this._onPostSectionRender);
@@ -266,9 +266,9 @@ ContextMenuPlugin.prototype.unload = function (host) {
 ContextMenuPlugin.prototype.config = function (options) {
 	if (!options) { return; }
 
-	var t = this;
+	let t = this;
 
-	var contextMenu = options["contextMenu"];
+	let contextMenu = options["contextMenu"];
 
 	if (contextMenu == null) { return; }
 	else if (typeof contextMenu === "object") {
@@ -294,7 +294,7 @@ ContextMenuPlugin.prototype.config = function (options) {
 * @return {!Object}
 */
 ContextMenuPlugin.prototype.getConfigObject = function (gridOptions) {
-	var obj = gridOptions || {};
+	let obj = gridOptions || {};
 
 	obj.contextMenu = this._contextMenu;
 
@@ -313,13 +313,13 @@ ContextMenuPlugin.prototype.getMenuModel = function () {
 * @return {!Object} Mouse related information
 */
 ContextMenuPlugin.prototype._configureMouseInfo = function (e) {
-	var host = this._hosts[0];
-	var mouseInfo = host.getRelativePosition(e);
+	let host = this._hosts[0];
+	let mouseInfo = host.getRelativePosition(e);
 
 	// Supply possibly needed arguments for the event handler
 	mouseInfo.context = this._contextMap[mouseInfo.sectionType] || "";
-	var colIndex = mouseInfo.colIndex;
-	var columnDef = mouseInfo.columnDef = {};
+	let colIndex = mouseInfo.colIndex;
+	let columnDef = mouseInfo.columnDef = {};
 	mouseInfo.field = columnDef.field = this.getColumnField(colIndex);
 	mouseInfo.colId = columnDef.id = this.getColumnId(colIndex);
 
@@ -331,13 +331,13 @@ ContextMenuPlugin.prototype._configureMouseInfo = function (e) {
 	}
 
 	if (this._csp) {
-		var selCols = this._csp.getSelectedColumns();
+		let selCols = this._csp.getSelectedColumns();
 		mouseInfo.selectedColumns = selCols && selCols.length ? selCols : null;
 	} else {
 		mouseInfo.selectedColumns = null;
 	}
 	if (this._rsp) {
-		var selRows = this._rsp.getSelectedRows();
+		let selRows = this._rsp.getSelectedRows();
 		mouseInfo.selectedRows = selRows && selRows.length ? selRows : null;
 	} else {
 		mouseInfo.selectedRows = null;
@@ -351,21 +351,21 @@ ContextMenuPlugin.prototype._configureMouseInfo = function (e) {
 * @param {Object} e
 */
 ContextMenuPlugin.prototype._rightClickedHandler = function (e) {
-	var t = this;
+	let t = this;
 
-	var host = t._hosts[0];
+	let host = t._hosts[0];
 
 	if (!host) { return; }
 
-	var pos = host.getRelativePosition(e);
+	let pos = host.getRelativePosition(e);
 	if(pos.rowIndex == null) {
 		return;
 	}
 
 	e.preventDefault(); // Prevent default system menu
 
-	var mouseInfo = t._mouseInfo = t._configureMouseInfo(e);
-	var contextMenu = t._contextMenu;
+	let mouseInfo = t._mouseInfo = t._configureMouseInfo(e);
+	let contextMenu = t._contextMenu;
 
 	if (!contextMenu || t._disabled) { return; }
 
@@ -375,7 +375,7 @@ ContextMenuPlugin.prototype._rightClickedHandler = function (e) {
 		t._menuAPI.clear(); // Clear cache everytime
 		mouseInfo.menu = t._menuAPI; // Augment the event argument with Context Menu API
 
-		var menuItems;
+		let menuItems;
 		if (contextMenu.onMenu) {
 			contextMenu.onMenu(mouseInfo); // Let user populates menu items based on the context
 			menuItems = mouseInfo.menu.getMenuItems();
@@ -390,7 +390,7 @@ ContextMenuPlugin.prototype._rightClickedHandler = function (e) {
 			t._popup.dispose();
 		}
 
-		var hostElem = host.getElement();
+		let hostElem = host.getElement();
 
 		// TODO: Cannot initiate PopupMenu once because of blur timer trigger in Popup.
 		// Blur timer (10ms) will try to hide popup after mousedown event.
@@ -410,24 +410,24 @@ ContextMenuPlugin.prototype._rightClickedHandler = function (e) {
 * @param {Event} e
 */
 ContextMenuPlugin.prototype._onItemClicked = function (e) {
-	var menuItem = e.item;
-	var subMenu = menuItem.items;
+	let menuItem = e.item;
+	let subMenu = menuItem.items;
 	if (subMenu && subMenu.length) {
 		return; // The selected item is not a leaf node
 	}
 
-	var pathArray = this._menuAPI.findItem(menuItem.id);
+	let pathArray = this._menuAPI.findItem(menuItem.id);
 	if (!pathArray) {
 		return; // Invalid item id
 	}
 
 	// User don't need to specify callback for each individual item.
 	// User can specify call back at the parent item as a fallback method
-	var len = pathArray.length;
-	for (var i = 0; i < len; ++i) {
-		var itemModel = pathArray[i];
+	let len = pathArray.length;
+	for (let i = 0; i < len; ++i) {
+		let itemModel = pathArray[i];
 		if (itemModel.callback) {
-			for (var propName in this._mouseInfo) {
+			for (let propName in this._mouseInfo) {
 				e[propName] = this._mouseInfo[propName];
 			}
 			itemModel.callback(e);

package/lib/tr-grid-contextmenu/es6/MenuEventAPI.js

@@ -6,7 +6,7 @@
 * @param {Array} columnGroups
 * @param {Array} legacyColumnGroups
 */
-var MenuEventAPI = function (menuModel) {
+let MenuEventAPI = function (menuModel) {
 	this._model = menuModel;
 	this._items = [];
 	this._runningId = 0;
@@ -52,8 +52,8 @@ MenuEventAPI.prototype._addItem = function (item, level) {
 			this._addItem(this._model.items[item], level + 1);
 		}
 	} else if (Array.isArray(item)) { // The item is an item list
-		var len = item.length;
-		for (var i = 0; i < len; ++i) {
+		let len = item.length;
+		for (let i = 0; i < len; ++i) {
 			this._addItem(item[i], level + 1);
 		}
 	} else { // Assume the item has an object type
@@ -88,12 +88,12 @@ MenuEventAPI.prototype.findItem = function (id) { // For internal use
 * @returns {string}
 */
 MenuEventAPI.prototype._findItem = function (id, item) {
-	var foundItemPath;
+	let foundItemPath;
 	if (!item) {
 		return null;
 	} else if (Array.isArray(item)) {
-		var len = item.length;
-		for (var i = 0; i < len; ++i) {
+		let len = item.length;
+		for (let i = 0; i < len; ++i) {
 			foundItemPath = this._findItem(id, item[i]);
 			if (foundItemPath) {
 				return foundItemPath;
@@ -116,7 +116,7 @@ MenuEventAPI.prototype._findItem = function (id, item) {
 */
 MenuEventAPI.prototype._assignId = function (items) {
 	if (Array.isArray(items)) {
-		for (var i = 0; i < items.length; i++) {
+		for (let i = 0; i < items.length; i++) {
 			this._assignId(items[i]);
 		}
 	} else {

package/lib/tr-grid-contextmenu/es6/MenuItem.js

@@ -5,8 +5,8 @@ import Ext from "../../tr-grid-util/es6/Ext.js";
 * @extends {EventDispatcher}
 * @param {Object} options
 */
-var MenuItem = function (options) {
-	var t = this;
+let MenuItem = function (options) {
+	let t = this;
 
 	t._onItemHovered = t._onItemHovered.bind(t);
 	t._onItemClicked = t._onItemClicked.bind(t);
@@ -33,9 +33,9 @@ MenuItem.prototype._isSelectable = true;
 * @param {Object} options
 */
 MenuItem.prototype._init = function(options) {
-	var t = this;
+	let t = this;
 
-	var li = document.createElement("li");
+	let li = document.createElement("li");
 	li.className = "tr-contextmenu-item";
 	li.addEventListener("mouseover", t._onItemHovered);
 	li.addEventListener("click", t._onItemClicked);
@@ -45,7 +45,7 @@ MenuItem.prototype._init = function(options) {
 
 /** @public */
 MenuItem.prototype.dispose = function() {
-	var t = this;
+	let t = this;
 	t.removeAllEventListeners();
 	t._elem.removeEventListener("mouseover", t._onItemHovered);
 	t._elem.removeEventListener("click", t._onItemClicked);
@@ -58,9 +58,9 @@ MenuItem.prototype.dispose = function() {
 MenuItem.prototype._config = function(opt_model) {
 	if (!opt_model) opt_model = {};
 
-	var pref;
+	let pref;
 
-	var t = this;
+	let t = this;
 
 	pref = opt_model["id"];
 	if (pref) {
@@ -111,7 +111,7 @@ MenuItem.prototype._config = function(opt_model) {
 * @param {Object} e
 */
 MenuItem.prototype._onItemHovered = function(e) {
-	var t = this;
+	let t = this;
 
 	// Cannot be hover if disabled or has no children
 	if (!t.isSelectable()) { return; }
@@ -124,7 +124,7 @@ MenuItem.prototype._onItemHovered = function(e) {
 * @param {Object} e
 */
 MenuItem.prototype._onItemClicked = function(e) {
-	var t = this;
+	let t = this;
 
 	// Cannot be clicked if disabled or has children
 	if (!t.isSelectable() || Array.isArray(t.getItems())) { return; }
@@ -137,7 +137,7 @@ MenuItem.prototype._onItemClicked = function(e) {
 * @param {*} id
 */
 MenuItem.prototype.setId = function(id) {
-	var t = this;
+	let t = this;
 	t._elem.setAttribute("id", id);
 	this._id = id;
 };
@@ -153,7 +153,7 @@ MenuItem.prototype.getId = function() {
 * @param {*} text
 */
 MenuItem.prototype.setText = function(text) {
-	var t = this;
+	let t = this;
 	t._elem.textContent = text + "";
 	this._text = text;
 };
@@ -183,7 +183,7 @@ MenuItem.prototype.getValue = function() {
 * @param {boolean=} selectable
 */
 MenuItem.prototype.setSelectable = function(selectable) {
-	var t = this;
+	let t = this;
 	if (selectable) {
 		t._elem.removeAttribute("data-unselectable");
 		t._elem.removeAttribute("disabled");
@@ -205,7 +205,7 @@ MenuItem.prototype.isSelectable = function() {
 * @param {Array} items
 */
 MenuItem.prototype.setItems = function(items) {
-	var t = this;
+	let t = this;
 	t._items = items;
 	t._elem.classList.add("has-child");
 };

package/lib/tr-grid-contextmenu/es6/PopupMenu.js

@@ -7,8 +7,8 @@ import Ext from "../../tr-grid-util/es6/Ext.js";
 * @extends {EventDispatcher}
 * @param {Element} parentElement
 */
-var PopupMenu = function (parentElement) {
-	var t = this;
+let PopupMenu = function (parentElement) {
+	let t = this;
 
 	t.show = t.show.bind(t);
 	t.attachTo = t.attachTo.bind(t);
@@ -64,11 +64,11 @@ PopupMenu.prototype._isMounted;
 * @param {Element} parentElement
 */
 PopupMenu.prototype._init = function(parentElement) {
-	var t = this;
+	let t = this;
 
-	var topNode = document.createElement("div");
+	let topNode = document.createElement("div");
 	topNode.className = "tr-contextmenu-popup";
-	var ul = document.createElement("ul");
+	let ul = document.createElement("ul");
 	ul.className = "tr-contextmenu";
 	topNode.appendChild(ul);
 
@@ -98,7 +98,7 @@ PopupMenu.prototype.isDisposed = function () {
 
 /** @public */
 PopupMenu.prototype.dispose = function () {
-	var t = this;
+	let t = this;
 	if (t._isMounted) {
 		t.removeAllEventListeners();
 		t._popup.dispose();
@@ -109,7 +109,7 @@ PopupMenu.prototype.dispose = function () {
 
 /** @private */
 PopupMenu.prototype._disposeChildren = function () {
-	var t = this;
+	let t = this;
 	t._children.forEach(function (child) {
 		if (child) {
 			child.dispose();
@@ -126,7 +126,7 @@ PopupMenu.prototype._disposeChildren = function () {
 
 /** @public */
 PopupMenu.prototype.show = function () {
-	var t = this;
+	let t = this;
 	t._popup.show(true, t._parentElement);
 	t.setPosition(t._popup._positioning, t._x, t._y);
 };
@@ -152,19 +152,19 @@ PopupMenu.prototype.attachTo = function (elem, positioning) {
 * @param {number} y
 */
 PopupMenu.prototype.setPosition = function(positioning, x, y) {
-	var t = this;
+	let t = this;
 
 	if (positioning === "custom") {
 		t._x = x;
 		t._y = y;
-		var ww = window.innerWidth;
-		var wh = window.innerHeight;
-		var sx = (window.scrollX != null) ? window.scrollX : window.pageXOffset;
-		var sy = (window.scrollY != null) ? window.scrollY : window.pageYOffset;
-		var rb = ww + sx; // view port right bound
-		var bb = wh + sy; // view port bottom boundnd
-		var aw = t._popup._elem.offsetWidth;
-		var ah = t._popup._elem.offsetHeight;
+		let ww = window.innerWidth;
+		let wh = window.innerHeight;
+		let sx = (window.scrollX != null) ? window.scrollX : window.pageXOffset;
+		let sy = (window.scrollY != null) ? window.scrollY : window.pageYOffset;
+		let rb = ww + sx; // view port right bound
+		let bb = wh + sy; // view port bottom boundnd
+		let aw = t._popup._elem.offsetWidth;
+		let ah = t._popup._elem.offsetHeight;
 
 		if (x + aw > rb) { // Do not overflow right bound
 			x = rb - aw;
@@ -196,7 +196,7 @@ PopupMenu.prototype.addPopupChild = function(element, popupMenu) {
 PopupMenu.prototype.setMenu = function (menuItems) {
 	if (!menuItems || !Array.isArray(menuItems)) { return; }
 
-	var t = this;
+	let t = this;
 
 	// Clear existing before set a new items.
 	if (Array.isArray(t._menuItems)) {
@@ -205,16 +205,16 @@ PopupMenu.prototype.setMenu = function (menuItems) {
 
 	t._menuItems = menuItems;
 
-	for (var i = 0; i < menuItems.length; i++) {
-		var item = menuItems[i];
+	for (let i = 0; i < menuItems.length; i++) {
+		let item = menuItems[i];
 
-		var menuItem = new MenuItem(item);
+		let menuItem = new MenuItem(item);
 		menuItem.addEventListener("itemHovered", t._hoveredItem);
 		menuItem.addEventListener("itemClicked", t._clickedItem);
 		t._childrenItem.push(menuItem);
 
 		if (Array.isArray(menuItem.getItems())) {
-			var pm = new PopupMenu(t._parentElement);
+			let pm = new PopupMenu(t._parentElement);
 			pm._id = menuItem.getId();
 			pm.setMenu(menuItem.getItems());
 			pm.addEventListener("itemHovered", t._hoveredChildItem);
@@ -230,7 +230,7 @@ PopupMenu.prototype.setMenu = function (menuItems) {
 * @param {Event} e
 */
 PopupMenu.prototype._hoveredChildItem = function (e) {
-	var t = this;
+	let t = this;
 	t._dispatch("itemHovered", e);
 };
 
@@ -238,7 +238,7 @@ PopupMenu.prototype._hoveredChildItem = function (e) {
 * @param {Event} e
 */
 PopupMenu.prototype._clickedChildItem = function (e) {
-	var t = this;
+	let t = this;
 	t._dispatch("itemClicked", e);
 	t.hide();
 };
@@ -247,14 +247,14 @@ PopupMenu.prototype._clickedChildItem = function (e) {
 * @param {Event} e
 */
 PopupMenu.prototype._hoveredItem = function (e) {
-	var t = this;
-	var evt = t._evtArg;
-	var element = e.srcElement;
-	var children = t._children;
+	let t = this;
+	let evt = t._evtArg;
+	let element = e.srcElement;
+	let children = t._children;
 
 	if (element && !!children.length) {
-		for (var i = 0; i < children.length; i++) {
-			var child = children[i];
+		for (let i = 0; i < children.length; i++) {
+			let child = children[i];
 			if (child._id === element.getAttribute("id")) {
 				child.show();
 			} else {
@@ -272,10 +272,10 @@ PopupMenu.prototype._hoveredItem = function (e) {
 * @param {Event} e
 */
 PopupMenu.prototype._clickedItem = function(e) {
-	var t = this;
+	let t = this;
 	if (e.item && e.item.id) {
-		for (var i = 0; i < t._menuItems.length; i++) {
-			var menuItem = t._menuItems[i];
+		for (let i = 0; i < t._menuItems.length; i++) {
+			let menuItem = t._menuItems[i];
 			if (menuItem.id === e.item.id) {
 				t._evtArg["item"] = menuItem;
 				break;

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

@@ -162,13 +162,20 @@ const BlankValues = {
 * @function
 * @param {Array} ary
 * @param {string} str
+* @param {*=} orignalValue
 * @returns {boolean} Returns true if there is any change
 */
-let _pushRawValue = function(ary, str) {
+let _pushRawValue = function(ary, str, orignalValue) {
 	if(str) {
 		if(!BlankValues[str]) {
 			let dateObj = stringToDateObject(str);
 			if(dateObj !== str) {
+				if(orignalValue && typeof orignalValue === "number") {
+					let originalDate = new Date(orignalValue);
+					if(originalDate.getTime()) {
+						dateObj = originalDate;
+					}
+				}
 				ary.push(dateObj);
 			} else {
 				try {
@@ -1890,7 +1897,7 @@ RowFilteringPlugin.prototype.openDialog = function(colIndex, runtimeDialogOption
 		} else if(typeof exp === "function" || typeof exp === "string" || typeof exp === "object") {
 			if(typeof exp === "object") {
 				for(let expKey in exp) {
-					_pushRawValue(userInputs, expKey);
+					_pushRawValue(userInputs, expKey, exp[expKey]);
 				}
 			}
 		}
@@ -2244,7 +2251,8 @@ RowFilteringPlugin.prototype._onDialogFilterChanged = function(e) {
 
 		let jLen = rawVals.length;
 		for(let j = 0; j < jLen; ++j) {
-			itemMap[rawVals[j]] = true;
+			let rawVal = rawVals[j];
+			itemMap[rawVal] = (rawVal instanceof Date) ? rawVal.getTime() : rawVal;
 		}
 	}
 	if(atLeastOne) {

package/lib/tr-grid-util/es6/CellPainter.js

@@ -758,6 +758,12 @@ CellPainter.prototype._getStyles = function(rowData, min, max) {
 * @return {Array.<number>} resultColor
 */
 CellPainter.blendColor = blendColor; // For backward compatability
+/** @private
+* @function
+* @param {Array.<number>} triplet
+* @return {string} resultColor
+*/
+CellPainter.blackAndWhite = getContrastColor; // For backward compatability
 /** @public
 * @function
 * @param {string} rgbCode

package/lib/types/es6/ContextMenu.d.ts

@@ -3,7 +3,7 @@ import Ext from "../../tr-grid-util/es6/Ext.js";
 import MenuEventAPI from "./MenuEventAPI.js";
 import PopupMenu from "./PopupMenu.js";
 import { prettifyCss } from "../../tr-grid-util/es6/Util.js";
-import CellPainter from "../../tr-grid-util/es6/CellPainter.js";
+import { rgb2Hex, num2Hex, hex2Num, blendColor, getContrastColor } from "../../tr-grid-util/es6/Color.js";
 
 declare namespace ContextMenuPlugin {
 

package/lib/types/es6/RowFiltering.d.ts

@@ -32,12 +32,20 @@ declare namespace RowFilteringPlugin {
         rawDataAccessor?: ((...params: any[]) => any)|null,
         formattedDataAccessor?: ((...params: any[]) => any)|null,
         sortLogic?: ((...params: any[]) => any)|null,
+        groupCriteria?: ((...params: any[]) => any)|null,
+        groupSortLogic?: ((...params: any[]) => any)|null,
         itemList?: any[]|null,
         additionalItems?: any[]|null,
         compactMode?: boolean|null,
         blankValues?: (boolean|string)|null
     };
 
+    type FilterEntry = {
+        type?: string|null,
+        label: string,
+        checked: boolean
+    };
+
     type Options = {
         emptySegmentFiltering?: boolean|null,
         separatorFiltering?: boolean|null,

package/lib/versions.json

@@ -1,5 +1,5 @@
 {
-	"tr-grid-util": "1.3.154",
+	"tr-grid-util": "1.3.155",
 	"tr-grid-printer": "1.0.18",
 	"@grid/column-dragging": "1.0.20",
 	"@grid/row-segmenting": "1.0.31",
@@ -16,7 +16,7 @@
 	"tr-grid-column-stack": "1.0.75",
 	"tr-grid-conditional-coloring": "1.0.70",
 	"tr-grid-content-wrap": "1.0.20",
-	"tr-grid-contextmenu": "1.0.41",
+	"tr-grid-contextmenu": "1.0.42",
 	"tr-grid-filter-input": "0.9.41",
 	"tr-grid-heat-map": "1.0.29",
 	"tr-grid-in-cell-editing": "1.0.87",
@@ -24,7 +24,7 @@
 	"tr-grid-percent-bar": "1.0.24",
 	"tr-grid-range-bar": "2.0.8",
 	"tr-grid-row-dragging": "1.0.35",
-	"tr-grid-row-filtering": "1.0.79",
+	"tr-grid-row-filtering": "1.0.80",
 	"tr-grid-row-grouping": "1.0.88",
 	"tr-grid-row-selection": "1.0.30",
 	"tr-grid-rowcoloring": "1.0.25",

package/package.json

@@ -3,6 +3,7 @@
 	"description": "Grid Components Library",
 	"author": "Refinitiv",
 	"license": "SEE LICENSE IN LICENSE",
+	"type": "module",
 	"main": "./lib/grid/index.js",
 	"module": "./lib/grid/index.js",
 	"types": "./lib/types/index.d.ts",
@@ -68,5 +69,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"version": "6.0.112"
+	"version": "6.0.113"
 }