Fixed click event without selection to not run action (#440)

* Fixed click event without selection to not run action * fix tests * fix test
future-architect · Feb 7, 2025 · 7e5ce60 · 7e5ce60
1 parent ae1d269
commit 7e5ce60
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 0 deletions.
diff --git a/packages/cheetah-grid/src/js/columns/action/actionBind.ts b/packages/cheetah-grid/src/js/columns/action/actionBind.ts
@@ -63,6 +63,13 @@ export function bindCellClickAction<T>(
       if (!isTarget(e.col, e.row)) {
         return;
       }
+      const sel = grid.selection.select;
+      if (sel.col !== e.col || sel.row !== e.row) {
+        // If the user drags from another element in the grid and then clicks,
+        // this can lead to unexpected behavior because there is no selection event.
+        // A guard avoids this issue.
+        return;
+      }
       if (isPromise(grid.getRowRecord(e.row))) {
         return;
       }

diff --git a/packages/cheetah-grid/src/js/header/action/actionBind.ts b/packages/cheetah-grid/src/js/header/action/actionBind.ts
@@ -31,6 +31,13 @@ export function bindCellClickAction<T>(
       if (!isTarget(e.col, e.row)) {
         return;
       }
+      const sel = grid.selection.select;
+      if (sel.col !== e.col || sel.row !== e.row) {
+        // If the user drags from another element in the grid and then clicks,
+        // this can lead to unexpected behavior because there is no selection event.
+        // A guard avoids this issue.
+        return;
+      }
       action({
         col: e.col,
         row: e.row,

diff --git a/packages/cheetah-grid/src/test/specs/column/style/CheckStyle_spec.js b/packages/cheetah-grid/src/test/specs/column/style/CheckStyle_spec.js
@@ -122,11 +122,17 @@
 		});
 
 		it('toggle', function(done) {
+			grid.selection.select = {col: 0, row: 1};
 			grid.fireListeners(cheetahGrid.ListGrid.EVENT_TYPE.CLICK_CELL, {col: 0, row: 1});
+			grid.selection.select = {col: 1, row: 1};
 			grid.fireListeners(cheetahGrid.ListGrid.EVENT_TYPE.CLICK_CELL, {col: 1, row: 1});
+			grid.selection.select = {col: 2, row: 1};
 			grid.fireListeners(cheetahGrid.ListGrid.EVENT_TYPE.CLICK_CELL, {col: 2, row: 1});
+			grid.selection.select = {col: 3, row: 1};
 			grid.fireListeners(cheetahGrid.ListGrid.EVENT_TYPE.CLICK_CELL, {col: 3, row: 1});
+			grid.selection.select = {col: 4, row: 1};
 			grid.fireListeners(cheetahGrid.ListGrid.EVENT_TYPE.CLICK_CELL, {col: 4, row: 1});
+			grid.selection.select = {col: 0, row: 0};
 
 			expect(records[0]).toEqual({bool: true, str: 'true', onoff: 'on', num: 1, numstr: '01'});
 
@@ -286,11 +292,17 @@
 		it('checkBgColor', function(done) {
 			action.readOnly = false;
 			style.checkBgColor = '#0f0';
+			grid.selection.select = {col: 0, row: 1};
 			grid.fireListeners(cheetahGrid.ListGrid.EVENT_TYPE.CLICK_CELL, {col: 0, row: 1});
+			grid.selection.select = {col: 1, row: 1};
 			grid.fireListeners(cheetahGrid.ListGrid.EVENT_TYPE.CLICK_CELL, {col: 1, row: 1});
+			grid.selection.select = {col: 2, row: 1};
 			grid.fireListeners(cheetahGrid.ListGrid.EVENT_TYPE.CLICK_CELL, {col: 2, row: 1});
+			grid.selection.select = {col: 3, row: 1};
 			grid.fireListeners(cheetahGrid.ListGrid.EVENT_TYPE.CLICK_CELL, {col: 3, row: 1});
+			grid.selection.select = {col: 4, row: 1};
 			grid.fireListeners(cheetahGrid.ListGrid.EVENT_TYPE.CLICK_CELL, {col: 4, row: 1});
+			grid.selection.select = {col: 0, row: 0};
 
 
 			setTimeout(function() {

diff --git a/packages/cheetah-grid/src/test/specs/column/type/CheckColumn_spec.js b/packages/cheetah-grid/src/test/specs/column/type/CheckColumn_spec.js
@@ -116,11 +116,17 @@
 		});
 
 		it('toggle', function(done) {
+			grid.selection.select = {col: 0, row: 1};
 			grid.fireListeners(cheetahGrid.ListGrid.EVENT_TYPE.CLICK_CELL, {col: 0, row: 1});
+			grid.selection.select = {col: 1, row: 1};
 			grid.fireListeners(cheetahGrid.ListGrid.EVENT_TYPE.CLICK_CELL, {col: 1, row: 1});
+			grid.selection.select = {col: 2, row: 1};
 			grid.fireListeners(cheetahGrid.ListGrid.EVENT_TYPE.CLICK_CELL, {col: 2, row: 1});
+			grid.selection.select = {col: 3, row: 1};
 			grid.fireListeners(cheetahGrid.ListGrid.EVENT_TYPE.CLICK_CELL, {col: 3, row: 1});
+			grid.selection.select = {col: 4, row: 1};
 			grid.fireListeners(cheetahGrid.ListGrid.EVENT_TYPE.CLICK_CELL, {col: 4, row: 1});
+			grid.selection.select = {col: 0, row: 0};
 
 			expect(records[0]).toEqual({bool: true, str: 'true', onoff: 'on', num: 1, numstr: '01'});