Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-07 16:04:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 https://github.com/siyuan-note/siyuan/issues/10060

Browse source
This commit is contained in:
Vanessa 2024-01-12 20:08:57 +08:00
parent ace4d5c9e0
commit 3c0c333ac6
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/boot/onGetConfig.ts
View file

@ -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;

6
app/src/card/openCard.ts
View file

@ -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);