diff --git a/src/lib/richtextprocessor.ts b/src/lib/richtextprocessor.ts index 9f17705f..242ad1d1 100644 --- a/src/lib/richtextprocessor.ts +++ b/src/lib/richtextprocessor.ts @@ -512,8 +512,8 @@ namespace RichTextProcessor { break; case 'messageEntityEmoji': - html.push(emojiSupported ? // ! contenteditable="false" было у span, зачем? - `${encodeEntities(entityText)}` : + html.push(emojiSupported ? // ! contenteditable="false" нужен для поля ввода, иначе там будет меняться шрифт в Safari + `${encodeEntities(entityText)}` : `${encodeEntities(entityText)}`); break; diff --git a/src/scss/style.scss b/src/scss/style.scss index 32933ba3..29d2fa12 100644 --- a/src/scss/style.scss +++ b/src/scss/style.scss @@ -295,7 +295,7 @@ h4 { } } -input, [contenteditable] { +input, [contenteditable=true] { caret-color: $button-primary-background; } @@ -641,18 +641,18 @@ img.emoji { } } -[contenteditable] { +[contenteditable=true] { user-select: text; outline: none; cursor: text; +} - &[data-placeholder] { - &:empty:before { - content: attr(data-placeholder); - color: #a2acb4; - display: block; /* For Firefox By Ariel Flesler */ - cursor: text; - } +[contenteditable][data-placeholder] { + &:empty:before { + content: attr(data-placeholder); + color: #a2acb4; + display: block; /* For Firefox By Ariel Flesler */ + pointer-events: none; } }