@refinitiv-ui/efx-grid 6.0.99 → 6.0.100

package/lib/core/dist/core.js

@@ -26028,7 +26028,7 @@ Core_Core.prototype._hasPendingRowChange = false;
 * @return {string}
 */
 Core_Core.getVersion = function () {
-	return "5.1.102";
+	return "5.1.103";
 };
 /** {@link ElementWrapper#dispose}
 * @override
@@ -29037,33 +29037,24 @@ Core_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) {
@@ -29073,7 +29064,9 @@ Core_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
@@ -29088,6 +29081,21 @@ Core_Core.prototype.scrollToRow = function (sectionRef, rowIndex, topOfView) {
 	}
 };
 /** @public
+* @return {Object}
+*/
+Core_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_Core.prototype.getVScrollView = function () {