@refinitiv-ui/efx-grid 6.0.40 → 6.0.42

package/lib/rt-grid/es6/Grid.d.ts

@@ -320,6 +320,28 @@ declare class Grid extends EventDispatcher {
 
     public replaceRow(rowRef: Grid.RowReference|null, rowOption?: any): any;
 
+    public scrollToColumn(colIndex: number, leftOfView?: boolean|null): boolean;
+
+    public scrollToRow(rowIndex: number, topOfView?: boolean|null): void;
+
+    public getScrollLeft(): number;
+
+    public getScrollTop(): number;
+
+    public setScrollLeft(pixels: number): void;
+
+    public setScrollTop(pixels: number): void;
+
+    public scrollRight(pixels: number): void;
+
+    public scrollDown(pixels: number): void;
+
+    public getScrollWidth(): number;
+
+    public getScrollHeight(): number;
+
+    public getVScrollView(): any;
+
 }
 
 declare function borders(gridOptions?: any): any;

package/lib/rt-grid/es6/Grid.js

@@ -140,21 +140,17 @@ import { ElementWrapper } from "../../core/es6/grid/components/ElementWrapper.js
 * @description Fired after ADC data or response received from the server
 * @property {Array.<Array>} data Data part of the server response
 */
-
 /** @event Grid#pageIndexChanged
 * @description Fired after page index in the data view is changed during the active pagination mode
 */
-
 /** @event Grid#pageCountChanged
 * @description Fired after page count in the data view is changed during the active pagination mode
 */
-
 /** @event Grid#dataComposed
 * @description Trigger before dataChanged. Perform any data update during the event will NOT cause more dataChanged events
 * @property {Grid} grid
 * @property {RowDefinition} rowDef
 */
-
 /** @event Grid#beforeRowRemoved
 * @description Fired only when a row will be removed through Grid's API and before occurring of the actual removal
 */
@@ -230,6 +226,45 @@ var compareNumber = function(rowDefA, rowDefB, sortOrder, fieldName) { // edit n
 	return (rowDefA.getData(fieldName) - rowDefB.getData(fieldName)) * sortOrder; // for numeric comparison
 };
 
+/**
+ * @private
+* @param {string} rowDefA
+* @param {string} rowDefB
+* @param {string} sortOrder
+* @return {number} The outcome of the value comparison
+*/
+var _sortChildrenOfChain =  function (rowDefA, rowDefB, sortOrder) {
+	var parentA = rowDefA.getParent();
+
+	if (!parentA) {
+	  return 0;
+	}
+
+	var parentB = rowDefB.getParent();
+
+	if (!parentB) {
+	  return 0;
+	}
+
+	if (parentA !== parentB) {
+	  return 0;
+	}
+
+	var a = rowDefA.getData('CHILD_ORDER');
+
+	if (a == null) {
+	  return 0;
+	}
+
+	var b = rowDefB.getData('CHILD_ORDER');
+
+	if (b == null) {
+	  return 0;
+	}
+
+	return ( a - b ) * sortOrder;
+};
+
 /** @private
 * @param {ColumnDefinition} colDef
 * @return {string}
@@ -258,6 +293,7 @@ var Grid = function(placeholder, config) {
 	var t = this; // This is to primarily reduce file size
 
 	t._onDataChanged = t._onDataChanged.bind(t);
+	t._onQuote2PostUpdate = t._onQuote2PostUpdate.bind(t);
 	t._onDataComposed = t._onDataComposed.bind(t);
 	t._onSubSegmentChanged = t._onSubSegmentChanged.bind(t);
 	t._recalculateFormulas = t._recalculateFormulas.bind(t);
@@ -616,6 +652,7 @@ Grid.prototype.initSubscription = function() {
 	this._subs = s;
 	this._subs["start"]();
 	this._dc.setSubscriptions(s);
+	this._subs.addEventListener("postUpdate", this._onQuote2PostUpdate);
 
 	// TODO: Subscriptions should be registered per row.
 	// However, chain subscription cannot be integrated with DataConnector in this current implementation.
@@ -2608,13 +2645,7 @@ Grid.prototype.setRic = function(rowRef, str, options) {
 		options["ric"] = str;
 		var extractedOptions = RowDefinition.extractRowOptions(options);
 		var oldRic = rowDef.getSymbol();
-		var permId = options["permId"];
-		var expanded = null;
-		var collapsed = options["collapsed"];
-		if(collapsed != null){
-			expanded = !extractedOptions["collapsed"];
-		}
-		if(rowDef.setContent(str, permId, extractedOptions["asChain"], expanded)) { // The given string may not be a RIC
+		if(rowDef.setContent(str, extractedOptions)) { // The given string may not be a RIC
 			this._connector.removeRic(rowDef, oldRic);
 			this._initDuplicateRicData(rowDef);
 			this._connector.addRic(rowDef);
@@ -3328,6 +3359,19 @@ Grid.prototype.clearSort = function() {
 	this._stp.clearSortState(); // WARNING: No event is dispatched
 };
 
+/**
+* @private
+* @param {Object} e Event object from quote2
+*/
+Grid.prototype._onQuote2PostUpdate = function (e) {
+	if(e.childOrderChange) { // For dynamic chain when CHILD_ORDER from the server change, it will be call sort children
+		if(!this.isSorting()) {
+			// Use rowDef for get CHILD_ORDER to sort
+			this._dt.sortOnce("ROW_DEF", "a", _sortChildrenOfChain);
+		}
+	}
+};
+
 /** @private
 * @param {!Object} e
 */
