@refinitiv-ui/efx-grid 6.0.105 → 6.0.107

package/lib/tr-grid-printer/es6/PrintTrait.js

@@ -26,8 +26,8 @@ import { EventDispatcher } from "../../tr-grid-util/es6/EventDispatcher.js";
 * @extends{EventDispatcher}
 * @suppress {checkTypes}
 */
-var PrintTrait = function() {
-	var t = this;
+let PrintTrait = function() {
+	let t = this;
 	t._onKeyDown = t._onKeyDown.bind(t);
 	t._onMediaQuery = t._onMediaQuery.bind(t);
 	t._onBeforePrint = t._onBeforePrint.bind(t);
@@ -44,19 +44,19 @@ Ext.inherits(PrintTrait, EventDispatcher);
 /** @type {number}
 * @private
 */
-var IDLE = 0;
+const IDLE = 0;
 /** @type {number}
 * @private
 */
-var COUNTING = 1;
+const COUNTING = 1;
 /** @type {number}
 * @private
 */
-var BEFORE_PRINT = 2;
+const BEFORE_PRINT = 2;
 /** @type {number}
 * @private
 */
-var AFTER_PRINT = 3;
+const AFTER_PRINT = 3;
 
 /** @type {number}
 * @private
@@ -97,7 +97,11 @@ PrintTrait.prototype._state = IDLE;
 /** @type {number}
 * @private
 */
-PrintTrait.prototype._timerId = 0;
+PrintTrait.prototype._beforePrintTimer = 0;
+/** @type {number}
+* @private
+*/
+PrintTrait.prototype._afterPrintTimer = 0;
 /** @type {boolean}
 * @public
 */
@@ -117,10 +121,10 @@ PrintTrait._env = {};
 * @return {Object}
 */
 PrintTrait.calculateEnvironment = function() {
-	var env = PrintTrait._env;
-	var ua = navigator.userAgent;
-	var jet = window["JET"];
-	var cd = jet ? jet["ContainerDescription"] : "";
+	let env = PrintTrait._env;
+	let ua = navigator.userAgent;
+	let jet = window["JET"];
+	let cd = jet ? jet["ContainerDescription"] : "";
 
 	env.isMac = /Mac/.test(navigator.platform);
 	env.isIE = (ua.indexOf("MSIE ") > 0) || (ua.indexOf("Trident/")  > 0) || (ua.indexOf("Edge/")  > 0);
@@ -138,7 +142,7 @@ PrintTrait.prototype.observe = function(iframeElement) {
 		return;
 	}
 
-	var winObj = null;
+	let winObj = null;
 
 	if(iframeElement) {
 		if(iframeElement.contentWindow) {
@@ -199,10 +203,15 @@ PrintTrait.prototype.isObserving = function() {
 * @suppress {checkTypes}
 */
 PrintTrait.prototype.dispose = function() {
-	this.removeAllEventlisteners();
+	this.removeAllEventListeners();
 
-	if(this._timerId) {
-		clearTimeout(this._timerId);
+	if(this._beforePrintTimer) {
+		clearTimeout(this._beforePrintTimer);
+		this._beforePrintTimer = 0;
+	}
+	if(this._afterPrintTimer) {
+		clearTimeout(this._afterPrintTimer);
+		this._afterPrintTimer = 0;
 	}
 
 	this._onPrintEnd(); // Force ending the process
@@ -213,7 +222,7 @@ PrintTrait.prototype.dispose = function() {
 */
 PrintTrait.prototype.print = function() {
 	if(!this._window) {
-		console.error("Cannot perform printing. Window object must be specified by using observe() method.");
+		console.warn("Cannot perform printing. Window object must be specified by using observe() method.");
 		return;
 	}
 	if(this._state !== IDLE) {
@@ -233,10 +242,9 @@ PrintTrait.prototype.print = function() {
 	this._eventArg["documentElement"] = this.getDocumentElement();
 	this._eventArg["bodyElement"] = this.getBodyElement();
 	this.getDocumentElement().classList.add("tr-printing-mode");
-	this._dispatch("pageCounting", this._eventArg);
 
 	if(PrintTrait.DEBUG) {
-		var debugBtn = PrintTrait._debugBtn = document.createElement("button");
+		let debugBtn = PrintTrait._debugBtn = document.createElement("button");
 		debugBtn.addEventListener("click", this._onBeforePrint);
 		debugBtn.textContent = "BeforePrint";
 		debugBtn.style.display = "unset";
@@ -246,30 +254,35 @@ PrintTrait.prototype.print = function() {
 		debugBtn.style.transform = "translateX(-50%)";
 		debugBtn.style.top = "20px";
 		document.body.appendChild(debugBtn);
-	} else {
+	}
+	this._dispatch("pageCounting", this._eventArg);
+
+	if(!PrintTrait.DEBUG) {
 		/**
 		 * _onBeforePrint() was originally execute by window 'beforeprint' event.
 		 * Due to Custom Elements can't be create during 'beforeprint', _onBeforePrint() needs to be executed manually.
 		 * And window.print() need to be executed after some delay to make sure Custom Elements are created and rendered.
 		 * See here: https://html.spec.whatwg.org/multipage/custom-elements.html#custom-element-reactions
 		 */
+		this._beforePrintTimer = setTimeout(this._print, 500);
 		this._onBeforePrint();
-		setTimeout(this._print, 500);
 	}
 };
 /** @public
 */
 PrintTrait.prototype._print = function() {
+	this._beforePrintTimer = 0;
 	this._defaultPrint.call(this._window);
+	this._dispatch("printed", this._eventArg);
 };
 /** @public
 * @param {number} pageCount
 * @return {!Element}
 */
 PrintTrait.createBlankPages = function(pageCount) {
-	var rootElem = document.createElement("div");
-	for(var i = 0; i < pageCount; ++i) {
-		var bp = document.createElement("div");
+	let rootElem = document.createElement("div");
+	for(let i = 0; i < pageCount; ++i) {
+		let bp = document.createElement("div");
 		if(PrintTrait.DEBUG) {
 			bp.textContent = "Page " + (i + 1);
 		} else {
@@ -286,8 +299,8 @@ PrintTrait.createBlankPages = function(pageCount) {
 * @return {!Element}
 */
 PrintTrait.prototype.createClientBox = function(pw, ph) {
-	var rootElem = document.createElement("div");
-	var styObj = rootElem.style;
+	let rootElem = document.createElement("div");
+	let styObj = rootElem.style;
 	styObj.width = pw + "px";
 	styObj.height = ph + "px";
 
@@ -329,9 +342,7 @@ PrintTrait.prototype.getBodyElement = function() {
 * @param {KeyboardEvent} e
 */
 PrintTrait.prototype._onKeyDown = function(e) {
-	var ctrlCmdKey = PrintTrait._env.isMac ? e.metaKey : e.ctrlKey;
-
-	if(ctrlCmdKey) {
+	if(e.metaKey || e.ctrlKey) {
 		if(!e.altKey) {
 			if(e.keyCode === 80) { // P
 				e.preventDefault();
@@ -359,18 +370,18 @@ PrintTrait.prototype._onBeforePrint = function(e) {
 		this._state = BEFORE_PRINT;
 		this._calculatePageSize(this._correction, this._fixedSize);
 
-
 		this._eventArg["documentElement"] = this.getDocumentElement();
 		this._eventArg["bodyElement"] = this.getBodyElement();
 		this.getDocumentElement().classList.add("tr-printing-mode");
-		this._dispatch("beforeprint", this._eventArg);
 
 		if(PrintTrait.DEBUG) {
-			var debugBtn = PrintTrait._debugBtn;
+			let debugBtn = PrintTrait._debugBtn;
 			debugBtn.removeEventListener("click", this._onBeforePrint);
 			debugBtn.addEventListener("click", this._onAfterPrint);
 			debugBtn.textContent = "AfterPrint";
 		}
+
+		this._dispatch("beforeprint", this._eventArg);
 	}
 };
 /** @private
@@ -382,22 +393,22 @@ PrintTrait.prototype._onAfterPrint = function(e) {
 		this._calculatePageSize();
 
 		this.getDocumentElement().classList.remove("tr-printing-mode");
-		this._dispatch("afterprint", this._eventArg);
-		this._timerId = setTimeout(this._onPrintEnd, 0);
-
 		if (PrintTrait._debugBtn) { // For debugging
-			var pn = PrintTrait._debugBtn.parentNode;
+			let pn = PrintTrait._debugBtn.parentNode;
 			if(pn) {
 				pn.removeChild(PrintTrait._debugBtn);
 			}
 			PrintTrait._debugBtn = null;
 		}
+
+		this._afterPrintTimer = setTimeout(this._onPrintEnd, 0);
+		this._dispatch("afterprint", this._eventArg);
 	}
 };
 /** @private
 */
 PrintTrait.prototype._onPrintEnd = function() {
-	this._timerId = 0;
+	this._afterPrintTimer = 0;
 	this._state = IDLE;
 };
 /** @private
@@ -409,13 +420,13 @@ PrintTrait.prototype._calculatePageSize = function(sizeCorrection, fixedSize) {
 	if(PrintTrait._env.isIE) {
 		return false; // Cannot calculate paper size in IE
 	}
-	var documentElement = this.getDocumentElement();
-	var cw = documentElement.clientWidth;
+	let documentElement = this.getDocumentElement();
+	let cw = documentElement.clientWidth;
 	var	iw = this._window.innerWidth || 0;
-	var ch = documentElement.clientHeight;
-	var	ih = this._window.innerHeight || 0;
-	var nw = (cw >= iw) ? cw : iw;
-	var nh = (ch >= ih) ? ch : ih;
+	let ch = documentElement.clientHeight;
+	let ih = this._window.innerHeight || 0;
+	let nw = (cw >= iw) ? cw : iw;
+	let nh = (ch >= ih) ? ch : ih;
 
 	if(fixedSize) {
 		if(nw > nh) {
@@ -426,9 +437,9 @@ PrintTrait.prototype._calculatePageSize = function(sizeCorrection, fixedSize) {
 			nh = this._defaultHeight;
 		}
 	} else if(sizeCorrection) {
-		var portrait = nh >= nw;
-		var ar = this._calculateAspectRatio(nw, nh);
-		var paperSize = PrintTrait._paperSizes[ar];
+		let portrait = nh >= nw;
+		let ar = this._calculateAspectRatio(nw, nh);
+		let paperSize = PrintTrait._paperSizes[ar];
 		if(!paperSize) {
 			paperSize = PrintTrait._paperSizes[ar - 1] || PrintTrait._paperSizes[ar + 1];
 		}
@@ -457,8 +468,8 @@ PrintTrait.prototype._calculatePageSize = function(sizeCorrection, fixedSize) {
 * @return {number}
 */
 PrintTrait.prototype._calculateAspectRatio = function(w, h) {
-	var portrait = h >= w;
-	var ratio = (portrait) ? w / h : h / w;
+	let portrait = h >= w;
+	let ratio = (portrait) ? w / h : h / w;
 	return Math.floor(ratio * 1000); // Return 3 digit precision
 };
 
@@ -478,4 +489,6 @@ PrintTrait._paperSizes = {
 };
 
 
+
+export default PrintTrait;
 export { PrintTrait };

package/lib/tr-grid-printer/es6/SectionWriter.d.ts

@@ -29,10 +29,12 @@ declare class SectionWriter extends ElementWrapper {
 
     public enableRowClass(rowIndex: number, className: string, enabled: boolean): void;
 
-    public stretchCell(colIndex: number, rowIndex: number, opt_stretching?: boolean|null, opt_noLeftStretching?: boolean|null): void;
+    public stretchCell(cellRef: any, rowIndex?: number|null, stretching?: boolean|null, onlyToTheRight?: boolean|null): any;
 
     public hasCellSpan(): boolean;
 
+    public getStretchedCell(cellRef: any, rowIndex?: number|null): any;
+
     public getCellRowSpan(colIndex: number, rowIndex: number): number;
 
     public setCellRowSpan(colIndex: number, rowIndex: number, rowSpan: number): void;
@@ -51,4 +53,5 @@ declare class SectionWriter extends ElementWrapper {
 
 }
 
+export default SectionWriter;
 export { SectionWriter };

package/lib/tr-grid-printer/es6/SectionWriter.js

@@ -7,7 +7,7 @@ import { CellWriter } from "./CellWriter.js";
 * @constructor
 * @extends {ElementWrapper}
 */
-var SectionWriter = function () {
+let SectionWriter = function () {
 	this._cellWriter = new CellWriter();
 	this._table = new Table();
 	this._columns = [];
@@ -34,7 +34,7 @@ SectionWriter.prototype.getFirstIndexInView = function () {
 * @return {number}
 */
 SectionWriter.prototype.getLastIndexInView = function () {
-	return this._table.getRowCount();
+	return this._table.getRowCount() - 1; // WARNING: This is inclusive
 };
 
 /** @public
@@ -48,7 +48,7 @@ SectionWriter.prototype.getColumnCount = function () {
 * @return {*}
 */
 SectionWriter.prototype.getColumn = function (colIndex) {
-	var col = this._columns[colIndex];
+	let col = this._columns[colIndex];
 	if (!col) {
 		col = this._columns[colIndex] = {};
 	}
@@ -81,7 +81,7 @@ SectionWriter.prototype.setRowCount = function (val) {
 * @return {CellWriter}
 */
 SectionWriter.prototype.getCell = function (colIndex, rowIndex) {
-	var cell = this._table.getCell(colIndex, rowIndex);
+	let cell = this._table.getCell(colIndex, rowIndex);
 	if(cell) {
 		this._cellWriter.cloak(cell);
 		return this._cellWriter;
@@ -94,7 +94,7 @@ SectionWriter.prototype.getCell = function (colIndex, rowIndex) {
 * @return {Element|Node|NodeList}
 */
 SectionWriter.prototype.getCellContent = function (colIndex, rowIndex) {
-	var cell = this.getCell(colIndex, rowIndex);
+	let cell = this.getCell(colIndex, rowIndex);
 	return cell ? cell.getContent() : null;
 };
 /** Set data to the specified cell
@@ -104,7 +104,7 @@ SectionWriter.prototype.getCellContent = function (colIndex, rowIndex) {
 * @param {string|Element|tr.IElementControl|*} data this can be HTML element, string, number, date, image
 */
 SectionWriter.prototype.setCellContent = function (colIndex, rowIndex, data) {
-	var cell = this.getCell(colIndex, rowIndex);
+	let cell = this.getCell(colIndex, rowIndex);
 	if(cell) {
 		cell.setContent(data);
 	}
@@ -119,17 +119,24 @@ SectionWriter.prototype.setCellContent = function (colIndex, rowIndex, data) {
 SectionWriter.prototype.enableRowClass = function (rowIndex, className, enabled) { };
 
 /** This will make the specified cell horizontally span to fit entire row regardless of position of the cell -- cell will shift to the left most of the section.<br>
-* If opt_noLeftStretching is true, the cell will not extend to the left most position<br>
+* If onlyToTheRight is true, the cell will not extend to the left most position<br>
 * This is different from cell colSpan, which the cell remain in the same position. tr-stretched class will also be added to the cell
 * @public
-* @param {number} colIndex
-* @param {number} rowIndex
-* @param {boolean=} opt_stretching Default is true
-* @param {boolean=} opt_noLeftStretching Default is false (expand cell to the left).
-*/
-SectionWriter.prototype.stretchCell = function (colIndex, rowIndex, opt_stretching, opt_noLeftStretching) {
-	var cell = this._table.getCell(colIndex, rowIndex);
-	cell.setAttribute("colspan", this._table.getColumnCount());
+* @param {*} cellRef Either column index or cell reference is acceptable
+* @param {number=} rowIndex If the cell instance is given as the first parameter, this parameter will be ignored.
+* @param {boolean=} stretching Default is true
+* @param {boolean=} onlyToTheRight=false By default, cell will be stretched to both left and right directions, covering entire row. Set to true to expand only to the right
+* @return {*} The cell being stretched
+* @example
+* grid.stretchCell(1, 0); // The second cell on the first row will be stretched covering the entire row
+* grid.stretchCell(cellInstance, 0, true); // The given cell will be stretched covering the entire row
+*/
+SectionWriter.prototype.stretchCell = function (cellRef, rowIndex, stretching, onlyToTheRight) {
+	let cell = this._table.getCell(cellRef, rowIndex);
+	if(stretching !== false) {
+		cell.setAttribute("colspan", this._table.getColumnCount());
+	}
+	return cell;
 };
 /** {@link SectionWriter#stretchCell}
 * @public
@@ -143,6 +150,22 @@ SectionWriter.prototype.unstretchCell = function (colIndex, rowIndex) {};
 * @return {boolean}
 */
 SectionWriter.prototype.hasCellSpan = function () { return false; };
+/**
+* @public
+* @param {*} cellRef
+* @param {number=} rowIndex
+* @return {*}
+*/
+SectionWriter.prototype.getStretchedCell = function (cellRef, rowIndex) {
+	if(typeof rowIndex === "number") {
+		let cell = this._table.getCell(cellRef, rowIndex);
+		let colSpan = +cell.getAttribute("colspan");
+		if(colSpan > 1) {
+			return cell;
+		}
+	}
+	return null;
+};
 /** @description Returns zero or negative value, if the cell is spanned over (i.e. occupied by the spanning cell). <br>
 * Negative value is distance from the spanning cell (i.e. -1 means one cell from the spanning cell and -2 means two cells from the spanning cell) <br>
 * Return one, if the cell has no span (normal cell). <br>
@@ -210,4 +233,6 @@ SectionWriter.prototype._startBindingSession = function (enabled) {
 };
 
 
+
+export default SectionWriter;
 export { SectionWriter };

package/lib/tr-grid-row-filtering/es6/RowFiltering.d.ts

@@ -26,6 +26,7 @@ declare namespace RowFilteringPlugin {
     type FilterDialogOptions = {
         sortUI?: boolean|null,
         filterUI?: boolean|null,
+        advancedFilter?: boolean|null,
         fieldDataType?: string|null,
         lang?: string|null,
         rawDataAccessor?: ((...params: any[]) => any)|null,
@@ -33,6 +34,7 @@ declare namespace RowFilteringPlugin {
         sortLogic?: ((...params: any[]) => any)|null,
         itemList?: any[]|null,
         additionalItems?: any[]|null,
+        compactMode?: boolean|null,
         blankValues?: (boolean|string)|null
     };
 

package/lib/tr-grid-row-filtering/es6/RowFiltering.js

@@ -80,6 +80,7 @@ The expression can take various forms:<br>
 * @description Options that specify UIs of filter dialog
 * @property {boolean=} sortUI=true show/hide sort UI
 * @property {boolean=} filterUI=true show/hide filter UI
+* @property {boolean=} advancedFilter=true show advaced filter tab
 * @property {string=} fieldDataType data type of column
 * @property {string=} lang dialog language
 * @property {Function=} rawDataAccessor In case you have custom data type for the specified field, data getter is needed to retrieve raw value for filtering
@@ -87,6 +88,7 @@ The expression can take various forms:<br>
 * @property {Function=} sortLogic This function for sorting filter item list in the dialog. The comparison will perform on raw values, and not formatted values
 * @property {Array=} itemList Item list to be shown in the dialog. If this is not specified, the list will be collected from existing data on the grid
 * @property {Array=} additionalItems Additional items to be put on the itemList
+* @property {boolean=} compactMode=false force compact mode in dialog
 * @property {(boolean|string)=} blankValues Display a "(Blanks)" item in the filter dialog to represent an empty value. If a string is passed, it will be used as the label for the blank item
 */
 
@@ -1813,6 +1815,8 @@ RowFilteringPlugin.prototype.openDialog = function(colIndex, runtimeDialogOption
 	let dialogConfig = { // default config
 		sortUI: true,
 		filterUI: true,
+		advancedFilter: true,
+		compactMode: false,
 		fieldDataType: "",
 		lang: "",
 		rawDataAccessor: null,
@@ -1974,6 +1978,16 @@ RowFilteringPlugin._overrideConfig = function(config, userConfig) {
 		config.filterUI = filterUI;
 	}
 
+	let advancedFilter = userConfig["advancedFilter"];
+	if (advancedFilter != null) {
+	  config.advancedFilter = advancedFilter;
+	}
+
+	let compactMode = userConfig["compactMode"];
+	if (compactMode != null) {
+	  config.compactMode = compactMode;
+	}
+
 	let fieldDataType = userConfig["fieldDataType"];
 	if(fieldDataType != null) {
 		config.fieldDataType = fieldDataType;

package/lib/tr-grid-row-grouping/es6/RowGrouping.js

@@ -396,6 +396,12 @@ RowGroupingPlugin.prototype.initialize = function (host, options) {
 		return;
 	}
 
+	if(options && !options.multitable) {
+		while (this._hosts.length) {
+			this.unload(this._hosts[0]);
+		}
+	}
+
 	this._hosts.push(host);
 
 	ExpanderIcon.loadExpanderStyles();

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

@@ -341,6 +341,7 @@ MultiTableManager.prototype._addTable = function(tableIndex) {
 
 	let configObj = this._cloneConfig();
 	configObj.extensions = this._generateExtensions();
+	configObj.multitable = true;
 
 	delete configObj.staticDataRows;
 	delete configObj.rows;

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

@@ -6,6 +6,8 @@ declare namespace FieldDefinition {
 
     function set(field: string, def: any): void;
 
+    function resetAll(): void;
+
     function get(field: string): any;
 
     function getFieldInfo(field: string): any;

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

@@ -19,7 +19,5 @@ declare class SimpleTickerFormatter {
 
 }
 
-declare function onContextCreated(): void;
-
 export default SimpleTickerFormatter;
 export { SimpleTickerFormatter };

package/lib/versions.json

@@ -1,6 +1,6 @@
 {
-	"tr-grid-util": "1.3.151",
-	"tr-grid-printer": "1.0.17",
+	"tr-grid-util": "1.3.152",
+	"tr-grid-printer": "1.0.18",
 	"@grid/column-dragging": "1.0.20",
 	"@grid/row-segmenting": "1.0.31",
 	"@grid/statistics-row": "1.0.17",
@@ -19,19 +19,19 @@
 	"tr-grid-contextmenu": "1.0.41",
 	"tr-grid-filter-input": "0.9.39",
 	"tr-grid-heat-map": "1.0.29",
-	"tr-grid-in-cell-editing": "1.0.86",
+	"tr-grid-in-cell-editing": "1.0.87",
 	"tr-grid-pagination": "1.0.24",
 	"tr-grid-percent-bar": "1.0.24",
 	"tr-grid-range-bar": "2.0.8",
 	"tr-grid-row-dragging": "1.0.35",
-	"tr-grid-row-filtering": "1.0.76",
-	"tr-grid-row-grouping": "1.0.87",
+	"tr-grid-row-filtering": "1.0.77",
+	"tr-grid-row-grouping": "1.0.88",
 	"tr-grid-row-selection": "1.0.30",
 	"tr-grid-rowcoloring": "1.0.25",
 	"tr-grid-textformatting": "1.0.48",
 	"tr-grid-titlewrap": "1.0.22",
-	"@grid/formatters": "1.0.52",
+	"@grid/formatters": "1.0.53",
 	"@grid/column-selection-dialog": "4.0.57",
-	"@grid/filter-dialog": "4.0.64",
+	"@grid/filter-dialog": "4.0.65",
 	"@grid/column-format-dialog": "4.0.45"
 }

package/package.json

@@ -67,5 +67,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"version": "6.0.105"
+	"version": "6.0.107"
 }