@refinitiv-ui/efx-grid 6.0.1 → 6.0.4

package/lib/tr-grid-row-selection/es6/RowSelection.js

@@ -1,8 +1,10 @@
-import { Ext } from '../../tr-grid-util/es6/Ext.js';
-import { EventDispatcher } from '../../tr-grid-util/es6/EventDispatcher.js';
-import { GridPlugin } from '../../tr-grid-util/es6/GridPlugin.js';
-import { isMac as isMacFn } from '../../tr-grid-util/es6/Util.js';
+import { Ext } from "../../tr-grid-util/es6/Ext.js";
+import { EventDispatcher } from "../../tr-grid-util/es6/EventDispatcher.js";
+import { GridPlugin } from "../../tr-grid-util/es6/GridPlugin.js";
+import { isMac as isMacFn } from "../../tr-grid-util/es6/Util.js";
 import { isIE, prepareTSVContent } from "../../tr-grid-util/es6/Util.js";
+import { ElfUtil } from "../../tr-grid-util/es6/ElfUtil.js";
+import { injectCss, prettifyCss } from "../../tr-grid-util/es6/Util.js";
 var isMac = isMacFn();
 /** Fired when selection is changed by mouse down or key press. A change by JavaScript APIs will not trigger this event.
 * @event RowSelectionPlugin#selectionChanged
@@ -25,6 +27,8 @@ var isMac = isMacFn();
 * @property {Function=} beforeSelection=null Handler executed before selection is made
 * @property {boolean=} basedOnContent=false Normally row selection will not move when data sorted, with this option turn on then selection will relocate strictly with row data.
 * @property {string=} selectionField=SELECTED_ROW Normally basedOnContent will set selection state in row data with field name "SELECTED_ROW" but you can change field name here.
+* @property {Function=} menuClicked=null Event Handler when user clicks on menu icon.
+* @property {string=} menuPosition="outside" show icon in column grid that have style outside and non-outside
 */
 
 /** @constructor
@@ -41,6 +45,9 @@ var RowSelectionPlugin = function (options) {
 	t._onBeforeRowRemoved = t._onBeforeRowRemoved.bind(t);
 	t._onReselection = t._onReselection.bind(t);
 	t._onPostSectionDataBinding = t._onPostSectionDataBinding.bind(t);
+	t._onThemeLoaded = t._onThemeLoaded.bind(t);
+	t._onRowPositionChanged = t._onRowPositionChanged.bind(t);
+	t._updateMenuIcon = t._updateMenuIcon.bind(t);
 
 	t._hosts = [];
 	t._anchorRowDict = {};
@@ -100,10 +107,26 @@ RowSelectionPlugin.prototype._isIE = false;
 * @private
 */
 RowSelectionPlugin.prototype._textRange = null;
+/** @type {Function}
+* @private
+*/
+RowSelectionPlugin.prototype._onMenuClicked = null;
+/** @type {Element}
+* @private
+*/
+RowSelectionPlugin.prototype._menuButton = null;
+/** @type {string}
+* @private
+*/
+RowSelectionPlugin.prototype._menuPosition = "outside";
 /** @type {number}
 * @private
 */
 RowSelectionPlugin.prototype._timerId = 0;
+/** @type {number}
+* @private
+*/
+RowSelectionPlugin.prototype._timerMenuId = 0;
 /** @type {(number|null)}
 * @private
 */
