@refinitiv-ui/efx-grid 6.0.40 → 6.0.41

package/lib/column-selection-dialog/lib/column-selection-dialog.d.ts

@@ -23,7 +23,8 @@ declare namespace ColumnSelectionDialog {
         excludedRightColumns?: number|null,
         unmovableColumns?: number|null,
         descriptionBox?: boolean|null,
-        middleSeparator?: string|null
+        middleSeparator?: string|null,
+        collapseAll?: boolean|null
     };
 
 }

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

@@ -22,6 +22,7 @@ import { injectCss, prettifyCss } from "../../tr-grid-util/es6/Util.js";
  * @property {number=} unmovableColumns Depricated, Alias with stationary column option. Number of columns that is unmovable in Visible Columns.
  * @property {boolean=} descriptionBox Show description box
  * @property {string=} middleSeparator Field of column which used as middle separator to divide grid into two sides
+ * @property {boolean=} collapseAll=false Default collapse property applies to all groups
 */
 
 /** Insert multiple items to the given array. This is an in-place modification.
@@ -256,10 +257,15 @@ const _getSelectedItemIndexes = function (list) {
 * @private
 * @param {Object} colObj
 * @param {string} parent parent of this group
+* @param {boolean} defaultExpanded default expand state for tree item
 * @return {Object}
 */
