This commit is contained in:
Vanessa 2023-03-27 11:42:39 +08:00 committed by Liang Ding
parent 24757b72c1
commit 3d1ff6ac16
No known key found for this signature in database
GPG Key ID: 136F30F901A2231D

View File

@ -361,11 +361,8 @@ export const globalShortcut = () => {
const currentType = currentLiElement.getAttribute("data-type") as TDockType;
if (currentType) {
getDockByType(currentType).toggleModel(currentType, true);
const target = event.target as HTMLElement;
if (target.classList.contains("protyle-wysiwyg") ||
target.classList.contains("protyle-title__input") ||
target.tagName === "INPUT" || target.tagName === "TEXTAREA") {
target.blur();
if (document.activeElement) {
(document.activeElement as HTMLElement).blur();
}
} else {
const currentId = currentLiElement.getAttribute("data-id");
@ -613,10 +610,8 @@ export const globalShortcut = () => {
const matchDock = getAllDocks().find(item => {
if (matchHotKey(window.siyuan.config.keymap.general[item.hotkeyLangId].custom, event)) {
getDockByType(item.type).toggleModel(item.type);
if (target.classList.contains("protyle-wysiwyg") ||
target.classList.contains("protyle-title__input") ||
target.tagName === "INPUT" || target.tagName === "TEXTAREA") {
target.blur();
if (document.activeElement) {
(document.activeElement as HTMLElement).blur();
}
event.preventDefault();
return true;
@ -627,23 +622,18 @@ export const globalShortcut = () => {
}
if (matchHotKey(window.siyuan.config.keymap.general.riffCard.custom, event)) {
openCard();
if (target.classList.contains("protyle-wysiwyg") ||
target.tagName === "TABLE" ||
target.classList.contains("protyle-title__input") ||
target.tagName === "INPUT" || target.tagName === "TEXTAREA") {
target.blur();
if (document.activeElement) {
(document.activeElement as HTMLElement).blur();
}
event.preventDefault();
return;
}
if (!isTabWindow && matchHotKey(window.siyuan.config.keymap.general.dailyNote.custom, event)) {
newDailyNote();
if (target.classList.contains("protyle-wysiwyg") ||
target.tagName === "TABLE" ||
target.classList.contains("protyle-title__input") ||
target.tagName === "INPUT" || target.tagName === "TEXTAREA") {
target.blur();
if (document.activeElement) {
(document.activeElement as HTMLElement).blur();
}
event.stopPropagation();
event.preventDefault();
return;
}