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

🎨 fix https://github.com/siyuan-note/insider/issues/1049

Browse source
This commit is contained in:
Vanessa 2022-09-19 11:54:29 +08:00
parent 8920697029
commit 0ebafadd43
1 changed files with 23 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

24
app/src/protyle/toolbar/index.ts
View file

@ -423,6 +423,28 @@ export class Toolbar {
} else {
let types = (item.getAttribute("data-type") || "").split(" ");
types.push(type);
// 上标和下标不能同时存在 https://github.com/siyuan-note/insider/issues/1049
if (type === "sub" && types.includes("sup")) {
types.find((item, index) => {
if (item === "sup") {
types.splice(index, 1)
if (!this.element.classList.contains("fn__none")) {
this.element.querySelector(`[data-type="sup"]`).classList.remove("protyle-toolbar__item--current");
}
return true;
}
})
} else if (type === "sup" && types.includes("sub")) {
types.find((item, index) => {
if (item === "sub") {
types.splice(index, 1)
if (!this.element.classList.contains("fn__none")) {
this.element.querySelector(`[data-type="sub"]`).classList.remove("protyle-toolbar__item--current");
}
return true;
}
})
}
types = [...new Set(types)];
if (index === 0 && previousElement && previousElement.nodeType !== 3 &&
isArrayEqual(types, previousElement.getAttribute("data-type").split(" ")) &&
@ -508,7 +530,7 @@ export class Toolbar {
} else if (lastNewNode.nodeType === 3) {
this.range.setEnd(lastNewNode, lastNewNode.textContent.length);
if (lastNewNode.textContent === Constants.ZWSP) {
// https://github.com/siyuan-note/insider/issues/1056
// 粗体后取消粗体光标不存在 https://github.com/siyuan-note/insider/issues/1056
this.range.collapse(false);
}
} else {