@refinitiv-ui/efx-grid 6.0.2 → 6.0.5

package/lib/tr-grid-column-selection/es6/ColumnSelection.js

@@ -34,6 +34,7 @@ var ColumnSelectionPlugin = function ColumnSelectionPlugin(options) {
   t._onMouseDown = t._onMouseDown.bind(t);
   t._onKeyDown = t._onKeyDown.bind(t);
   t._onColumnRemoved = t._onColumnRemoved.bind(t);
+  t._onColumnAdded = t._onColumnAdded.bind(t);
   t._onReselection = t._onReselection.bind(t);
   t._onThemeLoaded = t._onThemeLoaded.bind(t);
   t._onColumnPositionChanged = t._onColumnPositionChanged.bind(t);
@@ -93,7 +94,12 @@ ColumnSelectionPlugin.prototype._timerMenuId = 0;
 * @private
 */
 
-ColumnSelectionPlugin.prototype._pendingSelection = -1;
+ColumnSelectionPlugin.prototype._pendingSelectionOnAdded = -1;
+/** @type {Function}
+* @private
+*/
+
+ColumnSelectionPlugin.prototype._pendingSelectionOnRemoved = -1;
 /** @type {Function}
 * @private
 */
@@ -142,6 +148,7 @@ ColumnSelectionPlugin.prototype.initialize = function (host, options) {
   host.listen("mousedown", this._onMouseDown);
   host.listen("keydown", this._onKeyDown);
   host.listen("columnRemoved", this._onColumnRemoved);
+  host.listen("columnAdded", this._onColumnAdded);
   host.listen("columnPositionChanged", this._onColumnPositionChanged);
   this.config(options);
 
@@ -204,6 +211,7 @@ ColumnSelectionPlugin.prototype.unload = function (host) {
   host.unlisten("mousedown", this._onMouseDown);
   host.unlisten("keydown", this._onKeyDown);
   host.unlisten("columnRemoved", this._onColumnRemoved);
+  host.unlisten("columnAdded", this._onColumnAdded);
   host.unlisten("columnPositionChanged", this._onColumnPositionChanged);
 
   this._hosts.splice(at, 1);
@@ -458,7 +466,9 @@ ColumnSelectionPlugin.prototype.setSelectedColumn = function (colIndex, opt_sele
   }
 
   this._hasSelection = selection ? true : null;
-  this._pendingSelection = -1; // New selection happens before resolving the pending selection
+  this._pendingSelectionOnAdded = -1; // New selection happens before resolving the pending selection
+
+  this._pendingSelectionOnRemoved = -1; // New selection happens before resolving the pending selection
 
   var len = this._hosts.length;
 
@@ -867,7 +877,13 @@ ColumnSelectionPlugin.prototype._onKeyDown = function (e) {
 
 
 ColumnSelectionPlugin.prototype._onColumnRemoved = function (e) {
+  var colIndex = e.colIndex;
+
   if (this._timerId) {
+    if (this._pendingSelectionOnAdded > 0 && colIndex < this._pendingSelectionOnAdded) {
+      this._pendingSelectionOnAdded = this._pendingSelectionOnAdded - 1;
+    }
+
     return;
   } // Since column and its selection state has been removed, we have to keep track of the first selection across multiple calls
 
@@ -879,19 +895,17 @@ ColumnSelectionPlugin.prototype._onColumnRemoved = function (e) {
       // The last selection has been removed
       this._hasSelection = false;
 
-      if (this._pendingSelection < 0) {
-        var colIndex = e.colIndex;
-
+      if (this._pendingSelectionOnRemoved < 0) {
         if (colIndex >= this.getColumnCount()) {
           colIndex = this.getColumnCount() - 1;
         }
 
-        this._pendingSelection = colIndex;
+        this._pendingSelectionOnRemoved = colIndex;
       }
 
       this._timerId = setTimeout(this._onReselection, 10);
     } else {
-      this._pendingSelection = firstSel;
+      this._pendingSelectionOnRemoved = firstSel;
     }
   }
 };
@@ -900,10 +914,33 @@ ColumnSelectionPlugin.prototype._onColumnRemoved = function (e) {
 */
 
 
+ColumnSelectionPlugin.prototype._onColumnAdded = function (e) {
+  if (this._timerId) {
+    this._pendingSelectionOnAdded = e.colIndex;
+    return;
+  }
+
+  if (this._hasSelection) {
+    this.clearAllSelections();
+
+    if (this._pendingSelectionOnAdded < 0) {
+      this._pendingSelectionOnAdded = e.colIndex;
+    }
+
+    this._timerId = setTimeout(this._onReselection, 10);
+  }
+};
+/** @private
+* @param {Object} e
+*/
+
+
 ColumnSelectionPlugin.prototype._onReselection = function (e) {
   this._timerId = 0;
-  this.setSelectedColumn(this._pendingSelection, true);
-  this._pendingSelection = -1;
+  var pendingSelection = this._pendingSelectionOnAdded > -1 ? this._pendingSelectionOnAdded : this._pendingSelectionOnRemoved;
+  this.setSelectedColumn(pendingSelection, true);
+  this._pendingSelectionOnAdded = -1;
+  this._pendingSelectionOnRemoved = -1;
 
   if (!this._activeGrid) {
     this._activeGrid = this._hosts[0];

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

@@ -9,6 +9,10 @@ import { preventDefault } from "../../tr-grid-util/es6/EventDispatcher.js";
 
 declare namespace ColumnStackPlugin {
 
+    type Options = {
+        fields: (string)[]
+    };
+
     type ColumnOptions = {
         stackId?: string,
         stack?: (string|StackOptions)
@@ -34,11 +38,11 @@ declare class ColumnStackPlugin extends GridPlugin {
 
     public getConfigObject(gridOptions?: any): any;
 
-    public getMemberIndices(colIndex: number): (number)[];
+    public getMemberIndices(colIndex: number): (number)[]|null;
 
-    public collapseGroup(colIndex: number, collapsed?: boolean): (number)[];
+    public collapseGroup(colIndex: number, collapsed?: boolean): (number)[]|null;
 
-    public expandGroup(colIndex: number): (number)[];
+    public expandGroup(colIndex: number): (number)[]|null;
 
     public isColumnStackable(colIndices: (number)[]): boolean;
 
@@ -60,7 +64,7 @@ declare class ColumnStackPlugin extends GridPlugin {
 
     public getStackId(colIndex: number): string;
 
-    public stackColumns(colIndices?: (number)[], stackId?: string, options?: any): boolean;
+    public stackColumns(colRefs?: (number|string)[], stackId?: string, options?: any): boolean;
 
     public setStack(colRefs: (number|string)[]): boolean;