fix: code review copilot

Author: Gabriel Morador

src/annotator/draw-tool.tsx

@@ -105,7 +105,7 @@ export class DrawTool implements Destroyable {
   /** Increment for keyboard movement (pixels) */
   private readonly _keyboardMoveIncrement = 10;
 
-  /** Increment for keyboard movement with Ctrl (Windows) or Cmd (Mac) (pixels) */
+  /** Increment for keyboard movement with Ctrl or Cmd (pixels) */
   private readonly _keyboardMoveIncrementLarge = 50;
 
   /** Default size for rectangle when initialized via keyboard (pixels) */
@@ -290,6 +290,8 @@ export class DrawTool implements Destroyable {
         this._waitingForSecondClick = false;
         this._firstClickPoint = undefined;
         this._hasMoved = false;
+        // Deactivate keyboard mode since user is switching to mouse interaction
+        this._deactivateKeyboardMode();
         this._renderSurface();
         return;
       }
@@ -458,7 +460,7 @@ export class DrawTool implements Destroyable {
           return;
         }
 
-        // Arrow keys: Move or resize. Fast movement: Ctrl (Windows) or Cmd (Mac)
+        // Arrow keys: Move or resize. Fast movement: Ctrl or Cmd
         if (
           ['ArrowUp', 'ArrowDown', 'ArrowLeft', 'ArrowRight'].includes(e.key)
         ) {

src/annotator/guest.ts

@@ -537,6 +537,12 @@ export class Guest
 
     this._hostRPC.on('createAnnotation', ({ tool }) => {
       if (tool) {
+        // When creating rect annotation via sidebar (mouse click), default to 'move'
+        // mode so the rectangle appears on canvas. Keyboard shortcuts set
+        // _pendingKeyboardMode themselves before calling createAnnotation.
+        if (tool === 'rect' && this._pendingKeyboardMode === undefined) {
+          this._pendingKeyboardMode = 'move';
+        }
         return this.createAnnotation(tool);
       } else {
         this._drawTool.cancel();
@@ -1045,12 +1051,8 @@ export class Guest
         this._hostRPC.call('activeToolChanged', tool);
 
         // Draw the shape for the new annotation's region.
-        // Pass pending keyboard mode if set (from hotkey). For rect, default to
-        // 'move' so the rectangle appears on canvas when started via mouse (sidebar icon).
-        const initialMode =
-          tool === 'rect'
-            ? (this._pendingKeyboardMode ?? 'move')
-            : this._pendingKeyboardMode;
+        // Pass pending keyboard mode if set (from hotkey or sidebar click).
+        const initialMode = this._pendingKeyboardMode;
         this._pendingKeyboardMode = undefined;
         const shape = await this._drawTool.draw(tool, initialMode);
 

src/annotator/test/draw-tool-test.js

@@ -1101,14 +1101,17 @@ describe('DrawTool', () => {
       assert.equal(shape.type, 'rect');
     });
 
-    it('clears keyboard-initiated rectangle on first mouse move', async () => {
+    it('clears keyboard-initiated rectangle on first mouse move and deactivates keyboard mode', async () => {
       const shapePromise = tool.draw('rect', 'move');
       await delay(0);
 
       // Verify rectangle was created and marked as keyboard-initiated
       assert.ok(tool._shape);
       assert.equal(tool._shape.type, 'rect');
       assert.isTrue(tool._rectInitiatedByKeyboard);
+      // Verify keyboard mode is active
+      const initialState = tool.getKeyboardModeState();
+      assert.isTrue(initialState.keyboardActive);
 
       // Simulate mouse move - should clear the keyboard-initiated rectangle
       sendPointerEvent('pointermove', 50, 50);
@@ -1120,6 +1123,10 @@ describe('DrawTool', () => {
       assert.isFalse(tool._waitingForSecondClick);
       assert.isUndefined(tool._firstClickPoint);
       assert.isFalse(tool._hasMoved);
+      // Verify keyboard mode was deactivated
+      const stateAfterMove = tool.getKeyboardModeState();
+      assert.isFalse(stateAfterMove.keyboardActive);
+      assert.isNull(stateAfterMove.keyboardMode);
 
       // Now user can draw with mouse - simulate click to create new rectangle
       sendPointerEvent('pointerdown', 10, 10);