@refinitiv-ui/efx-grid 6.0.53 → 6.0.55

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

@@ -685,6 +685,8 @@ ColumnSelectionPlugin.prototype.clearAllSelections = function () {
 
     this._clearMenuIcon();
   }
+
+  this._updateGroupSelection();
 };
 /** Alias to clearAllSelections() method
 * @public
@@ -821,37 +823,14 @@ ColumnSelectionPlugin.prototype._isSelectedColumns = function (colIndices) {
 
   return isAllSelected;
 };
-/**
+/** Update group selection according to current selected columns
 * @private
-* @param {Array<number>} colIndices
 */
 
 
 ColumnSelectionPlugin.prototype._updateGroupSelection = function () {
-  var cgp = this._cgp;
-  var grid = this._activeGrid;
-
-  if (!cgp || !grid) {
-    return;
-  }
-
-  var section = grid.getSection("title");
-  var groupDefs = cgp.getGroupDefinitions();
-  var count = groupDefs.length;
-
-  for (var i = 0; i < count; i++) {
-    var groupDef = groupDefs[i];
-    var groupId = groupDef["id"];
-    var childIndices = cgp.getChildColumnIndices(groupId);
-    var rowIndex = cgp.getGroupLevel(groupId);
-    var colIndex = childIndices[0];
-    var cell = section.getCell(colIndex, rowIndex);
-
-    if (this._isSelectedColumns(childIndices)) {
-      cell.addClass("selected-group");
-    } else {
-      cell.removeClass("selected-group");
-    }
+  if (this._cgp && this._cgp.selectGroupHeaders) {
+    this._cgp.selectGroupHeaders(this.getSelectedColumns());
   }
 };
 /** Left click on title causes selection change. <br>

package/lib/tr-grid-in-cell-editing/es6/InCellEditing.js

@@ -165,6 +165,8 @@ var InCellEditingPlugin = function InCellEditingPlugin(options) {
   t._createTitleEditor = t._createTitleEditor.bind(t);
   t._onColumnAdded = t._onColumnAdded.bind(t);
   t._onValueChanged = t._onValueChanged.bind(t);
+  t._onMultiSelectionValueChanged = t._onMultiSelectionValueChanged.bind(t);
+  t._onMultiSelectionEditorChanged = t._onMultiSelectionEditorChanged.bind(t);
   t._onAutoSuggestItemSelected = t._onAutoSuggestItemSelected.bind(t);
   t._hosts = [];
   if (options) {
@@ -393,7 +395,12 @@ InCellEditingPlugin.prototype._createInputElement = function (tag, attributes) {
       }
     });
   } else if (tag === typeMap.select || tag === typeMap.combobox || tag === typeMap.date) {
-    elem.addEventListener("value-changed", t._onValueChanged);
+    if (tag === typeMap.combobox && attributes && attributes["multiple"]) {
+      elem.addEventListener("value-changed", t._onMultiSelectionValueChanged);
+      elem.addEventListener("opened-changed", t._onMultiSelectionEditorChanged);
+    } else {
+      elem.addEventListener("value-changed", t._onValueChanged);
+    }
   } else if (tag === "ef-input") {
     elem.setAttribute("type", "number");
   } else if (tag === typeMap.input) {
@@ -1481,6 +1488,26 @@ InCellEditingPlugin.prototype._onValueChanged = function (e) {
 
   this._commitText(true);
 };
+/** @private
+* @param {Object} e
+*/
+InCellEditingPlugin.prototype._onMultiSelectionValueChanged = function (e) {
+  e.currentTarget.dirty = true;
+};
+/** @private
+* @param {Object} e
+*/
+InCellEditingPlugin.prototype._onMultiSelectionEditorChanged = function (e) {
+  if (e.detail && e.detail.value === false) {
+    if (this._activePos) {
+      var inputElement = this._activePos["inputElement"];
+      if (inputElement.dirty) {
+        this._onValueChanged(e);
+        inputElement.dirty = false;
+      }
+    }
+  }
+};
 
 /** @private
 * @param {Object} e
@@ -1767,7 +1794,10 @@ InCellEditingPlugin.prototype._setText = function (content, inputElement) {
       inputElement.removeAttribute("checked");
     }
   } else if (inputTag === typeMap.combobox) {
-    if (this._elfVersion <= 3) {
+    var isMultiple = inputElement.getAttribute("multiple");
+    if (isMultiple) {
+      inputElement.values = content.split(/, */);
+    } else if (this._elfVersion <= 3) {
       inputElement.value = "";
       inputElement.value = {
         value: content,
@@ -1847,6 +1877,8 @@ InCellEditingPlugin.prototype._getValue = function (inputElement) {
   } else if (inputTag === typeMap.number || typeof inputElement._origValue === "number" // Smart data conversion based orignal value
   ) {
     return +inputElement.value;
+  } else if (inputTag === typeMap.combobox && inputElement.getAttribute("multiple")) {
+    return inputElement.values.join(", ");
   }
   return this._getText(inputElement);
 };

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

@@ -24,6 +24,8 @@ declare class GroupDefinitions {
 
     public cloneGroupMap(): { [key: string]:  any };
 
+    public rebuildMap(): void;
+
     public getGroupChildren(groupId: string): (string)[]|null;
 
     public getLeafDescendants(groupId: string): (string)[]|null;
@@ -46,10 +48,12 @@ declare class GroupDefinitions {
 
     public removeGroup(groupId: string): boolean;
 
-    public setGroup(groupId: string, groupDef?: (string)[]|any|null): string;
+    public setGroup(groupId: string, groupDef?: ((string)[]|any)|null): string;
 
     public hasGroupChild(parentId: string, childId: string): boolean;
 
+    public contains(groupId: string, childId: string): boolean;
+
     public addGroupChild(parentId: string, childId: string, position?: number|null): boolean;
 
     public removeGroupChild(parentId: string, childId?: string|null): boolean;

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

@@ -67,7 +67,7 @@ GroupDefinitions.getLeafDescendants = function (groupMap, groupId) {
 		groupDef = unvisitedGroups[visitedCount++];
 		visitedMap[groupDef.id] = true;
 		var chdr = groupDef.children;
-		var len = chdr.length;
+		var len = chdr ? chdr.length : 0;
 		for(var i = 0; i < len; ++i) {
 			var childId = chdr[i];
 			groupDef = groupMap[childId];
@@ -87,44 +87,30 @@ GroupDefinitions.getLeafDescendants = function (groupMap, groupId) {
 /** @private
 * @function
 * @param {Object} obj
-* @return {Object}
+* @return {Object} Return a new object with guaranteed children property
 */
 GroupDefinitions._cloneObject = function(obj) {
 	var newObj = cloneObject(obj);
-	if(Array.isArray(newObj.children)) {
-		newObj.children = newObj.children;
+	if(Array.isArray(newObj.children)) { // This is to prevent modification from the outside source
+		newObj.children = newObj.children.slice();
 	} else {
 		newObj.children = [];
 	}
 	return newObj;
 };
-/** @private
-* @param {Object} groupMap
-* @return {!Object}
-*/
-GroupDefinitions._cloneGroupMap = function (groupMap) {
-	var outMap = {};
-	for(var groupId in groupMap) {
-		var groupDef = groupMap[groupId];
-		var obj = GroupDefinitions._cloneObject(groupDef);
-		obj.children = groupDef.children.slice();
-		outMap[groupId] = obj;
-	}
-	return outMap;
-};
 
 /** @private
 * @function
 * @param {Array.<string>|Object} obj
 * @param {string=} groupId
-* @return {Object}
+* @return {Object} Return a new object with guaranteed children property
 */
 GroupDefinitions._toGroupDefinition = function(obj, groupId) {
 	var groupDef = null;
 	if(obj) {
 		if(Array.isArray(obj)) {
 			groupDef = {
-				children: obj
+				children: obj.slice()
 			};
 		} else {
 			groupDef = GroupDefinitions._cloneObject(obj);
@@ -204,7 +190,43 @@ GroupDefinitions.prototype.getGroupMap = function () {
 * @return {!Object.<string, Object>}
 */
 GroupDefinitions.prototype.cloneGroupMap = function () {
-	return GroupDefinitions._cloneGroupMap(this._groupMap);
+	var groupMap = this._groupMap;
+	var outMap = {};
+	for(var groupId in groupMap) {
+		var groupDef = groupMap[groupId];
+		var obj = GroupDefinitions._cloneObject(groupDef);
+		outMap[groupId] = obj;
+	}
+	return outMap;
+};
+/** In case of a children array has been modified outside of GroupDefinitions, this method is needed to re-create internal maps to reflect existing structure
+* @public
+*/
+GroupDefinitions.prototype.rebuildMap = function () {
+	var groupMap = this._groupMap;
+	var childToParent = this._childToParent = {};
+
+	// Create child to parent map
+	var groupIds = Object.keys(groupMap);
+	var grpCount = groupIds.length;
+	var i, groupId;
+	for(i = 0; i < grpCount; ++i) {
+		groupId = groupIds[i];
+		var chdr = groupMap[groupId].children;
+		var childCount = chdr ? chdr.length : 0;
+		for (var j = 0; j < childCount; j++) {
+			childToParent[chdr[j]] = groupId;
+		}
+	}
+
+	// Apply a parent id to group definition to make it easier to find depth
+	for(i = 0; i < grpCount; ++i) {
+		groupId = groupIds[i];
+		var parentId = childToParent[groupId];
+		if(parentId) {
+			groupMap[groupId].parentId = parentId;
+		}
+	}
 };
 
 /** Get immediate child ids of the specified group. The returned array can contain both child ids and group ids
@@ -284,7 +306,7 @@ GroupDefinitions.prototype.getParentIds = function(childId) {
 };
 /** @public
 * @param {string} childId
-* @param {number=} groupLevel
+* @param {number=} groupLevel Default is to retrieve immediate parent id. Use 0 to get root (topmost) group id
 * @return {string}
 */
 GroupDefinitions.prototype.getParentId = function (childId, groupLevel) {
@@ -312,47 +334,25 @@ GroupDefinitions.prototype.removeAllGroups = function () {
 	}
 	return false;
 };
-/** Remove all existing group definitions and replace them with the given definitions.
+/** Remove all existing group definitions and replace them with the given definitions. Note that this method does not check for circular referencing nor duplication of ids
 * @public
 * @param {Array.<Object>=} groupDefs Use null or empty array to remove all existing groups
 */
 GroupDefinitions.prototype.setGroups = function (groupDefs) {
 	// Clear existing group structure
 	var groupMap = this._groupMap = {};
-	var childToParent = this._childToParent = {};
 
 	// Create group map
-	var i;
 	var grpCount = groupDefs ? groupDefs.length : 0;
-	var groupId = "";
-	for (i = 0; i < grpCount; i++) {
+	for (var i = 0; i < grpCount; i++) {
 		var groupDef = groupDefs[i];
-		groupId = groupDef.id;
+		var groupId = groupDef.id;
 		if(groupId) {
-			groupMap[groupId] = groupDef;
+			groupMap[groupId] = GroupDefinitions._cloneObject(groupDef);
 		}
 	}
 
-	// Create child to parent map
-	var groupIds = Object.keys(groupMap);
-	grpCount = groupIds.length;
-	for(i = 0; i < grpCount; ++i) {
-		groupId = groupIds[i];
-		var children = groupMap[groupId].children;
-		var childCount = children.length;
-		for (var j = 0; j < childCount; j++) {
-			childToParent[children[j]] = groupId;
-		}
-	}
-
-	// Apply a parent id to group definition to make it easier to find depth
-	for(i = 0; i < grpCount; ++i) {
-		groupId = groupIds[i];
-		var parentId = childToParent[groupId];
-		if(parentId) {
-			groupMap[groupId].parentId = parentId;
-		}
-	}
+	this.rebuildMap();
 };
 /** Add new group definition to existing group structure. Existing group with the same id will be replaced.
 * @public
@@ -381,11 +381,11 @@ GroupDefinitions.prototype.removeGroup = function (groupId) {
 	}
 	return false;
 };
-/** Replace and update existing group definition. New group is added if the given id has no match. Existing group will be removed of no new definition is given.
+/** Replace and update existing group definition. A new group will be added, only if the given id has no match. Existing group will be removed of no new definition is given.
 * @public
 * @param {string} groupId
-* @param {Array.<string>|Object=} groupDef
-* @return {string} Return group Id. Return empty string if nothing has been changed.
+* @param {(Array.<string>|Object)=} groupDef
+* @return {string} Return group Id. Return empty string, if nothing has been changed
 */
 GroupDefinitions.prototype.setGroup = function (groupId, groupDef) {
 	if(!groupId) {
@@ -406,7 +406,7 @@ GroupDefinitions.prototype.setGroup = function (groupId, groupDef) {
 		}
 		this._groupMap[groupId] = newDef;
 
-		var chdr = newDef.children;
+		var chdr = newDef.children; // newDef is guaranteed to have children property
 		var len = chdr.length;
 		for(var i = 0; i < len; ++i) {
 			var childId = chdr[i];
@@ -438,7 +438,8 @@ GroupDefinitions.prototype._ungroupChildren = function(children) {
 	}
 };
 
-/** @public
+/** Check if the given child id is an immediate child of the given group
+* @public
 * @param {string} parentId Group id
 * @param {string} childId
 * @return {boolean}
@@ -448,7 +449,30 @@ GroupDefinitions.prototype.hasGroupChild = function (parentId, childId) {
 	if(childId && groupDef) {
 		var chdr = groupDef.children;
 		if(chdr) {
-			return chdr.indexOf(childId) >= 0;
+			return chdr.indexOf(childId) >= 0; // TODO: Use childToParent map to improve performance
+		}
+	}
+	return false;
+};
+/** Check if the specified id is contained within the given group regardless of any group level that the id is in
+* @public
+* @param {string} groupId
+* @param {string} childId
+* @return {boolean}
+*/
+GroupDefinitions.prototype.contains = function (groupId, childId) {
+	if(groupId && childId) {
+		if(groupId === childId) {
+			return true;
+		}
+		var levelLimit = 20;
+		var parentId = this._childToParent[childId];
+		while(parentId && levelLimit) { // WARNING: Circular dependency could happen
+			if(groupId === parentId) {
+				return true;
+			}
+			--levelLimit;
+			parentId = this._childToParent[parentId];
 		}
 	}
 	return false;
@@ -515,7 +539,7 @@ GroupDefinitions.prototype.unsetParent = function (childId) {
 	var parentDef = this._groupMap[parentId];
 	if(parentDef) {
 		var chdr = parentDef.children;
-		if(chdr.length) {
+		if(chdr && chdr.length) {
 			var at = chdr.indexOf(childId);
 			if (at >= 0) {
 				chdr.splice(at, 1); // splice is slow
@@ -533,7 +557,7 @@ GroupDefinitions.prototype.removeAllChildren = function(groupId) {
 	var grpDef = this._groupMap[groupId];
 	if(grpDef) {
 		var chdr = grpDef.children;
-		var len = chdr.length;
+		var len = chdr ? chdr.length : 0;
 		if(len) {
 			grpDef.children = [];
 			for(var i = 0; i < len; ++i) {

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

@@ -4,22 +4,22 @@ import { GridPlugin } from "../../tr-grid-util/es6/GridPlugin.js";
 declare namespace AutoTooltipPlugin {
 
     type Options = {
-        header?: boolean,
-        title?: boolean,
-        footer?: boolean,
-        content?: boolean,
-        quickMode?: boolean
+        header?: boolean|null,
+        title?: boolean|null,
+        footer?: boolean|null,
+        content?: boolean|null,
+        quickMode?: boolean|null
     };
 
     type ColumnOptions = {
-        autoTooltip?: boolean
+        autoTooltip?: boolean|null
     };
 
 }
 
 declare class AutoTooltipPlugin extends GridPlugin {
 
-    constructor(options?: AutoTooltipPlugin.Options);
+    constructor(options?: AutoTooltipPlugin.Options|null);
 
     public getName(): string;
 
@@ -31,9 +31,9 @@ declare class AutoTooltipPlugin extends GridPlugin {
 
     public getConfigObject(gridOptions?: any): any;
 
-    public applyTooltip(colIndex: number, fromR?: number, toR?: number): void;
+    public applyTooltip(colIndex: number, fromR?: number|null, toR?: number|null): void;
 
-    public applyTooltipToColumns(colIndices?: (number)[]): void;
+    public applyTooltipToColumns(colIndices?: (number)[]|null): void;
 
     public applyTooltipToAllColumns(): void;
 

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

@@ -93,6 +93,8 @@ declare class ColumnGroupingPlugin extends GridPlugin {
 
     public unpinGroup(groupId: string, dest?: (number|string)|null): void;
 
+    public selectGroupHeaders(colIndices: (number)[]|null): void;
+
     public static getObjectIndex(column: any): number;
 
     public static getObjectId(column: any): string;

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

@@ -407,7 +407,7 @@ declare class Core extends ElementWrapper {
 
     public getValidColumnList(colIds: (string)[]|null, columnMap?: any): (string)[];
 
-    public createColumnMap(colIds?: (string)[]|null): any;
+    public createColumnMap(colRefs?: (string|number)[]|null): any;
 
     public startBatch(batchType: string): boolean;
 

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

@@ -8,6 +8,8 @@ declare namespace FieldDefinition {
 
     function get(field: string): any;
 
+    function getFieldInfo(field: string): any;
+
     function hasFieldInfo(field: string): boolean;
 
     function getTimeSeriesChildren(field: string): any;
@@ -18,8 +20,6 @@ declare namespace FieldDefinition {
 
     function setSynapseConfig(config: Grid.SynapseConfig|null): void;
 
-    function setFieldCaching(caching: boolean): void;
-
     function disableTimeSeriesExpansion(disabled: boolean): void;
 
     function isFormula(field: string): boolean;

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

@@ -135,9 +135,13 @@ declare class Grid extends EventDispatcher {
 
     public replaceColumn(columnOption: ColumnDefinition.Options|string|null, colRef: Grid.ColumnReference|null): void;
 
+    public getFieldInfo(field: string): any;
+
+    public loadFieldInfo(field: string): Promise<any>|null;
+
     public setColumns(columns: (any)[]|null): void;
 
-    public restoreColumns(columns: (any)[]|null): void;
+    public restoreColumns(columns: (any)[]|null, byId?: boolean|null): void;
 
     public setFields(ary: (string)[]|null): void;
 

package/lib/versions.json

@@ -1,25 +1,25 @@
 {
-	"tr-grid-util": "1.3.116",
+	"tr-grid-util": "1.3.117",
 	"tr-grid-printer": "1.0.16",
 	"@grid/column-dragging": "1.0.14",
 	"@grid/row-segmenting": "1.0.24",
-	"@grid/statistics-row": "1.0.14",
+	"@grid/statistics-row": "1.0.15",
 	"@grid/zoom": "1.0.11",
-	"tr-grid-auto-tooltip": "1.1.5",
+	"tr-grid-auto-tooltip": "1.1.6",
 	"tr-grid-cell-selection": "1.0.33",
 	"tr-grid-checkbox": "1.0.60",
 	"tr-grid-column-fitter": "1.0.39",
 	"tr-grid-column-formatting": "0.9.34",
-	"tr-grid-column-grouping": "1.0.52",
+	"tr-grid-column-grouping": "1.0.54",
 	"tr-grid-column-resizing": "1.0.28",
-	"tr-grid-column-selection": "1.0.28",
+	"tr-grid-column-selection": "1.0.29",
 	"tr-grid-column-stack": "1.0.68",
 	"tr-grid-conditional-coloring": "1.0.61",
 	"tr-grid-content-wrap": "1.0.20",
 	"tr-grid-contextmenu": "1.0.39",
 	"tr-grid-filter-input": "0.9.33",
 	"tr-grid-heat-map": "1.0.29",
-	"tr-grid-in-cell-editing": "1.0.78",
+	"tr-grid-in-cell-editing": "1.0.79",
 	"tr-grid-pagination": "1.0.24",
 	"tr-grid-percent-bar": "1.0.22",
 	"tr-grid-range-bar": "2.0.4",

package/package.json

@@ -66,5 +66,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"version": "6.0.53"
+	"version": "6.0.55"
 }