Update publish-alpha

100mslive · Mar 8, 2024 · 1fc34b0 · 1fc34b0
2 parents bb71837 + b01d7a8
commit 1fc34b0
Show file tree

Hide file tree

Showing 7 changed files with 214 additions and 70 deletions.
diff --git a/packages/roomkit-react/src/Prebuilt/components/Footer/ParticipantList.tsx b/packages/roomkit-react/src/Prebuilt/components/Footer/ParticipantList.tsx
@@ -9,24 +9,30 @@ import {
   selectIsPeerAudioEnabled,
   selectLocalPeerID,
   selectPeerCount,
-  selectPeerMetadata,
   selectPermissions,
-  useHMSActions,
   useHMSStore,
 } from '@100mslive/react-sdk';
-import { ChangeRoleIcon, HandIcon, MicOffIcon, PeopleIcon, SearchIcon, VerticalMenuIcon } from '@100mslive/react-icons';
+import {
+  AddIcon,
+  ChangeRoleIcon,
+  CrossIcon,
+  HandIcon,
+  MicOffIcon,
+  PeopleIcon,
+  SearchIcon,
+  VerticalMenuIcon,
+} from '@100mslive/react-icons';
 import { Accordion, Box, config as cssConfig, Dropdown, Flex, Input, Text, textEllipsis } from '../../..';
+import { IconButton as BaseIconButton } from '../../../IconButton';
 // @ts-ignore: No implicit Any
 import IconButton from '../../IconButton';
 import { ConnectionIndicator } from '../Connection/ConnectionIndicator';
 import { RemoveParticipant } from '../RemoveParticipant';
 import { RoleAccordion } from './RoleAccordion';
-import {
-  ConferencingScreenElements,
-  useRoomLayoutConferencingScreen,
-} from '../../provider/roomLayoutProvider/hooks/useRoomLayoutScreen';
+import { useRoomLayoutConferencingScreen } from '../../provider/roomLayoutProvider/hooks/useRoomLayoutScreen';
 // @ts-ignore: No implicit Any
 import { useIsSidepaneTypeOpen, useSidepaneToggle } from '../AppData/useSidepane';
+import { usePeerOnStageActions } from '../hooks/usePeerOnStageActions';
 import { useParticipants } from '../../common/hooks';
 // @ts-ignore: No implicit Any
 import { getFormattedCount } from '../../common/utils';
