@refinitiv-ui/efx-grid 6.0.20 → 6.0.22

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

@@ -128,6 +128,10 @@ ColumnDraggingPlugin.prototype._dragPulseId = 0;
 */
 ColumnDraggingPlugin.prototype._pos = null; // Cache of current mouse position
 /** @private
+* @type {Object}
+*/
+ColumnDraggingPlugin.prototype._startPos = null; // Cache of start column position
+/** @private
 * @type {number}
 */
 ColumnDraggingPlugin.prototype._cacheLeft = 0;
@@ -413,6 +417,7 @@ ColumnDraggingPlugin.prototype._onMouseDown = function (e) {
 	this._clickedSection = section;
 	this._clickedRow = rowIndex;
 
+	this._startPos = this._pos;
 	this._startColumn = movingColumns["left"];
 	this._endColumn = movingColumns["right"];
 	this._leftMovableBorder = movableBorder["left"];
@@ -601,31 +606,47 @@ ColumnDraggingPlugin.prototype._onDragEnd = function (e) {
 
 	if (!operationCancelled) {
 		if (!this._noColumnMoving) {
-			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 cgp = this._getPlugin("ColumnGroupingPlugin");
+			if(cgp){
+				var cellInfo = cgp.getCellInfo(this._startPos);
+				var srcId = cellInfo["groupId"] || cellInfo["columnId"];
+				var destIndex = this._destColumn;
+
+				// 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);
+				}
+			} 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
+				}
 
-			//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));
+				//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));
+						}
 					}
 				}
 			}
@@ -673,6 +694,7 @@ ColumnDraggingPlugin.prototype._onDragPulse = function() {
 */
 ColumnDraggingPlugin.prototype._clearCache = function() {
 	this._startColumn = this._endColumn = this._destColumn = -1;
+	this._startPos = null;
 
 	this._leftMovableBorder = this._rightMovableBorder = -1;
 

package/lib/core/dist/core.js

@@ -5272,6 +5272,33 @@ CellSpans.prototype.removeColumn = function (at) { // Use when a column is remov
 	}
 	return dirty;
 };
+/** @public
+* @param {boolean=} bool
+*/
+CellSpans.prototype.freezeMapping = function (bool) {
+	this._frozenMapping = bool !== false;
+	if(!this._frozenMapping) {
+		this._mapCellSpans();
+	}
+};
+
+
+/** @private
+*/
+CellSpans.prototype._mapCellSpans = function () {
+	var cellSpans = this._spans;
+	this._spans = [];
+	this._occupiedMap = {};
+	var i, cellSpan;
+	for(i = cellSpans.length; --i >= 0;) {
+		cellSpan = cellSpans[i];
+		if(cellSpan.indexX >= 0) {
+			cellSpan.register(this._spans, this._occupiedMap);
+		}
+	}
+};
+
+
 /** @public
 * @param {number} from
 * @param {number} amount This can be negative number
@@ -5288,18 +5315,10 @@ CellSpans.prototype.shiftColumn = function (from, amount) { // Use when a column
 			cellSpan.indexX += amount;
 		}
 	}
-	if(!dirty) { return false; }
+	if(!dirty || this._frozenMapping) { return false; }
 
 	// Re-registers all cellspans. Some of the cellspans may be lost due to shifting
-	var cellSpans = this._spans;
-	this._spans = [];
-	this._occupiedMap = {};
-	for(i = cellSpans.length; --i >= 0;) {
-		cellSpan = cellSpans[i];
-		if(cellSpan.indexX >= 0) {
-			cellSpan.register(this._spans, this._occupiedMap);
-		}
-	}
+	this._mapCellSpans();
 	return true;
 };
 /** @public
@@ -5588,6 +5607,12 @@ CellSpans.prototype._spans;
 */
 CellSpans.prototype._occupiedMap;
 
+/**
+* @private
+* @type {boolean}
+*/
+CellSpans.prototype._frozenMapping = false;
+
 /* harmony default export */ const components_CellSpans = (CellSpans);
 
 
@@ -9341,6 +9366,7 @@ LayoutGrid.prototype.setFrozenLayout = function (bool) {
 	if (this._frozenLayout !== bool) {
 		this._frozenLayout = bool;
 
+		this._cellSpans.freezeMapping(this._frozenLayout);
 		if (!this._frozenLayout) {
 			this._syncLayoutToColumns(0);
 			this._syncLayoutToRows(0, this._rowCount);
@@ -24225,7 +24251,7 @@ Core_Core.prototype._rowHeightTimerId = 0;
 * @return {string}
 */
 Core_Core.getVersion = function () {
-	return "5.1.31";
+	return "5.1.32";
 };
 /** {@link ElementWrapper#dispose}
 * @override
@@ -26577,6 +26603,13 @@ Core_Core.prototype.freezeLayout = function (opt_bool) {
 	if (prevState !== opt_bool) {
 		this._frozenLayout = opt_bool;
 
+		var stp = this.getPlugin("SortableTitlePlugin");
+		if(this._frozenLayout) {
+			if(stp) {
+				stp.freezeIndicator(true);
+			}
+		}
+
 		if (!this._frozenLayout) {
 			// Width has not yet changed so we need to disable it first
 			this._disableEvent("widthChanged");
@@ -26605,6 +26638,9 @@ Core_Core.prototype.freezeLayout = function (opt_bool) {
 			if(!viewChanged) { // Always update virtualizer
 				this._rowVirtualizer.update(true); // Force section activation
 			}
+			if(stp) {
+				stp.freezeIndicator(false);
+			}
 		}
 		this._rowHeightSync = true;
 	}
@@ -29252,6 +29288,10 @@ SortableTitlePlugin.prototype._userManagedLogic = false;
 * @type {boolean}
 */
 SortableTitlePlugin.prototype._disabled = false;
+/** @private
+* @type {boolean}
+*/
+SortableTitlePlugin.prototype._frozenIndicator = false;
 /** Since DataView in real-time grid has only one ROW_DEF column, we need to re-map sorting field to sort correctly.
 * @private
 * @type {boolean}
@@ -29810,8 +29850,9 @@ SortableTitlePlugin.prototype.sortColumns = function (sortOptions, opt_arg) {
 * @param {Object=} opt_arg Event argument to be sent with preDataSorting event
 */
 SortableTitlePlugin.prototype.clearSortState = function (opt_arg) {
-	this._popSortState(0, opt_arg);
-	this.updateSortSymbols();
+	if(this._popSortState(0, opt_arg)) {
+		this.updateSortSymbols();
+	}
 };
 /** @description Perform sorting with the same parameter.
 * @public
@@ -30016,6 +30057,12 @@ SortableTitlePlugin.prototype.disableTwoStateSorting = function (disabled) {
 
 };
 /** @public
+* @param {boolean=} bool=true, if set to false it will be unfreeze indicator
+*/
+SortableTitlePlugin.prototype.freezeIndicator = function (bool) {
+	this._frozenIndicator = bool !== false;
+};
+/** @public
 * @param {boolean=} disabled
 */
 SortableTitlePlugin.prototype.disableSortSymbols = function (disabled) {
@@ -30628,7 +30675,7 @@ SortableTitlePlugin.prototype._clearSortSymbols = function (state) {
 SortableTitlePlugin.prototype._updateSortableIndicator = function (hostIndex) {
 	var t = this;
 	var host = t._hosts[hostIndex];
-	if (!host) { return; }
+	if (!host || this._frozenIndicator) { return; }
 
 	var section = host.getSection("title");
 	if (section == null) { return; }