From 525071a4ebf741c93d48af69e37afe63f6ccdfc9 Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Wed, 25 Jan 2023 11:42:56 +0800
Subject: [PATCH] :art: https://github.com/siyuan-note/siyuan/issues/3318

---
 app/src/asset/index.ts   | 2 +-
 app/src/asset/pdf/app.js | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/asset/index.ts b/app/src/asset/index.ts
index 8fd03525c..40be2bc72 100644
--- a/app/src/asset/index.ts
+++ b/app/src/asset/index.ts
@@ -241,7 +241,7 @@ export class Asset extends Model {
                 <button id="viewFind" class="toolbarButton b3-tooltips b3-tooltips__s" tabindex="12" aria-expanded="false" aria-controls="findbar" aria-label="${window.siyuan.languages.search}">
                   <svg><use xlink:href="#iconSearch"></use></svg>
                 </button>
-                <button id="rectAnno" class="toolbarButton b3-tooltips b3-tooltips__s" tabindex="12" aria-expanded="false" aria-controls="findbar" aria-label="${window.siyuan.languages.rectAnnotation} ${updateHotkeyTip("⌘/⌥")}">
+                <button id="rectAnno" class="toolbarButton b3-tooltips b3-tooltips__s" tabindex="12" aria-expanded="false" aria-controls="findbar" aria-label="${window.siyuan.languages.rectAnnotation} ${updateHotkeyTip("⌘D")}/${updateHotkeyTip("⌥D")}">
                   <svg><use xlink:href="#iconTopLeft"></use></svg>
                 </button>
                 <button class="toolbarButton pageUp b3-tooltips b3-tooltips__s" aria-label="${window.siyuan.languages.previousLabel}" id="previous" tabindex="13">
diff --git a/app/src/asset/pdf/app.js b/app/src/asset/pdf/app.js
index 9e5b4a272..b9a7bb97e 100644
--- a/app/src/asset/pdf/app.js
+++ b/app/src/asset/pdf/app.js
@@ -2962,7 +2962,7 @@ function webViewerKeyUp (evt) {
   if (pdfInstance.overlayManager.active) {
     return
   }
-  if (pdfInstance.appConfig.toolbar.rectAnno.classList.contains('toggled')) {
+  if (evt.keyCode === 68 && pdfInstance.appConfig.toolbar.rectAnno.classList.contains('toggled')) {
     pdfInstance.appConfig.toolbar.rectAnno.dispatchEvent(
       new MouseEvent('click'))
   }
@@ -2987,10 +2987,12 @@ function webViewerKeyDown (evt) {
     (evt.shiftKey ? 4 : 0) |
     (evt.metaKey ? 8 : 0)
 
-  if ((cmd === 8 || cmd === 1 || cmd === 2) &&
+  if (!evt.repeat && (cmd === 8 || cmd === 1 || cmd === 2) && evt.keyCode === 68 &&  // D
     !pdfInstance.appConfig.toolbar.rectAnno.classList.contains('toggled')) {
     pdfInstance.appConfig.toolbar.rectAnno.dispatchEvent(
       new MouseEvent('click'))
+    evt.preventDefault()
+    return
   }
 
   // First, handle the key bindings that are independent whether an input