@refinitiv-ui/efx-grid 6.0.27 → 6.0.28

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

@@ -85,6 +85,7 @@ import { ElementWrapper } from "../../core/es6/grid/components/ElementWrapper.js
 * @property {number=} adcPollingInterval=0 Length of polling interval for refreshing ADC data in milliseconds. The default value (0) means no polling.
 * @property {boolean=} fieldCaching=false If enabled, field definition will be caching internal mechanism
 * @property {string=} childDataField=CHILD_VALUES The given field will be used to store children's static data, such as row color assignment.
+* @property {boolean=} topSection=true If disabled, title section will not be rendered
 */
 
 /** @typedef {number|string|RowDefinition} Grid~RowReference
@@ -228,26 +229,6 @@ var compareNumber = function(rowDefA, rowDefB, sortOrder, fieldName) { // edit n
 	return (rowDefA.getData(fieldName) - rowDefB.getData(fieldName)) * sortOrder; // for numeric comparison
 };
 
-/** @private
-* @param {ColumnDefinition} colDef
-* @return {string}
-*/
-var _getId = function(colDef) {
-	if(colDef) {
-		return colDef.getId();
-	}
-	return "";
-};
-/** @private
-* @param {ColumnDefinition} colDef
-* @return {string}
-*/
-var _getField = function(colDef) {
-	if(colDef) {
-		return colDef.getField();
-	}
-	return "";
-};
 /** @private
 * @param {ColumnDefinition} colDef
 * @return {string}
@@ -336,6 +317,9 @@ var Grid = function(placeholder, config) {
 		if(config["SortableTitle"]) { // Exception for built-in plugin
 			t._stp = config["SortableTitle"];
 		}
+		if(config["topSection"] === false) {
+			t._topSection = false;
+		}
 	}
 	if(!t._sharedDataSource) {
 		t._dc = new DataCache();
@@ -550,7 +534,10 @@ Grid.prototype._fieldCaching = false;
 * @private
 */
 Grid.prototype._childDataField = "";
-
+/** @type {boolean}
+* @private
+*/
+Grid.prototype._topSection = true;
 
 /** @public
 */
