@refinitiv-ui/efx-grid 6.0.69 → 6.0.71

package/lib/column-selection-dialog/lib/column-selection-dialog.js

@@ -1948,12 +1948,19 @@ class ColumnSelectionDialog extends BasicElement {
 			}
 			var index = getItemIndex(this._allColumnList, item.value, 'value');
 			coralItem.selected = true;
-
+			var stationaryCount = this._unmovableColumns;
+			var highligtedRowCount = highligtedRows ? highligtedRows.length : 0;
+			var highligtedIndex;
 			var isInserted = false;
 			if(separatorIndex !== -1 && index < separatorIndex){
-				for(j = 0; j < highligtedRows.length; j++){
-					if(highligtedRows[j] < visibleSeparatorIndex){
-						this._visibleColumnList.splice(highligtedRows[j], 0, coralItem);
+				for(j = 0; j < highligtedRowCount; j++){
+					highligtedIndex = highligtedRows[j];
+					if(highligtedIndex < visibleSeparatorIndex){
+						if(highligtedIndex < stationaryCount){
+							this._visibleColumnList.splice(stationaryCount, 0, coralItem);
+						} else {
+							this._visibleColumnList.splice(highligtedIndex, 0, coralItem);
+						}
 						isInserted = true;
 						break;
 					}
@@ -1962,9 +1969,14 @@ class ColumnSelectionDialog extends BasicElement {
 					this._visibleColumnList.splice(visibleSeparatorIndex, 0, coralItem);
 				}
 			} else {
-				for(j = 0; j < highligtedRows.length; j++){
-					if(highligtedRows[j] > visibleSeparatorIndex){
-						this._visibleColumnList.splice(highligtedRows[j], 0, coralItem);
+				for(j = 0; j < highligtedRowCount; j++){
+					highligtedIndex = highligtedRows[j];
+					if(highligtedIndex > visibleSeparatorIndex){
+						if(highligtedIndex < stationaryCount){
+							this._visibleColumnList.splice(stationaryCount, 0, coralItem);
+						} else {
+							this._visibleColumnList.splice(highligtedIndex, 0, coralItem);
+						}
 						isInserted = true;
 						break;
 					}

package/lib/core/dist/core.js

@@ -24986,7 +24986,14 @@ VirtualizedLayoutGrid.prototype.getFirstIndexInView = function () {
 
 /** @inheritDoc */
 VirtualizedLayoutGrid.prototype.getLastIndexInView = function () {
-	return this._firstIndex + this._getInnerRowCount() - 1;
+	var li = this._firstIndex + this._getInnerRowCount() - 1;
+	var core = this._grid._getContext();
+	var dv = core.getDataSource();
+	var actualLastIndex = dv ? dv.getRowCount() - 1 : -1;
+	if (li > actualLastIndex) { //Avoid incorrect index because the delay of row count synchronization after filtering
+		return actualLastIndex;
+	}
+	return li;
 };
 
 /** @inheritDoc */
@@ -25565,6 +25572,8 @@ VirtualizedLayoutGrid._proto = VirtualizedLayoutGrid.prototype;
 */
 /** @event Core#beforeContentBinding */
 /** @event Core#postSectionDataBinding */
+/** @event Core#firstRendered */
+/** @event Core#afterContentBinding */
 /** @event Core#rowHighlighted */
 
 /** @event Core#rowAdded
@@ -25735,6 +25744,8 @@ var Core_Core = function (opt_initializer) {
 		"beforeContentBinding",
 		"preSectionDataBinding",
 		"postSectionDataBinding",
+		"firstRendered",
+		"afterContentBinding",
 		"rowExpansionBinding",
 		"rowHighlighted",
 		"preForcedUpdate",
@@ -26087,6 +26098,10 @@ Core_Core.prototype._groupDefs = null;
 * @private
 */
 Core_Core.prototype._batches = null;
+/** @type {boolean}
+* @private
+*/
+Core_Core.prototype._firstRendered = false;
 //#region Public Methods
 
 /**
@@ -26094,7 +26109,7 @@ Core_Core.prototype._batches = null;
 * @return {string}
 */
 Core_Core.getVersion = function () {
-	return "5.1.77";
+	return "5.1.80";
 };
 /** {@link ElementWrapper#dispose}
 * @override
@@ -26902,6 +26917,7 @@ Core_Core.prototype.getColumnCount = function () {
 * @fires Core#preSectionDataBinding
 * @fires Core#columnDataBinding
 * @fires Core#postSectionDataBinding
+* @fires Core#afterContentBinding
 */
 Core_Core.prototype.setColumnCount = function(num) {
 	var colCount = this._layoutX.getLaneCount();
@@ -26930,6 +26946,7 @@ Core_Core.prototype.setColumnCount = function(num) {
 * @fires Core#preSectionDataBinding
 * @fires Core#columnDataBinding
 * @fires Core#postSectionDataBinding
+* @fires Core#afterContentBinding
 */
 Core_Core.prototype.insertColumn = function (index, jsonObj) {
 	var prevCount = this.getColumnCount();
@@ -27545,6 +27562,7 @@ Core_Core.prototype._deserializeColumn = function (index, jsonObj) {
 * @fires Core#preSectionDataBinding
 * @fires Core#columnDataBinding
 * @fires Core#postSectionDataBinding
+* @fires Core#afterContentBinding
 */
 Core_Core.prototype.addRow = function (opt_num) {
 	if (opt_num == null) { opt_num = 1; }
@@ -29349,6 +29367,7 @@ Core_Core.prototype.synchronizeHScrollbar = function (subGrid) {
 * @fires Core#preSectionDataBinding
 * @fires Core#columnDataBinding
 * @fires Core#postSectionDataBinding
+* @fires Core#afterContentBinding
 */
 Core_Core.prototype.updateRowData = function (sectionRef, fromRowIndex, lastRowIndex, userParam) {
 	var ss = this.getSectionSettings(sectionRef || "content");
@@ -30483,7 +30502,9 @@ Core_Core.prototype._onSectionDataChanged = function (e) {
 		rowDataCollection = dataView.getMultipleRowData(rids, fromR, toR);
 		e["dataRows"] = rowDataCollection;
 	}
-	if(e["sectionType"] === "content"){
+
+	var isContentSection = e["sectionType"] === "content";
+	if(isContentSection){
 		this._dispatch("beforeContentBinding", e);
 	}
 	this._dispatch("preSectionDataBinding", e);
@@ -30517,10 +30538,24 @@ Core_Core.prototype._onSectionDataChanged = function (e) {
 	this._dispatch("postSectionDataBinding", e);
 	this._dispatchRowExpansionBinding(e);
 
+	if(isContentSection){
+		if(!this._firstRendered) {
+			this._dispatch("firstRendered", e);
+			this._firstRendered = true;
+		}
+		this._dispatch("afterContentBinding", e);
+	}
 	section._startBindingSession(false);
 	this._dispatchingDataChanged = false;
 };
 
+/** @public
+* @ignore
+*/
+Core_Core.prototype.resetInternalState = function() {
+	this._firstRendered = false;
+};
+
 /** @private
 * @param {VScrollbar|HScrollbar} scrollbar
 * @returns {boolean}