@refinitiv-ui/efx-grid 6.0.98 → 6.0.100

package/lib/core/es6/data/DataView.js

@@ -2384,8 +2384,9 @@ DataView.prototype.stallSorting = function(bool) {
 				this._dispatchDataChange(DataTable._positionChangeArg);
 			}
 		}
+		return true;
 	}
-	return true;
+	return false;
 };
 
 /** Automatically and asyncronuosly remove group that has no member or no content. Predefined groups will not be removed in this way.

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

@@ -327,6 +327,8 @@ declare class Core extends ElementWrapper {
 
     public scrollToRow(sectionRef: Core.SectionReference|null, rowIndex: number, topOfView?: boolean|null): void;
 
+    public getVerticalViewInfo(): any;
+
     public getVScrollView(): any;
 
     public getScrollTop(): number;

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

@@ -574,7 +574,7 @@ Core.prototype._hasPendingRowChange = false;
 * @return {string}
 */
 Core.getVersion = function () {
-	return "5.1.98";
+	return "5.1.103";
 };
 /** {@link ElementWrapper#dispose}
 * @override
@@ -1775,6 +1775,16 @@ Core.prototype._moveColumn = function (fromCol, destCol) {
 		}
 	}
 
+	// The deactivated column may be moved directly or indirectly to the current view. It's necessary to make all columns in view activated.
+	if(!this._frozenLayout) {
+		if(this._colVirtualizer.isEnabled()) {
+			let vBegin = this._colVirtualizer.getFirstIndexInView();
+			if(!((fromCol < vBegin && destCol < vBegin) || (fromCol > vEnd && destCol > vEnd))) { // Columns does not move between hidden columns
+				this._activateColumns(vBegin, vEnd, vBegin, vEnd); // To confirm that all columns in view are activated
+			}
+		}
+	}
+
 	// no need to invoke because moving column does not change column-width
 	// this._syncLayoutToColumns(minColumn, this.getColumnCount());
 
@@ -3573,33 +3583,24 @@ Core.prototype.getYScrollVal = function (sectionRef, rowIndex, topOfView) {
 	}
 
 	let rowCount = this._layoutY.getLaneCount();
-	let rowIndexOffset = (section) ? section.getRowOffset() : this._sectionStarts[this._startVScrollbarIndex];
-
-	if(rowIndexOffset) {
-		rowIndex += rowIndexOffset;
-	}
 	if (rowIndex <= 0) { rowIndex = 0; }
 	else if (rowIndex >= rowCount) { rowIndex = rowCount - 1; }
 
-	let heightOffset = this._layoutY.getLaneStart(rowIndexOffset);
-	let scrollTop = this._vscrollbar.getScrollTop();
-	let viewTop = scrollTop + heightOffset;
-	let viewTopIndex = section ? section.getFirstIndexInView() : this._layoutY.hitTest(viewTop); // TODO: Make it work in zooming mode
+	let viewInfo = this.getVerticalViewInfo();
+	let viewTopIndex = viewInfo.topRowIndex; // TODO: Make it work in zooming mode
 
 	let scrollIndex = -1;
 	if (topOfView) {
 		scrollIndex = rowIndex;
 	} else {
-		if(rowIndex <= viewTopIndex) { // Scroll up
+		if(rowIndex < viewTopIndex) { // Scroll up
 			scrollIndex = rowIndex - 3; // Have some spaces at the top for more appealing visual
 			if(scrollIndex < 0) {
 				scrollIndex = 0;
 			}
 		} else { // Scroll down
-			let viewHeight = this._vscrollbar.getHeight();
-			let viewBottom = viewTop + viewHeight;
-			let viewBottomIndex = section ? section.getLastIndexInView() : this._layoutY.hitTest(viewBottom - 0.1);
-			if (rowIndex >= viewBottomIndex) {
+			let viewBottomIndex = viewInfo.bottomRowIndex;
+			if (rowIndex > viewBottomIndex) {
 				let viewIndexSize = viewBottomIndex - viewTopIndex;
 				scrollIndex = rowIndex - viewIndexSize + 3;
 				if(scrollIndex < 0) {
@@ -3609,7 +3610,9 @@ Core.prototype.getYScrollVal = function (sectionRef, rowIndex, topOfView) {
 		}
 	}
 
-	return (scrollIndex >= 0) ? (this._layoutY.getLaneStart(scrollIndex) - heightOffset) : null;
+	let rowIndexOffset = (section) ? section.getRowOffset() : this._sectionStarts[this._startVScrollbarIndex];
+	let heightOffset = this._layoutY.getLaneStart(this._startVScrollbarIndex);
+	return (scrollIndex >= 0) ? (this._layoutY.getLaneStart(scrollIndex + rowIndexOffset) - heightOffset) : null;
 };
 /** Scroll up or down to make specified row visible in the view
 * @public
@@ -3624,6 +3627,21 @@ Core.prototype.scrollToRow = function (sectionRef, rowIndex, topOfView) {
 	}
 };
 /** @public
+* @return {Object}
+*/
+Core.prototype.getVerticalViewInfo = function() {
+	let rowIndexOffset = this._sectionStarts[this._startVScrollbarIndex];
+	let heightOffset = this._layoutY.getLaneStart(rowIndexOffset);
+	let viewHeight = this._vscrollbar.getHeight();
+	let viewTop = this._vscrollbar.getScrollTop() + heightOffset;
+	let viewBottom = viewTop + viewHeight;
+
+	return {
+		topRowIndex: this._layoutY.hitTest(viewTop) - rowIndexOffset,
+		bottomRowIndex: this._layoutY.hitTest(viewBottom - 0.1) - rowIndexOffset
+	};
+};
+/** @public
 * @return {Object} Returns null if vscrollbar does not exists
 */
 Core.prototype.getVScrollView = function () {
@@ -5721,7 +5739,15 @@ Core.prototype._updateScrollbarHeight = function (paneChanged, contentChanged, n
 		// HACK: Due to fixed layout size we need to scale view size instead of content size, when zooming
 		// TODO: Check if zoom factor is used for virtualization correctly
 		this._rowVirtualizer.setViewSize(viewSize / this._zoomFactor);
-		this._rowVirtualizer.setViewBounds(this._startVScrollbarIndex, this.getFooterCount());
+
+		let offsetRowCount = this._sectionStarts[this._startVScrollbarIndex];
+		let footerCount = this.getFooterCount();
+		let footerRowCount = 0;
+		if(footerCount) {
+			let sectionCount = this.getSectionCount();
+			footerRowCount = this._sectionStarts[sectionCount] - this._sectionStarts[sectionCount - footerCount];
+		}
+		this._rowVirtualizer.setViewBounds(offsetRowCount, footerRowCount);
 	} else {
 		this._rowVirtualizer.validateVirtualization(); // Content height may be changed
 	}

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

@@ -1229,6 +1229,17 @@ SortableTitlePlugin.prototype._getPlugin = function(pluginName) {
 	let host = this._hosts[0];
 	return (host) ? host.getPlugin(pluginName) : null;
 };
+
+/** @public
+* @description Click title to sort with mouse event. This is for testing purpose.
+* @ignore
+* @param {Core} grid
+* @param {Object=} mouseEvt
+*/
+SortableTitlePlugin.prototype.clickTitleByMouse = function (grid, mouseEvt) {
+	this._onClickTitle(grid, mouseEvt);
+};
+
 /** @private
 * @param {Core} grid
 * @param {MouseEvent} e

package/lib/core/es6/grid/util/Virtualizer.js

@@ -299,12 +299,12 @@ Virtualizer.prototype.setViewOffset = function (px) {
 };
 /** @public
 * @ignore
-* @param {number} start
-* @param {number} end
+* @param {number} startItemCount
+* @param {number} endItemCount
 */
-Virtualizer.prototype.setViewBounds = function (start, end) {
-	this._startOffsetCount = start > 0 ? start : 0;
-	this._endOffsetCount = end > 0 ? end : 0;
+Virtualizer.prototype.setViewBounds = function (startItemCount, endItemCount) {
+	this._startOffsetCount = startItemCount > 0 ? startItemCount : 0;
+	this._endOffsetCount = endItemCount > 0 ? endItemCount : 0;
 	this.validateVirtualization(); // Everytime row height is changed
 };
 /** @public

package/lib/grid/index.js

@@ -1,3 +1,3 @@
 import {Grid} from "./lib/efx-grid.js";
 export {Grid}
-window.EFX_GRID = { version: "6.0.98" };
+window.EFX_GRID = { version: "6.0.100" };