@refinitiv-ui/efx-grid 6.0.111 → 6.0.113

package/lib/rt-grid/dist/rt-grid.js

@@ -36293,7 +36293,7 @@ Core.prototype._hasPendingRowChange = false;
 * @return {string}
 */
 Core.getVersion = function () {
-	return "5.1.112";
+	return "5.1.114";
 };
 /** {@link ElementWrapper#dispose}
 * @override
@@ -39413,9 +39413,16 @@ Core.prototype.getVerticalViewInfo = function() {
 	let viewTop = this._vscrollbar.getScrollTop() + heightOffset;
 	let viewBottom = viewTop + viewHeight;
 
+	let topRowIndex = this._layoutY.hitTest(viewTop) - rowIndexOffset;
+	let bottomRowIndex = this._layoutY.hitTest(viewBottom - 0.1) - rowIndexOffset;
+	let laneTop = this._layoutY.getLaneStart(topRowIndex + rowIndexOffset);
+	let laneBottom = this._layoutY.getLaneEnd(bottomRowIndex + rowIndexOffset);
+
 	return {
-		topRowIndex: this._layoutY.hitTest(viewTop) - rowIndexOffset,
-		bottomRowIndex: this._layoutY.hitTest(viewBottom - 0.1) - rowIndexOffset
+		topRowIndex: topRowIndex,
+		firstFullRow: (laneTop < viewTop) ? topRowIndex + 1 : topRowIndex,
+		lastFullRow: (laneBottom > viewBottom) ? bottomRowIndex - 1 : bottomRowIndex,
+		bottomRowIndex: bottomRowIndex
 	};
 };
 /** @public
@@ -39437,8 +39444,8 @@ Core.prototype.getVScrollView = function () {
 	let topRowIndex = this._layoutY.hitTest(viewTop);
 	let bottomRowIndex = this._layoutY.hitTest(viewBottom - 0.1);
 
-	let laneTop = this._layoutY.getLaneStart(topRowIndex);
-	let laneBottom = this._layoutY.getLaneEnd(bottomRowIndex);
+	let laneTop = this._layoutY.getLaneStart(topRowIndex + rowIndexOffset);
+	let laneBottom = this._layoutY.getLaneEnd(bottomRowIndex + rowIndexOffset);
 
 	let prevAnchor = viewTop - viewHeight;
 	let prevPage = (prevAnchor <= heightOffset) ? rowIndexOffset : this._layoutY.hitTest(prevAnchor) + 1;
@@ -40699,6 +40706,9 @@ Core.prototype._dispatchRowExpansionBinding = function (e) {
 		}
 
 		let ctxRow = section.getContextRow(r);
+		if(!ctxRow) {
+			continue; // The row may have been pushed out of view due to row count or height changed during the binding
+		}
 		let parentId = dataView.getExpansionParentByRowId(rowId);
 		if(parentId) { // dispatch to render row expansion
 			e["originalRowData"] = dataView.getRowData(parentId);
@@ -48797,12 +48807,12 @@ Grid.prototype._focusNextCellContent = function(args) {
 	let grid = this._grid;
 	let section = grid.getSection("content");
 	let viewInfo = grid.getVerticalViewInfo();
-	let bottomRowIndex = viewInfo.bottomRowIndex;
+	let lastFullRow = viewInfo.lastFullRow;
 	let rowCount = this.getRowCount();
 	for(let r = rowIndex; r < rowCount; r++) {
 		for(i = startIdx; i < len; i++) {
 			let c = focusableColIndices[i];
-			if(r > bottomRowIndex) {
+			if(r > lastFullRow) {
 				this._requestScroll(args, c, r);
 				return;
 			} else {
@@ -48852,11 +48862,11 @@ Grid.prototype._focusPrevCellContent = function(args) {
 	let grid = this._grid;
 	let section = grid.getSection("content");
 	let viewInfo = grid.getVerticalViewInfo();
-	let topRowIndex = viewInfo.topRowIndex;
+	let firstFullRow = viewInfo.firstFullRow;
 	for(let r = rowIndex; r >= 0; r--) {
 		for(i = startIdx; i >= 0; i--) {
 			let c = focusableColIndices[i];
-			if(r < topRowIndex) {
+			if(r < firstFullRow) {
 				this._requestScroll(args, c, r);
 				return;
 			} else {
@@ -48910,7 +48920,7 @@ Grid.prototype._onTabNavigation = function(e) {
 	}
 	let startingRowIndex = pos["rowIndex"];
 	if(e.onTheEdge) {
-		let viewInfo = this._grid.getVScrollView();
+		let viewInfo = this._grid.getVerticalViewInfo();
 		startingRowIndex = keyEvt.shiftKey ? viewInfo.lastFullRow : viewInfo.firstFullRow;
 	}
 	let args = {