@refinitiv-ui/efx-grid 6.0.81 → 6.0.83

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

@@ -570,7 +570,7 @@ Core.prototype._firstRendered = false;
 * @return {string}
 */
 Core.getVersion = function () {
-	return "5.1.85";
+	return "5.1.86";
 };
 /** {@link ElementWrapper#dispose}
 * @override

package/lib/core/es6/grid/plugins/SortableTitlePlugin.js

@@ -1179,6 +1179,10 @@ SortableTitlePlugin.prototype._proceedSorting = function (hitObj) {
 		if (state) {
 			this._sortColumn([state], { "isUserAction": true });
 		}
+		var grid = hitObj["grid"];
+		if(grid && grid["focus"]) {
+			grid["focus"]();
+		}
 
 		if (this._hasListener("clicked")) {
 			var ce = {};

package/lib/grid/index.js

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

package/lib/tr-grid-cell-selection/es6/CellSelection.js

@@ -406,7 +406,6 @@ CellSelectionPlugin.prototype._onMouseDown = function (e) {
   }
   this._dirty = true;
   this.selectSingleCell(newAnchor);
-  activeGrid.setAttribute("draggable", "true");
   this._draggable = true;
 };
 
@@ -664,7 +663,6 @@ CellSelectionPlugin.prototype._onMouseUp = function (e) {
   if (this._disabled || !this._dirty) {
     return;
   }
-  this._hosts[0].removeAttribute("draggable");
   this._draggable = false;
 
   // WORKAROUND: FOR IE11

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

@@ -1649,7 +1649,9 @@ CheckboxPlugin.prototype._onPostSectionDataBinding = function (e) {
 		}
 	}
 
-	this._syncAscendantState(e["sectionSettings"], null, dv);
+	if(e.actualUpdate) {
+		this._syncAscendantState(e["sectionSettings"], null, dv);
+	}
 };
 
 

package/lib/tr-grid-column-fitter/es6/ColumnFitter.d.ts

@@ -4,27 +4,27 @@ import { GridPlugin } from '../../tr-grid-util/es6/GridPlugin.js';
 declare namespace ColumnFitterPlugin {
 
     type Options = {
-        proportion?: boolean,
-        constraint?: boolean,
-        autoAdjust?: (boolean|number),
-        autoAdjusting?: (boolean|number),
-        title?: boolean,
-        paddingSize?: number,
-        shrinkable?: boolean
+        proportion?: boolean|null,
+        constraint?: boolean|null,
+        autoAdjust?: (boolean|number)|null,
+        autoAdjusting?: (boolean|number)|null,
+        title?: boolean|null,
+        paddingSize?: number|null,
+        shrinkable?: boolean|null
     };
 
     type ColumnOptions = {
-        noFitting?: boolean,
-        contentFitting?: boolean,
-        minWidth?: number,
-        maxWidth?: number
+        noFitting?: boolean|null,
+        contentFitting?: boolean|null,
+        minWidth?: number|null,
+        maxWidth?: number|null
     };
 
 }
 
 declare class ColumnFitterPlugin extends GridPlugin {
 
-    constructor(options?: ColumnFitterPlugin.Options);
+    constructor(options?: ColumnFitterPlugin.Options|null);
 
     public getName(): string;
 
@@ -32,15 +32,15 @@ declare class ColumnFitterPlugin extends GridPlugin {
 
     public unload(host: any): void;
 
-    public config(options?: ColumnFitterPlugin.Options): void;
+    public config(options?: ColumnFitterPlugin.Options|null): void;
 
     public getConfigObject(gridOptions?: any): any;
 
     public getColumnMenu(colIndex: number, config: any): any;
 
-    public adjustColumnWidth(colIndex?: (number)[]): boolean;
+    public adjustColumnWidth(colIndex?: (number)[]|null): boolean;
 
-    public adjustColumns(colIndices?: (number)[], force?: boolean): boolean;
+    public adjustColumns(colIndices?: (number)[]|null, force?: boolean|null): boolean;
 
     public adjustAllColumns(): boolean;
 

package/lib/tr-grid-column-fitter/es6/ColumnFitter.js

@@ -757,9 +757,10 @@ ColumnFitterPlugin.prototype._getColumnFitContentWidth = function (colIndex) {
 
     for (var s = 0; s < sectionCount; s++) {
       var section = sections[s];
-      var rowCount = section.getRowCount();
+      var fi = section.getFirstIndexInView();
+      var li = section.getLastIndexInView() + 1;
 
-      for (var r = 0; r < rowCount; r++) {
+      for (var r = fi; r < li; r++) {
         var cell = section.getCell(colIndex, r, false);
 
         if (!cell) {
@@ -827,9 +828,10 @@ ColumnFitterPlugin.prototype._getColumnFitContentText = function (colIndex) {
 
     for (var s = 0; s < sectionCount; s++) {
       var section = sections[s];
-      var rowCount = section.getRowCount();
+      var fi = section.getFirstIndexInView();
+      var li = section.getLastIndexInView() + 1;
 
-      for (var r = 0; r < rowCount; r++) {
+      for (var r = fi; r < li; r++) {
         var cell = section.getCell(colIndex, r, false); // Ignore cell span
 
         if (!cell) {

package/lib/tr-grid-column-selection/es6/ColumnSelection.js

@@ -829,6 +829,9 @@ ColumnSelectionPlugin.prototype._onClick = function (e) {
     return;
   }
 
+  var cIndex = info["colIndex"];
+  var prevSel = this.isSelectedColumn(cIndex);
+
   if (e.button === 2) {
     // Right button
     if (e.type === "click") {
@@ -837,12 +840,11 @@ ColumnSelectionPlugin.prototype._onClick = function (e) {
     } // To allow right clicking at the content for context menu and multi column selection
 
 
-    if (this.isSelectedColumn(info["colIndex"])) {
+    if (prevSel) {
       return;
     }
   }
 
-  var cIndex = info["colIndex"];
   var isNewGridClicked = !this._activeGrid || this._activeGrid !== host;
   var groupId = info["groupId"];
   var childIndices, childCount;
@@ -859,9 +861,9 @@ ColumnSelectionPlugin.prototype._onClick = function (e) {
   }
 
   if (e.ctrlKey || e.metaKey) {
-    if (!groupId && (!this._singleSelMode || this.isSelectedColumn(cIndex))) {
-      this.setSelectedColumn(cIndex, !this.isSelectedColumn(cIndex));
-      this._anchorCol = this.isSelectedColumn(cIndex) ? cIndex : this.getFirstSelectedColumn();
+    if (!groupId && (!this._singleSelMode || prevSel)) {
+      this.setSelectedColumn(cIndex, !prevSel);
+      this._anchorCol = prevSel ? cIndex : this.getFirstSelectedColumn();
     } else {
       var newState = !this._isSelectedColumns(childIndices);
 
@@ -915,6 +917,10 @@ ColumnSelectionPlugin.prototype._onClick = function (e) {
   if (this._anchorCol < 0) {
     this._hasSelection = false;
     this._activeGrid = this._hosts[0] || null; // Maintain selectability even if there is no selection
+  } else {
+    if (this._activeGrid && !prevSel) {
+      this._activeGrid.focus();
+    }
   }
 
   this._dispatchSelectionChanged(e, cIndex);

package/lib/tr-grid-conditional-coloring/es6/ConditionalColoring.js

@@ -1118,6 +1118,9 @@ ConditionalColoringPlugin._fb = null;
 
 /** @private */
 ConditionalColoringPlugin.prototype._requestRowRefresh = function () {
+	if(!this._hasColoring()){
+		return;
+	}
 	for(var i = this._hosts.length; --i >= 0;) {
 		this._hosts[i].requestRowRefresh();
 	}
@@ -1454,6 +1457,21 @@ ConditionalColoringPlugin._stopCleanUpInterval = function() {
 		ConditionalColoringPlugin._cleanUpTimer = 0;
 	}
 };
