@refinitiv-ui/efx-grid 6.0.36 → 6.0.38

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

@@ -44,7 +44,7 @@ import { preventDefault } from "../../tr-grid-util/es6/EventDispatcher.js";
 * @description Available options describing grouped column displaying
 * @property {boolean=} spreading=false If specified true, this group will be running in collapsing mode
 * @property {boolean=} collapsed=true If disabled, this group will be expanded at the first time
-* @property {string=} activeColumn="" Column index or field for set as active column
+* @property {string=} activeColumn="" Column index, column id, or field for set as active column
 */
 
 /** @event ColumnStackPlugin#clicked
@@ -95,6 +95,7 @@ var _resolveActiveColumn = function(stackOpt) {
 		var children = stackOpt.children;
 		if(children && children.length) {
 			var activeColumn = stackOpt.activeColumn;
+			// TODO: If columns are stored as column id and activeColumn is a field, active index could not be found
 			if(!activeColumn || children.indexOf(activeColumn) < 0) {
 				stackOpt.activeColumn = stackOpt.spreading ? children[children.length - 1] : children[0];
 				return true;
@@ -114,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);
@@ -158,7 +160,10 @@ ColumnStackPlugin.prototype._inReordering = false;
 * @private
 */
 ColumnStackPlugin.prototype._inResetting = false;