-const _toCoralTreeItem = function (colObj, parent) {
+const _toCoralTreeItem = function (colObj, parent, defaultExpanded) {
 	var label = colObj.label || colObj.title || colObj.name || colObj.field;
+	var expanded = defaultExpanded;
+	if(colObj.expanded != null){
+		expanded = colObj.expanded;
+	}
 	var currentId;
 	if(parent) {
 		currentId = parent + '/' + label;
@@ -272,9 +278,9 @@ const _toCoralTreeItem = function (colObj, parent) {
 			rawValue: colObj.id,
 			value: colObj.id,
 			items: colObj.items.map(function (obj) {
-				return _toCoralTreeItem(obj, currentId);
+				return _toCoralTreeItem(obj, currentId, defaultExpanded);
 			}),
-			expanded: true,
+			expanded: expanded,
 			isGroup: true
 		};
 	} else {
@@ -494,6 +500,7 @@ class ColumnSelectionDialog extends BasicElement {
 		this._pendingTreeRefresh = false;
 		this._pendingResetSearchInput = false;
 		this._middleSeparator = "";
+		this._defaultExpanded = true;
 
 		this._allItemMapping = {};
 		this._filterItemMapping = {};
@@ -574,6 +581,10 @@ class ColumnSelectionDialog extends BasicElement {
 					this._descriptionBox = !!this.config.descriptionBox;
 				}
 
+				if (this.config.collapseAll != null) {
+					this._defaultExpanded = !this.config.collapseAll;
+				}
+
 				this._defaultItems = this.config.defaultItems;
 			}
 		}
@@ -766,7 +777,10 @@ class ColumnSelectionDialog extends BasicElement {
 		}
 
 		if(this._pendingScroll) {
-			this._visibleColumnsContainer.scrollTop = this._visibleColumnsContainer.scrollHeight;
+			var selectedIndexes = _getSelectedItemIndexes(this._visibleColumnList);
+			if (selectedIndexes.length) {
+				scrollToItem(this._visibleColumnsContainer, selectedIndexes[0]);
+			}
 			this._pendingScroll = false;
 		}
 
@@ -879,9 +893,11 @@ class ColumnSelectionDialog extends BasicElement {
 
 		}
 
-		this._allColumnList = allItems.map(function (obj) {
-			return _toCoralTreeItem(obj);
-		});
+		this._allColumnList = [];
+		for(i = 0; i < allItems.length; i++){
+			item = allItems[i];
+			this._allColumnList.push(_toCoralTreeItem(item, null, this._defaultExpanded));
+		}
 		this._allItemMapping = _createMapping(this._allColumnList, 'value');
 
 		this._visibleColumnList = [];

package/lib/core/dist/core.js

@@ -25917,7 +25917,7 @@ Core_Core.prototype._batches = null;
 * @return {string}
 */
 Core_Core.getVersion = function () {
-	return "5.1.57";
+	return "5.1.59";
 };
 /** {@link ElementWrapper#dispose}
 * @override
@@ -26864,16 +26864,12 @@ Core_Core.prototype.removeColumnAt = function (index) {
 
 	if (this._hasListener("columnRemoved")) {
 		var e = {};
-		var batches = this._batches;
-		if(batches){
-			e["batches"] = batches;
-		}
 		e["atTheMiddle"] = true;
 		e["colIndex"] = index;
 		e["columns"] = "deprecated";
 		e["columnData"] = colDef["columnData"];
 		e["colId"] = colDef["id"] || "";
-		this._dispatch("columnRemoved", e);
+		this._dispatchColumnEvent("columnRemoved", e);
 	}
 
 	// Last index in view here might be different from before moving column if columns have different width.
@@ -27126,7 +27122,7 @@ Core_Core.prototype._moveColumn = function (fromCol, destCol) {
 		e["fromColIndex"] = fromCol;
 		e["toColIndex"] = destCol;
 		e["colId"] = colId; // TODO: Id may not needed
-		this._dispatch("columnMoved", e);
+		this._dispatchColumnEvent("columnMoved", e); // add remove move
 	}
 
 	// Last index in view here might be different from before moving column if columns have different width.
@@ -27196,6 +27192,9 @@ Core_Core.prototype.reorderColumns = function (colRefs, destCol) {
 		destId = destCol;
 	}
 
+	this.startBatch("move");
+
+	var dirty = 0;
 	if(Array.isArray(colRefs)) {
 		var srcLen = colRefs.length;
 		if(srcLen > 1) {
@@ -27238,7 +27237,6 @@ Core_Core.prototype.reorderColumns = function (colRefs, destCol) {
 				}
 			}
 
-			var dirty = 0;
 			for(i = srcLen; --i >= 0;) {
 				srcId = srcIds[i]; // Only valid source columns are left at this point
 				srcIdx = this.getColumnIndex(srcId);
@@ -27249,17 +27247,15 @@ Core_Core.prototype.reorderColumns = function (colRefs, destCol) {
 				dirty |= this._moveColumnByIndex(srcIdx, destIdx);
 				destId = srcId;
 			}
-			return dirty ? true : false;
 		} else {
-			return this.moveColumnById(colRefs[0], destId);
+			dirty = this.moveColumnById(colRefs[0], destId);
 		}
-	}
-
-	if(colRefs != null) {
+	} else if(colRefs != null) {
 		// colRefs will be a number or string
-		return this.moveColumnById(colRefs, destId);
+		dirty = this.moveColumnById(colRefs, destId);
 	}
-	return false;
+	this.stopBatch("move");
+	return dirty ? true : false;
 };
 
 /** @public
@@ -29813,6 +29809,17 @@ Core_Core.prototype.stopBatch = function (batchType) {
 
 //#region Private Methods
 /** @private
+* @param {string} type
+* @param {!Object} eventArg
+*/
+Core_Core.prototype._dispatchColumnEvent = function (type, eventArg) {
+	var batches = this._batches;
+	if(batches){
+		eventArg["batches"] = batches;
+	}
+	this._dispatch(type, eventArg);
+};
+/** @private
 */
 Core_Core.prototype._dispatchColumnPositionChanged = function () {
 	if(this._columnPositionConflator.conflate()) {
@@ -30052,20 +30059,16 @@ Core_Core.prototype._dispatchColumnAddedEvent = function (at, count, atTheMiddle
 	if (this._hasListener("columnAdded")) {
 		var e = {};
 		e["atTheMiddle"] = atTheMiddle;
-		var batches = this._batches;
-		if(batches){
-			e["batches"] = batches;
-		}
 		if(count === 1) {
 			e["colIndex"] = at;
 			e["context"] = ctx;
-			this._dispatch("columnAdded", e);
+			this._dispatchColumnEvent("columnAdded", e);
 		} else {
 			var ary = Array.isArray(ctx) ? ctx : [];
 			for (var i = 0; i < count; ++i) {
 				e["colIndex"] = at + i;
 				e["context"] = ary[i];
-				this._dispatch("columnAdded", e);
+				this._dispatchColumnEvent("columnAdded", e);
 			}
 		}
 	}
@@ -30207,15 +30210,11 @@ Core_Core.prototype._removeColumn = function (num) {  // TODO: change the logic
 
 	if (this._hasListener("columnRemoved")) {
 		var e = {};
-		var batches = this._batches;
-		if(batches){
-			e["batches"] = batches;
-		}
 		for (var c = colCount; --c >= newCount; ) {
 			var colDef = removedCols[c - newCount];
 			e["colIndex"] = c;
 			e["columnData"] = colDef ? colDef["columnData"] : null;
-			this._dispatch("columnRemoved", e);
+			this._dispatchColumnEvent("columnRemoved", e);
 		}
 	}
 };