@refinitiv-ui/efx-grid 6.0.30 → 6.0.31

package/lib/tr-grid-content-wrap/es6/ContentWrap.js

@@ -17,7 +17,7 @@ import { GridPlugin } from '../../tr-grid-util/es6/GridPlugin.js';
 var ContentWrapPlugin = function ContentWrapPlugin() {
   this._onColumnAdded = this._onColumnAdded.bind(this);
   this._onRecalculation = this._onRecalculation.bind(this);
-  this._setReCalculationTimer = this._setReCalculationTimer.bind(this);
+  this._requestRecalculation = this._requestRecalculation.bind(this);
   this._hosts = [];
 };
 
@@ -77,10 +77,10 @@ ContentWrapPlugin.prototype.initialize = function (host, options) {
 
   this._hosts.push(host);
 
-  window.addEventListener("load", this._setReCalculationTimer); // Since CSS can impact font, we need adjust accordingly
+  window.addEventListener("load", this._requestRecalculation); // Since CSS can impact font, we need adjust accordingly
 
-  host.listen("widthChanged", this._setReCalculationTimer);
-  host.listen("postSectionDataBinding", this._setReCalculationTimer); // In case of lazy loading
+  host.listen("widthChanged", this._requestRecalculation);
+  host.listen("postSectionDataBinding", this._requestRecalculation); // In case of lazy loading
 
   this.config(options);
   host.listen("columnAdded", this._onColumnAdded);
@@ -99,11 +99,13 @@ ContentWrapPlugin.prototype.unload = function (host) {
 
   this._hosts.splice(at, 1);
 
-  window.removeEventListener("load", this._setReCalculationTimer);
-  host.unlisten("widthChanged", this._setReCalculationTimer);
-  host.unlisten("postSectionDataBinding", this._setReCalculationTimer);
+  window.removeEventListener("load", this._requestRecalculation);
+  host.unlisten("widthChanged", this._requestRecalculation);
+  host.unlisten("postSectionDataBinding", this._requestRecalculation);
   host.unlisten("columnAdded", this._onColumnAdded);
 
+  this._dispose();
+
   this._clearTimer();
 };
 /** @public
@@ -182,7 +184,7 @@ ContentWrapPlugin.prototype.getConfigObject = function (gridOptions) {
 
 
 ContentWrapPlugin.prototype.adjustRowHeight = function (sectionRef, from, to) {
-  if (this._adjusting || this._hosts.length === 0) {
+  if (this._adjusting || !this._hosts.length) {
     return false; // Quite if grid has not been registered or in the process of adjusting row height
   }
 
@@ -198,17 +200,30 @@ ContentWrapPlugin.prototype.adjustRowHeight = function (sectionRef, from, to) {
     return false;
   }
 
+  var sectionElem = section.getElement();
+
+  if (!sectionElem || !sectionElem.offsetParent) {
+    return false;
+  }
+
   this._adjusting = true; // Prevent infinite loop
 
   var dirtyRows = []; // Collect dirty rows
 
-  var results = this._calculateRowHeight(section, from, to, dirtyRows); // Setting row height for multiple rows can cause performance issue
+  var maxHeight = NaN;
+  var heights = null;
 
+  if (this._evenRowHeight) {
+    maxHeight = this._calcMaxRowHeight(section, dirtyRows, from, to);
+  } else {
+    heights = this._calcRowHeights(section, dirtyRows, from, to);
+  } // Setting row height for multiple rows can cause performance issue
 
-  var rowCount = dirtyRows.length;
+
+  var dirtyCount = dirtyRows.length;
   var prevFState = false;
 
-  if (rowCount > this._freezingThreshold) {
+  if (dirtyCount > this._freezingThreshold) {
     if (section.getFrozenLayout) {
       prevFState = section.getFrozenLayout();
       section.setFrozenLayout(true);
@@ -219,29 +234,25 @@ ContentWrapPlugin.prototype.adjustRowHeight = function (sectionRef, from, to) {
   var r, rowIndex;
 
   if (this._evenRowHeight) {
-    var max = results["max"];
-
-    for (r = 0; r < rowCount; ++r) {
+    for (r = 0; r < dirtyCount; ++r) {
       rowIndex = dirtyRows[r];
-      section.setRowHeight(rowIndex, max);
+      section.setRowHeight(rowIndex, maxHeight);
     }
   } else {
-    var heights = results["heights"];
-
-    for (r = 0; r < rowCount; ++r) {
+    for (r = 0; r < dirtyCount; ++r) {
       rowIndex = dirtyRows[r];
       section.setRowHeight(rowIndex, heights[rowIndex]);
     }
   }
 
-  if (rowCount > this._freezingThreshold) {
+  if (dirtyCount > this._freezingThreshold) {
     if (section.setFrozenLayout) {
       section.setFrozenLayout(prevFState);
     }
   }
 
   this._adjusting = false;
-  return rowCount ? true : false;
+  return dirtyCount ? true : false;
 };
 /** @public
 * @param {Object} sectionRef core grid SectionReference object
@@ -300,8 +311,8 @@ ContentWrapPlugin.prototype._setColumnContentWrapping = function (colIndex, colu
 /** @private */
 
 
-ContentWrapPlugin.prototype._setReCalculationTimer = function () {
-  if (!this._recalTimer) {
+ContentWrapPlugin.prototype._requestRecalculation = function () {
+  if (!this._recalTimer && !this._adjusting) {
     this._recalTimer = setTimeout(this._onRecalculation, 100);
   }
 };
@@ -328,7 +339,7 @@ ContentWrapPlugin.prototype._clearTimer = function () {
 
 
 ContentWrapPlugin.prototype._getSteppingHeight = function (height) {
-  return Math.floor(height + 1) + 12; // Add top and bottom padding
+  return Math.ceil(height) + 14; // Add top and bottom padding
 };
 /** @private
 * @param {Object} section ILayoutGrid
@@ -343,25 +354,31 @@ ContentWrapPlugin.prototype._calculateRowHeightAt = function (section, rowIndex)
   var colCount = section.getColumnCount();
 
   for (var c = 0; c < colCount; ++c) {
-    if (this.isWrappingContent(c)) {
-      var cell = section.getCell(c, rowIndex, false); // TODO: Handle cell spanning
+    if (!this.isWrappingContent(c)) {
+      continue;
+    }
 
-      if (cell && cell.isVisible()) {
-        var cellContent = cell.getContent();
+    var cell = section.getCell(c, rowIndex, false); // TODO: Handle cell spanning
 
-        if (cellContent) {
-          if (!cellContent.offsetParent) {
-            // Cell content is not in the document, so the height cannot be calculated
-            return NaN;
-          }
+    if (!cell || !cell.isVisible()) {
+      continue;
+    }
 
-          var contentHeight = this._getSteppingHeight(cellContent.offsetHeight);
+    var cellContent = cell.getContent();
 
-          if (contentHeight > maxHeight) {
-            maxHeight = contentHeight;
-          }
-        }
-      }
+    if (!cellContent) {
+      continue;
+    }
+
+    if (!cellContent.offsetParent) {
+      // Cell content is not in the document, so the height cannot be calculated
+      continue;
+    }
+
+    var contentHeight = this._getSteppingHeight(cellContent.offsetHeight);
+
+    if (contentHeight > maxHeight) {
+      maxHeight = contentHeight;
     }
   }
 
@@ -369,61 +386,90 @@ ContentWrapPlugin.prototype._calculateRowHeightAt = function (section, rowIndex)
 };
 /** @private
 * @param {Object} section ILayoutGrid
+* @param {!Array.<number>} dirtyRows
 * @param {number=} from
 * @param {number=} to
-* @param {Array.<number>=} opt_dirtyRows
-* @return {!Object}
+* @return {number}
 */
 
 
-ContentWrapPlugin.prototype._calculateRowHeight = function (section, from, to, opt_dirtyRows) {
-  if (!from || from < 0) {
+ContentWrapPlugin.prototype._calcMaxRowHeight = function (section, dirtyRows, from, to) {
+  if (from == null) {
+    from = section.getFirstIndexInView();
+  } else if (!from || from < 0) {
     from = 0;
   }
 
-  var rowCount = section.getRowCount();
+  if (to == null) {
+    to = section.getLastIndexInView() + 1;
+  } else {
+    var rowCount = section.getRowCount();
 
-  if (!to || to > rowCount) {
-    to = rowCount;
+    if (!to || to > rowCount) {
+      to = rowCount;
+    }
   }
 
-  var r, h;
-  var results = {};
+  var r;
+  var max = 0;
 
-  if (this._evenRowHeight) {
-    var max = 0;
-
-    for (r = from; r < to; ++r) {
-      h = this._calculateRowHeightAt(section, r);
+  for (r = from; r < to; ++r) {
+    var h = this._calculateRowHeightAt(section, r);
 
-      if (max < h) {
-        max = h;
-      }
+    if (max < h) {
+      max = h;
     }
+  }
 
-    results["max"] = max;
-
+  if (max) {
     for (r = from; r < to; ++r) {
-      if (max && opt_dirtyRows && max !== section.getRowHeight(r)) {
-        opt_dirtyRows.push(r);
+      if (max !== section.getRowHeight(r)) {
+        dirtyRows.push(r);
       }
     }
-  } else {
-    var heights = new Array(to);
+  }
 
-    for (r = from; r < to; ++r) {
-      h = this._calculateRowHeightAt(section, r);
-      heights[r] = h;
+  return max;
+};
+/** @private
+* @param {Object} section ILayoutGrid
+* @param {!Array.<number>} dirtyRows
+* @param {number=} from
+* @param {number=} to
+* @return {!Array.<number>}
+*/
 
-      if (h && opt_dirtyRows && h !== section.getRowHeight(r)) {
-        opt_dirtyRows.push(r);
-      }
+
+ContentWrapPlugin.prototype._calcRowHeights = function (section, dirtyRows, from, to) {
+  if (from == null) {
+    from = section.getFirstIndexInView();
+  } else if (!from || from < 0) {
+    from = 0;
+  }
+
+  if (to == null) {
+    to = section.getLastIndexInView() + 1;
+  } else {
+    var rowCount = section.getRowCount();
+
+    if (!to || to > rowCount) {
+      to = rowCount;
     }
+  }
+
+  var heights = new Array(to);
 
-    results["heights"] = heights;
+  for (var r = from; r < to; ++r) {
+    var h = this._calculateRowHeightAt(section, r);
+
+    heights[r] = h;
+
+    if (h && h !== section.getRowHeight(r)) {
+      dirtyRows.push(r);
+    }
   }
 
-  return results;
+  return heights;
 };
 /** @private
 * @param {number} colIndex
@@ -434,7 +480,7 @@ ContentWrapPlugin.prototype._calculateRowHeight = function (section, from, to, o
 ContentWrapPlugin.prototype._wrapContent = function (colIndex, bool) {
   this._hosts[0].enableColumnClass(colIndex, "wrap", bool, "content");
 
-  this._setReCalculationTimer();
+  this._requestRecalculation();
 };
 /** @public
 * @param {number} colIndex

package/lib/tr-grid-util/es6/DragUI.d.ts

@@ -10,6 +10,8 @@ declare class DragUI {
 
     public onThemeLoaded(colors: any): void;
 
+    public setContent(content: any): void;
+
 }
 
 export default DragUI;

package/lib/tr-grid-util/es6/DragUI.js

@@ -9,7 +9,9 @@ import ElfUtil from "./ElfUtil.js";
 var DragUI = function(options) {
 	this._dragBox = options.dragBox;
 	this._dragBoxIcon = options.dragBoxIcon;
-
+	this._dragBoxContent = document.createElement("div");
+	this._dragBoxContent.className = "drag-box-content";
+	this._dragBox.appendChild(this._dragBoxContent);
 };
 
 /** @type {string}
@@ -60,6 +62,10 @@ DragUI.applyThemeColor = function(grid) {
 */
 DragUI.prototype.onThemeLoaded = function(colors) {
 	if(!DragUI._styles) {
+		var cursor = "grabbing";
+		if (ElfUtil.getElfVersion() < 3) {
+			cursor = "move";
+		}
 		var styles = [ // Main Styles without theme
 			".tr-row-guideline", [ // Backward compatability of row dragging
 				"position: absolute;",
@@ -104,6 +110,10 @@ DragUI.prototype.onThemeLoaded = function(colors) {
 				"top: 0;",
 				"position: absolute;"
 			],
+			".drag-box-content", [
+				"overflow-x: clip;",
+				"text-overflow: ellipsis;"
+			],
 			".drag-box-icon", [
 				"top: -4px;",
 				"left: 12px;",
@@ -128,7 +138,7 @@ DragUI.prototype.onThemeLoaded = function(colors) {
 				"--grid-void-icon-color: #FFFFFF;"
 			],
 			".mouse-dragging .cell:hover", [ // for change mouse cursor when hover header while dragging
-				"cursor: grabbing !important;"
+				"cursor: " + cursor + " !important;"
 			],
 			".tr-grid .column .cell.drag-indicator", [ // --grid-drag-indicator defualt is "none"
 				"border-top: var(--grid-drag-indicator) !important;",
@@ -175,27 +185,31 @@ DragUI.prototype.renderDragBox = function (e, grid) {
 	}
 
 	var gridElem = grid.getElement();
+	var dragBoxHost = gridElem;
 	var gridParent = grid.getParent().parentNode;
-	var pn = this._dragBox.parentNode;
-	if(!pn) {
-		gridParent.appendChild(this._dragBox);
+	if (gridParent.nodeType === 11) {
+		dragBoxHost = gridParent;
 	}
 
-	var iconParent = this._dragBoxIcon.parentNode;
+	var parent = this._dragBox.parentNode;
+	if(!parent) {
+		dragBoxHost.appendChild(this._dragBox);
+	}
 
-	var dragBoxIcon = e.dragBoxIcon || this._dragBox.dragBoxIcon;
+	var dragBoxIcon = e.dragBoxIcon || this._dragBox.dragBoxIcon; // The user-supplied icon
 	this._dragBoxIcon.style.visibility = "visible";
+	parent = this._dragBoxIcon.parentNode;
 	var drop = true;
 	if(dragBoxIcon === "insertion") {
 		drop = false;
 		this._dragBoxIcon.icon = "add";
-		if(!iconParent) {
+		if(!parent) {
 			this._dragBox.appendChild(this._dragBoxIcon);
 		}
 	} else if (dragBoxIcon === "not-allowed" || dragBoxIcon === "no-drop" || dragBoxIcon === "void" ) {
 		drop = false;
 		this._dragBoxIcon.icon = "void";
-		if(!iconParent) {
+		if(!parent) {
 			this._dragBox.appendChild(this._dragBoxIcon);
 		}
 	} else {
@@ -213,5 +227,21 @@ DragUI.prototype.renderDragBox = function (e, grid) {
 	return drop;
 };
 
+/** @public
+* @param {*} content Element, Node, string, number, or everything else.
+*/
+DragUI.prototype.setContent = function(content) {
+	if (content && content["getElement"]) {
+		content = content["getElement"]();
+	}
+
+	var dragBoxContent = this._dragBoxContent;
+	var currentContent = dragBoxContent._content;
+	if (content !== currentContent) {
+		dragBoxContent._content = content;
+		Dom.setContent(dragBoxContent, content);
+	}
+};
+
 export default DragUI;
 export {DragUI};

package/lib/tr-grid-util/es6/Popup.d.ts

@@ -69,11 +69,13 @@ declare class Popup extends EventDispatcher {
 
     public disableAutoHiding(opt_disabled?: boolean|null): void;
 
+    public disableAutoRepositioning(opt_disabled?: boolean|null): void;
+
     public disableAutoClipping(opt_disabled?: boolean|null): void;
 
     public disableHideOnScroll(opt_disabled?: boolean|null): void;
 
-    public updatePosition(): void;
+    public updatePosition(fallback?: boolean|null): void;
 
     public enableUIBlocking(bool?: boolean|null): boolean;
 

package/lib/tr-grid-util/es6/Popup.js

@@ -221,6 +221,10 @@ Popup.prototype._uiBlocking = false;
 * @private
 */
 Popup.prototype._hideOnScroll = true;
+/** @type {boolean}
+* @private
+*/
+Popup.prototype._autoRepositioning = true;
 
 /** @public */
 Popup.prototype.dispose = function () {
@@ -303,6 +307,10 @@ Popup.prototype.init = function (options) {
 		this._hideOnScroll = false;
 	}
 
+	if (options["autoRepositioning"] == false) {
+		this._autoRepositioning = false;
+	}
+
 	this.addListener(options, "show");
 	this.addListener(options, "hide");
 	this.addListener(options, "shown");
@@ -573,6 +581,15 @@ Popup.prototype.disableAutoHiding = function (opt_disabled) {
 /** @public
 * @param {boolean=} opt_disabled
 */
+Popup.prototype.disableAutoRepositioning = function (opt_disabled) {
+	var autoRepositioning = (opt_disabled === false);
+	if (this._autoRepositioning !== autoRepositioning) {
+		this._autoRepositioning = autoRepositioning;
+	}
+};
+/** @public
+* @param {boolean=} opt_disabled
+*/
 Popup.prototype.disableAutoClipping = function (opt_disabled) {
 	var autoClipping = (opt_disabled === false);
 	if (this._autoClipping !== autoClipping) {
@@ -592,8 +609,12 @@ Popup.prototype.disableHideOnScroll = function (opt_disabled) {
 
 /** @public
 * @fires Popup#positioning
+* @param {boolean=} fallback=true
 */
-Popup.prototype.updatePosition = function () {
+Popup.prototype.updatePosition = function (fallback) {
+	if(fallback == null){
+		fallback = true;
+	}
 	var t = this;
 	t._resizeTimer = 0;
 
@@ -630,34 +651,48 @@ Popup.prototype.updatePosition = function () {
 		if (t._positioning == "right") {
 			x = px + aw + this._gap;
 			y = py;
-			// Re-position, if the popup exceeds the bounds
-			if ((x + ew > rb) && (px - ew > sx)) {
-				x = px - ew - this._gap;
-			}
-			if ((y + eh > bb) && (py + ah - eh > sy)) {
-				y = py + ah - eh;
-			}
 		} else if (t._positioning == "over") {
 			x = px;
 			y = py;
-			// Re-position, if the popup exceeds the bounds
-			if ((x + ew > rb) && (px + aw - ew > sx)) {
-				x = px + aw - ew;
-			}
-			if ((y + eh > bb) && (py + aw - eh > sy)) {
-				y = py + aw - eh;
-			}
 		} else { // under, bottom, or etc.
 			x = px;
 			y = py + ah;
-			// Re-position, if the popup exceeds the bounds
-			if ((x + ew > rb) && (px + aw - ew > sx)) {
-				x = px + aw - ew;
-			}
-			if ((y + eh > bb) && (py - eh > sy)) {
-				y = py - eh;
+		}
+
+		if(fallback){
+			// Re-position for each type of positioning, if the popup exceeds the bounds
+			if (t._positioning == "right") {
+				if ((x + ew > rb) && (px - ew > sx)) {
+					x = px - ew - this._gap;
+				}
+				if ((y + eh > bb) && (py + ah - eh > sy)) {
+					y = py + ah - eh;
+				}
+			} else if (t._positioning == "over") {
+				if ((x + ew > rb) && (px + aw - ew > sx)) {
+					x = px + aw - ew;
+				}
+				if ((y + eh > bb) && (py + aw - eh > sy)) {
+					y = py + aw - eh;
+				}
+			} else { // under, bottom, or etc.
+				if ((x + ew > rb) && (px + aw - ew > sx)) {
+					x = px + aw - ew;
+				}
+				if (y + eh > bb) {
+					// If popup is exceeded bottom bound
+					if(py - eh > sy){
+						y = py - eh; // move popup to top of attached element, if it has enough space
+					} else {
+						y = y - (y + eh - bb); // shift the popup up to make everything in popup visible
+						if(y < 0){
+							y = 0; // popup should not shift beyond top bound
+						}
+					}
+				}
 			}
 		}
+
 		if (t._autoClipping) { // Last resort of positioning
 			if (x + ew > rb) {
 				if (t._origW == null) {
@@ -685,7 +720,6 @@ Popup.prototype.updatePosition = function () {
 	t._dispatch(evtType, t._evtArg);
 };
 
-
 /** @public
 * @param {boolean=} bool
 * @return {boolean} previous uiBlocking state
@@ -759,7 +793,7 @@ Popup.prototype._onBlurTimer = function () {
 * @fires Popup#positioning
 */
 Popup.prototype._onResize = function () {
-	if (!this._resizeTimer && this._inDoc) {
+	if (!this._resizeTimer && this._inDoc && this._autoRepositioning) {
 		this._resizeTimer = setTimeout(this.updatePosition, 50);
 	}
 };

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

@@ -4,11 +4,11 @@ import { GridPlugin } from '../../tr-grid-util/es6/GridPlugin.js';
 declare namespace ContentWrapPlugin {
 
     type Options = {
-        evenRowHeight?: boolean
+        evenRowHeight?: boolean|null
     };
 
     type ColumnOptions = {
-        contentWrap?: boolean
+        contentWrap?: boolean|null
     };
 
 }
@@ -29,11 +29,11 @@ declare class ContentWrapPlugin extends GridPlugin {
 
     public getConfigObject(gridOptions?: any): any;
 
-    public adjustRowHeight(sectionRef: any, from?: number, to?: number): boolean;
+    public adjustRowHeight(sectionRef: any, from?: number|null, to?: number|null): boolean;
 
     public adjustRowHeightAt(sectionRef: any, rowIndex: number): boolean;
 
-    public enableContentWrapping(colIndex: number, bool?: boolean): void;
+    public enableContentWrapping(colIndex: number, bool?: boolean|null): void;
 
     public isWrappingContent(colIndex: number): boolean;
 

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

@@ -93,6 +93,8 @@ declare class ColumnDefinition {
 
     public isTimeSeries(): boolean;
 
+    public isTimeSeriesChild(): boolean;
+
     public isFormulaField(): boolean;
 
     public static isFormulaField(field: string): boolean;

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

@@ -20,12 +20,16 @@ declare namespace FieldDefinition {
 
     function setFieldCaching(caching: boolean): void;
 
+    function disableTimeSeriesExpansion(disabled: boolean): void;
+
     function isFormula(field: string): boolean;
 
     function isAdc(field: string): boolean;
 
     function isRealTimeField(field: string): boolean;
 
+    function isTimeSeriesChild(field: string): boolean;
+
     function isTimeSeries(field: string): boolean;
 
 }

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

@@ -83,6 +83,7 @@ declare namespace Grid {
         formulaEngine?: boolean|null,
         adcPollingInterval?: number|null,
         fieldCaching?: boolean|null,
+        timeSeriesExpansion?: boolean|null,
         childDataField?: string|null,
         topSection?: boolean|null
     };

package/lib/versions.json

@@ -1,5 +1,5 @@
 {
-	"tr-grid-util": "1.3.89",
+	"tr-grid-util": "1.3.92",
 	"@grid/column-dragging": "1.0.11",
 	"@grid/row-segmenting": "1.0.23",
 	"@grid/statistics-row": "1.0.13",
@@ -14,7 +14,7 @@
 	"tr-grid-column-selection": "1.0.26",
 	"tr-grid-column-stack": "1.0.54",
 	"tr-grid-conditional-coloring": "1.0.58",
-	"tr-grid-content-wrap": "1.0.19",
+	"tr-grid-content-wrap": "1.0.20",
 	"tr-grid-contextmenu": "1.0.38",
 	"tr-grid-filter-input": "0.9.31",
 	"tr-grid-heat-map": "1.0.28",
@@ -32,6 +32,6 @@
 	"tr-grid-titlewrap": "1.0.19",
 	"@grid/formatters": "1.0.49",
 	"@grid/column-selection-dialog": "4.0.46",
-	"@grid/filter-dialog": "4.0.56",
+	"@grid/filter-dialog": "4.0.57",
 	"@grid/column-format-dialog": "4.0.43"
 }

package/package.json

@@ -66,5 +66,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"version": "6.0.30"
+	"version": "6.0.31"
 }