@@ -665,7 +652,11 @@ Grid.prototype.updateRowData = Grid.prototype._updateRowData;
  */
 Grid.prototype._addGridSections = function () {
 	var title = this._grid.addSection("title");
-	title.setRowCount(1);
+	if(this._topSection == false){
+		title.setRowCount(0);
+	} else {
+		title.setRowCount(1);
+	}
 	this._grid.addSection("content");
 
 	var titleSettings = this._grid.getSectionSettings("title");
@@ -1617,10 +1608,13 @@ Grid.prototype.setFields = Grid.prototype.setColumns;
 * @param {Object} e
 */
 Grid.prototype._onColumnAdded = function(e) {
-	var colDef = e.context[COL_DEF];
+	var colDef = /** @type{ColumnDefinition} */(e.context[COL_DEF]);
 	delete e.context[COL_DEF];
 	var idx = e.colIndex;
 
+	var coreColDef = this._grid._getColumnDef(idx);
+	colDef._setCoreColumnDef(coreColDef); // For column id and field
+
 	var colData = this._grid.getColumnData(idx);
 	if(!colData) { // Save column inside grid
 		colData = this._grid.setColumnData(idx, {});
@@ -1847,102 +1841,16 @@ Grid.prototype.moveColumn = function (fromColIndex, toColIndex) {
 * grid.moveColumnById("sourceColumnId", ""); // move to the last position
 */
 Grid.prototype.moveColumnById = function (srcCol, destCol) {
-	var colCount = this.getColumnCount();
-	var srcIndex = this.getColumnIndex(srcCol);
-	if(srcIndex < 0 || srcIndex >= colCount) {
-		return false;
-	}
-	var destIndex = this.getColumnIndex(destCol);
-	if(destIndex < 0) {
-		destIndex = colCount;
-	}
-	return this._moveColumnByIndex(srcIndex, destIndex);
-};
-/** Move column without verification for better performance
-* @private
-* @param {number} srcIndex Column index
-* @param {number} destIndex Column index of the destination
-* @return {boolean} Return true if there is any change, and false otherwise
-*/
-Grid.prototype._moveColumnByIndex = function (srcIndex, destIndex) {
-	if(srcIndex < destIndex) { // Ensure that the source column is put in front of the destination index
-		--destIndex;
-	}
-	if(srcIndex === destIndex) {
-		return false;
-	}
-	return this.moveColumn(srcIndex, destIndex);
+	return this._grid.moveColumnById(srcCol, destCol);
 };
 
 /** @public
 * @param {number|string|Array.<number|string>} colRefs List of column index or column id to be moved
-* @param {number|string} destCol Destination position where the moved columns will be placed BEFORE the specified position. This can be column id or index
+* @param {(number|string)=} destCol Destination position where the moved columns will be placed BEFORE the specified position. This can be column id or index
 * @return {boolean} Return true if there is any change, and false otherwise
 */
 Grid.prototype.reorderColumns = function (colRefs, destCol) {
-	var destId = (typeof destCol === "number") ? this.getColumnId(destCol) : destCol;
-
-	if(Array.isArray(colRefs)) {
-		var srcLen = colRefs.length;
-		if(srcLen > 1) {
-			var colIds = this.getColumnIds();
-			var colCount = colIds.length;
-			var srcIds = [];
-			var invalidDest = false;
-			var i, srcId, srcIdx;
-			for(i = 0; i < srcLen; ++i) {
-				var colRef = colRefs[i];
-				if(typeof colRef === "number") {
-					srcIdx = colRef;
-					srcId = colIds[colRef] || "";
-				} else {
-					srcId = colRef;
-					srcIdx = colIds.indexOf(srcId);
-				}
-				if(srcId && srcIdx >= 0) {
-					srcIds.push(srcId);
-					if(destId === srcId) {
-						invalidDest = true; // Destination must not exist in source columns
-					}
-				}
-			}
-
-			var destIdx;
-			srcLen = srcIds.length;
-			if(invalidDest) { // Find the next valid destination where it is not contained in the source columns
-				destIdx = this.getColumnIndex(destId);
-				if(destIdx >= 0) {
-					while(++destIdx < colCount) {
-						destId = colIds[destIdx];
-						if(srcIds.indexOf(destId) < 0) {
-							break;
-						}
-					}
-				}
-				if(destIdx < 0 || destIdx >= colCount) {
-					destId = "";
-				}
-			}
-
-			var dirty = 0;
-			for(i = srcLen; --i >= 0;) {
-				srcId = srcIds[i]; // Only valid source columns are left at this point
-				srcIdx = this.getColumnIndex(srcId);
-				destIdx = this.getColumnIndex(destId);
-				if(destIdx < 0) { // Insert to the back when id is not found
-					destIdx = colCount;
-				}
-				dirty |= this._moveColumnByIndex(srcIdx, destIdx);
-				destId = srcId;
-			}
-			return dirty ? true : false;
-		} else {
-			return this.moveColumnById(colRefs[0], destId);
-		}
-	}
-
-	// colRefs will be a number or string
-	return this.moveColumnById(colRefs, destId);
+	return this._grid.reorderColumns(colRefs, destCol);
 };
 
 /** The hidden column still occupies the same index.
@@ -2981,30 +2889,19 @@ Grid.prototype._getRowId = function(rowRef) {
 * @return {number}
 */
 Grid.prototype.getColumnIndex = function(colRef) {
-	if(typeof colRef === "number") {
-		return colRef;
-	}
-
 	if(colRef) {
 		var colCount = this.getColumnCount();
-		var i, colDef;
 		if(colRef instanceof ColumnDefinition) {
-			for(i = 0; i < colCount; ++i) {
-				colDef = this.getColumnDefinition(i);
+			for(var i = 0; i < colCount; ++i) {
+				var colDef = this.getColumnDefinition(i);
 				if(colDef === colRef) {
 					return i;
 				}
 			}
-		} else if(typeof colRef === "string") {
-			for(i = 0; i < colCount; ++i) {
-				colDef = this.getColumnDefinition(i);
-				if(_hasFieldOrId(colDef, colRef)) {
-					return i; // Return the first found field
-				}
-			}
+			return -1;
 		}
 	}
-	return -1;
+	return this._grid.getColumnIndex(colRef);
 };
 /** Any invalid column reference will be excluded from the output array
 * @public
@@ -3020,7 +2917,7 @@ Grid.prototype.getColumnIndices = function(colRefs) {
 	for(var i = 0; i < len; ++i) {
 		var colIndex = this.getColumnIndex(inputAry[i]);
 		if(colIndex >= 0 && colIndex < colCount) {
-			ary.push(colIndex); // WARNING: We have not check for duplication
+			ary.push(colIndex); // WARNING: We have not checked for duplication
 		}
 	}
 	return ary;
@@ -3032,14 +2929,14 @@ Grid.prototype.getColumnIndices = function(colRefs) {
 * @see {@link Grid#getColumnDefinition}
 */
 Grid.prototype.getColumnId = function(colIndex) {
-	return _getId(this.getColumnDefinition(colIndex));
+	return this._grid.getColumnId(colIndex);
 };
 /** Get ids from each column definition.
 * @public
 * @return {!Array.<string>} New array is created
 */
 Grid.prototype.getColumnIds = function() {
-	return this.getColumnDefinitions().map(_getId);
+	return this._grid.getColumnIds();
 };
 /** Return field defined in the column definition
 * @public
@@ -3048,14 +2945,14 @@ Grid.prototype.getColumnIds = function() {
 * @see {@link Grid#getColumnDefinition}
 */
 Grid.prototype.getColumnField = function(colIndex) {
-	return _getField(this.getColumnDefinition(colIndex));
+	return this._grid.getColumnField(colIndex);
 };
 /** Get fields from each column definition. Note that this does not include any required field or data fields. Duplicates may exist.
 * @public
 * @return {!Array.<string>} New array is created
 */
 Grid.prototype.getColumnFields = function() {
-	return this.getColumnDefinitions().map(_getField);
+	return this._grid.getColumnFields();
 };
 /** Get column name from each column definition. Note that this does not include any required field or data fields. Duplicates may exist.
 * @public
@@ -3513,6 +3410,32 @@ Grid.prototype.setClassification = function(rowRef, fields) {
 	return false;
 };
 
+/** Check element in the grid element
+ * @public
+ * @param {Element} elem
+ * @return {boolean}=true if an element from the parameter is inside a grid element
+ */
+Grid.prototype.contains = function(elem) {
+	if(elem) {
+		// This will impact the contents within the rt-grid element, but not those outside of it, such as the wrapper elements atlas-blotter and ef-grid.
+		return this._topNode.contains(elem);
+	}
+	return false;
+};
+
+/** Check grid element is focused
+ * @public
+ * @return {boolean}
+ */
+Grid.prototype.isFocused = function() {
+	var activeElement = document.activeElement;
+	if(!activeElement || !activeElement.shadowRoot) {
+		// active element is not in the shadow DOM. try using contains method to check
+		return this.contains(activeElement);
+	}
+ 	// For wrapper scenarios, such as atlas-blotter or efx-grid
+	return  activeElement.shadowRoot === this._topNode.parentNode;
+};
 /** @description Focus grid element without moving window scrollbar
  * @public
  */

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

@@ -79,11 +79,11 @@ declare class ColumnGroupingPlugin extends GridPlugin {
 
     public getValidDestinationIndex(id: string, destCol: number|string|null): number;
 
-    public moveGroup(id: string, destCol: number|string|null): void;
+    public moveGroup(id: string, destCol?: (number|string)|null): void;
 
-    public reorderColumns(colList: (number|string)[]|null, destCol: number|string|null): boolean;
+    public reorderColumns(colList: (number|string)[]|null, destCol?: (number|string)|null): boolean;
 
-    public moveColumnById(srcCol: number|string|null, destCol?: number|string|null): boolean;
+    public moveColumnById(srcCol: number|string|null, destCol?: (number|string)|null): boolean;
 
 }
 

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

@@ -318,16 +318,7 @@ ColumnGroupingPlugin.prototype.config = function (options) {
   }
   var columns = options["columns"];
   if (columns) {
-    var len = columns.length;
-    for (var i = 0; i < len; ++i) {
-      var colData = this._newColumnData(i);
-      colData["columnGrouping"] = {
-        // used for columnRemoved event
-        id: columns[i].id // TODO: This does not work with runtime change
-      };
-    }
-
-    groupDefs = this._migrateLegacyStructure(groupDefs, options["columns"]);
+    groupDefs = this._migrateLegacyStructure(groupDefs, columns);
   }
   if (groupDefs) {
     ColumnGroupingPlugin._flattenGroupDefs(groupDefs);
@@ -805,9 +796,8 @@ ColumnGroupingPlugin.prototype._onColumnMoved = function (e) {
 * @param {Object} e
 */
 ColumnGroupingPlugin.prototype._onColumnRemoved = function (e) {
-  var colData = e.columnData;
-  if (colData && colData.columnGrouping) {
-    var colId = colData.columnGrouping.id;
+  var colId = e.colId;
+  if (colId) {
     if (this._groupDefs.unsetParent(colId)) {
       this._requestApplyGrouping();
     }
@@ -1440,7 +1430,7 @@ ColumnGroupingPlugin.prototype.getValidDestinationIndex = function (id, destCol)
 * 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
-* @param {number|string} destCol destination column index / id
+* @param {(number|string)=} destCol destination column index / id
 */
 ColumnGroupingPlugin.prototype.moveGroup = function (id, destCol) {
   var groupDef;
@@ -1466,7 +1456,7 @@ ColumnGroupingPlugin.prototype.moveGroup = function (id, destCol) {
 /** 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
+* @param {(number|string)=} destCol Destination column id or index
 * @return {boolean}
 */
 ColumnGroupingPlugin.prototype.reorderColumns = function (colList, destCol) {
@@ -1474,29 +1464,21 @@ ColumnGroupingPlugin.prototype.reorderColumns = function (colList, destCol) {
   // TODO: create method for toggling autoGrouping flag
   this._autoGrouping = false; // Prevent re-grouping in columnMoved event
 
-  var gridApi = this.getGridApi();
-  if (gridApi && gridApi.reorderColumns) {
-    dirty = gridApi.reorderColumns(colList, destCol); // TODO: Support multi-table feature
-  }
-
+  this._reorderColumns(colList, destCol);
   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
+* @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._moveColumnById(srcCol, destCol);
   this._autoGrouping = true;
   return dirty;
 };

package/lib/tr-grid-column-stack/es6/ColumnStack.js

@@ -1850,10 +1850,7 @@ ColumnStackPlugin.prototype.reorderColumns = function(colList, destCol) {
 	var dirty = false;
 	this._stacking = false;
 
-	var gridApi = this.getGridApi();
-	if(gridApi && gridApi.reorderColumns) {
-		dirty = gridApi.reorderColumns(colList, destCol); // TODO: Support multi-table feature
-	}
+	this._reorderColumns(colList, destCol);
 
 	this._stacking = true;
 	return dirty;
@@ -1868,10 +1865,7 @@ ColumnStackPlugin.prototype.moveColumnById = function(srcCol, destCol) {
 	var dirty = false;
 	this._stacking = false;
 
-	var gridApi = this.getGridApi();
-	if(gridApi && gridApi.moveColumnById) {
-		dirty = gridApi.moveColumnById(srcCol, destCol); // TODO: Support multi-table feature
-	}
+	this._moveColumnById(srcCol, destCol);
 
 	this._stacking = true;
 	return dirty;

package/lib/tr-grid-util/es6/GridPlugin.d.ts

@@ -34,6 +34,12 @@ declare class GridPlugin extends EventDispatcher {
 
     public getColumnId(colIndex: number|string|null): string;
 
+    public getColumnIds(): (string)[];
+
+    public getColumnField(colIndex: number): string;
+
+    public getColumnFields(): (string)[];
+
     public getColumnCount(): number;
 
     public static requestPlugin(ref: any, pluginRef: any, configObj?: any, compositeGrid?: any, realTimeGrid?: any): Promise<any>|null;

package/lib/tr-grid-util/es6/GridPlugin.js

@@ -238,6 +238,7 @@ GridPlugin.prototype.getColumnName = function (colRef) {
 * @return {number}
 */
 GridPlugin.prototype.getColumnIndex = function (colRef) {
+	// TODO: Unify the below logics
 	if(typeof colRef === "number") {
 		return colRef;
 	}
@@ -258,6 +259,7 @@ GridPlugin.prototype.getColumnIndex = function (colRef) {
 * @return {Array.<number>} column indices
 */
 GridPlugin.prototype.getColumnIndices = function (colRefs) {
+	// TODO: Unify the below logics
 	if(this._compositeGrid) {
 		var allFields = this._compositeGrid.getColumnFields();
 		var columnCount = this._compositeGrid.getColumnCount();
@@ -286,6 +288,7 @@ GridPlugin.prototype.getColumnIndices = function (colRefs) {
 * @return {string}
 */
 GridPlugin.prototype.getColumnId = function (colIndex) {
+	// TODO: Unify the below logics
 	if(typeof colIndex === "string") {
 		return colIndex;
 	}
@@ -300,6 +303,34 @@ GridPlugin.prototype.getColumnId = function (colIndex) {
 	return "";
 };
 /** @public
+* @return {!Array.<string>} Return all column ids from existing column
+*/
+GridPlugin.prototype.getColumnIds = function () {
+	if(this._hosts && this._hosts.length) {
+		return this._hosts[0].getColumnIds();
+	}
+	return [];
+};
+/** @public
+* @param {number} colIndex
+* @return {string} Return empty string if the specified column does not exist
+*/
+GridPlugin.prototype.getColumnField = function (colIndex) {
+	if(this._hosts && this._hosts.length) {
+		return this._hosts[0].getColumnField(colIndex);
+	}
+	return "";
+};
+/** @public
+* @return {!Array.<string>} Return all column fields from existing column
+*/
+GridPlugin.prototype.getColumnFields = function () {
+	if(this._hosts && this._hosts.length) {
+		return this._hosts[0].getColumnFields();
+	}
+	return [];
+};
+/** @public
 * @return {number}
 */
 GridPlugin.prototype.getColumnCount = function() {
@@ -309,6 +340,42 @@ GridPlugin.prototype.getColumnCount = function() {
 	}
 	return 0;
 };
+/** @protected
+* @ignore
+* @param {number|string} srcCol Column Id or index
+* @param {(number|string)=} destCol Column Id or index of the destination
+* @return {boolean}
+*/
+GridPlugin.prototype._moveColumnById = function (srcCol, destCol) {
+	var hosts = this._hosts;
+	var len = hosts ? hosts.length : 0;
+	if(len) {
+		var dirty = 0;
+		for(var i = 0; i < len; ++i) {
+			dirty |= hosts[i].moveColumnById(srcCol, destCol);
+		}
+		return dirty ? true : false;
+	}
+	return false;
+};
+/** @protected
+* @ignore
+* @param {number|string|Array.<number|string>} colRefs List of column index or column id to be moved
+* @param {(number|string)=} destCol Destination position where the moved columns will be placed BEFORE the specified position. This can be column id or index
+* @return {boolean} Return true if there is any change, and false otherwise
+*/
+GridPlugin.prototype._reorderColumns = function (colRefs, destCol) {
+	var hosts = this._hosts;
+	var len = hosts ? hosts.length : 0;
+	if(len) {
+		var dirty = 0;
+		for(var i = 0; i < len; ++i) {
+			dirty |= hosts[i].reorderColumns(colRefs, destCol);
+		}
+		return dirty ? true : false;
+	}
+	return false;
+};
 
 /** @protected
 * @deprecated

package/lib/types/es6/ColumnGrouping.d.ts

@@ -79,11 +79,11 @@ declare class ColumnGroupingPlugin extends GridPlugin {
 
     public getValidDestinationIndex(id: string, destCol: number|string|null): number;
 
-    public moveGroup(id: string, destCol: number|string|null): void;
+    public moveGroup(id: string, destCol?: (number|string)|null): void;
 
-    public reorderColumns(colList: (number|string)[]|null, destCol: number|string|null): boolean;
+    public reorderColumns(colList: (number|string)[]|null, destCol?: (number|string)|null): boolean;
 
-    public moveColumnById(srcCol: number|string|null, destCol?: number|string|null): boolean;
+    public moveColumnById(srcCol: number|string|null, destCol?: (number|string)|null): boolean;
 
 }
 

package/lib/types/es6/Core/data/DataTable.d.ts

@@ -98,7 +98,7 @@ declare class DataTable extends DataCache {
 
     public addSegmentChild(segmentId: string, rid: string, dataId?: string|null): boolean;
 
-    public addSegmentChildren(segmentId: string, rids: (string)[]|null): boolean;
+    public addSegmentChildren(segmentId: string, rids: (string)[]|null, dataIds?: (string)[]|null): boolean;
 
     public removeSegmentChild(segmentId: string, rid: string): boolean;
 

package/lib/types/es6/Core/data/DataView.d.ts

@@ -258,7 +258,7 @@ declare class DataView extends EventDispatcher {
 
     public addSegmentChild(segmentRef: string|number|null, rowRef: string|number|null, dataId?: string|null): boolean;
 
-    public addSegmentChildren(segmentRef: string|number|null, rowRefs: (string|number)[]|null): boolean;
+    public addSegmentChildren(segmentRef: string|number|null, rowRefs: (string|number)[]|null, dataIds?: (string)[]|null): boolean;
 
     public removeSegmentChild(segmentRef: string|number|null, rowRef: string|number|null): boolean;
 

package/lib/types/es6/Core/data/Segment.d.ts

@@ -15,7 +15,7 @@ declare class Segment extends EventDispatcher {
 
     public addChild(rid: string, dataId?: string|null): boolean;
 
-    public addChildren(rids: (string)[]|null): boolean;
+    public addChildren(rids: (string)[]|null, dataIds?: (string)[]|null): boolean;
 
     public containsChild(rid: string): boolean;
 

package/lib/types/es6/Core/data/SegmentCollection.d.ts

@@ -40,7 +40,7 @@ declare class SegmentCollection extends EventDispatcher {
 
     public addSegmentChild(segmentId: string, rid: string, dataId?: string|null): boolean;
 
-    public addSegmentChildren(segmentId: string, rids: (string)[]|null): boolean;
+    public addSegmentChildren(segmentId: string, rids: (string)[]|null, dataIds?: (string)[]|null): boolean;
 
     public containsSegmentChild(segmentId: string, rid: string): boolean;
 

package/lib/types/es6/Core/grid/Core.d.ts

@@ -133,6 +133,10 @@ declare class Core extends ElementWrapper {
 
     public moveColumn(fromCol: number|(number)[]|null, destCol: number): boolean;
 
+    public moveColumnById(srcCol: number|string|null, destCol?: (number|string)|null): boolean;
+
+    public reorderColumns(colRefs: number|string|(number|string)[]|null, destCol?: (number|string)|null): boolean;
+
     public addRow(opt_num?: number|null): void;
 
     public removeRow(opt_num?: number|null): void;
@@ -297,8 +301,6 @@ declare class Core extends ElementWrapper {
 
     public getRelativePosition(obj: ElementWrapper|Element|Event|MouseEvent, context?: any): Core.MouseInfo;
 
-    public getColumnIndex(str: string): number;
-
     public getVScrollbar(): ElementWrapper;
 
     public getHScrollbar(): ElementWrapper;
@@ -393,6 +395,18 @@ declare class Core extends ElementWrapper {
 
     public getColumnIds(): (string)[];
 
+    public setColumnField(colIndex: number, field: string): void;
+
+    public getColumnField(colIndex: number): string;
+
+    public getColumnFields(): (string)[];
+
+    public getColumnIndex(colRef: string|number|null): number;
+
+    public getColumnIndices(colRefs: (number|string)[]|null): (number)[];
+
+    public getColumnIndexMap(): { [key: string]:  number };
+
 }
 
 declare function num(opt_type?: string|null): (ILayoutGrid)[];
@@ -409,7 +423,7 @@ declare function section(): number;
 
 declare function path(obj: ElementWrapper|Element|Event|MouseEvent, context?: any): Core.MouseInfo;
 
-declare function cellElement(str: string): number;
+declare function cellElement(): ElementWrapper;
 
 export default Core;
 export { Core };

package/lib/types/es6/RealtimeGrid/ColumnDefinition.d.ts

@@ -51,13 +51,13 @@ declare namespace ColumnDefinition {
 
 declare class ColumnDefinition {
 
-    constructor(columnOption?: ColumnDefinition.Options|string|null, hostGrid?: any);
+    constructor(columnOption?: ColumnDefinition.Options|null, hostGrid?: any);
 
     public dispose(): void;
 
     public _initializeTimeSeriesChild(columnOption?: ColumnDefinition.Options|string|null): void;
 
-    public initialize(columnOption?: ColumnDefinition.Options|string|null): void;
+    public initialize(columnOption?: ColumnDefinition.Options|null): void;
 
     public getId(): string;