+/** @private
+ * @return {Boolean}
+*/
+ConditionalColoringPlugin.prototype._hasColoring = function() {
+	var hosts = this._hosts;
+	var grid = hosts[0];
+
+	var colCount = this.getColumnCount();
+	for(var colIndex = 0; colIndex < colCount; colIndex++){
+		if(grid.hasColumnClass(colIndex, "conditionally-colored")){
+			return true;
+		}
+	}
+	return false;
+};
 
 /** @public
 * @description Deprecated:: Should use reloadThemeColors instead

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

@@ -591,17 +591,6 @@ RowSelectionPlugin.prototype._onClick = function (e) {
 		}
 		this._dispatchSelectionChanged(e);
 	}
-	if(this._activeGrid != null){
-		var selectionText;
-		if(this._isIE) {
-			selectionText = document.selection.createRange().htmlText;
-		} else {
-			selectionText = window.getSelection().toString();
-		}
-		if(!selectionText) { // Doesn't select text, tried to focus
-			this._activeGrid.focus();
-		}
-	}
 };
 /** @public
 * @description Select a specified row as if it were clicked by a mouse. This is for testing purpose.
@@ -678,12 +667,13 @@ RowSelectionPlugin.prototype._onMouseDown = function (e) {
 
 	var singleSelection = this._singleSelMode || !this._activeGrid || (this._activeGrid !== host); // New grid is clicked
 	var section = ctx["section"];
+	var prevSel = section.isSelectedRow(rowIndex);
 
 	if (!singleSelection) {
 		if (e.shiftKey) { // Shift + Click: selects every rows start from anchor to clicked point. Anchor point doesn't change.
 			this._selectFromAnchorToTarget(section, rowIndex);
 		} else if ((e.ctrlKey && !isMac) || (isMac && !e.ctrlKey && e.metaKey)) { // Ctrl(windows)/Command(macOS) + Click: additionally selects a row without deselect all others.
-			this._sectionSetSelectedRow(section, rowIndex, !section.isSelectedRow(rowIndex));
+			this._sectionSetSelectedRow(section, rowIndex, !prevSel);
 		} else {
 			singleSelection = true;
 		}
@@ -691,7 +681,7 @@ RowSelectionPlugin.prototype._onMouseDown = function (e) {
 
 	if (singleSelection) { // Click: selects a single row
 		this._anchorSection = section;
-		if (section.isSelectedRow(rowIndex)) { // Click on the selected row
+		if (prevSel) { // Click on the selected row
 			this._setPendingClickIndex(rowIndex, host); // Delay the operation to allow drag and drop operation
 			return;
 		} else { // Perform single click immediately
@@ -707,29 +697,11 @@ RowSelectionPlugin.prototype._onMouseDown = function (e) {
 		}
 	}
 
-	// Native copy event will not be triggered, if there's no text selection.
-	// So we will select text in hiddenInput
-	// we can only use selection.addRange because it not hijack focus of other element
-	// EXCEPT IE11 there is no way to select text without changing focus element
-	var hiddenInput = host.getHiddenInput();
-	if (hiddenInput) {
-		// we cannot set start with hidden input
-		// it will cause error in IE11
-		// So we use hiddenInput parent instead
-		this._textRange.setStart(hiddenInput.parentNode, 0);
-		this._textRange.setEnd(hiddenInput, 0);
-		var selection = window.getSelection();
-		selection.removeAllRanges();
-
-		// THIS WILL CAUSE IE11 FIRE BLUR EVENT AND CHANG FOCUS
-		selection.addRange(this._textRange);
-
-		// Cause in IE11, active element will change when perform text select
-		// so we will make current grid focus again
-		if (this._isIE) {
-			host.getParent().focus();
-		}
+	if(this._activeGrid && !prevSel) {
+		e.preventDefault();
+		this._activeGrid.focus();
 	}
+
 	if(!this._basedOnContent) { // Protect against rowPositionChanged and postBindingSection event
 		this._updateMenuIcon();
 	}

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

@@ -766,6 +766,30 @@ GridPlugin.prototype._activateColumnRenderer = function(colIndex, id, renderer)
 	}
 };
 
+/** @private
+* @function
+*/
+var _emptyFunc = function(){};
+/** @private
+* @type {Object.<string, number>}
+* @constant
+*/
+var KEY_MAP = {
+	"left": 37,
+	"right": 39,
+	"up": 38,
+	"down": 40,
+	"backspace": 8,
+	"tab": 9,
+	"enter": 13,
+	"esc": 27,
+	"escape": 27,
+	"space": 32,
+	"pageup": 33,
+	"pagedown": 34,
+	"del": 46,
+	"delete": 46
+};
 /** @private
 * @param {number=} colIndex
 * @param {number=} rowIndex
@@ -782,6 +806,8 @@ GridPlugin.prototype._mockMouseEvent = function(colIndex, rowIndex, context) {
 	}
 
 	var evt = context ? context : {};
+	evt.preventDefault = _emptyFunc;
+	evt.stopPropagation = _emptyFunc;
 
 	if (colIndex >= 0 && rowIndex >= 0) {
 		var grid = this._activeGrid || this._hosts[0];
@@ -791,15 +817,6 @@ GridPlugin.prototype._mockMouseEvent = function(colIndex, rowIndex, context) {
 
 	return evt;
 };
-
-var keyMap = {
-	"left": 37,
-	"right": 39,
-	"up": 38,
-	"down": 40,
-	"tab": 9
-};
-
 /** @private
 * @param {number|string} keyCode
 * @param {Object=} context
@@ -807,12 +824,12 @@ var keyMap = {
 */
 GridPlugin.prototype._mockKeyboardEvent = function(keyCode, context) {
 	var evt = context ? context : {};
-	evt.preventDefault = function(){};
-	evt.stopPropagation = function(){};
+	evt.preventDefault = _emptyFunc;
+	evt.stopPropagation = _emptyFunc;
 
 	if (typeof keyCode === "string") {
-		keyCode = keyCode.toLowerCase();
-		keyCode = keyMap[keyCode];
+		var predefinedCode = KEY_MAP[keyCode.toLowerCase()] || 0;
+		keyCode = predefinedCode ? predefinedCode : keyCode.charCodeAt(0);
 	}
 	evt.keyCode = keyCode;
 

package/lib/versions.json

@@ -1,20 +1,20 @@
 {
-	"tr-grid-util": "1.3.135",
+	"tr-grid-util": "1.3.136",
 	"tr-grid-printer": "1.0.17",
 	"@grid/column-dragging": "1.0.16",
 	"@grid/row-segmenting": "1.0.30",
 	"@grid/statistics-row": "1.0.16",
 	"@grid/zoom": "1.0.11",
 	"tr-grid-auto-tooltip": "1.1.6",
-	"tr-grid-cell-selection": "1.0.34",
-	"tr-grid-checkbox": "1.0.63",
-	"tr-grid-column-fitter": "1.0.39",
+	"tr-grid-cell-selection": "1.0.35",
+	"tr-grid-checkbox": "1.0.64",
+	"tr-grid-column-fitter": "1.0.40",
 	"tr-grid-column-formatting": "0.9.35",
 	"tr-grid-column-grouping": "1.0.57",
 	"tr-grid-column-resizing": "1.0.28",
-	"tr-grid-column-selection": "1.0.32",
+	"tr-grid-column-selection": "1.0.33",
 	"tr-grid-column-stack": "1.0.74",
-	"tr-grid-conditional-coloring": "1.0.68",
+	"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.37",
@@ -26,10 +26,10 @@
 	"tr-grid-row-dragging": "1.0.31",
 	"tr-grid-row-filtering": "1.0.66",
 	"tr-grid-row-grouping": "1.0.86",
-	"tr-grid-row-selection": "1.0.26",
+	"tr-grid-row-selection": "1.0.27",
 	"tr-grid-rowcoloring": "1.0.25",
 	"tr-grid-textformatting": "1.0.47",
-	"tr-grid-titlewrap": "1.0.20",
+	"tr-grid-titlewrap": "1.0.21",
 	"@grid/formatters": "1.0.51",
 	"@grid/column-selection-dialog": "4.0.56",
 	"@grid/filter-dialog": "4.0.62",

package/package.json

@@ -66,5 +66,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"version": "6.0.81"
+	"version": "6.0.83"
 }