This commit is contained in:
Vanessa 2024-11-26 01:00:23 +08:00
parent 23ee2027a0
commit 11fd8f2c44
5 changed files with 14 additions and 13 deletions

View file

@ -337,8 +337,8 @@ export class BlockPanel {
this.element.querySelector(".block__content").addEventListener("scroll", () => {
this.editors.forEach(item => {
hideElements(["gutter"], item.protyle)
})
})
hideElements(["gutter"], item.protyle);
});
});
}
}

View file

@ -737,7 +737,7 @@ export class Files extends Model {
}
private updateDocInfo(data: IWebSocketData) {
const liElement = this.element.querySelector(`li[data-node-id="${data.data.rootID}"]`)
const liElement = this.element.querySelector(`li[data-node-id="${data.data.rootID}"]`);
if (liElement) {
liElement.setAttribute("data-count", data.data.subFileCount);
liElement.querySelector(".ariaLabel")?.setAttribute("aria-label", this.genDocAriaLabel(data.data, escapeGreat));

View file

@ -148,7 +148,7 @@ export const isInIOS = () => {
export const isInHarmony = () => {
return window.siyuan.config.system.container === "harmony" && window.JSHarmony;
}
};
// MacWindows 快捷键展示
export const updateHotkeyTip = (hotkey: string) => {

View file

@ -65,7 +65,7 @@ import {openGlobalSearch} from "../../search/util";
import {popSearch} from "../../mobile/menu/search";
/// #endif
import {BlockPanel} from "../../block/Panel";
import {isInIOS, isOnlyMeta, readText} from "../util/compatibility";
import {isInIOS, isMac, isOnlyMeta, readText} from "../util/compatibility";
import {MenuItem} from "../../menus/Menu";
import {fetchPost} from "../../util/fetch";
import {onGet} from "../util/onGet";
@ -2007,7 +2007,8 @@ export class WYSIWYG {
// 输入法测试点 https://github.com/siyuan-note/siyuan/issues/3027
let isComposition = false; // for iPhone
this.element.addEventListener("compositionstart", (event) => {isComposition = true;
this.element.addEventListener("compositionstart", (event) => {
isComposition = true;
event.stopPropagation();
});
@ -2086,7 +2087,7 @@ export class WYSIWYG {
!event.ctrlKey && !event.shiftKey && !event.metaKey && !event.altKey &&
!/^F\d{1,2}$/.test(event.key)) {
// 搜狗输入法不走 keydown需重新记录历史状态
if ( nodeElement &&
if (!isMac() && nodeElement &&
(typeof protyle.wysiwyg.lastHTMLs[nodeElement.getAttribute("data-node-id")] === "undefined" || range.toString() !== "" || !this.preventKeyup)) {
range.insertNode(document.createElement("wbr"));
protyle.wysiwyg.lastHTMLs[nodeElement.getAttribute("data-node-id")] = nodeElement.outerHTML;

View file

@ -174,7 +174,7 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
nodeElement.querySelector("wbr").remove();
// 光标位于引用结尾后 ctrl+b 偶尔会失效
range = cloneRange;
focusByRange(cloneRange)
focusByRange(cloneRange);
protyle.toolbar.range = cloneRange;
protyle.wysiwyg.preventKeyup = true;
}