@refinitiv-ui/efx-grid 6.0.85 → 6.0.86

package/lib/core/es6/data/DataView.d.ts

@@ -218,10 +218,14 @@ declare class DataView extends EventDispatcher {
 
     public getExpansionParents(from?: number|null, to?: number|null): (string)[]|null;
 
+    public getExpansionParentByRowId(rid: string): string;
+
     public isRowExpansion(rid: string): boolean;
 
     public hasRowExpansion(rid: string): boolean;
 
+    public getRowExpansionCount(rowId: string): number;
+
     public getRowExpansionId(rid: string, idx?: number|null): string;
 
     public getRowExpansionIndex(rid: string): number;

package/lib/core/es6/data/DataView.js

@@ -2094,6 +2094,17 @@ DataView.prototype.getExpansionParents = function (from, to) {
 	return parentMapping;
 };
 
+/**
+* @public
+* @param {string} rid
+* @return {string} parent row id
+*/
+DataView.prototype.getExpansionParentByRowId = function(rid) {
+	if(this._expansionChildren) {
+		return this._expansionChildren[rid] || "";
+	}
+	return "";
+};
 /** Check if the specified row is itself a row expansion.
 * @public
 * @param {string} rid rowId
@@ -2116,6 +2127,18 @@ DataView.prototype.hasRowExpansion = function(rid) {
 	}
 	return false;
 };
+/**
+* @public
+* @param {string} rowId
+* @return {number}
+*/
+DataView.prototype.getRowExpansionCount = function(rowId) {
+	if(this._expansionMap) {
+		return this._expansionMap[rowId] || 0;
+	}
+	return 0;
+};
+
 /** Get row Id of the row expansion by providing the row Id of the row with row expansion (not row expansion itself). This is NOT recommended for normal usage, since the row expansion contains no data in the DataView
 * @public
 * @param {string} rid rowId

package/lib/core/es6/grid/Core.js

@@ -574,7 +574,7 @@ Core.prototype._hasPendingRowChange = false;
 * @return {string}
 */
 Core.getVersion = function () {
-	return "5.1.89";
+	return "5.1.90";
 };
 /** {@link ElementWrapper#dispose}
 * @override
@@ -4881,25 +4881,35 @@ Core.prototype._dispatchRowExpansionBinding = function (e) {
 
 	var fromR = /** @type{number} */(e["fromRowIndex"]);
 	var toR = /** @type{number} */(e["toRowIndex"]);
-	var parents = dataView.getExpansionParents(fromR, toR);
 	var rids = dataView.getVisibleRowIds(true);
 	var section = /** @type{ILayoutGrid} */(e["section"]);
 
 	e["rowData"] = null;
 	e["cell"] = null;
-	for (var r = fromR; r < toR; ++r) {
-		var parentRid = parents[r];
+	var lastRowIndexChanged = false;
+	for (var r = toR - 1; r >= fromR; --r) {
+		var rowId = dataView.getRowId(r);
+		if(!lastRowIndexChanged) {
+			var reCount = dataView.getRowExpansionCount(rowId);
+			if(reCount > 0){
+				r = r + reCount + 1; // include parent row
+				lastRowIndexChanged = true;
+				continue;
+			}
+		}
+
 		var ctxRow = section.getContextRow(r);
-		if(parentRid) { // Previous row is the row with expansion
-			e["originalRowData"] = dataView.getRowData(parentRid);
-			e["originalRowId"] = parentRid;
+		var parentId = dataView.getExpansionParentByRowId(rowId);
+		if(parentId) { // dispatch to render row expansion
+			e["originalRowData"] = dataView.getRowData(parentId);
+			e["originalRowId"] = parentId;
 			e["rowExpansion"] = ctxRow["rowExpansion"] = true;
-		} else if(ctxRow["rowExpansion"]) {
+		} else if(ctxRow["rowExpansion"] ){ // dispose cases
 			e["originalRowData"] = null;
 			e["originalRowId"] = null;
 			e["rowExpansion"] = ctxRow["rowExpansion"] = false;
-		} else {
-			continue; // There is no need to dispatch the event for normal row
+		} else { // normal row no need to dispatch
+			continue;
 		}
 		e["rowId"] = rids[r];
 		e["rowIndex"] = r;

package/lib/grid/index.js

@@ -1,3 +1,3 @@
 import {Grid} from "./lib/efx-grid.js";
 export {Grid}
-window.EFX_GRID = { version: "6.0.85" };
+window.EFX_GRID = { version: "6.0.86" };

package/lib/tr-grid-checkbox/es6/Checkbox.d.ts

@@ -76,5 +76,7 @@ declare class CheckboxPlugin extends GridPlugin {
 
 declare function val(gridOptions?: any): any;
 
+declare function newState(sectionRef: any, rowIndex: number, context?: any): void;
+
 export default CheckboxPlugin;
 export { CheckboxPlugin, CheckboxPlugin as Checkbox, CheckboxPlugin as CheckboxExtension };

package/lib/tr-grid-checkbox/es6/Checkbox.js

@@ -1425,6 +1425,44 @@ CheckboxPlugin.prototype._onCheckboxChanged = function (e, toggling) {
 
 	e.stopPropagation();
 };
+
+/** @public
+* @description Check/Uncheck a specified row by a simulated mouse click input. This is for testing purpose.
+* @ignore
+* @param {Object} sectionRef Grid SectionReference object
+* @param {number} rowIndex
+* @param {Object=} context
+*/
+CheckboxPlugin.prototype.toggleCheckByMouse = function(sectionRef, rowIndex, context) {
+	var eventObj = context || {};
+	eventObj.sectionType = sectionRef;
+	eventObj = this._mockMouseEvent(this._displayColumn, rowIndex, eventObj);
+
+	var checkbox = this.getCheckbox(sectionRef, rowIndex);
+	if(!checkbox) {
+		return;
+	}
+	var curState = CheckboxPlugin._getCheckState(checkbox);
+	CheckboxPlugin._setBooleanProp(checkbox, "checked", curState !== "checked");
+	eventObj.currentTarget = eventObj.target = checkbox;
+
+	this._onCheckboxMousedown(eventObj);
+	this._onCheckboxClicked(eventObj);
+};
+/** @public
+* @description Supply an keyboard input. This is for testing purpose.
+* @ignore
+* @param {string} keyName
+* @param {number} rowIndex
+* @param {Object} context
+*/
+CheckboxPlugin.prototype.supplyKey = function(keyName, rowIndex, context) {
+	var checkbox = this.getCheckbox("content", rowIndex);
+	var eventObj = this._mockKeyboardEvent(keyName, context);
+	eventObj.currentTarget = eventObj.target = checkbox;
+	this._onCheckboxKeydown(eventObj);
+};
+
 /** @private
 * @param {Event} e
 */

package/lib/tr-grid-column-grouping/es6/ColumnGrouping.js

@@ -161,9 +161,7 @@ ColumnGroupingPlugin._toGroupDefinition = function (obj, groupId) {
 */
 ColumnGroupingPlugin._cloneObject = function (obj) {
   var newObj = cloneObject(obj);
-  if (Array.isArray(newObj.children)) {
-    newObj.children = newObj.children;
-  } else {
+  if (!Array.isArray(newObj.children)) {
     newObj.children = [];
   }
   return newObj;
@@ -548,7 +546,8 @@ ColumnGroupingPlugin.prototype._evaluateGroupStructure = function () {
   this._maxDepth = maxDepth + 1; // Column header depth = maximum group depth + 1
 };
 
-/** @private Add pinning state to group definition for further verification.
+/** Add pinning state to group definition for further verification.
+* @private
 * @param {Object} groupDef
 * @param {string} side
 */

package/lib/tr-grid-filter-input/es6/FilterInput.js

@@ -748,7 +748,7 @@ FilterInputPlugin.prototype.updateUI = function (colIndex, text) {
 };
 /** @private
 * @param {number} colIndex
-* @param {string} text
+* @param {string|number} text
 * @param {Object=} textMap
 * @return {Object} Column option
 */

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

@@ -6,7 +6,7 @@ declare namespace Dom {
 
     function div(className?: string|null): Element;
 
-    function text(textContent?: string|null, className?: string|null): Element;
+    function text(textContent?: (string|number)|null, className?: string|null): Element;
 
     function appendChild(parentElem: Element|null, children: Node|any[]|null): Element|null;
 

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

@@ -27,7 +27,7 @@ Dom.div = function(className) {
 /** Shorthand for creating a span element with textContent
 * @public
 * @function
-* @param {string=} textContent
+* @param {(string|number)=} textContent
 * @param {string=} className
 * @return {!Element}
 */

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

@@ -42,7 +42,7 @@ var OperatorFunctions = {
 	"!": function(lhs, rhs){ return !lhs; },
 	"!!": function(lhs, rhs){ return !!lhs; }
 };
-/** @type {Object.<string, Function>}
+/** @type {Object.<string, number>}
 * @private
 * @const
 */

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

@@ -32,7 +32,7 @@ declare class FilterBuilder {
 
     public setDataAccessors(rawDataAccessor?: ((...params: any[]) => any)|null, formattedDataAccessor?: ((...params: any[]) => any)|null): void;
 
-    public addCondition(oper: string, value: string|number|Date|null, connector?: string|null, useUTCTime?: boolean|null): boolean;
+    public addCondition(oper: string, value: string|number|boolean|Date|null, connector?: string|null, useUTCTime?: boolean|null): boolean;
 
     public addConditions(conditions: FilterBuilder.Conditions|null): number;
 

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

@@ -375,7 +375,7 @@ FilterBuilder.prototype.setDataAccessors = function(rawDataAccessor, formattedDa
 };
 /** @public
 * @param {string} oper Operator id (e.g., "GT", "CONT", "EQ")
-* @param {string|number|Date} value If date type operator is specified, this should be accompanied with useUTCTime flag to indicate whether local or UTC time to be used.
+* @param {string|number|boolean|Date} value If date type operator is specified, this should be accompanied with useUTCTime flag to indicate whether local or UTC time to be used.
 * @param {string=} connector Possible values are "OR" and "AND"
 * @param {boolean=} useUTCTime If the value is not specified, the default setting will be used
 * @return {boolean} Return true, if the new condition is added

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

@@ -37,7 +37,7 @@ declare class PercentBar {
 
     public hideZeroValue(hidden?: boolean|null): boolean;
 
-    public setText(txt: string): void;
+    public setText(txt: string|number|null): void;
 
     public hideText(hidden?: boolean|null): boolean;
 

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

@@ -318,7 +318,7 @@ PercentBar.prototype.hideZeroValue = function (hidden) {
 };
 
 /** @public
-* @param {string} txt
+* @param {string|number} txt
 */
 PercentBar.prototype.setText = function (txt) {
 	if(!this._invalid) {

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

@@ -23,7 +23,7 @@ declare class RangeBar {
 
     public setPercent(percent?: number|null): void;
 
-    public isPercentNaN(): boolean;
+    public isValid(): boolean;
 
     public isInvalid(): boolean;
 

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

@@ -137,7 +137,7 @@ RangeBar.prototype.setStyles = function(obj) {
 		}
 	}
 
-	if(!this.isPercentNaN()) {
+	if(!this.isValid()) {
 		this._elem.style.backgroundColor = this._styles["trackColor"];
 	}
 	if(this._styles["fontColor"] != null) {
@@ -185,7 +185,7 @@ RangeBar.prototype.getPercent = function() {
 RangeBar.prototype.setPercent = function(percent) {
 	percent = RangeBar._limitPercent(percent);
 	if(this._percent !== percent) {
-		if(this._percent === this._percent || percent === percent) { // Prevent unnecessary update by checking NaN
+		if(this.isValid() || percent === percent) { // Prevent unnecessary update by checking NaN
 			this._percent = percent;
 			this._updateUI();
 		}
@@ -226,20 +226,21 @@ RangeBar._limitPercent = function(percent) {
 /** @public
 * @return {boolean}
 */
-RangeBar.prototype.isPercentNaN = function() {
+RangeBar.prototype.isValid = function() {
 	return this._percent === this._percent;
 };
 
-/** Alias to {@link RangeBar#isPercentNaN}
-* @public
+/** @public
 * @function
 * @return {boolean}
 */
-RangeBar.prototype.isInvalid = RangeBar.prototype.isPercentNaN;
+RangeBar.prototype.isInvalid = function() {
+	return !this.isValid();
+};
 
 /** @private */
 RangeBar.prototype._updateUI = function() {
-	if(this.isPercentNaN()) {
+	if(this.isValid()) {
 		var percent = ((this._percent * 10000) | 0) / 10000; // rounding number
 		this._slider.style.left = "calc(" +
 			(percent * 100) +

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

@@ -6,8 +6,6 @@ declare namespace TextHighlighter {
 
     const spaces: RegExp|null;
 
-    const spaceTrimer: RegExp|null;
-
     const defaultTag: string;
 
 }

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

@@ -12,11 +12,6 @@ TextHighlighter.invalidChars = /[^\w-_ .]+/g;
 * @public
 */
 TextHighlighter.spaces = /\s+/;
-/** /^\s+|\s+$/g
-* @type {RegExp}
-* @public
-*/
-TextHighlighter.spaceTrimer = /^\s+|\s+$/g;
 /** Default is <mark> tag
 * @type {string}
 * @public
@@ -256,7 +251,7 @@ TextHighlighter.buildRule = function(txt, caseSensitive) {
 
 	if(txt) {
 		txt = txt.replace(TextHighlighter.invalidChars, " ");
-		txt = txt.replace(TextHighlighter.spaceTrimer, "");
+		txt = txt.trim();
 	}
 	if(!txt) {
 		return null;

package/lib/tr-grid-util/es6/formula/Formula.js

@@ -613,7 +613,7 @@ Formula.prototype._parse = function(exp) {
 	if(exp.charAt(0) === "=") { // Remove the first equal sign
 		exp = exp.substr(1);
 	}
-	exp = exp.replace(/^\s+|\s+$/gm, ""); // Trim white spaces -- equivalent to String.trim(), which is not support in IE8
+	exp = exp.trim();
 	exp = exp.replace(/<>/g, "!=");
 	exp = exp.replace(/‛|‘|’/g, "'"); // Left and right single quote will be converted to simple single quote
 	exp = exp.replace(/‟|“|”/g, '"'); // Left and right double quote will be converted to simple double quote

package/lib/tr-grid-util/es6/formula/VariableToken.js

@@ -4,7 +4,7 @@
 * @param {number=} index
 */
 var VariableToken = function(str, index) {
-	str = str.replace(/^\s+|\s+$/gm, ""); // Trim white spaces -- equivalent to String.trim(), which is not support in IE8
+	str = str.trim();
 
 	if(this._inputConverter[str]) {
 		str = this._inputConverter[str];

package/lib/tr-grid-util/es6/formula/functions/Excel.d.ts

@@ -5,4 +5,4 @@ declare namespace Excel {
 }
 
 export default Excel;
-export { Excel }; ("Excel", Excel);
+export { Excel };

package/lib/tr-grid-util/es6/formula/functions/Excel.js

@@ -18,4 +18,4 @@ Excel["REFERENCEDATA"] = function(/* ... args*/) {};
 Excel["SETCOLUMNCOLOR"] = function(/* ... args*/) {};
 
 export default Excel;
-export { Excel }; ("Excel", Excel);
+export { Excel };

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

@@ -50,7 +50,7 @@ tr.Conflator = Conflator;
 tr.Perf = Perf;
 tr.NumberFormatter = NumberFormatter;
 tr.FieldFormatter = FieldFormatter;
-tr.DateTime = tr.DateTime;
+tr.DateTime = DateTime;
 tr.FilterBuilder = FilterBuilder;
 tr.FilterOperators = FilterOperators;
 tr.PercentBar = PercentBar;

package/lib/tr-grid-util/es6/jet/DataGenerator.d.ts

@@ -102,7 +102,7 @@ declare function randDate(min?: (number|any)|null, max?: (number|any)|null, seed
 
 declare function randString(min?: number|null, max?: number|null, seed?: number|null): string;
 
-declare function toRecords(data2D: (any[])[]|null, fields?: (string)[]|null): (any)[]|null;
+declare function toRecords(data2D: (any[])[]|null, fields?: (string|number)[]|null): (any)[]|null;
 
 declare function getSeed(): number;
 

package/lib/tr-grid-util/es6/jet/DataGenerator.js

@@ -277,7 +277,7 @@ var randString = function(min, max, seed) {
 /** Convert 2D Array to Array of records
 * @public
 * @param {Array.<Array>} data2D Array of values
-* @param {Array.<string>=} fields Keys to be mapped on the output records.
+* @param {Array.<string|number>=} fields Keys to be mapped on the output records.
 * @return {Array.<Object>} records
 */
 var toRecords = function(data2D, fields) {

package/lib/types/es6/Core/data/DataView.d.ts

@@ -218,10 +218,14 @@ declare class DataView extends EventDispatcher {
 
     public getExpansionParents(from?: number|null, to?: number|null): (string)[]|null;
 
+    public getExpansionParentByRowId(rid: string): string;
+
     public isRowExpansion(rid: string): boolean;
 
     public hasRowExpansion(rid: string): boolean;
 
+    public getRowExpansionCount(rowId: string): number;
+
     public getRowExpansionId(rid: string, idx?: number|null): string;
 
     public getRowExpansionIndex(rid: string): number;

package/lib/versions.json

@@ -1,5 +1,5 @@
 {
-	"tr-grid-util": "1.3.137",
+	"tr-grid-util": "1.3.139",
 	"tr-grid-printer": "1.0.17",
 	"@grid/column-dragging": "1.0.16",
 	"@grid/row-segmenting": "1.0.30",
@@ -7,17 +7,17 @@
 	"@grid/zoom": "1.0.11",
 	"tr-grid-auto-tooltip": "1.1.6",
 	"tr-grid-cell-selection": "1.0.35",
-	"tr-grid-checkbox": "1.0.64",
+	"tr-grid-checkbox": "1.0.65",
 	"tr-grid-column-fitter": "1.0.40",
 	"tr-grid-column-formatting": "0.9.35",
-	"tr-grid-column-grouping": "1.0.57",
+	"tr-grid-column-grouping": "1.0.58",
 	"tr-grid-column-resizing": "1.0.28",
 	"tr-grid-column-selection": "1.0.33",
 	"tr-grid-column-stack": "1.0.74",
 	"tr-grid-conditional-coloring": "1.0.69",
 	"tr-grid-content-wrap": "1.0.20",
 	"tr-grid-contextmenu": "1.0.41",
-	"tr-grid-filter-input": "0.9.38",
+	"tr-grid-filter-input": "0.9.39",
 	"tr-grid-heat-map": "1.0.29",
 	"tr-grid-in-cell-editing": "1.0.81",
 	"tr-grid-pagination": "1.0.24",

package/package.json

@@ -66,5 +66,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"version": "6.0.85"
+	"version": "6.0.86"
 }