diff --git a/app/src/assets/scss/component/_menu.scss b/app/src/assets/scss/component/_menu.scss index 097c50a23..057bdb08c 100644 --- a/app/src/assets/scss/component/_menu.scss +++ b/app/src/assets/scss/component/_menu.scss @@ -361,6 +361,9 @@ line-height: 28px; transition: var(--b3-list-hover); font-size: 16px; + background-color: transparent; + border: 0; + padding: 0; &:hover { background-color: var(--b3-theme-surface-lighter); diff --git a/app/src/assets/scss/mobile.scss b/app/src/assets/scss/mobile.scss index 5def066b8..05f90f36f 100644 --- a/app/src/assets/scss/mobile.scss +++ b/app/src/assets/scss/mobile.scss @@ -464,14 +464,13 @@ } } -html .protyle-wysiwyg [spellcheck][contenteditable="true"]:empty:before { +html .protyle-wysiwyg [data-node-id]:last-child [spellcheck][contenteditable="true"]:empty:before { content: "Enter text"; color: var(--b3-theme-on-surface-light); } -html[lang="zh_CN"] .protyle-wysiwyg [spellcheck][contenteditable="true"]:empty:before { +html[lang="zh_CN"] .protyle-wysiwyg [data-node-id]:last-child [spellcheck][contenteditable="true"]:empty:before { content: "键入文字"; - color: var(--b3-theme-on-surface-light); } diff --git a/app/src/protyle/hint/index.ts b/app/src/protyle/hint/index.ts index ac38cb26d..c3f5098b1 100644 --- a/app/src/protyle/hint/index.ts +++ b/app/src/protyle/hint/index.ts @@ -56,7 +56,7 @@ export class Hint { return; } const btnElement = hasClosestByMatchTag(eventTarget, "BUTTON"); - if (btnElement && !btnElement.classList.contains("emojis__item")) { + if (btnElement && !btnElement.classList.contains("emojis__item") && !btnElement.classList.contains("emojis__type")) { if (btnElement.parentElement.classList.contains("b3-list")) { this.fill(decodeURIComponent(btnElement.getAttribute("data-value")), protyle, true, isCtrl(event)); } else { @@ -102,6 +102,9 @@ ${unicode2Emoji(emoji.unicode)}`; const range = getSelection().getRangeAt(0); if (range.endContainer.nodeType !== 3) { range.endContainer.childNodes[range.endOffset - 1]?.remove(); + } else if (range.endContainer.textContent === ":") { + // iphone + range.endContainer.textContent = ""; } addEmoji(unicode); let emoji; @@ -110,7 +113,7 @@ ${unicode2Emoji(emoji.unicode)}`; } else { emoji = unicode2Emoji(unicode) + " "; } - insertHTML(protyle.lute.SpinBlockDOM(emoji), protyle); + insertHTML(protyle.lute.SpinBlockDOM(emoji), protyle, false, true); this.element.classList.add("fn__none"); } else { this.fill(unicode, protyle); @@ -389,16 +392,16 @@ ${unicode2Emoji(emoji.unicode)}`; this.element.innerHTML = `