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

🎨 https://github.com/siyuan-note/siyuan/issues/12073

Browse source
This commit is contained in:
Vanessa 2024-09-12 22:07:32 +08:00
parent de69e19ab7
commit 9ccb1f173e
2 changed files with 62 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/protyle/gutter/index.ts
View file

@ -989,6 +989,14 @@ export class Gutter {
selectsElement: [nodeElement],
type: "Blocks2Ps",
}));
turnIntoSubmenu.push(this.turnsIntoOne({
icon: "iconQuote",
accelerator: window.siyuan.config.keymap.editor.insert.quote.custom,
label: window.siyuan.languages.quote,
protyle,
selectsElement: [nodeElement],
type: "Blocks2Blockquote"
}));
if (subType !== "h1") {
turnIntoSubmenu.push(this.turnsInto({
icon: "iconH1",
@ -1065,6 +1073,14 @@ export class Gutter {
id,
type: "CancelList"
}));
turnIntoSubmenu.push(this.turnsIntoOne({
icon: "iconQuote",
accelerator: window.siyuan.config.keymap.editor.insert.quote.custom,
label: window.siyuan.languages.quote,
protyle,
selectsElement: [nodeElement],
type: "Blocks2Blockquote"
}));
if (nodeElement.getAttribute("data-subtype") === "o") {
turnIntoSubmenu.push(this.turnsOneInto({
icon: "iconList",

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

@ -1387,45 +1387,58 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
if (isMatchList || isMatchOList || isMatchCheck || isMatchQuote) {
const selectsElement: HTMLElement[] = Array.from(protyle.wysiwyg.element.querySelectorAll(".protyle-wysiwyg--select"));
if (selectsElement.length === 0) {
protyle.hint.splitChar = "/";
protyle.hint.lastIndex = -1;
if (isMatchQuote) {
protyle.hint.fill(">" + Lute.Caret, protyle);
} else {
protyle.hint.fill((isMatchCheck ? "* [ ] " : (isMatchList ? "* " : "1. ")) + Lute.Caret, protyle);
}
} else if (selectsElement.length === 1) {
selectsElement.push(nodeElement);
}
if (selectsElement.length === 1) {
const subType = selectsElement[0].dataset.subtype;
const type = selectsElement[0].dataset.type;
if (type === "NodeParagraph") {
turnsIntoOneTransaction({
protyle,
selectsElement,
type: isMatchQuote ? "Blocks2Blockquote" : (isMatchCheck ? "Blocks2TLs" : (isMatchList ? "Blocks2ULs" : "Blocks2OLs"))
});
} else if (type === "NodeList") {
const id = selectsElement[0].dataset.nodeId;
if (subType === "o" && (isMatchList || isMatchCheck)) {
turnsOneInto({
if (isMatchQuote) {
if (["NodeHeading", "NodeParagraph", "NodeList"].includes(type)) {
turnsIntoOneTransaction({
protyle,
nodeElement: selectsElement[0],
id,
type: isMatchCheck ? "UL2TL" : "OL2UL",
selectsElement,
type: "Blocks2Blockquote"
});
} else if (subType === "t" && (isMatchList || isMatchOList)) {
turnsOneInto({
} else {
protyle.hint.splitChar = "/";
protyle.hint.lastIndex = -1;
protyle.hint.fill(">" + Lute.Caret, protyle);
}
} else {
if (type === "NodeParagraph") {
turnsIntoOneTransaction({
protyle,
nodeElement: selectsElement[0],
id,
type: isMatchList ? "TL2UL" : "TL2OL",
});
} else if (isMatchCheck || isMatchOList) {
turnsOneInto({
protyle,
nodeElement: selectsElement[0],
id,
type: isMatchCheck ? "OL2TL" : "UL2OL",
selectsElement,
type: isMatchCheck ? "Blocks2TLs" : (isMatchList ? "Blocks2ULs" : "Blocks2OLs")
});
} else if (type === "NodeList") {
const id = selectsElement[0].dataset.nodeId;
if (subType === "o" && (isMatchList || isMatchCheck)) {
turnsOneInto({
protyle,
nodeElement: selectsElement[0],
id,
type: isMatchCheck ? "UL2TL" : "OL2UL",
});
} else if (subType === "t" && (isMatchList || isMatchOList)) {
turnsOneInto({
protyle,
nodeElement: selectsElement[0],
id,
type: isMatchList ? "TL2UL" : "TL2OL",
});
} else if (isMatchCheck || isMatchOList) {
turnsOneInto({
protyle,
nodeElement: selectsElement[0],
id,
type: isMatchCheck ? "OL2TL" : "UL2OL",
});
}
} else {
protyle.hint.splitChar = "/";
protyle.hint.lastIndex = -1;
protyle.hint.fill((isMatchCheck ? "* [ ] " : (isMatchList ? "* " : "1. ")) + Lute.Caret, protyle);
}
}
} else {