@refinitiv-ui/efx-grid 6.0.26 → 6.0.27

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

@@ -536,7 +536,7 @@ Core.prototype._groupDefs = null;
 * @return {string}
 */
 Core.getVersion = function () {
-	return "5.1.34";
+	return "5.1.35";
 };
 /** {@link ElementWrapper#dispose}
 * @override

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

@@ -1317,6 +1317,12 @@ Scrollbar.prototype.getDefaultMouseWheelLogic = function () {
 * @param {Event} e
 */
 Scrollbar.prototype._onMouseWheel = function (e) {
+
+	// Blacklist for prevent triggering the scrollbar when the dialog is opened.
+	if(e.target.opened) { // get attribute method doesn't work in elf element
+		return;
+	}
+
 	if (this._isFrozen) {
 		Util._preventDefault(e);
 		return;

package/lib/grid/index.js

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

package/lib/tr-grid-column-grouping/es6/ColumnGrouping.d.ts

@@ -69,12 +69,22 @@ declare class ColumnGroupingPlugin extends GridPlugin {
 
     public moveColumnIntoGroup(colRef: number|string|null, to: number, groupId: string): void;
 
-    public setColumnParent(colRef: number|string|null, groupId: string): void;
+    public setColumnParent(colRef: number|string|null, groupId: string): boolean;
+
+    public addGroupChild(parentId: string, childRef: number|string|null): boolean;
+
+    public removeGroupChild(parentId: string, childRef: number|string|null): boolean;
+
+    public unsetParent(childRef: number|string|null): boolean;
 
     public getValidDestinationIndex(id: string, destCol: number|string|null): number;
 
     public moveGroup(id: string, destCol: number|string|null): void;
 
+    public reorderColumns(colList: (number|string)[]|null, destCol: number|string|null): boolean;
+
+    public moveColumnById(srcCol: number|string|null, destCol?: number|string|null): boolean;
+
 }
 
 export default ColumnGroupingPlugin;

package/lib/tr-grid-column-grouping/es6/ColumnGrouping.js

@@ -591,7 +591,7 @@ ColumnGroupingPlugin.prototype._applyNearestGrouping = function (colIndex) {
       }
     }
     // The current column is no longer close to its parent
-    if (this._groupDefs.removeGroupChild(colId)) {
+    if (this._groupDefs.unsetParent(colId)) {
       chdr = this._groupDefs.getGroupChildren(parentId);
       childCount = chdr ? chdr.length : 0;
       if (childCount === 1) {
@@ -808,7 +808,7 @@ ColumnGroupingPlugin.prototype._onColumnRemoved = function (e) {
   var colData = e.columnData;
   if (colData && colData.columnGrouping) {
     var colId = colData.columnGrouping.id;
-    if (this._groupDefs.removeGroupChild(colId)) {
+    if (this._groupDefs.unsetParent(colId)) {
       this._requestApplyGrouping();
     }
   }
@@ -1002,11 +1002,7 @@ ColumnGroupingPlugin.prototype.setGroupDefinition = function (groupId, groupDef)
       var len = chdr.length;
       // TODO: Filter out group id
       if (len > 1) {
-        var gridApi = this.getGridApi();
-        if (gridApi && gridApi.reorderColumns) {
-          // TODO: Support multi-table feature
-          gridApi.reorderColumns(chdr, chdr[0]); // WARNING: group id doesn't work
-        }
+        this.reorderColumns(chdr, chdr[0]); // WARNING: group id doesn't work
       }
     }
 
@@ -1086,10 +1082,10 @@ ColumnGroupingPlugin.prototype.getChildColumnIndices = function (groupId) {
   var colIds = this._groupDefs.getLeafDescendants(groupId);
   if (colIds) {
     var colIndices = [];
-    var index;
-    for (var i = 0; i < colIds.length; i++) {
-      index = this.getColumnIndex(colIds[i]);
-      if (index > -1) {
+    var leafCount = colIds.length;
+    for (var i = 0; i < leafCount; i++) {
+      var index = this.getColumnIndex(colIds[i]);
+      if (index >= 0) {
         colIndices.push(index);
       }
     }
@@ -1268,31 +1264,114 @@ ColumnGroupingPlugin.prototype.moveColumnIntoGroup = function (colRef, to, group
     }
   }
 };
-/** @public
+/**
+* @public
 * @param {number|string} colRef Column index or id that should be moved
 * @param {string} groupId
+* @return {boolean}
 */
 ColumnGroupingPlugin.prototype.setColumnParent = function (colRef, groupId) {
-  var api = this.getGridApi();
-  if (!api) {
-    return;
+  if (groupId) {
+    return this.addGroupChild(groupId, colRef);
   }
-  var colCount = this.getColumnCount();
-  var toIndex = -1;
-  var childIndices = this.getChildColumnIndices(groupId);
-
-  // When group has at least one child, move column to last index within a group
-  // Otherwise, column will not be moved
-  if (childIndices && childIndices.length) {
-    toIndex = colCount;
+  return this.unsetParent(colRef);
+};
+/** If a column is added as a new child in a group, the column will be moved to the last position in the group. If the column is already a child of the group, nothing happens.
+* @public
+* @param {string} parentId
+* @param {number|string} childRef Column index, column id, group id to be added
+* @return {boolean}
+*/
+ColumnGroupingPlugin.prototype.addGroupChild = function (parentId, childRef) {
+  var parentDef = this._groupDefs.getGroup(parentId);
+  if (!parentDef) {
+    return false;
+  }
+  var colId = "";
+  if (typeof childRef === "string") {
+    var groupDef = this._groupDefs.getGroup(childRef);
+    if (groupDef) {
+      if (this._groupDefs.addGroupChild(parentId, childRef)) {
+        this._applyGrouping();
+        return true;
+      }
+    } else {
+      colId = childRef;
+    }
+  } else {
+    colId = this.getColumnId(childRef);
+  }
+  if (!colId) {
+    return false;
+  }
+  var leafIndices = this.getChildColumnIndices(parentId);
+  if (this._groupDefs.addGroupChild(parentId, colId)) {
+    if (leafIndices && leafIndices.length) {
+      if (this.moveColumnById(colId, leafIndices[leafIndices.length - 1] + 1)) {
+        return true;
+      }
+    }
+    this._applyGrouping();
+    return true;
+  }
+  return false;
+};
+/**
+* @public
+* @param {string} parentId
+* @param {number|string} childRef Column index, column id, group id to be added
+* @return {boolean}
+*/
+ColumnGroupingPlugin.prototype.removeGroupChild = function (parentId, childRef) {
+  var parentDef = this._groupDefs.getGroup(parentId);
+  if (!parentDef) {
+    return false;
+  }
+  var colId = "";
+  if (typeof childRef === "string") {
+    var groupDef = this._groupDefs.getGroup(childRef);
+    if (groupDef) {
+      if (this._groupDefs.unsetParent(childRef)) {
+        this._applyGrouping();
+        return true;
+      }
+    } else {
+      colId = childRef;
+    }
   } else {
-    toIndex = this.getColumnIndex(colRef);
+    colId = this.getColumnId(childRef);
+  }
+  if (!colId) {
+    return false;
+  }
+  var leafIndices = this.getChildColumnIndices(parentId);
+  if (this._groupDefs.removeGroupChild(parentId, colId)) {
+    if (leafIndices && leafIndices.length > 1) {
+      if (this.moveColumnById(colId, leafIndices[leafIndices.length - 1] + 1)) {
+        return true;
+      }
+    }
+    this._applyGrouping();
+    return true;
+  }
+  return false;
+};
+/**
+* @public
+* @param {number|string} childRef Column index, column id, group id to be removed from its own parent
+* @return {boolean}
+*/
+ColumnGroupingPlugin.prototype.unsetParent = function (childRef) {
+  var refId = typeof childRef === "string" ? childRef : this.getColumnId(childRef);
+  var parentId = this._groupDefs.getParentId(refId);
+  if (parentId) {
+    return this.removeGroupChild(parentId, refId);
   }
-  this.moveColumnIntoGroup(colRef, toIndex, groupId);
+  return false;
 };
 
 /** @public
-* Get a valid index for moving group/column to specific index
+* @description Get a valid index for moving group/column to specific index.
 * @param {string} id group id or column id
 * @param {number|string} destCol destination column index / id
 * @returns {number} destination index
@@ -1357,7 +1436,7 @@ ColumnGroupingPlugin.prototype.getValidDestinationIndex = function (id, destCol)
 };
 
 /** @public
-* Move group or column to left side of the destination column.
+* @description Move group or column to left side of the destination column.
 * Group or column can only be moved within the parent group.
 * If the destination is between other column group, the destination will change to the end of  that group instead.
 * @param {string} id group id or column id
@@ -1380,16 +1459,46 @@ ColumnGroupingPlugin.prototype.moveGroup = function (id, destCol) {
     return;
   }
   var destColIndex = this.getValidDestinationIndex(id, destCol);
-  var destColId = this.getColumnId(destColIndex);
+  var destColId = this.getColumnId(destColIndex); // TODO: This may not necessary
 
+  this.reorderColumns(members, destColId);
+};
+/** Move and reorder the specified columns to position before the destination
+* @public
+* @param {Array.<number|string>} colList Column list to be reordered
+* @param {number|string} destCol destination destination column id or index
+* @return {boolean}
+*/
+ColumnGroupingPlugin.prototype.reorderColumns = function (colList, destCol) {
+  var dirty = false;
   // TODO: create method for toggling autoGrouping flag
-  this._autoGrouping = false;
+  this._autoGrouping = false; // Prevent re-grouping in columnMoved event
+
   var gridApi = this.getGridApi();
   if (gridApi && gridApi.reorderColumns) {
-    gridApi.reorderColumns(members, destColId); // TODO: Support multi-table feature
+    dirty = gridApi.reorderColumns(colList, destCol); // TODO: Support multi-table feature
+  }
+
+  this._autoGrouping = true;
+  return dirty;
+};
+/** Move the specified column to position before the destination
+* @public
+* @param {number|string} srcCol source column id or index
+* @param {number|string=} destCol destination column id or index
+* @return {boolean}
+*/
+ColumnGroupingPlugin.prototype.moveColumnById = function (srcCol, destCol) {
+  var dirty = false;
+  this._autoGrouping = false; // Prevent re-grouping in columnMoved event
+
+  var gridApi = this.getGridApi();
+  if (gridApi && gridApi.moveColumnById) {
+    dirty = gridApi.moveColumnById(srcCol, destCol); // TODO: Support multi-table feature
   }
 
   this._autoGrouping = true;
+  return dirty;
 };
 export default ColumnGroupingPlugin;
 export { ColumnGroupingPlugin, ColumnGroupingPlugin as ColumnGrouping, ColumnGroupingPlugin as ColumnGroupingExtension };

package/lib/tr-grid-column-stack/es6/ColumnStack.d.ts

@@ -12,7 +12,8 @@ declare namespace ColumnStackPlugin {
     type Options = {
         fields: (string)[]|null,
         stacks: (ColumnStackPlugin.StackDefinition)[]|null,
-        autoStacking?: boolean|null
+        autoStacking?: boolean|null,
+        clicked?: ((...params: any[]) => any)|null
     };
 
     type ColumnOptions = {
@@ -90,6 +91,8 @@ declare class ColumnStackPlugin extends GridPlugin {
 
     public unstackColumns(colIndices?: (number)[]|null): boolean;
 
+    public removeStack(stackId: string): boolean;
+
     public removeAllStacks(enableUpdateUI?: boolean|null): boolean;
 
     public swapColumn(colRef: number|Event|null, swappingIndex: number): boolean;
@@ -116,6 +119,16 @@ declare class ColumnStackPlugin extends GridPlugin {
 
     public getActiveColumnField(stackId: string): string;
 
+    public addStackChild(stackId: string, colRef: number|string|null): void;
+
+    public removeStackChild(stackId: string, colRef: number|string|null): void;
+
+    public unsetParent(colRef: number|string|null): void;
+
+    public reorderColumns(colList: (number|string)[]|null, destCol?: (number|string)|null): boolean;
+
+    public moveColumnById(srcCol: number|string|null, destCol?: (number|string)|null): boolean;
+
 }
 
 export default ColumnStackPlugin;