From 98b856a6bbb985faebf699c229c22aac09ca0bef Mon Sep 17 00:00:00 2001 From: Kevin Kipp Date: Tue, 27 May 2025 15:13:23 -0500 Subject: [PATCH 1/3] Revert "Revert "Merge pull request #205 from cloudflare/use-partytracks-utils"" This reverts commit eafb00168a39216444c3df47dbffa8e6d8bec7a1. --- app/components/ScreenshareButton.tsx | 8 +- app/components/VideoInputSelector.tsx | 26 +- app/hooks/useMediaDevices.ts | 1 - app/hooks/useStageManager.ts | 2 +- app/hooks/useUserMedia.ts | 274 +++++++++------------- app/routes/_room.$roomName.room.tsx | 4 +- app/routes/_room.tsx | 13 +- app/utils/blurVideoTrack.ts | 133 ++++++----- app/utils/getUserMedia.ts | 66 ------ app/utils/noiseSuppression.ts | 29 ++- app/utils/rxjs/devicePrioritization.ts | 144 ------------ app/utils/rxjs/getDeviceListObservable.ts | 24 -- app/utils/rxjs/getUserMediaTrack$.ts | 16 -- package-lock.json | 49 +++- package.json | 2 +- 15 files changed, 255 insertions(+), 536 deletions(-) delete mode 100644 app/utils/getUserMedia.ts delete mode 100644 app/utils/rxjs/devicePrioritization.ts delete mode 100644 app/utils/rxjs/getDeviceListObservable.ts delete mode 100644 app/utils/rxjs/getUserMediaTrack$.ts diff --git a/app/components/ScreenshareButton.tsx b/app/components/ScreenshareButton.tsx index 72703a05..de7cf93c 100644 --- a/app/components/ScreenshareButton.tsx +++ b/app/components/ScreenshareButton.tsx @@ -9,11 +9,9 @@ interface ScreenshareButtonProps {} export const ScreenshareButton: FC = () => { const { - userMedia: { screenShareVideoTrack, startScreenShare, endScreenShare }, + userMedia: { startScreenShare, endScreenShare, screenShareEnabled }, } = useRoomContext() - const sharing = screenShareVideoTrack !== undefined - const [canShareScreen, setCanShareScreen] = useState(true) // setting this in a useEffect because we need to do this feature @@ -31,8 +29,8 @@ export const ScreenshareButton: FC = () => { return (