@refinitiv-ui/efx-grid 6.0.39 → 6.0.41

package/lib/core/es6/grid/Core.js

@@ -31,6 +31,7 @@ import VirtualizedLayoutGrid from "./VirtualizedLayoutGrid.js";
 * @property {string} rowId
 * @property {number} rowIndex
 */
+/** @event Core#beforeContentBinding */
 /** @event Core#postSectionDataBinding */
 /** @event Core#rowHighlighted */
 
@@ -193,6 +194,7 @@ var Core = function (opt_initializer) {
 		"postDataSourceChanged",
 		"preSectionRender",
 		"postSectionRender",
+		"beforeContentBinding",
 		"preSectionDataBinding",
 		"postSectionDataBinding",
 		"rowExpansionBinding",
@@ -554,7 +556,7 @@ Core.prototype._batches = null;
 * @return {string}
 */
 Core.getVersion = function () {
-	return "5.1.55";
+	return "5.1.59";
 };
 /** {@link ElementWrapper#dispose}
 * @override
@@ -1356,6 +1358,7 @@ Core.prototype.getColumnCount = function () {
 * @fires Core#columnAdded
 * @fires Core#preSectionRender
 * @fires Core#columnRender
+* @fires Core#beforeContentBinding
 * @fires Core#preSectionDataBinding
 * @fires Core#columnDataBinding
 * @fires Core#postSectionDataBinding
@@ -1383,6 +1386,7 @@ Core.prototype.setColumnCount = function(num) {
 * @fires Core#columnAdded
 * @fires Core#preSectionRender
 * @fires Core#columnRender
+* @fires Core#beforeContentBinding
 * @fires Core#preSectionDataBinding
 * @fires Core#columnDataBinding
 * @fires Core#postSectionDataBinding
@@ -1499,16 +1503,12 @@ Core.prototype.removeColumnAt = function (index) {
 
 	if (this._hasListener("columnRemoved")) {
 		var e = {};
-		var batches = this._batches;
-		if(batches){
-			e["batches"] = batches;
-		}
 		e["atTheMiddle"] = true;
 		e["colIndex"] = index;
 		e["columns"] = "deprecated";
 		e["columnData"] = colDef["columnData"];
 		e["colId"] = colDef["id"] || "";
-		this._dispatch("columnRemoved", e);
+		this._dispatchColumnEvent("columnRemoved", e);
 	}
 
 	// Last index in view here might be different from before moving column if columns have different width.
@@ -1761,7 +1761,7 @@ Core.prototype._moveColumn = function (fromCol, destCol) {
 		e["fromColIndex"] = fromCol;
 		e["toColIndex"] = destCol;
 		e["colId"] = colId; // TODO: Id may not needed
-		this._dispatch("columnMoved", e);
+		this._dispatchColumnEvent("columnMoved", e); // add remove move
 	}
 
 	// Last index in view here might be different from before moving column if columns have different width.
@@ -1831,6 +1831,9 @@ Core.prototype.reorderColumns = function (colRefs, destCol) {
 		destId = destCol;
 	}
 
+	this.startBatch("move");
+
+	var dirty = 0;
 	if(Array.isArray(colRefs)) {
 		var srcLen = colRefs.length;
 		if(srcLen > 1) {
@@ -1873,7 +1876,6 @@ Core.prototype.reorderColumns = function (colRefs, destCol) {
 				}
 			}
 
-			var dirty = 0;
 			for(i = srcLen; --i >= 0;) {
 				srcId = srcIds[i]; // Only valid source columns are left at this point
 				srcIdx = this.getColumnIndex(srcId);
@@ -1884,17 +1886,15 @@ Core.prototype.reorderColumns = function (colRefs, destCol) {
 				dirty |= this._moveColumnByIndex(srcIdx, destIdx);
 				destId = srcId;
 			}
-			return dirty ? true : false;
 		} else {
-			return this.moveColumnById(colRefs[0], destId);
+			dirty = this.moveColumnById(colRefs[0], destId);
 		}
-	}
-
-	if(colRefs != null) {
+	} else if(colRefs != null) {
 		// colRefs will be a number or string
-		return this.moveColumnById(colRefs, destId);
+		dirty = this.moveColumnById(colRefs, destId);
 	}
-	return false;
+	this.stopBatch("move");
+	return dirty ? true : false;
 };
 
 /** @public
@@ -2001,6 +2001,7 @@ Core.prototype._deserializeColumn = function (index, jsonObj) {
 * @param {number=} opt_num Default is one row
 * @fires Core#preSectionRender
 * @fires Core#columnRender
+* @fires Core#beforeContentBinding
 * @fires Core#preSectionDataBinding
 * @fires Core#columnDataBinding
 * @fires Core#postSectionDataBinding
@@ -3804,6 +3805,7 @@ Core.prototype.synchronizeHScrollbar = function (subGrid) {
 * @param {number=} fromRowIndex INCLUSIVE If the value is undefined, the first row index will be used
 * @param {number=} lastRowIndex INCLUSIVE If the value is undefined, the last row index will be used
 * @param {Object=} userParam Addtional parameters to be fired with the event
+* @fires Core#beforeContentBinding
 * @fires Core#preSectionDataBinding
 * @fires Core#columnDataBinding
 * @fires Core#postSectionDataBinding
@@ -4446,6 +4448,17 @@ Core.prototype.stopBatch = function (batchType) {
 
 //#region Private Methods
 /** @private
+* @param {string} type
+* @param {!Object} eventArg
+*/
+Core.prototype._dispatchColumnEvent = function (type, eventArg) {
+	var batches = this._batches;
+	if(batches){
+		eventArg["batches"] = batches;
+	}
+	this._dispatch(type, eventArg);
+};
+/** @private
 */
 Core.prototype._dispatchColumnPositionChanged = function () {
 	if(this._columnPositionConflator.conflate()) {
@@ -4685,20 +4698,16 @@ Core.prototype._dispatchColumnAddedEvent = function (at, count, atTheMiddle, ctx
 	if (this._hasListener("columnAdded")) {
 		var e = {};
 		e["atTheMiddle"] = atTheMiddle;
-		var batches = this._batches;
-		if(batches){
-			e["batches"] = batches;
-		}
 		if(count === 1) {
 			e["colIndex"] = at;
 			e["context"] = ctx;
-			this._dispatch("columnAdded", e);
+			this._dispatchColumnEvent("columnAdded", e);
 		} else {
 			var ary = Array.isArray(ctx) ? ctx : [];
 			for (var i = 0; i < count; ++i) {
 				e["colIndex"] = at + i;
 				e["context"] = ary[i];
-				this._dispatch("columnAdded", e);
+				this._dispatchColumnEvent("columnAdded", e);
 			}
 		}
 	}
@@ -4840,15 +4849,11 @@ Core.prototype._removeColumn = function (num) {  // TODO: change the logic to us
 
 	if (this._hasListener("columnRemoved")) {
 		var e = {};
-		var batches = this._batches;
-		if(batches){
-			e["batches"] = batches;
-		}
 		for (var c = colCount; --c >= newCount; ) {
 			var colDef = removedCols[c - newCount];
 			e["colIndex"] = c;
 			e["columnData"] = colDef ? colDef["columnData"] : null;
-			this._dispatch("columnRemoved", e);
+			this._dispatchColumnEvent("columnRemoved", e);
 		}
 	}
 };
@@ -4881,6 +4886,9 @@ Core.prototype._onSectionDataChanged = function (e) {
 		rowDataCollection = dataView.getMultipleRowData(rids, fromR, toR);
 		e["dataRows"] = rowDataCollection;
 	}
+	if(e["sectionType"] === "content"){
+		this._dispatch("beforeContentBinding", e);
+	}
 	this._dispatch("preSectionDataBinding", e);
 
 	var dataMap = this.getDataColumnMap();

package/lib/core/es6/grid/plugins/SortableTitlePlugin.js

@@ -1525,8 +1525,11 @@ SortableTitlePlugin.prototype._onColumnAdded = function (e) {
 
 	var sortOrder = column["sortOrder"] || column["sort"];
 	if(sortOrder != null) {
-		t.clearSortState(); // clear previous sorting state
-		t.sortColumn(colIndex, sortOrder);
+		sortOrder = SortableTitlePlugin._toSortOrder(sortOrder); // Invalid input will return "n"
+		if(sortOrder !== "n") {
+			t.clearSortState(); // clear previous sorting state
+			t.sortColumn(colIndex, sortOrder);
+		}
 	}
 };
 

package/lib/grid/index.js

@@ -1,3 +1,3 @@
 import {Grid} from "./lib/efx-grid.js";
 export {Grid}
-window.EFX_GRID = { version: "6.0.39" };
+window.EFX_GRID = { version: "6.0.41" };

package/lib/row-segmenting/es6/RowSegmenting.js

@@ -33,7 +33,7 @@ import { injectCss, prettifyCss } from "../../tr-grid-util/es6/Util.js";
 */
 var RowSegmentingPlugin = function (options) {
 	var t = this;
-	t._onPostSectionDataBinding = t._onPostSectionDataBinding.bind(t);
+	t._onPreSectionDataBinding = t._onPreSectionDataBinding.bind(t);
 	t._updateHeader = t._updateHeader.bind(t);
 	t._onArrowClick = t._onArrowClick.bind(t);
 	t._rtSortingLogic = t._rtSortingLogic.bind(t);
@@ -128,7 +128,7 @@ RowSegmentingPlugin.prototype.initialize = function (host, options) {
 	ExpanderIcon.injectExpanderStyles(host.getElement());
 
 	this._hosts.push(host);
-	host.listen("postSectionDataBinding", this._onPostSectionDataBinding);
+	host.listen("preSectionDataBinding", this._onPreSectionDataBinding);
 
 	this.config(options);
 
@@ -182,7 +182,7 @@ RowSegmentingPlugin.prototype.unload = function (host) {
 	if (at < 0) {
 		return;
 	}
-	host.unlisten("postSectionDataBinding", this._onPostSectionDataBinding);
+	host.unlisten("preSectionDataBinding", this._onPreSectionDataBinding);
 	this._hosts.splice(at, 1);
 	this._dispose();
 };
@@ -338,7 +338,7 @@ RowSegmentingPlugin.prototype._injectStyles = function(predefinedColors) {
 /** @private
 * @param {Object} e
 */
-RowSegmentingPlugin.prototype._onPostSectionDataBinding = function (e) {
+RowSegmentingPlugin.prototype._onPreSectionDataBinding = function (e) {
 	this._updateHeader(
 		e.sectionSettings,
 		e.fromRowIndex,