@refinitiv-ui/efx-grid 6.0.20 → 6.0.22

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

@@ -528,7 +528,7 @@ Core.prototype._rowHeightTimerId = 0;
 * @return {string}
 */
 Core.getVersion = function () {
-	return "5.1.31";
+	return "5.1.32";
 };
 /** {@link ElementWrapper#dispose}
 * @override
@@ -2880,6 +2880,13 @@ 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");
@@ -2908,6 +2915,9 @@ 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;
 	}

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

@@ -1612,6 +1612,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);

package/lib/core/es6/grid/components/CellSpans.d.ts

@@ -6,6 +6,8 @@ declare class CellSpans {
 
     public removeColumn(at: number): boolean;
 
+    public freezeMapping(bool?: boolean|null): void;
+
     public shiftColumn(from: number, amount: number): boolean;
 
     public removeSpan(indexX: number, indexY: number): CellSpan|null;

package/lib/core/es6/grid/components/CellSpans.js

@@ -20,6 +20,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
@@ -36,18 +63,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
@@ -336,6 +355,12 @@ CellSpans.prototype._spans;
 */
 CellSpans.prototype._occupiedMap;
 
+/**
+* @private
+* @type {boolean}
+*/
+CellSpans.prototype._frozenMapping = false;
+
 export default CellSpans;
 export { CellSpans };
 

package/lib/core/es6/grid/plugins/SortableTitlePlugin.d.ts

@@ -110,6 +110,8 @@ declare class SortableTitlePlugin extends EventDispatcher {
 
     public disableTwoStateSorting(disabled?: boolean|null): void;
 
+    public freezeIndicator(bool?: boolean|null): void;
+
     public disableSortSymbols(disabled?: boolean|null): void;
 
     public disableDataSorting(disabled?: boolean|null): void;

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

@@ -192,6 +192,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}
@@ -750,8 +754,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
@@ -956,6 +961,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) {
@@ -1568,7 +1579,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; }

package/lib/grid/index.js

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