-
+/** @type {boolean}
+* @private
+*/
+ColumnStackPlugin.prototype._inPinning = false;
 
 /** @type {number}
 * @private
@@ -213,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);
 
@@ -233,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();
@@ -547,6 +554,34 @@ ColumnStackPlugin.prototype._getSelectedColumns = function() {
 	var csp = this._getPlugin("ColumnSelectionPlugin");
 	return (csp && csp.isEnabled()) ? csp.getSelectedColumns() : [];
 };
+/** Hide the specified column to prevent it from flashing when it is added as a member of the stack
+* @private
+* @param {Object} stack
+* @param {(number|Array.<number>)=} colRefs
+* @param {number=} activeRef
+*/
+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 hidden
+	}
+	// WARNING: activeIndex may not be valid
+	var activeIndex = (typeof activeRef === "number") ? activeRef : this.getColumnIndex(stack.activeColumn);
+	var colIndices = null;
+	if(typeof colRefs === "number") {
+		colIndices = [colRefs];
+	} else if(colIndices == null) {
+		colIndices = this.getColumnIndices(stack.children);
+	} else {
+		colIndices = colRefs;
+	}
+	var validCount = colIndices.length;
+	for(var i = 0; i < validCount; ++i) {
+		var colIndex = colIndices[i];
+		if(colIndex !== activeIndex) {
+			this._setColumnVisibility(colIndex, false); // Hide a column
+		}
+	}
+};
 /** @private
 * @param {number} colIndex
 * @param {boolean} shown
@@ -1009,20 +1044,28 @@ ColumnStackPlugin.prototype.stackColumns = function(colRefs, stackId, options) {
 		return false;
 	}
 
+	// TODO: If columns are stored as column id and activeColumn is a field, active index could not be found
 	stack.children = children;
-	_resolveActiveColumn(stack); // stack.activeColumn may be modified here
-	var activeIndex = this.getColumnIndex(stack.activeColumn);
-
-	// Hide the column to prevent it from flashing in stack mode
-	if(!isSpreading || !isCollapsed) {
-		for(i = 0; i < validCount; ++i) {
-			var colIndex = colIndices[i];
-			if(colIndex !== activeIndex) {
-				this._setColumnVisibility(colIndex, false); // Hide a column
+	var activeIndex = -1;
+	if(activeColumn && typeof activeColumn === "string") {
+		activeIndex = this.getColumnIndex(activeColumn);
+		if(children.indexOf(activeColumn) < 0) { // children and activeColumn may have different type
+			var field = this._getField(activeIndex);
+			if(field === activeColumn) {
+				stack.activeColumn = activeColumn = this.getColumnId(activeIndex);
 			}
 		}
+	} else if(typeof activeColumn === "number"){
+		activeIndex = activeColumn;
 	}
 
+	if(_resolveActiveColumn(stack)) {
+		activeColumn = stack.activeColumn;
+		activeIndex = this.getColumnIndex(activeColumn);
+	}
+
+	this._hideStackedColumns(stack, colIndices, activeIndex);
+
 	// Make sure that all columns stay packed together
 	this.reorderColumns(colIndices, colIndices[0]);
 
@@ -1032,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;
 				}
@@ -1050,6 +1093,8 @@ ColumnStackPlugin.prototype.stackColumns = function(colRefs, stackId, options) {
 		}
 	}
 
+	this._verifyColumnPinning(stack);
+
 	this._groupDefs.setGroup(sid, stack);
 
 	var cfp = this._getPlugin("ColumnFilterPlugin");
@@ -1060,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.
@@ -1270,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 {
@@ -1376,17 +1472,30 @@ ColumnStackPlugin.prototype._onBeforeBatchOperation = function (e) {
 ColumnStackPlugin.prototype._onAfterBatchOperation = function (e) {
 	if(e.batchType === "reset") {
 		this._inResetting = false;
-		// TODO: Re-packing each stack
+		// TODO: Revalidate members in stacks
+		// TODO: Reposition members and stacks
 		var groups = this._groupDefs.getGroups();
 		var groupCount = groups.length;
 		for(var i = 0; i < groupCount; ++i) {
-			this._updateActiveColumn(groups[i]);
+			var group = groups[i];
+			this._updateActiveColumn(group);
+			this._hideStackedColumns(group);
 		}
 	} else if(e.batchType === "move") {
 		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
@@ -1410,13 +1519,7 @@ ColumnStackPlugin.prototype._isWithinStack = function (colIndex) {
 ColumnStackPlugin.prototype._addRefToStack = function (stackOption, colIndex) {
 	var colId = this._toIdOrField(colIndex);
 
-	// Hide the column to prevent it from flashing in stack mode
-	if(!stackOption.spreading || !stackOption.collapsed) {
-		var activeIndex = this.getColumnIndex(stackOption.activeColumn);
-		if(colIndex >= 0 && colIndex !== activeIndex) {
-			this._setColumnVisibility(colIndex, false); // Hide a column
-		}
-	}
+	this._hideStackedColumns(stackOption, colIndex);
 
 	// Find a position to be placed in the stack
 	var rightColRef = this._toIdOrField(colIndex + 1);
@@ -1443,6 +1546,7 @@ ColumnStackPlugin.prototype._removeRefFromStack = function (stackOption, colRef,
 		this._setColumnVisibility(colIndex, true);
 	}
 	this._updateActiveColumn(stackOption); // This may trigger _updateUI
+
 	return true;
 };
 
@@ -1631,14 +1735,7 @@ ColumnStackPlugin.prototype.addColumnToStack = function(colRef, stackId) {
 		return;
 	}
 
-	// Hide the column to prevent it from flashing in stack mode
-	if(!stack.spreading || !stack.collapsed) {
-		var activeIndex = this.getColumnIndex(stack.activeColumn);
-		var colIndex = this.getColumnIndex(colId);
-		if(colIndex >= 0 && colIndex !== activeIndex) {
-			this._setColumnVisibility(colIndex, false); // Hide a column
-		}
-	}
+	this._hideStackedColumns(stack, this.getColumnIndex(colId));
 
 	// apply stacking
 	this._groupDefs.addGroupChild(stackId, colId);
@@ -1646,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();
 };
 
@@ -1692,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/tr-grid-util/es6/jet/MockQuotes2.js

@@ -556,6 +556,13 @@ MockSubscriptions.prototype._generateQuoteData = function(sub, fields) {
 		values[field] = data.value;
 		values[formattedField] = data.formattedValue;
 	}
+
+	// The delay symbol for X_RIC_NAME will depend on the INDICATOR field.
+	if(values["X_RIC_NAME"] != null && values["INDICATOR"] != null) {
+		if(values["INDICATOR"] > 0) {
+			values["X_RIC_NAME"] = "/" + values["X_RIC_NAME"];
+		}
+	}
 	return values;
 };
 

package/lib/types/es6/ColumnStack.d.ts

@@ -3,6 +3,7 @@ import { GridPlugin } from "../../tr-grid-util/es6/GridPlugin.js";
 import { Conflator } from "../../tr-grid-util/es6/Conflator.js";
 import { Icon } from "../../tr-grid-util/es6/Icon.js";
 import { ElfUtil } from "../../tr-grid-util/es6/ElfUtil.js";
+import { GroupDefinitions } from "../../tr-grid-util/es6/GroupDefinitions.js";
 import { Dom } from "../../tr-grid-util/es6/Dom.js";
 import { injectCss, prettifyCss } from "../../tr-grid-util/es6/Util.js";
 import { preventDefault } from "../../tr-grid-util/es6/EventDispatcher.js";

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/Core/grid/LayoutGrid.d.ts

@@ -26,7 +26,11 @@ declare class LayoutGrid extends ElementWrapper {
 
     public setCellBounds(colIndex: number, rowIndex: number, width: number, height: number): void;
 
+    public updateColumnSeparators(): void;
+
 }
 
+declare function rgtPx(): void;
+
 export default LayoutGrid;
 export { LayoutGrid };

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): 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): 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

@@ -1,18 +1,18 @@
 {
-	"tr-grid-util": "1.3.103",
+	"tr-grid-util": "1.3.104",
 	"@grid/column-dragging": "1.0.13",
 	"@grid/row-segmenting": "1.0.23",
 	"@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.58",
+	"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.36"
+	"version": "6.0.38"
 }