@refinitiv-ui/efx-grid 6.0.115 → 6.0.117

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

@@ -621,7 +621,7 @@ Core.prototype._hasPendingRowChange = false;
 * @return {string}
 */
 Core.getVersion = function () {
-	return "5.1.115";
+	return "5.1.117";
 };
 /** {@link ElementWrapper#dispose}
 * @override
@@ -3692,21 +3692,21 @@ Core.prototype.getYScrollVal = function (sectionRef, rowIndex, topOfView) {
 	else if (rowIndex >= rowCount) { rowIndex = rowCount - 1; }
 
 	let viewInfo = this.getVerticalViewInfo();
-	let viewTopIndex = viewInfo.topRowIndex; // TODO: Make it work in zooming mode
+	let firstFullRow = viewInfo.firstFullRow; // TODO: Make it work in zooming mode
 
 	let scrollIndex = -1;
 	if (topOfView) {
 		scrollIndex = rowIndex;
 	} else {
-		if(rowIndex < viewTopIndex) { // Scroll up
+		if(rowIndex < firstFullRow) { // Scroll up
 			scrollIndex = rowIndex - 3; // Have some spaces at the top for more appealing visual
 			if(scrollIndex < 0) {
 				scrollIndex = 0;
 			}
 		} else { // Scroll down
-			let viewBottomIndex = viewInfo.bottomRowIndex;
-			if (rowIndex > viewBottomIndex) {
-				let viewIndexSize = viewBottomIndex - viewTopIndex;
+			let lastFullRow = viewInfo.lastFullRow;
+			if (rowIndex > lastFullRow) {
+				let viewIndexSize = lastFullRow - firstFullRow;
 				scrollIndex = rowIndex - viewIndexSize + 3;
 				if(scrollIndex < 0) {
 					scrollIndex = 0;
@@ -5428,13 +5428,20 @@ Core.prototype.getColumnIndex = function (colRef) {
 		return colRef;
 	} else if(colRef) {
 		let str = colRef;
+		let indexByField = -1;
 		let colCount = this.getColumnCount();
 		for(let c = 0; c < colCount; ++c) {
 			let colDef = this._getColumnDef(c);
-			if(str === colDef["id"] || str === colDef["field"]) {
+			if(str === colDef["id"]){
 				return c;
 			}
+			if(str === colDef["field"]) { // In case colId and field are the same, use colId first and field as a fallback
+				if(indexByField < 0) {
+					indexByField = c;
+				}
+			}
 		}
+		return indexByField;
 	}
 	return -1;
 };

package/lib/grid/index.js

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

package/lib/row-segmenting/es6/RowSegmenting.js

@@ -106,7 +106,10 @@ RowSegmentingPlugin.prototype._predefinedColors = null;
 * @private
 */
 RowSegmentingPlugin._controlClass = "predefined-color-tag";
