@100mslive/roomkit-react 0.3.20 → 0.3.21-alpha.0

package/src/Prebuilt/components/HMSVideo/HMSVideo.jsx

@@ -1,7 +1,28 @@
-import React, { forwardRef } from 'react';
+import React, { forwardRef, useEffect, useState } from 'react';
 import { Flex } from '../../../Layout';
 
 export const HMSVideo = forwardRef(({ children, ...props }, videoRef) => {
+  const [width, setWidth] = useState('auto');
+
+  useEffect(() => {
+    const updatingVideoWidth = () => {
+      const videoEl = videoRef.current;
+      if (!videoEl) {
+        return;
+      }
+      if (videoEl.videoWidth > videoEl.videoHeight && width !== '100%') {
+        setWidth('100%');
+      }
+    };
+    const videoEl = videoRef.current;
+    if (!videoEl) {
+      return;
+    }
+    videoEl.addEventListener('loadedmetadata', updatingVideoWidth);
+    return () => {
+      videoEl.removeEventListener('loadedmetadata', updatingVideoWidth);
+    };
+  }, []);
   return (
     <Flex
       data-testid="hms-video"
@@ -11,9 +32,8 @@ export const HMSVideo = forwardRef(({ children, ...props }, videoRef) => {
         justifyContent: 'center',
         transition: 'all 0.3s ease-in-out',
         '@md': {
-          height: 'auto',
           '& video': {
-            height: '$60 !important',
+            height: props.isFullScreen ? '' : '$60 !important',
           },
         },
         '& video::cue': {
@@ -41,7 +61,7 @@ export const HMSVideo = forwardRef(({ children, ...props }, videoRef) => {
         style={{
           margin: '0 auto',
           objectFit: 'contain',
-          width: 'auto',
+          width: width,
           height: '100%',
           maxWidth: '100%',
         }}

package/src/Prebuilt/components/Header/common.jsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import {
   DeviceType,
+  getAudioDeviceCategory,
   selectIsLocalVideoEnabled,
   selectLocalVideoTrackID,
   selectVideoTrackByID,
@@ -78,12 +79,13 @@ export const AudioActions = () => {
   if (!audioFiltered) {
     return null;
   }
+  const deviceCategory = getAudioDeviceCategory(currentSelection.label);
   let AudioIcon = <SpeakerIcon />;
-  if (currentSelection && currentSelection.label.toLowerCase().includes('bluetooth')) {
+  if (deviceCategory === 'bluetooth') {
     AudioIcon = <BluetoothIcon />;
-  } else if (currentSelection && currentSelection.label.toLowerCase().includes('wired')) {
+  } else if (deviceCategory === 'wired') {
     AudioIcon = <HeadphonesIcon />;
-  } else if (currentSelection && currentSelection.label.toLowerCase().includes('earpiece')) {
+  } else if (deviceCategory === 'earpiece') {
     AudioIcon = <TelePhoneIcon />;
   }
   return (

package/src/Prebuilt/components/MoreSettings/ChangeNameContent.tsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect, useRef } from 'react';
 import { ChevronLeftIcon, CrossIcon } from '@100mslive/react-icons';
 import { Button } from '../../../Button';
 import { Input } from '../../../Input';
@@ -22,6 +22,16 @@ export const ChangeNameContent = ({
   onExit: () => void;
   onBackClick: () => void;
 }) => {
+  const inputRef = useRef<HTMLInputElement>(null);
+
+  useEffect(() => {
+    if (isMobile) {
+      setTimeout(() => {
+        inputRef.current?.focus();
+      }, 200);
+    }
+  }, [isMobile]);
+
   return (
     <form
       onSubmit={async e => {
@@ -53,10 +63,10 @@ export const ChangeNameContent = ({
       </Text>
       <Flex justify="center" align="center" css={{ my: '$8', w: '100%', '@md': { px: '$8' } }}>
         <Input
+          ref={inputRef}
           css={{ width: '100%', bg: '$surface_default' }}
           value={currentName}
-          // Prevents popup from showing up on chrome mweb
-          type={isMobile ? 'search' : 'text'}
+          type="text"
           onChange={e => {
             setCurrentName(e.target.value);
           }}

package/src/Prebuilt/components/MoreSettings/ChangeNameModal.tsx

@@ -58,7 +58,7 @@ export const ChangeNameModal = ({
   if (isMobile) {
     return (
       <Sheet.Root defaultOpen onOpenChange={onOpenChange}>
-        <Sheet.Content css={{ bg: '$surface_dim', p: '$8 0' }}>
+        <Sheet.Content css={{ bg: '$surface_dim', p: '$8 0' }} onOpenAutoFocus={e => e.preventDefault()}>
           <ChangeNameContent {...props} />
         </Sheet.Content>
       </Sheet.Root>

package/src/Prebuilt/components/Notifications/TrackUnmuteModal.tsx

@@ -44,7 +44,7 @@ export const TrackUnmuteModal = () => {
     <RequestDialog
       title={`Unmute your ${track.type}?`}
       onOpenChange={(value: boolean) => !value && setMuteNotification(null)}
-      body={`${peer?.name}is requesting you to unmute your ${track?.type}.`}
+      body={`${peer?.name} is requesting you to unmute your ${track?.type}.`}
       onAction={() => {
         hmsActions.setEnabledTrack(track.id, enabled);
         setMuteNotification(null);

package/src/Prebuilt/components/ScreenshareTile.tsx

@@ -16,7 +16,6 @@ import { config as cssConfig, useTheme } from '../../Theme';
 import { Video } from '../../Video';
 import { StyledVideoTile } from '../../VideoTile';
 import { LayoutModeSelector } from './LayoutModeSelector';
-// @ts-ignore: No implicit Any
 import { getVideoTileLabel } from './peerTileUtils';
 import { ScreenshareDisplay } from './ScreenshareDisplay';
 // @ts-ignore: No implicit Any
@@ -62,7 +61,8 @@ const Tile = ({ peerId, width = '100%', height = '100%' }: { peerId: string; wid
   const label = getVideoTileLabel({
     peerName: peer?.name,
     isLocal: false,
-    track,
+    videoTrack: track,
+    audioTrack,
   });
 
   return (

package/src/Prebuilt/components/Settings/SettingsModal.jsx

@@ -140,7 +140,6 @@ const MobileSettingModal = ({
           <Flex
             direction="column"
             css={{
-              px: '$8',
               pb: '$8',
               overflowY: 'auto',
             }}
@@ -159,7 +158,7 @@ const MobileSettingModal = ({
                     css={{
                       all: 'unset',
                       fontFamily: '$sans',
-                      py: '$10',
+                      p: '$10 $8',
                       display: 'flex',
                       alignItems: 'center',
                       fontSize: '$sm',

package/src/Prebuilt/components/TileMenu/TileMenu.tsx

@@ -1,6 +1,7 @@
 import React, { useState } from 'react';
 import { useMedia } from 'react-use';
 import {
+  HMSAudioTrack,
   HMSVideoTrack,
   selectLocalPeerID,
   selectPeerByID,
@@ -17,6 +18,7 @@ import { Text } from '../../../Text';
 import { config as cssConfig, useTheme } from '../../../Theme';
 import { StyledMenuTile } from '../../../TileMenu';
 import { ChangeNameModal } from '../MoreSettings/ChangeNameModal';
+import { getVideoTileLabel } from '../peerTileUtils';
 import { RoleChangeModal } from '../RoleChangeModal';
 import { TileMenuContent } from './TileMenuContent';
 import { useDropdownList } from '../hooks/useDropdownList';
@@ -52,7 +54,8 @@ const TileMenu = ({
   const isPrimaryVideoTrack = useHMSStore(selectVideoTrackByPeerID(peerID))?.id === videoTrackID;
   const showPinAction = !!(audioTrackID || (videoTrackID && isPrimaryVideoTrack));
 
-  const track = useHMSStore(selectTrackByID(videoTrackID)) as HMSVideoTrack;
+  const track = useHMSStore(selectTrackByID(videoTrackID)) as HMSVideoTrack | null;
+  const audioTrack = useHMSStore(selectTrackByID(audioTrackID)) as HMSAudioTrack | null;
   const hideSimulcastLayers = !track?.layerDefinitions?.length || track.degraded || !track.enabled;
   const isMobile = useMedia(cssConfig.media.md);
   const peer = useHMSStore(selectPeerByID(peerID));
@@ -61,20 +64,19 @@ const TileMenu = ({
   useDropdownList({ open, name: 'TileMenu' });
   const dragClassName = getDragClassName();
 
-  if (!(removeOthers || toggleAudio || toggleVideo || setVolume || showPinAction) && hideSimulcastLayers) {
+  if (!peer || (!(removeOthers || toggleAudio || toggleVideo || setVolume || showPinAction) && hideSimulcastLayers)) {
     return null;
   }
 
   const openNameChangeModal = () => setShowNameChangeModal(true);
   const openRoleChangeModal = () => setShowRoleChangeModal(true);
 
-  const props = {
+  const props: React.ComponentPropsWithoutRef<typeof TileMenuContent> = {
     isLocal,
     isScreenshare,
     audioTrackID,
     videoTrackID,
     peerID,
-    isPrimaryVideoTrack,
     showSpotlight,
     showPinAction,
     canMinimise,
@@ -111,8 +113,7 @@ const TileMenu = ({
               >
                 <Box>
                   <Text css={{ color: '$on_surface_high', fontWeight: '$semiBold' }}>
-                    {peer?.name}
-                    {isLocal ? ` (You)` : null}
+                    {getVideoTileLabel({ peerName: peer?.name, isLocal, audioTrack, videoTrack: track })}
                   </Text>
                   {peer?.roleName ? (
                     <Text variant="xs" css={{ color: '$on_surface_low', mt: '$2' }}>

package/src/Prebuilt/components/TileMenu/TileMenuContent.tsx

@@ -41,7 +41,7 @@ import { useSetAppDataByKey } from '../AppData/useUISettings';
 // @ts-ignore
 import { useDropdownSelection } from '../hooks/useDropdownSelection';
 import { getDragClassName } from './utils';
-import { APP_DATA, REMOTE_STOP_SCREENSHARE_TYPE, SESSION_STORE_KEY } from '../../common/constants';
+import { APP_DATA, isIOS, REMOTE_STOP_SCREENSHARE_TYPE, SESSION_STORE_KEY } from '../../common/constants';
 
 export const isSameTile = ({
   trackId,
@@ -317,7 +317,7 @@ export const TileMenuContent = ({
         </StyledMenuTile.ItemButton>
       ) : null}
 
-      {canChangeRole && roles.length > 1 ? (
+      {!isScreenshare && canChangeRole && roles.length > 1 ? (
         <StyledMenuTile.ItemButton
           className={dragClassName}
           css={spacingCSS}
@@ -332,7 +332,7 @@ export const TileMenuContent = ({
         </StyledMenuTile.ItemButton>
       ) : null}
 
-      {audioTrackID ? (
+      {!isIOS && audioTrackID ? (
         <StyledMenuTile.VolumeItem data-testid="participant_volume_slider" css={{ ...spacingCSS, mb: '$0' }}>
           <Flex align="center" gap={1}>
             <SpeakerIcon height={20} width={20} />

package/src/Prebuilt/components/VideoLayouts/EqualProminence.tsx

@@ -1,5 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import { useMedia } from 'react-use';
+import { selectPeerCount, useHMSStore } from '@100mslive/react-sdk';
 import { PeopleAddIcon } from '@100mslive/react-icons';
 import { Flex } from '../../../Layout';
 import { config as cssConfig } from '../../../Theme';
@@ -17,6 +18,7 @@ export function EqualProminence({ isInsetEnabled = false, peers, onPageChange, o
   const isMobile = useMedia(cssConfig.media.md);
   let maxTileCount = useUISettings(UI_SETTINGS.maxTileCount);
   maxTileCount = isMobile ? Math.min(maxTileCount, 6) : maxTileCount;
+  const peerCount = useHMSStore(selectPeerCount);
   const pageList = usePagesWithTiles({
     peers,
     maxTileCount,
@@ -51,8 +53,8 @@ export function EqualProminence({ isInsetEnabled = false, peers, onPageChange, o
       )}
       {pageList.length === 0 ? (
         <WaitingView
-          title="You're the first to join"
-          subtitle="Sit back and relax till others join"
+          title={peerCount <= 1 ? "You're the only one here" : 'Glad to have you here'}
+          subtitle={peerCount <= 1 ? 'Sit back and relax till others join' : ''}
           icon={<PeopleAddIcon width="56px" height="56px" style={{ color: 'white' }} />}
         />
       ) : null}

package/src/Prebuilt/components/VideoTile.tsx

@@ -20,7 +20,6 @@ import { VideoTileStats } from '../../Stats';
 import { CSS } from '../../Theme';
 import { Video } from '../../Video';
 import { StyledVideoTile } from '../../VideoTile';
-// @ts-ignore: No implicit Any
 import { getVideoTileLabel } from './peerTileUtils';
 // @ts-ignore: No implicit Any
 import { useSetAppDataByKey, useUISettings } from './AppData/useUISettings';
@@ -101,8 +100,9 @@ const Tile = ({
   });
   const label = getVideoTileLabel({
     peerName,
-    track,
     isLocal,
+    videoTrack: track,
+    audioTrack,
   });
   const onHoverHandler = useCallback((event: React.MouseEvent) => {
     setIsMouseHovered(event.type === 'mouseenter');

package/src/Prebuilt/components/VirtualBackground/VBHandler.tsx

@@ -2,7 +2,7 @@
 // eslint-disable-next-line
 import { HMSVBPlugin, HMSVirtualBackgroundTypes } from '@100mslive/hms-virtual-background/hmsvbplugin';
 import { parsedUserAgent } from '@100mslive/react-sdk';
-import { isSafari } from '../../common/constants';
+import { isIOS, isSafari } from '../../common/constants';
 export class VBPlugin {
   private hmsPlugin?: HMSVBPlugin;
   private effectsPlugin?: any;
@@ -103,6 +103,18 @@ export class VBPlugin {
     this.hmsPlugin = undefined;
   };
 
+  isBlurSupported = () => {
+    if ((isSafari || isIOS) && this.hmsPlugin) {
+      return false;
+    }
+
+    if (this.effectsPlugin) {
+      return true;
+    }
+
+    return false;
+  };
+
   isEffectsSupported = () => {
     if (!isSafari) {
       return true;

package/src/Prebuilt/components/VirtualBackground/VBPicker.tsx

@@ -57,6 +57,7 @@ export const VBPicker = ({ backgroundMedia = [] }: { backgroundMedia: VirtualBac
   const background = useHMSStore(selectAppData(APP_DATA.background));
   const mediaList = backgroundMedia.map((media: VirtualBackgroundMedia) => media.url || '');
   const pluginLoadingRef = useRef(false);
+  const isBlurSupported = VBHandler?.isBlurSupported();
 
   const inPreview = roomState === HMSRoomState.Preview;
   // Hidden in preview as the effect will be visible in the preview tile
@@ -190,7 +191,7 @@ export const VBPicker = ({ backgroundMedia = [] }: { backgroundMedia: VirtualBac
                 await VBHandler?.setBlur(blurAmount);
                 hmsActions.setAppData(APP_DATA.background, HMSVirtualBackgroundTypes.BLUR);
               },
-              supported: isEffectsSupported && isEffectsEnabled,
+              supported: isBlurSupported,
             },
           ]}
           activeBackground={background}
@@ -198,7 +199,7 @@ export const VBPicker = ({ backgroundMedia = [] }: { backgroundMedia: VirtualBac
 
         {/* Slider */}
         <Flex direction="column" css={{ w: '100%', gap: '$8', mt: '$8' }}>
-          {background === HMSVirtualBackgroundTypes.BLUR && isEffectsEnabled && effectsKey ? (
+          {background === HMSVirtualBackgroundTypes.BLUR && isBlurSupported ? (
             <Box>
               <Text variant="sm" css={{ color: '$on_surface_high', fontWeight: '$semiBold', mb: '$4' }}>
                 Blur intensity

package/src/Prebuilt/components/{peerTileUtils.jsx → peerTileUtils.tsx}

@@ -1,4 +1,8 @@
+import { HMSAudioTrack, HMSVideoTrack } from '@100mslive/react-sdk';
+
 const PEER_NAME_PLACEHOLDER = 'peerName';
+
+// Map [isLocal, videoSource] to the label to be displayed.
 const labelMap = new Map([
   [[true, 'screen'].toString(), 'Your Screen'],
   [[true, 'regular'].toString(), `You (${PEER_NAME_PLACEHOLDER})`],
@@ -8,19 +12,30 @@ const labelMap = new Map([
   [[false, undefined].toString(), `${PEER_NAME_PLACEHOLDER}`],
 ]);
 
-export const getVideoTileLabel = ({ peerName, isLocal, track }) => {
+export const getVideoTileLabel = ({
+  peerName,
+  isLocal,
+  videoTrack,
+  audioTrack,
+}: {
+  isLocal: boolean;
+  peerName?: string;
+  videoTrack?: HMSVideoTrack | null;
+  audioTrack?: HMSAudioTrack | null;
+}) => {
   const isPeerPresent = peerName !== undefined;
-  if (!isPeerPresent || !track) {
+  if (!isPeerPresent || !videoTrack) {
     // for peers with only audio track
-    return isPeerPresent ? labelMap.get([isLocal, undefined].toString()).replace(PEER_NAME_PLACEHOLDER, peerName) : '';
+    const label = labelMap.get([isLocal, undefined].toString());
+    return isPeerPresent && label ? label.replace(PEER_NAME_PLACEHOLDER, peerName) : '';
   }
-  const isLocallyMuted = track.volume === 0;
+  const isLocallyMuted = audioTrack?.volume === 0;
   // Map [isLocal, videoSource] to the label to be displayed.
-  let label = labelMap.get([isLocal, track.source].toString());
+  let label = labelMap.get([isLocal, videoTrack.source].toString());
   if (label) {
     label = label.replace(PEER_NAME_PLACEHOLDER, peerName);
   } else {
-    label = `${peerName} ${track.source}`;
+    label = `${peerName} ${videoTrack.source}`;
   }
   // label = `${label}${track.degraded ? '(Degraded)' : ''}`;
   return `${label}${isLocallyMuted ? ' (Muted for you)' : ''}`;

package/src/Prebuilt/layouts/HLSView.jsx

@@ -485,11 +485,6 @@ const HLSView = () => {
       css={{
         flex: isLandscape ? '2 1 0' : '1 1 0',
         transition: 'all 0.3s ease-in-out',
-        '&:fullscreen': {
-          '& video': {
-            height: 'unset !important',
-          },
-        },
       }}
     >
       {hlsViewRef.current && (isMobile || isLandscape) && (
@@ -541,6 +536,7 @@ const HLSView = () => {
             onMouseMove={onHoverHandler}
             onMouseLeave={onHoverHandler}
             onClick={onClickHandler}
+            isFullScreen={isFullScreen}
             onDoubleClick={e => {
               onDoubleClickHandler(e);
             }}
@@ -728,6 +724,7 @@ const HLSView = () => {
                           selection={currentSelectedQuality}
                           onQualityChange={handleQuality}
                           isAuto={isUserSelectedAuto}
+                          containerRef={hlsViewRef.current}
                         />
                       ) : null}
                       {isFullScreenSupported ? (