Skip to content

Commit 22cdda4

Browse files
morgmartRivet
andauthored
feat(desktop): restore message quick reactions (#6892)
## Summary - restore three learned quick-reaction shortcuts to the desktop message action rail - keep Add reaction (`SmilePlus`, `h-4 w-4`) immediately after shortcuts and left of the restored divider - preserve Reply, Copy link, More, custom emoji rendering, accessibility labels, and responsive behavior - hide shortcuts and the divider below `sm`, while keeping Add reaction available ## Tests At `24c4732c2341b846dccf4ae8fdc2455f700fc44d`: - `pnpm exec biome check src/features/messages/ui/MessageActionBar.tsx tests/e2e/message-copy-link.spec.ts tests/e2e/custom-emoji.spec.ts` - `pnpm exec tsc --noEmit` - `pnpm test` — 5,567 passed - `pnpm build:e2e` - `pnpm exec playwright test tests/e2e/message-copy-link.spec.ts tests/e2e/custom-emoji.spec.ts --project=smoke` — 19 passed - `pnpm exec playwright test tests/e2e/reaction-order.spec.ts --project=smoke` — 2 passed - pre-push: file-size-check, desktop-check, desktop-typecheck, desktop-test Vogue design review: **SHIP**. ## Screenshot Restored desktop message action rail: three learned quick reactions, Add reaction (`SmilePlus`), divider, Reply, Copy link, and More. ![Restored desktop message action rail](https://d24qwcpro867f5.cloudfront.net/repos/buzz/prs/6892/restored-message-action-rail.png) Signed-off-by: Rivet <a08d9a8418c7ff03afe19964724c8fd87bf1776ab9e9b9cafb8cc920edd02a6e@buzz.block.builderlab.xyz> Co-authored-by: Rivet <a08d9a8418c7ff03afe19964724c8fd87bf1776ab9e9b9cafb8cc920edd02a6e@buzz.block.builderlab.xyz>
1 parent f177f49 commit 22cdda4

3 files changed

Lines changed: 136 additions & 5 deletions

File tree

‎desktop/src/features/messages/ui/MessageActionBar.tsx‎

Lines changed: 88 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,23 @@ import { toast } from "sonner";
1818

1919
import { buildMessageLink } from "@/features/messages/lib/messageLink";
2020
import { EmojiPicker } from "@/features/custom-emoji/ui/EmojiPicker";
21+
import { useCustomEmoji } from "@/features/custom-emoji/hooks";
2122
import { getThreadReference } from "@/features/messages/lib/threading";
2223
import { ReportMessageDialog } from "@/features/moderation/ui/ReportMessageDialog";
2324
import { MessageModerationMenuItems } from "@/features/moderation/ui/MessageModerationMenuItems";
2425
import type {
2526
TimelineMessage,
2627
TimelineReaction,
2728
} from "@/features/messages/types";
28-
import { recordQuickReactionEmoji } from "@/features/messages/ui/useQuickReactionEmojis";
29+
import {
30+
recordQuickReactionEmoji,
31+
useQuickReactionEmojis,
32+
} from "@/features/messages/ui/useQuickReactionEmojis";
33+
import { reactionEmojiUrl } from "@/shared/api/customEmoji";
2934
import { cn } from "@/shared/lib/cn";
3035
import { copyTextToClipboard } from "@/shared/lib/clipboard";
36+
import { emojiDisplayName } from "@/shared/lib/emojiName";
37+
import { rewriteRelayUrl } from "@/shared/lib/mediaUrl";
3138
import { KIND_HUDDLE_STARTED } from "@/shared/constants/kinds";
3239
import { Button } from "@/shared/ui/button";
3340
import { HashArrowIn } from "@/shared/ui/icons";
@@ -329,6 +336,51 @@ function MoreActionsMenu({
329336
);
330337
}
331338

339+
function QuickReactionButton({
340+
customEmojiUrl,
341+
emoji,
342+
onSelect,
343+
}: {
344+
customEmojiUrl?: string;
345+
emoji: string;
346+
onSelect: (emoji: string) => void;
347+
}) {
348+
const displayName = emojiDisplayName(emoji);
349+
const mediaUrl = customEmojiUrl ? rewriteRelayUrl(customEmojiUrl) : null;
350+
351+
return (
352+
<Tooltip>
353+
<TooltipTrigger asChild>
354+
<button
355+
aria-label={`React with ${displayName}`}
356+
className="flex h-8 w-8 items-center justify-center rounded-full text-base leading-none text-muted-foreground transition-colors hover:bg-muted hover:text-foreground focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring"
357+
onClick={() => onSelect(emoji)}
358+
title={displayName}
359+
type="button"
360+
>
361+
{mediaUrl ? (
362+
<img
363+
alt={emoji}
364+
className="h-5 w-5 object-contain"
365+
draggable={false}
366+
src={mediaUrl}
367+
/>
368+
) : (
369+
<span aria-hidden="true" className="translate-y-px">
370+
{emoji}
371+
</span>
372+
)}
373+
</button>
374+
</TooltipTrigger>
375+
<TooltipContent>{displayName}</TooltipContent>
376+
</Tooltip>
377+
);
378+
}
379+
380+
function isCustomEmojiShortcode(emoji: string) {
381+
return emoji.startsWith(":") && emoji.endsWith(":");
382+
}
383+
332384
export const MessageActionBar = React.memo(function MessageActionBar({
333385
channelId,
334386
message,
@@ -372,6 +424,20 @@ export const MessageActionBar = React.memo(function MessageActionBar({
372424
}) {
373425
const [isReactionPickerOpen, setIsReactionPickerOpen] = React.useState(false);
374426
const [isDropdownOpen, setIsDropdownOpen] = React.useState(false);
427+
const customEmoji = useCustomEmoji();
428+
const quickReactionEmojis = useQuickReactionEmojis(3, customEmoji);
429+
const quickReactionItems = React.useMemo(
430+
() =>
431+
quickReactionEmojis
432+
.map((emoji) => ({
433+
customEmojiUrl: reactionEmojiUrl(emoji, customEmoji),
434+
emoji,
435+
}))
436+
.filter(
437+
(item) => !isCustomEmojiShortcode(item.emoji) || item.customEmojiUrl,
438+
),
439+
[customEmoji, quickReactionEmojis],
440+
);
375441
const hasReplyAction = Boolean(onReply);
376442
const hasReactionAction = Boolean(onReactionSelect);
377443

@@ -436,6 +502,19 @@ export const MessageActionBar = React.memo(function MessageActionBar({
436502
>
437503
<div className="overflow-hidden rounded-full border border-border/70 bg-background/95 shadow-xs backdrop-blur-sm supports-[backdrop-filter]:bg-background/85">
438504
<div className="flex items-center gap-0.5 p-1">
505+
{hasReactionAction && quickReactionItems.length > 0 ? (
506+
<div className="hidden items-center gap-0.5 sm:flex">
507+
{quickReactionItems.map(({ customEmojiUrl, emoji }) => (
508+
<QuickReactionButton
509+
customEmojiUrl={customEmojiUrl}
510+
emoji={emoji}
511+
key={emoji}
512+
onSelect={handleReactionSelection}
513+
/>
514+
))}
515+
</div>
516+
) : null}
517+
439518
{hasReactionAction ? (
440519
<Popover
441520
onOpenChange={setIsReactionPickerOpen}
@@ -483,6 +562,14 @@ export const MessageActionBar = React.memo(function MessageActionBar({
483562
</Popover>
484563
) : null}
485564

565+
{hasReactionAction && quickReactionItems.length > 0 ? (
566+
<div
567+
aria-hidden="true"
568+
className="mx-0.5 hidden h-4 w-px bg-border/70 sm:block"
569+
data-testid="message-action-divider"
570+
/>
571+
) : null}
572+
486573
{hasReplyAction ? (
487574
<Tooltip>
488575
<TooltipTrigger asChild>

‎desktop/tests/e2e/custom-emoji.spec.ts‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,30 @@ async function quickReactionStorageContains(
285285
}, emoji);
286286
}
287287

288+
test("message quick reaction stays neutral after selecting a shortcut", async ({
289+
page,
290+
}) => {
291+
await openGeneral(page);
292+
293+
const row = reactionTargetRow(page);
294+
await expect(row).toBeVisible();
295+
await row.hover();
296+
297+
const quickReactionButton = row.getByRole("button", {
298+
name: "React with :+1:",
299+
});
300+
await expect(quickReactionButton).toBeVisible();
301+
await quickReactionButton.click();
302+
303+
await expect(row.getByLabel("Toggle 👍 reaction")).toBeVisible();
304+
await row.hover();
305+
await expect(quickReactionButton).not.toHaveAttribute("aria-pressed", "true");
306+
await expect(quickReactionButton).not.toHaveClass(SELECTED_ACTION_CLASS);
307+
await expect(messageReactionTrigger(row)).not.toHaveClass(
308+
SELECTED_ACTION_CLASS,
309+
);
310+
});
311+
288312
test("message reaction action stays neutral after selecting from the picker", async ({
289313
page,
290314
}) => {

‎desktop/tests/e2e/message-copy-link.spec.ts‎

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,22 +79,42 @@ test("message action rail copies the same canonical thread link as More", async
7979
await replyRow.hover();
8080

8181
const actionBar = replyRow.getByTestId(`message-action-bar-${replyId}`);
82-
const quickReactions = actionBar.getByRole("button", {
83-
name: /^React with /,
84-
});
85-
await expect(quickReactions).toHaveCount(0);
8682
const orderedActionNames = await actionBar
8783
.getByRole("button")
8884
.evaluateAll((buttons) =>
8985
buttons.map((button) => button.getAttribute("aria-label")),
9086
);
9187
expect(orderedActionNames).toEqual([
88+
"React with :+1:",
89+
"React with :heart:",
90+
"React with :joy:",
9291
"Open reactions",
9392
"Reply",
9493
"Copy link",
9594
"More actions",
9695
]);
9796

97+
const pickerButton = actionBar.getByRole("button", {
98+
name: "Open reactions",
99+
});
100+
await expect(pickerButton.locator("svg")).toHaveClass(/lucide-smile-plus/);
101+
102+
const divider = actionBar.getByTestId("message-action-divider");
103+
await expect(divider).toBeVisible();
104+
const [pickerBox, dividerBox, replyBox] = await Promise.all([
105+
actionBar.getByRole("button", { name: "Open reactions" }).boundingBox(),
106+
divider.boundingBox(),
107+
actionBar.getByRole("button", { name: "Reply" }).boundingBox(),
108+
]);
109+
expect(pickerBox).not.toBeNull();
110+
expect(dividerBox).not.toBeNull();
111+
expect(replyBox).not.toBeNull();
112+
if (!pickerBox || !dividerBox || !replyBox) {
113+
throw new Error("Message action order bounds missing.");
114+
}
115+
expect(pickerBox.x + pickerBox.width).toBeLessThan(dividerBox.x);
116+
expect(dividerBox.x + dividerBox.width).toBeLessThan(replyBox.x);
117+
98118
const copyLink = actionBar.getByTestId(`copy-link-message-${replyId}`);
99119
await expect(copyLink).toHaveAccessibleName("Copy link");
100120
await copyLink.hover();

0 commit comments

Comments
 (0)