@refinitiv-ui/efx-grid 6.0.34 → 6.0.35

package/lib/column-dragging/es6/ColumnDragging.js

@@ -75,11 +75,17 @@ var ColumnDraggingPlugin = function (options) {
 	t._hosts = [];
 
 	t._guideline = document.createElement("div");
-	t._guideline.className = "guideline";
 	t._dragBox = document.createElement("div");
-	t._dragBox.className = "drag-box-disabled"; // defualt disable dragbox
+	t._dragBox.classList.add("drag-box-disabled"); // defualt disable dragbox
 	t._dragBoxIcon = document.createElement("ef-icon");
-	t._dragBoxIcon.className = "drag-box-icon";
+	t._dragBoxIcon.classList.add("drag-box-icon");
+
+	if(ElfUtil.getElfVersion() < 4) {
+		t._dragBox.classList.add("tr-dragbox");
+		t._guideline.classList.add("tr-guideline");
+	} else {
+		t._guideline.classList.add("guideline");
+	}
 
 	if(options) {
 		this.config({ "columnDragging": options });
@@ -284,7 +290,8 @@ ColumnDraggingPlugin.prototype.config = function (options) {
 
 	if (typeof extOptions["dragBoxRenderer"] === "function") {
 		this._dragBoxRenderer = extOptions["dragBoxRenderer"];
-		this._dragBox.className = "drag-box";
+		this._dragBox.classList.add("drag-box");
+		this._dragBox.classList.remove("drag-box-disabled");
 	}
 	this.addListener(extOptions, "dragStart");
 	this.addListener(extOptions, "drag");
@@ -607,47 +614,38 @@ ColumnDraggingPlugin.prototype._onDragEnd = function (e) {
 	if (!operationCancelled) {
 		if (!this._noColumnMoving) {
 			var cgp = this._getPlugin("ColumnGroupingPlugin");
+			var csp = this._getPlugin("ColumnStackPlugin");
+			var destIndex = this._destColumn;
+			var groupId, stackId;
+
+			// Move operation always move to the left of destination column
+			// When moving forward, destnation need to added by 1 to move correctly
+			if (this._startColumn < this._destColumn) {
+				destIndex = this._destColumn + 1;
+			}
+
+			// TODO: support multi column dragging
+			if(csp) {
+				stackId = csp.getStackId(this._startColumn);
+			}
 			if(cgp){
 				var cellInfo = cgp.getCellInfo(this._startPos);
-				var srcId = cellInfo["groupId"] || cellInfo["columnId"];
-				var destIndex = this._destColumn;
+				groupId = cellInfo["groupId"] || cellInfo["columnId"];
+			}
 
-				// Move group always move to the left of destination
-				// When moving forward, destnation need to added by 1 to move correctly
-				if (this._startColumn < this._destColumn) {
-					destIndex = this._destColumn + 1;
-				}
-				if(srcId){
-					cgp.moveGroup(srcId, destIndex);
-				}
+			if(stackId && this._startColumn === this._endColumn){
+				csp.moveStack(stackId, destIndex);
+			} else if(groupId) {
+				cgp.moveGroup(groupId, destIndex);
 			} else {
-				var shiftStart = -1;
-				var shiftEnd = -1;
-				var moveSize = -1;
-				if (this._startColumn > this._destColumn) { //Move backward
-					shiftStart = this._destColumn;
-					shiftEnd = this._startColumn - 1;
-					moveSize = -1 * (this._startColumn - this._destColumn); //Move to the left
-				} else
-				if (this._startColumn < this._destColumn) { //Move foward
-					shiftStart = this._endColumn + 1;
-					shiftEnd = this._destColumn;
-					moveSize = ((shiftEnd - shiftStart) + 1); //Move to the right
+				var colList = [];
+				var i;
+				for(i = this._startColumn; i <= this._endColumn; i++){
+					colList.push(i);
 				}
-
-				//Perform moving all columns in the range
-				for(var j = this._hosts.length; --j >= 0;) {
-					var host = this._hosts[j];
-					var i;
-					if (moveSize > 0) { //Move forward
-						for (i = this._startColumn; i <= this._endColumn; i++) {
-							host.moveColumn(this._startColumn, this._destColumn);
-						}
-					} else { //Move backward
-						for (i = this._startColumn; i <= this._endColumn; i++) {
-							host.moveColumn(this._startColumn + (i - this._startColumn), this._destColumn + (i - this._startColumn));
-						}
-					}
+				for(i = this._hosts.length; --i >= 0;) {
+					var host = this._hosts[i];
+					host.reorderColumns(colList, destIndex);
 				}
 			}
 		}
@@ -756,6 +754,18 @@ ColumnDraggingPlugin.prototype._renderGuideline = function() {
 	var rightHand = this._pos["x"] > colLeft + colWidth / 2;
 	var destColumn = (rightHand) ? colEnd + 1 : colStart;
 
+	var csp = this._getPlugin("ColumnStackPlugin");
+	if(csp){
+		var stackId = csp.getStackId(destColumn);
+		if(stackId){
+			var members = csp.getStackMemberIndices(stackId);
+			var memberCount = members.length;
+			if(members && memberCount){
+				destColumn = rightHand ? members[memberCount - 1] + 1 : members[0];
+			}
+		}
+	}
+
 	colLeft = this._clickedGrid.getColumnLeft(this._destColumn);
 	// If destination exceeds the specified bounds
 	if (destColumn < this._leftMovableBorder) {

package/lib/core/dist/core.js

@@ -15676,7 +15676,24 @@ DataTable.prototype.setSortingLogic = function(func) {
 * @param {DataTable.SortLogic} func Use null to remove current sorting logic
 */
 DataTable.prototype.setColumnSortingLogic = function(cid, func) {
-	this._compMap[cid] = func;
+	if(cid) {
+		this._compMap[cid] = func;
+	}
+};
+/** Get sorting logic for the specified field. Default logic is returned, if no logic is specified for the column
+* @public
+* @param {string=} cid
+* @return {DataTable.SortLogic}
+*/
+DataTable.prototype.getColumnSortingLogic = function(cid) {
+	if(cid) {
+		var logic = this._compMap[cid];
+		if(logic) {
+			return logic;
+		}
+	}
+
+	return this._compMap["_default"] || null;
 };
 
 /** Freeze data table so that no event is fired for data processing until executing {@link DataTable#unfreeze} method
@@ -19423,6 +19440,17 @@ DataView.prototype.setColumnSortingLogic = function(cid, func) {
 		this._dt.setColumnSortingLogic(cid, func);
 	}
 };
+/** Get sorting logic for the specified field. Default logic is returned, if no logic is specified for the column
+* @public
+* @param {string=} cid
+* @return {DataTable.SortLogic}
+*/
+DataView.prototype.getColumnSortingLogic = function(cid) {
+	if(this._dt) {
+		return this._dt.getColumnSortingLogic(cid);
+	}
+	return null;
+};
 /** Check if this view is in sorting mode
 * @public
 * @return {boolean}
@@ -25159,6 +25187,7 @@ VirtualizedLayoutGrid._proto = VirtualizedLayoutGrid.prototype;
 
  // eslint-disable-line
 
+
  // eslint-disable-line
 
 
@@ -25358,7 +25387,9 @@ var Core_Core = function (opt_initializer) {
 		"rowRemoved",
 		"columnPositionChanged",
 		"rowPositionChanged",
-		"beforeColumnBoundUpdate"
+		"beforeColumnBoundUpdate",
+		"beforeBatchOperation",
+		"afterBatchOperation"
 	);
 
 	// For debugging in advanced optimization mode
@@ -25433,6 +25464,15 @@ Core_Core.SectionReference;
 */
 Core_Core.MouseInfo;
 
+/** @typedef {Object} Core~BatchInfo
+* @private
+* @property {string=} reset //set columns
+* @property {string=} insertion //add cols
+* @property {string=} removal //remove cols
+* @property {string=} moving //reorder
+*/
+Core_Core.BatchInfo;
+
 /** @typedef {Core.MouseInfo|ElementWrapper|Element} Core~CellReference
 * @description A section in core grid can be refered by the following object <br>
 * `{Core.MouseInfo}` : Object with valid x, y coordinates and section index <br>
@@ -25687,6 +25727,10 @@ Core_Core.prototype._rowHeightTimerId = 0;
 * @private
 */
 Core_Core.prototype._groupDefs = null;
+/** @type {BatchInfo}
+* @private
+*/
+Core_Core.prototype._batches = null;
 //#region Public Methods
 
 /**
@@ -25694,7 +25738,7 @@ Core_Core.prototype._groupDefs = null;
 * @return {string}
 */
 Core_Core.getVersion = function () {
-	return "5.1.45";
+	return "5.1.48";
 };
 /** {@link ElementWrapper#dispose}
 * @override
@@ -26633,6 +26677,10 @@ Core_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";
@@ -29477,6 +29525,40 @@ Core_Core.prototype.getColumnGroupChildIds = function (groupId) {
 	}
 	return null;
 };
+
+/** @public
+* @param {string} batchType
+* @return {boolean}
+* @fires Core#beforeBatchOperation
+*/
+Core_Core.prototype.startBatch = function (batchType) {
+	if(!batchType){
+		return false;
+	}
+	if(!this._batches){
+		this._batches = {};
+	}
+	this._batches[batchType] = batchType;
+	this._dispatch("beforeBatchOperation", { batches: this._batches, batchType: batchType });
+	return true;
+};
+/** @public
+* @param {string} batchType
+* @return {boolean}
+* @fires Core#afterBatchOperation
+*/
+Core_Core.prototype.stopBatch = function (batchType) {
+	if(!batchType){
+		return false;
+	}
+	this._dispatch("afterBatchOperation", { batches: this._batches, batchType: batchType });
+
+	delete this._batches[batchType];
+	if((0,es6_Util/* isEmptyObject */.Qr)(this._batches)){
+		this._batches = null;
+	}
+	return true;
+};
 //#endregion Public Methods
 
 //#region Private Methods
@@ -29720,6 +29802,10 @@ Core_Core.prototype._dispatchColumnAddedEvent = function (at, count, atTheMiddle
 	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;
@@ -29871,6 +29957,10 @@ Core_Core.prototype._removeColumn = function (num) {  // TODO: change the logic
 
 	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;
@@ -32395,6 +32485,9 @@ SortableTitlePlugin.prototype._sortDataView = function (opt_action) {
 	if (!this._dataSorting) { return; }
 
 	var sortCount = this._sortStates.length;
+	if(this._userManagedLogic && sortCount > 1) { // The logic is managed by the user. There is no point in using multi-column sorting
+		sortCount = 1;
+	}
 	var orders = null;
 	var sortLogics = null;
 	var c_ref = null;
@@ -32410,6 +32503,9 @@ SortableTitlePlugin.prototype._sortDataView = function (opt_action) {
 		} else {
 			c_ref = this.getColumnSortingFields();
 		}
+		if(this._userManagedLogic && c_ref.length > 1) {
+			c_ref = c_ref.slice(0, 1);
+		}
 	}
 
 	// Perform sorting even if there is no sort state