@refinitiv-ui/efx-grid 6.0.119 → 6.0.121

package/README.md

@@ -56,6 +56,6 @@ See list of APIs, demo and more usage guide by visiting [EFX Grid document](http
 
 # License
 
-You can check out the full license [here](https://refinitiv.github.io/efx-grid/book/en/license.html)
+You can check out the full license [here](https://refinitiv.github.io/efx-grid/#/license)
 
 However, Halo theme shall only be used within Refinitiv products or services due to license of the font "Proxima Nova Fin".

package/lib/column-dragging/es6/ColumnDragging.js

@@ -531,21 +531,24 @@ ColumnDraggingPlugin.prototype._onMouseUp = function (e) {
 };
 
 /** @private
-* @return {number} 0 does not allow dragging, 1 allows single dragging, and 2 allows multiple dragging.
+* @return {number} 0 does not allow dragging, 1 allows single dragging, and 2 allows multiple dragging with row selection =.
 */
 ColumnDraggingPlugin.prototype._getDraggingStyle = function() {
 	let colSelExt = this._getPlugin("ColumnSelectionPlugin");
-	let cgp = this._getPlugin("ColumnGroupingPlugin");
-	if(!cgp) {
+	if(!colSelExt) {
 		return 1;
 	}
+	let cgp = this._getPlugin("ColumnGroupingPlugin");
 	let selectedCols = colSelExt.getSelectedColumns();
 	let dragOutSel = selectedCols.indexOf(this._startColumn) === -1;
-	if(dragOutSel) { // no column grouping, allow to drag
+	if(dragOutSel) { // drag outside selected col, drag only 1 row
 		return 1;
 	}
 	let selectedColCount = selectedCols.length;
 	if(selectedColCount > 1) { // Multiple column drag
+		if(!cgp) {
+			return 2;
+		}
 		let currentGroup, prevGroup;
 		for (let i = 0; i < selectedColCount; i++) {
 			let colIndex = selectedCols[i];

package/lib/core/dist/core.js

@@ -1686,6 +1686,10 @@ Cell.prototype._floatingPanel = null;
 * @type {CellFloatingPanel}
 */
 Cell.prototype._frontIcon = null;
+/** @type {Object}
+* @private
+*/
+Cell.prototype._tooltipInfo = null;
 
 //#region ElementWrapper
 /** {@link ElementWrapper#getContent}
@@ -2278,6 +2282,91 @@ Cell.prototype.getClientWidth = function () {
 Cell.prototype.getClientHeight = function () {
 	return (this._element) ? this._element.clientHeight : this.getHeight();
 };
+
+/** To remove the tooltip, pass str as an empty string. To allow cell calculation for the correct tooltip, set str to null.
+* @public
+* @param {string|null} str
+*/
+Cell.prototype.setTooltip = function(str) {
+	this.setTooltipInfo("userTooltip", str);
+	this.updateTooltip();
+};
+/** @public
+* @ignore
+* @param {string} type
+* @param {*=} tooltip
+*/
+Cell.prototype.setTooltipInfo = function(type, tooltip) {
+	let tooltipInfo = this._tooltipInfo;
+	if(!tooltipInfo) {
+		tooltipInfo = this._tooltipInfo = {};
+	}
+
+	tooltipInfo[type] = tooltip;
+};
+/** @public
+* @ignore
+*/
+Cell.prototype.updateTooltip = function() {
+	let tooltipInfo = this._tooltipInfo;
+	if(!tooltipInfo) {
+		return;
+	}
+
+	let defaultTooltip = "";
+	let customizedTooltip = null;
+
+	// Clipped text tooltip takes precedence over default group header and column tooltip
+	if(tooltipInfo["clippedText"]) { // boolean
+		defaultTooltip = customizedTooltip = tooltipInfo["clippedTextTooltip"];
+	}
+
+	if(tooltipInfo["groupHeaderTooltip"] == null) {
+		if(tooltipInfo["columnDefault"] !== false) {
+			if(tooltipInfo["columnDefault"] != null) { // true, "", string
+				customizedTooltip = tooltipInfo["columnTooltip"];
+			} else { // null
+				defaultTooltip = tooltipInfo["columnTooltip"];
+			}
+		}
+	} else { // Group header tooltip takes precedence over column tooltip
+		if(tooltipInfo["groupHeaderDefault"] !== false) {
+			if(tooltipInfo["groupHeaderDefault"] != null) {
+				customizedTooltip = tooltipInfo["groupHeaderTooltip"];
+			} else {
+				defaultTooltip = tooltipInfo["groupHeaderTooltip"];
+			}
+		}
+	}
+
+	// User tooltip take the highest precedence
+	if(tooltipInfo["userTooltip"] != null) { // "", string
+		customizedTooltip = tooltipInfo["userTooltip"];
+	}
+
+	if(customizedTooltip == null) {
+		customizedTooltip = defaultTooltip;
+	}
+
+	if(customizedTooltip) {
+		if(this.getAttribute("title") !== customizedTooltip) {
+			this.setAttribute("title", customizedTooltip);
+		}
+	} else if(this.getAttribute("title") != null) {
+		this.removeAttribute("title");
+	}
+};
+/** @public
+* @ignore
+* @param {string} type
+* @return {*}
+*/
+Cell.prototype.getTooltipInfo = function(type) {
+	if(this._tooltipInfo) {
+		return this._tooltipInfo[type];
+	}
+	return null;
+};
 //#region Internal Public Methods
 
 //#region Private Methods
@@ -7505,7 +7594,8 @@ HScrollbar.prototype.setScrollContent = function (grid, sections, startColIndex,
 			column = /** @type{Column} */(section.getColumn(c));
 			column.setScrollState(paneElem, null, false);
 		}
-		pane.setParent(section.getColumnHost());
+		let scrollHost = section.getColumnHost();
+		pane.setParent(scrollHost);
 		let columns = [];
 		let content = [];
 		for (c = startColIndex; c < endColIndex; ++c) {
@@ -7522,9 +7612,11 @@ HScrollbar.prototype.setScrollContent = function (grid, sections, startColIndex,
 
 		let rs = section.getReservedSpace();
 		if(rs) {
-			if(!this._pinnedRightColumnCount) {
+			if(this.isActive() && !this._pinnedRightColumnCount) {
 				paneSlider.addContent(rs);
 				content.push(rs);
+			} else {
+				scrollHost.appendChild(rs);
 			}
 			section._updateRightSpaceStyle();
 		}
@@ -21427,7 +21519,7 @@ DataView.prototype._updateRowIds = function(opt_rowIds) {
 
 	this._excludedRids = {};
 	let exclusionCount = 0;
-	exclusionCount += DataView._copyObjectKeys(this._excludedRids, this._hiddenRids);
+	exclusionCount += DataView._copyValidObjectKeys(this._excludedRids, this._hiddenRids);
 
 	// Segment separators should not be filtered out (hidden)
 	let segments = this._dt._getSegmentSeparators();
@@ -21447,7 +21539,7 @@ DataView.prototype._updateRowIds = function(opt_rowIds) {
 		}
 		this._collapsedRids = segments.getCollapsedRows();
 		 // Children of collapsed segments must be filtered out (hidden)
-		exclusionCount += DataView._copyObjectKeys(this._excludedRids, this._collapsedRids);
+		exclusionCount += DataView._copyValidObjectKeys(this._excludedRids, this._collapsedRids);
 	}
 
 	if(this._groupLevel > 0 && !opt_rowIds) { // WARNING: The line below is quite slow
@@ -21977,13 +22069,15 @@ DataView._removeArrayItems = function(ary, items) {
 * @param {Object} masterObj
 * @returns {number}
 */
-DataView._copyObjectKeys = function(baseObj, masterObj) {
+DataView._copyValidObjectKeys = function(baseObj, masterObj) {
 	if(masterObj) {
 		let count = 0;
 
 		for(let key in masterObj) {
-			baseObj[key] = 1;
-			++count; // WARNING: duplicated key can be counted more than once
+			if(masterObj[key]) {
+				baseObj[key] = 1;
+				++count; // WARNING: duplicated key can be counted more than once
+			}
 		}
 		return count;
 	}
@@ -25877,7 +25971,7 @@ Core_Core.prototype._hasPendingRowChange = false;
 * @return {string}
 */
 Core_Core.getVersion = function () {
-	return "5.1.118";
+	return "5.1.123";
 };
 /** {@link ElementWrapper#dispose}
 * @override
@@ -28955,7 +29049,7 @@ Core_Core.prototype.getYScrollVal = function (sectionRef, rowIndex, topOfView) {
 		scrollIndex = rowIndex;
 	} else {
 		if(rowIndex < firstFullRow) { // Scroll up
-			scrollIndex = rowIndex - 3; // Have some spaces at the top for more appealing visual
+			scrollIndex = rowIndex - 2; // Have some spaces at the top for more appealing visual
 			if(scrollIndex < 0) {
 				scrollIndex = 0;
 			}
@@ -28963,7 +29057,7 @@ Core_Core.prototype.getYScrollVal = function (sectionRef, rowIndex, topOfView) {
 			let lastFullRow = viewInfo.lastFullRow;
 			if (rowIndex > lastFullRow) {
 				let viewIndexSize = lastFullRow - firstFullRow;
-				scrollIndex = rowIndex - viewIndexSize + 3;
+				scrollIndex = rowIndex - viewIndexSize + 2;
 				if(scrollIndex < 0) {
 					scrollIndex = 0;
 				}