-
+/** @type {Object}
+* @private
+*/
+RowSegmentingPlugin.prototype._collapsingMap = null;
 
 /** @public
 * @return {string}
@@ -171,45 +174,58 @@ RowSegmentingPlugin.prototype.requestSeparatorRefresh = function () {
 * @private
 */
 RowSegmentingPlugin.prototype._refreshSegmentSeparator = function () {
-	var collapsedMapping = {};
+	var dv = this._getDataView();
+	if (!dv) { return; }
+
+	var collapsingMap = {};
+	if (this._collapsingMap) {
+		collapsingMap = this._collapsingMap;
+		this._collapsingMap = null;
+	}
+
+	var rowId, rowData, segmentId;
+	var dt = dv.getDataSource();
 	var segmentRowIds = this.getSegmentIds() || [];
 	var segmentCount = segmentRowIds.length;
-	if(segmentCount){
-		for(var index = 0; index < segmentCount; index++){
-			var key = segmentRowIds[index];
-			collapsedMapping[key] = this.isSegmentCollapsed(key);
+	if (segmentCount){
+		for(var s = 0; s < segmentCount; s++) {
+			rowId = segmentRowIds[s];
+			rowData = this._rowGetter(dt.getRowData(rowId));
+			segmentId = rowData[this._segmentIdField];
+			if (segmentId) {
+				if (collapsingMap[segmentId] == null) {
+					collapsingMap[segmentId] = this.isSegmentCollapsed(rowId);
+				}
+			}
 		}
 	}
 
-	if(this._prevSegmentBySegmentId) { // Check only the segmentation set by the segment ID field and exclude the segment separator set by the runtime API using the setSegmentSeparator method
+	if (this._prevSegmentBySegmentId) { // Check only the segmentation set by the segment ID field and exclude the segment separator set by the runtime API using the setSegmentSeparator method
 		this._prevSegmentBySegmentId = false;
 		this.unsetAllSegmentSeparators();
+		// Note: if there are chains, their segmenting will be lost here and they cannot be restored
+		// because their children has no segment-id.
 	}
-	var dv = this._getDataView();
-	if(dv) {
-		var dt = dv.getDataSource();
-		var rowIds = dt.getAllRowIds();
-		var rowCount = rowIds.length;
-		var separatorMapping = {};
-		for (var i = 0; i < rowCount; i++) {
-			var rowId = rowIds[i];
-			var rowData = this._rowGetter(dt.getRowData(rowId));
-			var segmentId = rowData[this._segmentIdField];
-			// TODO: supports collapsed and expanded for save/restore
-
-			if(segmentId != null) {
-				if(separatorMapping[segmentId] != null ) {
-					this.addSegmentChild(separatorMapping[segmentId], rowId);
-				} else {
-					separatorMapping[segmentId] = rowId;
-					this.setSegmentSeparator(rowId);
-				}
-				this._prevSegmentBySegmentId = true;
 
-				if(collapsedMapping[rowId]){
-					this.collapseSegment(rowId, collapsedMapping[rowId]);
+	var rowIds = dt.getAllRowIds();
+	var rowCount = rowIds.length;
+	var separatorMap = {};
+	for(var i = 0; i < rowCount; i++) {
+		rowId = rowIds[i];
+		rowData = this._rowGetter(dt.getRowData(rowId));
+		segmentId = rowData[this._segmentIdField];
+
+		if (segmentId != null) {
+			if (separatorMap[segmentId] != null ) {
+				this.addSegmentChild(separatorMap[segmentId], rowId);
+			} else {
+				separatorMap[segmentId] = rowId;
+				this.setSegmentSeparator(rowId);
+				if (collapsingMap[segmentId] != null) {
+					this.collapseSegment(rowId, collapsingMap[segmentId]);
 				}
 			}
+			this._prevSegmentBySegmentId = true;
 		}
 	}
 };
@@ -275,6 +291,29 @@ RowSegmentingPlugin.prototype.config = function (options) {
 	this.addListener(option, "clicked");
 	this.addListener(option, "segmentSeparatorBinding");
 	this.addListener(option, "nonSegmentSeparatorBinding");
+
+	// Collect collapsing states from configuration
+	var collapsingMap = {};
+	var dirty = false;
+	var rows = options.rows;
+	if (rows && rows.length) {
+		var len = rows.length;
+		for (var i = 0; i < len; i++) {
+			var row = rows[i];
+			var segmentId = row.values ? row.values[this._segmentIdField] : null;
+			if (segmentId && collapsingMap[segmentId] == null) {
+				if(row["collapsed"] != null) {
+					dirty = true;
+					collapsingMap[segmentId] = row["collapsed"] ? true : false;
+				}
+			}
+		}
+	}
+
+	if (dirty) {
+		this._collapsingMap = collapsingMap;
+	}
+
 	this.requestSeparatorRefresh();
 };
 
@@ -335,6 +374,10 @@ RowSegmentingPlugin.prototype.getRowConfigObject = function (rowData, rowId) {
 	}
 
 	if(this.isSegmentSeparator(rowId)) {
+		if(obj["collapsed"] == null) { // Avoid overriding value from real-time grid
+			obj["collapsed"] = this.isSegmentCollapsed(rowId);
+		}
+
 		if(!obj.values) {
 			obj.values = {};
 		}