@100mslive/react-native-room-kit 1.0.0 → 1.0.1

package/src/hooks-util.ts

@@ -46,9 +46,14 @@ import {
 } from 'react';
 import type { DependencyList } from 'react';
 
-import { MaxTilesInOnePage, ModalTypes, PipModes } from './utils/types';
+import {
+  MaxTilesInOnePage,
+  ModalTypes,
+  PeerListRefreshInterval,
+  PipModes,
+} from './utils/types';
 import type { ChatBroadcastFilter, PeerTrackNode } from './utils/types';
-import { createPeerTrackNode, parseMetadata } from './utils/functions';
+import { createPeerTrackNode } from './utils/functions';
 import {
   batch,
   shallowEqual,
@@ -61,6 +66,7 @@ import {
   addMessage,
   addNotification,
   addParticipant,
+  addParticipants,
   addPinnedMessage,
   addScreenshareTile,
   addUpdateParticipant,
@@ -70,7 +76,9 @@ import {
   clearStore,
   removeNotification,
   removeParticipant,
+  removeParticipants,
   removeScreenshareTile,
+  replaceParticipantsList,
   saveUserData,
   setActiveChatBottomSheetTab,
   setActiveSpeakers,
@@ -103,13 +111,7 @@ import {
   replacePeerTrackNodesWithTrack,
 } from './peerTrackNodeUtils';
 import { MeetingState } from './types';
-import {
-  AppState,
-  InteractionManager,
-  Keyboard,
-  LayoutAnimation,
-  Platform,
-} from 'react-native';
+import { InteractionManager, Keyboard, Platform } from 'react-native';
 import type { ImageStyle, StyleProp, ViewStyle, TextStyle } from 'react-native';
 import { NavigationContext } from '@react-navigation/native';
 import {
@@ -139,6 +141,8 @@ export const useHMSListeners = (
 
   useHMSPeersUpdate(hmsInstance, updateLocalPeer, setPeerTrackNodes);
 
+  useHMSPeerListUpdated(hmsInstance);
+
   useHMSTrackUpdate(hmsInstance, updateLocalPeer, setPeerTrackNodes);
 };
 
@@ -414,6 +418,7 @@ const useHMSPeersUpdate = (
       }
       if (
         type === HMSPeerUpdate.METADATA_CHANGED ||
+        type === HMSPeerUpdate.HAND_RAISED_CHANGED ||
         type === HMSPeerUpdate.NAME_CHANGED ||
         type === HMSPeerUpdate.NETWORK_QUALITY_UPDATED
       ) {
@@ -421,8 +426,8 @@ const useHMSPeersUpdate = (
 
         const reduxState = store.getState();
 
-        if (type === HMSPeerUpdate.METADATA_CHANGED) {
-          const handRaised = parseMetadata(peer.metadata).isHandRaised;
+        if (type === HMSPeerUpdate.HAND_RAISED_CHANGED) {
+          const handRaised = peer.isHandRaised;
 
           if (handRaised) {
             const { layoutConfig, localPeer } = reduxState.hmsStates;
@@ -506,6 +511,38 @@ const useHMSPeersUpdate = (
   }, [hmsInstance]);
 };
 
+type PeerListUpdate = {
+  addedPeers: HMSPeer[];
+  removedPeers: HMSPeer[];
+};
+
+const useHMSPeerListUpdated = (hmsInstance: HMSSDK) => {
+  const dispatch = useDispatch();
+
+  useEffect(() => {
+    const peerListUpdateHandler = ({
+      addedPeers,
+      removedPeers,
+    }: PeerListUpdate) => {
+      batch(() => {
+        dispatch(addParticipants(addedPeers));
+        dispatch(removeParticipants(removedPeers));
+      });
+    };
+
+    hmsInstance.addEventListener(
+      HMSUpdateListenerActions.ON_PEER_LIST_UPDATED,
+      peerListUpdateHandler
+    );
+
+    return () => {
+      hmsInstance.removeEventListener(
+        HMSUpdateListenerActions.ON_PEER_LIST_UPDATED
+      );
+    };
+  }, [hmsInstance]);
+};
+
 type TrackUpdate = {
   peer: HMSPeer;
   track: HMSTrack;
@@ -1270,20 +1307,27 @@ export const usePIPListener = () => {
   );
 
   useEffect(() => {
-    if (isPipModeActive) {
-      const appStateListener = () => {
-        LayoutAnimation.configureNext(LayoutAnimation.Presets.easeInEaseOut);
-        dispatch(changePipModeStatus(PipModes.INACTIVE));
-      };
+    const pipModeChangedHandler = (data: {
+      isInPictureInPictureMode: boolean;
+    }) => {
+      dispatch(
+        changePipModeStatus(
+          data.isInPictureInPictureMode ? PipModes.ACTIVE : PipModes.INACTIVE
+        )
+      );
+    };
 
-      AppState.addEventListener('focus', appStateListener);
+    hmsInstance.addEventListener(
+      HMSPIPListenerActions.ON_PIP_MODE_CHANGED,
+      pipModeChangedHandler
+    );
 
-      return () => {
-        AppState.removeEventListener('focus', appStateListener);
-        dispatch(changePipModeStatus(PipModes.INACTIVE));
-      };
-    }
-  }, [isPipModeActive]);
+    return () => {
+      hmsInstance.removeEventListener(
+        HMSPIPListenerActions.ON_PIP_MODE_CHANGED
+      );
+    };
+  }, []);
 
   // Check if PIP is supported or not
   useEffect(() => {
@@ -1524,7 +1568,6 @@ export const useHMSConfig = () => {
       username: storeState.user.userName,
       captureNetworkQualityInPreview: true,
       endpoint: storeState.user.endPoints?.init,
-      // metadata: JSON.stringify({isHandRaised: true}), // To join with hand raised
     });
 
     return hmsConfig;
@@ -1634,30 +1677,68 @@ export const useLandscapeChatViewVisible = () => {
   return pipModeNotActive && isLandscapeOrientation && overlayChatVisible;
 };
 
-export type ParticipantHeaderData = {
+export type ParticipantAccordianData = {
+  id: string;
   label: string;
-  role: HMSRole;
-  itemsLength: number;
+  showViewAll: boolean;
+  data: (HMSPeer | HMSLocalPeer)[];
 };
 
-export type ParticipantHandRaisedHeaderData = {
-  label: string;
-  itemsLength: number;
-};
+export const useOffStageParticipants = () => {
+  const dispatch = useDispatch();
+  const hmsInstance = useHMSInstance();
+  const offStageRoles = useHMSLayoutConfig(
+    (layoutConfig) =>
+      layoutConfig?.screens?.conferencing?.default?.elements?.on_stage_exp
+        ?.off_stage_roles || null
+  );
+
+  const [participantsTotalCounts, setParticipantsTotalCounts] = useState<
+    Record<string, number>
+  >({});
+
+  useEffect(() => {
+    if (offStageRoles) {
+      let mounted = true;
 
-export type ListItemUI<
-  T =
-    | ParticipantHeaderData
-    | HMSLocalPeer
-    | HMSPeer
-    | ParticipantHandRaisedHeaderData,
-> = {
-  type: 'EXPANDED_HEADER' | 'COLLAPSED_HEADER' | 'LAST_ITEM' | 'REGULAR_ITEM';
-  data: T;
-  key: string;
+      const createIterator = async (forRole: string) => {
+        const iterator = hmsInstance.getPeerListIterator({
+          byRoleName: forRole,
+          limit: 10,
+        });
+        const participants = await iterator.next();
+        if (mounted) {
+          dispatch(replaceParticipantsList(participants, forRole));
+          setParticipantsTotalCounts((prev) => ({
+            ...prev,
+            [forRole]: iterator.totalCount,
+          }));
+        }
+      };
+
+      const createIteratorForRoles = () => {
+        offStageRoles.forEach((role) => {
+          createIterator(role);
+        });
+      };
+
+      createIteratorForRoles();
+
+      const intervalId = setInterval(() => {
+        createIteratorForRoles();
+      }, PeerListRefreshInterval);
+
+      return () => {
+        mounted = false;
+        clearInterval(intervalId);
+      };
+    }
+  }, [offStageRoles]);
+
+  return participantsTotalCounts;
 };
 
-export const useFilteredParticipants = () => {
+export const useFilteredParticipants = (filterText: string) => {
   const roles = useSelector((state: RootState) => state.hmsStates.roles);
   const onStageRole = useHMSLayoutConfig(
     (layoutConfig) =>
@@ -1665,183 +1746,138 @@ export const useFilteredParticipants = () => {
         ?.on_stage_role || null
   );
 
-  const [searchText, setSearchText] = useState('');
-  const formattedSearchText = searchText.trim().toLowerCase();
-
-  const participants = useSelector(
-    (state: RootState) => state.hmsStates.participants
-  );
+  const offStageParticipantsTotalCounts = useOffStageParticipants();
 
-  const peerGroups = useMemo(() => {
-    return groupParticipantsAsPerRole(participants, formattedSearchText);
-  }, [formattedSearchText, participants]);
+  const formattedSearchText = filterText.trim().toLowerCase();
 
-  const sortedRoles = useMemo(() => {
-    return roles
-      .filter((role) => peerGroups.has(role.name!))
-      .sort((a, b) => {
-        if (onStageRole) {
-          if (a.name === onStageRole && b.name === onStageRole) {
-            return 0;
-          }
-
-          if (a.name === onStageRole) {
-            return -1;
-          }
+  const groupedParticipants = useSelector(
+    (state: RootState) => state.hmsStates.groupedParticipants
+  );
 
-          if (b.name === onStageRole) {
-            return 1;
+  const sortedRoles = useMemo(
+    () => {
+      return roles
+        .filter((role) => {
+          if (!role.name || role.name.startsWith('_')) {
+            return false;
           }
-        }
+          return true;
 
-        const canAPublish: boolean =
-          (a.publishSettings?.allowed &&
-            a.publishSettings.allowed.length > 0) ??
-          false;
-        const canBPublish: boolean =
-          (b.publishSettings?.allowed &&
-            b.publishSettings.allowed.length > 0) ??
-          false;
-
-        if (canAPublish && canBPublish) {
-          return 0;
-        }
+          // const list = groupedParticipants[role.name!];
 
-        if (canAPublish) {
-          return -1;
-        }
-
-        return 1;
-      });
-  }, [peerGroups, onStageRole, roles]);
+          // return list && list.length > 0;
+        })
+        .sort((a, b) => {
+          if (onStageRole) {
+            if (a.name === onStageRole && b.name === onStageRole) {
+              return 0;
+            }
 
-  const firstGroupName = peerGroups.has('hand-raised')
-    ? 'hand-raised'
-    : sortedRoles[0]?.name;
+            if (a.name === onStageRole) {
+              return -1;
+            }
 
-  const [expandedGroups, setExpandedGroups] = useState<string[]>(
-    firstGroupName ? [firstGroupName] : []
-  );
+            if (b.name === onStageRole) {
+              return 1;
+            }
+          }
 
-  const groupedList = useMemo(() => {
-    let list: ListItemUI[] = [];
+          const canAPublish: boolean =
+            (a.publishSettings?.allowed &&
+              a.publishSettings.allowed.length > 0) ??
+            false;
+          const canBPublish: boolean =
+            (b.publishSettings?.allowed &&
+              b.publishSettings.allowed.length > 0) ??
+            false;
 
-    const handRaisedPeers = peerGroups.get('hand-raised');
+          if (canAPublish && canBPublish) {
+            return 0;
+          }
 
-    if (handRaisedPeers) {
-      const expanded = expandedGroups.includes('hand-raised');
+          if (canAPublish) {
+            return -1;
+          }
 
-      list.push({
-        type: expanded ? 'EXPANDED_HEADER' : 'COLLAPSED_HEADER',
-        key: 'hand-raised',
-        data: {
-          label: `Hand Raised (${handRaisedPeers.length})`,
-          itemsLength: handRaisedPeers.length,
-        },
-      });
+          return 1;
+        });
+    },
+    // [groupedParticipants, onStageRole, roles]
+    [onStageRole, roles]
+  );
 
-      if (expanded) {
-        list = list.concat(
-          handRaisedPeers.map((peer, idx, arr) => {
-            const isLast = arr.length - 1 === idx;
+  const participantsAccordianData: ParticipantAccordianData[] = useMemo(() => {
+    const t = [];
 
-            return {
-              data: peer,
-              key: `${peer.peerID}--${'hand-raised'}`,
-              type: isLast ? 'LAST_ITEM' : 'REGULAR_ITEM',
-            };
-          })
-        );
-      }
-    }
+    const filteredHandRaisedPeers: (HMSPeer | HMSLocalPeer)[][] = [];
 
     sortedRoles.forEach((role) => {
-      const peers = peerGroups.get(role.name!);
-
-      if (peers) {
-        const expanded = expandedGroups.includes(role.name!);
-
-        list.push({
-          type: expanded ? 'EXPANDED_HEADER' : 'COLLAPSED_HEADER',
-          key: role.name!,
-          data: {
-            label: `${role.name!} (${peers.length})`,
-            role: role,
-            itemsLength: peers.length,
-          },
+      const list = groupedParticipants[role.name!];
+      const filteredList =
+        Array.isArray(list) && formattedSearchText.length > 0
+          ? list.filter((peer) =>
+              peer.name.toLowerCase().includes(formattedSearchText)
+            )
+          : list;
+
+      if (Array.isArray(filteredList) && filteredList.length > 0) {
+
+        filteredHandRaisedPeers.push(filteredList);
+        const offStageRoleTotalCount =
+          offStageParticipantsTotalCounts[role.name!];
+
+        const firstTen = filteredList.slice(0, 10);
+
+        t.push({
+          id: role.name!,
+          label: `${role.name!} (${
+            typeof offStageRoleTotalCount === 'number'
+              ? offStageRoleTotalCount
+              : filteredList.length
+          })`,
+          showViewAll:
+            typeof offStageRoleTotalCount === 'number' &&
+            formattedSearchText.length <= 0
+              ? offStageRoleTotalCount > 10
+              : filteredList.length > 10,
+          data: firstTen,
         });
-
-        if (expanded) {
-          list = list.concat(
-            peers.map((peer, idx, arr) => {
-              const isLast = arr.length - 1 === idx;
-
-              return {
-                data: peer,
-                key: `${peer.peerID}--${role.name!}`,
-                type: isLast ? 'LAST_ITEM' : 'REGULAR_ITEM',
-              };
-            })
-          );
-        }
       }
     });
 
-    return list;
-  }, [expandedGroups, peerGroups, sortedRoles]);
+    const handRaisedParticipants = filteredHandRaisedPeers
+      .flat()
+      .filter((participant) => participant.isHandRaised);
 
-  return {
-    data: groupedList,
-    searchText,
-    formattedSearchText,
-    setSearchText,
-    expandedGroups,
-    setExpandedGroups,
-  };
-};
-
-const groupParticipantsAsPerRole = (
-  participants: (HMSLocalPeer | HMSPeer)[],
-  searchText: string
-) => {
-  const groups: Map<string, (HMSLocalPeer | HMSPeer)[]> = new Map();
-
-  for (const participant of participants) {
-    const participantRole = participant.role;
+    const firstTenHandRaisedParticipants = handRaisedParticipants.slice(0, 10);
 
-    if (!participantRole) {
-      continue;
+    if (handRaisedParticipants.length > 0) {
+      t.unshift({
+        id: 'hand-raised',
+        label: `Hand Raised (${handRaisedParticipants.length})`,
+        showViewAll: handRaisedParticipants.length > 10,
+        data: firstTenHandRaisedParticipants,
+      });
     }
 
-    if (
-      searchText.length <= 0 ||
-      participant.name.toLowerCase().includes(searchText)
-    ) {
-      if (!groups.has(participantRole.name!)) {
-        groups.set(participantRole.name!, []);
-      }
-
-      const group = groups.get(participantRole.name!);
-
-      if (!group) {
-        continue;
-      }
-
-      group.push(participant);
-
-      if (parseMetadata(participant.metadata).isHandRaised) {
-        if (!groups.has('hand-raised')) {
-          groups.set('hand-raised', []);
-        }
-
-        const group = groups.get('hand-raised');
+    return t;
+  }, [
+    formattedSearchText,
+    groupedParticipants,
+    offStageParticipantsTotalCounts,
+    sortedRoles,
+  ]);
 
-        if (group) group.push(participant);
-      }
-    }
-  }
+  const [expandedGroup, setExpandedGroup] = useState<string | null>(
+    participantsAccordianData[0]?.id ?? null
+  );
 
-  return groups;
+  return {
+    data: participantsAccordianData,
+    formattedSearchText,
+    expandedGroup,
+    setExpandedGroup,
+  };
 };
 
 export const useShouldGoLive = () => {

package/src/redux/actionTypes.ts

@@ -141,8 +141,11 @@ export enum HmsStateActionTypes {
   SET_LAYOUT_CONFIG = 'SET_LAYOUT_CONFIG',
   SET_ROLE_CHANGE_REQUEST = 'SET_ROLE_CHANGE_REQUEST',
   ADD_PARTICIPANT = 'ADD_PARTICIPANT',
+  ADD_PARTICIPANTS = 'ADD_PARTICIPANTS',
   REMOVE_PARTICIPANT = 'REMOVE_PARTICIPANT',
-  ADD_UPDATE_PARTICIPANT = 'ADD_UPDATE_PARTICIPANT',
+  REMOVE_PARTICIPANTS = 'REMOVE_PARTICIPANTS',
+  UPDATE_PARTICIPANT = 'UPDATE_PARTICIPANT',
+  REPLACE_PARTICIPANTS_LIST = 'REPLACE_PARTICIPANTS_LIST',
   SET_ACTIVE_SPEAKERS = 'SET_ACTIVE_SPEAKERS',
   SET_RECONNECTING = 'SET_RECONNECTING',
 }

package/src/redux/actions/index.ts

@@ -344,16 +344,32 @@ export const addParticipant = (participant: HMSPeer) => ({
   participant,
 });
 
+export const addParticipants = (participants: HMSPeer[]) => ({
+  type: HmsStateActionTypes.ADD_PARTICIPANTS,
+  participants,
+});
+
 export const removeParticipant = (participant: HMSPeer) => ({
   type: HmsStateActionTypes.REMOVE_PARTICIPANT,
   participant,
 });
 
+export const removeParticipants = (participants: HMSPeer[]) => ({
+  type: HmsStateActionTypes.REMOVE_PARTICIPANTS,
+  participants,
+});
+
 export const addUpdateParticipant = (participant: HMSPeer) => ({
-  type: HmsStateActionTypes.ADD_UPDATE_PARTICIPANT,
+  type: HmsStateActionTypes.UPDATE_PARTICIPANT,
   participant,
 });
 
+export const replaceParticipantsList = (participants: HMSPeer[], roleName: string) => ({
+  type: HmsStateActionTypes.REPLACE_PARTICIPANTS_LIST,
+  participants,
+  roleName,
+});
+
 export const setActiveSpeakers = (activeSpeakers: HMSSpeaker[]) => ({
   type: HmsStateActionTypes.SET_ACTIVE_SPEAKERS,
   activeSpeakers,