@refinitiv-ui/efx-grid 6.0.1 → 6.0.4

package/lib/core/es6/grid/components/HScrollbar.js

@@ -26,6 +26,10 @@ var HScrollbar = function () {
 };
 Ext.inherits(HScrollbar, Scrollbar);
 
+/** @type {number}
+* @private
+*/
+HScrollbar.prototype._pinnedLeftColumnCount = 0;
 /** @type {number}
 * @private
 */
@@ -45,6 +49,7 @@ HScrollbar.prototype.setScrollContent = function (grid, sections, startColIndex,
 	var sectionCount = sections.length;
 	if(sectionCount <= 0) { return; }
 
+	this._pinnedLeftColumnCount = startColIndex >= 0 ? startColIndex : 0;
 	this._pinnedRightColumnCount = pinnedRightColumn > 0 ? pinnedRightColumn : 0;
 	var section = sections[0];
 	var colCount = section.getColumnCount();
@@ -62,8 +67,6 @@ HScrollbar.prototype.setScrollContent = function (grid, sections, startColIndex,
 		var paneElem = pane.getElement();
 		var sliderElem = paneSlider.getElement();
 
-		paneElem.classList.toggle("right-pinning", this._pinnedRightColumnCount ? true : false);
-
 		var c;
 		var column;
 		for (c = 0; c < startColIndex; ++c) {
@@ -91,10 +94,10 @@ HScrollbar.prototype.setScrollContent = function (grid, sections, startColIndex,
 				paneSlider.addContent(rs);
 				content.push(rs);
 			}
-			section._updateRightSpaceStyle(this.isActive() && !this._pinnedRightColumnCount);
+			section._updateRightSpaceStyle();
 		}
 		section._updateLayers(); // Order of the layers may be changed due to change in rightspace and/or column pinning
-		paneSlider._titleSection = section.getElement().classList.contains("title"); // To cache virtualized title section
+		paneSlider._titleSection = section.hasClass("title"); // To cache virtualized title section
 		paneSlider._columns = columns; // To cache virtualized columns
 		paneSlider._content = content; // To cache virtualized columns
 	}
@@ -125,6 +128,19 @@ HScrollbar.prototype.setScrollLeft = function (px) {
 	this._scrollTo(px); // "scroll" event may be fired
 };
 
+/** @public
+* @return {number}
+*/
+HScrollbar.prototype.getPinnedLeftColumnCount = function () {
+	return this.isEnabled() ? this._pinnedLeftColumnCount : 0;
+};
+/** @public
+* @return {number}
+*/
+HScrollbar.prototype.getPinnedRightColumnCount = function () {
+	return this.isEnabled() ? this._pinnedRightColumnCount : 0;
+};
+
 /** @public
 * @ignore
 * @param {number} val

package/lib/core/es6/grid/components/Scrollbar.d.ts

@@ -49,7 +49,7 @@ declare class Scrollbar extends ElementWrapper {
 
     public setMouseWheelSpeed(val: string): void;
 
-    public getDefaultMouseWheelLogic(): ((...params: any[]) => any);
+    public getDefaultMouseWheelLogic(): ((...params: any[]) => any)|null;
 
     public setScrollingStep(px: number): void;
 

package/lib/core/es6/grid/components/StretchedCells.js

@@ -160,10 +160,10 @@ StretchedCells.prototype.getColumnIndex = function (cellRef) {
 		if(cellRef["getElement"]) {
 			var cellElement = cellRef["getElement"]();
 			if(cellElement) {
-				return cellElement._colIndex || 0;
+				return cellElement._colIndex != null ? cellElement._colIndex : -1;
 			}
 		} else {
-			return cellRef._colIndex || 0;
+			return cellRef._colIndex != null ? cellRef._colIndex : -1;
 		}
 	}
 	return -1;

package/lib/core/es6/grid/plugins/SortableTitlePlugin.d.ts

@@ -1,5 +1,5 @@
 import Ext from "../../../../tr-grid-util/es6/Ext.js";
-import Plugin from "./Plugin.js";
+import EventDispatcher from "../event/EventDispatcher.js";
 import Core from "../Core.js";
 import ILayoutGrid from "../ILayoutGrid.js";
 import ElementWrapper from "../components/ElementWrapper.js";
@@ -45,10 +45,16 @@ declare namespace SortableTitlePlugin {
 
 }
 
-declare class SortableTitlePlugin extends Plugin {
+declare class SortableTitlePlugin extends EventDispatcher {
 
     constructor(options?: SortableTitlePlugin.Options);
 
+    public getName(): string;
+
+    public initialize(host: Core, options?: any): void;
+
+    public unload(host: Core): void;
+
     public afterInit(): void;
 
     public config(options?: any): void;
@@ -57,7 +63,7 @@ declare class SortableTitlePlugin extends Plugin {
 
     public getColumnMenu(colIndex: number, config: any): any;
 
-    public getIcons(): { [key: string]:  string };
+    public getIcons(): { [key: string]:  string }|null;
 
     public setSortLogics(sortLogic: { [key: string]:  ((...params: any[]) => any) }): void;
 
@@ -71,9 +77,11 @@ declare class SortableTitlePlugin extends Plugin {
 
     public isColumnSorted(colIndex: number): boolean;
 
-    public getSortedColumns(): (any)[] | null;
+    public getSortedColumns(): (any)[]|null;
+
+    public isSorting(): boolean;
 
-    public sortColumn(colIndex: number, sortOrder?: string, opt_arg?: any): void;
+    public sortColumn(colRef: number|string, sortOrder?: string, opt_arg?: any): void;
 
     public sortColumns(sortOptions: (SortableTitlePlugin.InitialSort)[], opt_arg?: any): void;
 
@@ -85,7 +93,7 @@ declare class SortableTitlePlugin extends Plugin {
 
     public setSortableColumnCount(count: number): void;
 
-    public getSortingStates(): (any)[];
+    public getSortingStates(): (any)[]|null;
 
     public updateSortSymbols(): void;
 

package/lib/core/es6/grid/plugins/SortableTitlePlugin.js

@@ -1,6 +1,6 @@
 /* eslint-disable */
 import Ext from "../../../../tr-grid-util/es6/Ext.js";
-import Plugin from "./Plugin.js";
+import EventDispatcher from "../event/EventDispatcher.js";
 import Core from "../Core.js";
 import ILayoutGrid from "../ILayoutGrid.js";
 import ElementWrapper from "../components/ElementWrapper.js";
@@ -40,7 +40,7 @@ import DataTable from "../../data/DataTable.js";
 */
 
 /** @constructor
-* @extends {Plugin}
+* @extends {EventDispatcher}
 * @param {SortableTitlePlugin.Options=} options
 */
 var SortableTitlePlugin = function (options) { // TODO: Extract SortableTitlePlugin to grid extension.
@@ -72,7 +72,7 @@ var SortableTitlePlugin = function (options) { // TODO: Extract SortableTitlePlu
 		_t.config({ "sorting": options });
 	}
 };
-Ext.inherits(SortableTitlePlugin, Plugin);
+Ext.inherits(SortableTitlePlugin, EventDispatcher);
 
 /**
  * @typedef {"a" | "ascending" | "d" | "descending" | "n" | null} SortableTitlePlugin~SortOrder
@@ -118,6 +118,12 @@ SortableTitlePlugin.ColumnOptions;
  */
 SortableTitlePlugin.Options;
 
+
+/** @type {Array.<Core>}
+* @private
+*/
+SortableTitlePlugin.prototype._hosts = null; // For a plug-in that support multi-table
+
 /** Order of item indicates sort priorities used in DataView. <br>
 * Each state contains column name{string}, sort order {string}, and rendering cell {ElementWrapper}
 * @private
@@ -222,13 +228,17 @@ var CODE_DOWN = "\u25BC";
 */
 var CODE_DIAMOND = "\u25CA";
 
-/** @override */
+/** The name must be readonly and unique among all other plugins
+* @public
+* @return {string}
+*/
 SortableTitlePlugin.prototype.getName = function () {
 	return "SortableTitlePlugin"; // Read Only
 };
 
-/**
-* @override
+/** @public
+* @param {!Core} host
+* @param {Object=} options
 * @description Suppress google compiler for argument options because Internal Plugin doesn't support.
 * @suppress {checkTypes}
 */
@@ -247,7 +257,10 @@ SortableTitlePlugin.prototype.initialize = function (host, options) {
 	this.config(options);
 };
 
-/** @override */
+/**For disposing any resource
+* @public
+* @param {!Core} host
+*/
 SortableTitlePlugin.prototype.unload = function (host) {
 	var at = this._hosts.indexOf(host);
 	if (at < 0) { return; }
@@ -638,31 +651,18 @@ SortableTitlePlugin.prototype.getSortOrder = function (colIndex) {
 * @return {number} Return negative value if there is no sorted column
 */
 SortableTitlePlugin.prototype.getSortedColumnIndex = function (priority) {
-	var state = this._sortStates[priority || 0];
-	if (state) {
-		var host = this._hosts[0];
-		var colCount = host ? host.getColumnCount() : 0;
-		for (var c = 0; c < colCount; ++c) {
-			var sortOptions = this._getSortOptions(c);
-			if (sortOptions === state) {
-				return c;
-			}
-		}
-	}
-	return -1;
+	return this._getColumnIndexByOptions(this._sortStates[priority || 0]);
 };
-/** @public
+/** Start with 0 (the first column that is being sorted). The highest number will be sorted last. Negative value means the specified column is not sorted
+* @public
 * @param {number} colIndex
-* @return {number} Start with 0 (first column to be sorted) and end in the highest number. Negative means the specified column is not sorted
+* @return {number}
 */
 SortableTitlePlugin.prototype.getSortPriority = function (colIndex) {
-	var sortOptions = this._getSortOptions(colIndex);
-	if (sortOptions && sortOptions["sortOrder"]) {
-		var len = this._sortStates.length;
-		for (var i = 0; i < len; ++i) {
-			if (this._sortStates[i] === sortOptions) {
-				return i;
-			}
+	var len = this._sortStates.length;
+	for (var i = 0; i < len; ++i) {
+		if (this._sortStates[i] === this._getSortOptions(colIndex)) {
+			return i;
 		}
 	}
 	return -1;
@@ -675,7 +675,7 @@ SortableTitlePlugin.prototype.isColumnSorted = function (colIndex) {
 	return this.getSortPriority(colIndex) >= 0;
 };
 /** @public
-* @return {Array.<Object> | null} Array of object with "colIndex" and "sortOrder"
+* @return {Array.<Object>} Array of object with "colIndex" and "sortOrder"
 */
 SortableTitlePlugin.prototype.getSortedColumns = function () {
 	var len = this._sortStates.length;
@@ -684,28 +684,33 @@ SortableTitlePlugin.prototype.getSortedColumns = function () {
 	var arr = new Array(len);
 	for (var i = 0; i < len; ++i) {
 		var colIndex = this.getSortedColumnIndex(i);
+		var state = this._sortStates[i];
 		arr[i] = {
 			"colIndex": colIndex,
-			"sortOrder": this._sortStates[i]["sortOrder"] || "n"
+			"field": state["field"] || "",
+			"sortOrder": state["sortOrder"] || "n"
 		};
 	}
 	return arr;
 };
+/** @public
+* @return {boolean}
+*/
+SortableTitlePlugin.prototype.isSorting = function () {
+	return this._sortStates.length ? true : false;
+};
 
 /** @public
-* @param {number} colIndex
+* @param {number|string} colRef Column index or field
 * @param {string=} sortOrder "a" for ascending, "d" for descending, and "n" for no sorting
 * @param {Object=} opt_arg Event argument to be sent with preDataSorting event
 * @fires SortableTitlePlugin#preDataSorting
 * @fires SortableTitlePlugin#columnSorted
 */
-SortableTitlePlugin.prototype.sortColumn = function (colIndex, sortOrder, opt_arg) {
-	if (colIndex >= 0) { // ColIndex can be greater than the host column count, to allow default sorting
-
-		var state = this._preSortColumn(colIndex, sortOrder);
-		if (state) {
-			this._sortColumn([state], opt_arg);
-		}
+SortableTitlePlugin.prototype.sortColumn = function (colRef, sortOrder, opt_arg) {
+	var state = this._prepareSorting(colRef, sortOrder);
+	if (state) {
+		this._sortColumn([state], opt_arg);
 	}
 };
 
@@ -721,7 +726,14 @@ SortableTitlePlugin.prototype.sortColumns = function (sortOptions, opt_arg) {
 		var states = [];
 		for (var i = 0; i < sortOptions.length; i++) {
 			var opt = sortOptions[i];
-			var state = this._preSortColumn(opt["colIndex"], opt["sortOrder"] || opt["order"]);
+			var colRef = opt["colIndex"];
+			if(colRef < 0 || colRef == null) {
+				colRef = opt["field"];
+			}
+			var state = this._prepareSorting(
+				colRef,
+				opt["sortOrder"] || opt["order"]
+			);
 			if (state) {
 				states[i] = state;
 			}
@@ -750,7 +762,6 @@ SortableTitlePlugin.prototype.refresh = function () {
 
 /** @description Perform sorting with the same parameter. Alias to {@link SortableTitlePlugin#refresh}
 * @public
-* @override
 * @function
 */
 SortableTitlePlugin.prototype.restoreUserActions = SortableTitlePlugin.prototype.refresh;
@@ -818,20 +829,24 @@ SortableTitlePlugin.prototype.setDataColumnNames = SortableTitlePlugin.prototype
 * @return {string} field A field used for sorting
 */
 SortableTitlePlugin.prototype.getColumnSortingField = function (colIndex) {
-	var options = this._getSortOptions(colIndex);
+	var sortOptions = this._getSortOptions(colIndex);
 	// options["field"] is already consolidated from field, sortBy, and sortable properties.
-	var field = (options) ? options["field"] : null;
+	var field = (sortOptions) ? sortOptions["field"] : null;
 
-	if (field == null && !this._rowDefMode) { // Old CompositeGrid may stored sorting field in DataColumnName
+	if (field == null && !this._rowDefMode) { // Old CompositeGrid may store sorting field in DataColumnName
 		var host = this._hosts[0];
 		if (host) {
 			field = host.getDataColumnName(colIndex);
+			if(field && sortOptions) {
+				sortOptions["field"] = field; // Cache for later use
+			}
 		}
 	}
 
 	return field || "";
 };
-/** @public
+/** This is equivalent to setting sortBy in the configuration object.
+* @public
 * @param {number} colIndex
 * @param {string|null} field A field used for sorting
 * @param {Function=} sortLogic
@@ -852,21 +867,26 @@ SortableTitlePlugin.prototype.setColumnSortingField = function (colIndex, field,
 		}
 	}
 };
-/** @public
+/** Return array of the fields from the currently sorted columns
+* @public
 * @return {!Array.<string>} fields of each sorting states
 */
 SortableTitlePlugin.prototype.getColumnSortingFields = function () {
-	var ary = [];
+	var len = this._sortStates.length;
+	var ary = new Array(len);
 	var host = this._hosts[0];
-	var colCount = host ? host.getColumnCount() : 0;
-	for (var c = 0; c < colCount; ++c) {
-		var sortOptions = this._getSortOptions(c);
-		if (sortOptions && sortOptions["sortOrder"]) {
-			var priority = this._sortStates.indexOf(sortOptions);
-			if (priority >= 0) {
-				ary[priority] = this.getColumnSortingField(c);
+
+	for(var i = 0; i < len; ++i) {
+		var sortOptions = this._sortStates[i];
+		var field = sortOptions["field"];
+		if(!field && !this._rowDefMode) {
+			var colIndex = this._getColumnIndexByOptions(sortOptions); // Slow
+			field = host.getDataColumnName(colIndex);
+			if(field) {
+				sortOptions["field"] = field; // Cache for later use
 			}
 		}
+		ary[i] = field || "";
 	}
 	return ary;
 };
@@ -1110,7 +1130,7 @@ SortableTitlePlugin.prototype._proceedSorting = function (hitObj) {
 	if (this._canClickToSort(hitObj)) {
 		var colIndex = hitObj["colIndex"];
 		// _proceedSorting() method is always produced by user clicking at the header // Thus, this operation is guaranteed to be a user action
-		var state = this._preSortColumn(colIndex);
+		var state = this._prepareSorting(colIndex);
 		if (state) {
 			this._sortColumn([state], { "isUserAction": true });
 		}
@@ -1134,6 +1154,14 @@ SortableTitlePlugin.prototype._onMouseDown = function (e) {
 	}
 };
 /** @private
+* @param {string} pluginName
+* @return {*|null}
+ */
+SortableTitlePlugin.prototype._getPlugin = function(pluginName) {
+	var host = this._hosts[0];
+	return (host) ? host.getPlugin(pluginName) : null;
+};
+/** @private
 * @param {Core} grid
 * @param {MouseEvent} e
  */
@@ -1288,23 +1316,36 @@ SortableTitlePlugin.prototype.clearAllColumnSortingSequences = function () {
 
 
 /** @private
-* @param {number} colIndex
+* @param {number|string} colRef Column index or field
 * @param {string=} sortOrder "a" for ascending, "d" for descending, and "n" for no sorting
 * @returns {Object} state Returns null, if nothing is changed
 */
-SortableTitlePlugin.prototype._preSortColumn = function (colIndex, sortOrder) {
-	if (!this._maxCount) { return null; }
+SortableTitlePlugin.prototype._prepareSorting = function (colRef, sortOrder) {
+	if (!this._maxCount) {
+		return null;
+	}
 
-	var priority = this.getSortPriority(colIndex);
-	var curState = (priority >= 0) ? this._sortStates[priority] : null;
+	var colIndex = -1;
+	var field = "";
+	var priority = -1;
+	if(typeof colRef === "number") {
+		colIndex = colRef;
+		field = this.getColumnSortingField(colIndex);
+		priority = this.getSortPriority(colIndex);
+	} else if(typeof colRef === "string") {
+		field = colRef;
+		colIndex = this._getColumnIndexByField(field);
+		var fields = this.getColumnSortingFields();
+		priority = fields.indexOf(field);
+	}
 
+	var curState = (priority >= 0) ? this._sortStates[priority] : null;
 	var curOrder = curState ? curState["sortOrder"] : "n";
 
 	// Getting next sort order
 	var nextOrder = "n";
-	var sortingField = this.getColumnSortingField(colIndex);
 	if (sortOrder == null) { // Auto order switch
-		var sortingSequence = this.getSortingSequence(sortingField);
+		var sortingSequence = this.getSortingSequence(field);
 
 		var sequenceIndex = sortingSequence.indexOf(curOrder);
 		if (sequenceIndex < 0) {
@@ -1329,10 +1370,16 @@ SortableTitlePlugin.prototype._preSortColumn = function (colIndex, sortOrder) {
 	}
 
 	if (nextOrder === "a" || nextOrder === "d") { // Reorder sort states
+		if(colIndex < 0 && !field) {
+			return null;
+		}
 		if (!curState) {
 			// TODO: Sort state object should not be sortOptions
 			curState = this._newSortOptions(colIndex); // This may come with sortLogic
 		}
+		if(colIndex < 0) {
+			curState["field"] = field;
+		}
 
 		this._sortStates.push(curState); // Latest sorting have lowest priority (multiColumn sorting)
 	}
@@ -1359,7 +1406,7 @@ SortableTitlePlugin.prototype._preSortColumn = function (colIndex, sortOrder) {
 
 	return { // TODO: Refactor this code as it is only used by "columnSorted" event (unnecessarily complex).
 		"colIndex": colIndex,
-		"sortedField": sortingField,
+		"sortedField": field,
 		"sortOrder": nextOrder || "n",
 		"prevOrder": curOrder,
 		"clearedSortColIndexes": clearedSortColIndexes
@@ -1367,7 +1414,7 @@ SortableTitlePlugin.prototype._preSortColumn = function (colIndex, sortOrder) {
 };
 
 /** @private
-* @param {Array.<Object>} states States from _preSortColumn for dispatching columnSorted event.
+* @param {Array.<Object>} states States from _prepareSorting for dispatching columnSorted event.
 * @param {Object=} opt_arg Event argument to be sent with preDataSorting event
 * @fires SortableTitlePlugin#preDataSorting
 * @fires SortableTitlePlugin#columnSorted
@@ -1394,8 +1441,8 @@ SortableTitlePlugin.prototype._sortColumn = function (states, opt_arg) {
 	this._dispatch("columnSorted", res);
 };
 
-/** @override
-* @ignore
+/** @private
+* @param {Object} e
 */
 SortableTitlePlugin.prototype._onColumnAdded = function (e) {
 	var t = this;
@@ -1417,8 +1464,8 @@ SortableTitlePlugin.prototype._onColumnAdded = function (e) {
 	}
 };
 
-/** @override
-* @ignore
+/** @private
+* @param {Object} e
 * @fires SortableTitlePlugin#preDataSorting
 * @fires SortableTitlePlugin#columnSorted
 */
@@ -1470,7 +1517,7 @@ SortableTitlePlugin.prototype._sortDataView = function (opt_action) {
 		sortLogics = new Array(sortCount);
 		for (var i = 0; i < sortCount; ++i) {
 			orders[i] = this._sortStates[i]["sortOrder"];
-			sortLogics[i] = this._sortStates[i]["sortLogic"];
+			sortLogics[i] = this._sortStates[i]["sortLogic"]; // sortLogic can be null
 		}
 		if(this._rowDefMode) { // DataView in real-time grid has only ROW_DEF column
 			c_ref = this._sortStates.map(SortableTitlePlugin._toRowDefField);
@@ -1552,7 +1599,7 @@ SortableTitlePlugin.prototype._updateSortableIndicator = function (hostIndex) {
 
 			cell["addClass"]("sortable");
 
-			var priority = t._getColumnSortingStatePriority(col);
+			var priority = t.getSortPriority(col);
 			var state = t._sortStates[priority];
 
 			var isSorting = state && state["sortOrder"] !== "n";
@@ -1623,18 +1670,40 @@ SortableTitlePlugin.prototype._createIconElem = function (icon, fallback) {
 };
 
 /** @private
- * @param {number} colIndex
-* @return {number} -1 means not found
+* @param {Object} sortOptions
+* @return {number}
 */
-SortableTitlePlugin.prototype._getColumnSortingStatePriority = function (colIndex) {
-	var t = this;
-	for (var i = t._sortStates.length; --i >= 0;) {
-		var col = t.getSortedColumnIndex(i);
-		if (col === colIndex) return i;
+SortableTitlePlugin.prototype._getColumnIndexByOptions = function (sortOptions) {
+	if(sortOptions) {
+		var host = this._hosts[0];
+		var colCount = host ? host.getColumnCount() : 0;
+		for (var c = 0; c < colCount; ++c) {
+			var colData = host.getColumnData(c); // Equivalent to _getSortOptions() method
+			if (colData) {
+				if(sortOptions === colData["sortableTitle"]) {
+					return c;
+				}
+			}
+		}
+	}
+	return -1;
+};
+/** @private
+* @param {string} field
+* @return {number}
+*/
+SortableTitlePlugin.prototype._getColumnIndexByField = function (field) {
+	if(field) {
+		var host = this._hosts[0];
+		var colCount = host ? host.getColumnCount() : 0;
+		for (var c = 0; c < colCount; ++c) {
+			if(field === this.getColumnSortingField(c)) {
+				return c;
+			}
+		}
 	}
 	return -1;
 };
-
 /** @private
 * @param {number} colIndex
 * @return {Object}
@@ -1657,10 +1726,7 @@ SortableTitlePlugin.prototype._newSortOptions = function (colIndex) {
 	var host = this._hosts[0];
 	var sortOptions = null;
 	if (host && colIndex >= 0) {
-		var colData = host.getColumnData(colIndex);
-		if (!colData) {
-			colData = host.setColumnData(colIndex, {});
-		}
+		var colData = host.getColumnData(colIndex); // colData is guaranteed to exist
 		sortOptions = colData["sortableTitle"];
 		if (!sortOptions) {
 			sortOptions = colData["sortableTitle"] = {};

package/lib/core/es6/grid/util/Conflator.d.ts

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

package/lib/core/es6/grid/util/ElementFrameWork.d.ts

@@ -6,11 +6,11 @@ declare namespace ElementFrameWork {
 
     function isElfv3(): boolean;
 
-    function createIcon(iconName: string): Element;
+    function createIcon(iconName: string): Element|null;
 
-    function createIconButton(iconName: string): Element;
+    function createIconButton(iconName: string): Element|null;
 
-    function createRangeBar(): Element;
+    function createRangeBar(): Element|null;
 
 }
 

package/lib/core/es6/grid/util/HttpRequest.d.ts

@@ -17,7 +17,7 @@ declare class HttpRequest extends EventDispatcher {
 
     public getState(): string;
 
-    public getResponse(): any|string;
+    public getResponse(): any|string|null;
 
     public getResponseText(): string;
 
@@ -27,7 +27,7 @@ declare class HttpRequest extends EventDispatcher {
 
     public setRequestTimeout(timeout: number): void;
 
-    public valueOf(): any|string;
+    public valueOf(): any|string|null;
 
     public toString(): string;
 

package/lib/core/es6/grid/util/PercentBarRenderer.d.ts

@@ -9,7 +9,7 @@ declare class PercentBarRenderer {
 
     public render(cell: ElementWrapper, value: number, opt_max?: number, opt_displayText?: string, opt_textWidth?: number): void;
 
-    public renderForPrinting(cell: ElementWrapper, value: number, opt_max?: number): PercentBar;
+    public renderForPrinting(cell: ElementWrapper, value: number, opt_max?: number): PercentBar|null;
 
     public setAlignment(alignment: string): void;
 

package/lib/core/es6/grid/util/RangeBar.d.ts

@@ -7,7 +7,7 @@ declare class RangeBar extends ElementWrapper {
 
     constructor(opt_element?: Element);
 
-    public static getControl(obj: any): RangeBar;
+    public static getControl(obj: any): RangeBar|null;
 
     public getPercent(): number;