@refinitiv-ui/efx-grid 6.0.37 → 6.0.38

package/lib/tr-grid-column-stack/es6/ColumnStack.js

@@ -115,6 +115,7 @@ var ColumnStackPlugin = function () {
 	this._onColumnAdded = this._onColumnAdded.bind(this);
 	this._onBeforeBatchOperation = this._onBeforeBatchOperation.bind(this);
 	this._onAfterBatchOperation = this._onAfterBatchOperation.bind(this);
+	this._onPinningChanged = this._onPinningChanged.bind(this);
 
 	this._onStackButtonClicked = this._onStackButtonClicked.bind(this);
 	this._updateUI = this._updateUI.bind(this);
@@ -159,7 +160,10 @@ ColumnStackPlugin.prototype._inReordering = false;
 * @private
 */
 ColumnStackPlugin.prototype._inResetting = false;
-
+/** @type {boolean}
+* @private
+*/
+ColumnStackPlugin.prototype._inPinning = false;
 
 /** @type {number}
 * @private
@@ -214,6 +218,7 @@ ColumnStackPlugin.prototype.initialize = function (host, options) {
 		host.listen("columnAdded", this._onColumnAdded);
 		host.listen("beforeBatchOperation", this._onBeforeBatchOperation);
 		host.listen("afterBatchOperation", this._onAfterBatchOperation);
+		host.listen("pinningChanged", this._onPinningChanged);
 	}
 	host.listen("preSectionRender", this._onPreSectionRender);
 
@@ -234,6 +239,7 @@ ColumnStackPlugin.prototype.unload = function (host) {
 	host.unlisten("beforeBatchOperation", this._onBeforeBatchOperation);
 	host.unlisten("afterBatchOperation", this._onAfterBatchOperation);
 	host.unlisten("preSectionRender", this._onPreSectionRender);
+	host.unlisten("pinningChanged", this._onPinningChanged);
 
 	if(this._hosts.length <= 0) {
 		this._conflator.reset();
@@ -556,7 +562,7 @@ ColumnStackPlugin.prototype._getSelectedColumns = function() {
 */
 ColumnStackPlugin.prototype._hideStackedColumns = function(stack, colRefs, activeRef) {
 	if(stack.spreading && !stack.collapsed) {
-		return; // In spreading mode, columns in an expanded stack don't need to be hiden
+		return; // In spreading mode, columns in an expanded stack don't need to be hidden
 	}
 	// WARNING: activeIndex may not be valid
 	var activeIndex = (typeof activeRef === "number") ? activeRef : this.getColumnIndex(stack.activeColumn);
@@ -1069,7 +1075,7 @@ ColumnStackPlugin.prototype.stackColumns = function(colRefs, stackId, options) {
 		if(csp && csp.isEnabled()){
 			var stackSelection = false;
 			for(i = 0; i < validCount; ++i){
-				colIndex = colIndices[i];
+				var colIndex = colIndices[i];
 				if(colIndex === activeIndex){
 					continue;
 				}
@@ -1087,6 +1093,8 @@ ColumnStackPlugin.prototype.stackColumns = function(colRefs, stackId, options) {
 		}
 	}
 
+	this._verifyColumnPinning(stack);
+
 	this._groupDefs.setGroup(sid, stack);
 
 	var cfp = this._getPlugin("ColumnFilterPlugin");
@@ -1097,6 +1105,57 @@ ColumnStackPlugin.prototype.stackColumns = function(colRefs, stackId, options) {
 	return true;
 };
 
+/** @private
+* @param {Object} stack
+*/
+ColumnStackPlugin.prototype._verifyColumnPinning = function(stack) {
+	stack.leftPinned = false;
+	stack.rightPinned = false;
+
+	var host = this._hosts[0];
+	var leftPinnedIndex = host.getFrozenColumnCount() - 1;
+	var rightPinnedIndex = host.getFirstPinnedRightIndex();
+	var colCount = this.getColumnCount();
+
+	if (leftPinnedIndex < 0 && rightPinnedIndex === colCount) {
+		return;
+	}
+
+	var colIndices = this.getColumnIndices(stack.children);
+	var min = colIndices[0];
+	var max = colIndices[0];
+	for (var i = 1; i < colIndices.length; i++) {
+		var colIndex = colIndices[i];
+		if (colIndex > max) { max = colIndex; }
+		if (colIndex < min) { min = colIndex; }
+	}
+
+	if (min <= leftPinnedIndex) {
+		stack.leftPinned = true;
+		if (max > leftPinnedIndex) {
+			this._freezeColumn(max, colCount - rightPinnedIndex);
+		}
+	} else if (max >= rightPinnedIndex) {
+		stack.rightPinned = true;
+		if (min < rightPinnedIndex) {
+			this._freezeColumn(leftPinnedIndex, colCount - min);
+		}
+	}
+};
+
+/** @private
+* @param {number} frozenColIndex
+* @param {number} numRightColumn
+*/
+ColumnStackPlugin.prototype._freezeColumn = function(frozenColIndex, numRightColumn) {
+	this._inPinning = true;
+	var hosts = this._hosts;
+	for (var i = 0; i < hosts.length; i++) {
+		hosts[i].freezeColumn(frozenColIndex, numRightColumn);
+	}
+	this._inPinning = false;
+};
+
 /** @public
 * @description Replace all of the stacking in the Grid with a new one.
 *  Grid stores the stacked fields indefinitely.
@@ -1307,7 +1366,7 @@ ColumnStackPlugin.prototype._onColumnRemoved = function (e) {
 	} else {
 		var colData = /** @type{Object} */(e.columnData);
 		var field = colData ? colData.field : "";
-		stackOpt = this._groupDefs.getParentGroup(fields);
+		stackOpt = this._groupDefs.getParentGroup(field);
 		if(stackOpt) {
 			colRef = field;
 		} else {
@@ -1426,7 +1485,17 @@ ColumnStackPlugin.prototype._onAfterBatchOperation = function (e) {
 		this._inReordering = false;
 	}
 };
-
+/** @private
+* @param {Object} e
+*/
+ColumnStackPlugin.prototype._onPinningChanged = function (e) {
+	if (!this._inPinning) {
+		var stacks = this._groupDefs.getGroups();
+		for (var i = 0; i < stacks.length; i++) {
+			this._verifyColumnPinning(stacks[i]);
+		}
+	}
+};
 /** @private
 * @param {number} colIndex
 * @return {Object} stackOption
@@ -1477,6 +1546,7 @@ ColumnStackPlugin.prototype._removeRefFromStack = function (stackOption, colRef,
 		this._setColumnVisibility(colIndex, true);
 	}
 	this._updateActiveColumn(stackOption); // This may trigger _updateUI
+
 	return true;
 };
 
@@ -1673,6 +1743,21 @@ ColumnStackPlugin.prototype.addColumnToStack = function(colRef, stackId) {
 	// Pack stacked columns together
 	this._moveStackedColumns(stack.children);
 
+	// Update pinning position
+	if (stack.leftPinned || stack.rightPinned) {
+		var host = this._hosts[0];
+		var leftPinnedIndex = host.getFrozenColumnCount() - 1;
+		var rightPinnedCount = host.getPinnedRightColumnCount();
+
+		if (stack.leftPinned) {
+			leftPinnedIndex++;
+			this._freezeColumn(leftPinnedIndex, rightPinnedCount);
+		} else if (stack.rightPinned) {
+			rightPinnedCount--;
+			this._freezeColumn(leftPinnedIndex, rightPinnedCount);
+		}
+	}
+
 	this._updateUI();
 };
 
@@ -1719,6 +1804,22 @@ ColumnStackPlugin.prototype.removeColumnFromStack = function(colRef) {
 	this._removeRefFromStack(stack, colRef, colIndex);
 
 	this.moveColumnById(colIndex, colIndices[memberCount - 1] + 1); // This assumes that the column order is already in correct position
+
+	// Update pinning position
+	if (stack.leftPinned || stack.rightPinned) {
+		var host = this._hosts[0];
+		var leftPinnedIndex = host.getFrozenColumnCount() - 1;
+		var rightPinnedCount = host.getPinnedRightColumnCount();
+
+		if (stack.leftPinned) {
+			leftPinnedIndex--;
+			this._freezeColumn(leftPinnedIndex, rightPinnedCount);
+		} else if (stack.rightPinned) {
+			rightPinnedCount++;
+			this._freezeColumn(leftPinnedIndex, rightPinnedCount);
+		}
+	}
+
 	this._updateUI();
 };
 

package/lib/types/es6/Core/grid/Core.d.ts

@@ -359,6 +359,8 @@ declare class Core extends ElementWrapper {
 
     public synchronizeVScrollbar(subGrid: Core|null): void;
 
+    public synchronizeHScrollbar(subGrid: Core|null): void;
+
     public updateRowData(sectionRef?: Core.SectionReference|null, fromRowIndex?: number|null, lastRowIndex?: number|null, userParam?: any): void;
 
     public rerender(): void;

package/lib/types/es6/RealtimeGrid/RowDefinition.d.ts

@@ -37,7 +37,7 @@ declare class RowDefinition {
 
     public initialize(rowOptions?: RowDefinition.Options|null): void;
 
-    public setContent(userInput: string, permId?: string|null, asChain?: boolean|null, expanded?: boolean|null): boolean;
+    public setContent(userInput: string, permId?: string|null, asChain?: boolean|null, expanded?: boolean|null, realTime?: boolean|null): boolean;
 
     public getRowId(): string;
 
@@ -143,7 +143,7 @@ declare const ROW_DEF: string;
 
 declare const ROW_TYPES: RowDefinition.RowTypes;
 
-declare function rowData(userInput: string, permId?: string|null, asChain?: boolean|null, expanded?: boolean|null): boolean;
+declare function rowData(userInput: string, permId?: string|null, asChain?: boolean|null, expanded?: boolean|null, realTime?: boolean|null): boolean;
 
 export {RowDefinition, ROW_DEF, ROW_TYPES};
 export default RowDefinition;

package/lib/versions.json

@@ -5,14 +5,14 @@
 	"@grid/statistics-row": "1.0.14",
 	"@grid/zoom": "1.0.11",
 	"tr-grid-auto-tooltip": "1.1.5",
-	"tr-grid-cell-selection": "1.0.32",
+	"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.47",
 	"tr-grid-column-resizing": "1.0.28",
 	"tr-grid-column-selection": "1.0.28",
-	"tr-grid-column-stack": "1.0.59",
+	"tr-grid-column-stack": "1.0.61",
 	"tr-grid-conditional-coloring": "1.0.61",
 	"tr-grid-content-wrap": "1.0.20",
 	"tr-grid-contextmenu": "1.0.38",

package/package.json

@@ -66,5 +66,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"version": "6.0.37"
+	"version": "6.0.38"
 }