Add support for displaying the duration of a raised hand.

This commit is contained in:
Half-Shot
2024-10-25 17:09:45 +01:00
parent 16afb568fd
commit 1c8e547b9a
5 changed files with 113 additions and 28 deletions

View File

@@ -92,7 +92,6 @@ const UserMediaTile = forwardRef<HTMLDivElement, UserMediaTileProps>(
[vm],
);
const { raisedHands } = useReactions();
const raisedHand = raisedHands.includes(vm.member?.userId ?? "");
const MicIcon = audioEnabled ? MicOnSolidIcon : MicOffSolidIcon;
@@ -147,7 +146,7 @@ const UserMediaTile = forwardRef<HTMLDivElement, UserMediaTileProps>(
{menu}
</Menu>
}
raisedHand={raisedHand}
raisedHandTime={raisedHands[vm.member?.userId ?? ""]}
{...props}
/>
);

View File

@@ -90,6 +90,21 @@ unconditionally select the container so we can use cqmin units */
place-items: start;
}
.raisedHandWidget {
display: flex;
background-color: var(--cpd-color-bg-subtle-primary);
border-radius: var(--cpd-radius-pill-effect);
color: var(--cpd-color-icon-secondary);
border: 1px solid var(--cpd-color-yellow-1200);
}
.raisedHandWidget > p {
padding: var(--cpd-space-2x);
margin-top: auto;
margin-bottom: auto;
width: 4em;
}
.raisedHand {
margin: var(--cpd-space-2x);
padding: var(--cpd-space-2x);
@@ -104,6 +119,7 @@ unconditionally select the container so we can use cqmin units */
box-shadow: var(--small-drop-shadow);
box-sizing: border-box;
max-inline-size: 100%;
max-width: fit-content;
}
.raisedHand > span {
@@ -114,6 +130,10 @@ unconditionally select the container so we can use cqmin units */
font-size: 22px;
}
.raisedHandBorder {
border: var(--cpd-space-1x) solid var(--cpd-color-yellow-1200);
}
.nameTag {
grid-area: nameTag;
padding: var(--cpd-space-1x);

View File

@@ -8,7 +8,13 @@ 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 {
ComponentProps,
ReactNode,
forwardRef,
useEffect,
useState,
} from "react";
import { useTranslation } from "react-i18next";
import classNames from "classnames";
import { VideoTrack } from "@livekit/components-react";
@@ -32,7 +38,7 @@ interface Props extends ComponentProps<typeof animated.div> {
nameTagLeadingIcon?: ReactNode;
displayName: string;
primaryButton?: ReactNode;
raisedHand: boolean;
raisedHandTime?: Date;
}
export const MediaView = forwardRef<HTMLDivElement, Props>(
@@ -51,18 +57,39 @@ export const MediaView = forwardRef<HTMLDivElement, Props>(
nameTagLeadingIcon,
displayName,
primaryButton,
raisedHand,
raisedHandTime,
...props
},
ref,
) => {
const { t } = useTranslation();
const [raisedHandDuration, setRaisedHandDuration] = useState("");
useEffect(() => {
if (!raisedHandTime) {
return;
}
setRaisedHandDuration("00:00");
const to = setInterval(() => {
const totalSeconds = Math.ceil(
(new Date().getTime() - raisedHandTime.getTime()) / 1000,
);
const seconds = totalSeconds % 60;
const minutes = Math.floor(totalSeconds / 60);
setRaisedHandDuration(
`${minutes < 10 ? "0" : ""}${minutes}:${seconds < 10 ? "0" : ""}${seconds}`,
);
}, 1000);
return (): void => clearInterval(to);
}, [setRaisedHandDuration, raisedHandTime]);
return (
<animated.div
className={classNames(styles.media, className, {
[styles.mirror]: mirror,
[styles.videoMuted]: !videoEnabled,
[styles.raisedHandBorder]: !!raisedHandTime,
})}
style={style}
ref={ref}
@@ -88,11 +115,14 @@ export const MediaView = forwardRef<HTMLDivElement, Props>(
)}
</div>
<div className={styles.fg}>
{raisedHand && (
<div className={styles.raisedHand}>
<span role="img" aria-label="raised hand">
</span>
{raisedHandTime && (
<div className={styles.raisedHandWidget}>
<div className={styles.raisedHand}>
<span role="img" aria-label="raised hand">
</span>
</div>
<p>{raisedHandDuration}</p>
</div>
)}
<div className={styles.nameTag}>