" : "");
- focusByWbr(nodeElement, this.range);
- } else {
- currentTypes.find((typeItem, index) => {
- if (typeItem === "inline-memo") {
- currentTypes.splice(index, 1);
- return true;
- }
- });
- item.setAttribute("data-type", currentTypes.join(" "));
- item.removeAttribute("data-inline-memo-content");
- }
- } else {
- item.setAttribute("data-inline-memo-content", Lute.EscapeHTMLStr(target.value));
- }
+ inlineMemoElements.forEach((item) => {
+ item.setAttribute("data-inline-memo-content", Lute.EscapeHTMLStr(textElement.value));
});
- } else if (type === "NodeBlockQueryEmbed") {
- blockRender(protyle, renderElement);
+ } else {
+ renderElement.setAttribute("data-content", Lute.EscapeHTMLStr(textElement.value));
+ renderElement.removeAttribute("data-render");
}
- if (this.range) {
- focusByRange(this.range);
- }
- if (type === "inline-math") {
- // 行内数学公式不允许换行 https://github.com/siyuan-note/siyuan/issues/2187
- renderElement.setAttribute("data-content", renderElement.getAttribute("data-content").replace(/\n/g, ""));
- }
- nodeElement.setAttribute("updated", dayjs().format("YYYYMMDDHHmmss"));
- const newHTML = protyle.lute.SpinBlockDOM(nodeElement.outerHTML);
- // HTML 块中包含多个 时只能保存第一个 https://github.com/siyuan-note/siyuan/issues/5732
- if (type === "NodeHTMLBlock") {
- const tempElement = document.createElement("template");
- tempElement.innerHTML = newHTML;
- if (tempElement.content.childElementCount > 1) {
- showMessage(window.siyuan.languages.htmlBlockTip);
- }
- }
- updateTransaction(protyle, id, newHTML, html);
- html = newHTML;
- if (isInlineMemo && !target.value) {
- this.subElement.classList.add("fn__none");
+ if (!types.includes("NodeBlockQueryEmbed") || !types.includes("NodeHTMLBlock") || !isInlineMemo) {
+ processRender(renderElement);
}
event.stopPropagation();
});
@@ -924,18 +861,8 @@ export class Toolbar {
return;
}
if (event.key === "Escape" || matchHotKey("⌘↩", event)) {
- this.subElement.classList.add("fn__none");
this.subElement.querySelector('[data-type="pin"]').classList.remove("block__icon--active");
- if (renderElement.tagName === "SPAN") {
- if (type === "inline-memo" && !textElement.value) {
- renderElement.outerHTML = renderElement.innerHTML + "";
- focusByWbr(nodeElement, this.range);
- } else {
- focusByRange(this.range);
- }
- } else {
- focusSideBlock(renderElement);
- }
+ hideElements(["util"], protyle);
} else if (event.key === "Tab") {
// https://github.com/siyuan-note/siyuan/issues/5270
document.execCommand("insertText", false, "\t");
@@ -944,8 +871,71 @@ export class Toolbar {
return;
}
});
-
this.subElement.classList.remove("fn__none");
+ this.subElementCloseCB = () => {
+ if (!renderElement.parentElement) {
+ return;
+ }
+ if (types.includes("NodeHTMLBlock")) {
+ renderElement.querySelector("protyle-html").setAttribute("data-content", Lute.EscapeHTMLStr(textElement.value));
+ } else if (isInlineMemo) {
+ let inlineMemoElements;
+ if (updateElements) {
+ inlineMemoElements = updateElements;
+ } else {
+ inlineMemoElements = [renderElement];
+ }
+ inlineMemoElements.forEach((item, index) => {
+ if (!textElement.value) {
+ // https://github.com/siyuan-note/insider/issues/1046
+ const currentTypes = item.getAttribute("data-type").split(" ");
+ if (currentTypes.length === 1 && currentTypes[0] === "inline-memo") {
+ item.outerHTML = item.innerHTML;
+ } else {
+ currentTypes.find((typeItem, index) => {
+ if (typeItem === "inline-memo") {
+ currentTypes.splice(index, 1);
+ return true;
+ }
+ });
+ item.setAttribute("data-type", currentTypes.join(" "));
+ item.removeAttribute("data-inline-memo-content");
+ }
+ } else {
+ item.setAttribute("data-inline-memo-content", Lute.EscapeHTMLStr(textElement.value));
+ }
+ });
+ } else {
+ renderElement.setAttribute("data-content", Lute.EscapeHTMLStr(textElement.value));
+ renderElement.removeAttribute("data-render");
+ if (types.includes("NodeBlockQueryEmbed")) {
+ blockRender(protyle, renderElement);
+ } else {
+ processRender(renderElement);
+ }
+ }
+
+ if (renderElement.tagName === "SPAN") {
+ focusByRange(this.range);
+ } else {
+ focusSideBlock(renderElement);
+ }
+ if (types.includes("inline-math")) {
+ // 行内数学公式不允许换行 https://github.com/siyuan-note/siyuan/issues/2187
+ renderElement.setAttribute("data-content", renderElement.getAttribute("data-content").replace(/\n/g, ""));
+ }
+ nodeElement.setAttribute("updated", dayjs().format("YYYYMMDDHHmmss"));
+ const newHTML = protyle.lute.SpinBlockDOM(nodeElement.outerHTML);
+ // HTML 块中包含多个 时只能保存第一个 https://github.com/siyuan-note/siyuan/issues/5732
+ if (types.includes("NodeHTMLBlock")) {
+ const tempElement = document.createElement("template");
+ tempElement.innerHTML = newHTML;
+ if (tempElement.content.childElementCount > 1) {
+ showMessage(window.siyuan.languages.htmlBlockTip);
+ }
+ }
+ updateTransaction(protyle, id, newHTML, html);
+ }
const nodeRect = renderElement.getBoundingClientRect();
this.element.classList.add("fn__none");
if (isPin) {
@@ -1069,6 +1059,7 @@ export class Toolbar {
}
});
this.subElement.classList.remove("fn__none");
+ this.subElementCloseCB = undefined;
const nodeRect = languageElement.getBoundingClientRect();
setPosition(this.subElement, nodeRect.left, nodeRect.bottom, nodeRect.height);
this.element.classList.add("fn__none");
@@ -1161,6 +1152,7 @@ export class Toolbar {
});
const rangePosition = getSelectionPosition(nodeElement, range);
this.subElement.classList.remove("fn__none");
+ this.subElementCloseCB = undefined;
setPosition(this.subElement, rangePosition.left, rangePosition.top + 18, Constants.SIZE_TOOLBAR_HEIGHT);
this.element.classList.add("fn__none");
inputElement.select();
@@ -1220,6 +1212,7 @@ export class Toolbar {
});
const rangePosition = getSelectionPosition(nodeElement, range);
this.subElement.classList.remove("fn__none");
+ this.subElementCloseCB = undefined;
setPosition(this.subElement, rangePosition.left, rangePosition.top + 18, Constants.SIZE_TOOLBAR_HEIGHT);
this.element.classList.add("fn__none");
inputElement.select();
@@ -1314,6 +1307,7 @@ export class Toolbar {
});
const rangePosition = getSelectionPosition(nodeElement, range);
this.subElement.classList.remove("fn__none");
+ this.subElementCloseCB = undefined;
setPosition(this.subElement, rangePosition.left, rangePosition.top + 18, Constants.SIZE_TOOLBAR_HEIGHT);
this.element.classList.add("fn__none");
inputElement.select();
@@ -1384,6 +1378,7 @@ export class Toolbar {
});
const rangePosition = getSelectionPosition(nodeElements[0], range);
this.subElement.classList.remove("fn__none");
+ this.subElementCloseCB = undefined;
setPosition(this.subElement, rangePosition.left, rangePosition.top + 18, Constants.SIZE_TOOLBAR_HEIGHT);
this.element.classList.add("fn__none");
inputElement.select();
diff --git a/app/src/protyle/ui/hideElements.ts b/app/src/protyle/ui/hideElements.ts
index 23e2eaade..2a6a2cf2a 100644
--- a/app/src/protyle/ui/hideElements.ts
+++ b/app/src/protyle/ui/hideElements.ts
@@ -1,5 +1,5 @@
// "gutter", "toolbar", "select", "hint", "util", "dialog"
-export const hideElements = (panels: string[], protyle?: IProtyle) => {
+export const hideElements = (panels: string[], protyle?: IProtyle, focusHide = false) => {
if (!protyle) {
if (panels.includes("dialog")) {
for (let i = 0; i < window.siyuan.dialogs.length; i++) {
@@ -27,8 +27,12 @@ export const hideElements = (panels: string[], protyle?: IProtyle) => {
}
if (protyle.toolbar && panels.includes("util")) {
const pinElement = protyle.toolbar.subElement.querySelector('[data-type="pin"]');
- if (!pinElement || (pinElement && !pinElement.classList.contains("block__icon--active"))) {
+ if (focusHide || !pinElement || (pinElement && !pinElement.classList.contains("block__icon--active"))) {
protyle.toolbar.subElement.classList.add("fn__none");
+ if (protyle.toolbar.subElementCloseCB) {
+ protyle.toolbar.subElementCloseCB();
+ protyle.toolbar.subElementCloseCB = undefined;
+ }
}
}
if (panels.includes("select")) {
diff --git a/app/src/protyle/wysiwyg/input.ts b/app/src/protyle/wysiwyg/input.ts
index 62d0ab00a..f75e7923e 100644
--- a/app/src/protyle/wysiwyg/input.ts
+++ b/app/src/protyle/wysiwyg/input.ts
@@ -126,7 +126,7 @@ export const input = async (protyle: IProtyle, blockElement: HTMLElement, range:
html = protyle.lute.SpinBlockDOM(html);
}
// 在数学公式输入框中撤销到最后一步，再继续撤销会撤销编辑器正文内容，从而出发 input 事件
- protyle.toolbar.subElement.classList.add("fn__none");
+ hideElements(["util"], protyle, true);
const tempElement = document.createElement("template");
tempElement.innerHTML = html;