From 3c0c333ac6495b2f81be656f52f305220f4f26e3 Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Fri, 12 Jan 2024 20:08:57 +0800
Subject: [PATCH] :art: https://github.com/siyuan-note/siyuan/issues/10060

---
 app/src/boot/onGetConfig.ts | 4 +---
 app/src/card/openCard.ts    | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/src/boot/onGetConfig.ts b/app/src/boot/onGetConfig.ts
index 5e384cd8c..36be70ac0 100644
--- a/app/src/boot/onGetConfig.ts
+++ b/app/src/boot/onGetConfig.ts
@@ -201,9 +201,7 @@ export const initWindow = async (app: App) => {
     ipcRenderer.send(Constants.SIYUAN_EVENT, "onEvent");
     ipcRenderer.on(Constants.SIYUAN_EVENT, (event, cmd) => {
         if (cmd === "focus") {
-            if (getSelection().rangeCount > 0) {
-                focusByRange(getSelection().getRangeAt(0));
-            }
+            // 由于 https://github.com/siyuan-note/siyuan/issues/10060 和新版 electron 应用切出再切进会保持光标，故移除 focus
             window.siyuan.altIsPressed = false;
             window.siyuan.ctrlIsPressed = false;
             window.siyuan.shiftIsPressed = false;
diff --git a/app/src/card/openCard.ts b/app/src/card/openCard.ts
index cbb8170a7..e5df82cb0 100644
--- a/app/src/card/openCard.ts
+++ b/app/src/card/openCard.ts
@@ -50,9 +50,9 @@ export const genCardHTML = (options: {
         <span class="fn__flex-1 resize__move" style="min-height: 100%"></span>
         <div data-type="count" class="ft__on-surface ft__smaller fn__flex-center${options.cardsData.cards.length === 0 ? " fn__none" : " fn__flex"}">${genCardCount(options.cardsData.unreviewedNewCardCount, options.cardsData.unreviewedOldCardCount)}</span></div>
         <div class="fn__space"></div>
-        <div data-id="${options.id || ""}" data-cardtype="${options.cardType}" data-type="filter" class="block__icon block__icon--show">
+        <button data-id="${options.id || ""}" data-cardtype="${options.cardType}" data-type="filter" class="block__icon block__icon--show">
             <svg><use xlink:href="#iconFilter"></use></svg>
-        </div>
+        </button>
         <div class="fn__space"></div>
         <div data-type="fullscreen" class="b3-tooltips b3-tooltips__sw block__icon block__icon--show" aria-label="${window.siyuan.languages.fullscreen}">
             <svg><use xlink:href="#iconFullscreen"></use></svg>
@@ -484,7 +484,7 @@ export const openCardByData = async (app: App, cardsData: ICardData, cardType: T
     });
     dialog.editor = editor;
     /// #if !MOBILE
-    const focusElement = dialog.element.querySelector(".block__icons") as HTMLElement;
+    const focusElement = dialog.element.querySelector(".block__icons button.block__icon") as HTMLElement;
     focusElement.focus();
     const range = document.createRange();
     range.selectNodeContents(focusElement);