@refinitiv-ui/efx-grid 6.0.37 → 6.0.39

package/lib/rt-grid/es6/ColumnDefinition.js

@@ -805,10 +805,11 @@ ColumnDefinition.prototype.getConfigObject = function(colOptions) {
 		obj["minWidth"] = value;
 	}
 
-	value = core.isColumnVisible(colIndex);
 	// If "hidden" property already available from core/extensions, don't override this property
-	if(!value && obj["hidden"] == null) {
-		obj["hidden"] = true;
+	if(obj["hidden"] == null) {
+		if(!core.getColumnVisibility(colIndex, 0)) {
+			obj["hidden"] = true;
+		}
 	}
 
 	value = core.getColumnAlignment(colIndex);

package/lib/rt-grid/es6/Grid.d.ts

@@ -266,7 +266,7 @@ declare class Grid extends EventDispatcher {
 
     public freezeColumn(colIndex?: number|null, pinnedRightColumns?: number|null): void;
 
-    public pinColumn(colRef: Grid.ColumnReference|(Grid.ColumnReference)[]|null): boolean;
+    public pinColumn(colRef: Grid.ColumnReference|(Grid.ColumnReference)[]|null, side?: string|null): boolean;
 
     public unpinColumn(colRef: Grid.ColumnReference|(Grid.ColumnReference)[]|null, dest?: Grid.ColumnReference|null): boolean;
 

package/lib/rt-grid/es6/Grid.js

@@ -3101,50 +3101,72 @@ Grid.prototype.freezeColumn = function(colIndex, pinnedRightColumns) {
 	}
 	this._grid.freezeColumn(colIndex, pinnedRightColumns);
 };
+
 /** Pin column to the left side by moving the specified column to the rightmost of the frozen columns. <br>
 * The method will do nothing if the specified column is already pinned to the left side
 * @public
 * @param {Grid~ColumnReference|Array.<Grid~ColumnReference>} colRef
+* @param {string=} side Available values are: left|right. If no value is supplied, the column will be pinned to the left.
 * @return {boolean}
 */
-Grid.prototype.pinColumn = function(colRef) {
+Grid.prototype.pinColumn = function(colRef, side) {
 	if(Array.isArray(colRef)) {
 		var ary = colRef;
 		var len = ary.length;
 
 		var dirty = 0;
 		for(var i = 0; i < len; ++i) {
-			dirty |= this._pinColumn(ary[i]);
+			dirty |= this._pinColumn(ary[i], side);
 		}
 		return dirty ? true : false;
 	}
-	return this._pinColumn(colRef);
+	return this._pinColumn(colRef, side);
 };
 /** @private
 * @param {Grid~ColumnReference} colRef
+* @param {string=} side Available values are: left|right. If no value is supplied, the column will be pinned to the left.
 * @return {boolean}
 */
-Grid.prototype._pinColumn = function(colRef) {
+Grid.prototype._pinColumn = function(colRef, side) {
 	var colIndex = this.getColumnIndex(colRef);
-	if(colIndex < 0) {
+	var colCount = this.getColumnCount();
+	if(colIndex < 0 || colIndex > colCount) {
 		return false;
 	}
-	var pinnedCount = this._grid.getFrozenColumnCount();
-	if(colIndex < pinnedCount) {
-		return false; // The column is already pinned area
-	}
-	if(!pinnedCount) {
-		var stationaryIdx = this._grid.getStationaryColumnIndex();
-		if(stationaryIdx >= 0) {
-			pinnedCount = stationaryIdx;
-			if(colIndex > stationaryIdx) {
-				pinnedCount++;
+
+	var leftPinnedCount = this._grid.getPinnedLeftColumnCount();
+	var rightPinnedCount = this._grid.getPinnedRightColumnCount();
+	var stationaryIdx = this._grid.getStationaryColumnIndex();
+
+	if(side && side.toLowerCase() === "right") {
+		var rightPinnedIndex = this._grid.getFirstPinnedRightIndex();
+		if(colIndex >= rightPinnedIndex) {
+			return false; // The column is already pinned area
+		}
+
+		if(stationaryIdx >= 0 && colIndex <= stationaryIdx) {
+			return false;
+		}
+
+		this.moveColumnById(colIndex, rightPinnedIndex);
+		rightPinnedCount += 1;
+		leftPinnedCount -= 1;
+	} else {
+		if(colIndex < leftPinnedCount) {
+			return false; // The column is already pinned area
+		}
+		if(!leftPinnedCount) {
+			if(stationaryIdx >= 0) {
+				leftPinnedCount = stationaryIdx;
+				if(colIndex > stationaryIdx) {
+					leftPinnedCount++;
+				}
 			}
 		}
+		this.moveColumnById(colIndex, leftPinnedCount);
 	}
 
-	this.moveColumnById(colIndex, pinnedCount);
-	this._grid.freezeColumn(pinnedCount);
+	this._grid.freezeColumn(leftPinnedCount, rightPinnedCount);
 	return true;
 };
 /** Unpin column from the left side by moving the specified column to the end of the frozen columns. <br>
@@ -3177,13 +3199,16 @@ Grid.prototype._unpinColumn = function(colRef, dest) {
 	if(colIndex < 0) {
 		return false;
 	}
-	var pinnedCount = this._grid.getFrozenColumnCount();
-	if(!pinnedCount) {
+
+	var leftPinnedCount = this._grid.getPinnedLeftColumnCount();
+	var rightPinnedCount = this._grid.getPinnedRightColumnCount();
+	var colCount = this.getColumnCount();
+	var firstRightPinnedIndex = colCount - rightPinnedCount;
+
+	if(colIndex >= leftPinnedCount && colIndex < firstRightPinnedIndex) {
 		return false;
 	}
-	if(colIndex >= pinnedCount) {
-		return false; // The column is outside of frozen area
-	}
+
 	var srcId = null;
 	var destId = null;
 	if(dest != null) {
@@ -3194,11 +3219,19 @@ Grid.prototype._unpinColumn = function(colRef, dest) {
 
 	var stationaryIdx = this._grid.getStationaryColumnIndex();
 
-	if(colIndex > stationaryIdx) {
-		this.moveColumnById(colIndex, pinnedCount);
-	}
+	if(colIndex < leftPinnedCount) {
+		if(colIndex > stationaryIdx) {
+			this.moveColumnById(colIndex, leftPinnedCount);
+		}
 
-	this._grid.freezeColumn(pinnedCount - 2); // Column index is used for freezing
+		this._grid.freezeColumn(leftPinnedCount - 2, rightPinnedCount); // Column index is used for freezing
+	} else if(colIndex >= firstRightPinnedIndex) {
+		if(colIndex > stationaryIdx) {
+			this.moveColumnById(colIndex, firstRightPinnedIndex);
+		}
+
+		this._grid.freezeColumn(leftPinnedCount - 1, rightPinnedCount - 1); // Column index is used for freezing
+	}
 
 	if(colIndex > stationaryIdx) {
 		if(destId != null) {
@@ -3213,11 +3246,12 @@ Grid.prototype._unpinColumn = function(colRef, dest) {
 * @return {boolean}
 */
 Grid.prototype.unpinAllColumns = function() {
-	var pinnedCount = this._grid.getFrozenColumnCount();
-	if(!pinnedCount) {
+	var leftPinnedCount = this._grid.getPinnedLeftColumnCount();
+	var rightPinnedCount = this._grid.getPinnedRightColumnCount();
+	if(!leftPinnedCount && !rightPinnedCount) {
 		return false;
 	}
-	this._grid.freezeColumn(-1); // Column index is used for freezing
+	this._grid.freezeColumn(-1, 0); // Column index is used for left freezing and column count is used for right freezing
 	return true;
 };
 

package/lib/rt-grid/es6/RowDefinition.js

@@ -94,7 +94,7 @@ RowDefinition.prototype._permId = "";
 /** @type {string|null}
 * @private
 */
-RowDefinition.prototype._label = null; // Label overrides _ric and _displayText
+RowDefinition.prototype._label = null; // Label overrides _ric and _permId
 /** @type {boolean|null}
 * @private
 */
@@ -261,15 +261,15 @@ RowDefinition.prototype.initialize = function(rowOptions) {
 
 	var expanded = this._expanded;
 	var symbol = this._ric || this._chainRic;
-	var asChain = rowOptions["asChain"] || !!this._chainRic;
+	var asChain = this._isChain || !!this._chainRic;
 	if(this._ric && this._ric.indexOf("0#") >= 0){
 		asChain = true;
 		expanded = true;
 	}
-	if(rowOptions["asChain"] === false){
+	if(this._isChain === false){
 		asChain = false;
 	}
-	if(rowOptions["collapsed"] === true){
+	if(this._expanded === false){
 		expanded = false;
 	}
 	if(symbol || this._permId){
@@ -284,7 +284,7 @@ RowDefinition.prototype._initializeAsConstituent = function(rowOptions) {
 	var parentDef = /** @type{RowDefinition} */(rowOptions["parent"]);
 	if(this.setParent(parentDef)) {
 		this._dataId = /** @type{string} */(rowOptions["dataId"]); // Constituent will have the same subId as its parent but with different ric
-
+		this._ric = /** @type{string} */(rowOptions["ric"]);
 		this._dc = parentDef._dc; // Parent chain must have data cache
 		if(this._dc) {
 			var rowData = this.getRowData(); // Do not trigger any data update
@@ -339,7 +339,7 @@ RowDefinition.prototype.setContent = function(userInput, permId, asChain, expand
 			if(asChain === false){
 				this._ric = this._userInput;
 			} else {
-				this._ric = expanded ? this._userInput.replace("0#", "") : this._userInput;
+				this._ric = expanded === false ? this._userInput : this._userInput.replace("0#", "");
 				this._expanded = expanded;
 				this._isChain = true; // Only chain can be expanded by 0#
 				this._chainRic = this._userInput;