@@ -3873,6 +3917,7 @@ Grid.prototype._logData = function(rowDefs, options) {
 
 	console.table(tbl); // eslint-disable-line
 };
+
 /** @public
 * @description Replace existing row with a new row. Row ID would be changed, after row is replaced.
 * @param {Grid~RowReference} rowRef Reference (i.e. row index, row id, or row definition) of the insert position
@@ -3896,5 +3941,95 @@ Grid.prototype.replaceRow = function(rowRef, rowOption) {
 	}
 };
 
+/** Scroll the view to the specified column. If the column is already in the view, nothing happens. If the column is outside of the view, the view will be moved to the column with some additional offsets
+* @public
+* @param {number} colIndex
+* @param {boolean=} leftOfView Default is false. If true, the specified column will be put at the leftmost of the view (no offset)
+* @returns {boolean} Return true, if there is any change
+*/
+Grid.prototype.scrollToColumn = function (colIndex, leftOfView) {
+	return this._grid.scrollToColumn(colIndex, leftOfView);
+};
+/** Scroll the view to the specified row. If the row is already in the view, nothing happens. If the row is outside of the view, the view will be moved to the row with some additional offsets
+* @public
+* @param {number} rowIndex
+* @param {boolean=} topOfView=false If true, the specified row will be put at the top of the view (no offset)
+*/
+Grid.prototype.scrollToRow = function (rowIndex, topOfView) {
+	this._grid.scrollToRow("content", rowIndex, topOfView);
+};
+
+/** Get scroll value in pixel from the horizontal scrollbar
+* @public
+* @returns {number} pixels
+*/
+Grid.prototype.getScrollLeft = function () {
+	return this._grid.getScrollLeft();
+};
+/** Get scroll value in pixel from the vertical scrollbar
+* @public
+* @returns {number} pixels
+*/
+Grid.prototype.getScrollTop = function () {
+	return this._grid.getScrollTop();
+};
+
+/** Set scroll value to the horizontal scrollbar. This will move the scrollbar to specific position
+* @public
+* @param {number} pixels
+* @see {@link Grid.scrollRight}
+*/
+Grid.prototype.setScrollLeft = function (pixels) {
+	this._grid.setScrollLeft(pixels);
+};
+/**  Set scroll value to the vertical scrollbar. This will move the scrollbar to specific position
+* @public
+* @param {number} pixels
+* @see {@link Grid.scrollDown}
+*/
+Grid.prototype.setScrollTop = function (pixels) {
+	this._grid.setScrollTop(pixels);
+};
+
+/** Scroll the view to the right by the specified value. Use negative value to scroll the view to the left
+* @public
+* @param {number} pixels
+* @see {@link Grid.setScrollLeft}
+*/
+Grid.prototype.scrollRight = function (pixels) {
+	this._grid.scrollRight(pixels);
+};
+/** Scroll the view down by the specified value. Use negative value to scroll the view to the top
+* @public
+* @param {number} pixels
+* @see {@link Grid.setScrollTop}
+*/
+Grid.prototype.scrollDown = function (pixels) {
+	this._grid.scrollDown(pixels);
+};
+
+/** Get width of scrollable area from the horizontal scrollbar. This is useful for determining the end of scrollbar
+* @public
+* @returns {number}
+*/
+Grid.prototype.getScrollWidth = function () {
+	return this._grid.getScrollWidth();
+};
+/** Get height of scrollable area from the vertical scrollbar. This is useful for determining the end of scrollbar
+* @public
+* @returns {number}
+*/
+Grid.prototype.getScrollHeight = function () {
+	return this._grid.getScrollHeight();
+};
+
+/** Get information about current grid's view and the vertical scrollbar
+* @public
+* @returns {Object} Returns null, if vertical scrollbar does not exists
+*/
+Grid.prototype.getVScrollView = function () {
+	return this._grid.getVScrollView();
+};
+
 export { Grid };
 export default Grid;

