@refinitiv-ui/efx-grid 6.0.2 → 6.0.5

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

@@ -91,6 +91,7 @@ var Core = function (opt_initializer) {
 	_t._updateColumnBounds = _t._updateColumnBounds.bind(_t);
 	_t._dispatchColumnPositionChanged = _t._dispatchColumnPositionChanged.bind(_t);
 	_t._dispatchRowPositionChanged = _t._dispatchRowPositionChanged.bind(_t);
+	_t._requestScrollbarUpdate = _t._requestScrollbarUpdate.bind(_t);
 
 	// Text nodes are unintentionally getting in the tag.
 	if(opt_initializer) { // Any node other than element node is not allowed within the tag.
@@ -508,6 +509,10 @@ Core.prototype._preserveProportion = false;
 * @private
 */
 Core.prototype._preserveGridSize = false;
+/** @type {number}
+* @private
+*/
+Core.prototype._rowHeightTimerId = 0;
 //#region Public Methods
 
 /**
@@ -515,7 +520,7 @@ Core.prototype._preserveGridSize = false;
 * @return {string}
 */
 Core.getVersion = function () {
-	return "5.0.50";
+	return "5.0.59";
 };
 /** {@link ElementWrapper#dispose}
 * @override
@@ -834,6 +839,10 @@ Core.prototype.addSectionAt = function (at, opt_type, opt_sectionName) {
 	}
 
 	this._updateSectionIndices(at);
+	if (this._autoSetDataSource) {
+		// This could trigger data binding and column virtualization
+		sectionSettings.setDataSource(this._dataSource);
+	}
 
 	sectType = sectionSettings.getType();
 	if (sectType === "footer") {
@@ -3339,6 +3348,11 @@ Core.prototype.getScrollHeight = function () {
 	}
 	return this._vscrollbar.getContentHeight();
 };
+/** @public
+*/
+Core.prototype.restoreScrollbars = function () {
+	this._vscrollbar.restoreTrackPosition();
+};
 
 /** @public
 * @ignore
@@ -3464,6 +3478,13 @@ Core.prototype.requestRowRefresh = function() {
 		this._rowRefreshTimer = setTimeout(this._onRowRefresh, 100);
 	}
 };
+/** Set a timer to call updateScrollbarHeight only once to avoid performance issue due to multiple call of _updateScrollbarHeight()
+* @public
+*/
+Core.prototype._requestScrollbarUpdate = function() {
+	this._updateScrollbarHeight(true, true);
+	this._rowHeightTimerId = 0;
+};
 
 /** prevent bind data process
 * @public
@@ -4056,9 +4077,6 @@ Core.prototype._newSection = function (opt_type, sectionName) {
 	section.listen("rowCountChanged", this._onRowCountChanged);
 	section.listen("rowHeightChanged", this._onRowHeightChanged);
 
-	if (this._autoSetDataSource) {
-		sectionSettings.setDataSource(this._dataSource);
-	}
 	return sectionSettings;
 };
 
@@ -4349,7 +4367,12 @@ Core.prototype._removeColumn = function (num) {  // TODO: change the logic to us
 */
 Core.prototype._onSectionDataChanged = function (e) {
 	if(this._dispatchingDataChanged) { return; } // Prevent infinite loop
-	this._dispatchingDataChanged = true;
+
+	var colCount = this._layoutX.getLaneCount();
+	this._dispatchingDataChanged = colCount ? true : false;
+	if(!colCount) {
+		return;
+	}
 
 	var fromR = /** @type{number} */(e["fromRowIndex"]);
 	var toR = /** @type{number} */(e["toRowIndex"]);
@@ -4357,6 +4380,9 @@ Core.prototype._onSectionDataChanged = function (e) {
 	var dataView = /** @type{DataView} */(e["dataSource"]);
 	var hasDataView = (dataView && dataView.getDataSource()) ? 1 : 0;
 	var rids, rowDataCollection;
+
+	section._startBindingSession(true);
+
 	if(hasDataView) {
 		rids = dataView.getVisibleRowIds(true);
 		rowDataCollection = dataView.getMultipleRowData(rids, fromR, toR);
@@ -4364,7 +4390,6 @@ Core.prototype._onSectionDataChanged = function (e) {
 	}
 	this._dispatch("preSectionDataBinding", e);
 
-	var colCount = this._layoutX.getLaneCount();
 	var dataMap = this.getDataColumnMap();
 	for (var c = 0; c < colCount; ++c) {
 		if(section["isColumnActive"](c) && (this.isColumnVisible(c) || this._isAlwaysRenderColumn(c))) {
@@ -4395,8 +4420,9 @@ Core.prototype._onSectionDataChanged = function (e) {
 	}
 
 	this._dispatch("postSectionDataBinding", e);
-
 	this._dispatchRowExpansionBinding(e);
+
+	section._startBindingSession(false);
 	this._dispatchingDataChanged = false;
 };
 
@@ -4470,6 +4496,9 @@ Core.prototype._onRowInViewChanged = function (e) { // Triggered from virtualize
 * @param {Object} e
 */
 Core.prototype._onColInViewChanged = function (e) {
+	if(!this.getColumnCount()) {
+		return; // No column for activation and no cell to be rendered
+	}
 	var pfi = e["prevFirstIndex"];
 	var pli = e["prevLastIndex"]; // INCLUSIVE
 	var fi = e["firstIndex"];
@@ -4719,8 +4748,14 @@ Core.prototype._onRowHeightChanged = function (e) {
 		this._rowHeightConflator._needScrollbarUpdate = false;
 		this._updateScrollbarHeight(true, true);
 	} else if(minSectionIndex >= 0) {
-		this._updateScrollbarHeight(minSectionIndex < this._startVScrollbarIndex,
-			minSectionIndex >= this._startVScrollbarIndex);
+		if(this._dispatchingDataChanged){
+			if(!this._rowHeightTimerId){
+				this._rowHeightTimerId = setTimeout(this._requestScrollbarUpdate, 0);
+			}
+		} else {
+			this._updateScrollbarHeight(minSectionIndex < this._startVScrollbarIndex,
+				minSectionIndex >= this._startVScrollbarIndex);
+		}
 	}
 
 	this._dispatchRowPositionChanged();
@@ -4785,7 +4820,7 @@ Core.prototype._onColumnCountChanged = function () {
 	// TODO: Optimize these methods during initialization
 	var pinnedLeft = this._countPinnedLeftColumns();
 	var pinnedRight = this._countPinnedRightColumns();
-	///
+
 	this._updateColumnBounds();
 
 	if (this._hScrollbarEnabled && pinnedLeft + pinnedRight < this.getColumnCount()) {
@@ -5146,7 +5181,8 @@ Core.prototype._updateSectionIndices = function (from) {
 
 /** @private */
 Core.prototype._updateLayout = function () {
-	if(this._disposed) { return; }
+	var element =  this.getElement();
+	if(this._disposed || !element.offsetParent) { return; }
 
 	this._syncLayoutToColumns(); // Update only if need
 

package/lib/core/es6/grid/ILayoutGrid.d.ts

@@ -4,7 +4,7 @@ import TrackLayout from "./util/TrackLayout.js";
 
 declare interface ILayoutGrid extends ElementWrapper {
 
-     hitTest(x: number, y: number, opt_omitSpan?: boolean): any|null;
+     hitTest(x: number, y: number, opt_omitSpan?: boolean): any|null|null;
 
      hitTestX(x: number): number;
 
@@ -76,13 +76,13 @@ declare interface ILayoutGrid extends ElementWrapper {
 
      setRowScalability(rowIndex: number, val: boolean): boolean;
 
-     getCell(colIndex: number, rowIndex: number, opt_includeSpan?: boolean): ElementWrapper;
+     getCell(colIndex: number, rowIndex: number, opt_includeSpan?: boolean): ElementWrapper|null;
 
-     getCellContent(colIndex: number, rowIndex: number): Element|Node|NodeList;
+     getCellContent(colIndex: number, rowIndex: number): Element|Node|NodeList|null;
 
-     setCellContent(colIndex: number, rowIndex: number, data: string|Element|ElementWrapper|any): Element;
+     setCellContent(colIndex: number, rowIndex: number, data: string|Element|ElementWrapper|any): Element|null;
 
-     getColumn(index: number): ElementWrapper;
+     getColumn(index: number): ElementWrapper|null;
 
      getColumnCount(): number;
 
@@ -100,7 +100,7 @@ declare interface ILayoutGrid extends ElementWrapper {
 
      setBorders(lft: boolean, top: boolean, rgt: boolean, btm: boolean): void;
 
-     getColumnStyle(colIndex: number, styleName: string): string|null;
+     getColumnStyle(colIndex: number, styleName: string): string|null|null;
 
      setColumnStyle(colIndex: number, styleName: string, value: string): void;
 
@@ -118,7 +118,7 @@ declare interface ILayoutGrid extends ElementWrapper {
 
      getContentHeight(): number;
 
-     getCellsByRowIndex(rowIndex: number): (ElementWrapper)[];
+     getCellsByRowIndex(rowIndex: number): (ElementWrapper)[]|null;
 
      disableHorizontalGridLine(opt_bool?: boolean): void;
 
@@ -134,7 +134,7 @@ declare interface ILayoutGrid extends ElementWrapper {
 
      setRowHighlight(rowIndex: number): void;
 
-     getSelectedRows(): (number)[];
+     getSelectedRows(): (number)[]|null;
 
      getSelectedRowCount(): number;
 
@@ -172,25 +172,25 @@ declare interface ILayoutGrid extends ElementWrapper {
 
      getRowOffset(): number;
 
-     stretchCell(cellRef: number|Cell, rowIndex?: number, opt_stretching?: boolean, onlyToTheRight?: boolean): Cell;
+     stretchCell(cellRef: number|Cell, rowIndex?: number, opt_stretching?: boolean, onlyToTheRight?: boolean): Cell|null;
 
-     unstretchCell(cellRef: number|Cell, rowIndex?: number): Cell;
+     unstretchCell(cellRef: number|Cell, rowIndex?: number): Cell|null;
 
      unstretchAllCells(): void;
 
-     getStretchedCell(cellRef: number|Cell, rowIndex?: number): Cell;
+     getStretchedCell(cellRef: number|Cell, rowIndex?: number): Cell|null;
 
      getStretchedCells(): (Cell)[];
 
      updateStretchedCells(): boolean;
 
-     getColumnHost(): Element;
+     getColumnHost(): Element|null;
 
-     reserveRightSpace(size: number): Element;
+     reserveRightSpace(size: number): Element|null;
 
-     getReservedSpace(): Element;
+     getReservedSpace(): Element|null;
 
-     getComputedStyle(): CSSStyleDeclaration;
+     getComputedStyle(): CSSStyleDeclaration|null;
 
      isColumnActive(colIndex: number): boolean;
 

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

@@ -528,6 +528,22 @@ LayoutGrid.prototype._setColumnWidth = function (indexX, val) {
 LayoutGrid.prototype._updateColumnLayout = function () {
 	this._syncLayoutToColumns(0);
 };
+/** @public
+ * @ignore
+ * @param {boolean} enabled
+ * @param {number=} fromR
+ * @param {number=} toR
+ */
+LayoutGrid.prototype._startBindingSession = function (enabled, fromR, toR) {
+	// Prevent error when calling _startBindingSession in LayoutGrid
+};
+/** @public
+ * @ignore
+ * @return {Array<boolean>}
+ */
+LayoutGrid.prototype._getTempRowHeights = function () {
+	return null;
+};
 
 /**
  * {@link ILayoutGrid#getRowHeight}
@@ -1369,6 +1385,11 @@ LayoutGrid.prototype.setRowHighlight = function (rowIndex) {
 			this._highlightedCells[c] = cell;
 			cell.addClass("highlighted-row");
 		}
+		var stretchEl = this.getStretchedCell(rowIndex); // check stretched cell
+		if(stretchEl) {
+			this._highlightedCells.push(stretchEl);
+			stretchEl.addClass("highlighted-row");
+		}
 	} else {
 		this._highlightedCells.length = 0;
 	}
@@ -1654,6 +1675,7 @@ LayoutGrid.prototype.insertColumn = function (index, opt_json) {
 				cell.addClass("selected-row");
 			}
 		}
+		// TODO: Check if it can insert column with stretch cell
 	}
 
 	column.activate(atTheMiddle || !this._colVir);
@@ -1885,6 +1907,10 @@ LayoutGrid.prototype.stretchCell = function (cellRef, rowIndex, opt_stretching,
 	} else {
 		cell = this._stretchedCells.unstretchCell(rowIndex);
 	}
+	if(cell) {
+		var selected = this._selectionList.getSelection(rowIndex);
+		cell.enableClass("selected-row", selected); // It's can enable class without get stretch cell again.
+	}
 	return cell;
 };
 
@@ -1967,6 +1993,19 @@ LayoutGrid.prototype._calculateViewSize = function (forceRecal) {
 	}
 	return stretchSize;
 };
+
+/**
+* @private
+* @param {number} rowIndex
+* @param {string} className
+* @param {boolean} enabled
+*/
+LayoutGrid.prototype._enableStretchCellClass = function (rowIndex, className, enabled ) {
+	var stretchEl = this.getStretchedCell(rowIndex); // check stretched cell
+	if(stretchEl) {
+		stretchEl.enableClass(className, enabled);
+	}
+};
 /** View size is width of container (Grid's pane) or content (LayoutGrid's columns), whichever is smaller.
 * @public
 * @ignore
@@ -2650,11 +2689,16 @@ LayoutGrid.prototype._updateCellSpans = function (cellSpans, adding) {
  */
 LayoutGrid.prototype._onMouseMove = function (e) {
 	var target = e["target"];
-	var colElement = Util.closestElement(target, "column");
-	var colIndex = this.getColumnIndex(colElement);
-	var cellElement = (colIndex >= 0) ? Util.closestElement(target, "cell") : null;
 
-	this.setRowHighlight(this.getCellIndex(colIndex, cellElement));
+	var cellElement = Util.closestElement(target, "cell");
+	var colIndex = this._stretchedCells.getColumnIndex(cellElement);
+	if(colIndex < 0) { // Not found colIndex in stretching cell, then get from normal row
+		var colElement = Util.closestElement(target, "column");
+		colIndex =	this.getColumnIndex(colElement);
+	}
+	var rowIndex = this.getCellIndex(colIndex, cellElement);
+
+	this.setRowHighlight(rowIndex);
 };
 
 /**
@@ -2685,27 +2729,16 @@ LayoutGrid.prototype._onMouseOut = function (e) {
  */
 LayoutGrid.prototype._updateSelectionUI = function (rowIndex) { // Update UI of the specified row index
 	var selected = this._selectionList.getSelection(rowIndex);
-
-	for (var c = 0; c < this._colCount; ++c) {
-		var cell = this._columns[c].getCell(rowIndex);
-
-		if (cell) {
-			cell.enableClass("selected-row", selected);
-		}
-	}
+	this._enableStretchCellClass(rowIndex, "selected-row", selected);
+	this.enableRowClass(rowIndex, "selected-row", selected);
 };
 
 /** @private
 * @param {number} rowIndex
 */
 LayoutGrid.prototype._addSelectionUI = function (rowIndex) {
-	for (var c = 0; c < this._colCount; ++c) {
-		var cell = this._columns[c].getCell(rowIndex);
-
-		if (cell) {
-			cell.addClass("selected-row");
-		}
-	}
+	this._enableStretchCellClass(rowIndex, "selected-row", true);
+	this.enableRowClass(rowIndex, "selected-row", true);
 };
 
 /**
@@ -2713,13 +2746,8 @@ LayoutGrid.prototype._addSelectionUI = function (rowIndex) {
  * @param {number} rowIndex
  */
 LayoutGrid.prototype._removeSelectionUI = function (rowIndex) {
-	for (var c = 0; c < this._colCount; ++c) {
-		var cell = this._columns[c].getCell(rowIndex);
-
-		if (cell) {
-			cell.removeClass("selected-row");
-		}
-	}
+	this._enableStretchCellClass(rowIndex, "selected-row", false);
+	this.enableRowClass(rowIndex, "selected-row", false);
 };
 
 /**

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

@@ -67,6 +67,11 @@ Ext.inherits(VirtualizedLayoutGrid, ElementWrapper);
  */
 VirtualizedLayoutGrid.prototype._index = -1;
 
+/** Number of rows offsetting from the first section
+ * @private
+ * @type {number}
+ */
+VirtualizedLayoutGrid.prototype._rowOffset = 0;
 /** For virtualization in Y-Axis
  * @private
  * @type {number}
@@ -128,6 +133,14 @@ VirtualizedLayoutGrid.prototype._boundLayer = null;
 * @private
 */
 VirtualizedLayoutGrid.prototype._hscrollbar = null;
+/** @type {string}
+* @private
+*/
+VirtualizedLayoutGrid.prototype._session = "A";
+/** @type {Array<boolean>}
+* @private
+*/
+VirtualizedLayoutGrid.prototype._tempRowHeights = null;
 
 //#region ====== Override ElementWrapper ======//
 /** @override */
@@ -239,13 +252,68 @@ VirtualizedLayoutGrid.prototype._setColumnWidth = function (indexX, val) {
 VirtualizedLayoutGrid.prototype._updateColumnLayout = function () {
 	this._grid._updateColumnLayout();
 };
+/** @public
+ * @ignore
+ * @param {boolean} enabled
+ */
+VirtualizedLayoutGrid.prototype._startBindingSession = function (enabled) {
+	this._isBinding = enabled;
+	if(!enabled){
+		// Clear old session
+		if(this._tempRowHeights){
+			var defaultRowHeight = this.getDefaultRowHeight();
+			var hasSession = true;
+			var removedIndices = [];
+
+			for(var key in this._tempRowHeights){
+				var index = +key;
+				var rowSession = this._layoutY.getLaneProperty(index, "sizeSession");
+				if(rowSession) {
+					if(rowSession != this._session){
+						this.setRowHeight(index, defaultRowHeight);
+						this._layoutY.setLaneProperty(index, "sizeSession", null);
+						removedIndices.push(index);
+					}
+				}
+			}
+			var removedCount = removedIndices.length;
+			for(var i = 0; i < removedCount; i++){
+				delete this._tempRowHeights[removedIndices[i]];
+			}
+			if(removedCount){
+				for(var remainingKey in this._tempRowHeights){
+					hasSession = remainingKey != null;
+					break;
+				}
+			}
+			if(!hasSession){
+				this._tempRowHeights = null;
+			}
 
+		}
+		this._session = this._session === "A" ? "B" : "A";
+	}
+};
+/** @public
+ * @ignore
+ * @return {Array<boolean>}
+ */
+VirtualizedLayoutGrid.prototype._getTempRowHeights = function () {
+	return this._tempRowHeights;
+};
 /** @inheritDoc */
 VirtualizedLayoutGrid.prototype.getRowHeight = function (index) {
 	return this._layoutY.getLaneSize(index);
 };
 /** @inheritDoc */
 VirtualizedLayoutGrid.prototype.setRowHeight = function (index, val) {
+	if(this._isBinding && val != this.getDefaultRowHeight()){
+		this._layoutY.setLaneProperty(index, "sizeSession", this._session);
+		if(!this._tempRowHeights){
+			this._tempRowHeights = [];
+		}
+		this._tempRowHeights[index] = true; // Store row index that set temporary row height
+	}
 	if(this._layoutY.setLaneSize(index, val)) {
 		this._grid.setRowHeight(index - this._firstIndex, val);
 		this._element.style.height = this._layoutY.getTrackSize() + "px";
@@ -399,6 +467,9 @@ VirtualizedLayoutGrid.prototype.setRowCount = function (val, noBinding) {
 	var prevCount = this._layoutY.getLaneCount();
 	if(prevCount !== val){
 		this._layoutY.setLaneCount(val);
+		if(this._tempRowHeights){
+			this._tempRowHeights.length = val;
+		}
 		this._element.style.height = this._layoutY.getTrackSize() + "px";
 		this._requestUpdatingRowBounds();
 		//After rowCountChanged fires, virtualizer will update virtual row count if

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

@@ -10,11 +10,11 @@ declare class Cell extends ElementWrapper {
 
     public setTextContent(str: string): void;
 
-    public getTextElement(): Element;
+    public getTextElement(): Element|null;
 
     public hasElement(): boolean;
 
-    public getSection(): ILayoutGrid;
+    public getSection(): ILayoutGrid|null;
 
     public initialize(): Element;
 
@@ -34,11 +34,11 @@ declare class Cell extends ElementWrapper {
 
     public insertFloatingIcon(elem: Element, opt_order?: number): void;
 
-    public removeFloatingIcon(elemRef: Element|string): Element|null;
+    public removeFloatingIcon(elemRef: Element|string): Element|null|null;
 
     public insertFrontIcon(elem: Element, opt_order?: number): void;
 
-    public removeFrontIcon(elemRef: Element|string): Element|null;
+    public removeFrontIcon(elemRef: Element|string): Element|null|null;
 
     public updatePadding(): void;
 

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

@@ -9,7 +9,7 @@ declare class CellFloatingPanel extends ElementWrapper {
 
     public insertItem(item: Element, opt_order?: number): void;
 
-    public removeItem(elemRef?: (Element|string)): Element|null;
+    public removeItem(elemRef?: (Element|string)): Element|null|null;
 
     public clearItems(): void;
 

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

@@ -8,19 +8,19 @@ declare class CellSpans {
 
     public shiftColumn(from: number, amount: number): boolean;
 
-    public removeSpan(indexX: number, indexY: number): CellSpan;
+    public removeSpan(indexX: number, indexY: number): CellSpan|null;
 
-    public removeSpanByColIndex(at: number, opt_ary?: (CellSpan)[]): (CellSpan)[];
+    public removeSpanByColIndex(at: number, opt_ary?: (CellSpan)[]): (CellSpan)[]|null;
 
-    public removeSpanStartedFromRowIndex(at: number, opt_ary?: (CellSpan)[]): (CellSpan)[];
+    public removeSpanStartedFromRowIndex(at: number, opt_ary?: (CellSpan)[]): (CellSpan)[]|null;
 
-    public clearAllSpans(): (CellSpan)[];
+    public clearAllSpans(): (CellSpan)[]|null;
 
     public hasSpan(): boolean;
 
-    public getSpan(indexX: number, indexY: number): CellSpan|null;
+    public getSpan(indexX: number, indexY: number): CellSpan|null|null;
 
-    public getOccupyingSpan(indexX: number, indexY: number): CellSpan|null;
+    public getOccupyingSpan(indexX: number, indexY: number): CellSpan|null|null;
 
     public getAllSpans(): (CellSpan)[];
 
@@ -28,9 +28,9 @@ declare class CellSpans {
 
     public getRowSpan(indexX: number, indexY: number): number;
 
-    public setColSpan(indexX: number, indexY: number, spanVal: number): CellSpan;
+    public setColSpan(indexX: number, indexY: number, spanVal: number): CellSpan|null;
 
-    public setRowSpan(indexX: number, indexY: number, spanVal: number): CellSpan;
+    public setRowSpan(indexX: number, indexY: number, spanVal: number): CellSpan|null;
 
 }
 

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

@@ -14,7 +14,7 @@ declare class Column extends ElementWrapper {
 
     public isActive(): boolean;
 
-    public getSection(): ILayoutGrid;
+    public getSection(): ILayoutGrid|null;
 
 }
 

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

@@ -7,11 +7,11 @@ declare class ElementWrapper extends EventDispatcher {
 
     constructor(opt_element?: Element);
 
-    public getContent(opt_allContent?: boolean): Element|Node|NodeList;
+    public getContent(opt_allContent?: boolean): Element|Node|NodeList|null;
 
-    public setContent(content: string|Element|ElementWrapper|any, opt_tooltip?: string): Element;
+    public setContent(content: string|Element|ElementWrapper|any, opt_tooltip?: string): Element|null;
 
-    public addContent(content: Element|Node|ElementWrapper): Element;
+    public addContent(content: Element|Node|ElementWrapper): Element|null;
 
     public removeContent(content: Element|Node|ElementWrapper): boolean;
 
@@ -23,11 +23,11 @@ declare class ElementWrapper extends EventDispatcher {
 
     public dispose(): void;
 
-    public getElement(): Element;
+    public getElement(): Element|null;
 
-    public getNextSibling(): Element|Node;
+    public getNextSibling(): Element|Node|null;
 
-    public getParent(): Element|Node;
+    public getParent(): Element|Node|null;
 
     public setParent(parent: ElementWrapper|Element|Node, opt_prepend?: boolean): void;
 

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

@@ -49,12 +49,14 @@ 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;
 
     public freezeScrolling(frozen?: boolean): boolean;
 
+    public restoreTrackPosition(): void;
+
 }
 
 export default Scrollbar;

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

@@ -1367,6 +1367,19 @@ Scrollbar.prototype.freezeScrolling = function (frozen) {
 	this._isFrozen = frozen !== false;
 	return prev;
 };
+/** @public
+*/
+Scrollbar.prototype.restoreTrackPosition = function () {
+	// Scroll event will be fired asynchronously, if there is any change
+	var track = this._element;
+	if(this._vertical) {
+		track.scrollTop = this._tScrollVal;
+		if(track.scrollTop){
+			this._tScrollVal = track.scrollTop; //Check to ensure that cache equal to element's scroll
+		}
+	}
+	//TODO: handle restore scrollLeft for hscroll
+};
 
 Scrollbar._proto = Scrollbar.prototype;
 

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;