@@ -146,10 +152,12 @@ export const ParticipantCount = () => {
 export const Participant = ({
   peer,
   isConnected,
+  isHandRaisedAccordion,
   style,
 }: {
   peer: HMSPeer;
   isConnected: boolean;
+  isHandRaisedAccordion?: boolean;
   style: React.CSSProperties;
 }) => {
   const localPeerId = useHMSStore(selectLocalPeerID);
@@ -175,7 +183,12 @@ export const Participant = ({
         {peer.name} {localPeerId === peer.id ? '(You)' : ''}
       </Text>
       {isConnected && peer.roleName ? (
-        <ParticipantActions peerId={peer.id} isLocal={peer.id === localPeerId} role={peer.roleName} />
+        <ParticipantActions
+          peerId={peer.id}
+          isLocal={peer.id === localPeerId}
+          role={peer.roleName}
+          isHandRaisedAccordion={isHandRaisedAccordion}
+        />
       ) : null}
     </Flex>
   );
@@ -247,7 +260,17 @@ const VirtualizedParticipants = ({
  * shows settings to change for a participant like changing their role
  */
 const ParticipantActions = React.memo(
-  ({ peerId, role, isLocal }: { peerId: string; role: string; isLocal: boolean }) => {
+  ({
+    peerId,
+    role,
+    isLocal,
+    isHandRaisedAccordion,
+  }: {
+    peerId: string;
+    role: string;
+    isLocal: boolean;
+    isHandRaisedAccordion?: boolean;
+  }) => {
     const isHandRaised = useHMSStore(selectHasPeerHandRaised(peerId));
     const canChangeRole = useHMSStore(selectPermissions)?.changeRole;
     const canRemoveOthers = useHMSStore(selectPermissions)?.removeOthers;
@@ -264,72 +287,73 @@ const ParticipantActions = React.memo(
           gap: '$8',
         }}
       >
-        <ConnectionIndicator peerId={peerId} />
-        {isHandRaised && (
-          <Flex
-            align="center"
-            justify="center"
-            css={{ p: '$1', c: '$on_surface_high', bg: '$surface_bright', borderRadius: '$round' }}
-          >
-            <HandIcon height={19} width={19} />
-          </Flex>
-        )}
-        {isAudioMuted ? (
-          <Flex
-            align="center"
-            justify="center"
-            css={{ p: '$2', c: '$on_surface_high', bg: '$surface_bright', borderRadius: '$round' }}
-          >
-            <MicOffIcon height={19} width={19} />
-          </Flex>
-        ) : null}
+        {isHandRaisedAccordion ? (
+          <HandRaisedAccordionParticipantActions peerId={peerId} role={role} />
+        ) : (
+          <>
+            <ConnectionIndicator peerId={peerId} />
+            {isHandRaised && (
+              <Flex
+                align="center"
+                justify="center"
+                css={{ p: '$1', c: '$on_surface_high', bg: '$surface_bright', borderRadius: '$round' }}
+              >
+                <HandIcon height={19} width={19} />
+              </Flex>
+            )}
+            {isAudioMuted ? (
+              <Flex
+                align="center"
+                justify="center"
+                css={{ p: '$2', c: '$on_surface_high', bg: '$surface_bright', borderRadius: '$round' }}
+              >
+                <MicOffIcon height={19} width={19} />
+              </Flex>
+            ) : null}
 
-        {shouldShowMoreActions && !isLocal ? (
-          <ParticipantMoreActions peerId={peerId} role={role} elements={elements} canChangeRole={!!canChangeRole} />
-        ) : null}
+            {shouldShowMoreActions && !isLocal ? <ParticipantMoreActions peerId={peerId} role={role} /> : null}
+          </>
+        )}
       </Flex>
     );
   },
 );
 
-const ParticipantMoreActions = ({
-  peerId,
-  role,
-  elements,
-  canChangeRole,
-}: {
-  peerId: string;
-  role: string;
-  canChangeRole: boolean;
-  elements: ConferencingScreenElements;
-}) => {
-  const hmsActions = useHMSActions();
+const HandRaisedAccordionParticipantActions = ({ peerId, role }: { peerId: string; role: string }) => {
+  const { handleStageAction, lowerPeerHand, shouldShowStageRoleChange, isInStage } = usePeerOnStageActions({
+    peerId,
+    role,
+  });
+  return (
+    <>
+      <BaseIconButton
+        css={{ p: '$1', c: '$on_surface_high', bg: '$surface_bright', borderRadius: '$round' }}
+        onClick={() => lowerPeerHand()}
+      >
+        <CrossIcon height={19} width={19} />
+      </BaseIconButton>
+      {shouldShowStageRoleChange && !isInStage && (
+        <BaseIconButton
+          css={{ p: '$1', c: '$on_surface_high', bg: '$primary_default', borderRadius: '$round' }}
+          onClick={() => handleStageAction()}
+        >
+          <AddIcon height={19} width={19} />
+        </BaseIconButton>
+      )}
+    </>
+  );
+};
+
+const ParticipantMoreActions = ({ peerId, role }: { peerId: string; role: string }) => {
   const {
+    open,
+    setOpen,
     bring_to_stage_label,
     remove_from_stage_label,
-    on_stage_role,
-    off_stage_roles = [],
-    skip_preview_for_role_change = false,
-  } = elements.on_stage_exp || {};
-  const isInStage = role === on_stage_role;
-  const shouldShowStageRoleChange =
-    canChangeRole &&
-    ((isInStage && remove_from_stage_label) || (off_stage_roles?.includes(role) && bring_to_stage_label));
-  const prevRole = useHMSStore(selectPeerMetadata(peerId))?.prevRole;
-  const [open, setOpen] = useState(false);
-
-  const handleStageAction = async () => {
-    if (isInStage) {
-      prevRole && hmsActions.changeRoleOfPeer(peerId, prevRole, true);
-    } else if (on_stage_role) {
-      await hmsActions.changeRoleOfPeer(peerId, on_stage_role, skip_preview_for_role_change);
-      if (skip_preview_for_role_change) {
-        await hmsActions.lowerRemotePeerHand(peerId);
-      }
-    }
-    setOpen(false);
-  };
-
+    handleStageAction,
+    isInStage,
+    shouldShowStageRoleChange,
+  } = usePeerOnStageActions({ peerId, role });
   return (
     <Dropdown.Root open={open} onOpenChange={value => setOpen(value)} modal={false}>
       <Dropdown.Trigger

diff --git a/packages/roomkit-react/src/Prebuilt/components/Footer/RoleAccordion.tsx b/packages/roomkit-react/src/Prebuilt/components/Footer/RoleAccordion.tsx
@@ -4,10 +4,13 @@ import { FixedSizeList } from 'react-window';
 import { HMSPeer, selectIsLargeRoom, useHMSStore, usePaginatedParticipants } from '@100mslive/react-sdk';
 import { ChevronRightIcon } from '@100mslive/react-icons';
 import { Accordion } from '../../../Accordion';
+import { Button } from '../../../Button';
+import { HorizontalDivider } from '../../../Divider';
 import { Flex } from '../../../Layout';
 import { Text } from '../../../Text';
 import { Participant } from './ParticipantList';
 import { RoleOptions } from './RoleOptions';
+import { useGroupOnStageActions } from '../hooks/useGroupOnStageActions';
 // @ts-ignore: No implicit Any
 import { getFormattedCount } from '../../common/utils';
 
@@ -16,6 +19,7 @@ const ITER_TIMER = 5000;
 
 export interface ItemData {
   peerList: HMSPeer[];
+  isHandRaisedAccordion?: boolean;
   isConnected: boolean;
 }
 
@@ -29,6 +33,7 @@ export const VirtualizedParticipantItem = React.memo(
       <Participant
         key={data.peerList[index].id}
         peer={data.peerList[index]}
+        isHandRaisedAccordion={data.isHandRaisedAccordion}
         isConnected={data.isConnected}
         style={style}
       />
@@ -63,6 +68,9 @@ export const RoleAccordion = ({
       peersInAccordion = peersInAccordion.filter(peer => peer.name.toLowerCase().includes(filter.search || ''));
     }
   }
+  const { bringAllToStage, bring_to_stage_label, canBringToStage, lowerAllHands } = useGroupOnStageActions({
+    peers: peersInAccordion,
+  });
 
   useEffect(() => {
     if (!isOffStageRole || !isLargeRoom) {
@@ -113,7 +121,7 @@ export const RoleAccordion = ({
       <Accordion.Content contentStyles={{ border: '1px solid $border_default', borderTop: 'none' }}>
         <FixedSizeList
           itemSize={ROW_HEIGHT}
-          itemData={{ peerList: peersInAccordion, isConnected }}
+          itemData={{ peerList: peersInAccordion, isConnected, isHandRaisedAccordion }}
           itemKey={itemKey}
           itemCount={peersInAccordion.length}
           width={width}
@@ -140,6 +148,17 @@ export const RoleAccordion = ({
             <ChevronRightIcon />
           </Flex>
         ) : null}
+        {isHandRaisedAccordion && (
+          <>
+            <HorizontalDivider />
+            <Flex css={{ w: '100%', p: '$6', gap: '$4' }} justify="center">
+              <Button variant="standard" onClick={() => lowerAllHands()}>
+                Lower All Hands
+              </Button>
+              {canBringToStage && <Button onClick={() => bringAllToStage()}>{bring_to_stage_label}</Button>}
+            </Flex>
+          </>
+        )}
       </Accordion.Content>
     </Accordion.Item>
   );

diff --git a/packages/roomkit-react/src/Prebuilt/components/MwebLandscapePrompt.tsx b/packages/roomkit-react/src/Prebuilt/components/MwebLandscapePrompt.tsx
@@ -32,7 +32,7 @@ export const MwebLandscapePrompt = () => {
       // Angle check needed to diff bw mobile and desktop
       setShowMwebLandscapePrompt(
         match({ angle, isLandscapeHLSStream, isLandscape, type })
-          .with({ isLandscapeHLSStream }, () => false)
+          .with({ isLandscapeHLSStream: true }, () => false)
           .with({ angle: P.when(angle => angle && angle >= 90) }, ({ type }) => type.includes('landscape'))
           .otherwise(() => isLandscape),
       );

diff --git a/packages/roomkit-react/src/Prebuilt/components/VideoLayouts/ProminenceLayout.tsx b/packages/roomkit-react/src/Prebuilt/components/VideoLayouts/ProminenceLayout.tsx
@@ -36,7 +36,6 @@ const SecondarySection = ({
   hasSidebar,
 }: React.PropsWithChildren<{ tiles: TrackWithPeerAndDimensions[]; edgeToEdge?: boolean; hasSidebar?: boolean }>) => {
   const tileLayoutProps = useVideoTileContext();
-  console.log('secondary section', { tilesLength: tiles?.length });
   if (!tiles?.length) {
     return null;
   }

diff --git a/packages/roomkit-react/src/Prebuilt/components/hooks/useGroupOnStageActions.tsx b/packages/roomkit-react/src/Prebuilt/components/hooks/useGroupOnStageActions.tsx
@@ -0,0 +1,54 @@
+import { match, P } from 'ts-pattern';
+import { HMSPeer, selectPermissions, useHMSActions, useHMSStore } from '@100mslive/react-sdk';
+import { useRoomLayoutConferencingScreen } from '../../provider/roomLayoutProvider/hooks/useRoomLayoutScreen';
+
+export const useGroupOnStageActions = ({ peers }: { peers: HMSPeer[] }) => {
+  const hmsActions = useHMSActions();
+  const { elements } = useRoomLayoutConferencingScreen();
+  const {
+    bring_to_stage_label,
+    remove_from_stage_label,
+    on_stage_role,
+    off_stage_roles = [],
+    skip_preview_for_role_change = false,
+  } = elements.on_stage_exp || {};
+  const canChangeRole = useHMSStore(selectPermissions)?.changeRole;
+
+  const offStageRolePeers = peers.filter(peer =>
+    match({ on_stage_role, bring_to_stage_label, roleName: peer.roleName })
+      .with(
+        {
+          on_stage_role: P.when(role => !!role),
+          bring_to_stage_label: P.when(label => !!label),
+          roleName: P.when(role => !!role && off_stage_roles.includes(role)),
+        },
+        () => true,
+      )
+      .otherwise(() => false),
+  );
+
+  const lowerAllHands = async () => {
+    return Promise.all(peers.map(peer => hmsActions.lowerRemotePeerHand(peer.id)));
+  };
+
+  const bringAllToStage = () => {
+    if (!canChangeRole || !on_stage_role) {
+      return;
+    }
+    return Promise.all(
+      offStageRolePeers.map(peer => {
+        return hmsActions.changeRoleOfPeer(peer.id, on_stage_role, skip_preview_for_role_change).then(() => {
+          return skip_preview_for_role_change ? hmsActions.lowerRemotePeerHand(peer.id) : null;
+        });
+      }),
+    );
+  };
+
+  return {
+    lowerAllHands,
+    bringAllToStage,
+    canBringToStage: canChangeRole && offStageRolePeers.length > 0,
+    bring_to_stage_label,
+    remove_from_stage_label,
+  };
+};