@refinitiv-ui/efx-grid 6.0.122 → 6.0.124

package/lib/core/dist/core.js

@@ -25971,7 +25971,7 @@ Core_Core.prototype._hasPendingRowChange = false;
 * @return {string}
 */
 Core_Core.getVersion = function () {
-	return "5.1.123";
+	return "5.1.124";
 };
 /** {@link ElementWrapper#dispose}
 * @override
@@ -29037,37 +29037,37 @@ Core_Core.prototype.getYScrollVal = function (sectionRef, rowIndex, topOfView) {
 		section = this.getSection(sectionRef);
 	}
 
+	let rowIndexOffset = (section) ? section.getRowOffset() : this._sectionStarts[this._startVScrollbarIndex];
+	let heightOffset = this._layoutY.getLaneStart(this._startVScrollbarIndex);
+
 	let rowCount = this._layoutY.getLaneCount();
 	if (rowIndex <= 0) { rowIndex = 0; }
 	else if (rowIndex >= rowCount) { rowIndex = rowCount - 1; }
 
+	if (topOfView) {
+		return this._layoutY.getLaneStart(rowIndex + rowIndexOffset) - heightOffset;
+	}
+
+	let bufferSize = 2; // for more appealing space
 	let viewInfo = this.getVerticalViewInfo();
 	let firstFullRow = viewInfo.firstFullRow; // TODO: Make it work in zooming mode
-
-	let scrollIndex = -1;
-	if (topOfView) {
-		scrollIndex = rowIndex;
-	} else {
-		if(rowIndex < firstFullRow) { // Scroll up
-			scrollIndex = rowIndex - 2; // Have some spaces at the top for more appealing visual
-			if(scrollIndex < 0) {
-				scrollIndex = 0;
-			}
-		} else { // Scroll down
-			let lastFullRow = viewInfo.lastFullRow;
-			if (rowIndex > lastFullRow) {
-				let viewIndexSize = lastFullRow - firstFullRow;
-				scrollIndex = rowIndex - viewIndexSize + 2;
-				if(scrollIndex < 0) {
-					scrollIndex = 0;
-				}
-			}
+	if(rowIndex < firstFullRow) { // Scroll up, as the target row is outside of view
+		let targetIndex = rowIndex - bufferSize; // Have some spaces at the top for more appealing visual
+		if(targetIndex < 0) {
+			targetIndex = 0;
 		}
+
+		return this._layoutY.getLaneStart(targetIndex + rowIndexOffset) - heightOffset;
 	}
 
-	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;
+	let lastFullRow = viewInfo.lastFullRow;
+	if (rowIndex > lastFullRow) { // Scroll down, as the target row is outside of view
+		let targetScroll = this._layoutY.getLaneStart(rowIndex + rowIndexOffset + bufferSize + 1);
+
+		return targetScroll - viewInfo.viewHeight - heightOffset;
+	}
+
+	return null;
 };
 /** Scroll up or down to make specified row visible in the view
 * @public
@@ -29092,7 +29092,12 @@ Core_Core.prototype.getVerticalViewInfo = function() {
 	let viewBottom = viewTop + viewHeight;
 
 	let topRowIndex = this._layoutY.hitTest(viewTop) - rowIndexOffset;
-	let bottomRowIndex = this._layoutY.hitTest(viewBottom - 0.1) - rowIndexOffset;
+	let bottomRowIndex = this._layoutY.hitTest(viewBottom - 0.1);
+	if(bottomRowIndex < 0) { // view is larger than existing row count
+		bottomRowIndex = this._layoutY.getLaneCount() - 1;
+	}
+	bottomRowIndex -= rowIndexOffset;
+
 	let laneTop = this._layoutY.getLaneStart(topRowIndex + rowIndexOffset);
 	let laneBottom = this._layoutY.getLaneEnd(bottomRowIndex + rowIndexOffset);
 
@@ -29100,7 +29105,10 @@ Core_Core.prototype.getVerticalViewInfo = function() {
 		topRowIndex: topRowIndex,
 		firstFullRow: (laneTop < viewTop) ? topRowIndex + 1 : topRowIndex,
 		lastFullRow: (laneBottom > viewBottom) ? bottomRowIndex - 1 : bottomRowIndex,
-		bottomRowIndex: bottomRowIndex
+		bottomRowIndex: bottomRowIndex,
+		viewHeight: viewHeight,
+		viewTop: viewTop,
+		viewBottom: viewBottom
 	};
 };
 /** @public