@refinitiv-ui/efx-grid 6.0.81 → 6.0.82

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.82" };

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/versions.json

@@ -12,7 +12,7 @@
 	"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-content-wrap": "1.0.20",

package/package.json

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