@refinitiv-ui/efx-grid 6.0.40 → 6.0.42

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 = [];