From ff56016d722a0e1d65c411e6cb3102b354474852 Mon Sep 17 00:00:00 2001
From: fullex <106392080+0xfullex@users.noreply.github.com>
Date: Thu, 5 Jun 2025 19:05:17 +0800
Subject: [PATCH] fix(SelectionAssistant): ignore CtrlKey mode when ctrl+click
 (#6843)

fix(SelectionService): add mouse-down listener for multi-selection in ctrlkey mode
---
 src/main/services/SelectionService.ts | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/services/SelectionService.ts b/src/main/services/SelectionService.ts
index f785683b5a..ea5bede2d8 100644
--- a/src/main/services/SelectionService.ts
+++ b/src/main/services/SelectionService.ts
@@ -841,8 +841,9 @@ export class SelectionService {
     //ctrlkey pressed
     if (this.lastCtrlkeyDownTime === 0) {
       this.lastCtrlkeyDownTime = Date.now()
-      //add the mouse-wheel listener, detect if user is zooming in/out
+      //add the mouse-wheel&mouse-down listener, detect if user is zooming in/out or multi-selecting
       this.selectionHook!.on('mouse-wheel', this.handleMouseWheelCtrlkeyMode)
+      this.selectionHook!.on('mouse-down', this.handleMouseDownCtrlkeyMode)
       return
     }
 
@@ -866,8 +867,9 @@ export class SelectionService {
    */
   private handleKeyUpCtrlkeyMode = (data: KeyboardEventData) => {
     if (!this.isCtrlkey(data.vkCode)) return
-    //remove the mouse-wheel listener
+    //remove the mouse-wheel&mouse-down listener
     this.selectionHook!.off('mouse-wheel', this.handleMouseWheelCtrlkeyMode)
+    this.selectionHook!.off('mouse-down', this.handleMouseDownCtrlkeyMode)
     this.lastCtrlkeyDownTime = 0
   }
 
@@ -880,6 +882,15 @@ export class SelectionService {
     this.lastCtrlkeyDownTime = -1
   }
 
+  /**
+   * Handle mouse down events in ctrlkey trigger mode
+   * ignore CtrlKey pressing when mouse down is used
+   * because user is multi-selecting
+   */
+  private handleMouseDownCtrlkeyMode = () => {
+    this.lastCtrlkeyDownTime = -1
+  }
+
   //check if the key is ctrl key
   private isCtrlkey(vkCode: number) {
     return vkCode === 162 || vkCode === 163