mirror of
https://github.com/vector-im/element-call.git
synced 2024-11-24 00:38:31 +08:00
Support for generic reactions (#2708)
* Initial support for Hand Raise feature Signed-off-by: Milton Moura <miltonmoura@gmail.com> * Refactored to use reaction and redaction events Signed-off-by: Milton Moura <miltonmoura@gmail.com> * Replacing button svg with raised hand emoji Signed-off-by: Milton Moura <miltonmoura@gmail.com> * SpotlightTile should not duplicate the raised hand Signed-off-by: Milton Moura <miltonmoura@gmail.com> * Update src/room/useRaisedHands.tsx Element Call recently changed to AGPL-3.0 * Use relations to load existing reactions when joining the call Signed-off-by: Milton Moura <miltonmoura@gmail.com> * Links to sha commit of matrix-js-sdk that exposes the call membership event id and refactors some async code Signed-off-by: Milton Moura <miltonmoura@gmail.com> * Removing RaiseHand.svg * Check for reaction & redaction capabilities in widget mode Signed-off-by: Milton Moura <miltonmoura@gmail.com> * Fix failing GridTile test Signed-off-by: Milton Moura <miltonmoura@gmail.com> * Center align hand raise. * Add support for displaying the duration of a raised hand. * Add a sound for when a hand is raised. * Refactor raised hand indicator and add tests. * lint * Refactor into own files. * Redact the right thing. * Tidy up useEffect * Lint tests * Remove extra layer * Add better sound. (woosh) * Add a small mode for spotlight * Fix timestamp calculation on relaod. * Fix call border resizing video * lint * Fix and update tests * Allow timer to be configurable. * Add preferences tab for choosing to enable timer. * Drop border from raised hand icon * Handle cases when a new member event happens. * Prevent infinite loop * Major refactor to support various state problems. * Tidy up and finish test rewrites * Add some explanation comments. * Even more comments. * Use proper duration formatter * Remove rerender * Fix redactions not working because they pick up events in transit. * More tidying * Use deferred value * linting * Add tests for cases where we got a reaction from someone else. * Be even less brittle. * Transpose border to GridTile. * First PoC for reactions * hide menu by default * Add lightbulb. * Add reaction indicator. * Add sounds. * Tidy up + add support for floating emoji. * Linting and general stability improvements. * Subscribe to the ecall reaction event type. * fix import * Center emoji picker * Overflow buttons when screen is too narrow * lint * Add settings for disabling animations / sounds. * Make vertical divider more visually distinct. * Make event listener more resillient. * lint * Fix some tests. * Remove old raised hand component * Add new icon * Update text * Update compound hand raised icon. * Add deer. * Fix case where you could send larger strings as emoji * Const the active time. * Document time in css. * Add rock emoji * Add licence file. * Add type def for custom reaction type. * better reaction description * Factor out reactions test structure to utils file. * Add tests for ReactionToggleButton * Add keyboard shortcuts for reaction sending. * type tidyups * lint * Add tests for ReactionAudioRenderer * lint * prettier * i18n sort * final lint? * Preload reaction sounds to prevent delays. * Update rock sounds * add onclick back * Fix test * lint * simplify * Tweak line height * modal impl * Modal refactor attempts. * Remove closed menu test since we're using Modal. * Swap icon, make mobile view better. * Fix mobile view for emoji picker. * Use Intl.Segmenter * Clear timeouts on component close. * Remove useless useCallback * Use prefers-reduced-motion * Add toggle for raise hand. * Add lower hand text * Add lower motion mode. * Decomplicate className system for Modal * Add error for failured to send reaction. * i18n * Spacing for emoji buttons search * Remove unrequired media query * Fix generic sound not playing. * Clear reactions if we're clearing timeouts. * Fix tests * Relabel lower hand * More translations * Add comments on reaction interface * Move polyfill. * lint * Replace deer sound * Another attempt to fix the sizing of the reactions * cleanup * fix button * fix --------- Signed-off-by: Milton Moura <miltonmoura@gmail.com> Co-authored-by: Milton Moura <miltonmoura@gmail.com> Co-authored-by: fkwp <fkwp@users.noreply.github.com>
This commit is contained in:
parent
5b94dd6f1a
commit
5d88c52e30
@ -25,6 +25,7 @@
|
|||||||
"@babel/preset-react": "^7.22.15",
|
"@babel/preset-react": "^7.22.15",
|
||||||
"@babel/preset-typescript": "^7.23.0",
|
"@babel/preset-typescript": "^7.23.0",
|
||||||
"@formatjs/intl-durationformat": "^0.6.1",
|
"@formatjs/intl-durationformat": "^0.6.1",
|
||||||
|
"@formatjs/intl-segmenter": "^11.7.3",
|
||||||
"@livekit/components-core": "^0.11.0",
|
"@livekit/components-core": "^0.11.0",
|
||||||
"@livekit/components-react": "^2.0.0",
|
"@livekit/components-react": "^2.0.0",
|
||||||
"@opentelemetry/api": "^1.4.0",
|
"@opentelemetry/api": "^1.4.0",
|
||||||
@ -57,7 +58,7 @@
|
|||||||
"@typescript-eslint/eslint-plugin": "^8.0.0",
|
"@typescript-eslint/eslint-plugin": "^8.0.0",
|
||||||
"@typescript-eslint/parser": "^8.0.0",
|
"@typescript-eslint/parser": "^8.0.0",
|
||||||
"@use-gesture/react": "^10.2.11",
|
"@use-gesture/react": "^10.2.11",
|
||||||
"@vector-im/compound-design-tokens": "^1.0.0",
|
"@vector-im/compound-design-tokens": "^1.9.1",
|
||||||
"@vector-im/compound-web": "^6.0.0",
|
"@vector-im/compound-web": "^6.0.0",
|
||||||
"@vitejs/plugin-basic-ssl": "^1.0.1",
|
"@vitejs/plugin-basic-ssl": "^1.0.1",
|
||||||
"@vitejs/plugin-react": "^4.0.1",
|
"@vitejs/plugin-react": "^4.0.1",
|
||||||
|
@ -4,11 +4,17 @@
|
|||||||
},
|
},
|
||||||
"action": {
|
"action": {
|
||||||
"close": "Close",
|
"close": "Close",
|
||||||
|
"close_search": "Close search",
|
||||||
"copy_link": "Copy link",
|
"copy_link": "Copy link",
|
||||||
"edit": "Edit",
|
"edit": "Edit",
|
||||||
"go": "Go",
|
"go": "Go",
|
||||||
"invite": "Invite",
|
"invite": "Invite",
|
||||||
|
"lower_hand": "Lower hand",
|
||||||
"no": "No",
|
"no": "No",
|
||||||
|
"open_search": "Open search",
|
||||||
|
"pick_reaction": "Pick reaction",
|
||||||
|
"raise_hand": "Raise hand",
|
||||||
|
"raise_hand_or_send_reaction": "Raise hand or send reaction",
|
||||||
"register": "Register",
|
"register": "Register",
|
||||||
"remove": "Remove",
|
"remove": "Remove",
|
||||||
"sign_in": "Sign in",
|
"sign_in": "Sign in",
|
||||||
@ -55,8 +61,10 @@
|
|||||||
"password": "Password",
|
"password": "Password",
|
||||||
"preferences": "Preferences",
|
"preferences": "Preferences",
|
||||||
"profile": "Profile",
|
"profile": "Profile",
|
||||||
"raise_hand": "Raise hand",
|
"reaction": "Reaction",
|
||||||
|
"search": "Search",
|
||||||
"settings": "Settings",
|
"settings": "Settings",
|
||||||
|
"something_went_wrong": "Something went wrong",
|
||||||
"unencrypted": "Not encrypted",
|
"unencrypted": "Not encrypted",
|
||||||
"username": "Username",
|
"username": "Username",
|
||||||
"video": "Video"
|
"video": "Video"
|
||||||
@ -120,6 +128,7 @@
|
|||||||
"rageshake_sending": "Sending…",
|
"rageshake_sending": "Sending…",
|
||||||
"rageshake_sending_logs": "Sending debug logs…",
|
"rageshake_sending_logs": "Sending debug logs…",
|
||||||
"rageshake_sent": "Thanks!",
|
"rageshake_sent": "Thanks!",
|
||||||
|
"reaction_search": "Search reactions…",
|
||||||
"recaptcha_caption": "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy</2> and <6>Terms of Service</6> apply.<9></9>By clicking \"Register\", you agree to our <12>End User Licensing Agreement (EULA)</12>",
|
"recaptcha_caption": "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy</2> and <6>Terms of Service</6> apply.<9></9>By clicking \"Register\", you agree to our <12>End User Licensing Agreement (EULA)</12>",
|
||||||
"recaptcha_dismissed": "Recaptcha dismissed",
|
"recaptcha_dismissed": "Recaptcha dismissed",
|
||||||
"recaptcha_not_loaded": "Recaptcha not loaded",
|
"recaptcha_not_loaded": "Recaptcha not loaded",
|
||||||
@ -147,6 +156,13 @@
|
|||||||
"feedback_tab_title": "Feedback",
|
"feedback_tab_title": "Feedback",
|
||||||
"more_tab_title": "More",
|
"more_tab_title": "More",
|
||||||
"opt_in_description": "<0></0><1></1>You may withdraw consent by unchecking this box. If you are currently in a call, this setting will take effect at the end of the call.",
|
"opt_in_description": "<0></0><1></1>You may withdraw consent by unchecking this box. If you are currently in a call, this setting will take effect at the end of the call.",
|
||||||
|
"preferences_tab": {
|
||||||
|
"reactions_play_sound_description": "Play a sound effect when anyone sends a reaction into a call.",
|
||||||
|
"reactions_play_sound_label": "Play reaction sounds",
|
||||||
|
"reactions_show_description": "Show reactions",
|
||||||
|
"reactions_show_label": "Show an animation when anyone sends a reaction.",
|
||||||
|
"reactions_title": "Reactions"
|
||||||
|
},
|
||||||
"preferences_tab_body": "Here you can configure extra options for an improved experience",
|
"preferences_tab_body": "Here you can configure extra options for an improved experience",
|
||||||
"preferences_tab_h4": "Preferences",
|
"preferences_tab_h4": "Preferences",
|
||||||
"preferences_tab_show_hand_raised_timer_description": "Show a timer when a participant raises their hand",
|
"preferences_tab_show_hand_raised_timer_description": "Show a timer when a participant raises their hand",
|
||||||
|
18
src/@types/matrix-js-sdk.d.ts
vendored
Normal file
18
src/@types/matrix-js-sdk.d.ts
vendored
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2024 New Vector Ltd.
|
||||||
|
|
||||||
|
SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
Please see LICENSE in the repository root for full details.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import {
|
||||||
|
ElementCallReactionEventType,
|
||||||
|
ECallReactionEventContent,
|
||||||
|
} from "../reactions";
|
||||||
|
|
||||||
|
// Extend Matrix JS SDK types via Typescript declaration merging to support unspecced event fields and types
|
||||||
|
declare module "matrix-js-sdk/src/types" {
|
||||||
|
export interface TimelineEvents {
|
||||||
|
[ElementCallReactionEventType]: ECallReactionEventContent;
|
||||||
|
}
|
||||||
|
}
|
@ -27,8 +27,21 @@ import { useMediaQuery } from "./useMediaQuery";
|
|||||||
|
|
||||||
export interface Props {
|
export interface Props {
|
||||||
title: string;
|
title: string;
|
||||||
|
/**
|
||||||
|
* Hide the modal header. Used for smaller popups where the context is readily apparent.
|
||||||
|
* A title should still be specified for users using assistive technology.
|
||||||
|
*/
|
||||||
|
hideHeader?: boolean;
|
||||||
children: ReactNode;
|
children: ReactNode;
|
||||||
className?: string;
|
className?: string;
|
||||||
|
/**
|
||||||
|
* Class name to be used when in drawer mode (touchscreen).
|
||||||
|
*/
|
||||||
|
classNameDrawer?: string;
|
||||||
|
/**
|
||||||
|
* Class name to be used when in modal mode (desktop).
|
||||||
|
*/
|
||||||
|
classNameModal?: string;
|
||||||
/**
|
/**
|
||||||
* The controlled open state of the modal.
|
* The controlled open state of the modal.
|
||||||
*/
|
*/
|
||||||
@ -54,8 +67,11 @@ export interface Props {
|
|||||||
*/
|
*/
|
||||||
export const Modal: FC<Props> = ({
|
export const Modal: FC<Props> = ({
|
||||||
title,
|
title,
|
||||||
|
hideHeader,
|
||||||
children,
|
children,
|
||||||
className,
|
className,
|
||||||
|
classNameDrawer,
|
||||||
|
classNameModal,
|
||||||
open,
|
open,
|
||||||
onDismiss,
|
onDismiss,
|
||||||
tabbed,
|
tabbed,
|
||||||
@ -84,6 +100,7 @@ export const Modal: FC<Props> = ({
|
|||||||
<Drawer.Content
|
<Drawer.Content
|
||||||
className={classNames(
|
className={classNames(
|
||||||
className,
|
className,
|
||||||
|
classNameDrawer,
|
||||||
overlayStyles.overlay,
|
overlayStyles.overlay,
|
||||||
styles.modal,
|
styles.modal,
|
||||||
styles.drawer,
|
styles.drawer,
|
||||||
@ -109,6 +126,28 @@ export const Modal: FC<Props> = ({
|
|||||||
</Drawer.Root>
|
</Drawer.Root>
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
|
const titleNode = (
|
||||||
|
<DialogTitle asChild>
|
||||||
|
<Heading as="h2" weight="semibold" size="md">
|
||||||
|
{title}
|
||||||
|
</Heading>
|
||||||
|
</DialogTitle>
|
||||||
|
);
|
||||||
|
const header = (
|
||||||
|
<div className={styles.header}>
|
||||||
|
{titleNode}
|
||||||
|
{onDismiss !== undefined && (
|
||||||
|
<DialogClose
|
||||||
|
className={styles.close}
|
||||||
|
data-testid="modal_close"
|
||||||
|
aria-label={t("action.close")}
|
||||||
|
>
|
||||||
|
<CloseIcon width={20} height={20} />
|
||||||
|
</DialogClose>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<DialogRoot open={open} onOpenChange={onOpenChange}>
|
<DialogRoot open={open} onOpenChange={onOpenChange}>
|
||||||
<DialogPortal>
|
<DialogPortal>
|
||||||
@ -126,6 +165,7 @@ export const Modal: FC<Props> = ({
|
|||||||
<Glass
|
<Glass
|
||||||
className={classNames(
|
className={classNames(
|
||||||
className,
|
className,
|
||||||
|
classNameModal,
|
||||||
overlayStyles.overlay,
|
overlayStyles.overlay,
|
||||||
overlayStyles.animate,
|
overlayStyles.animate,
|
||||||
styles.modal,
|
styles.modal,
|
||||||
@ -134,22 +174,10 @@ export const Modal: FC<Props> = ({
|
|||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
<div className={styles.content}>
|
<div className={styles.content}>
|
||||||
<div className={styles.header}>
|
{!hideHeader ? header : null}
|
||||||
<DialogTitle asChild>
|
{hideHeader ? (
|
||||||
<Heading as="h2" weight="semibold" size="md">
|
<VisuallyHidden asChild>{titleNode}</VisuallyHidden>
|
||||||
{title}
|
) : null}
|
||||||
</Heading>
|
|
||||||
</DialogTitle>
|
|
||||||
{onDismiss !== undefined && (
|
|
||||||
<DialogClose
|
|
||||||
className={styles.close}
|
|
||||||
data-testid="modal_close"
|
|
||||||
aria-label={t("action.close")}
|
|
||||||
>
|
|
||||||
<CloseIcon width={20} height={20} />
|
|
||||||
</DialogClose>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
<div className={styles.body}>{children}</div>
|
<div className={styles.body}>{children}</div>
|
||||||
</div>
|
</div>
|
||||||
</Glass>
|
</Glass>
|
||||||
|
@ -1,126 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright 2024 New Vector Ltd.
|
|
||||||
|
|
||||||
SPDX-License-Identifier: AGPL-3.0-only
|
|
||||||
Please see LICENSE in the repository root for full details.
|
|
||||||
*/
|
|
||||||
|
|
||||||
import { Button as CpdButton, Tooltip } from "@vector-im/compound-web";
|
|
||||||
import {
|
|
||||||
ComponentPropsWithoutRef,
|
|
||||||
FC,
|
|
||||||
ReactNode,
|
|
||||||
useCallback,
|
|
||||||
useState,
|
|
||||||
} from "react";
|
|
||||||
import { useTranslation } from "react-i18next";
|
|
||||||
import { logger } from "matrix-js-sdk/src/logger";
|
|
||||||
import { EventType, RelationType } from "matrix-js-sdk/src/matrix";
|
|
||||||
import { MatrixClient } from "matrix-js-sdk/src/client";
|
|
||||||
import { MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSession";
|
|
||||||
|
|
||||||
import { useReactions } from "../useReactions";
|
|
||||||
import { useMatrixRTCSessionMemberships } from "../useMatrixRTCSessionMemberships";
|
|
||||||
|
|
||||||
interface InnerButtonProps extends ComponentPropsWithoutRef<"button"> {
|
|
||||||
raised: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
const InnerButton: FC<InnerButtonProps> = ({ raised, ...props }) => {
|
|
||||||
const { t } = useTranslation();
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Tooltip label={t("common.raise_hand")}>
|
|
||||||
<CpdButton
|
|
||||||
kind={raised ? "primary" : "secondary"}
|
|
||||||
{...props}
|
|
||||||
style={{ paddingLeft: 8, paddingRight: 8 }}
|
|
||||||
>
|
|
||||||
<p
|
|
||||||
role="img"
|
|
||||||
aria-hidden
|
|
||||||
style={{
|
|
||||||
width: "30px",
|
|
||||||
height: "0px",
|
|
||||||
display: "inline-block",
|
|
||||||
fontSize: "22px",
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
✋
|
|
||||||
</p>
|
|
||||||
</CpdButton>
|
|
||||||
</Tooltip>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
interface RaisedHandToggleButtonProps {
|
|
||||||
rtcSession: MatrixRTCSession;
|
|
||||||
client: MatrixClient;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function RaiseHandToggleButton({
|
|
||||||
client,
|
|
||||||
rtcSession,
|
|
||||||
}: RaisedHandToggleButtonProps): ReactNode {
|
|
||||||
const { raisedHands, lowerHand } = useReactions();
|
|
||||||
const [busy, setBusy] = useState(false);
|
|
||||||
const userId = client.getUserId()!;
|
|
||||||
const isHandRaised = !!raisedHands[userId];
|
|
||||||
const memberships = useMatrixRTCSessionMemberships(rtcSession);
|
|
||||||
|
|
||||||
const toggleRaisedHand = useCallback(() => {
|
|
||||||
const raiseHand = async (): Promise<void> => {
|
|
||||||
if (isHandRaised) {
|
|
||||||
try {
|
|
||||||
setBusy(true);
|
|
||||||
await lowerHand();
|
|
||||||
} finally {
|
|
||||||
setBusy(false);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
const myMembership = memberships.find((m) => m.sender === userId);
|
|
||||||
if (!myMembership?.eventId) {
|
|
||||||
logger.error("Cannot find own membership event");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const parentEventId = myMembership.eventId;
|
|
||||||
try {
|
|
||||||
setBusy(true);
|
|
||||||
const reaction = await client.sendEvent(
|
|
||||||
rtcSession.room.roomId,
|
|
||||||
EventType.Reaction,
|
|
||||||
{
|
|
||||||
"m.relates_to": {
|
|
||||||
rel_type: RelationType.Annotation,
|
|
||||||
event_id: parentEventId,
|
|
||||||
key: "🖐️",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
);
|
|
||||||
logger.debug("Sent raise hand event", reaction.event_id);
|
|
||||||
} catch (ex) {
|
|
||||||
logger.error("Failed to send reaction event", ex);
|
|
||||||
} finally {
|
|
||||||
setBusy(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
void raiseHand();
|
|
||||||
}, [
|
|
||||||
client,
|
|
||||||
isHandRaised,
|
|
||||||
memberships,
|
|
||||||
rtcSession.room.roomId,
|
|
||||||
userId,
|
|
||||||
lowerHand,
|
|
||||||
]);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<InnerButton
|
|
||||||
disabled={busy}
|
|
||||||
onClick={toggleRaisedHand}
|
|
||||||
raised={isHandRaised}
|
|
||||||
/>
|
|
||||||
);
|
|
||||||
}
|
|
82
src/button/ReactionToggleButton.module.css
Normal file
82
src/button/ReactionToggleButton.module.css
Normal file
@ -0,0 +1,82 @@
|
|||||||
|
.raisedButton > svg {
|
||||||
|
color: var(--cpd-color-icon-on-solid-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.reactionPopupMenu {
|
||||||
|
display: flex;
|
||||||
|
}
|
||||||
|
|
||||||
|
.reactionPopupMenuModal {
|
||||||
|
width: fit-content !important;
|
||||||
|
top: 82vh !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.reactionPopupMenuModal > div > div {
|
||||||
|
padding-inline: var(--cpd-space-6x) !important;
|
||||||
|
padding-block: var(--cpd-space-6x) var(--cpd-space-8x) !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.reactionPopupMenu menu {
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: var(--cpd-separator-spacing);
|
||||||
|
}
|
||||||
|
|
||||||
|
.reactionPopupMenu section {
|
||||||
|
height: fit-content;
|
||||||
|
margin-top: auto;
|
||||||
|
margin-bottom: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.reactionPopupMenuItem {
|
||||||
|
list-style: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.reactionsMenu {
|
||||||
|
min-height: 3em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.reactionButton {
|
||||||
|
padding: 1em;
|
||||||
|
font-size: 1.6em;
|
||||||
|
width: 1.4em;
|
||||||
|
height: 1.4em;
|
||||||
|
border-radius: var(--cpd-radius-pill-effect);
|
||||||
|
}
|
||||||
|
|
||||||
|
.verticalSeperator {
|
||||||
|
background-color: var(--cpd-color-gray-800);
|
||||||
|
width: 1px;
|
||||||
|
height: auto;
|
||||||
|
margin-left: var(--cpd-separator-spacing);
|
||||||
|
margin-right: var(--cpd-separator-spacing);
|
||||||
|
}
|
||||||
|
|
||||||
|
.searchForm {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
gap: var(--cpd-separator-spacing);
|
||||||
|
margin-bottom: var(--cpd-space-3x);
|
||||||
|
}
|
||||||
|
|
||||||
|
.searchForm > label {
|
||||||
|
flex: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.alert {
|
||||||
|
margin-bottom: var(--cpd-space-3x);
|
||||||
|
animation: grow-in 200ms;
|
||||||
|
height: 2.5em;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes grow-in {
|
||||||
|
from {
|
||||||
|
height: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
to {
|
||||||
|
height: 2.5em;
|
||||||
|
}
|
||||||
|
}
|
214
src/button/ReactionToggleButton.test.tsx
Normal file
214
src/button/ReactionToggleButton.test.tsx
Normal file
@ -0,0 +1,214 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2024 New Vector Ltd.
|
||||||
|
|
||||||
|
SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
Please see LICENSE in the repository root for full details.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { fireEvent, render } from "@testing-library/react";
|
||||||
|
import { act } from "react";
|
||||||
|
import { expect, test } from "vitest";
|
||||||
|
import { MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc";
|
||||||
|
import { TooltipProvider } from "@vector-im/compound-web";
|
||||||
|
import { userEvent } from "@testing-library/user-event";
|
||||||
|
import { ReactNode } from "react";
|
||||||
|
|
||||||
|
import {
|
||||||
|
MockRoom,
|
||||||
|
MockRTCSession,
|
||||||
|
TestReactionsWrapper,
|
||||||
|
} from "../utils/testReactions";
|
||||||
|
import { ReactionToggleButton } from "./ReactionToggleButton";
|
||||||
|
import { ElementCallReactionEventType } from "../reactions";
|
||||||
|
|
||||||
|
const memberUserIdAlice = "@alice:example.org";
|
||||||
|
const memberEventAlice = "$membership-alice:example.org";
|
||||||
|
|
||||||
|
const membership: Record<string, string> = {
|
||||||
|
[memberEventAlice]: memberUserIdAlice,
|
||||||
|
};
|
||||||
|
|
||||||
|
function TestComponent({
|
||||||
|
rtcSession,
|
||||||
|
room,
|
||||||
|
}: {
|
||||||
|
rtcSession: MockRTCSession;
|
||||||
|
room: MockRoom;
|
||||||
|
}): ReactNode {
|
||||||
|
return (
|
||||||
|
<TooltipProvider>
|
||||||
|
<TestReactionsWrapper rtcSession={rtcSession}>
|
||||||
|
<ReactionToggleButton
|
||||||
|
rtcSession={rtcSession as unknown as MatrixRTCSession}
|
||||||
|
client={room.client}
|
||||||
|
/>
|
||||||
|
</TestReactionsWrapper>
|
||||||
|
</TooltipProvider>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
test("Can open menu", async () => {
|
||||||
|
const user = userEvent.setup();
|
||||||
|
const room = new MockRoom(memberUserIdAlice);
|
||||||
|
const rtcSession = new MockRTCSession(room, membership);
|
||||||
|
const { getByLabelText, container } = render(
|
||||||
|
<TestComponent rtcSession={rtcSession} room={room} />,
|
||||||
|
);
|
||||||
|
await user.click(getByLabelText("action.raise_hand_or_send_reaction"));
|
||||||
|
expect(container).toMatchSnapshot();
|
||||||
|
});
|
||||||
|
|
||||||
|
test("Can raise hand", async () => {
|
||||||
|
const user = userEvent.setup();
|
||||||
|
const room = new MockRoom(memberUserIdAlice);
|
||||||
|
const rtcSession = new MockRTCSession(room, membership);
|
||||||
|
const { getByLabelText, container } = render(
|
||||||
|
<TestComponent rtcSession={rtcSession} room={room} />,
|
||||||
|
);
|
||||||
|
await user.click(getByLabelText("action.raise_hand_or_send_reaction"));
|
||||||
|
await user.click(getByLabelText("action.raise_hand"));
|
||||||
|
expect(room.testSentEvents).toEqual([
|
||||||
|
[
|
||||||
|
undefined,
|
||||||
|
"m.reaction",
|
||||||
|
{
|
||||||
|
"m.relates_to": {
|
||||||
|
event_id: memberEventAlice,
|
||||||
|
key: "🖐️",
|
||||||
|
rel_type: "m.annotation",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
expect(container).toMatchSnapshot();
|
||||||
|
});
|
||||||
|
|
||||||
|
test("Can lower hand", async () => {
|
||||||
|
const user = userEvent.setup();
|
||||||
|
const room = new MockRoom(memberUserIdAlice);
|
||||||
|
const rtcSession = new MockRTCSession(room, membership);
|
||||||
|
const { getByLabelText, container } = render(
|
||||||
|
<TestComponent rtcSession={rtcSession} room={room} />,
|
||||||
|
);
|
||||||
|
const reactionEvent = room.testSendHandRaise(memberEventAlice, membership);
|
||||||
|
await user.click(getByLabelText("action.raise_hand_or_send_reaction"));
|
||||||
|
await user.click(getByLabelText("action.lower_hand"));
|
||||||
|
expect(room.testRedactedEvents).toEqual([[undefined, reactionEvent]]);
|
||||||
|
expect(container).toMatchSnapshot();
|
||||||
|
});
|
||||||
|
|
||||||
|
test("Can react with emoji", async () => {
|
||||||
|
const user = userEvent.setup();
|
||||||
|
const room = new MockRoom(memberUserIdAlice);
|
||||||
|
const rtcSession = new MockRTCSession(room, membership);
|
||||||
|
const { getByLabelText, getByText } = render(
|
||||||
|
<TestComponent rtcSession={rtcSession} room={room} />,
|
||||||
|
);
|
||||||
|
await user.click(getByLabelText("action.raise_hand_or_send_reaction"));
|
||||||
|
await user.click(getByText("🐶"));
|
||||||
|
expect(room.testSentEvents).toEqual([
|
||||||
|
[
|
||||||
|
undefined,
|
||||||
|
ElementCallReactionEventType,
|
||||||
|
{
|
||||||
|
"m.relates_to": {
|
||||||
|
event_id: memberEventAlice,
|
||||||
|
rel_type: "m.reference",
|
||||||
|
},
|
||||||
|
name: "dog",
|
||||||
|
emoji: "🐶",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("Can search for and send emoji", async () => {
|
||||||
|
const user = userEvent.setup();
|
||||||
|
const room = new MockRoom(memberUserIdAlice);
|
||||||
|
const rtcSession = new MockRTCSession(room, membership);
|
||||||
|
const { getByText, container, getByLabelText } = render(
|
||||||
|
<TestComponent rtcSession={rtcSession} room={room} />,
|
||||||
|
);
|
||||||
|
await user.click(getByLabelText("action.raise_hand_or_send_reaction"));
|
||||||
|
await user.click(getByLabelText("action.open_search"));
|
||||||
|
// Search should autofocus.
|
||||||
|
await user.keyboard("crickets");
|
||||||
|
expect(container).toMatchSnapshot();
|
||||||
|
await user.click(getByText("🦗"));
|
||||||
|
|
||||||
|
expect(room.testSentEvents).toEqual([
|
||||||
|
[
|
||||||
|
undefined,
|
||||||
|
ElementCallReactionEventType,
|
||||||
|
{
|
||||||
|
"m.relates_to": {
|
||||||
|
event_id: memberEventAlice,
|
||||||
|
rel_type: "m.reference",
|
||||||
|
},
|
||||||
|
name: "crickets",
|
||||||
|
emoji: "🦗",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("Can search for and send emoji with the keyboard", async () => {
|
||||||
|
const user = userEvent.setup();
|
||||||
|
const room = new MockRoom(memberUserIdAlice);
|
||||||
|
const rtcSession = new MockRTCSession(room, membership);
|
||||||
|
const { getByLabelText, getByPlaceholderText, container } = render(
|
||||||
|
<TestComponent rtcSession={rtcSession} room={room} />,
|
||||||
|
);
|
||||||
|
await user.click(getByLabelText("action.raise_hand_or_send_reaction"));
|
||||||
|
await user.click(getByLabelText("action.open_search"));
|
||||||
|
const searchField = getByPlaceholderText("reaction_search");
|
||||||
|
// Search should autofocus.
|
||||||
|
await user.keyboard("crickets");
|
||||||
|
expect(container).toMatchSnapshot();
|
||||||
|
act(() => {
|
||||||
|
fireEvent.keyDown(searchField, { key: "Enter" });
|
||||||
|
});
|
||||||
|
expect(room.testSentEvents).toEqual([
|
||||||
|
[
|
||||||
|
undefined,
|
||||||
|
ElementCallReactionEventType,
|
||||||
|
{
|
||||||
|
"m.relates_to": {
|
||||||
|
event_id: memberEventAlice,
|
||||||
|
rel_type: "m.reference",
|
||||||
|
},
|
||||||
|
name: "crickets",
|
||||||
|
emoji: "🦗",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("Can close search", async () => {
|
||||||
|
const user = userEvent.setup();
|
||||||
|
const room = new MockRoom(memberUserIdAlice);
|
||||||
|
const rtcSession = new MockRTCSession(room, membership);
|
||||||
|
const { getByLabelText, container } = render(
|
||||||
|
<TestComponent rtcSession={rtcSession} room={room} />,
|
||||||
|
);
|
||||||
|
await user.click(getByLabelText("action.raise_hand_or_send_reaction"));
|
||||||
|
await user.click(getByLabelText("action.open_search"));
|
||||||
|
await user.click(getByLabelText("action.close_search"));
|
||||||
|
expect(container).toMatchSnapshot();
|
||||||
|
});
|
||||||
|
|
||||||
|
test("Can close search with the escape key", async () => {
|
||||||
|
const user = userEvent.setup();
|
||||||
|
const room = new MockRoom(memberUserIdAlice);
|
||||||
|
const rtcSession = new MockRTCSession(room, membership);
|
||||||
|
const { getByLabelText, container, getByPlaceholderText } = render(
|
||||||
|
<TestComponent rtcSession={rtcSession} room={room} />,
|
||||||
|
);
|
||||||
|
await user.click(getByLabelText("action.raise_hand_or_send_reaction"));
|
||||||
|
await user.click(getByLabelText("action.open_search"));
|
||||||
|
const searchField = getByPlaceholderText("reaction_search");
|
||||||
|
act(() => {
|
||||||
|
fireEvent.keyDown(searchField, { key: "Escape" });
|
||||||
|
});
|
||||||
|
expect(container).toMatchSnapshot();
|
||||||
|
});
|
348
src/button/ReactionToggleButton.tsx
Normal file
348
src/button/ReactionToggleButton.tsx
Normal file
@ -0,0 +1,348 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2024 New Vector Ltd.
|
||||||
|
|
||||||
|
SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
Please see LICENSE in the repository root for full details.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import {
|
||||||
|
Button as CpdButton,
|
||||||
|
Tooltip,
|
||||||
|
Search,
|
||||||
|
Form,
|
||||||
|
Alert,
|
||||||
|
} from "@vector-im/compound-web";
|
||||||
|
import {
|
||||||
|
SearchIcon,
|
||||||
|
CloseIcon,
|
||||||
|
RaisedHandSolidIcon,
|
||||||
|
ReactionIcon,
|
||||||
|
} from "@vector-im/compound-design-tokens/assets/web/icons";
|
||||||
|
import {
|
||||||
|
ChangeEventHandler,
|
||||||
|
ComponentPropsWithoutRef,
|
||||||
|
FC,
|
||||||
|
KeyboardEventHandler,
|
||||||
|
ReactNode,
|
||||||
|
useCallback,
|
||||||
|
useEffect,
|
||||||
|
useMemo,
|
||||||
|
useState,
|
||||||
|
} from "react";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
import { logger } from "matrix-js-sdk/src/logger";
|
||||||
|
import { EventType, RelationType } from "matrix-js-sdk/src/matrix";
|
||||||
|
import { MatrixClient } from "matrix-js-sdk/src/client";
|
||||||
|
import { MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSession";
|
||||||
|
import classNames from "classnames";
|
||||||
|
|
||||||
|
import { useReactions } from "../useReactions";
|
||||||
|
import { useMatrixRTCSessionMemberships } from "../useMatrixRTCSessionMemberships";
|
||||||
|
import styles from "./ReactionToggleButton.module.css";
|
||||||
|
import {
|
||||||
|
ReactionOption,
|
||||||
|
ReactionSet,
|
||||||
|
ElementCallReactionEventType,
|
||||||
|
} from "../reactions";
|
||||||
|
import { Modal } from "../Modal";
|
||||||
|
|
||||||
|
interface InnerButtonProps extends ComponentPropsWithoutRef<"button"> {
|
||||||
|
raised: boolean;
|
||||||
|
open: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
const InnerButton: FC<InnerButtonProps> = ({ raised, open, ...props }) => {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Tooltip label={t("action.raise_hand_or_send_reaction")}>
|
||||||
|
<CpdButton
|
||||||
|
className={classNames(raised && styles.raisedButton)}
|
||||||
|
aria-expanded={open}
|
||||||
|
aria-haspopup
|
||||||
|
aria-label={t("action.raise_hand_or_send_reaction")}
|
||||||
|
kind={raised || open ? "primary" : "secondary"}
|
||||||
|
iconOnly
|
||||||
|
Icon={raised ? RaisedHandSolidIcon : ReactionIcon}
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
</Tooltip>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export function ReactionPopupMenu({
|
||||||
|
sendReaction,
|
||||||
|
toggleRaisedHand,
|
||||||
|
isHandRaised,
|
||||||
|
canReact,
|
||||||
|
errorText,
|
||||||
|
}: {
|
||||||
|
sendReaction: (reaction: ReactionOption) => void;
|
||||||
|
toggleRaisedHand: () => void;
|
||||||
|
errorText?: string;
|
||||||
|
isHandRaised: boolean;
|
||||||
|
canReact: boolean;
|
||||||
|
}): ReactNode {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
const [searchText, setSearchText] = useState("");
|
||||||
|
const [isSearching, setIsSearching] = useState(false);
|
||||||
|
const onSearch = useCallback<ChangeEventHandler<HTMLInputElement>>((ev) => {
|
||||||
|
ev.preventDefault();
|
||||||
|
setSearchText(ev.target.value.trim().toLocaleLowerCase());
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const filteredReactionSet = useMemo(
|
||||||
|
() =>
|
||||||
|
ReactionSet.filter(
|
||||||
|
(reaction) =>
|
||||||
|
!isSearching ||
|
||||||
|
(!!searchText &&
|
||||||
|
(reaction.name.startsWith(searchText) ||
|
||||||
|
reaction.alias?.some((a) => a.startsWith(searchText)))),
|
||||||
|
).slice(0, 6),
|
||||||
|
[searchText, isSearching],
|
||||||
|
);
|
||||||
|
|
||||||
|
const onSearchKeyDown = useCallback<KeyboardEventHandler<never>>(
|
||||||
|
(ev) => {
|
||||||
|
if (ev.key === "Enter") {
|
||||||
|
ev.preventDefault();
|
||||||
|
if (!canReact) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (filteredReactionSet.length !== 1) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
sendReaction(filteredReactionSet[0]);
|
||||||
|
setIsSearching(false);
|
||||||
|
} else if (ev.key === "Escape") {
|
||||||
|
ev.preventDefault();
|
||||||
|
setIsSearching(false);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[sendReaction, filteredReactionSet, canReact, setIsSearching],
|
||||||
|
);
|
||||||
|
const label = isHandRaised ? t("action.lower_hand") : t("action.raise_hand");
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
{errorText && (
|
||||||
|
<Alert
|
||||||
|
className={styles.alert}
|
||||||
|
type="critical"
|
||||||
|
title={t("common.something_went_wrong")}
|
||||||
|
>
|
||||||
|
{errorText}
|
||||||
|
</Alert>
|
||||||
|
)}
|
||||||
|
<div className={styles.reactionPopupMenu}>
|
||||||
|
<section className={styles.handRaiseSection}>
|
||||||
|
<Tooltip label={label}>
|
||||||
|
<CpdButton
|
||||||
|
kind={isHandRaised ? "primary" : "secondary"}
|
||||||
|
aria-pressed={isHandRaised}
|
||||||
|
aria-label={label}
|
||||||
|
onClick={() => toggleRaisedHand()}
|
||||||
|
iconOnly
|
||||||
|
Icon={RaisedHandSolidIcon}
|
||||||
|
/>
|
||||||
|
</Tooltip>
|
||||||
|
</section>
|
||||||
|
<div className={styles.verticalSeperator} />
|
||||||
|
<section>
|
||||||
|
{isSearching ? (
|
||||||
|
<>
|
||||||
|
<Form.Root className={styles.searchForm}>
|
||||||
|
<Search
|
||||||
|
required
|
||||||
|
value={searchText}
|
||||||
|
name="reactionSearch"
|
||||||
|
placeholder={t("reaction_search")}
|
||||||
|
onChange={onSearch}
|
||||||
|
onKeyDown={onSearchKeyDown}
|
||||||
|
// This is a reasonable use of autofocus, we are focusing when
|
||||||
|
// the search button is clicked (which matches the Element Web reaction picker)
|
||||||
|
// eslint-disable-next-line jsx-a11y/no-autofocus
|
||||||
|
autoFocus
|
||||||
|
/>
|
||||||
|
<CpdButton
|
||||||
|
Icon={CloseIcon}
|
||||||
|
aria-label={t("action.close_search")}
|
||||||
|
size="sm"
|
||||||
|
kind="destructive"
|
||||||
|
onClick={() => setIsSearching(false)}
|
||||||
|
/>
|
||||||
|
</Form.Root>
|
||||||
|
</>
|
||||||
|
) : null}
|
||||||
|
<menu className={styles.reactionsMenu}>
|
||||||
|
{filteredReactionSet.map((reaction) => (
|
||||||
|
<li className={styles.reactionPopupMenuItem} key={reaction.name}>
|
||||||
|
<Tooltip label={reaction.name}>
|
||||||
|
<CpdButton
|
||||||
|
kind="secondary"
|
||||||
|
className={styles.reactionButton}
|
||||||
|
disabled={!canReact}
|
||||||
|
onClick={() => sendReaction(reaction)}
|
||||||
|
>
|
||||||
|
{reaction.emoji}
|
||||||
|
</CpdButton>
|
||||||
|
</Tooltip>
|
||||||
|
</li>
|
||||||
|
))}
|
||||||
|
</menu>
|
||||||
|
</section>
|
||||||
|
{!isSearching ? (
|
||||||
|
<section style={{ marginLeft: "var(--cpd-separator-spacing)" }}>
|
||||||
|
<li key="search" className={styles.reactionPopupMenuItem}>
|
||||||
|
<Tooltip label={t("common.search")}>
|
||||||
|
<CpdButton
|
||||||
|
iconOnly
|
||||||
|
aria-label={t("action.open_search")}
|
||||||
|
Icon={SearchIcon}
|
||||||
|
kind="tertiary"
|
||||||
|
onClick={() => setIsSearching(true)}
|
||||||
|
/>
|
||||||
|
</Tooltip>
|
||||||
|
</li>
|
||||||
|
</section>
|
||||||
|
) : null}
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
interface ReactionToggleButtonProps {
|
||||||
|
rtcSession: MatrixRTCSession;
|
||||||
|
client: MatrixClient;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function ReactionToggleButton({
|
||||||
|
client,
|
||||||
|
rtcSession,
|
||||||
|
}: ReactionToggleButtonProps): ReactNode {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
const { raisedHands, lowerHand, reactions } = useReactions();
|
||||||
|
const [busy, setBusy] = useState(false);
|
||||||
|
const userId = client.getUserId()!;
|
||||||
|
const isHandRaised = !!raisedHands[userId];
|
||||||
|
const memberships = useMatrixRTCSessionMemberships(rtcSession);
|
||||||
|
const [showReactionsMenu, setShowReactionsMenu] = useState(false);
|
||||||
|
const [errorText, setErrorText] = useState<string>();
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
// Clear whenever the reactions menu state changes.
|
||||||
|
setErrorText(undefined);
|
||||||
|
}, [showReactionsMenu]);
|
||||||
|
|
||||||
|
const canReact = !reactions[userId];
|
||||||
|
|
||||||
|
const sendRelation = useCallback(
|
||||||
|
async (reaction: ReactionOption) => {
|
||||||
|
try {
|
||||||
|
const myMembership = memberships.find((m) => m.sender === userId);
|
||||||
|
if (!myMembership?.eventId) {
|
||||||
|
throw new Error("Cannot find own membership event");
|
||||||
|
}
|
||||||
|
const parentEventId = myMembership.eventId;
|
||||||
|
setBusy(true);
|
||||||
|
await client.sendEvent(
|
||||||
|
rtcSession.room.roomId,
|
||||||
|
ElementCallReactionEventType,
|
||||||
|
{
|
||||||
|
"m.relates_to": {
|
||||||
|
rel_type: RelationType.Reference,
|
||||||
|
event_id: parentEventId,
|
||||||
|
},
|
||||||
|
emoji: reaction.emoji,
|
||||||
|
name: reaction.name,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
setErrorText(undefined);
|
||||||
|
setShowReactionsMenu(false);
|
||||||
|
} catch (ex) {
|
||||||
|
setErrorText(ex instanceof Error ? ex.message : "Unknown error");
|
||||||
|
logger.error("Failed to send reaction", ex);
|
||||||
|
} finally {
|
||||||
|
setBusy(false);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[memberships, client, userId, rtcSession],
|
||||||
|
);
|
||||||
|
|
||||||
|
const toggleRaisedHand = useCallback(() => {
|
||||||
|
const raiseHand = async (): Promise<void> => {
|
||||||
|
if (isHandRaised) {
|
||||||
|
try {
|
||||||
|
setBusy(true);
|
||||||
|
await lowerHand();
|
||||||
|
setShowReactionsMenu(false);
|
||||||
|
} finally {
|
||||||
|
setBusy(false);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
try {
|
||||||
|
const myMembership = memberships.find((m) => m.sender === userId);
|
||||||
|
if (!myMembership?.eventId) {
|
||||||
|
throw new Error("Cannot find own membership event");
|
||||||
|
}
|
||||||
|
const parentEventId = myMembership.eventId;
|
||||||
|
setBusy(true);
|
||||||
|
const reaction = await client.sendEvent(
|
||||||
|
rtcSession.room.roomId,
|
||||||
|
EventType.Reaction,
|
||||||
|
{
|
||||||
|
"m.relates_to": {
|
||||||
|
rel_type: RelationType.Annotation,
|
||||||
|
event_id: parentEventId,
|
||||||
|
key: "🖐️",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
);
|
||||||
|
logger.debug("Sent raise hand event", reaction.event_id);
|
||||||
|
setErrorText(undefined);
|
||||||
|
setShowReactionsMenu(false);
|
||||||
|
} catch (ex) {
|
||||||
|
setErrorText(ex instanceof Error ? ex.message : "Unknown error");
|
||||||
|
logger.error("Failed to raise hand", ex);
|
||||||
|
} finally {
|
||||||
|
setBusy(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
void raiseHand();
|
||||||
|
}, [
|
||||||
|
client,
|
||||||
|
isHandRaised,
|
||||||
|
memberships,
|
||||||
|
lowerHand,
|
||||||
|
rtcSession.room.roomId,
|
||||||
|
userId,
|
||||||
|
]);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<InnerButton
|
||||||
|
disabled={busy}
|
||||||
|
onClick={() => setShowReactionsMenu((show) => !show)}
|
||||||
|
raised={isHandRaised}
|
||||||
|
open={showReactionsMenu}
|
||||||
|
/>
|
||||||
|
<Modal
|
||||||
|
open={showReactionsMenu}
|
||||||
|
title={t("action.pick_reaction")}
|
||||||
|
hideHeader
|
||||||
|
classNameModal={styles.reactionPopupMenuModal}
|
||||||
|
onDismiss={() => setShowReactionsMenu(false)}
|
||||||
|
>
|
||||||
|
<ReactionPopupMenu
|
||||||
|
errorText={errorText}
|
||||||
|
isHandRaised={isHandRaised}
|
||||||
|
canReact={canReact}
|
||||||
|
sendReaction={(reaction) => void sendRelation(reaction)}
|
||||||
|
toggleRaisedHand={toggleRaisedHand}
|
||||||
|
/>
|
||||||
|
</Modal>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
241
src/button/__snapshots__/ReactionToggleButton.test.tsx.snap
Normal file
241
src/button/__snapshots__/ReactionToggleButton.test.tsx.snap
Normal file
@ -0,0 +1,241 @@
|
|||||||
|
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
|
||||||
|
|
||||||
|
exports[`Can close search 1`] = `
|
||||||
|
<div
|
||||||
|
aria-hidden="true"
|
||||||
|
data-aria-hidden="true"
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
aria-disabled="false"
|
||||||
|
aria-expanded="true"
|
||||||
|
aria-haspopup="true"
|
||||||
|
aria-label="action.raise_hand_or_send_reaction"
|
||||||
|
aria-labelledby=":rec:"
|
||||||
|
class="_button_i91xf_17 _has-icon_i91xf_66 _icon-only_i91xf_59"
|
||||||
|
data-kind="primary"
|
||||||
|
data-size="lg"
|
||||||
|
role="button"
|
||||||
|
tabindex="0"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
aria-hidden="true"
|
||||||
|
fill="currentColor"
|
||||||
|
height="24"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
width="24"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M15.536 15.536a1 1 0 0 0-1.415-1.415 2.987 2.987 0 0 1-2.12.879 2.988 2.988 0 0 1-2.122-.879 1 1 0 1 0-1.414 1.415A4.987 4.987 0 0 0 12 17c1.38 0 2.632-.56 3.536-1.464ZM10 10.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0Zm5.5 1.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
d="M22 12c0 5.523-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2s10 4.477 10 10Zm-2 0a8 8 0 1 0-16 0 8 8 0 0 0 16 0Z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`Can close search with the escape key 1`] = `
|
||||||
|
<div>
|
||||||
|
<button
|
||||||
|
aria-disabled="false"
|
||||||
|
aria-expanded="false"
|
||||||
|
aria-haspopup="true"
|
||||||
|
aria-label="action.raise_hand_or_send_reaction"
|
||||||
|
aria-labelledby=":rhh:"
|
||||||
|
class="_button_i91xf_17 _has-icon_i91xf_66 _icon-only_i91xf_59"
|
||||||
|
data-kind="secondary"
|
||||||
|
data-size="lg"
|
||||||
|
role="button"
|
||||||
|
tabindex="0"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
aria-hidden="true"
|
||||||
|
fill="currentColor"
|
||||||
|
height="24"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
width="24"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M15.536 15.536a1 1 0 0 0-1.415-1.415 2.987 2.987 0 0 1-2.12.879 2.988 2.988 0 0 1-2.122-.879 1 1 0 1 0-1.414 1.415A4.987 4.987 0 0 0 12 17c1.38 0 2.632-.56 3.536-1.464ZM10 10.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0Zm5.5 1.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
d="M22 12c0 5.523-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2s10 4.477 10 10Zm-2 0a8 8 0 1 0-16 0 8 8 0 0 0 16 0Z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`Can lower hand 1`] = `
|
||||||
|
<div>
|
||||||
|
<button
|
||||||
|
aria-disabled="false"
|
||||||
|
aria-expanded="false"
|
||||||
|
aria-haspopup="true"
|
||||||
|
aria-label="action.raise_hand_or_send_reaction"
|
||||||
|
aria-labelledby=":r3i:"
|
||||||
|
class="_button_i91xf_17 raisedButton _has-icon_i91xf_66 _icon-only_i91xf_59"
|
||||||
|
data-kind="primary"
|
||||||
|
data-size="lg"
|
||||||
|
role="button"
|
||||||
|
tabindex="0"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
aria-hidden="true"
|
||||||
|
fill="currentColor"
|
||||||
|
height="24"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
width="24"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M11 3a1 1 0 1 1 2 0v8.5a.5.5 0 0 0 1 0V4a1 1 0 1 1 2 0v10.2l3.284-2.597a1.081 1.081 0 0 1 1.47 1.577c-.613.673-1.214 1.367-1.818 2.064-1.267 1.463-2.541 2.934-3.944 4.235A6 6 0 0 1 5 15V7a1 1 0 0 1 2 0v5.5a.5.5 0 0 0 1 0V4a1 1 0 0 1 2 0v7.5a.5.5 0 0 0 1 0V3Z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`Can open menu 1`] = `
|
||||||
|
<div
|
||||||
|
aria-hidden="true"
|
||||||
|
data-aria-hidden="true"
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
aria-disabled="false"
|
||||||
|
aria-expanded="true"
|
||||||
|
aria-haspopup="true"
|
||||||
|
aria-label="action.raise_hand_or_send_reaction"
|
||||||
|
aria-labelledby=":r0:"
|
||||||
|
class="_button_i91xf_17 _has-icon_i91xf_66 _icon-only_i91xf_59"
|
||||||
|
data-kind="primary"
|
||||||
|
data-size="lg"
|
||||||
|
role="button"
|
||||||
|
tabindex="0"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
aria-hidden="true"
|
||||||
|
fill="currentColor"
|
||||||
|
height="24"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
width="24"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M15.536 15.536a1 1 0 0 0-1.415-1.415 2.987 2.987 0 0 1-2.12.879 2.988 2.988 0 0 1-2.122-.879 1 1 0 1 0-1.414 1.415A4.987 4.987 0 0 0 12 17c1.38 0 2.632-.56 3.536-1.464ZM10 10.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0Zm5.5 1.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
d="M22 12c0 5.523-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2s10 4.477 10 10Zm-2 0a8 8 0 1 0-16 0 8 8 0 0 0 16 0Z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`Can raise hand 1`] = `
|
||||||
|
<div>
|
||||||
|
<button
|
||||||
|
aria-disabled="false"
|
||||||
|
aria-expanded="false"
|
||||||
|
aria-haspopup="true"
|
||||||
|
aria-label="action.raise_hand_or_send_reaction"
|
||||||
|
aria-labelledby=":r1p:"
|
||||||
|
class="_button_i91xf_17 _has-icon_i91xf_66 _icon-only_i91xf_59"
|
||||||
|
data-kind="secondary"
|
||||||
|
data-size="lg"
|
||||||
|
role="button"
|
||||||
|
tabindex="0"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
aria-hidden="true"
|
||||||
|
fill="currentColor"
|
||||||
|
height="24"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
width="24"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M15.536 15.536a1 1 0 0 0-1.415-1.415 2.987 2.987 0 0 1-2.12.879 2.988 2.988 0 0 1-2.122-.879 1 1 0 1 0-1.414 1.415A4.987 4.987 0 0 0 12 17c1.38 0 2.632-.56 3.536-1.464ZM10 10.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0Zm5.5 1.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
d="M22 12c0 5.523-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2s10 4.477 10 10Zm-2 0a8 8 0 1 0-16 0 8 8 0 0 0 16 0Z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`Can search for and send emoji 1`] = `
|
||||||
|
<div
|
||||||
|
aria-hidden="true"
|
||||||
|
data-aria-hidden="true"
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
aria-disabled="false"
|
||||||
|
aria-expanded="true"
|
||||||
|
aria-haspopup="true"
|
||||||
|
aria-label="action.raise_hand_or_send_reaction"
|
||||||
|
aria-labelledby=":r74:"
|
||||||
|
class="_button_i91xf_17 _has-icon_i91xf_66 _icon-only_i91xf_59"
|
||||||
|
data-kind="primary"
|
||||||
|
data-size="lg"
|
||||||
|
role="button"
|
||||||
|
tabindex="0"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
aria-hidden="true"
|
||||||
|
fill="currentColor"
|
||||||
|
height="24"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
width="24"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M15.536 15.536a1 1 0 0 0-1.415-1.415 2.987 2.987 0 0 1-2.12.879 2.988 2.988 0 0 1-2.122-.879 1 1 0 1 0-1.414 1.415A4.987 4.987 0 0 0 12 17c1.38 0 2.632-.56 3.536-1.464ZM10 10.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0Zm5.5 1.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
d="M22 12c0 5.523-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2s10 4.477 10 10Zm-2 0a8 8 0 1 0-16 0 8 8 0 0 0 16 0Z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`Can search for and send emoji with the keyboard 1`] = `
|
||||||
|
<div
|
||||||
|
aria-hidden="true"
|
||||||
|
data-aria-hidden="true"
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
aria-disabled="false"
|
||||||
|
aria-expanded="true"
|
||||||
|
aria-haspopup="true"
|
||||||
|
aria-label="action.raise_hand_or_send_reaction"
|
||||||
|
aria-labelledby=":ra3:"
|
||||||
|
class="_button_i91xf_17 _has-icon_i91xf_66 _icon-only_i91xf_59"
|
||||||
|
data-kind="primary"
|
||||||
|
data-size="lg"
|
||||||
|
role="button"
|
||||||
|
tabindex="0"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
aria-hidden="true"
|
||||||
|
fill="currentColor"
|
||||||
|
height="24"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
width="24"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M15.536 15.536a1 1 0 0 0-1.415-1.415 2.987 2.987 0 0 1-2.12.879 2.988 2.988 0 0 1-2.122-.879 1 1 0 1 0-1.414 1.415A4.987 4.987 0 0 0 12 17c1.38 0 2.632-.56 3.536-1.464ZM10 10.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0Zm5.5 1.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
d="M22 12c0 5.523-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2s10 4.477 10 10Zm-2 0a8 8 0 1 0-16 0 8 8 0 0 0 16 0Z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
`;
|
@ -7,4 +7,4 @@ Please see LICENSE in the repository root for full details.
|
|||||||
|
|
||||||
export * from "./Button";
|
export * from "./Button";
|
||||||
export * from "./LinkButton";
|
export * from "./LinkButton";
|
||||||
export * from "./RaisedHandToggleButton";
|
export * from "./ReactionToggleButton";
|
||||||
|
@ -20,6 +20,8 @@ import {
|
|||||||
setLogExtension as setLKLogExtension,
|
setLogExtension as setLKLogExtension,
|
||||||
setLogLevel as setLKLogLevel,
|
setLogLevel as setLKLogLevel,
|
||||||
} from "livekit-client";
|
} from "livekit-client";
|
||||||
|
import "@formatjs/intl-segmenter/polyfill";
|
||||||
|
import "@formatjs/intl-durationformat/polyfill";
|
||||||
|
|
||||||
import { App } from "./App";
|
import { App } from "./App";
|
||||||
import { init as initRageshake } from "./settings/rageshake";
|
import { init as initRageshake } from "./settings/rageshake";
|
||||||
|
@ -12,11 +12,10 @@ import {
|
|||||||
useEffect,
|
useEffect,
|
||||||
useState,
|
useState,
|
||||||
} from "react";
|
} from "react";
|
||||||
import classNames from "classnames";
|
|
||||||
import "@formatjs/intl-durationformat/polyfill";
|
|
||||||
import { DurationFormat } from "@formatjs/intl-durationformat";
|
import { DurationFormat } from "@formatjs/intl-durationformat";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
|
||||||
import styles from "./RaisedHandIndicator.module.css";
|
import { ReactionIndicator } from "./ReactionIndicator";
|
||||||
|
|
||||||
const durationFormatter = new DurationFormat(undefined, {
|
const durationFormatter = new DurationFormat(undefined, {
|
||||||
minutesDisplay: "always",
|
minutesDisplay: "always",
|
||||||
@ -36,6 +35,7 @@ export function RaisedHandIndicator({
|
|||||||
showTimer?: boolean;
|
showTimer?: boolean;
|
||||||
onClick?: () => void;
|
onClick?: () => void;
|
||||||
}): ReactNode {
|
}): ReactNode {
|
||||||
|
const { t } = useTranslation();
|
||||||
const [raisedHandDuration, setRaisedHandDuration] = useState("");
|
const [raisedHandDuration, setRaisedHandDuration] = useState("");
|
||||||
|
|
||||||
const clickCallback = useCallback<MouseEventHandler<HTMLButtonElement>>(
|
const clickCallback = useCallback<MouseEventHandler<HTMLButtonElement>>(
|
||||||
@ -76,29 +76,19 @@ export function RaisedHandIndicator({
|
|||||||
}
|
}
|
||||||
|
|
||||||
const content = (
|
const content = (
|
||||||
<div
|
<ReactionIndicator emoji="✋" miniature={miniature}>
|
||||||
className={classNames(styles.raisedHandWidget, {
|
|
||||||
[styles.raisedHandWidgetLarge]: !miniature,
|
|
||||||
})}
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
className={classNames(styles.raisedHand, {
|
|
||||||
[styles.raisedHandLarge]: !miniature,
|
|
||||||
})}
|
|
||||||
>
|
|
||||||
<span role="img" aria-label="raised hand">
|
|
||||||
✋
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
{showTimer && <p>{raisedHandDuration}</p>}
|
{showTimer && <p>{raisedHandDuration}</p>}
|
||||||
</div>
|
</ReactionIndicator>
|
||||||
);
|
);
|
||||||
|
|
||||||
if (onClick) {
|
if (onClick) {
|
||||||
return (
|
return (
|
||||||
<button
|
<button
|
||||||
aria-label="lower raised hand"
|
aria-label={t("action.lower_hand")}
|
||||||
className={styles.button}
|
style={{
|
||||||
|
display: "contents",
|
||||||
|
background: "none",
|
||||||
|
}}
|
||||||
onClick={clickCallback}
|
onClick={clickCallback}
|
||||||
>
|
>
|
||||||
{content}
|
{content}
|
||||||
|
@ -1,33 +1,28 @@
|
|||||||
.raisedHandWidget {
|
.reactionIndicatorWidget {
|
||||||
display: flex;
|
display: flex;
|
||||||
background-color: var(--cpd-color-bg-subtle-primary);
|
background-color: var(--cpd-color-bg-subtle-primary);
|
||||||
border-radius: var(--cpd-radius-pill-effect);
|
border-radius: var(--cpd-radius-pill-effect);
|
||||||
color: var(--cpd-color-icon-secondary);
|
color: var(--cpd-color-icon-secondary);
|
||||||
}
|
}
|
||||||
|
|
||||||
.button {
|
.reactionIndicatorWidget > p {
|
||||||
display: contents;
|
|
||||||
background: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.raisedHandWidget > p {
|
|
||||||
padding: none;
|
padding: none;
|
||||||
margin-top: auto;
|
margin-top: auto;
|
||||||
margin-bottom: auto;
|
margin-bottom: auto;
|
||||||
width: 4em;
|
width: 4em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.raisedHandWidgetLarge > p {
|
.reactionIndicatorWidgetLarge > p {
|
||||||
padding: var(--cpd-space-2x);
|
padding: var(--cpd-space-2x);
|
||||||
}
|
}
|
||||||
|
|
||||||
.raisedHandLarge {
|
.reactionLarge {
|
||||||
margin: var(--cpd-space-2x);
|
margin: var(--cpd-space-2x);
|
||||||
padding: var(--cpd-space-2x);
|
padding: var(--cpd-space-4x);
|
||||||
padding-block: var(--cpd-space-2x);
|
padding-block: var(--cpd-space-4x);
|
||||||
}
|
}
|
||||||
|
|
||||||
.raisedHand {
|
.reaction {
|
||||||
margin: var(--cpd-space-1x);
|
margin: var(--cpd-space-1x);
|
||||||
color: var(--cpd-color-icon-secondary);
|
color: var(--cpd-color-icon-secondary);
|
||||||
background-color: var(--cpd-color-icon-secondary);
|
background-color: var(--cpd-color-icon-secondary);
|
||||||
@ -40,18 +35,22 @@
|
|||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
max-inline-size: 100%;
|
max-inline-size: 100%;
|
||||||
max-width: fit-content;
|
max-width: fit-content;
|
||||||
|
padding: var(--cpd-space-1x);
|
||||||
|
padding-block: var(--cpd-space-1x);
|
||||||
}
|
}
|
||||||
|
|
||||||
.raisedHand > span {
|
.reaction > span {
|
||||||
width: var(--cpd-space-6x);
|
width: var(--cpd-space-6x);
|
||||||
height: var(--cpd-space-6x);
|
height: var(--cpd-space-6x);
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
font-size: 1.3em;
|
font-size: 1.2em;
|
||||||
|
/* Centralise */
|
||||||
|
line-height: 1.2;
|
||||||
}
|
}
|
||||||
|
|
||||||
.raisedHandLarge > span {
|
.reactionLarge > span {
|
||||||
width: var(--cpd-space-8x);
|
width: 30px;
|
||||||
height: var(--cpd-space-8x);
|
height: 30px;
|
||||||
font-size: 1.9em;
|
font-size: 25px;
|
||||||
}
|
}
|
41
src/reactions/ReactionIndicator.tsx
Normal file
41
src/reactions/ReactionIndicator.tsx
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2024 New Vector Ltd.
|
||||||
|
|
||||||
|
SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
Please see LICENSE in the repository root for full details.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { PropsWithChildren, ReactNode } from "react";
|
||||||
|
import classNames from "classnames";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
|
||||||
|
import styles from "./ReactionIndicator.module.css";
|
||||||
|
|
||||||
|
export function ReactionIndicator({
|
||||||
|
emoji,
|
||||||
|
miniature,
|
||||||
|
children,
|
||||||
|
}: PropsWithChildren<{
|
||||||
|
miniature?: boolean;
|
||||||
|
emoji: string;
|
||||||
|
}>): ReactNode {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
className={classNames(styles.reactionIndicatorWidget, {
|
||||||
|
[styles.reactionIndicatorWidgetLarge]: !miniature,
|
||||||
|
})}
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
className={classNames(styles.reaction, {
|
||||||
|
[styles.reactionLarge]: !miniature,
|
||||||
|
})}
|
||||||
|
>
|
||||||
|
<span role="img" aria-label={t("common.reaction")}>
|
||||||
|
{emoji}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
{children}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
@ -2,13 +2,13 @@
|
|||||||
|
|
||||||
exports[`RaisedHandIndicator > renders a smaller indicator when miniature is specified 1`] = `
|
exports[`RaisedHandIndicator > renders a smaller indicator when miniature is specified 1`] = `
|
||||||
<div
|
<div
|
||||||
class="raisedHandWidget"
|
class="reactionIndicatorWidget"
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
class="raisedHand"
|
class="reaction"
|
||||||
>
|
>
|
||||||
<span
|
<span
|
||||||
aria-label="raised hand"
|
aria-label="common.reaction"
|
||||||
role="img"
|
role="img"
|
||||||
>
|
>
|
||||||
✋
|
✋
|
||||||
@ -22,13 +22,13 @@ exports[`RaisedHandIndicator > renders a smaller indicator when miniature is spe
|
|||||||
|
|
||||||
exports[`RaisedHandIndicator > renders an indicator when a hand has been raised 1`] = `
|
exports[`RaisedHandIndicator > renders an indicator when a hand has been raised 1`] = `
|
||||||
<div
|
<div
|
||||||
class="raisedHandWidget raisedHandWidgetLarge"
|
class="reactionIndicatorWidget reactionIndicatorWidgetLarge"
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
class="raisedHand raisedHandLarge"
|
class="reaction reactionLarge"
|
||||||
>
|
>
|
||||||
<span
|
<span
|
||||||
aria-label="raised hand"
|
aria-label="common.reaction"
|
||||||
role="img"
|
role="img"
|
||||||
>
|
>
|
||||||
✋
|
✋
|
||||||
@ -42,13 +42,13 @@ exports[`RaisedHandIndicator > renders an indicator when a hand has been raised
|
|||||||
|
|
||||||
exports[`RaisedHandIndicator > renders an indicator when a hand has been raised with the expected time 1`] = `
|
exports[`RaisedHandIndicator > renders an indicator when a hand has been raised with the expected time 1`] = `
|
||||||
<div
|
<div
|
||||||
class="raisedHandWidget raisedHandWidgetLarge"
|
class="reactionIndicatorWidget reactionIndicatorWidgetLarge"
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
class="raisedHand raisedHandLarge"
|
class="reaction reactionLarge"
|
||||||
>
|
>
|
||||||
<span
|
<span
|
||||||
aria-label="raised hand"
|
aria-label="common.reaction"
|
||||||
role="img"
|
role="img"
|
||||||
>
|
>
|
||||||
✋
|
✋
|
||||||
|
181
src/reactions/index.ts
Normal file
181
src/reactions/index.ts
Normal file
@ -0,0 +1,181 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2024 New Vector Ltd.
|
||||||
|
|
||||||
|
SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
Please see LICENSE in the repository root for full details.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { RelationType } from "matrix-js-sdk/src/types";
|
||||||
|
|
||||||
|
import catSoundOgg from "../sound/reactions/cat.ogg?url";
|
||||||
|
import catSoundMp3 from "../sound/reactions/cat.mp3?url";
|
||||||
|
import clapSoundOgg from "../sound/reactions/clap.ogg?url";
|
||||||
|
import clapSoundMp3 from "../sound/reactions/clap.mp3?url";
|
||||||
|
import cricketsSoundOgg from "../sound/reactions/crickets.ogg?url";
|
||||||
|
import cricketsSoundMp3 from "../sound/reactions/crickets.mp3?url";
|
||||||
|
import dogSoundOgg from "../sound/reactions/dog.ogg?url";
|
||||||
|
import dogSoundMp3 from "../sound/reactions/dog.mp3?url";
|
||||||
|
import genericSoundOgg from "../sound/reactions/generic.ogg?url";
|
||||||
|
import genericSoundMp3 from "../sound/reactions/generic.mp3?url";
|
||||||
|
import lightbulbSoundOgg from "../sound/reactions/lightbulb.ogg?url";
|
||||||
|
import lightbulbSoundMp3 from "../sound/reactions/lightbulb.mp3?url";
|
||||||
|
import partySoundOgg from "../sound/reactions/party.ogg?url";
|
||||||
|
import partySoundMp3 from "../sound/reactions/party.mp3?url";
|
||||||
|
import deerSoundOgg from "../sound/reactions/deer.ogg?url";
|
||||||
|
import deerSoundMp3 from "../sound/reactions/deer.mp3?url";
|
||||||
|
import rockSoundOgg from "../sound/reactions/rock.ogg?url";
|
||||||
|
import rockSoundMp3 from "../sound/reactions/rock.mp3?url";
|
||||||
|
|
||||||
|
export const ElementCallReactionEventType = "io.element.call.reaction";
|
||||||
|
|
||||||
|
export interface ReactionOption {
|
||||||
|
/**
|
||||||
|
* The emoji to display. This is always displayed even if no emoji is matched
|
||||||
|
* from `ReactionSet`.
|
||||||
|
*
|
||||||
|
* @note Any excess characters are trimmed from this string.
|
||||||
|
*/
|
||||||
|
emoji: string;
|
||||||
|
/**
|
||||||
|
* The name of the emoji. This is the unique key used when looking for a local
|
||||||
|
* effect in our `ReactionSet` array.
|
||||||
|
*/
|
||||||
|
name: string;
|
||||||
|
/**
|
||||||
|
* Optional aliases to look for when searching for an emoji in the interface.
|
||||||
|
*/
|
||||||
|
alias?: string[];
|
||||||
|
/**
|
||||||
|
* Optional sound to play. An ogg sound must always be provided.
|
||||||
|
* If this sound isn't given, `GenericReaction` is used.
|
||||||
|
*/
|
||||||
|
sound?: {
|
||||||
|
mp3?: string;
|
||||||
|
ogg: string;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ECallReactionEventContent {
|
||||||
|
"m.relates_to": {
|
||||||
|
rel_type: RelationType.Reference;
|
||||||
|
event_id: string;
|
||||||
|
};
|
||||||
|
emoji: string;
|
||||||
|
name: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const GenericReaction: ReactionOption = {
|
||||||
|
name: "generic",
|
||||||
|
emoji: "", // Filled in by user
|
||||||
|
sound: {
|
||||||
|
mp3: genericSoundMp3,
|
||||||
|
ogg: genericSoundOgg,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
// The first 6 reactions are always visible.
|
||||||
|
export const ReactionSet: ReactionOption[] = [
|
||||||
|
{
|
||||||
|
emoji: "👍",
|
||||||
|
name: "thumbsup",
|
||||||
|
// TODO: These need to be translated.
|
||||||
|
alias: ["+1", "yes", "thumbs up"],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
emoji: "🎉",
|
||||||
|
name: "party",
|
||||||
|
alias: ["hurray", "success"],
|
||||||
|
sound: {
|
||||||
|
ogg: partySoundOgg,
|
||||||
|
mp3: partySoundMp3,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
emoji: "👏",
|
||||||
|
name: "clapping",
|
||||||
|
alias: ["celebrate", "success"],
|
||||||
|
sound: {
|
||||||
|
ogg: clapSoundOgg,
|
||||||
|
mp3: clapSoundMp3,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
emoji: "🐶",
|
||||||
|
name: "dog",
|
||||||
|
alias: ["doggo", "pupper", "woofer", "bark"],
|
||||||
|
sound: {
|
||||||
|
ogg: dogSoundOgg,
|
||||||
|
mp3: dogSoundMp3,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
emoji: "🐱",
|
||||||
|
name: "cat",
|
||||||
|
alias: ["meow", "kitty"],
|
||||||
|
sound: {
|
||||||
|
ogg: catSoundOgg,
|
||||||
|
mp3: catSoundMp3,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
emoji: "💡",
|
||||||
|
name: "lightbulb",
|
||||||
|
alias: ["bulb", "light", "idea", "ping"],
|
||||||
|
sound: {
|
||||||
|
ogg: lightbulbSoundOgg,
|
||||||
|
mp3: lightbulbSoundMp3,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
emoji: "🦗",
|
||||||
|
name: "crickets",
|
||||||
|
alias: ["awkward", "silence"],
|
||||||
|
sound: {
|
||||||
|
ogg: cricketsSoundOgg,
|
||||||
|
mp3: cricketsSoundMp3,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
emoji: "👎",
|
||||||
|
name: "thumbsdown",
|
||||||
|
alias: ["-1", "no", "thumbs no"],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
emoji: "😵💫",
|
||||||
|
name: "dizzy",
|
||||||
|
alias: ["dazed", "confused"],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
emoji: "👌",
|
||||||
|
name: "ok",
|
||||||
|
alias: ["okay", "cool"],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
emoji: "🥰",
|
||||||
|
name: "heart",
|
||||||
|
alias: ["heart", "love", "smiling"],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
emoji: "😄",
|
||||||
|
name: "laugh",
|
||||||
|
alias: ["giggle", "joy", "smiling"],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
emoji: "🦌",
|
||||||
|
name: "deer",
|
||||||
|
alias: ["stag", "doe", "bleat"],
|
||||||
|
sound: {
|
||||||
|
ogg: deerSoundOgg,
|
||||||
|
mp3: deerSoundMp3,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
emoji: "🤘",
|
||||||
|
name: "rock",
|
||||||
|
alias: ["cool", "horns", "guitar"],
|
||||||
|
sound: {
|
||||||
|
ogg: rockSoundOgg,
|
||||||
|
mp3: rockSoundMp3,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
];
|
@ -144,3 +144,48 @@ Please see LICENSE in the repository root for full details.
|
|||||||
position: relative;
|
position: relative;
|
||||||
flex-grow: 1;
|
flex-grow: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.floatingReaction {
|
||||||
|
position: relative;
|
||||||
|
display: inline;
|
||||||
|
z-index: 2;
|
||||||
|
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;
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes reaction-up {
|
||||||
|
from {
|
||||||
|
opacity: 1;
|
||||||
|
translate: 100vw 0;
|
||||||
|
scale: 200%;
|
||||||
|
}
|
||||||
|
|
||||||
|
to {
|
||||||
|
opacity: 0;
|
||||||
|
translate: 100vw -100vh;
|
||||||
|
scale: 100%;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (prefers-reduced-motion) {
|
||||||
|
@keyframes reaction-up-reduced {
|
||||||
|
from {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
to {
|
||||||
|
opacity: 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.floatingReaction {
|
||||||
|
font-size: 48pt;
|
||||||
|
animation-name: reaction-up-reduced;
|
||||||
|
top: calc(-50vh + (48pt / 2));
|
||||||
|
left: calc(50vw - (48pt / 2)) !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -41,7 +41,7 @@ import {
|
|||||||
VideoButton,
|
VideoButton,
|
||||||
ShareScreenButton,
|
ShareScreenButton,
|
||||||
SettingsButton,
|
SettingsButton,
|
||||||
RaiseHandToggleButton,
|
ReactionToggleButton,
|
||||||
SwitchCameraButton,
|
SwitchCameraButton,
|
||||||
} from "../button";
|
} from "../button";
|
||||||
import { Header, LeftNav, RightNav, RoomHeaderInfo } from "../Header";
|
import { Header, LeftNav, RightNav, RoomHeaderInfo } from "../Header";
|
||||||
@ -83,7 +83,9 @@ import { GridTileViewModel, TileViewModel } from "../state/TileViewModel";
|
|||||||
import { ReactionsProvider, useReactions } from "../useReactions";
|
import { ReactionsProvider, useReactions } from "../useReactions";
|
||||||
import handSoundOgg from "../sound/raise_hand.ogg?url";
|
import handSoundOgg from "../sound/raise_hand.ogg?url";
|
||||||
import handSoundMp3 from "../sound/raise_hand.mp3?url";
|
import handSoundMp3 from "../sound/raise_hand.mp3?url";
|
||||||
|
import { ReactionsAudioRenderer } from "./ReactionAudioRenderer";
|
||||||
import { useSwitchCamera } from "./useSwitchCamera";
|
import { useSwitchCamera } from "./useSwitchCamera";
|
||||||
|
import { showReactions, useSetting } from "../settings/settings";
|
||||||
|
|
||||||
const canScreenshare = "getDisplayMedia" in (navigator.mediaDevices ?? {});
|
const canScreenshare = "getDisplayMedia" in (navigator.mediaDevices ?? {});
|
||||||
|
|
||||||
@ -179,13 +181,26 @@ export const InCallView: FC<InCallViewProps> = ({
|
|||||||
connState,
|
connState,
|
||||||
onShareClick,
|
onShareClick,
|
||||||
}) => {
|
}) => {
|
||||||
const { supportsReactions, raisedHands } = useReactions();
|
const [shouldShowReactions] = useSetting(showReactions);
|
||||||
|
const { supportsReactions, raisedHands, reactions } = useReactions();
|
||||||
const raisedHandCount = useMemo(
|
const raisedHandCount = useMemo(
|
||||||
() => Object.keys(raisedHands).length,
|
() => Object.keys(raisedHands).length,
|
||||||
[raisedHands],
|
[raisedHands],
|
||||||
);
|
);
|
||||||
const previousRaisedHandCount = useDeferredValue(raisedHandCount);
|
const previousRaisedHandCount = useDeferredValue(raisedHandCount);
|
||||||
|
|
||||||
|
const reactionsIcons = useMemo(
|
||||||
|
() =>
|
||||||
|
shouldShowReactions
|
||||||
|
? Object.entries(reactions).map(([sender, { emoji }]) => ({
|
||||||
|
sender,
|
||||||
|
emoji,
|
||||||
|
startX: -Math.ceil(Math.random() * 50) - 25,
|
||||||
|
}))
|
||||||
|
: [],
|
||||||
|
[shouldShowReactions, reactions],
|
||||||
|
);
|
||||||
|
|
||||||
useWakeLock();
|
useWakeLock();
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@ -551,7 +566,7 @@ export const InCallView: FC<InCallViewProps> = ({
|
|||||||
}
|
}
|
||||||
if (supportsReactions) {
|
if (supportsReactions) {
|
||||||
buttons.push(
|
buttons.push(
|
||||||
<RaiseHandToggleButton
|
<ReactionToggleButton
|
||||||
client={client}
|
client={client}
|
||||||
rtcSession={rtcSession}
|
rtcSession={rtcSession}
|
||||||
key="4"
|
key="4"
|
||||||
@ -639,10 +654,20 @@ export const InCallView: FC<InCallViewProps> = ({
|
|||||||
))}
|
))}
|
||||||
<RoomAudioRenderer />
|
<RoomAudioRenderer />
|
||||||
{renderContent()}
|
{renderContent()}
|
||||||
<audio ref={handRaisePlayer} hidden>
|
<audio ref={handRaisePlayer} preload="auto" hidden>
|
||||||
<source src={handSoundOgg} type="audio/ogg; codecs=vorbis" />
|
<source src={handSoundOgg} type="audio/ogg; codecs=vorbis" />
|
||||||
<source src={handSoundMp3} type="audio/mpeg" />
|
<source src={handSoundMp3} type="audio/mpeg" />
|
||||||
</audio>
|
</audio>
|
||||||
|
<ReactionsAudioRenderer />
|
||||||
|
{reactionsIcons.map(({ sender, emoji, startX }) => (
|
||||||
|
<span
|
||||||
|
style={{ left: `${startX}vw` }}
|
||||||
|
className={styles.floatingReaction}
|
||||||
|
key={sender}
|
||||||
|
>
|
||||||
|
{emoji}
|
||||||
|
</span>
|
||||||
|
))}
|
||||||
{footer}
|
{footer}
|
||||||
{!noControls && <RageshakeRequestModal {...rageshakeRequestModalProps} />}
|
{!noControls && <RageshakeRequestModal {...rageshakeRequestModalProps} />}
|
||||||
<SettingsModal
|
<SettingsModal
|
||||||
|
155
src/room/ReactionAudioRenderer.test.tsx
Normal file
155
src/room/ReactionAudioRenderer.test.tsx
Normal file
@ -0,0 +1,155 @@
|
|||||||
|
/*
|
||||||
|
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 { afterAll, expect, test } from "vitest";
|
||||||
|
import { TooltipProvider } from "@vector-im/compound-web";
|
||||||
|
import { act, ReactNode } from "react";
|
||||||
|
|
||||||
|
import {
|
||||||
|
MockRoom,
|
||||||
|
MockRTCSession,
|
||||||
|
TestReactionsWrapper,
|
||||||
|
} from "../utils/testReactions";
|
||||||
|
import { ReactionsAudioRenderer } from "./ReactionAudioRenderer";
|
||||||
|
import { GenericReaction, ReactionSet } from "../reactions";
|
||||||
|
import { playReactionsSound } from "../settings/settings";
|
||||||
|
|
||||||
|
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}>
|
||||||
|
<ReactionsAudioRenderer />
|
||||||
|
</TestReactionsWrapper>
|
||||||
|
</TooltipProvider>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const originalPlayFn = window.HTMLMediaElement.prototype.play;
|
||||||
|
afterAll(() => {
|
||||||
|
playReactionsSound.setValue(playReactionsSound.defaultValue);
|
||||||
|
window.HTMLMediaElement.prototype.play = originalPlayFn;
|
||||||
|
});
|
||||||
|
|
||||||
|
test("preloads all audio elements", () => {
|
||||||
|
playReactionsSound.setValue(true);
|
||||||
|
const rtcSession = new MockRTCSession(
|
||||||
|
new MockRoom(memberUserIdAlice),
|
||||||
|
membership,
|
||||||
|
);
|
||||||
|
const { container } = render(<TestComponent rtcSession={rtcSession} />);
|
||||||
|
expect(container.getElementsByTagName("audio")).toHaveLength(
|
||||||
|
// All reactions plus the generic sound
|
||||||
|
ReactionSet.filter((r) => r.sound).length + 1,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("loads no audio elements when disabled in settings", () => {
|
||||||
|
playReactionsSound.setValue(false);
|
||||||
|
const rtcSession = new MockRTCSession(
|
||||||
|
new MockRoom(memberUserIdAlice),
|
||||||
|
membership,
|
||||||
|
);
|
||||||
|
const { container } = render(<TestComponent rtcSession={rtcSession} />);
|
||||||
|
expect(container.getElementsByTagName("audio")).toHaveLength(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("will play an audio sound when there is a reaction", () => {
|
||||||
|
const audioIsPlaying: string[] = [];
|
||||||
|
window.HTMLMediaElement.prototype.play = async function (): Promise<void> {
|
||||||
|
audioIsPlaying.push((this.children[0] as HTMLSourceElement).src);
|
||||||
|
return Promise.resolve();
|
||||||
|
};
|
||||||
|
playReactionsSound.setValue(true);
|
||||||
|
const room = new MockRoom(memberUserIdAlice);
|
||||||
|
const rtcSession = new MockRTCSession(room, membership);
|
||||||
|
render(<TestComponent rtcSession={rtcSession} />);
|
||||||
|
|
||||||
|
// Find the first reaction with a sound effect
|
||||||
|
const chosenReaction = ReactionSet.find((r) => !!r.sound);
|
||||||
|
if (!chosenReaction) {
|
||||||
|
throw Error(
|
||||||
|
"No reactions have sounds configured, this test cannot succeed",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
act(() => {
|
||||||
|
room.testSendReaction(memberEventAlice, chosenReaction, membership);
|
||||||
|
});
|
||||||
|
expect(audioIsPlaying).toHaveLength(1);
|
||||||
|
expect(audioIsPlaying[0]).toContain(chosenReaction.sound?.ogg);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("will play the generic audio sound when there is soundless reaction", () => {
|
||||||
|
const audioIsPlaying: string[] = [];
|
||||||
|
window.HTMLMediaElement.prototype.play = async function (): Promise<void> {
|
||||||
|
audioIsPlaying.push((this.children[0] as HTMLSourceElement).src);
|
||||||
|
return Promise.resolve();
|
||||||
|
};
|
||||||
|
playReactionsSound.setValue(true);
|
||||||
|
const room = new MockRoom(memberUserIdAlice);
|
||||||
|
const rtcSession = new MockRTCSession(room, membership);
|
||||||
|
render(<TestComponent rtcSession={rtcSession} />);
|
||||||
|
|
||||||
|
// Find the first reaction with a sound effect
|
||||||
|
const chosenReaction = ReactionSet.find((r) => !r.sound);
|
||||||
|
if (!chosenReaction) {
|
||||||
|
throw Error(
|
||||||
|
"No reactions have sounds configured, this test cannot succeed",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
act(() => {
|
||||||
|
room.testSendReaction(memberEventAlice, chosenReaction, membership);
|
||||||
|
});
|
||||||
|
expect(audioIsPlaying).toHaveLength(1);
|
||||||
|
expect(audioIsPlaying[0]).toContain(GenericReaction.sound?.ogg);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("will play multiple audio sounds when there are multiple different reactions", () => {
|
||||||
|
const audioIsPlaying: string[] = [];
|
||||||
|
window.HTMLMediaElement.prototype.play = async function (): Promise<void> {
|
||||||
|
audioIsPlaying.push((this.children[0] as HTMLSourceElement).src);
|
||||||
|
return Promise.resolve();
|
||||||
|
};
|
||||||
|
playReactionsSound.setValue(true);
|
||||||
|
|
||||||
|
const room = new MockRoom(memberUserIdAlice);
|
||||||
|
const rtcSession = new MockRTCSession(room, membership);
|
||||||
|
render(<TestComponent rtcSession={rtcSession} />);
|
||||||
|
|
||||||
|
// Find the first reaction with a sound effect
|
||||||
|
const [reaction1, reaction2] = ReactionSet.filter((r) => !!r.sound);
|
||||||
|
if (!reaction1 || !reaction2) {
|
||||||
|
throw Error(
|
||||||
|
"No reactions have sounds configured, this test cannot succeed",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
act(() => {
|
||||||
|
room.testSendReaction(memberEventAlice, reaction1, membership);
|
||||||
|
room.testSendReaction(memberEventBob, reaction2, membership);
|
||||||
|
room.testSendReaction(memberEventCharlie, reaction1, membership);
|
||||||
|
});
|
||||||
|
expect(audioIsPlaying).toHaveLength(2);
|
||||||
|
expect(audioIsPlaying[0]).toContain(reaction1.sound?.ogg);
|
||||||
|
expect(audioIsPlaying[1]).toContain(reaction2.sound?.ogg);
|
||||||
|
});
|
68
src/room/ReactionAudioRenderer.tsx
Normal file
68
src/room/ReactionAudioRenderer.tsx
Normal file
@ -0,0 +1,68 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2024 New Vector Ltd.
|
||||||
|
|
||||||
|
SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
Please see LICENSE in the repository root for full details.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { ReactNode, useEffect, useRef } from "react";
|
||||||
|
|
||||||
|
import { useReactions } from "../useReactions";
|
||||||
|
import { playReactionsSound, useSetting } from "../settings/settings";
|
||||||
|
import { GenericReaction, ReactionSet } from "../reactions";
|
||||||
|
|
||||||
|
export function ReactionsAudioRenderer(): ReactNode {
|
||||||
|
const { reactions } = useReactions();
|
||||||
|
const [shouldPlay] = useSetting(playReactionsSound);
|
||||||
|
const audioElements = useRef<Record<string, HTMLAudioElement | null>>({});
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!audioElements.current) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!shouldPlay) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
for (const reactionName of new Set(
|
||||||
|
Object.values(reactions).map((r) => r.name),
|
||||||
|
)) {
|
||||||
|
const audioElement =
|
||||||
|
audioElements.current[reactionName] ?? audioElements.current.generic;
|
||||||
|
if (audioElement?.paused) {
|
||||||
|
void audioElement.play();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}, [audioElements, shouldPlay, reactions]);
|
||||||
|
|
||||||
|
// Do not render any audio elements if playback is disabled. Will save
|
||||||
|
// audio file fetches.
|
||||||
|
if (!shouldPlay) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// NOTE: We load all audio elements ahead of time to allow the cache
|
||||||
|
// to be populated, rather than risk a cache miss and have the audio
|
||||||
|
// be delayed.
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
{[GenericReaction, ...ReactionSet].map(
|
||||||
|
(r) =>
|
||||||
|
r.sound && (
|
||||||
|
<audio
|
||||||
|
ref={(el) => (audioElements.current[r.name] = el)}
|
||||||
|
data-testid={r.name}
|
||||||
|
key={r.name}
|
||||||
|
preload="auto"
|
||||||
|
hidden
|
||||||
|
>
|
||||||
|
<source src={r.sound.ogg} type="audio/ogg; codecs=vorbis" />
|
||||||
|
{r.sound.mp3 ? (
|
||||||
|
<source src={r.sound.mp3} type="audio/mpeg" />
|
||||||
|
) : null}
|
||||||
|
</audio>
|
||||||
|
),
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
@ -1,17 +1,19 @@
|
|||||||
/*
|
/*
|
||||||
Copyright 2022-2024 New Vector Ltd.
|
Copyright 2024 New Vector Ltd.
|
||||||
|
|
||||||
SPDX-License-Identifier: AGPL-3.0-only
|
SPDX-License-Identifier: AGPL-3.0-only
|
||||||
Please see LICENSE in the repository root for full details.
|
Please see LICENSE in the repository root for full details.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { ChangeEvent, FC, useCallback } from "react";
|
import { ChangeEvent, FC } from "react";
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
import { Text } from "@vector-im/compound-web";
|
import { Text } from "@vector-im/compound-web";
|
||||||
|
|
||||||
import { FieldRow, InputField } from "../input/Input";
|
import { FieldRow, InputField } from "../input/Input";
|
||||||
import {
|
import {
|
||||||
showHandRaisedTimer as showHandRaisedTimerSetting,
|
showHandRaisedTimer as showHandRaisedTimerSetting,
|
||||||
|
showReactions as showReactionsSetting,
|
||||||
|
playReactionsSound as playReactionsSoundSetting,
|
||||||
useSetting,
|
useSetting,
|
||||||
} from "./settings";
|
} from "./settings";
|
||||||
|
|
||||||
@ -21,13 +23,19 @@ export const PreferencesSettingsTab: FC = () => {
|
|||||||
showHandRaisedTimerSetting,
|
showHandRaisedTimerSetting,
|
||||||
);
|
);
|
||||||
|
|
||||||
const onChangeSetting = useCallback(
|
const [showReactions, setShowReactions] = useSetting(showReactionsSetting);
|
||||||
(e: ChangeEvent<HTMLInputElement>) => {
|
|
||||||
setShowHandRaisedTimer(e.target.checked);
|
const [playReactionsSound, setPlayReactionSound] = useSetting(
|
||||||
},
|
playReactionsSoundSetting,
|
||||||
[setShowHandRaisedTimer],
|
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const onChangeSetting = (
|
||||||
|
e: ChangeEvent<HTMLInputElement>,
|
||||||
|
fn: (value: boolean) => void,
|
||||||
|
): void => {
|
||||||
|
fn(e.target.checked);
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<h4>{t("settings.preferences_tab_h4")}</h4>
|
<h4>{t("settings.preferences_tab_h4")}</h4>
|
||||||
@ -41,7 +49,30 @@ export const PreferencesSettingsTab: FC = () => {
|
|||||||
)}
|
)}
|
||||||
type="checkbox"
|
type="checkbox"
|
||||||
checked={showHandRaisedTimer}
|
checked={showHandRaisedTimer}
|
||||||
onChange={onChangeSetting}
|
onChange={(e) => onChangeSetting(e, setShowHandRaisedTimer)}
|
||||||
|
/>
|
||||||
|
</FieldRow>
|
||||||
|
<h5>{t("settings.preferences_tab.reactions_title")}</h5>
|
||||||
|
<FieldRow>
|
||||||
|
<InputField
|
||||||
|
id="showReactions"
|
||||||
|
label={t("settings.preferences_tab.reactions_show_label")}
|
||||||
|
description={t("settings.preferences_tab.reactions_show_description")}
|
||||||
|
type="checkbox"
|
||||||
|
checked={showReactions}
|
||||||
|
onChange={(e) => onChangeSetting(e, setShowReactions)}
|
||||||
|
/>
|
||||||
|
</FieldRow>
|
||||||
|
<FieldRow>
|
||||||
|
<InputField
|
||||||
|
id="playReactionSound"
|
||||||
|
label={t("settings.preferences_tab.reactions_play_sound_label")}
|
||||||
|
description={t(
|
||||||
|
"settings.preferences_tab.reactions_play_sound_description",
|
||||||
|
)}
|
||||||
|
type="checkbox"
|
||||||
|
checked={playReactionsSound}
|
||||||
|
onChange={(e) => onChangeSetting(e, setPlayReactionSound)}
|
||||||
/>
|
/>
|
||||||
</FieldRow>
|
</FieldRow>
|
||||||
</div>
|
</div>
|
||||||
|
@ -12,7 +12,10 @@ import { useObservableEagerState } from "observable-hooks";
|
|||||||
import { PosthogAnalytics } from "../analytics/PosthogAnalytics";
|
import { PosthogAnalytics } from "../analytics/PosthogAnalytics";
|
||||||
|
|
||||||
export class Setting<T> {
|
export class Setting<T> {
|
||||||
public constructor(key: string, defaultValue: T) {
|
public constructor(
|
||||||
|
key: string,
|
||||||
|
public readonly defaultValue: T,
|
||||||
|
) {
|
||||||
this.key = `matrix-setting-${key}`;
|
this.key = `matrix-setting-${key}`;
|
||||||
|
|
||||||
const storedValue = localStorage.getItem(this.key);
|
const storedValue = localStorage.getItem(this.key);
|
||||||
@ -90,4 +93,11 @@ export const showHandRaisedTimer = new Setting<boolean>(
|
|||||||
false,
|
false,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
export const showReactions = new Setting<boolean>("reactions-show", true);
|
||||||
|
|
||||||
|
export const playReactionsSound = new Setting<boolean>(
|
||||||
|
"reactions-play-sound",
|
||||||
|
true,
|
||||||
|
);
|
||||||
|
|
||||||
export const alwaysShowSelf = new Setting<boolean>("always-show-self", true);
|
export const alwaysShowSelf = new Setting<boolean>("always-show-self", true);
|
||||||
|
22
src/sound/LICENCE.md
Normal file
22
src/sound/LICENCE.md
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
# Sound effect licences
|
||||||
|
|
||||||
|
The following sound effects have been licensed from Pixabay, under https://pixabay.com/service/license-summary/.
|
||||||
|
|
||||||
|
- `raise_hand`
|
||||||
|
- `reactions/cat`
|
||||||
|
- `reactions/clap`
|
||||||
|
- `reactions/crickets`
|
||||||
|
- `reactions/dog`
|
||||||
|
- `reactions/generic`
|
||||||
|
- `reactions/lightbulb`
|
||||||
|
- `reactions/party`
|
||||||
|
|
||||||
|
### Other
|
||||||
|
|
||||||
|
The following sound effects have been originally created by Element.
|
||||||
|
|
||||||
|
- `blocked`
|
||||||
|
- `end_talk`
|
||||||
|
- `start_talk_local`
|
||||||
|
- `start_talk_remote`
|
||||||
|
- `reactions/rock`
|
BIN
src/sound/reactions/cat.mp3
Normal file
BIN
src/sound/reactions/cat.mp3
Normal file
Binary file not shown.
BIN
src/sound/reactions/cat.ogg
Normal file
BIN
src/sound/reactions/cat.ogg
Normal file
Binary file not shown.
BIN
src/sound/reactions/clap.mp3
Normal file
BIN
src/sound/reactions/clap.mp3
Normal file
Binary file not shown.
BIN
src/sound/reactions/clap.ogg
Normal file
BIN
src/sound/reactions/clap.ogg
Normal file
Binary file not shown.
BIN
src/sound/reactions/crickets.mp3
Normal file
BIN
src/sound/reactions/crickets.mp3
Normal file
Binary file not shown.
BIN
src/sound/reactions/crickets.ogg
Normal file
BIN
src/sound/reactions/crickets.ogg
Normal file
Binary file not shown.
BIN
src/sound/reactions/deer.mp3
Normal file
BIN
src/sound/reactions/deer.mp3
Normal file
Binary file not shown.
BIN
src/sound/reactions/deer.ogg
Normal file
BIN
src/sound/reactions/deer.ogg
Normal file
Binary file not shown.
BIN
src/sound/reactions/dog.mp3
Normal file
BIN
src/sound/reactions/dog.mp3
Normal file
Binary file not shown.
BIN
src/sound/reactions/dog.ogg
Normal file
BIN
src/sound/reactions/dog.ogg
Normal file
Binary file not shown.
BIN
src/sound/reactions/generic.mp3
Normal file
BIN
src/sound/reactions/generic.mp3
Normal file
Binary file not shown.
BIN
src/sound/reactions/generic.ogg
Normal file
BIN
src/sound/reactions/generic.ogg
Normal file
Binary file not shown.
BIN
src/sound/reactions/lightbulb.mp3
Normal file
BIN
src/sound/reactions/lightbulb.mp3
Normal file
Binary file not shown.
BIN
src/sound/reactions/lightbulb.ogg
Normal file
BIN
src/sound/reactions/lightbulb.ogg
Normal file
Binary file not shown.
BIN
src/sound/reactions/party.mp3
Normal file
BIN
src/sound/reactions/party.mp3
Normal file
Binary file not shown.
BIN
src/sound/reactions/party.ogg
Normal file
BIN
src/sound/reactions/party.ogg
Normal file
Binary file not shown.
BIN
src/sound/reactions/rock.mp3
Normal file
BIN
src/sound/reactions/rock.mp3
Normal file
Binary file not shown.
BIN
src/sound/reactions/rock.ogg
Normal file
BIN
src/sound/reactions/rock.ogg
Normal file
Binary file not shown.
@ -48,6 +48,7 @@ import { useLatest } from "../useLatest";
|
|||||||
import { GridTileViewModel } from "../state/TileViewModel";
|
import { GridTileViewModel } from "../state/TileViewModel";
|
||||||
import { useMergedRefs } from "../useMergedRefs";
|
import { useMergedRefs } from "../useMergedRefs";
|
||||||
import { useReactions } from "../useReactions";
|
import { useReactions } from "../useReactions";
|
||||||
|
import { ReactionOption } from "../reactions";
|
||||||
|
|
||||||
interface TileProps {
|
interface TileProps {
|
||||||
className?: string;
|
className?: string;
|
||||||
@ -93,7 +94,7 @@ const UserMediaTile = forwardRef<HTMLDivElement, UserMediaTileProps>(
|
|||||||
},
|
},
|
||||||
[vm],
|
[vm],
|
||||||
);
|
);
|
||||||
const { raisedHands, lowerHand } = useReactions();
|
const { raisedHands, lowerHand, reactions } = useReactions();
|
||||||
|
|
||||||
const MicIcon = audioEnabled ? MicOnSolidIcon : MicOffSolidIcon;
|
const MicIcon = audioEnabled ? MicOnSolidIcon : MicOffSolidIcon;
|
||||||
|
|
||||||
@ -112,6 +113,8 @@ const UserMediaTile = forwardRef<HTMLDivElement, UserMediaTileProps>(
|
|||||||
);
|
);
|
||||||
|
|
||||||
const handRaised: Date | undefined = raisedHands[vm.member?.userId ?? ""];
|
const handRaised: Date | undefined = raisedHands[vm.member?.userId ?? ""];
|
||||||
|
const currentReaction: ReactionOption | undefined =
|
||||||
|
reactions[vm.member?.userId ?? ""];
|
||||||
const raisedHandOnClick =
|
const raisedHandOnClick =
|
||||||
vm.local && handRaised ? (): void => void lowerHand() : undefined;
|
vm.local && handRaised ? (): void => void lowerHand() : undefined;
|
||||||
|
|
||||||
@ -157,6 +160,7 @@ const UserMediaTile = forwardRef<HTMLDivElement, UserMediaTileProps>(
|
|||||||
</Menu>
|
</Menu>
|
||||||
}
|
}
|
||||||
raisedHandTime={handRaised}
|
raisedHandTime={handRaised}
|
||||||
|
currentReaction={currentReaction}
|
||||||
raisedHandOnClick={raisedHandOnClick}
|
raisedHandOnClick={raisedHandOnClick}
|
||||||
{...props}
|
{...props}
|
||||||
/>
|
/>
|
||||||
|
@ -20,6 +20,8 @@ import { Avatar } from "../Avatar";
|
|||||||
import { EncryptionStatus } from "../state/MediaViewModel";
|
import { EncryptionStatus } from "../state/MediaViewModel";
|
||||||
import { RaisedHandIndicator } from "../reactions/RaisedHandIndicator";
|
import { RaisedHandIndicator } from "../reactions/RaisedHandIndicator";
|
||||||
import { showHandRaisedTimer, useSetting } from "../settings/settings";
|
import { showHandRaisedTimer, useSetting } from "../settings/settings";
|
||||||
|
import { ReactionOption } from "../reactions";
|
||||||
|
import { ReactionIndicator } from "../reactions/ReactionIndicator";
|
||||||
|
|
||||||
interface Props extends ComponentProps<typeof animated.div> {
|
interface Props extends ComponentProps<typeof animated.div> {
|
||||||
className?: string;
|
className?: string;
|
||||||
@ -37,6 +39,7 @@ interface Props extends ComponentProps<typeof animated.div> {
|
|||||||
displayName: string;
|
displayName: string;
|
||||||
primaryButton?: ReactNode;
|
primaryButton?: ReactNode;
|
||||||
raisedHandTime?: Date;
|
raisedHandTime?: Date;
|
||||||
|
currentReaction?: ReactionOption;
|
||||||
raisedHandOnClick?: () => void;
|
raisedHandOnClick?: () => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -58,6 +61,7 @@ export const MediaView = forwardRef<HTMLDivElement, Props>(
|
|||||||
primaryButton,
|
primaryButton,
|
||||||
encryptionStatus,
|
encryptionStatus,
|
||||||
raisedHandTime,
|
raisedHandTime,
|
||||||
|
currentReaction,
|
||||||
raisedHandOnClick,
|
raisedHandOnClick,
|
||||||
...props
|
...props
|
||||||
},
|
},
|
||||||
@ -98,6 +102,20 @@ export const MediaView = forwardRef<HTMLDivElement, Props>(
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
<div className={styles.fg}>
|
<div className={styles.fg}>
|
||||||
|
<div style={{ display: "flex" }}>
|
||||||
|
<RaisedHandIndicator
|
||||||
|
raisedHandTime={raisedHandTime}
|
||||||
|
miniature={avatarSize < 96}
|
||||||
|
showTimer={handRaiseTimerVisible}
|
||||||
|
onClick={raisedHandOnClick}
|
||||||
|
/>
|
||||||
|
{currentReaction && (
|
||||||
|
<ReactionIndicator
|
||||||
|
miniature={avatarSize < 96}
|
||||||
|
emoji={currentReaction.emoji}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
{/* TODO: Bring this back once encryption status is less broken */}
|
{/* TODO: Bring this back once encryption status is less broken */}
|
||||||
{/*encryptionStatus !== EncryptionStatus.Okay && (
|
{/*encryptionStatus !== EncryptionStatus.Okay && (
|
||||||
<div className={styles.status}>
|
<div className={styles.status}>
|
||||||
@ -113,12 +131,6 @@ export const MediaView = forwardRef<HTMLDivElement, Props>(
|
|||||||
</Text>
|
</Text>
|
||||||
</div>
|
</div>
|
||||||
)*/}
|
)*/}
|
||||||
<RaisedHandIndicator
|
|
||||||
raisedHandTime={raisedHandTime}
|
|
||||||
miniature={avatarSize < 96}
|
|
||||||
showTimer={handRaiseTimerVisible}
|
|
||||||
onClick={raisedHandOnClick}
|
|
||||||
/>
|
|
||||||
<div className={styles.nameTag}>
|
<div className={styles.nameTag}>
|
||||||
{nameTagLeadingIcon}
|
{nameTagLeadingIcon}
|
||||||
<Text as="span" size="sm" weight="medium" className={styles.name}>
|
<Text as="span" size="sm" weight="medium" className={styles.name}>
|
||||||
|
@ -5,33 +5,19 @@ SPDX-License-Identifier: AGPL-3.0-only
|
|||||||
Please see LICENSE in the repository root for full details.
|
Please see LICENSE in the repository root for full details.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { act, render } from "@testing-library/react";
|
import { render } from "@testing-library/react";
|
||||||
import { FC, ReactNode } from "react";
|
import { act, FC } from "react";
|
||||||
import { describe, expect, test } from "vitest";
|
import { describe, expect, test } from "vitest";
|
||||||
import {
|
import { RoomEvent } from "matrix-js-sdk/src/matrix";
|
||||||
MatrixRTCSession,
|
|
||||||
MatrixRTCSessionEvent,
|
|
||||||
} from "matrix-js-sdk/src/matrixrtc/MatrixRTCSession";
|
|
||||||
import {
|
|
||||||
EventTimeline,
|
|
||||||
EventTimelineSet,
|
|
||||||
EventType,
|
|
||||||
MatrixClient,
|
|
||||||
MatrixEvent,
|
|
||||||
Room,
|
|
||||||
RoomEvent,
|
|
||||||
} from "matrix-js-sdk/src/matrix";
|
|
||||||
import EventEmitter from "events";
|
|
||||||
import { randomUUID } from "crypto";
|
|
||||||
|
|
||||||
import { ReactionsProvider, useReactions } from "./useReactions";
|
import { useReactions } from "./useReactions";
|
||||||
|
import {
|
||||||
/**
|
createHandRaisedReaction,
|
||||||
* Test explanation.
|
createRedaction,
|
||||||
* This test suite checks that the useReactions hook appropriately reacts
|
MockRoom,
|
||||||
* to new reactions, redactions and membership changesin the room. There is
|
MockRTCSession,
|
||||||
* a large amount of test structure used to construct a mock environment.
|
TestReactionsWrapper,
|
||||||
*/
|
} from "./utils/testReactions";
|
||||||
|
|
||||||
const memberUserIdAlice = "@alice:example.org";
|
const memberUserIdAlice = "@alice:example.org";
|
||||||
const memberEventAlice = "$membership-alice:example.org";
|
const memberEventAlice = "$membership-alice:example.org";
|
||||||
@ -44,6 +30,13 @@ const membership: Record<string, string> = {
|
|||||||
"$membership-charlie:example.org": "@charlie:example.org",
|
"$membership-charlie:example.org": "@charlie:example.org",
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test explanation.
|
||||||
|
* This test suite checks that the useReactions hook appropriately reacts
|
||||||
|
* to new reactions, redactions and membership changesin the room. There is
|
||||||
|
* a large amount of test structure used to construct a mock environment.
|
||||||
|
*/
|
||||||
|
|
||||||
const TestComponent: FC = () => {
|
const TestComponent: FC = () => {
|
||||||
const { raisedHands } = useReactions();
|
const { raisedHands } = useReactions();
|
||||||
return (
|
return (
|
||||||
@ -60,136 +53,42 @@ const TestComponent: FC = () => {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
const TestComponentWrapper = ({
|
|
||||||
rtcSession,
|
|
||||||
}: {
|
|
||||||
rtcSession: MockRTCSession;
|
|
||||||
}): ReactNode => {
|
|
||||||
return (
|
|
||||||
<ReactionsProvider rtcSession={rtcSession as unknown as MatrixRTCSession}>
|
|
||||||
<TestComponent />
|
|
||||||
</ReactionsProvider>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export class MockRTCSession extends EventEmitter {
|
|
||||||
public memberships = Object.entries(membership).map(([eventId, sender]) => ({
|
|
||||||
sender,
|
|
||||||
eventId,
|
|
||||||
createdTs: (): Date => new Date(),
|
|
||||||
}));
|
|
||||||
|
|
||||||
public constructor(public readonly room: MockRoom) {
|
|
||||||
super();
|
|
||||||
}
|
|
||||||
|
|
||||||
public testRemoveMember(userId: string): void {
|
|
||||||
this.memberships = this.memberships.filter((u) => u.sender !== userId);
|
|
||||||
this.emit(MatrixRTCSessionEvent.MembershipsChanged);
|
|
||||||
}
|
|
||||||
|
|
||||||
public testAddMember(sender: string): void {
|
|
||||||
this.memberships.push({
|
|
||||||
sender,
|
|
||||||
eventId: `!fake-${randomUUID()}:event`,
|
|
||||||
createdTs: (): Date => new Date(),
|
|
||||||
});
|
|
||||||
this.emit(MatrixRTCSessionEvent.MembershipsChanged);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function createReaction(
|
|
||||||
parentMemberEvent: string,
|
|
||||||
overridenSender?: string,
|
|
||||||
): MatrixEvent {
|
|
||||||
return new MatrixEvent({
|
|
||||||
sender: overridenSender ?? membership[parentMemberEvent],
|
|
||||||
type: EventType.Reaction,
|
|
||||||
origin_server_ts: new Date().getTime(),
|
|
||||||
content: {
|
|
||||||
"m.relates_to": {
|
|
||||||
key: "🖐️",
|
|
||||||
event_id: parentMemberEvent,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
event_id: randomUUID(),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function createRedaction(sender: string, reactionEventId: string): MatrixEvent {
|
|
||||||
return new MatrixEvent({
|
|
||||||
sender,
|
|
||||||
type: EventType.RoomRedaction,
|
|
||||||
origin_server_ts: new Date().getTime(),
|
|
||||||
redacts: reactionEventId,
|
|
||||||
content: {},
|
|
||||||
event_id: randomUUID(),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
export class MockRoom extends EventEmitter {
|
|
||||||
public constructor(private readonly existingRelations: MatrixEvent[] = []) {
|
|
||||||
super();
|
|
||||||
}
|
|
||||||
|
|
||||||
public get client(): MatrixClient {
|
|
||||||
return {
|
|
||||||
getUserId: (): string => memberUserIdAlice,
|
|
||||||
} as unknown as MatrixClient;
|
|
||||||
}
|
|
||||||
|
|
||||||
public get relations(): Room["relations"] {
|
|
||||||
return {
|
|
||||||
getChildEventsForEvent: (membershipEventId: string) => ({
|
|
||||||
getRelations: (): MatrixEvent[] => {
|
|
||||||
return this.existingRelations.filter(
|
|
||||||
(r) =>
|
|
||||||
r.getContent()["m.relates_to"]?.event_id === membershipEventId,
|
|
||||||
);
|
|
||||||
},
|
|
||||||
}),
|
|
||||||
} as unknown as Room["relations"];
|
|
||||||
}
|
|
||||||
|
|
||||||
public testSendReaction(
|
|
||||||
parentMemberEvent: string,
|
|
||||||
overridenSender?: string,
|
|
||||||
): string {
|
|
||||||
const evt = createReaction(parentMemberEvent, overridenSender);
|
|
||||||
this.emit(RoomEvent.Timeline, evt, this, undefined, false, {
|
|
||||||
timeline: new EventTimeline(new EventTimelineSet(undefined)),
|
|
||||||
});
|
|
||||||
return evt.getId()!;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
describe("useReactions", () => {
|
describe("useReactions", () => {
|
||||||
test("starts with an empty list", () => {
|
test("starts with an empty list", () => {
|
||||||
const rtcSession = new MockRTCSession(new MockRoom());
|
const rtcSession = new MockRTCSession(
|
||||||
|
new MockRoom(memberUserIdAlice),
|
||||||
|
membership,
|
||||||
|
);
|
||||||
const { queryByRole } = render(
|
const { queryByRole } = render(
|
||||||
<TestComponentWrapper rtcSession={rtcSession} />,
|
<TestReactionsWrapper rtcSession={rtcSession}>
|
||||||
|
<TestComponent />
|
||||||
|
</TestReactionsWrapper>,
|
||||||
);
|
);
|
||||||
expect(queryByRole("list")?.children).to.have.lengthOf(0);
|
expect(queryByRole("list")?.children).to.have.lengthOf(0);
|
||||||
});
|
});
|
||||||
test("handles incoming raised hand", async () => {
|
test("handles incoming raised hand", async () => {
|
||||||
const room = new MockRoom();
|
const room = new MockRoom(memberUserIdAlice);
|
||||||
const rtcSession = new MockRTCSession(room);
|
const rtcSession = new MockRTCSession(room, membership);
|
||||||
const { queryByRole } = render(
|
const { queryByRole } = render(
|
||||||
<TestComponentWrapper rtcSession={rtcSession} />,
|
<TestReactionsWrapper rtcSession={rtcSession}>
|
||||||
|
<TestComponent />
|
||||||
|
</TestReactionsWrapper>,
|
||||||
);
|
);
|
||||||
await act(() => room.testSendReaction(memberEventAlice));
|
await act(() => room.testSendHandRaise(memberEventAlice, membership));
|
||||||
expect(queryByRole("list")?.children).to.have.lengthOf(1);
|
expect(queryByRole("list")?.children).to.have.lengthOf(1);
|
||||||
await act(() => room.testSendReaction(memberEventBob));
|
await act(() => room.testSendHandRaise(memberEventBob, membership));
|
||||||
expect(queryByRole("list")?.children).to.have.lengthOf(2);
|
expect(queryByRole("list")?.children).to.have.lengthOf(2);
|
||||||
});
|
});
|
||||||
test("handles incoming unraised hand", async () => {
|
test("handles incoming unraised hand", async () => {
|
||||||
const room = new MockRoom();
|
const room = new MockRoom(memberUserIdAlice);
|
||||||
const rtcSession = new MockRTCSession(room);
|
const rtcSession = new MockRTCSession(room, membership);
|
||||||
const { queryByRole } = render(
|
const { queryByRole } = render(
|
||||||
<TestComponentWrapper rtcSession={rtcSession} />,
|
<TestReactionsWrapper rtcSession={rtcSession}>
|
||||||
|
<TestComponent />
|
||||||
|
</TestReactionsWrapper>,
|
||||||
);
|
);
|
||||||
const reactionEventId = await act(() =>
|
const reactionEventId = await act(() =>
|
||||||
room.testSendReaction(memberEventAlice),
|
room.testSendHandRaise(memberEventAlice, membership),
|
||||||
);
|
);
|
||||||
expect(queryByRole("list")?.children).to.have.lengthOf(1);
|
expect(queryByRole("list")?.children).to.have.lengthOf(1);
|
||||||
await act(() =>
|
await act(() =>
|
||||||
@ -203,30 +102,42 @@ describe("useReactions", () => {
|
|||||||
expect(queryByRole("list")?.children).to.have.lengthOf(0);
|
expect(queryByRole("list")?.children).to.have.lengthOf(0);
|
||||||
});
|
});
|
||||||
test("handles loading prior raised hand events", () => {
|
test("handles loading prior raised hand events", () => {
|
||||||
const room = new MockRoom([createReaction(memberEventAlice)]);
|
const room = new MockRoom(memberUserIdAlice, [
|
||||||
const rtcSession = new MockRTCSession(room);
|
createHandRaisedReaction(memberEventAlice, membership),
|
||||||
|
]);
|
||||||
|
const rtcSession = new MockRTCSession(room, membership);
|
||||||
const { queryByRole } = render(
|
const { queryByRole } = render(
|
||||||
<TestComponentWrapper rtcSession={rtcSession} />,
|
<TestReactionsWrapper rtcSession={rtcSession}>
|
||||||
|
<TestComponent />
|
||||||
|
</TestReactionsWrapper>,
|
||||||
);
|
);
|
||||||
expect(queryByRole("list")?.children).to.have.lengthOf(1);
|
expect(queryByRole("list")?.children).to.have.lengthOf(1);
|
||||||
});
|
});
|
||||||
// If the membership event changes for a user, we want to remove
|
// If the membership event changes for a user, we want to remove
|
||||||
// the raised hand event.
|
// the raised hand event.
|
||||||
test("will remove reaction when a member leaves the call", () => {
|
test("will remove reaction when a member leaves the call", () => {
|
||||||
const room = new MockRoom([createReaction(memberEventAlice)]);
|
const room = new MockRoom(memberUserIdAlice, [
|
||||||
const rtcSession = new MockRTCSession(room);
|
createHandRaisedReaction(memberEventAlice, membership),
|
||||||
|
]);
|
||||||
|
const rtcSession = new MockRTCSession(room, membership);
|
||||||
const { queryByRole } = render(
|
const { queryByRole } = render(
|
||||||
<TestComponentWrapper rtcSession={rtcSession} />,
|
<TestReactionsWrapper rtcSession={rtcSession}>
|
||||||
|
<TestComponent />
|
||||||
|
</TestReactionsWrapper>,
|
||||||
);
|
);
|
||||||
expect(queryByRole("list")?.children).to.have.lengthOf(1);
|
expect(queryByRole("list")?.children).to.have.lengthOf(1);
|
||||||
act(() => rtcSession.testRemoveMember(memberUserIdAlice));
|
act(() => rtcSession.testRemoveMember(memberUserIdAlice));
|
||||||
expect(queryByRole("list")?.children).to.have.lengthOf(0);
|
expect(queryByRole("list")?.children).to.have.lengthOf(0);
|
||||||
});
|
});
|
||||||
test("will remove reaction when a member joins via a new event", () => {
|
test("will remove reaction when a member joins via a new event", () => {
|
||||||
const room = new MockRoom([createReaction(memberEventAlice)]);
|
const room = new MockRoom(memberUserIdAlice, [
|
||||||
const rtcSession = new MockRTCSession(room);
|
createHandRaisedReaction(memberEventAlice, membership),
|
||||||
|
]);
|
||||||
|
const rtcSession = new MockRTCSession(room, membership);
|
||||||
const { queryByRole } = render(
|
const { queryByRole } = render(
|
||||||
<TestComponentWrapper rtcSession={rtcSession} />,
|
<TestReactionsWrapper rtcSession={rtcSession}>
|
||||||
|
<TestComponent />
|
||||||
|
</TestReactionsWrapper>,
|
||||||
);
|
);
|
||||||
expect(queryByRole("list")?.children).to.have.lengthOf(1);
|
expect(queryByRole("list")?.children).to.have.lengthOf(1);
|
||||||
// Simulate leaving and rejoining
|
// Simulate leaving and rejoining
|
||||||
@ -237,22 +148,26 @@ describe("useReactions", () => {
|
|||||||
expect(queryByRole("list")?.children).to.have.lengthOf(0);
|
expect(queryByRole("list")?.children).to.have.lengthOf(0);
|
||||||
});
|
});
|
||||||
test("ignores invalid sender for historic event", () => {
|
test("ignores invalid sender for historic event", () => {
|
||||||
const room = new MockRoom([
|
const room = new MockRoom(memberUserIdAlice, [
|
||||||
createReaction(memberEventAlice, memberUserIdBob),
|
createHandRaisedReaction(memberEventAlice, memberUserIdBob),
|
||||||
]);
|
]);
|
||||||
const rtcSession = new MockRTCSession(room);
|
const rtcSession = new MockRTCSession(room, membership);
|
||||||
const { queryByRole } = render(
|
const { queryByRole } = render(
|
||||||
<TestComponentWrapper rtcSession={rtcSession} />,
|
<TestReactionsWrapper rtcSession={rtcSession}>
|
||||||
|
<TestComponent />
|
||||||
|
</TestReactionsWrapper>,
|
||||||
);
|
);
|
||||||
expect(queryByRole("list")?.children).to.have.lengthOf(0);
|
expect(queryByRole("list")?.children).to.have.lengthOf(0);
|
||||||
});
|
});
|
||||||
test("ignores invalid sender for new event", async () => {
|
test("ignores invalid sender for new event", async () => {
|
||||||
const room = new MockRoom([]);
|
const room = new MockRoom(memberUserIdAlice);
|
||||||
const rtcSession = new MockRTCSession(room);
|
const rtcSession = new MockRTCSession(room, membership);
|
||||||
const { queryByRole } = render(
|
const { queryByRole } = render(
|
||||||
<TestComponentWrapper rtcSession={rtcSession} />,
|
<TestReactionsWrapper rtcSession={rtcSession}>
|
||||||
|
<TestComponent />
|
||||||
|
</TestReactionsWrapper>,
|
||||||
);
|
);
|
||||||
await act(() => room.testSendReaction(memberEventAlice, memberUserIdBob));
|
await act(() => room.testSendHandRaise(memberEventAlice, memberUserIdBob));
|
||||||
expect(queryByRole("list")?.children).to.have.lengthOf(0);
|
expect(queryByRole("list")?.children).to.have.lengthOf(0);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -26,10 +26,19 @@ import { logger } from "matrix-js-sdk/src/logger";
|
|||||||
|
|
||||||
import { useMatrixRTCSessionMemberships } from "./useMatrixRTCSessionMemberships";
|
import { useMatrixRTCSessionMemberships } from "./useMatrixRTCSessionMemberships";
|
||||||
import { useClientState } from "./ClientContext";
|
import { useClientState } from "./ClientContext";
|
||||||
|
import {
|
||||||
|
ECallReactionEventContent,
|
||||||
|
ElementCallReactionEventType,
|
||||||
|
GenericReaction,
|
||||||
|
ReactionOption,
|
||||||
|
ReactionSet,
|
||||||
|
} from "./reactions";
|
||||||
|
import { useLatest } from "./useLatest";
|
||||||
|
|
||||||
interface ReactionsContextType {
|
interface ReactionsContextType {
|
||||||
raisedHands: Record<string, Date>;
|
raisedHands: Record<string, Date>;
|
||||||
supportsReactions: boolean;
|
supportsReactions: boolean;
|
||||||
|
reactions: Record<string, ReactionOption>;
|
||||||
lowerHand: () => Promise<void>;
|
lowerHand: () => Promise<void>;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -52,6 +61,8 @@ interface RaisedHandInfo {
|
|||||||
time: Date;
|
time: Date;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const REACTION_ACTIVE_TIME_MS = 3000;
|
||||||
|
|
||||||
export const useReactions = (): ReactionsContextType => {
|
export const useReactions = (): ReactionsContextType => {
|
||||||
const context = useContext(ReactionsContext);
|
const context = useContext(ReactionsContext);
|
||||||
if (!context) {
|
if (!context) {
|
||||||
@ -80,6 +91,10 @@ export const ReactionsProvider = ({
|
|||||||
const room = rtcSession.room;
|
const room = rtcSession.room;
|
||||||
const myUserId = room.client.getUserId();
|
const myUserId = room.client.getUserId();
|
||||||
|
|
||||||
|
const [reactions, setReactions] = useState<Record<string, ReactionOption>>(
|
||||||
|
{},
|
||||||
|
);
|
||||||
|
|
||||||
// Reduce the data down for the consumers.
|
// Reduce the data down for the consumers.
|
||||||
const resultRaisedHands = useMemo(
|
const resultRaisedHands = useMemo(
|
||||||
() =>
|
() =>
|
||||||
@ -162,8 +177,12 @@ export const ReactionsProvider = ({
|
|||||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
}, [room, memberships, myUserId, addRaisedHand, removeRaisedHand]);
|
}, [room, memberships, myUserId, addRaisedHand, removeRaisedHand]);
|
||||||
|
|
||||||
|
const latestMemberships = useLatest(memberships);
|
||||||
|
const latestRaisedHands = useLatest(raisedHands);
|
||||||
|
|
||||||
// This effect handles any *live* reaction/redactions in the room.
|
// This effect handles any *live* reaction/redactions in the room.
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
const reactionTimeouts = new Set<NodeJS.Timeout>();
|
||||||
const handleReactionEvent = (event: MatrixEvent): void => {
|
const handleReactionEvent = (event: MatrixEvent): void => {
|
||||||
if (event.isSending()) {
|
if (event.isSending()) {
|
||||||
// Skip any events that are still sending.
|
// Skip any events that are still sending.
|
||||||
@ -177,14 +196,74 @@ export const ReactionsProvider = ({
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (event.getType() === EventType.Reaction) {
|
if (event.getType() === ElementCallReactionEventType) {
|
||||||
|
const content: ECallReactionEventContent = event.getContent();
|
||||||
|
|
||||||
|
const membershipEventId = content?.["m.relates_to"]?.event_id;
|
||||||
|
// Check to see if this reaction was made to a membership event (and the
|
||||||
|
// sender of the reaction matches the membership)
|
||||||
|
if (
|
||||||
|
!latestMemberships.current.some(
|
||||||
|
(e) => e.eventId === membershipEventId && e.sender === sender,
|
||||||
|
)
|
||||||
|
) {
|
||||||
|
logger.warn(
|
||||||
|
`Reaction target was not a membership event for ${sender}, ignoring`,
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!content.emoji) {
|
||||||
|
logger.warn(`Reaction had no emoji from ${reactionEventId}`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const segment = new Intl.Segmenter(undefined, {
|
||||||
|
granularity: "grapheme",
|
||||||
|
})
|
||||||
|
.segment(content.emoji)
|
||||||
|
[Symbol.iterator]();
|
||||||
|
const emoji = segment.next().value?.segment;
|
||||||
|
|
||||||
|
if (!emoji) {
|
||||||
|
logger.warn(
|
||||||
|
`Reaction had no emoji from ${reactionEventId} after splitting`,
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// One of our custom reactions
|
||||||
|
const reaction = {
|
||||||
|
...GenericReaction,
|
||||||
|
emoji,
|
||||||
|
// If we don't find a reaction, we can fallback to the generic sound.
|
||||||
|
...ReactionSet.find((r) => r.name === content.name),
|
||||||
|
};
|
||||||
|
|
||||||
|
setReactions((reactions) => {
|
||||||
|
if (reactions[sender]) {
|
||||||
|
// We've still got a reaction from this user, ignore it to prevent spamming
|
||||||
|
return reactions;
|
||||||
|
}
|
||||||
|
const timeout = setTimeout(() => {
|
||||||
|
// Clear the reaction after some time.
|
||||||
|
setReactions(({ [sender]: _unused, ...remaining }) => remaining);
|
||||||
|
reactionTimeouts.delete(timeout);
|
||||||
|
}, REACTION_ACTIVE_TIME_MS);
|
||||||
|
reactionTimeouts.add(timeout);
|
||||||
|
return {
|
||||||
|
...reactions,
|
||||||
|
[sender]: reaction,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
} else if (event.getType() === EventType.Reaction) {
|
||||||
const content = event.getContent() as ReactionEventContent;
|
const content = event.getContent() as ReactionEventContent;
|
||||||
const membershipEventId = content["m.relates_to"].event_id;
|
const membershipEventId = content["m.relates_to"].event_id;
|
||||||
|
|
||||||
// Check to see if this reaction was made to a membership event (and the
|
// Check to see if this reaction was made to a membership event (and the
|
||||||
// sender of the reaction matches the membership)
|
// sender of the reaction matches the membership)
|
||||||
if (
|
if (
|
||||||
!memberships.some(
|
!latestMemberships.current.some(
|
||||||
(e) => e.eventId === membershipEventId && e.sender === sender,
|
(e) => e.eventId === membershipEventId && e.sender === sender,
|
||||||
)
|
)
|
||||||
) {
|
) {
|
||||||
@ -203,7 +282,7 @@ export const ReactionsProvider = ({
|
|||||||
}
|
}
|
||||||
} else if (event.getType() === EventType.RoomRedaction) {
|
} else if (event.getType() === EventType.RoomRedaction) {
|
||||||
const targetEvent = event.event.redacts;
|
const targetEvent = event.event.redacts;
|
||||||
const targetUser = Object.entries(raisedHands).find(
|
const targetUser = Object.entries(latestRaisedHands.current).find(
|
||||||
([_u, r]) => r.reactionEventId === targetEvent,
|
([_u, r]) => r.reactionEventId === targetEvent,
|
||||||
)?.[0];
|
)?.[0];
|
||||||
if (!targetUser) {
|
if (!targetUser) {
|
||||||
@ -225,16 +304,20 @@ export const ReactionsProvider = ({
|
|||||||
room.off(MatrixRoomEvent.Timeline, handleReactionEvent);
|
room.off(MatrixRoomEvent.Timeline, handleReactionEvent);
|
||||||
room.off(MatrixRoomEvent.Redaction, handleReactionEvent);
|
room.off(MatrixRoomEvent.Redaction, handleReactionEvent);
|
||||||
room.off(MatrixRoomEvent.LocalEchoUpdated, handleReactionEvent);
|
room.off(MatrixRoomEvent.LocalEchoUpdated, handleReactionEvent);
|
||||||
|
reactionTimeouts.forEach((t) => clearTimeout(t));
|
||||||
|
// If we're clearing timeouts, we also clear all reactions.
|
||||||
|
setReactions({});
|
||||||
};
|
};
|
||||||
}, [room, addRaisedHand, removeRaisedHand, memberships, raisedHands]);
|
}, [
|
||||||
|
room,
|
||||||
|
addRaisedHand,
|
||||||
|
removeRaisedHand,
|
||||||
|
latestMemberships,
|
||||||
|
latestRaisedHands,
|
||||||
|
]);
|
||||||
|
|
||||||
const lowerHand = useCallback(async () => {
|
const lowerHand = useCallback(async () => {
|
||||||
if (
|
if (!myUserId || !raisedHands[myUserId]) {
|
||||||
!myUserId ||
|
|
||||||
clientState?.state !== "valid" ||
|
|
||||||
!clientState.authenticated ||
|
|
||||||
!raisedHands[myUserId]
|
|
||||||
) {
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const myReactionId = raisedHands[myUserId].reactionEventId;
|
const myReactionId = raisedHands[myUserId].reactionEventId;
|
||||||
@ -243,21 +326,19 @@ export const ReactionsProvider = ({
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
await clientState.authenticated.client.redactEvent(
|
await room.client.redactEvent(rtcSession.room.roomId, myReactionId);
|
||||||
rtcSession.room.roomId,
|
|
||||||
myReactionId,
|
|
||||||
);
|
|
||||||
logger.debug("Redacted raise hand event");
|
logger.debug("Redacted raise hand event");
|
||||||
} catch (ex) {
|
} catch (ex) {
|
||||||
logger.error("Failed to redact reaction event", myReactionId, ex);
|
logger.error("Failed to redact reaction event", myReactionId, ex);
|
||||||
}
|
}
|
||||||
}, [myUserId, raisedHands, clientState, rtcSession]);
|
}, [myUserId, raisedHands, rtcSession, room]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ReactionsContext.Provider
|
<ReactionsContext.Provider
|
||||||
value={{
|
value={{
|
||||||
raisedHands: resultRaisedHands,
|
raisedHands: resultRaisedHands,
|
||||||
supportsReactions,
|
supportsReactions,
|
||||||
|
reactions,
|
||||||
lowerHand,
|
lowerHand,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
|
199
src/utils/testReactions.tsx
Normal file
199
src/utils/testReactions.tsx
Normal file
@ -0,0 +1,199 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2024 New Vector Ltd.
|
||||||
|
|
||||||
|
SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
Please see LICENSE in the repository root for full details.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { PropsWithChildren, ReactNode } from "react";
|
||||||
|
import { randomUUID } from "crypto";
|
||||||
|
import EventEmitter from "events";
|
||||||
|
import { MatrixClient } from "matrix-js-sdk/src/client";
|
||||||
|
import { EventType, RoomEvent, RelationType } from "matrix-js-sdk/src/matrix";
|
||||||
|
import {
|
||||||
|
MatrixEvent,
|
||||||
|
EventTimeline,
|
||||||
|
EventTimelineSet,
|
||||||
|
Room,
|
||||||
|
} from "matrix-js-sdk/src/matrix";
|
||||||
|
import {
|
||||||
|
MatrixRTCSession,
|
||||||
|
MatrixRTCSessionEvent,
|
||||||
|
} from "matrix-js-sdk/src/matrixrtc";
|
||||||
|
|
||||||
|
import { ReactionsProvider } from "../useReactions";
|
||||||
|
import {
|
||||||
|
ECallReactionEventContent,
|
||||||
|
ElementCallReactionEventType,
|
||||||
|
ReactionOption,
|
||||||
|
} from "../reactions";
|
||||||
|
|
||||||
|
export const TestReactionsWrapper = ({
|
||||||
|
rtcSession,
|
||||||
|
children,
|
||||||
|
}: PropsWithChildren<{
|
||||||
|
rtcSession: MockRTCSession;
|
||||||
|
}>): ReactNode => {
|
||||||
|
return (
|
||||||
|
<ReactionsProvider rtcSession={rtcSession as unknown as MatrixRTCSession}>
|
||||||
|
{children}
|
||||||
|
</ReactionsProvider>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export class MockRTCSession extends EventEmitter {
|
||||||
|
public memberships: {
|
||||||
|
sender: string;
|
||||||
|
eventId: string;
|
||||||
|
createdTs: () => Date;
|
||||||
|
}[];
|
||||||
|
|
||||||
|
public constructor(
|
||||||
|
public readonly room: MockRoom,
|
||||||
|
membership: Record<string, string>,
|
||||||
|
) {
|
||||||
|
super();
|
||||||
|
this.memberships = Object.entries(membership).map(([eventId, sender]) => ({
|
||||||
|
sender,
|
||||||
|
eventId,
|
||||||
|
createdTs: (): Date => new Date(),
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
public testRemoveMember(userId: string): void {
|
||||||
|
this.memberships = this.memberships.filter((u) => u.sender !== userId);
|
||||||
|
this.emit(MatrixRTCSessionEvent.MembershipsChanged);
|
||||||
|
}
|
||||||
|
|
||||||
|
public testAddMember(sender: string): void {
|
||||||
|
this.memberships.push({
|
||||||
|
sender,
|
||||||
|
eventId: `!fake-${randomUUID()}:event`,
|
||||||
|
createdTs: (): Date => new Date(),
|
||||||
|
});
|
||||||
|
this.emit(MatrixRTCSessionEvent.MembershipsChanged);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function createHandRaisedReaction(
|
||||||
|
parentMemberEvent: string,
|
||||||
|
membershipOrOverridenSender: Record<string, string> | string,
|
||||||
|
): MatrixEvent {
|
||||||
|
return new MatrixEvent({
|
||||||
|
sender:
|
||||||
|
typeof membershipOrOverridenSender === "string"
|
||||||
|
? membershipOrOverridenSender
|
||||||
|
: membershipOrOverridenSender[parentMemberEvent],
|
||||||
|
type: EventType.Reaction,
|
||||||
|
origin_server_ts: new Date().getTime(),
|
||||||
|
content: {
|
||||||
|
"m.relates_to": {
|
||||||
|
key: "🖐️",
|
||||||
|
event_id: parentMemberEvent,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
event_id: randomUUID(),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function createRedaction(
|
||||||
|
sender: string,
|
||||||
|
reactionEventId: string,
|
||||||
|
): MatrixEvent {
|
||||||
|
return new MatrixEvent({
|
||||||
|
sender,
|
||||||
|
type: EventType.RoomRedaction,
|
||||||
|
origin_server_ts: new Date().getTime(),
|
||||||
|
redacts: reactionEventId,
|
||||||
|
content: {},
|
||||||
|
event_id: randomUUID(),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export class MockRoom extends EventEmitter {
|
||||||
|
public readonly testSentEvents: Parameters<MatrixClient["sendEvent"]>[] = [];
|
||||||
|
public readonly testRedactedEvents: Parameters<
|
||||||
|
MatrixClient["redactEvent"]
|
||||||
|
>[] = [];
|
||||||
|
|
||||||
|
public constructor(
|
||||||
|
private readonly ownUserId: string,
|
||||||
|
private readonly existingRelations: MatrixEvent[] = [],
|
||||||
|
) {
|
||||||
|
super();
|
||||||
|
}
|
||||||
|
|
||||||
|
public get client(): MatrixClient {
|
||||||
|
return {
|
||||||
|
getUserId: (): string => this.ownUserId,
|
||||||
|
sendEvent: async (
|
||||||
|
...props: Parameters<MatrixClient["sendEvent"]>
|
||||||
|
): ReturnType<MatrixClient["sendEvent"]> => {
|
||||||
|
this.testSentEvents.push(props);
|
||||||
|
return Promise.resolve({ event_id: randomUUID() });
|
||||||
|
},
|
||||||
|
redactEvent: async (
|
||||||
|
...props: Parameters<MatrixClient["redactEvent"]>
|
||||||
|
): ReturnType<MatrixClient["redactEvent"]> => {
|
||||||
|
this.testRedactedEvents.push(props);
|
||||||
|
return Promise.resolve({ event_id: randomUUID() });
|
||||||
|
},
|
||||||
|
} as unknown as MatrixClient;
|
||||||
|
}
|
||||||
|
|
||||||
|
public get relations(): Room["relations"] {
|
||||||
|
return {
|
||||||
|
getChildEventsForEvent: (membershipEventId: string) => ({
|
||||||
|
getRelations: (): MatrixEvent[] => {
|
||||||
|
return this.existingRelations.filter(
|
||||||
|
(r) =>
|
||||||
|
r.getContent()["m.relates_to"]?.event_id === membershipEventId,
|
||||||
|
);
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
} as unknown as Room["relations"];
|
||||||
|
}
|
||||||
|
|
||||||
|
public testSendHandRaise(
|
||||||
|
parentMemberEvent: string,
|
||||||
|
membershipOrOverridenSender: Record<string, string> | string,
|
||||||
|
): string {
|
||||||
|
const evt = createHandRaisedReaction(
|
||||||
|
parentMemberEvent,
|
||||||
|
membershipOrOverridenSender,
|
||||||
|
);
|
||||||
|
this.emit(RoomEvent.Timeline, evt, this, undefined, false, {
|
||||||
|
timeline: new EventTimeline(new EventTimelineSet(undefined)),
|
||||||
|
});
|
||||||
|
return evt.getId()!;
|
||||||
|
}
|
||||||
|
|
||||||
|
public testSendReaction(
|
||||||
|
parentMemberEvent: string,
|
||||||
|
reaction: ReactionOption,
|
||||||
|
membershipOrOverridenSender: Record<string, string> | string,
|
||||||
|
): string {
|
||||||
|
const evt = new MatrixEvent({
|
||||||
|
sender:
|
||||||
|
typeof membershipOrOverridenSender === "string"
|
||||||
|
? membershipOrOverridenSender
|
||||||
|
: membershipOrOverridenSender[parentMemberEvent],
|
||||||
|
type: ElementCallReactionEventType,
|
||||||
|
origin_server_ts: new Date().getTime(),
|
||||||
|
content: {
|
||||||
|
"m.relates_to": {
|
||||||
|
rel_type: RelationType.Reference,
|
||||||
|
event_id: parentMemberEvent,
|
||||||
|
},
|
||||||
|
emoji: reaction.emoji,
|
||||||
|
name: reaction.name,
|
||||||
|
} satisfies ECallReactionEventContent,
|
||||||
|
event_id: randomUUID(),
|
||||||
|
});
|
||||||
|
|
||||||
|
this.emit(RoomEvent.Timeline, evt, this, undefined, false, {
|
||||||
|
timeline: new EventTimeline(new EventTimelineSet(undefined)),
|
||||||
|
});
|
||||||
|
return evt.getId()!;
|
||||||
|
}
|
||||||
|
}
|
@ -15,6 +15,7 @@ import type { IWidgetApiRequest } from "matrix-widget-api";
|
|||||||
import { LazyEventEmitter } from "./LazyEventEmitter";
|
import { LazyEventEmitter } from "./LazyEventEmitter";
|
||||||
import { getUrlParams } from "./UrlParams";
|
import { getUrlParams } from "./UrlParams";
|
||||||
import { Config } from "./config/Config";
|
import { Config } from "./config/Config";
|
||||||
|
import { ElementCallReactionEventType } from "./reactions";
|
||||||
|
|
||||||
// Subset of the actions in matrix-react-sdk
|
// Subset of the actions in matrix-react-sdk
|
||||||
export enum ElementWidgetActions {
|
export enum ElementWidgetActions {
|
||||||
@ -105,6 +106,7 @@ export const widget = ((): WidgetHelpers | null => {
|
|||||||
EventType.CallEncryptionKeysPrefix,
|
EventType.CallEncryptionKeysPrefix,
|
||||||
EventType.Reaction,
|
EventType.Reaction,
|
||||||
EventType.RoomRedaction,
|
EventType.RoomRedaction,
|
||||||
|
ElementCallReactionEventType,
|
||||||
];
|
];
|
||||||
|
|
||||||
const sendState = [
|
const sendState = [
|
||||||
|
17
yarn.lock
17
yarn.lock
@ -1608,6 +1608,15 @@
|
|||||||
dependencies:
|
dependencies:
|
||||||
tslib "2"
|
tslib "2"
|
||||||
|
|
||||||
|
"@formatjs/intl-segmenter@^11.7.3":
|
||||||
|
version "11.7.3"
|
||||||
|
resolved "https://registry.yarnpkg.com/@formatjs/intl-segmenter/-/intl-segmenter-11.7.3.tgz#aeb49c33c81fec68419922c64c72188b659eaa5a"
|
||||||
|
integrity sha512-IvEDQRe0t0ouqaqZK2KobGt/+BhwDHdtbS8GWhdl+fjmWbhXMz2mHihu5fAYkYChum5eNfGhEF5P+bLCeYq67w==
|
||||||
|
dependencies:
|
||||||
|
"@formatjs/ecma402-abstract" "2.2.3"
|
||||||
|
"@formatjs/intl-localematcher" "0.5.7"
|
||||||
|
tslib "2"
|
||||||
|
|
||||||
"@gulpjs/to-absolute-glob@^4.0.0":
|
"@gulpjs/to-absolute-glob@^4.0.0":
|
||||||
version "4.0.0"
|
version "4.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/@gulpjs/to-absolute-glob/-/to-absolute-glob-4.0.0.tgz#1fc2460d3953e1d9b9f2dfdb4bcc99da4710c021"
|
resolved "https://registry.yarnpkg.com/@gulpjs/to-absolute-glob/-/to-absolute-glob-4.0.0.tgz#1fc2460d3953e1d9b9f2dfdb4bcc99da4710c021"
|
||||||
@ -3100,10 +3109,10 @@
|
|||||||
dependencies:
|
dependencies:
|
||||||
"@use-gesture/core" "10.3.1"
|
"@use-gesture/core" "10.3.1"
|
||||||
|
|
||||||
"@vector-im/compound-design-tokens@^1.0.0":
|
"@vector-im/compound-design-tokens@^1.9.1":
|
||||||
version "1.9.0"
|
version "1.9.1"
|
||||||
resolved "https://registry.yarnpkg.com/@vector-im/compound-design-tokens/-/compound-design-tokens-1.9.0.tgz#a3788845110fdcafb1720f633cb060b86f9a1592"
|
resolved "https://registry.yarnpkg.com/@vector-im/compound-design-tokens/-/compound-design-tokens-1.9.1.tgz#644dc7ca5ca251fd476af2a7c075e9d740c08871"
|
||||||
integrity sha512-09eIRJSiWtAqK605eIu+PfT1ugu7u13gkvfxvfN7kjJMHQOzHSvDxmwADmfIzlV7oBQ8M+5D4KSKHNskvMxWsA==
|
integrity sha512-zjI+PhoNLNrJrLU8whEGjzCuxdqIz6tM0ARYBMS8AG1vC+NlGak6Y21TWnzHT3VINNhnF+PiQ9lFWsU65GydOg==
|
||||||
|
|
||||||
"@vector-im/compound-web@^6.0.0":
|
"@vector-im/compound-web@^6.0.0":
|
||||||
version "6.3.2"
|
version "6.3.2"
|
||||||
|
Loading…
Reference in New Issue
Block a user