Merge remote-tracking branch 'origin/livekit' into hs/emoji-reactions

src/tile/GridTile.tsx

@@ -10,6 +10,7 @@ import {
   ReactNode,
   forwardRef,
   useCallback,
+  useRef,
   useState,
 } from "react";
 import { animated } from "@react-spring/web";
@@ -44,6 +45,8 @@ import {
 import { Slider } from "../Slider";
 import { MediaView } from "./MediaView";
 import { useLatest } from "../useLatest";
+import { GridTileViewModel } from "../state/TileViewModel";
+import { useMergedRefs } from "../useMergedRefs";
 import { useReactions } from "../useReactions";
 import { ReactionOption } from "../reactions";
 
@@ -53,7 +56,6 @@ interface TileProps {
   targetWidth: number;
   targetHeight: number;
   displayName: string;
-  showVideo: boolean;
   showSpeakingIndicators: boolean;
 }
 
@@ -68,7 +70,6 @@ const UserMediaTile = forwardRef<HTMLDivElement, UserMediaTileProps>(
   (
     {
       vm,
-      showVideo,
       showSpeakingIndicators,
       menuStart,
       menuEnd,
@@ -81,6 +82,7 @@ const UserMediaTile = forwardRef<HTMLDivElement, UserMediaTileProps>(
     const { t } = useTranslation();
     const video = useObservableEagerState(vm.video);
     const unencryptedWarning = useObservableEagerState(vm.unencryptedWarning);
+    const encryptionStatus = useObservableEagerState(vm.encryptionStatus);
     const audioEnabled = useObservableEagerState(vm.audioEnabled);
     const videoEnabled = useObservableEagerState(vm.videoEnabled);
     const speaking = useObservableEagerState(vm.speaking);
@@ -92,7 +94,7 @@ const UserMediaTile = forwardRef<HTMLDivElement, UserMediaTileProps>(
       },
       [vm],
     );
-    const { raisedHands, reactions } = useReactions();
+    const { raisedHands, lowerHand, reactions } = useReactions();
 
     const MicIcon = audioEnabled ? MicOnSolidIcon : MicOffSolidIcon;
 
@@ -113,6 +115,8 @@ const UserMediaTile = forwardRef<HTMLDivElement, UserMediaTileProps>(
     const handRaised: Date | undefined = raisedHands[vm.member?.userId ?? ""];
     const currentReaction: ReactionOption | undefined =
       reactions[vm.member?.userId ?? ""];
+    const raisedHandOnClick =
+      vm.local && handRaised ? (): void => void lowerHand() : undefined;
 
     const showSpeaking = showSpeakingIndicators && speaking;
 
@@ -122,7 +126,8 @@ const UserMediaTile = forwardRef<HTMLDivElement, UserMediaTileProps>(
         video={video}
         member={vm.member}
         unencryptedWarning={unencryptedWarning}
-        videoEnabled={videoEnabled && showVideo}
+        encryptionStatus={encryptionStatus}
+        videoEnabled={videoEnabled}
         videoFit={cropVideo ? "cover" : "contain"}
         className={classNames(className, styles.tile, {
           [styles.speaking]: showSpeaking,
@@ -156,6 +161,7 @@ const UserMediaTile = forwardRef<HTMLDivElement, UserMediaTileProps>(
         }
         raisedHandTime={handRaised}
         currentReaction={currentReaction}
+        raisedHandOnClick={raisedHandOnClick}
         {...props}
       />
     );
@@ -281,25 +287,27 @@ const RemoteUserMediaTile = forwardRef<
 RemoteUserMediaTile.displayName = "RemoteUserMediaTile";
 
 interface GridTileProps {
-  vm: UserMediaViewModel;
+  vm: GridTileViewModel;
   onOpenProfile: (() => void) | null;
   targetWidth: number;
   targetHeight: number;
   className?: string;
   style?: ComponentProps<typeof animated.div>["style"];
-  showVideo: boolean;
   showSpeakingIndicators: boolean;
 }
 
 export const GridTile = forwardRef<HTMLDivElement, GridTileProps>(
-  ({ vm, onOpenProfile, ...props }, ref) => {
-    const displayName = useDisplayName(vm);
+  ({ vm, onOpenProfile, ...props }, theirRef) => {
+    const ourRef = useRef<HTMLDivElement | null>(null);
+    const ref = useMergedRefs(ourRef, theirRef);
+    const media = useObservableEagerState(vm.media);
+    const displayName = useDisplayName(media);
 
-    if (vm instanceof LocalUserMediaViewModel) {
+    if (media instanceof LocalUserMediaViewModel) {
       return (
         <LocalUserMediaTile
           ref={ref}
-          vm={vm}
+          vm={media}
           onOpenProfile={onOpenProfile}
           displayName={displayName}
           {...props}
@@ -309,7 +317,7 @@ export const GridTile = forwardRef<HTMLDivElement, GridTileProps>(
       return (
         <RemoteUserMediaTile
           ref={ref}
-          vm={vm}
+          vm={media}
           displayName={displayName}
           {...props}
         />