@refinitiv-ui/efx-grid 6.0.18 → 6.0.19

package/lib/core/es6/data/DataView.d.ts

@@ -188,6 +188,10 @@ declare class DataView extends EventDispatcher {
 
     public enableContentAsHeader(bool?: boolean|null): void;
 
+    public setDefaultCollapse(collapse?: boolean|null): void;
+
+    public getDefaultCollapse(): boolean;
+
     public getVisibleRowCount(): number;
 
     public isRowDataInGroup(rowData: any, groupID?: string|null): boolean;

package/lib/core/es6/data/DataView.js

@@ -1054,7 +1054,7 @@ DataView.prototype.prevPage = DataView.prototype.previousPage;
 * @fires DataView#dataChanged
 */
 DataView.prototype.lastPage = function () {
-	return this.gotoPage(this._lastPageIndex - 1);
+	return this.gotoPage(this._lastPageIndex);
 };
 /** Goes to the first page
 * @public
@@ -1760,6 +1760,20 @@ DataView.prototype.isCollapsed = function() {
 DataView.prototype.enableContentAsHeader = function(bool) {
 	this._shared.contentAsHeader = bool !== false;
 };
+/** set default collapse when new groups added
+* @public
+* @param {boolean=} collapse=false, if enable it, it will be set collapsing by default
+*/
+DataView.prototype.setDefaultCollapse = function(collapse) {
+	this._shared.defaultCollapse = !!collapse;
+};
+/** get default collapse when new groups added
+* @public
+* @return {boolean}
+*/
+DataView.prototype.getDefaultCollapse = function() {
+	return !!this._shared.defaultCollapse; // it can be null, convert to boolean
+};
 /** @private
 * @return {?Array.<string>}
 */
@@ -3678,6 +3692,10 @@ DataView.prototype._addGroup = function (value) {
 		}
 	}
 	member = new DataView();
+	var collapsed = this._shared.defaultCollapse;
+	if(collapsed != null) {
+		member._collapsed = collapsed;
+	}
 	member._groupId = groupId;
 	if(typeof value == "string") { // TODO: Raw value should not always be a string
 		if(value == "null") {

package/lib/core/es6/data/SegmentCollection.js

@@ -440,26 +440,38 @@ SegmentCollection.prototype.getSegmentValues = function(rids) {
 	var prevSegment = null;
 	var segmentValues = new Array(rowCount);
 	var segmentVal = 0;
+	var highestVal = -10;
 	var offset = 0;
 	for(var r = 0; r < rowCount; ++r) {
 		var rid = rids[r];
 		curSegment = segmentSeparators[rid];
-		if(curSegment) {
+		if(curSegment) { // segment separator
+			if(prevSegment !== curSegment) {
+				prevSegment = curSegment;
+				segmentVal = curSegment.getOrder() * 100;
+				if(segmentVal > highestVal) {
+					highestVal = segmentVal;
+				}
+			}
 			offset = 0;
 		} else {
 			var parentId = childToSegmentId[rid];
-			if(parentId) {
+			if(parentId) { // segment member
 				curSegment = segmentSeparators[parentId];
+				if(prevSegment !== curSegment) {
+					prevSegment = curSegment;
+					segmentVal = curSegment.getOrder() * 100;
+					if(segmentVal > highestVal) {
+						highestVal = segmentVal;
+					}
+				}
 				offset = 1;
-			} else {
-				offset = prevSegment ? 10 : 0;
+			} else { // row outside of segments
+				segmentVal = highestVal;
+				offset = 10;
 			}
 		}
 
-		if(curSegment && prevSegment !== curSegment) {
-			prevSegment = curSegment;
-			segmentVal = curSegment.getOrder() * 100;
-		}
 		segmentValues[r] = segmentVal + offset;
 	}
 

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

@@ -528,7 +528,7 @@ Core.prototype._rowHeightTimerId = 0;
 * @return {string}
 */
 Core.getVersion = function () {
-	return "5.1.27";
+	return "5.1.31";
 };
 /** {@link ElementWrapper#dispose}
 * @override

package/lib/core/es6/grid/components/Cell.js

@@ -13,8 +13,6 @@ import CellFloatingPanel from "../components/CellFloatingPanel.js";
 * @param {ILayoutGrid=} opt_section Parent section
 */
 var Cell = function (opt_element, opt_section) {
-	this._onFocus = this._onFocus.bind(this);
-
 	this._id = Cell._runningId++;
 	this._element = document.createElement("div");
 	this._element.className = "cell";
@@ -358,7 +356,6 @@ Cell.prototype.initialize = function () {
 			this._aligner = document.createElement("div");
 		} else {
 			this._aligner = document.createElement("button");
-			this._aligner.addEventListener('focus', this._onFocus);
 		}
 		this._aligner.className = "valigner";
 		if(this._frontIcon) {
@@ -724,16 +721,6 @@ Cell.prototype._updateDisplay = function () {
 		this._element.style.display = "none";
 	}
 };
-
-/** @private
-* @param {Event} e
-*/
-Cell.prototype._onFocus = function (e) {
-	if (!this._section) return;
-
-	var core = this._section._getContext();
-	core.getElement().focus({ preventScroll: true });
-};
 //#endregion Private Methods