Update and use isParticipantTrackPinned function (#141)

* add TrackParticipantPair to core types

* update and use isParticipantTrackPinned function

Author: Ocupe

packages/core/src/types.ts

@@ -1,6 +1,11 @@
-import type { Participant, Track } from 'livekit-client';
+import type { Participant, Track, TrackPublication } from 'livekit-client';
 
 export type PinState = {
   pinnedParticipant?: Participant;
   pinnedSource?: Track.Source;
 };
+
+export type TrackParticipantPair = {
+  track: TrackPublication;
+  participant: Participant;
+};

packages/core/src/utils.ts

@@ -1,14 +1,8 @@
-import {
-  LocalParticipant,
-  Participant,
-  RemoteParticipant,
-  Track,
-  TrackPublication,
-} from 'livekit-client';
+import { LocalParticipant, Participant, RemoteParticipant, TrackPublication } from 'livekit-client';
 import type { ClassNames } from '@livekit/components-styles/dist/types/general/styles.css';
 import type { UnprefixedClassNames } from '@livekit/components-styles/dist/types_unprefixed/styles.scss';
 import { cssPrefix } from './constants';
-import { PinState } from './types';
+import { PinState, TrackParticipantPair } from './types';
 export function kebabize(str: string) {
   return str.replace(/[A-Z]+(?![a-z])|[A-Z]/g, ($, ofs) => (ofs ? '-' : '') + $.toLowerCase());
 }
@@ -43,41 +37,16 @@ export const attachIfSubscribed = (
 };
 
 export function isParticipantTrackPinned(
-  participant: Participant,
-  focusState: PinState | undefined,
-  source: Track.Source,
+  trackParticipantPair: TrackParticipantPair,
+  pinState: PinState | undefined,
 ): boolean {
-  if (focusState === undefined) {
-    console.warn(`focusState not set: `, focusState);
-    return false;
-  }
-
-  if (focusState.pinnedParticipant === undefined || focusState.pinnedSource === undefined) {
-    console.warn(`focusState not set: `, focusState);
-    return false;
-  }
+  const { track, participant } = trackParticipantPair;
 
-  if (focusState.pinnedSource !== source) {
+  if (pinState === undefined) {
     return false;
   }
 
-  if (focusState.pinnedParticipant.identity === participant.identity) {
-    console.log(`Participant has same identity as pinned.`, focusState);
-    switch (focusState.pinnedSource) {
-      case Track.Source.Camera:
-        return participant.isCameraEnabled;
-        break;
-      case Track.Source.ScreenShare:
-        return participant.isScreenShareEnabled;
-        break;
-
-      default:
-        return false;
-        break;
-    }
-  } else {
-    return false;
-  }
+  return pinState.pinnedSource === track.source && pinState.pinnedParticipant === participant;
 }
 
 /**

packages/react/src/hooks/track-hooks.ts

@@ -1,4 +1,9 @@
-import { setupMediaTrack, trackObservable } from '@livekit/components-core';
+import {
+  isParticipantTrackPinned,
+  setupMediaTrack,
+  trackObservable,
+  TrackParticipantPair,
+} from '@livekit/components-core';
 import { Participant, Track, TrackPublication } from 'livekit-client';
 import * as React from 'react';
 import { useMaybePinContext } from '../contexts';
@@ -82,7 +87,6 @@ export function useTrack({ pub }: UseTrackProps) {
   return { publication, track };
 }
 
-export type TrackParticipantPair = { track: TrackPublication; participant: Participant };
 export type TracksFilter = Parameters<TrackParticipantPair[]['filter']>['0'];
 type UseTracksProps = {
   sources: Track.Source[];
@@ -159,11 +163,8 @@ export function useTracks({
     });
 
     if (excludePinnedTracks && pinContext) {
-      sourceParticipantPairs = sourceParticipantPairs.filter(({ track, participant }) =>
-        pinContext.state?.pinnedSource === track.source &&
-        participant === pinContext.state.pinnedParticipant
-          ? false
-          : true,
+      sourceParticipantPairs = sourceParticipantPairs.filter((trackParticipantPair) =>
+        isParticipantTrackPinned(trackParticipantPair, pinContext.state),
       );
     }