Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-20 08:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 1 https://github.com/siyuan-note/siyuan/issues/5382

Browse source
This commit is contained in:
Vanessa 2022-07-09 16:47:02 +08:00
parent f788aa96e2
commit 3ae4585c0c
1 changed files with 26 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

49
app/src/protyle/wysiwyg/keydown.ts
View file

@ -285,18 +285,19 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
if (selectElements.length > 0) { if (selectElements.length > 0) {
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();
} } else {
const start = getSelectionOffset(nodeElement, editorElement, range).start; const start = getSelectionOffset(nodeElement, editorElement, range).start;
if (start !== 0) { if (start !== 0) {
const editElement = getContenteditableElement(nodeElement); const editElement = getContenteditableElement(nodeElement);
const firstIndex = editElement.textContent.indexOf("\n"); const firstIndex = editElement.textContent.indexOf("\n");
if (firstIndex === -1 || start < firstIndex || start === editElement.textContent.replace("\n", " ").indexOf("\n")) { if (firstIndex === -1 || start < firstIndex || start === editElement.textContent.replace("\n", " ").indexOf("\n")) {
setFirstNodeRange(editElement, range); setFirstNodeRange(editElement, range);
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();
return; return;
} else { } else {
return; return;
}
} }
} }
range.collapse(true); range.collapse(true);
@ -332,17 +333,18 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
if (selectElements.length > 0) { if (selectElements.length > 0) {
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();
} } else {
const editElement = getContenteditableElement(nodeElement); const editElement = getContenteditableElement(nodeElement);
const end = getSelectionOffset(nodeElement, editorElement, range).end; const end = getSelectionOffset(nodeElement, editorElement, range).end;
if (end < editElement.textContent.length) { if (end < editElement.textContent.length) {
if (end > editElement.textContent.lastIndexOf("\n")) { if (end > editElement.textContent.lastIndexOf("\n")) {
setLastNodeRange(editElement, range, false); setLastNodeRange(editElement, range, false);
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();
return; return;
} else { } else {
return; return;
}
} }
} }
range.collapse(false); range.collapse(false);
@ -985,6 +987,7 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
protyle.wysiwyg.element.querySelectorAll(".protyle-wysiwyg--select").forEach(item => { protyle.wysiwyg.element.querySelectorAll(".protyle-wysiwyg--select").forEach(item => {
item.classList.remove("protyle-wysiwyg--select"); item.classList.remove("protyle-wysiwyg--select");
}); });
range.collapse(false);
nodeElement.classList.add("protyle-wysiwyg--select"); nodeElement.classList.add("protyle-wysiwyg--select");
countBlockWord([nodeElement.getAttribute("data-node-id")]); countBlockWord([nodeElement.getAttribute("data-node-id")]);
} }