@refinitiv-ui/efx-grid 6.0.6 → 6.0.7

package/lib/core/dist/core.js

@@ -1711,6 +1711,13 @@ CellFloatingPanel.prototype._items = [];
 CellFloatingPanel.prototype.hasItem = function () {
 	return !!this._items.length;
 };
+/** @public
+ * @param {Element} icon Element of item
+ * @returns {boolean}
+*/
+CellFloatingPanel.prototype.containItem = function (icon) {
+	return this._items.indexOf(icon) > -1;
+};
 /** @public
 * @param {Element} item
 * @param {number=} opt_order The greater the order, the farther the position to the right
@@ -2195,6 +2202,9 @@ Cell.prototype.updateIcon = function(icon) {
 
 	var fi = this._frontIcon;
 	if (fi) {
+		if(fi.containItem(icon)) { // Check same icon which duplicate with insertItem in _frontIcon
+			return;
+		}
 		fi.clearItems();
 	}
 	this.insertFrontIcon(icon, 0);
@@ -4939,7 +4949,11 @@ StretchedCells.prototype.setCellCount = function (count) {
 * @return {Cell}
 */
 StretchedCells.prototype.getCell = function (rowIndex) {
-	return this._cells[rowIndex] || null;
+	var cell = this._cells[rowIndex];
+	if(cell && cell["getParent"]()) {
+		return cell;
+	}
+	return null;
 };
 /** @public
 * @ignore
@@ -4986,13 +5000,13 @@ StretchedCells.prototype.getColumnIndex = function (cellRef) {
 StretchedCells.prototype.getRowIndex = function (cellRef) {
 	if(cellRef) {
 		if(cellRef["getElement"]) {
-			return this._cells.indexOf(cellRef);
+			return cellRef["getParent"]() ? this._cells.indexOf(cellRef) : -1;
 		} else {
 			var cells = this._cells;
 			var rowCount = cells.length;
 			for(var r = 0; r < rowCount; ++r) {
 				var cell = cells[r];
-				if(cell && cell["getElement"]() === cellRef) {
+				if(cell && cell["getParent"]() && cell["getElement"]() === cellRef) {
 					return r;
 				}
 			}
@@ -11889,6 +11903,10 @@ Segment.prototype._collapsed = false;
 * @private
 */
 Segment.prototype._value = 0;
+/** @type {number}
+* @private
+*/
+Segment.prototype._order = 0;
 
 
 /** @public
@@ -12056,6 +12074,18 @@ Segment.prototype.getValue = function() {
 Segment.prototype.setValue = function(val) {
 	this._value = val;
 };
+/** @public
+* @return {number}
+*/
+Segment.prototype.getOrder = function() {
+	return this._order;
+};
+/** @public
+* @param {number} val
+*/
+Segment.prototype.setOrder = function(val) {
+	this._order = val;
+};
 
 
 /* harmony default export */ const data_Segment = (Segment);
