From 0ad5553050717428f0fad7c029bf3f581ff50eb1 Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 6 Jul 2021 12:47:22 +0100 Subject: [PATCH] removed deep memos --- dailyjs/basic-call/components/Room/Header.js | 2 +- .../shared/contexts/ParticipantsProvider.js | 19 ++++++------------- dailyjs/shared/contexts/TracksProvider.js | 1 - 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/dailyjs/basic-call/components/Room/Header.js b/dailyjs/basic-call/components/Room/Header.js index a18e5d5..661447c 100644 --- a/dailyjs/basic-call/components/Room/Header.js +++ b/dailyjs/basic-call/components/Room/Header.js @@ -13,7 +13,7 @@ export const Header = () => {
Basic call demo
{`${participantCount} ${ - participantCount > 1 ? 'participants' : 'participant' + participantCount === 1 ? 'participant' : 'participants' }`}
{customCapsule && ( diff --git a/dailyjs/shared/contexts/ParticipantsProvider.js b/dailyjs/shared/contexts/ParticipantsProvider.js index a39a984..2bfe405 100644 --- a/dailyjs/shared/contexts/ParticipantsProvider.js +++ b/dailyjs/shared/contexts/ParticipantsProvider.js @@ -8,7 +8,6 @@ import React, { useMemo, } from 'react'; import PropTypes from 'prop-types'; -import { useDeepCompareMemo } from 'use-deep-compare'; import { sortByKey } from '../lib/sortByKey'; @@ -45,16 +44,13 @@ export const ParticipantsProvider = ({ children }) => { /** * Only return participants that should be visible in the call */ - const participants = useDeepCompareMemo( - () => allParticipants.filter((p) => p?.isOwner), - [allParticipants] - ); + const participants = useMemo(() => state.participants, [state.participants]); /** * The number of participants, who are not a shared screen * (technically a shared screen counts as a participant, but we shouldn't tell humans) */ - const participantCount = useDeepCompareMemo( + const participantCount = useMemo( () => participants.filter(({ isScreenshare }) => !isScreenshare).length, [participants] ); @@ -62,7 +58,7 @@ export const ParticipantsProvider = ({ children }) => { /** * The participant who most recently got mentioned via a `active-speaker-change` event */ - const activeParticipant = useDeepCompareMemo( + const activeParticipant = useMemo( () => participants.find(({ isActiveSpeaker }) => isActiveSpeaker), [participants] ); @@ -70,7 +66,7 @@ export const ParticipantsProvider = ({ children }) => { /** * The local participant */ - const localParticipant = useDeepCompareMemo( + const localParticipant = useMemo( () => allParticipants.find( ({ isLocal, isScreenshare }) => isLocal && !isScreenshare @@ -78,10 +74,7 @@ export const ParticipantsProvider = ({ children }) => { [allParticipants] ); - const isOwner = useDeepCompareMemo( - () => localParticipant?.isOwner, - [localParticipant] - ); + const isOwner = useMemo(() => localParticipant?.isOwner, [localParticipant]); /** * The participant who should be rendered prominently right now @@ -119,7 +112,7 @@ export const ParticipantsProvider = ({ children }) => { /** * Screen shares */ - const screens = useDeepCompareMemo( + const screens = useMemo( () => allParticipants.filter(({ isScreenshare }) => isScreenshare), [allParticipants] ); diff --git a/dailyjs/shared/contexts/TracksProvider.js b/dailyjs/shared/contexts/TracksProvider.js index 49d4fdb..92003ff 100644 --- a/dailyjs/shared/contexts/TracksProvider.js +++ b/dailyjs/shared/contexts/TracksProvider.js @@ -186,7 +186,6 @@ export const TracksProvider = ({ children }) => { }; const trackStoppedBatchInterval = setInterval(() => { - console.log(trackStoppedQueue); if (!trackStoppedQueue.length) { return; }