UX: makes smile the default emoji-picker icon ()

discourse-emojis is used in chat only for message actions to show a
difference with the the other emojis so people don't think it's just the
smiley emoji.
This commit is contained in:
Joffrey JAFFEUX 2025-01-17 12:29:18 +01:00 committed by GitHub
parent 359bbbe617
commit f8d5a7873a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 9 additions and 9 deletions
app/assets/javascripts/discourse
app
components
instance-initializers
tests/acceptance
plugins/chat/assets/javascripts/discourse/initializers

View File

@ -14,7 +14,7 @@ export default class EmojiPicker extends Component {
}
get icon() {
return this.args.icon ?? "discourse-emojis";
return this.args.icon ?? "face-smile";
}
get context() {
@ -38,10 +38,10 @@ export default class EmojiPicker extends Component {
@onClose={{@onClose}}
>
<:trigger>
{{#if @icon}}
{{replaceEmoji (concat ":" @icon ":")}}
{{#if @emoji}}
{{replaceEmoji (concat ":" @emoji ":")}}
{{else}}
{{icon "discourse-emojis"}}
{{icon this.icon}}
{{/if}}
{{#if @label}}

View File

@ -46,7 +46,7 @@ export default class UserStatusPicker extends Component {
}}
>
<EmojiPicker
@icon={{@status.emoji}}
@emoji={{@status.emoji}}
@didSelectEmoji={{this.emojiSelected}}
@btnClass="btn-emoji"
@modalForMobile={{false}}

View File

@ -16,7 +16,7 @@ export default {
toolbar.addButton({
id: "emoji",
group: "extras",
icon: "discourse-emojis",
icon: "face-smile",
sendAction: () => {
const menu = api.container.lookup("service:menu");
menu.show(document.querySelector(".insert-composer-emoji"), {

View File

@ -112,7 +112,7 @@ acceptance("User Status", function (needs) {
await visit("/");
await openUserStatusModal();
assert.dom(".d-icon-discourse-emojis").exists("empty status icon is shown");
assert.dom(".d-icon-face-smile").exists("empty status icon is shown");
await pickEmoji(userStatusEmoji);
@ -305,7 +305,7 @@ acceptance("User Status", function (needs) {
await click(".btn.delete-status");
await openUserStatusModal();
assert.dom(".d-icon-discourse-emojis").exists("empty status icon is shown");
assert.dom(".d-icon-face-smile").exists("empty status icon is shown");
assert
.dom(".user-status-description")
.hasValue("", "no status description is shown");

View File

@ -64,7 +64,7 @@ class ChatSetupInit {
label: "chat.emoji",
id: "emoji",
class: "chat-emoji-btn",
icon: "discourse-emojis",
icon: "smile",
position: "dropdown",
displayed: owner.lookup("service:site").mobileView,
action(context) {