0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🐛 fix https://github.com/siyuan-note/siyuan/issues/11118

Browse source
This commit is contained in:
Vanessa 2024-04-23 22:18:00 +08:00
parent 51455b16a8
commit 7e4dcebde2
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/protyle/wysiwyg/input.ts
View file

@ -56,8 +56,8 @@ export const input = async (protyle: IProtyle, blockElement: HTMLElement, range:
if (event && event.inputType === "deleteContentForward") {
const wbrNextElement = hasNextSibling(wbrElement) as HTMLElement;
if (wbrNextElement && wbrNextElement.nodeType === 1 && !wbrNextElement.textContent.startsWith(Constants.ZWSP)) {
const type = wbrNextElement.getAttribute("data-type").split(" ");
if (type.includes("code") || type.includes("kbd") || type.includes("tag")) {
const nextType = (wbrNextElement.getAttribute("data-type") || "").split(" ");
if (nextType.includes("code") || nextType.includes("kbd") || nextType.includes("tag")) {
wbrNextElement.insertAdjacentElement("afterbegin", wbrElement);
}
}

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

@ -774,7 +774,9 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
const position = getSelectionOffset(editElement, protyle.wysiwyg.element, range);
if (event.key === "Delete" || matchHotKey("⌃D", event)) {
// 段末反向删除 https://github.com/siyuan-note/insider/issues/274
if (position.end === editElement.textContent.length) {
if (position.end === editElement.textContent.length ||
// 软换行后删除 https://github.com/siyuan-note/siyuan/issues/11118
(position.end === editElement.textContent.length - 1 && editElement.textContent.endsWith("\n"))) {
const nextElement = getNextBlock(getTopAloneElement(nodeElement));
if (nextElement) {
const nextRange = focusBlock(nextElement);