@refinitiv-ui/efx-grid 6.0.58 → 6.0.59

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

@@ -181,9 +181,9 @@ declare class Grid extends EventDispatcher {
 
     public _initDuplicateRicData(rowDef: RowDefinition|null): void;
 
-    public insertRow(rowOption?: any, rowRef?: Grid.RowReference|null): any;
+    public insertRow(rowOption?: (RowDefinition.Options|string)|null, rowRef?: Grid.RowReference|null): RowDefinition|null;
 
-    public insertRows(rowOptions: (any)[]|null, rowRef?: Grid.RowReference|null, opt_fields?: (string)[]|null): void;
+    public insertRows(rowOptions: (RowDefinition.Options|string)[]|null, rowRef?: Grid.RowReference|null, opt_fields?: (string)[]|null): void;
 
     public addStaticDataRows(dataRows: any[]|null, fields?: (string)[]|null): void;
 
@@ -323,7 +323,7 @@ declare class Grid extends EventDispatcher {
 
     public logDV(opt_options?: any): void;
 
-    public replaceRow(rowRef: Grid.RowReference|null, rowOption?: any): any;
+    public replaceRow(rowRef: Grid.RowReference|null, rowOption?: (RowDefinition.Options|string)|null): RowDefinition|null;
 
     public scrollToColumn(colIndex: number, leftOfView?: boolean|null): boolean;
 

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

@@ -1581,16 +1581,16 @@ Grid.prototype.replaceColumn = function (columnOption, colRef) {
 	}
 
 	var colDef = this.getColumnDefinition(colIndex);
-	if(colDef.getChildren()) { // Parent time series field doesn't provide hidden property
+	if(colDef && colDef.getChildren().length > 0) { // Parent time series field doesn't provide hidden property
 		colConfig["hidden"] = false;
 	}
 
-	if(colConfig.id == null) {
+	if(colDef && colConfig.id == null) {
 		colConfig.id =  colDef.getId(); // retain ID
 	}
 	this._grid.startBatch("reset");
+	this.removeColumn(colIndex);
 	this.insertColumn(colConfig, colIndex);
-	this.removeColumn(colIndex + 1); // remove existing column after insert
 	this._grid.stopBatch("reset");
 };
 
@@ -2295,9 +2295,9 @@ Grid.prototype._initDuplicateRicData = function(rowDef) {
 	}
 };
 /** @public
-* @param {Object=} rowOption
+* @param {(RowDefinition~Options|string)=} rowOption
 * @param {Grid~RowReference=} rowRef Reference (i.e. row index, row id, or row definition) of the insert position
-* @returns {Object}
+* @returns {RowDefinition}
 * @example
 * var grid = new rt.Grid(grid_div, options);
 * grid.insertRow({"ric": "RIC"}, 0); // A new row is added at the top
@@ -2328,7 +2328,7 @@ Grid.prototype.insertRow = function(rowOption, rowRef) {
 	return rowDef;
 };
 /** @public
-* @param {Array.<Object>} rowOptions Array of row option object
+* @param {Array.<RowDefinition~Options|string>} rowOptions Array of row option object
 * @param {Grid~RowReference=} rowRef Reference (i.e. row index, row id, or row definition) of the insert position
 * @param {Array.<string>=} opt_fields
 * @example
@@ -3978,8 +3978,8 @@ Grid.prototype._logData = function(rowDefs, options) {
 /** @public
 * @description Replace existing row with a new row. Row ID would be changed, after row is replaced.
 * @param {Grid~RowReference} rowRef Reference (i.e. row index, row id, or row definition) of the insert position
-* @param {Object=} rowOption
-* @returns {Object}
+* @param {(RowDefinition~Options|string)=} rowOption
+* @returns {RowDefinition}
 */
 Grid.prototype.replaceRow = function(rowRef, rowOption) {
 	var rowId = this._getRowId(rowRef);

package/lib/tr-grid-column-stack/es6/ColumnStack.d.ts

@@ -14,7 +14,9 @@ declare namespace ColumnStackPlugin {
         fields: (string)[]|null,
         stacks: (ColumnStackPlugin.StackDefinition)[]|null,
         autoStacking?: boolean|null,
-        clicked?: ((...params: any[]) => any)|null
+        clicked?: ((...params: any[]) => any)|null,
+        menuElement?: Element|null,
+        menuItemClicked?: ((...params: any[]) => any)|null
     };
 
     type ColumnOptions = {

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

@@ -10,10 +10,12 @@ import { preventDefault } from "../../tr-grid-util/es6/EventDispatcher.js";
 
 /** @typedef {Object} ColumnStackPlugin~Options
 * @description Available options describing `columnStack` object specified in grid's option
-* @property {Array.<string>} fields Fields for stacking. The minimum is 2 fields.
+* @property {Array.<string>} fields Fields for stacking. The minimum is 2 fields
 * @property {Array.<ColumnStackPlugin~StackDefinition>} stacks List of stacking configuration
 * @property {boolean=} autoStacking Deprecated. Stacks are automatically maintained as long as its members exist
 * @property {Function=} clicked=null Event handler when user clicks on stack/expanding icon
+* @property {Element=} menuElement Element used to display a column selection list
+* @property {Function=} menuItemClicked When the menuElement is specified and menu item is clicked, an event handler is called
 */
 
 /** @typedef {Object} ColumnStackPlugin~ColumnOptions
@@ -122,6 +124,7 @@ var ColumnStackPlugin = function () {
 	this._onBeforeBatchOperation = this._onBeforeBatchOperation.bind(this);
 	this._onAfterBatchOperation = this._onAfterBatchOperation.bind(this);
 	this._onPinningChanged = this._onPinningChanged.bind(this);
+	this._onMenuItemClicked = this._onMenuItemClicked.bind(this);
 
 	this._onStackButtonClicked = this._onStackButtonClicked.bind(this);
 	this._updateUI = this._updateUI.bind(this);
@@ -165,6 +168,14 @@ ColumnStackPlugin.prototype._inResetting = false;
 * @private
 */
 ColumnStackPlugin.prototype._inPinning = false;
+/** @type {Element}
+* @private
+*/
+ColumnStackPlugin.prototype._menuElement = null;
+/** @type {Function}
+* @private
+*/
+ColumnStackPlugin.prototype._menuItemClicked = null;
 
 /** @type {number}
 * @private
@@ -201,12 +212,28 @@ ColumnStackPlugin.prototype.initialize = function (host, options) {
 	if(this._hosts.indexOf(host) >= 0) { return; }
 	this._hosts.push(host);
 
-	if(options && options["icons"]) {
-		var icons = options["icons"]["columnStack"];
-		if(icons) {
-			this._stackIconName = icons["stack"];
-			this._expandIconName = icons["expand"];
-			this._collapseIconName = icons["collapse"];
+	if(options) {
+		if(options["icons"]) {
+			var icons = options["icons"]["columnStack"];
+			if(icons) {
+				this._stackIconName = icons["stack"];
+				this._expandIconName = icons["expand"];
+				this._collapseIconName = icons["collapse"];
+			}
+		}
+
+		var opt = options["columnStack"];
+		if(opt && this._hosts.length === 1) {
+			var menuElement = opt["menuElement"];
+			if(menuElement && typeof menuElement === "object" && menuElement.nodeType === 1) {
+				menuElement.addEventListener("item-trigger", this._onMenuItemClicked);
+				this._menuElement = menuElement;
+			}
+
+			var menuItemClicked = opt["menuItemClicked"];
+			if(typeof menuItemClicked === "function") {
+				this._menuItemClicked = menuItemClicked;
+			}
 		}
 	}
 
@@ -242,6 +269,10 @@ ColumnStackPlugin.prototype.unload = function (host) {
 	host.unlisten("preSectionRender", this._onPreSectionRender);
 	host.unlisten("pinningChanged", this._onPinningChanged);
 
+	if(this._menuElement) {
+		this._menuElement.removeEventListener("item-trigger", this._onMenuItemClicked);
+	}
+
 	if(this._hosts.length <= 0) {
 		this._conflator.reset();
 		this._groupDefs.removeAllGroups();
@@ -1608,7 +1639,8 @@ ColumnStackPlugin.prototype._onStackButtonClicked = function(e) {
 				value: i,
 				selected: i === activeIndex,
 				label: this.getColumnName(colIndices[i]),
-				field: this.getColumnField(colIndices[i])
+				field: this.getColumnField(colIndices[i]),
+				colId: children[i]
 			};
 		}
 		pos["menuData"] = menuData;
@@ -1622,9 +1654,33 @@ ColumnStackPlugin.prototype._onStackButtonClicked = function(e) {
 	pos["stackId"] = colData.id;
 
 	elem.focus();
+
+	if(this._menuElement && !colData.spreading) {
+		// Populate stack member
+		var button = pos.event.srcElement;
+		var el = this._menuElement;
+		el.data = pos["menuData"];
+		el.positionTarget = button;
+		el.opened = true;
+	}
 	this._dispatch("clicked", pos);
 };
+/** @private
+* @param {Object} e
+*/
+ColumnStackPlugin.prototype._onMenuItemClicked = function(e) {
+	if(e.detail) {
+		var selectedIndex = parseInt(e.detail.value, 0);
+		var menuData = this._menuElement.data[selectedIndex];
+		var colId = menuData.colId;
+		this.setActiveColumn(colId);
+	}
+	this._menuElement.opened = false;
 
+	if(this._menuItemClicked) {
+		this._menuItemClicked(e);
+	}
+};
 /** @public
 * @description Get member column indices in a stack
 * @param {string} stackId

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

@@ -38,7 +38,8 @@ ElementObserver._getNewId = function () {
 	return id;
 };
 
-/** @private Observe any element
+/** Observe any element
+* @private
 * @param {Element} elem
 * @param {Function} listener
 * @param {Object=} opt_option
@@ -101,7 +102,8 @@ ElementObserver.addLanguageListener = function(element) {
 	ElementObserver._addObserver(document.documentElement, _onLanguageMutated.bind(null, element));
 };
 
-/** @public Add a listener to a html attribute
+/** Add a listener to a html attribute
+* @public
 * @param {Element} element An element within the DOM tree to watch for changes
 * @param {Function} listener A function which will be called on each attribute change
 * @param {string=} attributeName If not specified, listener will be called on every attribute change

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

@@ -63,7 +63,8 @@ ElementWrapper.prototype.getMousePosition = function(e, retObj) {
 */
 ElementWrapper.prototype.addEventListener = function(type, listener) {
 	ElementWrapper.base(this, "addEventListener", type, listener);
-	if(this._elem["on" + type] != null) { // TODO: This won't work with Custom Element
+	// TODO: This won't work with Custom Element
+	if(this._elem["on" + type] !== undefined) { // eslint-disable-line
 		this._elem.addEventListener(type, listener, false);
 	}
 };
@@ -74,7 +75,7 @@ ElementWrapper.prototype.addEventListener = function(type, listener) {
 */
 ElementWrapper.prototype.removeEventListener = function(type, listener) {
 	ElementWrapper.base(this, "removeEventListener", type, listener);
-	if(this._elem["on" + type] != null) {
+	if(this._elem["on" + type] !== undefined) { // eslint-disable-line
 		this._elem.removeEventListener(type, listener, false);
 	}
 };

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

@@ -259,6 +259,11 @@ GridPlugin.prototype.getColumnIndex = function (colRef) {
 * @return {Array.<number>} column indices
 */
 GridPlugin.prototype.getColumnIndices = function (colRefs) {
+	var api = this.getGridApi();
+	if(api.getColumnIndices) {
+		return api.getColumnIndices(colRefs);
+	}
+
 	// TODO: Unify the below logics
 	if(this._compositeGrid) {
 		var allFields = this._compositeGrid.getColumnFields();

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

@@ -30,9 +30,9 @@ declare class SubTable extends ElementWrapper {
 
     public getAllCells(): (Element)[];
 
-    public getAllRows(): HTMLCollection|null;
+    public getAllRows(): (Element)[];
 
-    public getRows(): HTMLCollection|null;
+    public getRows(): (Element)[];
 
     public getRow(r: number): Element|null;
 
@@ -70,5 +70,7 @@ declare class SubTable extends ElementWrapper {
 
 declare function tdElem(e: Event|null): number;
 
+declare function trElem(colIndex: number, rowIndex?: number|null): number;
+
 export default SubTable;
 export { SubTable };

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

@@ -49,7 +49,7 @@ SubTable.prototype.addColumns = function(opt_count) {
 
 	this._colCount += opt_count;
 
-	var rows = this.getRows(); // TODO: Must include all suspended rows
+	var rows = this._elem.children; // TODO: Must include all suspended rows
 	for(var r = rows.length; --r >= 0;) {
 		var tr = rows[r];
 		for(var c = 0; c < opt_count; ++c) {
@@ -68,7 +68,7 @@ SubTable.prototype.removeColumns = function(opt_count) {
 	if(opt_count <= 0) { return; }
 
 	this._colCount -= opt_count;
-	var rows = this.getRows(); // TODO: Must include all suspended rows
+	var rows = this._elem.children; // TODO: Must include all suspended rows
 	for(var r = rows.length; --r >= 0;) {
 		Dom.removeChildren(rows[r], opt_count);
 	}
@@ -158,7 +158,7 @@ SubTable.prototype.setDefaultRowHeight = function(val) {
 	this._defaultRowHeight = val;
 	var minHeight = (this._defaultRowHeight != null) ? this._defaultRowHeight + "px" : "";
 
-	this._applyDefaultRowHeight(this.getRows(), minHeight);
+	this._applyDefaultRowHeight(this._elem.children, minHeight);
 };
 
 /** @public
@@ -194,7 +194,7 @@ SubTable.prototype.getCellsInColumn = function(c) {
 	if(c < 0 || c >= this._colCount) {
 		return null;
 	}
-	var rows = this.getRows();
+	var rows = this._elem.children;
 	var rowCount = rows.length;
 	var ary = new Array(rowCount);
 	for(var r = 0; r < rowCount; ++r) {
@@ -209,13 +209,22 @@ SubTable.prototype.getCellsInColumn = function(c) {
 */
 SubTable.prototype.getCellsInRow = function(r) {
 	var tr = this.getRow(r);
-	return (tr) ? tr.cells : null;
+	if(tr) {
+		var cells = tr.cells;
+		var len = cells.length;
+		var ary = new Array(len);
+		for(var i = 0; i < len; ++i) {
+			ary[i] = cells[i];
+		}
+		return ary;
+	}
+	return null;
 };
 /** @public
 * @return {!Array.<Element>} Array of td (HTMLTableCellElement) elements
 */
 SubTable.prototype.getAllCells = function() {
-	var rows = this.getRows();
+	var rows = this._elem.children;
 	var rowCount = rows.length;
 	var colCount = this._colCount;
 	var cellCount = 0;
@@ -229,14 +238,20 @@ SubTable.prototype.getAllCells = function() {
 	return ary;
 };
 /** @public
-* @return {HTMLCollection} Array like collection of tr (HTMLTableRowElement) elements
+* @return {!Array.<Element>} Array of tr (HTMLTableRowElement) elements
 */
 SubTable.prototype.getAllRows = function() {
-	return this._elem.children;
+	var chdr = this._elem.children;
+	var len = chdr ? chdr.length : 0;
+	var ary = new Array(len);
+	for(var i = 0; i < len; ++i) {
+		ary[i] = chdr[i];
+	}
+	return ary;
 };
 /** @public
 * @function
-* @return {HTMLCollection} Array like collection of tr (HTMLTableRowElement) elements
+* @return {!Array.<Element>} Array of tr (HTMLTableRowElement) elements
 */
 SubTable.prototype.getRows = SubTable.prototype.getAllRows;
 /** @public
@@ -251,7 +266,7 @@ SubTable.prototype.getRow = function(r) {
 * @return {!Array.<Array.<string>>}
 */
 SubTable.prototype.getTextContents = function() {
-	var rows = this.getRows();
+	var rows = this._elem.children;
 	var rowCount = rows.length;
 	var rowContents = new Array(rowCount);
 	for(var r = 0; r < rowCount; ++r) {
@@ -281,7 +296,7 @@ SubTable.prototype.getCellTextContent = function(c, r) {
 * @return {string}
 */
 SubTable.prototype.getColumnTextContent = function(c) { // New-line delimited
-	var rows = this.getRows();
+	var rows = this._elem.children;
 	var rowCount = rows.length;
 	if(c >= 0 && c < this._colCount && rowCount > 0) {
 		var str = rows[0].cells[c].textContent;
@@ -311,7 +326,7 @@ SubTable.prototype.getRowTextContent = function(r) { // Tab delimited
 * @return {string}
 */
 SubTable.prototype.getTableTextContent = function() { // Tab delimited
-	var rowCount = this.getRows().length;
+	var rowCount = this._elem.children.length;
 	if(rowCount > 0) {
 		var str = this.getRowTextContent(0);
 		for(var r = 1; r < rowCount; ++r) {
@@ -326,9 +341,10 @@ SubTable.prototype.getTableTextContent = function() { // Tab delimited
 */
 SubTable.prototype.toString = function() {
 	var str = this.getElement().outerHTML;
+	str = str.replace(/>\s+</g, "><");
 	str = str.replace(/><tr/g, ">\n\t<tr");
 	str = str.replace(/><td/g, ">\n\t\t<td");
-	str = str.replace(/><td/g, ">\n\t\t<th"); // TH can occur in thead
+	str = str.replace(/><th/g, ">\n\t\t<th"); // TH can occur in thead
 	str = str.replace(/><\/tr/g, ">\n\t</tr");
 	var tagName = this.getElement().tagName.toLowerCase();
 	str = str.replace("</" + tagName, "\n</" + tagName);
@@ -340,39 +356,40 @@ SubTable.prototype.toString = function() {
 * @return {number}
 */
 SubTable.prototype.getColumnIndex = function(e) {
-	if(e) {
-		var len, i;
-		var tgt = /** @type{Node} */(e.target);
-		if(this._elem.contains(tgt)) {
-			var tdElem = Dom.closestTagName(tgt, "TD");
-			if(!tdElem) {
-				tdElem = Dom.closestTagName(tgt, "TH");
+	if(!e) {
+		return -1;
+	}
+	var len, i;
+	var tgt = /** @type{Node} */(e.target); // TODO: Support Shadow Root
+	if(this._elem.contains(tgt)) {
+		var tdElem = Dom.closestTagName(tgt, "TD");
+		if(!tdElem) {
+			tdElem = Dom.closestTagName(tgt, "TH");
+		}
+		if(tdElem) {
+			var chdr = tdElem.parentElement.children;
+			len = chdr.length;
+			for(i = 0; i < len; ++i) {
+				if(tdElem === chdr[i]) {
+					return i;
+				}
 			}
-			if(tdElem) {
-				var chdr = tdElem.parentElement.children;
-				len = chdr.length;
+		}
+	} else { // In case of the target is not a child of this element
+		var rows = this._elem.children;
+		var cells = (rows[0]) ? rows[0].cells : null;
+		if(cells) {
+			var pos = Dom.getRelativePosition(e, this._elem);
+			var x = pos["x"];
+			if(x >= 0) {
+				len = cells.length;
 				for(i = 0; i < len; ++i) {
-					if(tdElem === chdr[i]) {
+					x -= cells[i].offsetWidth;
+					if(x < 0) { // Not include the right border
 						return i;
 					}
 				}
 			}
-		} else { // In case of the target is not a child of this element
-			var rows = this.getRows();
-			var cells = (rows[0]) ? rows[0].cells : null;
-			if(cells) {
-				var pos = Dom.getRelativePosition(e, this._elem);
-				var x = pos["x"];
-				if(x >= 0) {
-					len = cells.length;
-					for(i = 0; i < len; ++i) {
-						x -= cells[i].offsetWidth;
-						if(x < 0) { // Not include the right border
-							return i;
-						}
-					}
-				}
-			}
 		}
 	}
 	return -1;
@@ -382,27 +399,36 @@ SubTable.prototype.getColumnIndex = function(e) {
 * @return {number}
 */
 SubTable.prototype.getRowIndex = function(e) {
-	var rows = this.getRows();
-	if(rows && e) {
-		var jLen = rows.length;
-		var tgtElem = e.target; // TODO: Support Shadow Root
-		for(var j = 0; j < jLen; ++j) {
-			var row = rows[j];
-			if(row === tgtElem) {
-				return j;
+	if(!e) {
+		return -1;
+	}
+	var rows = this._elem.children; // This return HTML collection
+	var rowCount = rows ? rows.length : 0;
+	if(!rowCount) {
+		return -1;
+	}
+	var i;
+	var tgt = /** @type{Node} */(e.target); // TODO: Support Shadow Root
+	if(this._elem.contains(tgt)) {
+		var trElem = Dom.closestTagName(tgt, "TR");
+		if(trElem) {
+			for(i = 0; i < rowCount; ++i) {
+				var row = rows[i];
+				if(row === trElem) {
+					return i;
+				}
 			}
 		}
+	}
 
-		// In case of the target is not a child of this element
-		var pos = Dom.getRelativePosition(e, this._elem);
-		var y = pos["y"];
-		if(y >= 0) {
-			var len = rows.length;
-			for(var i = 0; i < len; ++i) {
-				y -= rows[i].offsetHeight;
-				if(y < 0) { // Not include the right border
-					return i;
-				}
+	// In case of the target is not a child of this element
+	var pos = Dom.getRelativePosition(e, this._elem);
+	var y = pos["y"];
+	if(y >= 0) {
+		for(i = 0; i < rowCount; ++i) {
+			y -= rows[i].offsetHeight;
+			if(y < 0) { // Not include the right border
+				return i;
 			}
 		}
 	}
@@ -458,31 +484,69 @@ SubTable.prototype.setCellRenderer = function(func) {
 * @param {string=} opt_elementType
 */
 SubTable.prototype.cloak = function(elem, opt_elementType) {
-	SubTable["base"](this, "cloak", elem, "tr");
-	var rows = elem.getElementsByTagName("TR");
-	this._colCount = rows[0] ? rows[0].children.length : 0;
+	if(elem) {
+		this._elem = elem;
+		var rows = elem.getElementsByTagName("TR");
+		this._colCount = rows[0] ? rows[0].children.length : 0;
+	}
 };
 
 /** @public
-* @param {number} c1
-* @param {number} c2
-* @param {number} r1
-* @param {number} r2
+* @param {number} c1 Starting column index
+* @param {number} c2 Destination column index
+* @param {number} r1 Starting row index
+* @param {number} r2 Destination row index
 * @return {Element} Top left cell element
 */
 SubTable.prototype.spanBlock = function (c1, c2, r1, r2) { // WARNING: It's c c r r
-	var cell = null;
-	for(var c = c2; c >= c1; --c) {
-		for(var r = r2; r >= r1; --r) {
+	var cell = this.getCell(c1, r1);
+	if(!cell) {
+		return null;
+	}
+	if(c2 < c1) {
+		c2 = c1;
+	}
+	if(r2 < r1) {
+		r2 = r1;
+	}
+	var curColSpan = +cell.getAttribute("colspan");
+	var curRowSpan = +cell.getAttribute("rowspan");
+	var c3 = (curColSpan) ? c1 + curColSpan - 1 : c1;
+	var r3 = (curRowSpan) ? r1 + curRowSpan - 1 : r1;
+
+	// TODO: Optimize below logics
+	var c, r;
+	for(c = c3; c >= c1; --c) {
+		for(r = r3; r >= r1; --r) {
+			cell = this.getCell(c, r);
+			if(cell) {
+				cell.style.display = "";
+			}
+		}
+	}
+
+	for(c = c2; c >= c1; --c) {
+		for(r = r2; r >= r1; --r) {
 			cell = this.getCell(c, r);
 			if(cell) {
 				cell.style.display = "none";
 			}
 		}
 	}
-	if(cell) {
-		cell.setAttribute("colspan", (c2 - c1 + 1));
-		cell.setAttribute("rowspan", (r2 - r1 + 1));
+
+	if(cell) { // The last cell from the loop is the top left cell
+		var colSpan = (c2 - c1 + 1);
+		var rowSpan = (r2 - r1 + 1);
+		if(colSpan > 1) {
+			cell.setAttribute("colspan", colSpan);
+		} else {
+			cell.removeAttribute("colspan");
+		}
+		if(colSpan > 1) {
+			cell.setAttribute("rowspan", rowSpan);
+		} else {
+			cell.removeAttribute("rowspan");
+		}
 		cell.style.display = "";
 	}
 	return cell;
@@ -526,7 +590,7 @@ SubTable.parseTableContent = function(tbl) {
 };
 
 /** @private
-* @param {!NodeList<!Element>|Array.<Element>} rows
+* @param {!(NodeList<!Element>|Array.<Element>)} rows
 * @param {string} minHeight
 */
 SubTable.prototype._applyDefaultRowHeight = function(rows, minHeight) {