-
Notifications
You must be signed in to change notification settings - Fork 90
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2749 from element-hq/hs/css-fixes-for-reactions
Small improvements for reaction rendering
- Loading branch information
Showing
6 changed files
with
238 additions
and
87 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| .container { | ||
| position: absolute; | ||
| display: inline; | ||
| z-index: 2; | ||
| pointer-events: none; | ||
| width: 100vw; | ||
| height: 100vh; | ||
| left: 0; | ||
| top: 0; | ||
| } | ||
|
|
||
| .reaction { | ||
| font-size: 32pt; | ||
| /* Reactions are "active" for 3 seconds (as per REACTION_ACTIVE_TIME_MS), give a bit more time for it to fade out. */ | ||
| animation-duration: 4s; | ||
| animation-name: reaction-up; | ||
| width: fit-content; | ||
| position: relative; | ||
| top: 80vh; | ||
| } | ||
|
|
||
| @keyframes reaction-up { | ||
| from { | ||
| opacity: 1; | ||
| translate: 0 0; | ||
| scale: 200%; | ||
| top: 80vh; | ||
| } | ||
|
|
||
| to { | ||
| top: 0; | ||
| opacity: 0; | ||
| scale: 100%; | ||
| } | ||
| } | ||
|
|
||
| @media (prefers-reduced-motion) { | ||
| @keyframes reaction-up-reduced { | ||
| from { | ||
| opacity: 1; | ||
| } | ||
|
|
||
| to { | ||
| opacity: 0; | ||
| } | ||
| } | ||
|
|
||
| .reaction { | ||
| font-size: 48pt; | ||
| animation-name: reaction-up-reduced; | ||
| top: calc(-50vh + (48pt / 2)); | ||
| left: calc(50vw - (48pt / 2)) !important; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| /* | ||
| Copyright 2024 New Vector Ltd. | ||
| SPDX-License-Identifier: AGPL-3.0-only | ||
| Please see LICENSE in the repository root for full details. | ||
| */ | ||
|
|
||
| import { render } from "@testing-library/react"; | ||
| import { expect, test } from "vitest"; | ||
| import { TooltipProvider } from "@vector-im/compound-web"; | ||
| import { act, ReactNode } from "react"; | ||
| import { afterEach } from "node:test"; | ||
|
|
||
| import { | ||
| MockRoom, | ||
| MockRTCSession, | ||
| TestReactionsWrapper, | ||
| } from "../utils/testReactions"; | ||
| import { showReactions } from "../settings/settings"; | ||
| import { ReactionsOverlay } from "./ReactionsOverlay"; | ||
| import { ReactionSet } from "../reactions"; | ||
|
|
||
| const memberUserIdAlice = "@alice:example.org"; | ||
| const memberUserIdBob = "@bob:example.org"; | ||
| const memberUserIdCharlie = "@charlie:example.org"; | ||
| const memberEventAlice = "$membership-alice:example.org"; | ||
| const memberEventBob = "$membership-bob:example.org"; | ||
| const memberEventCharlie = "$membership-charlie:example.org"; | ||
|
|
||
| const membership: Record<string, string> = { | ||
| [memberEventAlice]: memberUserIdAlice, | ||
| [memberEventBob]: memberUserIdBob, | ||
| [memberEventCharlie]: memberUserIdCharlie, | ||
| }; | ||
|
|
||
| function TestComponent({ | ||
| rtcSession, | ||
| }: { | ||
| rtcSession: MockRTCSession; | ||
| }): ReactNode { | ||
| return ( | ||
| <TooltipProvider> | ||
| <TestReactionsWrapper rtcSession={rtcSession}> | ||
| <ReactionsOverlay /> | ||
| </TestReactionsWrapper> | ||
| </TooltipProvider> | ||
| ); | ||
| } | ||
|
|
||
| afterEach(() => { | ||
| showReactions.setValue(showReactions.defaultValue); | ||
| }); | ||
|
|
||
| test("defaults to showing no reactions", () => { | ||
| showReactions.setValue(true); | ||
| const rtcSession = new MockRTCSession( | ||
| new MockRoom(memberUserIdAlice), | ||
| membership, | ||
| ); | ||
| const { container } = render(<TestComponent rtcSession={rtcSession} />); | ||
| expect(container.getElementsByTagName("span")).toHaveLength(0); | ||
| }); | ||
|
|
||
| test("shows a reaction when sent", () => { | ||
| showReactions.setValue(true); | ||
| const reaction = ReactionSet[0]; | ||
| const room = new MockRoom(memberUserIdAlice); | ||
| const rtcSession = new MockRTCSession(room, membership); | ||
| const { getByRole } = render(<TestComponent rtcSession={rtcSession} />); | ||
| act(() => { | ||
| room.testSendReaction(memberEventAlice, reaction, membership); | ||
| }); | ||
| const span = getByRole("presentation"); | ||
| expect(getByRole("presentation")).toBeTruthy(); | ||
| expect(span.innerHTML).toEqual(reaction.emoji); | ||
| }); | ||
|
|
||
| test("shows two of the same reaction when sent", () => { | ||
| showReactions.setValue(true); | ||
| const reaction = ReactionSet[0]; | ||
| const room = new MockRoom(memberUserIdAlice); | ||
| const rtcSession = new MockRTCSession(room, membership); | ||
| const { getAllByRole } = render(<TestComponent rtcSession={rtcSession} />); | ||
| act(() => { | ||
| room.testSendReaction(memberEventAlice, reaction, membership); | ||
| }); | ||
| act(() => { | ||
| room.testSendReaction(memberEventBob, reaction, membership); | ||
| }); | ||
| expect(getAllByRole("presentation")).toHaveLength(2); | ||
| }); | ||
|
|
||
| test("shows two different reactions when sent", () => { | ||
| showReactions.setValue(true); | ||
| const room = new MockRoom(memberUserIdAlice); | ||
| const rtcSession = new MockRTCSession(room, membership); | ||
| const [reactionA, reactionB] = ReactionSet; | ||
| const { getAllByRole } = render(<TestComponent rtcSession={rtcSession} />); | ||
| act(() => { | ||
| room.testSendReaction(memberEventAlice, reactionA, membership); | ||
| }); | ||
| act(() => { | ||
| room.testSendReaction(memberEventBob, reactionB, membership); | ||
| }); | ||
| const [reactionElementA, reactionElementB] = getAllByRole("presentation"); | ||
| expect(reactionElementA.innerHTML).toEqual(reactionA.emoji); | ||
| expect(reactionElementB.innerHTML).toEqual(reactionB.emoji); | ||
| }); | ||
|
|
||
| test("hides reactions when reaction animations are disabled", () => { | ||
| showReactions.setValue(false); | ||
| const reaction = ReactionSet[0]; | ||
| const room = new MockRoom(memberUserIdAlice); | ||
| const rtcSession = new MockRTCSession(room, membership); | ||
| act(() => { | ||
| room.testSendReaction(memberEventAlice, reaction, membership); | ||
| }); | ||
| const { container } = render(<TestComponent rtcSession={rtcSession} />); | ||
| expect(container.getElementsByTagName("span")).toHaveLength(0); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| /* | ||
| Copyright 2024 New Vector Ltd. | ||
| SPDX-License-Identifier: AGPL-3.0-only | ||
| Please see LICENSE in the repository root for full details. | ||
| */ | ||
|
|
||
| import { ReactNode, useMemo } from "react"; | ||
|
|
||
| import { useReactions } from "../useReactions"; | ||
| import { | ||
| showReactions as showReactionsSetting, | ||
| useSetting, | ||
| } from "../settings/settings"; | ||
| import styles from "./ReactionsOverlay.module.css"; | ||
|
|
||
| export function ReactionsOverlay(): ReactNode { | ||
| const { reactions } = useReactions(); | ||
| const [showReactions] = useSetting(showReactionsSetting); | ||
| const reactionsIcons = useMemo( | ||
| () => | ||
| showReactions | ||
| ? Object.entries(reactions).map(([sender, { emoji }]) => ({ | ||
| sender, | ||
| emoji, | ||
| startX: Math.ceil(Math.random() * 80) + 10, | ||
| })) | ||
| : [], | ||
| [showReactions, reactions], | ||
| ); | ||
|
|
||
| return ( | ||
| <div className={styles.container}> | ||
| {reactionsIcons.map(({ sender, emoji, startX }) => ( | ||
| <span | ||
| // Reactions effects are considered presentation elements. The reaction | ||
| // is also present on the sender's tile, which assistive technology can | ||
| // read from instead. | ||
| role="presentation" | ||
| style={{ left: `${startX}vw` }} | ||
| className={styles.reaction} | ||
| // A sender can only send one emoji at a time. | ||
| key={sender} | ||
| > | ||
| {emoji} | ||
| </span> | ||
| ))} | ||
| </div> | ||
| ); | ||
| } |