@refinitiv-ui/efx-grid 6.0.99 → 6.0.101

package/lib/tr-grid-row-dragging/es6/RowDragging.js

@@ -464,12 +464,22 @@ RowDraggingPlugin.prototype.getConfigObject = function (out_obj) {
 	if(!extOptions) {
 		extOptions = obj.rowDragging = {};
 	}
-	// TODO: should not assign the config object if it's a default value
-	extOptions.dragBox = this._dragBoxEnabled;
-	extOptions.mouseInput = this._mouseInput;
-	extOptions.autoScroll = this._autoScroll;
-	extOptions.dataTransfer = this._dataTransfer;
-	extOptions.disabled = this._uiDisabled;
+
+	if(this._dragBoxEnabled) {
+		extOptions.dragBox = this._dragBoxEnabled;
+	}
+	if(!this._mouseInput) {
+		extOptions.mouseInput = this._mouseInput;
+	}
+	if(!this._autoScroll) {
+		extOptions.autoScroll = this._autoScroll;
+	}
+	if(!this._dataTransfer) {
+		extOptions.dataTransfer = this._dataTransfer;
+	}
+	if(this._uiDisabled) {
+		extOptions.disabled = this._uiDisabled;
+	}
 
 	return obj;
 };
@@ -1103,6 +1113,8 @@ RowDraggingPlugin.prototype._moveRows = function (srcRowRef, destRowIndex, srcGr
 
 	let moveCount = movedRowIds ? movedRowIds.length : 0;
 	if(moveCount) {
+		destGrid.focus();
+
 		evtArg["originRowId"] = movedRowIds[0];
 		evtArg["originRowIds"] = movedRowIds;
 		evtArg["destinationRowId"] = destRowId; // Return empty string for the last row

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

@@ -136,6 +136,42 @@ let _arrayConcat = function(ary, val) {
 	}
 	return ary;
 };
+
+/** @type {Object}
+* @private
+* @const
+*/
+const BlankValues = {
+	"": true,
+	"null": true,
+	"undefined": true,
+	"NaN": true
+};
+/** @private
+* @function
+* @param {Array} ary
+* @param {string} str
+* @returns {boolean} Returns true if there is any change
+*/
+let _pushRawValue = function(ary, str) {
+	if(str) {
+		if(!BlankValues[str]) {
+			let dateObj = stringToDateObject(str);
+			if(dateObj !== str) {
+				ary.push(dateObj);
+			} else {
+				try {
+					ary.push(JSON.parse(str));
+				} catch (err) {
+					ary.push(str);
+				}
+			}
+			return true;
+		}
+	}
+	return false;
+};
+
 /** @private
 * @function
 * @param {Object} obj
@@ -670,8 +706,8 @@ RowFilteringPlugin.prototype._parseFilter = function(exp, colIndex, ctx) {
 			rawDataAccessor = ctx.rawDataAccessor || null;
 			formattedDataAccessor = ctx.formattedDataAccessor || null;
 		}
-		if(!Array.isArray(exp)) {
-			if(exp[BLANKS] || (ctx && ctx.blankValues)) {
+		if(!Array.isArray(exp)) { // If exp is an object
+			if(exp[BLANKS] || (ctx && ctx.blankValues)) { // it contains BLANKS key or context object has blank option
 				exp[""] = exp["null"] = exp["undefined"] = exp["NaN"] = true;
 				delete exp[BLANKS];
 			}
@@ -1485,7 +1521,7 @@ let _valueToString = function(formattedVal, rawVal) {
 		} else if(formattedVal instanceof Date) {
 			return formattedVal.toLocaleString("en-GB");
 		} else { // Object type cannot be converted to string
-			return"";
+			return "";
 		}
 	} else if(formattedVal === 0) {
 		return "0";
@@ -1650,19 +1686,22 @@ RowFilteringPlugin._formatArrayExpression = function(exp, field, formatter) {
 			ary.rawValue = val;
 			ary.formattedValue = formattedVal;
 		}
-		if(field && formatter && typeof val !== "string") {
-			if(val != null) {
+		if(typeof val !== "string" && val != null) {
+			if(field && formatter) {
 				let dummyRow = {};
 				dummyRow[field] = val;
 				formattedVal = formatter(dummyRow);
-				if(formattedVal) {
-					ary.rawValue = val;
-					ary.formattedValue = formattedVal;
-					val = formattedVal;
-				}
+			} else {
+				formattedVal = _valueToString(val, val);
+			}
+			if(formattedVal) {
+				ary.rawValue = val;
+				ary.formattedValue = formattedVal;
+			} else {
+				formattedVal = val;
 			}
 		}
-		ary[1] = val;
+		ary[1] = formattedVal;
 		return ary;
 	}
 	return null;
@@ -1802,22 +1841,36 @@ RowFilteringPlugin.prototype.openDialog = function(colIndex, runtimeDialogOption
 	let filterFuncs = null;
 	let exp = colSettings.expression;
 	if(exp) {
+		let userInputs = [];
+		if(cfo._filters && cfo._filters.length) {
+			filterFuncs = cfo._filters;
+		}
 		if(Array.isArray(exp)) {
 			if(exp.length) {
 				condition2D = Array.isArray(exp[0]) ? exp.slice() : [exp]; // Guaranteed condition2D to be a 2D array
-				condition2D[0] = RowFilteringPlugin._formatArrayExpression(condition2D[0], field, formatter);
-				condition2D[1] = RowFilteringPlugin._formatArrayExpression(condition2D[1], field, formatter);
+				let conditionAry = null;
+				conditionAry = RowFilteringPlugin._formatArrayExpression(condition2D[0], field, formatter);
+				condition2D[0] = conditionAry;
+				if(conditionAry) {
+					_pushRawValue(userInputs, conditionAry.rawValue != null ? conditionAry.rawValue : conditionAry[1]);
+				}
+
+				conditionAry = RowFilteringPlugin._formatArrayExpression(condition2D[1], field, formatter);
+				condition2D[1] = conditionAry;
+				if(conditionAry) {
+					_pushRawValue(userInputs, conditionAry.rawValue != null ? conditionAry.rawValue : conditionAry[1]);
+				}
+
 				filterMode = "advanced";
 			}
 		} else if(typeof exp === "function" || typeof exp === "string" || typeof exp === "object") {
-			if(cfo._filters && cfo._filters.length) {
-				filterFuncs = cfo._filters;
-			}
 			if(typeof exp === "object") {
-				exp = _handledBlankProperties(exp);
-				dialogConfig.additionalItems = _arrayConcat(dialogConfig.additionalItems, Object.keys(exp));
+				for(let expKey in exp) {
+					_pushRawValue(userInputs, expKey);
+				}
 			}
 		}
+		dialogConfig.additionalItems = _arrayConcat(dialogConfig.additionalItems, userInputs);
 	}
 
 	let selectedItems = {};

package/lib/tr-grid-row-selection/es6/RowSelection.d.ts

@@ -1,9 +1,7 @@
 import { Ext } from "../../tr-grid-util/es6/Ext.js";
 import { EventDispatcher } from "../../tr-grid-util/es6/EventDispatcher.js";
 import { GridPlugin } from "../../tr-grid-util/es6/GridPlugin.js";
-import { isMac as isMacFn } from "../../tr-grid-util/es6/Util.js";
-import { isIE, prepareTSVContent } from "../../tr-grid-util/es6/Util.js";
-import { prettifyCss } from "../../tr-grid-util/es6/Util.js";
+import { isMac as isMacFn, prepareTSVContent, prettifyCss } from "../../tr-grid-util/es6/Util.js";
 
 declare namespace RowSelectionPlugin {
 

package/lib/tr-grid-row-selection/es6/RowSelection.js

@@ -1,9 +1,7 @@
 import { Ext } from "../../tr-grid-util/es6/Ext.js";
 import { EventDispatcher } from "../../tr-grid-util/es6/EventDispatcher.js";
 import { GridPlugin } from "../../tr-grid-util/es6/GridPlugin.js";
-import { isMac as isMacFn } from "../../tr-grid-util/es6/Util.js";
-import { isIE, prepareTSVContent } from "../../tr-grid-util/es6/Util.js";
-import { prettifyCss } from "../../tr-grid-util/es6/Util.js";
+import { isMac as isMacFn, prepareTSVContent, prettifyCss } from "../../tr-grid-util/es6/Util.js";
 
 /** @private
 * @type {boolean}
@@ -43,7 +41,6 @@ const IS_MAC = isMacFn();
 let RowSelectionPlugin = function (options) {
 	let t = this;
 	t._onMouseDown = t._onMouseDown.bind(t);
-	t._onMouseMove = t._onMouseMove.bind(t);
 	t._onClick = t._onClick.bind(t);
 	t._onKeyDown = t._onKeyDown.bind(t);
 	t._onBeforeRowRemoved = t._onBeforeRowRemoved.bind(t);
@@ -53,7 +50,6 @@ let RowSelectionPlugin = function (options) {
 	t._updateMenuIcon = t._updateMenuIcon.bind(t);
 
 	t._hosts = [];
-	t._isIE = isIE();
 	t._textRange = document.createRange();
 
 	if(options) {
@@ -101,10 +97,6 @@ RowSelectionPlugin.prototype._selectionField = "SELECTED_ROW";
 * @description use with _basedOnContent mode for tracking current anchor row
 */
 RowSelectionPlugin.prototype._anchorRowId = "";
-/** @type {boolean}
-* @private
-*/
-RowSelectionPlugin.prototype._isIE = false;
 /** @type {Range}
 * @private
 */
@@ -578,19 +570,40 @@ RowSelectionPlugin.prototype.disableMultiSelection = function (disabled) {
 	this._singleSelMode = disabled !== false;
 };
 
+/** Focus the active grid only if there is no selected text
+* @private
+* @param {boolean=} force
+* @returns {boolean} Returns true if there is any change
+*/
+RowSelectionPlugin.prototype._focusGrid = function (force) {
+	if(this._activeGrid) {
+		if(force || !window.getSelection().toString()) {
+			this._activeGrid.focus();
+			return true;
+		}
+	}
+	return false;
+};
 /** @private
 * @param {Event} e
 */
 RowSelectionPlugin.prototype._onClick = function (e) {
-	if(this._pendingClickIndex >= 0 && this._anchorSection) {
-		this._selectSingleRow(this._anchorSection, this._pendingClickIndex);
-		let host = this.getRelativeGrid(e);
-		this._clearPendingClickIndex(host);
+	if(this._pendingClickIndex >= 0) {
+		let performClick = (this._activeGrid && this._anchorSection) ? true : false;
+		if(performClick) {
+			let curPos = this._activeGrid.getRelativePosition(e);
+			performClick = curPos.rowIndex === this._pendingClickIndex && curPos.section === this._anchorSection;
+		}
+		if(performClick) {
+			this._selectSingleRow(this._anchorSection, this._pendingClickIndex);
+			this._focusGrid();
 
-		if(!this._basedOnContent) { // Protect against rowPositionChanged and postBindingSection event
-			this._updateMenuIcon();
+			if(!this._basedOnContent) { // Protect against rowPositionChanged and postBindingSection event
+				this._updateMenuIcon();
+			}
+			this._dispatchSelectionChanged(e);
 		}
-		this._dispatchSelectionChanged(e);
+		this._pendingClickIndex = -1;
 	}
 };
 /** @public
@@ -634,10 +647,9 @@ RowSelectionPlugin.prototype._onMouseDown = function (e) {
 		}
 	}
 
+	this._pendingClickIndex = -1;
 	let host = this.getRelativeGrid(e);
 
-	this._clearPendingClickIndex(host);
-
 	if(!host) {
 		return;
 	}
@@ -683,7 +695,8 @@ RowSelectionPlugin.prototype._onMouseDown = function (e) {
 	if(singleSelection) { // Click: selects a single row
 		this._anchorSection = section;
 		if(prevSel) { // Click on the selected row
-			this._setPendingClickIndex(rowIndex, host); // Delay the operation to allow drag and drop operation
+			// Delay the operation to allow drag and drop operation
+			this._pendingClickIndex = rowIndex;
 			return;
 		} else { // Perform single click immediately
 			let prevGrid = this._activeGrid;
@@ -698,44 +711,16 @@ RowSelectionPlugin.prototype._onMouseDown = function (e) {
 		}
 	}
 
-	if(this._activeGrid && !prevSel) {
-		e.preventDefault();
-		this._activeGrid.focus();
+	if(this._focusGrid(!prevSel)) {
+		e.preventDefault(); // Prevent changing focus due to clicking on unfocusable element
 	}
 
 	if(!this._basedOnContent) { // Protect against rowPositionChanged and postBindingSection event
 		this._updateMenuIcon();
 	}
 
-	this._dispatchSelectionChanged(e, rowIndex, section);
-};
 
-/** To clear _pendingClickIndex when mouse move
-* @private
-* @param {Event} e
-*/
-RowSelectionPlugin.prototype._onMouseMove = function (e) {
-	let host = this.getRelativeGrid(e);
-	this._clearPendingClickIndex(host);
-};
-
-/** To set _pendingClickIndex
-* @private
-* @param {number} rowIndex
-* @param {Object=} host core grid instance
-*/
-RowSelectionPlugin.prototype._setPendingClickIndex = function (rowIndex, host) {
-	this._pendingClickIndex = rowIndex;
-	host && host.listen("mousemove", this._onMouseMove);
-};
-
-/** To clear _pendingClickIndex
-* @private
-* @param {Object=} host core grid instance
-*/
-RowSelectionPlugin.prototype._clearPendingClickIndex = function (host) {
-	this._pendingClickIndex = -1;
-	host && host.unlisten("mousemove", this._onMouseMove);
+	this._dispatchSelectionChanged(e, rowIndex, section);
 };
 
 /** @private
@@ -865,7 +850,7 @@ RowSelectionPlugin.prototype.getSelectedText = function () {
 	if(!this._compositeGrid && !this._realTimeGrid) return "";
 
 	let selectedRows = this.getSelectedRows();
-	let rowCount = selectedRows.length;
+	let rowCount = selectedRows ? selectedRows.length : 0;
 	let columnCount = this.getColumnCount();
 	let text = "";
 	let dv = this._activeGrid.getDataSource();
@@ -938,7 +923,7 @@ RowSelectionPlugin.prototype._clearSelectedRows = function (preserveAnchor) { //
 	if(!preserveAnchor) {
 		this._anchorSection = null;
 	}
-	this._clearPendingClickIndex(this._activeGrid);
+	this._pendingClickIndex = -1;
 	this._clearMenuIcon();
 };
 /** @private
@@ -952,9 +937,7 @@ RowSelectionPlugin.prototype._selectByKey = function (direction, e, pageKey) {
 
 	if(!this._anchorSection) { return; }
 
-	if(this._activeGrid != null){
-		this._activeGrid.focus();
-	}
+	this._focusGrid(true);
 
 	let shiftKey = e.shiftKey;
 	let next = 0;
@@ -1267,9 +1250,7 @@ RowSelectionPlugin.prototype._gotoGrid = function (gridIndex) {
 	let sectionIndex = this._anchorSection.getIndex();
 	this.clearSelectedRows(); // Clear all current grid's selections
 	this.selectSingleRow(anchorRow, sectionIndex, this._hosts[gridIndex]); // go to the next grid at the first column
-	if(this._activeGrid != null){
-		this._activeGrid.focus();
-	}
+	this._focusGrid(true);
 };
 
 /** @private

package/lib/types/es6/Core/grid/Core.d.ts

@@ -327,6 +327,8 @@ declare class Core extends ElementWrapper {
 
     public scrollToRow(sectionRef: Core.SectionReference|null, rowIndex: number, topOfView?: boolean|null): void;
 
+    public getVerticalViewInfo(): any;
+
     public getVScrollView(): any;
 
     public getScrollTop(): number;

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

@@ -31,7 +31,9 @@ declare namespace InCellEditingPlugin {
         rowEditorClosed?: ((...params: any[]) => any)|null,
         autoSuggest?: Element|null,
         closingOnScroll?: boolean|null,
-        autoHiding?: boolean|null
+        autoHiding?: boolean|null,
+        readonly?: boolean|null,
+        starterText?: (string|boolean)|null
     };
 
     type Cache = {
@@ -81,6 +83,8 @@ declare class InCellEditingPlugin extends GridPlugin {
 
     public disableDblClick(opt_disabled?: boolean|null): void;
 
+    public showStarterText(bool?: boolean|null): void;
+
     public isEditing(): boolean;
 
     public getTextBox(columnIndex?: number|null, grid?: any): Element|null;
@@ -99,6 +103,10 @@ declare class InCellEditingPlugin extends GridPlugin {
 
     public isColumnEditable(colIndex: number): boolean;
 
+    public enableReadonly(bool: boolean): void;
+
+    public disableReadonly(bool: boolean): void;
+
     public openRowEditor(rowIndex: number, grid?: any): void;
 
     public closeRowEditor(isCommit?: boolean|null): void;

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

@@ -45,7 +45,8 @@ declare namespace ColumnDefinition {
         stationary?: boolean|null,
         leftPinned?: boolean|null,
         rightPinned?: boolean|null,
-        info?: any
+        info?: any,
+        focusable?: boolean|null
     };
 
 }
@@ -160,6 +161,8 @@ declare class ColumnDefinition {
 
     public getColumnInfo(): any;
 
+    public isFocusable(): boolean;
+
 }
 
 declare const COL_DEF: string;

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

@@ -287,6 +287,8 @@ declare class Grid extends EventDispatcher {
 
     public setRicData(ric: string, values: any): void;
 
+    public getAllRics(): (string)[]|null;
+
     public setRowData(rowRef: Grid.RowReference|null, values: any): void;
 
     public setStaticRowData(rowRef: Grid.RowReference|null, values: any): void;

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

@@ -1,9 +1,7 @@
 import { Ext } from "../../tr-grid-util/es6/Ext.js";
 import { EventDispatcher } from "../../tr-grid-util/es6/EventDispatcher.js";
 import { GridPlugin } from "../../tr-grid-util/es6/GridPlugin.js";
-import { isMac as isMacFn } from "../../tr-grid-util/es6/Util.js";
-import { isIE, prepareTSVContent } from "../../tr-grid-util/es6/Util.js";
-import { prettifyCss } from "../../tr-grid-util/es6/Util.js";
+import { isMac as isMacFn, prepareTSVContent, prettifyCss } from "../../tr-grid-util/es6/Util.js";
 
 declare namespace RowSelectionPlugin {
 

package/lib/versions.json

@@ -19,14 +19,14 @@
 	"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.84",
+	"tr-grid-in-cell-editing": "1.0.86",
 	"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.34",
-	"tr-grid-row-filtering": "1.0.74",
+	"tr-grid-row-dragging": "1.0.35",
+	"tr-grid-row-filtering": "1.0.75",
 	"tr-grid-row-grouping": "1.0.87",
-	"tr-grid-row-selection": "1.0.28",
+	"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",

package/package.json

@@ -66,5 +66,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"version": "6.0.99"
+	"version": "6.0.101"
 }