@@ -12102,6 +12132,7 @@ SegmentCollection.prototype.addSegment = function(rid) {
 	if(rid && !this._segments[rid]) {
 		if(this._childToSegmentId[rid]) {
 			console.log("child of a segment cannot be set as a segment separator");
+			return false;
 		}
 		this._segments[rid] = new data_Segment(rid);
 		++this._segmentCount;
@@ -12432,8 +12463,27 @@ SegmentCollection.prototype.fillSegments = function(rids) {
 	return change;
 };
 /** @public
+* @param {Array.<string>} rids
+*/
+SegmentCollection.prototype.calcSegmentOrder = function(rids) {
+	var ridCount = rids ? rids.length : 0;
+	var segmentSeparators = this._segments;
+	var segmentCount = this._segmentCount;
+	var order = 0;
+	for(var i = 0; i < ridCount; ++i) {
+		var rid = rids[i];
+		var segment = segmentSeparators[rid];
+		if(segment) {
+			segment.setOrder(++order);
+			if(order >= segmentCount) {
+				break;
+			}
+		}
+	}
+};
+/** @public
 * @param {!Array.<string>} rids Array of row ids
-* @return {Array.<number>} Returns Array of segment values, if there are at least two segments, otherwise returns null
+* @return {Array.<number>} Returns Array of segment values, if there are at least one segment, otherwise returns null
 */
 SegmentCollection.prototype.getSegmentValues = function(rids) {
 	var rowCount = rids ? rids.length : 0;
@@ -12443,51 +12493,33 @@ SegmentCollection.prototype.getSegmentValues = function(rids) {
 	var segmentSeparators = this._segments;
 	var childToSegmentId = this._childToSegmentId;
 	var curSegment = null;
+	var prevSegment = null;
 	var segmentValues = new Array(rowCount);
-	var curSegmentCount = 0;
 	var segmentVal = 0;
-	var r = 0;
-	var childToIndex = {};
-	while(r < rowCount) {
+	var offset = 0;
+	for(var r = 0; r < rowCount; ++r) {
 		var rid = rids[r];
-		if(segmentSeparators[rid]) {
-			++curSegmentCount;
-			curSegment = segmentSeparators[rid];
-			segmentVal += 100;
-			segmentValues[r] = segmentVal;
-			curSegment.setValue(segmentVal);
-			if(curSegmentCount >= this._segmentCount) {
-				++r;
-				break;
-			}
+		curSegment = segmentSeparators[rid];
+		if(curSegment) {
+			offset = 0;
 		} else {
-			if(curSegmentCount) {
-				segmentValues[r] = segmentVal + 10;
+			var parentId = childToSegmentId[rid];
+			if(parentId) {
+				curSegment = segmentSeparators[parentId];
+				offset = 1;
 			} else {
-				segmentValues[r] = 0;
-			}
-			if(childToSegmentId[rid]) {
-				childToIndex[rid] = r;
-			}
-		}
-		++r;
-	}
-	if(curSegmentCount) {
-		while(r < rowCount) {
-			rid = rids[r];
-			segmentValues[r] = segmentVal + 10;
-			if(childToSegmentId[rid]) {
-				childToIndex[rid] = r;
+				offset = prevSegment ? 10 : 0;
 			}
-			++r;
 		}
-		for(var childId in childToIndex) {
-			curSegment = segmentSeparators[childToSegmentId[childId]];
-			segmentValues[childToIndex[childId]] = curSegment.getValue() + 1;
+
+		if(curSegment && prevSegment !== curSegment) {
+			prevSegment = curSegment;
+			segmentVal = curSegment.getOrder() * 100;
 		}
+		segmentValues[r] = segmentVal + offset;
 	}
 
-	return curSegmentCount ? segmentValues : null;
+	return prevSegment ? segmentValues : null;
 };
 
 
@@ -13059,6 +13091,7 @@ DataTable.prototype.removeRows = function(refs) {
 			this._prevData[rid] = this._rows[rid];
 			this._removedRows[rid] = 1;
 			delete this._rows[rid];
+			// TODO: remove segments
 			dirty = true;
 		}
 	}
@@ -13155,6 +13188,7 @@ DataTable.prototype.moveRow = function(fromIndex, toIndex, suppressEvent) {
 
 	if(output) {
 		if(this._segments) {
+			this._segments.calcSegmentOrder(this._rids);
 			this._sort(null); // Reorder segment members
 		}
 		this._dispatchPositionChange(suppressEvent);
@@ -13384,12 +13418,19 @@ DataTable.prototype.isFrozen = function() {
 DataTable.prototype.setSegmentSeparator = function(rid, enabled) {
 	var change = false;
 	var memberCount = 0;
-	if(typeof rid === "string") {
+	if(rid && typeof rid === "string") {
 		if(enabled !== false) {
 			if(!this._segments) {
 				this._segments = new data_SegmentCollection();
 			}
+			if(this._autoSegmentFilling) {
+				var parentId = this._segments.getParentRowId(rid);
+				if(parentId) {
+					this._segments.removeSegmentChild(parentId, rid);
+				}
+			}
 			if(this._segments.addSegment(rid)) {
+				this._segments.calcSegmentOrder(this._rids);
 				change = true;
 			}
 		} else if(this._segments) {
@@ -13691,6 +13732,7 @@ DataTable.prototype.sortSegments = function (compare) {
 	}
 
 	if(dirty) {
+		this._segments.calcSegmentOrder(rids);
 		this._sort(null);
 		this._dispatchPositionChange();
 	}
@@ -23107,7 +23149,7 @@ Core_Core.prototype._rowHeightTimerId = 0;
 * @return {string}
 */
 Core_Core.getVersion = function () {
-	return "5.1.17";
+	return "5.1.20";
 };
 /** {@link ElementWrapper#dispose}
 * @override
@@ -29751,6 +29793,7 @@ SortableTitlePlugin._proto = SortableTitlePlugin.prototype;
 
 
 
+
 // tsd-disable
 var tr = window["tr"];
 if(!tr) {
@@ -29774,6 +29817,7 @@ tr.ColumnStats = data_ColumnStats;
 tr.DataCache = data_DataCache;
 tr.DataTable = data_DataTable;
 tr.DataView = data_DataView;
+tr.SegmentCollection = data_SegmentCollection;
 
 // Components
 grid.CellFloatingPanel = components_CellFloatingPanel;