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

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

Browse source
This commit is contained in:
Vanessa 2022-10-25 10:53:33 +08:00
parent 2ffc8f9a40
commit 5f1f636f39
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/config/search.ts
View file

@ -72,7 +72,8 @@ export const initConfigSearch = (element: HTMLElement) => {
"dataRepoKeyTip1", "dataRepoKeyTip2", "slogan", "currentVer", "checkUpdate", "updatePath", "systemLog",
"importKey", "genKey", "genKeyByPW", "copyKey", "resetRepo", "systemLogTip", "export", "visitAnnouncements",
"safeQuit", "directConnection", "siyuanNote", "key", "password", "copied", "resetRepoTip",
"autoDownloadUpdatePkg", "autoDownloadUpdatePkgTip", "networkProxy", "keyPlaceholder", "initRepoKeyTip"]),
"autoDownloadUpdatePkg", "autoDownloadUpdatePkgTip", "networkProxy", "keyPlaceholder", "initRepoKeyTip",
"useFixedPort", "useFixedPortTip"]),
];
const inputElement = element.querySelector(".b3-form__icon input") as HTMLInputElement;
if (window.siyuan.config.system.container !== "ios") {

18
app/src/protyle/wysiwyg/getBlock.ts
View file

@ -1,4 +1,5 @@
import {hasClosestBlock, hasClosestByAttribute} from "../util/hasClosest";
import {Constants} from "../../constants";
export const getPreviousHeading = (element: Element) => {
let previous = getPreviousBlock(element);
@ -68,7 +69,7 @@ export const getNextBlock = (element: Element) => {
export const getNoContainerElement = (element: Element) => {
let childElement = element;
while (childElement) {
if (childElement.classList.contains("list") || childElement.classList.contains("li")|| childElement.classList.contains("bq")|| childElement.classList.contains("sb")) {
if (childElement.classList.contains("list") || childElement.classList.contains("li") || childElement.classList.contains("bq") || childElement.classList.contains("sb")) {
childElement = childElement.querySelector("[data-node-id]");
} else {
return childElement;
@ -94,11 +95,18 @@ export const getTopEmptyElement = (element: Element) => {
while (topElement.parentElement && !topElement.parentElement.classList.contains("protyle-wysiwyg")) {
if (!topElement.parentElement.getAttribute("data-node-id")) {
topElement = topElement.parentElement;
} else if (getContenteditableElement(topElement.parentElement).textContent !== "" ||
topElement.previousElementSibling?.getAttribute("data-node-id")) {
break;
} else {
topElement = topElement.parentElement;
const hasText = Array.from(topElement.parentElement.querySelectorAll('[contenteditable="true"]')).find(item => {
if (item.textContent.replace(Constants.ZWSP, "").replace("\n", "") !== "") {
return true;
}
});
if (!hasText || topElement.previousElementSibling?.getAttribute("data-node-id") ||
topElement.nextElementSibling?.getAttribute("data-node-id")) {
break;
} else {
topElement = topElement.parentElement;
}
}
}
return topElement;