Skip to content

A platform for community discussion. Free, open, simple.

UX: Match the Live reactions picker to post reactions and animate on hover (#45337)

Rafael dos Santos Silva2717adfbc028
diff --git a/plugins/live/assets/javascripts/discourse/components/live/reaction-picker.gjs b/plugins/live/assets/javascripts/discourse/components/live/reaction-picker.gjs
index 86fdfdfe484..4579023beef 100644
--- a/plugins/live/assets/javascripts/discourse/components/live/reaction-picker.gjs
+++ b/plugins/live/assets/javascripts/discourse/components/live/reaction-picker.gjs
@@ -1,10 +1,13 @@
import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
import { fn } from "@ember/helper";
+import { on } from "@ember/modifier";
import { action } from "@ember/object";
import { service } from "@ember/service";
import { trustHTML } from "@ember/template";
import EmojiPickerDetached from "discourse/components/emoji-picker/detached";
import DMenu from "discourse/float-kit/components/d-menu";
+import DAnimatedEmoji from "discourse/ui-kit/d-animated-emoji";
import DButton from "discourse/ui-kit/d-button";
import dEmoji from "discourse/ui-kit/helpers/d-emoji";
import { i18n } from "discourse-i18n";
@@ -17,6 +20,8 @@ export default class LiveReactionPicker extends Component {
@service site;
@service siteSettings;
+ @tracked hoveredEmoji = null;
+
#menuApi = null;
get emojis() {
@@ -43,6 +48,18 @@ export default class LiveReactionPicker extends Component {
: i18n("live.reactions.title");
}
+ @action
+ hover(emoji, event) {
+ if (event.pointerType === "mouse") {
+ this.hoveredEmoji = emoji;
+ }
+ }
+
+ @action
+ unhover() {
+ this.hoveredEmoji = null;
+ }
+
@action
registerMenu(api) {
this.#menuApi = api;
@@ -80,6 +97,8 @@ export default class LiveReactionPicker extends Component {
@disabled={{this.liveReactions.rateLimited}}
@icon="far-face-smile"
@identifier="live-reaction-menu"
+ {{! A full row of our larger emoji outgrows the default menu width. }}
+ @maxWidth={{500}}
@onRegisterApi={{this.registerMenu}}
@placement="top"
@title={{this.title}}
@@ -93,8 +112,14 @@ export default class LiveReactionPicker extends Component {
data-emoji={{emoji}}
@action={{fn this.react emoji}}
@translatedTitle={{emoji}}
+ {{on "pointerenter" (fn this.hover emoji)}}
+ {{on "pointerleave" this.unhover}}
>
- {{dEmoji emoji}}
+ {{#if (eq this.hoveredEmoji emoji)}}
+ <DAnimatedEmoji @code={{emoji}} />
+ {{else}}
+ {{dEmoji emoji}}
+ {{/if}}
</DButton>
{{/each}}
{{#if this.allowAnyEmoji}}
diff --git a/plugins/live/assets/stylesheets/common/live-room-page.scss b/plugins/live/assets/stylesheets/common/live-room-page.scss
index 1f4308ec5e2..07004006ecc 100644
--- a/plugins/live/assets/stylesheets/common/live-room-page.scss
+++ b/plugins/live/assets/stylesheets/common/live-room-page.scss
@@ -1,3 +1,5 @@
+@use "lib/viewport";
+
// One step above the fixed site header so a widget dragged to the top edge
// stays visible and grabbable, while everything that already outranked the
// header (mobile composer, fullscreen layers, modals) keeps outranking the
@@ -766,32 +768,42 @@ body.has-sidebar-page #main-outlet-wrapper:has(.live-room-header) {
}
}
+// Same proportions as the post reactions picker (1.2em emoji, 0.25em
+// spacing, 1.5x hover), scaled up to our larger emoji.
.live-reaction-picker {
+ --live-reaction-size: 1.75rem;
+ --live-reaction-spacing: calc(var(--live-reaction-size) * 0.25 / 1.2);
+
+ // So a full seven-column row still fits a phone.
+ @include viewport.until(sm) {
+ --live-reaction-size: 1.5rem;
+ }
display: grid;
- grid-template-columns: repeat(var(--live-reaction-columns, 7), auto);
- gap: var(--space-1);
- padding: var(--space-1);
+ grid-template-columns: repeat(var(--live-reaction-columns, 7), 1fr);
+ gap: var(--live-reaction-spacing);
+ padding: var(--live-reaction-spacing);
&__emoji,
&__more {
- padding: var(--space-1);
- }
+ padding: var(--live-reaction-spacing);
+ margin: var(--live-reaction-spacing);
+ border-radius: var(--d-border-radius);
- &__more .d-icon {
- width: 1.75rem;
- height: 1.75rem;
+ .emoji,
+ .d-icon {
+ width: var(--live-reaction-size);
+ height: var(--live-reaction-size);
+ }
}
+ // Scales the button, not the image: hovering swaps in the animated image,
+ // which would otherwise skip the transition.
&__emoji {
- .emoji {
- width: 1.75rem;
- height: 1.75rem;
- transition: transform 0.1s ease-out;
- }
+ transition: transform 0.1s ease-out;
- &:hover .emoji,
- &:focus-visible .emoji {
- transform: scale(1.2);
+ .discourse-no-touch &:hover,
+ &:focus-visible {
+ transform: scale(1.5);
}
}
}