github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-22 03:50:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

🐛 $$

Browse Source
This commit is contained in:
Vanessa 2023-08-16 23:50:24 +08:00
parent 12f56ae084
commit 8a4e4e0128
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/protyle/toolbar/index.ts
View File

@ -1076,7 +1076,10 @@ export class Toolbar {
} }
// 光标定位 // 光标定位
if (getSelection().rangeCount === 0) { // https://ld246.com/article/1665306093005 if (getSelection().rangeCount === 0 ||
// $$ 中间输入后再 ESC 光标无法定位
(getSelection().rangeCount > 0 && hasClosestByClassName(getSelection().getRangeAt(0).startContainer, "protyle-util"))
) { // https://ld246.com/article/1665306093005
if (renderElement.tagName === "SPAN") { if (renderElement.tagName === "SPAN") {
if (inlineLastNode) { if (inlineLastNode) {
if (inlineLastNode.parentElement) { if (inlineLastNode.parentElement) {

5
app/src/protyle/wysiwyg/input.ts
View File

@ -148,15 +148,14 @@ export const input = async (protyle: IProtyle, blockElement: HTMLElement, range:
// 使用 md 闭合后继续输入应为普通文本 // 使用 md 闭合后继续输入应为普通文本
blockElement.outerHTML = html.replace("</span><wbr>", "</span>" + Constants.ZWSP + "<wbr>"); blockElement.outerHTML = html.replace("</span><wbr>", "</span>" + Constants.ZWSP + "<wbr>");
} }
// https://github.com/siyuan-note/siyuan/issues/8972
const mathSize = blockElement.querySelectorAll('[data-type="inline-math"]').length;
protyle.wysiwyg.element.querySelectorAll(`[data-node-id="${id}"]`).forEach((item: HTMLElement) => { protyle.wysiwyg.element.querySelectorAll(`[data-node-id="${id}"]`).forEach((item: HTMLElement) => {
if (item.getAttribute("data-type") === "NodeBlockQueryEmbed" || if (item.getAttribute("data-type") === "NodeBlockQueryEmbed" ||
!hasClosestByAttribute(item, "data-type", "NodeBlockQueryEmbed")) { !hasClosestByAttribute(item, "data-type", "NodeBlockQueryEmbed")) {
blockElement = item; blockElement = item;
} }
}); });
if (mathSize > 0 && mathSize < html.split('<span data-type="inline-math" data-subtype="math"').length - 1) { // https://github.com/siyuan-note/siyuan/issues/8972
if (html.split('<span data-type="inline-math" data-subtype="math"').length > 1) {
Array.from(blockElement.querySelectorAll('[data-type="inline-math"]')).find((item: HTMLElement) => { Array.from(blockElement.querySelectorAll('[data-type="inline-math"]')).find((item: HTMLElement) => {
if (item.dataset.content.indexOf("<wbr>") > -1) { if (item.dataset.content.indexOf("<wbr>") > -1) {
item.setAttribute("data-content", item.dataset.content.replace("<wbr>", "")); item.setAttribute("data-content", item.dataset.content.replace("<wbr>", ""));