Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-06 16:58:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

✨ https://github.com/siyuan-note/siyuan/issues/2911 copy

Browse source
This commit is contained in:
Vanessa 2022-09-16 11:01:05 +08:00
parent 5a4ed2b478
commit ef095fe3d6
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/protyle/hint/index.ts
View file

@ -128,7 +128,7 @@ ${unicode2Emoji(emoji.unicode, true)}</button>`;
const key = this.getKey(currentLineValue, protyle.options.hint.extend);
if (typeof key === "undefined" ||
( // 除emoji 提示外，其余在 tag/inline math/inline-code 内移动不进行提示
( // 除 emoji 提示外，其余在 tag/inline math/inline-code 内移动不进行提示
this.splitChar !== ":" &&
(protyle.toolbar.getCurrentType(range).length > 0 || hasClosestByAttribute(range.startContainer, "data-type", "NodeCodeBlock"))
)

2
app/src/protyle/wysiwyg/enter.ts
View file

@ -285,7 +285,7 @@ export const enter = (blockElement: HTMLElement, range: Range, protyle: IProtyle
}
range.extractContents();
const types = protyle.toolbar.getCurrentType(range);
if (types.includes("inline-code") && range.startContainer.nodeType !== 3) {
if (types.includes("code") && range.startContainer.nodeType !== 3) {
// https://github.com/siyuan-note/siyuan/issues/4169
const brElement = document.createElement("br");
(range.startContainer as HTMLElement).after(brElement);

2
app/src/protyle/wysiwyg/index.ts
View file

@ -218,7 +218,7 @@ export class WYSIWYG {
const tempElement = document.createElement("div");
// https://github.com/siyuan-note/siyuan/issues/5540
const selectTypes = protyle.toolbar.getCurrentType(range);
if ((selectTypes.length === 1 || range.startContainer.parentElement.parentElement.getAttribute("data-type") === "NodeHeading") &&
if ((selectTypes.length > 0 || range.startContainer.parentElement.parentElement.getAttribute("data-type") === "NodeHeading") &&
(
(range.startContainer.nodeType === 3 && range.startContainer.parentElement.textContent === range.toString()) ||
(range.startContainer.nodeType !== 3 && range.startContainer.textContent === range.toString())