* 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>
161 lines
5.1 KiB
TypeScript
161 lines
5.1 KiB
TypeScript
/*
|
|
Copyright 2024 New Vector Ltd.
|
|
|
|
SPDX-License-Identifier: AGPL-3.0-only
|
|
Please see LICENSE in the repository root for full details.
|
|
*/
|
|
|
|
import { TrackReferenceOrPlaceholder } from "@livekit/components-core";
|
|
import { animated } from "@react-spring/web";
|
|
import { RoomMember } from "matrix-js-sdk/src/matrix";
|
|
import { ComponentProps, ReactNode, forwardRef } from "react";
|
|
import { useTranslation } from "react-i18next";
|
|
import classNames from "classnames";
|
|
import { VideoTrack } from "@livekit/components-react";
|
|
import { Text, Tooltip } from "@vector-im/compound-web";
|
|
import { ErrorIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
|
|
|
|
import styles from "./MediaView.module.css";
|
|
import { Avatar } from "../Avatar";
|
|
import { EncryptionStatus } from "../state/MediaViewModel";
|
|
import { RaisedHandIndicator } from "../reactions/RaisedHandIndicator";
|
|
import { showHandRaisedTimer, useSetting } from "../settings/settings";
|
|
import { ReactionOption } from "../reactions";
|
|
import { ReactionIndicator } from "../reactions/ReactionIndicator";
|
|
|
|
interface Props extends ComponentProps<typeof animated.div> {
|
|
className?: string;
|
|
style?: ComponentProps<typeof animated.div>["style"];
|
|
targetWidth: number;
|
|
targetHeight: number;
|
|
video: TrackReferenceOrPlaceholder;
|
|
videoFit: "cover" | "contain";
|
|
mirror: boolean;
|
|
member: RoomMember | undefined;
|
|
videoEnabled: boolean;
|
|
unencryptedWarning: boolean;
|
|
encryptionStatus: EncryptionStatus;
|
|
nameTagLeadingIcon?: ReactNode;
|
|
displayName: string;
|
|
primaryButton?: ReactNode;
|
|
raisedHandTime?: Date;
|
|
currentReaction?: ReactionOption;
|
|
raisedHandOnClick?: () => void;
|
|
}
|
|
|
|
export const MediaView = forwardRef<HTMLDivElement, Props>(
|
|
(
|
|
{
|
|
className,
|
|
style,
|
|
targetWidth,
|
|
targetHeight,
|
|
video,
|
|
videoFit,
|
|
mirror,
|
|
member,
|
|
videoEnabled,
|
|
unencryptedWarning,
|
|
nameTagLeadingIcon,
|
|
displayName,
|
|
primaryButton,
|
|
encryptionStatus,
|
|
raisedHandTime,
|
|
currentReaction,
|
|
raisedHandOnClick,
|
|
...props
|
|
},
|
|
ref,
|
|
) => {
|
|
const { t } = useTranslation();
|
|
const [handRaiseTimerVisible] = useSetting(showHandRaisedTimer);
|
|
|
|
const avatarSize = Math.round(Math.min(targetWidth, targetHeight) / 2);
|
|
|
|
return (
|
|
<animated.div
|
|
className={classNames(styles.media, className, {
|
|
[styles.mirror]: mirror,
|
|
[styles.videoMuted]: !videoEnabled,
|
|
})}
|
|
style={style}
|
|
ref={ref}
|
|
data-testid="videoTile"
|
|
data-video-fit={videoFit}
|
|
{...props}
|
|
>
|
|
<div className={styles.bg}>
|
|
<Avatar
|
|
id={member?.userId ?? displayName}
|
|
name={displayName}
|
|
size={avatarSize}
|
|
src={member?.getMxcAvatarUrl()}
|
|
className={styles.avatar}
|
|
/>
|
|
{video.publication !== undefined && (
|
|
<VideoTrack
|
|
trackRef={video}
|
|
// There's no reason for this to be focusable
|
|
tabIndex={-1}
|
|
disablePictureInPicture
|
|
/>
|
|
)}
|
|
</div>
|
|
<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 */}
|
|
{/*encryptionStatus !== EncryptionStatus.Okay && (
|
|
<div className={styles.status}>
|
|
<Text as="span" size="sm" weight="medium" className={styles.name}>
|
|
{encryptionStatus === EncryptionStatus.Connecting &&
|
|
t("e2ee_encryption_status.connecting")}
|
|
{encryptionStatus === EncryptionStatus.KeyMissing &&
|
|
t("e2ee_encryption_status.key_missing")}
|
|
{encryptionStatus === EncryptionStatus.KeyInvalid &&
|
|
t("e2ee_encryption_status.key_invalid")}
|
|
{encryptionStatus === EncryptionStatus.PasswordInvalid &&
|
|
t("e2ee_encryption_status.password_invalid")}
|
|
</Text>
|
|
</div>
|
|
)*/}
|
|
<div className={styles.nameTag}>
|
|
{nameTagLeadingIcon}
|
|
<Text as="span" size="sm" weight="medium" className={styles.name}>
|
|
{displayName}
|
|
</Text>
|
|
{unencryptedWarning && (
|
|
<Tooltip
|
|
label={t("common.unencrypted")}
|
|
placement="bottom"
|
|
isTriggerInteractive={false}
|
|
>
|
|
<ErrorIcon
|
|
width={20}
|
|
height={20}
|
|
className={styles.errorIcon}
|
|
/>
|
|
</Tooltip>
|
|
)}
|
|
</div>
|
|
{primaryButton}
|
|
</div>
|
|
</animated.div>
|
|
);
|
|
},
|
|
);
|
|
|
|
MediaView.displayName = "MediaView";
|