@@ -136,6 +159,7 @@ RowSelectionPlugin.prototype.initialize = function (host, options) {
 	host.listen("click", this._onClick);
 	host.listen("keydown", this._onKeyDown);
 	host.listen("postSectionDataBinding", this._onPostSectionDataBinding);
+	host.listen("rowPositionChanged", this._onRowPositionChanged);
 
 	var wrapper = this.getGridApi(host);
 	if(wrapper) {
@@ -147,6 +171,59 @@ RowSelectionPlugin.prototype.initialize = function (host, options) {
 	// host.listen("cut", this._onCopy);
 
 	this.config(options);
+
+	if(this._onMenuClicked) { // use styles menu icon only when want to use icon menu
+		if(RowSelectionPlugin._stylePromise) {
+			RowSelectionPlugin._applyThemeColor(host);
+		} else {
+			RowSelectionPlugin._stylePromise = ElfUtil.getThemeColors();
+			RowSelectionPlugin._stylePromise.then(this._onThemeLoaded);
+		}
+	}
+
+};
+
+/** @private
+* @param {Object} colors
+*/
+RowSelectionPlugin.prototype._onThemeLoaded = function(colors) {
+	if(!RowSelectionPlugin._styles) {
+		var styles = [
+			".row-selection-menu", [
+				"position: absolute;",
+				"background-color: var(--grid-column-menu-icon-bgcolor);",
+				"color: var(--grid-column-menu-icon-color);",
+				"z-index: 1;",
+				"cursor: pointer;",
+				"text-align: center;",
+				"width: 16px;",
+				"height: 16px;",
+				"padding: 6px;"
+			],
+			".row-selection-menu:hover", [
+				"background-color: var(--grid-column-menu-icon-hover-bgcolor);"
+			],
+			".row-selection-menu-inside", [
+				"padding: 4px;"
+			]
+		];
+		RowSelectionPlugin._styles = prettifyCss(styles);
+	}
+	for(var i = this._hosts.length; --i >= 0;) {
+		RowSelectionPlugin._applyThemeColor(this._hosts[i]);
+	}
+};
+/** @private
+* @param {Object} grid core grid instance
+*/
+RowSelectionPlugin._applyThemeColor = function(grid) {
+	if(!grid || grid._rowSelectionStyles) {
+		return;
+	}
+	if(RowSelectionPlugin._styles) {
+		grid._rowSelectionStyles = true; // Prevent loading the same style twice
+		injectCss(RowSelectionPlugin._styles, grid.getParent());
+	}
 };
 /** @public
 * @param {Object=} host core grid instance
@@ -161,12 +238,15 @@ RowSelectionPlugin.prototype.unload = function (host) {
 	host.unlisten("click", this._onClick);
 	host.unlisten("keydown", this._onKeyDown);
 	host.unlisten("postSectionDataBinding", this._onPostSectionDataBinding);
+	host.unlisten("rowPositionChanged", this._onRowPositionChanged);
+
 	this._hosts.splice(at, 1);
 
 	if (!this._hosts.length) {
 		if(this._timerId) {
 			clearTimeout(this._timerId);
 			this._timerId = 0;
+			this._timerMenuId = 0;
 			this._pendingSelection = null;
 		}
 	}
@@ -197,6 +277,14 @@ RowSelectionPlugin.prototype.config = function (options) {
 			if (pluginOptions["selectionField"]) {
 				this._selectionField = pluginOptions["selectionField"];
 			}
+			var val = pluginOptions["menuClicked"];
+			if(typeof val === "function"){
+				this._onMenuClicked = val;
+			}
+			val = pluginOptions["menuPosition"];
+			if(val) {
+				this._menuPosition = val;
+			}
 		} else if (pluginOptions === "single") {
 			this._singleSelMode = true;
 		}
@@ -300,12 +388,12 @@ RowSelectionPlugin.prototype.getFirstSelectedIndex = function (sectRef) {
 		var dv = this._activeGrid ? this._activeGrid.getDataSource() : null;
 		if (!dv) return null;
 
-		var rids = dv.getAllRowIds(true, true);
+		var rids = dv.getVisibleRowIds(true);
 		var rows = dv.getMultipleRowData(rids);
 		var count = rows.length;
 		var dataRow;
 		for (var rowIndex = 0; rowIndex < count; rowIndex++) {
-			dataRow = this._getRowData(rows[rowIndex]);
+			dataRow = this._rowGetter(rows[rowIndex]);
 			if (dataRow && dataRow[this._selectionField]) {
 				return rowIndex;
 			}
@@ -328,12 +416,12 @@ RowSelectionPlugin.prototype.getLastSelectedIndex = function (sectRef) {
 		var dv = this._activeGrid ? this._activeGrid.getDataSource() : null;
 		if (!dv) return null;
 
-		var rids = dv.getAllRowIds(true, true);
+		var rids = dv.getVisibleRowIds(true);
 		var rows = dv.getMultipleRowData(rids);
 		var count = rows.length;
 		var dataRow;
 		for (var rowIndex = count - 1; rowIndex >= 0; rowIndex--) {
-			dataRow = this._getRowData(rows[rowIndex]);
+			dataRow = this._rowGetter(rows[rowIndex]);
 			if (dataRow && dataRow[this._selectionField]) {
 				return rowIndex;
 			}
@@ -357,13 +445,13 @@ RowSelectionPlugin.prototype.getSelectedRows = function (sectRef) {
 		var dv = this._activeGrid ? this._activeGrid.getDataSource() : null;
 		if (!dv) return null;
 
-		var rids = dv.getAllRowIds(true, true);
+		var rids = dv.getVisibleRowIds(true);
 		var rows = dv.getMultipleRowData(rids);
 		var count = rows.length;
 		var selectedRows = [];
 		var dataRow;
 		for (var rowIndex = 0; rowIndex < count; rowIndex++) {
-			dataRow = this._getRowData(rows[rowIndex]);
+			dataRow = this._rowGetter(rows[rowIndex]);
 			if (dataRow && dataRow[this._selectionField]) {
 				selectedRows.push(rowIndex);
 			}
@@ -385,7 +473,7 @@ RowSelectionPlugin.prototype.getSelectedRowIds = function (sectRef) {
 	var selRows = this.getSelectedRows(sectRef);
 	if (selRows) {
 		var dv = this._activeGrid.getDataSource();
-		var rowIds = dv.getAllRowIds(true, true);
+		var rowIds = dv.getVisibleRowIds(true);
 		len = selRows.length;
 		rids = new Array(len);
 		for (i = 0; i < len; ++i) {
@@ -471,6 +559,7 @@ RowSelectionPlugin.prototype.selectAllRows = function (activeGrid) {
 			}
 		}
 	}
+	this._updateMenuIcon();
 };
 
 /** @public
@@ -485,6 +574,7 @@ RowSelectionPlugin.prototype.selectRowRange = function (rowIndex, length, sectRe
 	if (opt_scrollToRow) {
 		this._scrollToRow(rowIndex);
 	}
+	this._updateMenuIcon();
 };
 
 /** @public
@@ -516,8 +606,14 @@ RowSelectionPlugin.prototype._onClick = function (e) {
 		var host = this.getRelativeGrid(e);
 		this._clearPendingClickIndex(host);
 
+		if(!this._basedOnContent) { // Protect against rowPositionChanged and postBindingSection event
+			this._updateMenuIcon();
+		}
 		this._dispatchSelectionChanged(e);
 	}
+	if(this._activeGrid != null){
+		this._activeGrid.focus();
+	}
 };
 /** @private
 * @description Left click will cause single row selection <br>
@@ -550,8 +646,8 @@ RowSelectionPlugin.prototype._onMouseDown = function (e) {
 	if (!ctx["hit"] || ctx["sectionType"] !== "content") { return; }
 	if (e.button === 2) { // Right click at the selected column should override clicking row to select;
 		var csp = this._getPlugin("ColumnSelectionPlugin");
-		if (csp && csp['isEnabled']()) {
-			if (csp['isSelectedColumn'](ctx["colIndex"])) {
+		if (csp && csp["isEnabled"]()) {
+			if (csp["isSelectedColumn"](ctx["colIndex"])) {
 				return;
 			}
 		}
@@ -624,6 +720,9 @@ RowSelectionPlugin.prototype._onMouseDown = function (e) {
 			host.getParent().focus();
 		}
 	}
+	if(!this._basedOnContent) { // Protect against rowPositionChanged and postBindingSection event
+		this._updateMenuIcon();
+	}
 
 	this._dispatchSelectionChanged(e, rowIndex, section);
 };
@@ -644,7 +743,7 @@ RowSelectionPlugin.prototype._onMouseMove = function (e) {
 */
 RowSelectionPlugin.prototype._setPendingClickIndex = function (rowIndex, host) {
 	this._pendingClickIndex = rowIndex;
-	host && host.listen('mousemove', this._onMouseMove);
+	host && host.listen("mousemove", this._onMouseMove);
 };
 
 /** To clear _pendingClickIndex
@@ -653,7 +752,7 @@ RowSelectionPlugin.prototype._setPendingClickIndex = function (rowIndex, host) {
 */
 RowSelectionPlugin.prototype._clearPendingClickIndex = function (host) {
 	this._pendingClickIndex = -1;
-	host && host.unlisten('mousemove', this._onMouseMove);
+	host && host.unlisten("mousemove", this._onMouseMove);
 };
 
 
@@ -757,15 +856,39 @@ RowSelectionPlugin.prototype._onCopy = function (e) {
 */
 RowSelectionPlugin.prototype._onPostSectionDataBinding = function (e) {
 	if (!this._basedOnContent
-		|| 'content' !== e.sectionType
+		|| "content" !== e.sectionType
 		|| !this._activeGrid) {
 		return;
 	}
-	var dataRow, isSelect;
-	for (var rowIndex = e.fromRowIndex; rowIndex < e.toRowIndex; rowIndex++) {
-		dataRow = this._getRowData(e.dataRows[rowIndex]);
-		isSelect = dataRow ? dataRow[this._selectionField] : false;
-		e.section.setSelectedRow(rowIndex, isSelect === true);
+	var section = e.section;
+	var dv = e.dataSource;
+
+	var field = this._selectionField;
+	section.clearSelectedRows();
+
+	var fromR = section.getFirstIndexInView();
+	var toR = section.getLastIndexInView();
+	for (var r = fromR; r < toR; ++r) {
+		var dataRow = this._rowGetter(dv.getRowDataAt(r));
+		if(dataRow) {
+			if(dataRow[field]) {
+				section.setSelectedRow(r, true);
+			}
+		}
+	}
+	this._updateMenuIcon();
+};
+
+/** @private
+* @param {Object} e
+*/
+RowSelectionPlugin.prototype._onRowPositionChanged = function (e) {
+	if(this._timerMenuId) {
+		return;
+	}
+	if(e.sender && e.sender === this._activeGrid) {
+		this._clearMenuIcon(); // Clear icon before re-renderer
+		this._timerMenuId = setTimeout(this._updateMenuIcon, 800);
 	}
 };
 
@@ -839,14 +962,14 @@ RowSelectionPlugin.prototype._clearSelectedRows = function (preserveAnchor) { //
 		if (this._basedOnContent) {
 			var dv = this._activeGrid.getDataSource();
 			if (dv) {
-				var rids = dv.getAllRowIds(true, true);
+				var rids = dv.getVisibleRowIds(true);
 				var rows = dv.getMultipleRowData(rids);
 				var valueList = [];
 				var ridList = [];
 				var dataRow, firstIndex;
 				var len = rows.length;
 				for (i = 0; i < len; i++) {
-					dataRow = this._getRowData(rows[i]);
+					dataRow = this._rowGetter(rows[i]);
 					if (dataRow && dataRow[this._selectionField]) {
 						valueList.push(false);
 						ridList.push(rids[i]);
@@ -875,6 +998,7 @@ RowSelectionPlugin.prototype._clearSelectedRows = function (preserveAnchor) { //
 			this._anchorSection = null;
 		}
 		this._clearPendingClickIndex(this._activeGrid);
+		this._clearMenuIcon();
 	}
 };
 /** @private
@@ -888,6 +1012,10 @@ RowSelectionPlugin.prototype._selectByKey = function (direction, e, pageKey) {
 
 	if (!this._anchorSection) { return; }
 
+	if(this._activeGrid != null){
+		this._activeGrid.focus();
+	}
+
 	var shiftKey = e.shiftKey;
 	var next = 0;
 	var rowLimit = this._anchorSection.getRowCount() - 1;
@@ -913,8 +1041,8 @@ RowSelectionPlugin.prototype._selectByKey = function (direction, e, pageKey) {
 	}
 	if (next < 0) {
 		var csp = this._getPlugin("ColumnSelectionPlugin");
-		if (!shiftKey && csp && csp['isEnabled']()) {
-			csp['selectSingleColumn'](null, this._activeGrid);
+		if (!shiftKey && csp && csp["isEnabled"]()) {
+			csp["selectSingleColumn"](null, this._activeGrid);
 
 			this.clearAllSelections();
 			return;
@@ -937,7 +1065,9 @@ RowSelectionPlugin.prototype._selectByKey = function (direction, e, pageKey) {
 	}
 
 	this._scrollToRow(next);
-
+	if(!this._basedOnContent) { // Protect against rowPositionChanged and postBindingSection event
+		this._updateMenuIcon();
+	}
 	this._dispatchSelectionChanged(e, next);
 };
 /** @private
@@ -975,7 +1105,7 @@ RowSelectionPlugin.prototype._sectionSelectRowRange = function (section, rowInde
 
 		if (dv) {
 			var toRowIndex = rowIndex + length - 1;
-			var rids = dv.getAllRowIds(true, true);
+			var rids = dv.getVisibleRowIds(true);
 			var ridList = [];
 			var valueList = [];
 			for (var r = rowIndex; r <= toRowIndex; r++) {
@@ -1034,6 +1164,74 @@ RowSelectionPlugin.prototype._selectSingleRow = function (section, rowIndex) {
 	return true;
 };
 
+/** @private
+* @return {boolean} return true if can added icon
+*/
+RowSelectionPlugin.prototype._updateMenuIcon = function () {
+	this._timerMenuId = 0;
+	if(!this._onMenuClicked) {
+		return false;
+	}
+	var host = this._activeGrid;
+	var startRowIndex = this.getFirstSelectedIndex();
+	if(startRowIndex == null || !host) { // have no selected rows
+		return false;
+	}
+	var endRowIndex = this.getLastSelectedIndex();
+	var parentEl = host.getParent().parentNode;
+
+	if(!this._menuButton) {
+		this._menuButton = document.createElement("div");
+		this._menuButton.classList.add("row-selection-menu");
+		this._menuButton.addEventListener("click", this._onMenuClicked);
+		var coralIcon = document.createElement("ef-icon");
+		coralIcon.icon = "most-detail";
+		this._menuButton.appendChild(coralIcon);
+	}
+
+	parentEl.appendChild(this._menuButton);
+
+	var menuIconSize = 28; // Currently support 28 and 24 pixel only
+	var rowRect = host.getRowRect(startRowIndex, endRowIndex);
+
+	if( rowRect.scrollViewSize <= rowRect.top || rowRect.height + rowRect.top <= 0) { // hide icon when have no selection in view both left and right
+		this._clearMenuIcon();
+		return false;
+	}
+
+	var leftOffset = rowRect.left + rowRect.width;
+	var topOffset = rowRect.top + rowRect.scrollViewTop;
+	if(this._menuPosition !== "outside") {
+		menuIconSize = 24;
+		this._menuButton.classList.add("row-selection-menu-inside");
+		leftOffset = rowRect.left + rowRect.width - menuIconSize;
+		topOffset = rowRect.top  + rowRect.scrollViewTop - menuIconSize;
+
+		if(rowRect.top < menuIconSize) {
+			topOffset = rowRect.top + rowRect.scrollViewTop;
+		}
+
+	} else {
+		if(rowRect.top <= 0) {
+			topOffset = rowRect.scrollViewTop;
+		}
+
+		if(rowRect.top + menuIconSize >= rowRect.scrollViewSize) { // when move from top to bottom and try to set new position icon
+			topOffset = rowRect.scrollViewSize;
+		}
+	}
+
+	this._menuButton.style.left = leftOffset + "px";
+	this._menuButton.style.top = topOffset + "px";
+	return true;
+};
+
+/** @private */
+RowSelectionPlugin.prototype._clearMenuIcon = function () {
+	if(this._menuButton && this._menuButton.parentNode) {
+		this._menuButton.parentNode.removeChild(this._menuButton);
+	}
+};
 /** @private
 * @param {number} rowIndex
 * @param {number} length
@@ -1131,6 +1329,9 @@ RowSelectionPlugin.prototype._gotoGrid = function (gridIndex) {
 	var sectionIndex = this._anchorSection.getIndex();
 	this.clearSelectedRows(); // Clear all current grid's selections
 	this.selectSingleRow(anchorRow, sectionIndex, this._hosts[gridIndex]); // go to the next grid at the first column
+	if(this._activeGrid != null){
+		this._activeGrid.focus();
+	}
 };
 
 /** @private
@@ -1172,8 +1373,8 @@ RowSelectionPlugin.prototype._dispatchBeforeSelection = function (e, ctx) {
 RowSelectionPlugin.prototype._dispatchSelectionChanged = function (e, rowIndex, section) {
 	if (this._activeGrid) {
 		var csp = this._getPlugin("ColumnSelectionPlugin");
-		if (csp && csp['isEnabled']()) {
-			csp['clearSelection']();
+		if (csp && csp["isEnabled"]()) {
+			csp["clearSelection"]();
 		}
 		var cep = this._getPlugin("CellEditingPlugin");
 		if (cep) {

package/lib/tr-grid-rowcoloring/es6/RowColoring.d.ts

@@ -30,6 +30,8 @@ declare class RowColoringPlugin extends GridPlugin {
 
     public getConfigObject(gridOptions?: any): any;
 
+    public getRowConfigObject(rowId: string): any|null;
+
     public setRowColor(rowRef: string|number, bgColor?: (string|null), txtColor?: (string|null)): void;
 
     public getRowColor(rowRef: string|number): string;

package/lib/tr-grid-rowcoloring/es6/RowColoring.js

@@ -231,6 +231,42 @@ RowColoringPlugin.prototype.getConfigObject = function (gridOptions) {
   return obj;
 };
 /** @public
+* @param {string} rowId
+* @return {Object|null} If this row doesn't contain a config object, return null.
+*/
+
+
+RowColoringPlugin.prototype.getRowConfigObject = function (rowId) {
+  // TODO: Should be call a method for get data from dataTable in tr-grid-util instead of call direct in dataTable
+  var dv = this._getDataView();
+
+  if (!dv) {
+    return null;
+  }
+
+  var dt = dv.getDataSource();
+
+  if (!dt) {
+    return null;
+  }
+
+  var rowData = this._rowGetter(dt.getRowData(rowId)); // get data from dataTable
+
+
+  if (!rowData) {
+    return null;
+  }
+
+  var obj = {}; // Only css field for predefine user color classes are currently supported
+
+  if (rowData[this._cssField]) {
+    obj[this._cssField] = rowData[this._cssField];
+    return obj;
+  }
+
+  return null;
+};
+/** @public
 * @param {string|number} rowRef Row id in the data table or row index
 * @param {(string|null)=} bgColor
 * @param {(string|null)=} txtColor

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

@@ -65,7 +65,7 @@ declare class TextFormattingPlugin extends GridPlugin {
 
     public getColumnFormatOptions(colIndex: number, options?: any): any;
 
-    public getFormatter(colIndex: number): FieldFormatter;
+    public getFormatter(colIndex: number): FieldFormatter|null;
 
     public formatText(colIndex: number, obj: any): string;
 

package/lib/tr-grid-textformatting/es6/TextFormatting.js

@@ -122,6 +122,18 @@ TextFormattingPlugin.prototype.initialize = function (host, options) {
     this.config(options);
   }
 };
+/** @override
+*/
+
+
+TextFormattingPlugin.prototype._afterInit = function () {
+  // WOWRKAROUND : In test-resource and tr-grid-util, avoid using static variables. duplicating DateTime
+  var rtGrid = this._realTimeGrid;
+
+  if (rtGrid && rtGrid.setDateTimeUtil) {
+    rtGrid.setDateTimeUtil(DateTime);
+  }
+};
 /** @public
 * @param {Object} host core grid instance
 */

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

@@ -44,9 +44,9 @@ declare class CellPainter {
 
     constructor();
 
-    public static readonly themeReady: Promise<any>;
+    public static readonly themeReady: Promise<any>|null;
 
-    public static parse(expression: string|((...params: any[]) => any)): ((...params: any[]) => any);
+    public static parse(expression: string|((...params: any[]) => any)): ((...params: any[]) => any)|null;
 
     public dispose(): void;
 
@@ -64,9 +64,9 @@ declare class CellPainter {
 
     public applyThemeColor(): void;
 
-    public getConditions(): (any)[];
+    public getConditions(): (any)[]|null;
 
-    public getColoringType(): CellPainter.ColoringTypes;
+    public getColoringType(): CellPainter.ColoringTypes|null;
 
     public setConditions(conditions: (CellPainter.Condition)[]): void;
 
@@ -96,7 +96,7 @@ declare class CellPainter {
 
     public renderForPrinting(cell: Element, rowData: any, min: number, max: number): void;
 
-    public static blendColor(baseColor: string, maxColor: string, ratio: number): (number)[];
+    public static blendColor(baseColor: string, maxColor: string, ratio: number): (number)[]|null;
 
     public static rgb2Hex(rgbCode: string): string;
 
@@ -104,15 +104,15 @@ declare class CellPainter {
 
     public static num2Rgb(triplet: (number)[]): string;
 
-    public static hex2Num(hex: string): (number)[];
+    public static hex2Num(hex: string): (number)[]|null;
 
     public static hex2Rgb(hex: string): string;
 
     public static setThemeColors(): void;
 
-    public static loadThemeColors(): Promise<any>;
+    public static loadThemeColors(): Promise<any>|null;
 
-    public static reloadThemeColors(): Promise<any>;
+    public static reloadThemeColors(): Promise<any>|null;
 
     public static getOppositeColor(hexCode: string|(number)[]): string;
 

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

@@ -4,9 +4,9 @@ declare class Conflator {
 
     constructor(func?: (((...params: any[]) => any)|number), ms?: (number|((...params: any[]) => any)), thisObj?: any);
 
-    public reset(): any[];
+    public reset(): any[]|null;
 
-    public popAllData(): any[];
+    public popAllData(): any[]|null;
 
     public dispose(): void;
 

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

@@ -2,7 +2,7 @@
 
 declare namespace CoralItems {
 
-    function create(userItems: any[]): (any)[];
+    function create(userItems: any[]): (any)[]|null;
 
 }
 

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

@@ -41,13 +41,13 @@ declare const SECONDS_IN_HOUR: number;
 
 declare const SECONDS_IN_MINUTE: number;
 
-declare const SHORT_DAYS: (string)[];
+declare const SHORT_DAYS: (string)[]|null;
 
-declare const FULL_DAYS: (string)[];
+declare const FULL_DAYS: (string)[]|null;
 
-declare const SHORT_MONTHS: (string)[];
+declare const SHORT_MONTHS: (string)[]|null;
 
-declare const FULL_MONTHS: (string)[];
+declare const FULL_MONTHS: (string)[]|null;
 
 declare function prefixZero(num: number): string;
 

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

@@ -6,7 +6,7 @@ declare class Delay {
 
     public static readonly promise: Promise<any>;
 
-    public static for(ms?: number, ctx?: any): Delay;
+    public static for(ms?: number, ctx?: any): Delay|null;
 
     public resolve(): void;