@refinitiv-ui/efx-grid 6.0.24 → 6.0.26

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

@@ -426,7 +426,6 @@ ColumnStackPlugin.prototype._transformStackConfig = function(stackConfig) {
 	stackConfig.colRefs = [];
 	var children = stackConfig.children;
 	var fields = stackConfig.fields;
-	var activeColumn = stackConfig.activeColumn;
 	var field;
 	if(children){
 		var childLen = stackConfig.children.length;
@@ -434,18 +433,21 @@ ColumnStackPlugin.prototype._transformStackConfig = function(stackConfig) {
 			var colIndex = this.getColumnIndex(children[j]);
 			if(colIndex !== -1){
 				field = this._getField(colIndex);
-				stackConfig.colRefs.push(field);
+				if(field) {
+					stackConfig.colRefs.push(field);
+				}
 			}
 		}
 	} else if(fields) {
 		stackConfig.colRefs = fields;
 	}
-	if(activeColumn && !this._autoStacking){
+	var activeColumn = stackConfig.activeColumn;
+	if(activeColumn != null && !this._autoStacking){
 		var activeColIndex = this.getColumnIndex(activeColumn);
 		if(activeColIndex !== -1){
-			field = this._getField(colIndex);
+			field = this._getField(activeColIndex);
 			if(field){
-				stackConfig.activeColumn;
+				stackConfig.activeColumn = field;
 			}
 		}
 	}
@@ -929,6 +931,7 @@ ColumnStackPlugin.prototype.stackColumns = function(colRefs, stackId, options) {
 	if(colRefs.length) {
 		if(typeof colRefs[0] === "string") {
 			fields = colRefs.slice();
+			colRefs = this.getColumnIndices(colRefs);
 		} else {
 			colRefs.sort(function(a, b) { return a - b; }); // Only sort in the case of column index stack
 			for(i = 0; i < colRefs.length; i++){
@@ -936,7 +939,6 @@ ColumnStackPlugin.prototype.stackColumns = function(colRefs, stackId, options) {
 				fields.push(field);
 			}
 		}
-		colRefs = this.getColumnIndices(colRefs);
 	}
 
 	// Save stack fields for
@@ -954,13 +956,14 @@ ColumnStackPlugin.prototype.stackColumns = function(colRefs, stackId, options) {
 		return false;
 	}
 
-	var activeIndex = options.activeColumn ? this.getColumnIndices(options.activeColumn) : colRefs[0];
-	if (activeIndex.length){
-		activeIndex = activeIndex[0];
-	}
-	if(activeIndex == null || colRefs.indexOf(activeIndex) == -1){
-		activeIndex = colRefs[0];
+	var activeIndex = colRefs[0];
+	if(options.activeColumn != null) {
+		var idx = this.getColumnIndex(options.activeColumn);
+		if(idx > -1 && colRefs.indexOf(idx) > -1) {
+			activeIndex = idx;
+		}
 	}
+
 	// Collecting data
 	var stack = {};
 	stack.stackId = sid;
@@ -1486,19 +1489,17 @@ ColumnStackPlugin.prototype.getStackMemberIds = function(stackId) {
 
 /** @public
 * @description Get column id by column index or indices
-* @param {number|Array<number>} columnIndex
+* @param {number|Array<number>} colIndices
 * @return {!Array.<string>} Column ids
 */
-ColumnStackPlugin.prototype.getColumnIdsByIndex = function(columnIndex) {
-	var colIndices = [];
-	var colIds = [];
-	if(Array.isArray(columnIndex)){
-		colIndices = columnIndex;
-	} else {
-		colIndices.push(colIds);
+ColumnStackPlugin.prototype.getColumnIdsByIndex = function(colIndices) {
+	if(!Array.isArray(colIndices)){
+		colIndices = [colIndices];
 	}
+	var colIds = [];
+	var colId;
 	for(var i = 0; i < colIndices.length; ++i) {
-		var colId = this.getColumnId(colIndices[i]);
+		colId = this.getColumnId(colIndices[i]);
 		colIds.push(colId);
 	}
 	return colIds;
@@ -1506,39 +1507,33 @@ ColumnStackPlugin.prototype.getColumnIdsByIndex = function(columnIndex) {
 
 /** @public
 * @description Get column indices by column ids
-* @param {string|Array<string>} columnId
+* @param {string|Array<string>} colIds
 * @return {!Array.<string>} Column indices
 */
-ColumnStackPlugin.prototype.getColumnIndicesByColumnIds = function(columnId) {
-	var colIndices = [];
-	var colIds = [];
-	if(Array.isArray(columnId)){
-		colIds = columnId;
-	} else {
-		colIds.push(colIds);
+ColumnStackPlugin.prototype.getColumnIndicesByColumnIds = function(colIds) {
+	if(!Array.isArray(colIds)){
+		colIds = [colIds];
 	}
+	var colIndices = [];
+	var colIndex;
 	for(var i = 0; i < colIds.length; ++i) {
-		var colId = this.getColumnIndex(colIds[i]);
-		colIndices.push(colId);
+		colIndex = this.getColumnIndex(colIds[i]);
+		colIndices.push(colIndex);
 	}
 	return colIndices;
 };
 
 /** @public
 * @description Get column ids by fields
-* @param {string|Array<string>} field
+* @param {string|Array<string>} fields
 * @return {!Array.<string>} Column indices
 */
-ColumnStackPlugin.prototype.getColumnIdsByFields = function(field) {
-	var colIndices = [];
-	var fields = [];
-	if(Array.isArray(field)){
-		fields = field;
-	} else {
-		fields.push(field);
+ColumnStackPlugin.prototype.getColumnIdsByFields = function(fields) {
+	if(!Array.isArray(fields)){
+		fields = [fields];
 	}
 
-	colIndices = this.getColumnIndices(field);
+	var colIndices = this.getColumnIndices(fields);
 
 	return this.getColumnIdsByIndex(colIndices);
 };
@@ -1550,9 +1545,9 @@ ColumnStackPlugin.prototype.getColumnIdsByFields = function(field) {
 */
 ColumnStackPlugin.prototype.addColumnToStack = function(colRef, stackId) {
 	if(typeof colRef === "string") {
-		var colIndices = this.getColumnIndices([colRef]);
-		if(colIndices.length){
-			colRef = colIndices[0];
+		colRef = this.getColumnIndex(colRef);
+		if(colRef < 0) {
+			return;
 		}
 	}
 
@@ -1570,7 +1565,7 @@ ColumnStackPlugin.prototype.addColumnToStack = function(colRef, stackId) {
 	}
 
 	// Prevent from flashing in stack mode
-	if(colRef !== activeIndex && stack.collapsed !== false) {
+	if(stack.collapsed !== false) {
 		this._setColumnVisibility(colRef, false);
 	}
 
@@ -1585,8 +1580,6 @@ ColumnStackPlugin.prototype.addColumnToStack = function(colRef, stackId) {
 		stack.activeColumn  = stack.stackRefs[0];
 	}
 
-	var activeIndex = this._getColumnIndex(stack.activeColumn);
-
 	// Pack stacked columns together
 	this._moveStackedColumns(stack.stackRefs);
 
@@ -1599,16 +1592,16 @@ ColumnStackPlugin.prototype.addColumnToStack = function(colRef, stackId) {
 */
 ColumnStackPlugin.prototype.removeColumnFromStack = function(colRef) {
 	if(typeof colRef === "string") {
-		var colIndices = this.getColumnIndices([colRef]);
-		if(colIndices.length){
-			colRef = colIndices[0];
+		colRef = this.getColumnIndex(colRef);
+		if(colRef < 0) {
+			return;
 		}
 	}
 
 	var stackId = this.getStackId(colRef);
 	var stack = this._stacks[stackId];
-	if(!stack || colRef == -1) {
-		return; // Invalid column index or stackId
+	if(!stack) {
+		return;
 	}
 
 	var stackMembers = this.getStackMemberIndices(stackId);
@@ -1669,17 +1662,18 @@ ColumnStackPlugin.prototype.reorderStackColumns = function(colRefs, stackId) {
 	}
 
 	var newStackMembers = [];
-	for(var i = 0; i < len; i++ ){
-		var colIndex = colRefs[i];
+	var i, colIndex;
+	for(i = 0; i < len; i++ ){
+		colIndex = colRefs[i];
 		if(stackMemberIndices.indexOf(colIndex) !== -1){
 			newStackMembers.push(colIndex);
 		}
 	}
 	if(newStackMembers.length !== stackMemberCount){
 		for(i = 0; i < stackMemberCount; i++ ){
-			var columnIndex = stackMemberIndices[i];
-			if(newStackMembers.indexOf(columnIndex) === -1){
-				newStackMembers.push(columnIndex);
+			colIndex = stackMemberIndices[i];
+			if(newStackMembers.indexOf(colIndex) === -1){
+				newStackMembers.push(colIndex);
 				if(newStackMembers.length === stackMemberCount){
 					break;
 				}

package/lib/tr-grid-in-cell-editing/es6/InCellEditing.js

@@ -350,7 +350,7 @@ InCellEditingPlugin._primaryColor = "";
 /** @type {string}
 * @private
 */
-InCellEditingPlugin._styles = prettifyCss([":host .cell.editing input[type=text]", ["border-style: solid;"]]);
+InCellEditingPlugin._styles = prettifyCss([":host .cell.editing input[type=text]", ["border-style: solid;"], ":host .cell.editing", ["z-index: 2;"]]);
 
 /** @private
 */
@@ -1911,11 +1911,18 @@ InCellEditingPlugin.prototype._onUpdateEditorPopup = function () {
   if (this._compositeGrid || this._realTimeGrid) {
     parentElement = grid.getElement().parentElement;
   }
+  var rowIndex, colIndex;
   if (this._activeInCellCache) {
     var activePos = this._activePos;
     if (activePos) {
+      rowIndex = activePos["rowIndex"];
+      colIndex = activePos["colIndex"];
       var section = grid.getSection(activePos["sectionType"]);
-      var cell = section.getCell(activePos["colIndex"], activePos["rowIndex"]);
+      var cell = section.getCell(colIndex, rowIndex);
+      var stretchedCell = section.getStretchedCell(cell, rowIndex);
+      if (stretchedCell) {
+        cell = stretchedCell;
+      }
       if (cell) {
         var popup = this._activeInCellCache["balloonPopup"];
         popup.attachTo(cell.getElement());
@@ -1925,7 +1932,7 @@ InCellEditingPlugin.prototype._onUpdateEditorPopup = function () {
     }
   } else if (this._activeRowId) {
     var sectionContent = grid.getSection("content");
-    var rowIndex = this._getRowIndex(this._activeRowId);
+    rowIndex = this._getRowIndex(this._activeRowId);
     if (sectionContent.isRowVisible(rowIndex)) {
       var lastIndex = (sectionContent.getColumnCount() || 0) - 1;
       for (var columnIndex = 0; columnIndex <= lastIndex; columnIndex++) {
@@ -1942,7 +1949,6 @@ InCellEditingPlugin.prototype._onUpdateEditorPopup = function () {
       }
     }
   }
-  grid.focus();
 };
 /** Update editor popup position and styles
 * @private
@@ -1953,6 +1959,7 @@ InCellEditingPlugin.prototype._onUpdateEditorPopup = function () {
 InCellEditingPlugin.prototype._updateEditorPopup = function (contentEditor, cell, grid) {
   var popup = contentEditor["balloonPopup"];
   var editor = contentEditor["editor"];
+  var inputElement = contentEditor["inputElement"];
   var popupElem = popup.getElement();
   var pos = grid.getRelativePosition(cell);
   var width = cell.getWidth();
@@ -1992,12 +1999,16 @@ InCellEditingPlugin.prototype._updateEditorPopup = function (contentEditor, cell
   } else {
     var acquiredWidth = pos["x"] + newWidth;
     var acquiredHeight = pos["y"] - offsetTop + newHeight;
-
-    // Left overflow
-    if (pos["x"] < offsetLeft) {
-      newWidth = newWidth - (offsetLeft - pos["x"]);
-      marginLeft = marginLeft + Math.abs(pos["x"] - offsetLeft);
+    var isPinned = grid.isPinnedColumn(pos["colIndex"]);
+    // if column is pinned, doesn't need to calculate left overflow
+    if (!isPinned) {
+      // Left overflow
+      if (pos["x"] < offsetLeft) {
+        newWidth = newWidth - (offsetLeft - pos["x"]);
+        marginLeft = marginLeft + Math.abs(pos["x"] - offsetLeft);
+      }
     }
+
     // Right overflow
     if (acquiredWidth > offsetWidth) {
       newWidth = newWidth - (acquiredWidth - offsetWidth);
@@ -2020,6 +2031,7 @@ InCellEditingPlugin.prototype._updateEditorPopup = function (contentEditor, cell
   editor.style.height = newHeight ? newHeight + "px" : "";
   editor.style.marginLeft = marginLeft ? marginLeft + "px" : 0;
   editor.style.marginTop = marginTop ? marginTop + "px" : 0;
+  inputElement.focus();
 };
 export default InCellEditingPlugin;
 export { InCellEditingPlugin, InCellEditingPlugin as InCellEditing, InCellEditingPlugin as InCellEditingExtension };

package/lib/tr-grid-range-bar/es6/RangeBar.d.ts

@@ -1,22 +1,25 @@
 import {Ext} from '../../tr-grid-util/es6/Ext.js';
 import {GridPlugin} from '../../tr-grid-util/es6/GridPlugin.js';
-import {RangeBar} from '../../tr-grid-util/es6/RangeBar.js';
-import {Dom} from '../../tr-grid-util/es6/Dom.js';
 import {ElfUtil} from '../../tr-grid-util/es6/ElfUtil.js';
+import { injectCss, prettifyCss } from "../../tr-grid-util/es6/Util.js";
 
 declare namespace RangeBarPlugin {
 
     type ColumnOptions = {
-        rangeBar?: RangeBarPlugin.RangeDefinition
+        rangeBar?: RangeBarPlugin.RangeDefinition|null
     };
 
     type RangeDefinition = {
-        field?: string,
-        start?: number,
-        end?: number,
-        low?: string,
-        high?: string,
-        last?: string
+        field?: string|null,
+        start?: number|null,
+        end?: number|null,
+        low?: string|null,
+        high?: string|null,
+        last?: string|null
+    };
+
+    type Options = {
+        tooltip?: boolean|null
     };
 
 }
@@ -33,6 +36,12 @@ declare class RangeBarPlugin extends GridPlugin {
 
     public getConfigObject(out_obj?: any): any;
 
+    public getColumnConfigObject(colIndex: number, out_obj?: any): any;
+
+    public getValue(colRef: number|string|null, rowRef: number|string|null): any;
+
+    public getTooltipText(colRef: number|string|null, rowRef: number|string|null): string;
+
 }
 
 export default RangeBarPlugin;