@refinitiv-ui/efx-grid 6.0.54 → 6.0.56

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

@@ -198,15 +198,6 @@ var cloneRowData = function(fromRowDef, toRowDef) {
 	}
 };
 
-/** @private
-* @param {string} sortField
-* @param {Object} elemData
-* @param {number} index
-*/
-var mapRowOrder = function (sortField, elemData, index) { // edit name
-	elemData[sortField] = index; // Make column for sort with user data array
-};
-
 /** @private
 * @param {RowDefinition} rowDef
 * @return {boolean}
@@ -2458,20 +2449,11 @@ Grid.prototype.updateDataSet = function(records, rowIdentifier) {
 	}
 
 	// Map new data index
-	var newDataMap = {};
 	var recordCount = records.length;
-	var record, i;
-	for (i = 0; i < recordCount; i++) {
-		record = records[i];
-		newDataMap[record[rowIdentifier]] = record; // Assign a new data map to compare to the previous data
-	}
-
 	var fieldSorting = "ROW_ORDER"; // TODO: Should be config by options
-	records.forEach(mapRowOrder.bind(null, fieldSorting));
-
 	var oldDataMap = {};
-	var rowDef, id;
-	var rowDefs = this.getRowDefinitions(); // WARNING: Filtered and hidden rows are not included
+	var rowDef, id, record, i;
+	var rowDefs = this.getAllRowDefinitions(); // Include the filter/hidden rows
 	var rowDefCount = rowDefs.length;
 	for (i = 0; i < rowDefCount; i++) {
 		rowDef = rowDefs[i];
@@ -2485,26 +2467,35 @@ Grid.prototype.updateDataSet = function(records, rowIdentifier) {
 		}
 	}
 
-	// Check Remove previous data
-	for (var rowIdentifierName in oldDataMap) {
-		if (oldDataMap[rowIdentifierName] && !newDataMap[rowIdentifierName]) {
-			this.removeRow(oldDataMap[rowIdentifierName]); // Slow
-		}
-	}
-
 	// Check Update and Insert
-	for (i = 0; i < recordCount; i++) {
+	var idMap = {};
+	var newDataMap = {};
+	for (i = recordCount - 1; i >= 0; i--) {
 		record = records[i];
 		id = record[rowIdentifier];
 		rowDef = oldDataMap[id];
+		newDataMap[id] = record; // Assign a new data map to compare to the previous data
+		record[fieldSorting] = i;
+		if(idMap[id]) { // Prevent assign data in duplicate row
+			continue;
+		}
+		idMap[id] = true;
 		if (!rowDef) {
-			this.insertRow({ values: newDataMap[id]}); // Insert last position
+			this.insertRow({ values: record}); // Insert last position
 		} else {
 			rowDef.setRowData(record);
 		}
 	}
+
+	// Check Remove previous data
+	for (var rowIdentifierName in oldDataMap) {
+		if (oldDataMap[rowIdentifierName] && !newDataMap[rowIdentifierName]) {
+			this.removeRow(oldDataMap[rowIdentifierName]); // Slow
+		}
+	}
+
 	// Sorting
-	this._dt.sortOnce("ROW_DEF", "a", compareNumber, fieldSorting);
+	this._dt.sortOnce(ROW_DEF, "a", compareNumber, fieldSorting);
 };
 /** @private
 * @param {Array|Object} item

package/lib/statistics-row/es6/StatisticsRow.js

@@ -702,7 +702,7 @@ StatisticsRowPlugin.prototype._onPostSectionDataBinding = function (e) {
 	}
 	// Render stuff
 	for(c = 0; c < colCount; ++c) {
-		this._renderStatistics(c, statistics[c], e.actualUpdate);
+		this._renderStatistics(c, statistics[c], e ? e.actualUpdate : false);
 	}
 
 	if(this.hasListener("postRendering")) {

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

@@ -88,7 +88,7 @@ ColumnGroupingPlugin.prototype._legacyColumnGroups = null;
 * @private
 */
 ColumnGroupingPlugin.prototype._inPinning = false;
-/** @type {!Object.<string, boolean}
+/** @type {!Object.<string, boolean>}
 * @description A map of selected groups
 * @private
 */

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/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/versions.json

@@ -3,14 +3,14 @@
 	"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.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.53",
+	"tr-grid-column-grouping": "1.0.54",
 	"tr-grid-column-resizing": "1.0.28",
 	"tr-grid-column-selection": "1.0.29",
 	"tr-grid-column-stack": "1.0.68",
@@ -19,7 +19,7 @@
 	"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.54"
+	"version": "6.0.56"
 }