package/lib/rt-grid/es6/RowDefinition.d.ts

@@ -104,7 +104,7 @@ declare class RowDefinition {
 
     public resetUpdates(): void;
 
-    public registerToView(view: DataTable|null, rowId?: string|null): void;
+    public registerToView(view: DataView|null, rowId?: string|null): void;
 
     public static deregisterFromView(rowIds: (string)[]|null, rowDef: RowDefinition|null): (string)[]|null;
 
@@ -142,7 +142,7 @@ declare const ROW_DEF: string;
 
 declare const ROW_TYPES: RowDefinition.RowTypes;
 
-declare function rowData(userInput: string, permId?: string|null, asChain?: boolean|null, expanded?: boolean|null): boolean;
+declare function rowData(userInput: string, extractedOptions: any): boolean;
 
 export {RowDefinition, ROW_DEF, ROW_TYPES};
 export default RowDefinition;

package/lib/rt-grid/es6/RowDefinition.js

@@ -248,8 +248,9 @@ RowDefinition.prototype.initialize = function(rowOptions) {
 	}
 
 	val = rowOptions["collapsed"];
-	if(val != null){
-		this._expanded = extractedOptions["collapsed"];
+	var collapsed = extractedOptions["collapsed"];
+	if(val != null || !collapsed){
+		this._expanded = !collapsed;
 	}
 	val = rowOptions["keepModel"];
 	if(val) {
@@ -258,7 +259,7 @@ RowDefinition.prototype.initialize = function(rowOptions) {
 
 	var symbol = this._ric || this._chainRic;
 	if(symbol || this._permId){
-		this.setContent(symbol, this._permId, this._isChain, this._expanded); // this._dataId is modified
+		this.setContent(symbol, extractedOptions); // this._dataId is modified
 	}
 
 	val = rowOptions["values"];
@@ -293,12 +294,10 @@ RowDefinition.prototype._initializeAsConstituent = function(rowOptions) {
 /** @public
 * @ignore
 * @param {string} userInput RIC
-* @param {string=} permId=null Organization PermId, which use for getting ADC data for private  company
-* @param {boolean=} asChain
-* @param {boolean=} expanded
+* @param {Object} extractedOptions
 * @return {boolean} True if there is any change otherwise false
 */
-RowDefinition.prototype.setContent = function(userInput, permId, asChain, expanded) {
+RowDefinition.prototype.setContent = function(userInput, extractedOptions) {
 	if(this._autoGenerated) { // AutoGenerated RowDefinition cannot be changed by user input
 		return false;
 	}
@@ -310,6 +309,7 @@ RowDefinition.prototype.setContent = function(userInput, permId, asChain, expand
 	}
 
 	var dirty = (this._userInput !== userInput);
+	var permId = extractedOptions["permId"];
 	if(this._permId !== permId){
 		this._permId = permId || "";
 		dirty = true;
@@ -327,15 +327,17 @@ RowDefinition.prototype.setContent = function(userInput, permId, asChain, expand
 	if(this._userInput.charAt(0) === "'") { // This is a row header
 		this._ric = this._chainRic = ""; // No ric for realtime request
 	} else {
+		var asChain = extractedOptions["asChain"];
+		var expanded = !extractedOptions["collapsed"];
+		var chainRic = extractedOptions["chainRic"];
 		if(asChain === true){
 			this._ric = expanded === false ? this._userInput : this._userInput.replace("0#", "");
-			this._expanded = expanded;
-			this._isChain = true; // Only chain can be expanded by 0#
-			this._chainRic = this._userInput;
+			this._expanded = expanded; // Only chain can be expanded by 0#
 		} else {
 			this._ric = this._userInput;
-			this._isChain = asChain;
 		}
+		this._isChain = asChain;
+		this._chainRic = chainRic || "";
 	}
 
 	if(this._view) {
@@ -767,8 +769,17 @@ RowDefinition.prototype.subscribeForUpdates = function() {
 	var prevRowData = this.unsubscribeForUpdates();
 
 	if(this.isChain()) {
-		this._subId = subs["addChain"](this._chainRic || this._ric, this._rowId); // Some chain require 0# symbol to populate its constituents
-		// TODO: Handle Dynamic chain such as .PG.PA
+		var symbol = this._chainRic;
+		if(!symbol){
+			symbol = this._ric;
+			if(symbol.indexOf("0#") < 0){
+				var count = (symbol.match(/\./g) || []).length;
+				if(count < 2){
+					symbol = "0#" + symbol;
+				}
+			}
+		}
+		this._subId = subs["addChain"](symbol, this._rowId); // Some chain require 0# symbol to populate its constituents
 	} else if(this._ric) {
 		this._subId = subs["addRic"](this._ric, this._rowId);
 	}
@@ -845,7 +856,7 @@ RowDefinition.prototype.resetUpdates = function() {
 };
 
 /** @public
-* @param {DataTable} view
+* @param {DataView} view
 * @param {string=} rowId
 */
 RowDefinition.prototype.registerToView = function(view, rowId) {
@@ -962,11 +973,17 @@ RowDefinition.prototype.addConstituent = function(ric) {
 	}
 
 	if(this._view) {
-		// WARNING: ChildCount may not be enough to determine proper inserting position
-		// TODO: Handle nested children
 		var rowId = this.getRowId();
-		var rowIndex = this._view.getRowIndex(rowId) + this.getChildCount(); // Children must be directly under its parent
-		childDef.registerToView(this._view, this._view.getRowId(rowIndex));
+		// WARNING: insert position, we prioritize using CHILD_ORDER (From server) in dc first. If it does not exist, the last row of the segment will be pushed
+		var childOrder = childDef.getData("CHILD_ORDER");
+		var parentIndex =  this._view.getRowIndex(rowId);
+		var position =  parentIndex + this.getChildCount(); // push the last position
+		if(childOrder != null) {
+			// Warning: We need to carry a value of 1 because the CHILD_ORDER starts with 0, and it will be added to the parentIndex. In case the parent rowIndex is not included.
+			position = parentIndex + childOrder + 1; // insert between segment
+		} // else {} it will be push in the last row of segment
+		childDef.registerToView(this._view, this._view.getRowId(position));
+		// TODO: Handle nested children
 		this._view.addSegmentChild(rowId, childDef.getRowId(), childDef.getDataId());
 	}
 
@@ -1217,6 +1234,7 @@ RowDefinition.toRowId = function(rowDef) {
 */
 RowDefinition.extractRowOptions = function(rowOptions) {
 	var ric = rowOptions["ric"];
+	var permId = rowOptions["permId"];
 	var chainRic = rowOptions["chainRic"];
 	var collapsed = rowOptions["collapsed"];
 	var asChain = rowOptions["asChain"];
@@ -1238,6 +1256,7 @@ RowDefinition.extractRowOptions = function(rowOptions) {
 		extractedOptions["collapsed"] = collapsed;
 	}
 	extractedOptions["ric"] = ric;
+	extractedOptions["permId"] = permId;
 	extractedOptions["chainRic"] = chainRic;
 	extractedOptions["asChain"] = asChain;
 	return extractedOptions;

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

@@ -93,6 +93,10 @@ declare class ColumnGroupingPlugin extends GridPlugin {
 
     public unpinGroup(groupId: string, dest?: (number|string)|null): void;
 
+    public static getObjectIndex(column: any): number;
+
+    public static getObjectId(column: any): string;
+
 }
 
 export default ColumnGroupingPlugin;

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

@@ -64,10 +64,6 @@ ColumnGroupingPlugin.prototype._maxDepth = 0;
 * @private
 */
 ColumnGroupingPlugin.prototype._restructuring = false;
-/** @type {boolean}
-* @private
-*/
-ColumnGroupingPlugin.prototype._autoGrouping = true;
 /** @type {number}
 * @private
 */
@@ -487,7 +483,7 @@ ColumnGroupingPlugin.prototype._applyGrouping = function () {
         for (r = 0; r < rowCount; r++) {
           cell = section.getCell(c, r, false);
           if (cell) {
-            cell.reset();
+            // TODO: The style and class from the user will not be reset, for example, the color or background
             cell.removeClass("no-sort");
             cell.removeAttribute("group-id");
           }
@@ -894,9 +890,11 @@ ColumnGroupingPlugin.prototype._applyTimeSeries = function (e) {
 * @param {Object} e dispatching of columnAdded event object
 */
 ColumnGroupingPlugin.prototype._onColumnAdded = function (e) {
-  var colIndex = e.colIndex;
-  this._requestApplyAddChildGroup(e);
-  this._applyNearestGrouping(colIndex);
+  var batches = e["batches"];
+  if (!(batches && batches["reset"])) {
+    this._requestApplyAddChildGroup(e);
+    this._applyNearestGrouping(e.colIndex);
+  }
   this._requestApplyGrouping();
 };
 /** @private
@@ -908,7 +906,8 @@ ColumnGroupingPlugin.prototype._onColumnChanged = function () {
 * @param {Object} e dispatching of columnMoved event object
 */
 ColumnGroupingPlugin.prototype._onColumnMoved = function (e) {
-  if (this._autoGrouping) {
+  var batches = e["batches"];
+  if (!(batches && batches["move"])) {
     this._applyNearestGrouping(e.toColIndex);
   }
   this._requestApplyGrouping();
@@ -917,11 +916,16 @@ ColumnGroupingPlugin.prototype._onColumnMoved = function (e) {
 * @param {Object} e
 */
 ColumnGroupingPlugin.prototype._onColumnRemoved = function (e) {
-  var colId = e.colId;
-  if (colId) {
-    if (this._groupDefs.unsetParent(colId)) {
-      this._requestApplyGrouping();
+  var batches = e["batches"];
+  if (!(batches && batches["reset"])) {
+    var colId = e.colId;
+    if (colId) {
+      if (this._groupDefs.unsetParent(colId)) {
+        this._requestApplyGrouping();
+      }
     }
+  } else {
+    this._requestApplyGrouping();
   }
 };
 /** @private
@@ -1028,29 +1032,22 @@ ColumnGroupingPlugin.prototype._onBeforeColumnBoundUpdate = function (e) {
 */
 ColumnGroupingPlugin.prototype.addColumnToGroup = function (column, groupId, colIndex) {
   if (!column) return;
-  var columnIndex = -1;
-  if (colIndex == null) {
+  var destIndex = this.getColumnCount();
+  if (colIndex != null) {
     var groupDef = this._groupDefs.getGroup(groupId);
     if (groupDef) {
-      var childIndices = this.getChildColumnIndices(groupId);
-      if (childIndices && childIndices.length) {
-        // Child indices need to be sorted here
-        columnIndex = childIndices[childIndices.length - 1] + 1; // Put new column next to the last child in the group
-      }
-
       this._groupDefs.addGroupChild(groupId, column.id);
     }
-  } else {
-    columnIndex = colIndex;
-  }
-  if (columnIndex < 0) {
-    columnIndex = this.getColumnCount();
+    destIndex = colIndex;
   }
   if (this._realTimeGrid) {
     // TODO: Support multi-table feature
-    this._realTimeGrid.insertColumn(column, columnIndex);
+    this._realTimeGrid.insertColumn(column, destIndex);
   } else if (this._compositeGrid) {
-    this._compositeGrid.insertColumn(columnIndex, column);
+    this._compositeGrid.insertColumn(destIndex, column);
+  }
+  if (colIndex == null) {
+    this.setColumnParent(column.id || destColIndex, groupId);
   }
 };
 
@@ -1125,14 +1122,13 @@ ColumnGroupingPlugin.prototype.setGroupDefinition = function (groupId, groupDef)
   if (this._groupDefs.setGroup(groupId, groupDef)) {
     var newDef = this._groupDefs.getGroup(groupId);
     if (newDef) {
-      var chdr = newDef.children;
+      var host = this._hosts[0];
+      var chdr = host.getValidColumnList(newDef.children).map(ColumnGroupingPlugin.getObjectId); //this return only valid columns without group
       var len = chdr.length;
-      // TODO: Filter out group id
       if (len > 1) {
-        this.reorderColumns(chdr, chdr[0]); // WARNING: group id doesn't work
+        this.reorderColumns(chdr, chdr[0]);
       }
     }
-
     this._applyGrouping();
     return groupId;
   }
@@ -1195,16 +1191,17 @@ ColumnGroupingPlugin.prototype._getAvaliableChildren = function (groupId) {
   var childCount = chdr ? chdr.length : 0;
   var validChildren = [];
   if (childCount) {
+    var host = this._hosts[0];
+    var validCols = host.getValidColumnList(chdr);
+    validChildren = validCols.map(ColumnGroupingPlugin.getObjectId);
     var groupMap = this._groupDefs.getGroupMap();
-    // Filter out columns that do not exist
     for (var i = 0; i < childCount; i++) {
       var childId = chdr[i];
-      if (groupMap[childId] || this.getColumnIndex(childId) > -1) {
-        validChildren.push(childId); // TODO: This is slow
+      if (groupMap[childId]) {
+        validChildren.push(childId);
       }
     }
   }
-
   return validChildren;
 };
 
@@ -1226,19 +1223,14 @@ ColumnGroupingPlugin.prototype.getGroupChildren = function (groupId) {
 * @return {Array.<number>}
 */
 ColumnGroupingPlugin.prototype.getChildColumnIndices = function (groupId) {
+  var colIndices = [];
+  var host = this._hosts[0];
   var colIds = this._groupDefs.getLeafDescendants(groupId);
   if (colIds) {
-    var colIndices = [];
-    var leafCount = colIds.length;
-    for (var i = 0; i < leafCount; i++) {
-      var index = this.getColumnIndex(colIds[i]);
-      if (index >= 0) {
-        colIndices.push(index);
-      }
-    }
-    return colIndices.sort(ColumnGroupingPlugin._ascSortLogic); // TODO: This could be unnecessary
+    var validColList = host.getValidColumnList(colIds);
+    colIndices = validColList.map(ColumnGroupingPlugin.getObjectIndex);
+    return colIndices;
   }
-
   return null;
 };
 
@@ -1622,13 +1614,7 @@ ColumnGroupingPlugin.prototype.moveGroup = function (id, destCol) {
 * @return {boolean}
 */
 ColumnGroupingPlugin.prototype.reorderColumns = function (colList, destCol) {
-  var dirty = false;
-  // TODO: create method for toggling autoGrouping flag
-  this._autoGrouping = false; // Prevent re-grouping in columnMoved event
-
-  this._reorderColumns(colList, destCol);
-  this._autoGrouping = true;
-  return dirty;
+  return this._reorderColumns(colList, destCol);
 };
 /** Move the specified column to position before the destination
 * @public
@@ -1637,12 +1623,7 @@ ColumnGroupingPlugin.prototype.reorderColumns = function (colList, destCol) {
 * @return {boolean}
 */
 ColumnGroupingPlugin.prototype.moveColumnById = function (srcCol, destCol) {
-  var dirty = false;
-  this._autoGrouping = false; // Prevent re-grouping in columnMoved event
-
-  this._moveColumnById(srcCol, destCol);
-  this._autoGrouping = true;
-  return dirty;
+  return this._moveColumnById(srcCol, destCol);
 };
 /** @public
 * @param {string} groupId
@@ -1729,5 +1710,25 @@ ColumnGroupingPlugin.prototype.unpinGroup = function (groupId, dest) {
     this.moveGroup(groupId, destId);
   }
 };
+
+/** Get column index from column object
+* @public
+* @function
+* @param {Object} column
+* @return {number}
+*/
+ColumnGroupingPlugin.getObjectIndex = function (column) {
+  return column["index"];
+};
+
+/** Get column id from column object
+* @public
+* @function
+* @param {Object} column
+* @return {string}
+*/
+ColumnGroupingPlugin.getObjectId = function (column) {
+  return column["id"];
+};
 export default ColumnGroupingPlugin;
 export { ColumnGroupingPlugin, ColumnGroupingPlugin as ColumnGrouping, ColumnGroupingPlugin as ColumnGroupingExtension };

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

@@ -32,8 +32,8 @@ declare namespace ColumnStackPlugin {
         id: string,
         spreading?: boolean|null,
         collapsed?: boolean|null,
-        children: (string)[]|null,
-        fields: (string)[]|null,
+        children?: (string)[]|null,
+        fields?: (string)[]|null,
         name?: string|null,
         activeColumn?: string|null
     };
@@ -88,7 +88,11 @@ declare class ColumnStackPlugin extends GridPlugin {
 
     public stackColumns(colRefs?: (number|string)[]|null, stackId?: string|null, options?: ColumnStackPlugin.StackConfiguration|null): boolean;
 
-    public setStack(colRefs?: (number|string)[]|null, activeColRef?: number|string|null): boolean;
+    public setStack(colRefs?: (number|string)[]|null, activeColRef?: (number|string)|null): boolean;
+
+    public setStacks(stacks: (ColumnStackPlugin.StackDefinition)[]|null): void;
+
+    public getStacks(): (ColumnStackPlugin.StackDefinition)[];
 
     public unstackColumns(colIndices?: (number)[]|null): boolean;
 
@@ -120,6 +124,8 @@ declare class ColumnStackPlugin extends GridPlugin {
 
     public getStackName(stackId: string): string;
 
+    public getActiveColumnId(stackId: string): string;
+
     public getActiveColumnField(stackId: string): string;
 
     public getActiveColumnIndex(stackId: string): number;