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

package/src/Prebuilt/components/EndCallFeedback/FeedbackForm.tsx

@@ -39,7 +39,7 @@ export const FeedbackModal = ({
     return (
       <Sheet.Root open={index !== FEEBACK_INDEX.INIT} onOpenChange={onOpenChange}>
         <Sheet.Content
-          css={{ bg: '$surface_dim', p: '$12' }}
+          css={{ bg: '$surface_dim', p: '$10', overflowY: 'auto' }}
           onPointerDownOutside={avoidDefaultDomBehavior}
           onInteractOutside={avoidDefaultDomBehavior}
         >
@@ -75,6 +75,7 @@ export const FeedbackContent = ({
 }) => {
   const { feedback } = useRoomLayoutLeaveScreen();
   const { endpoints } = useHMSPrebuiltContext();
+  const isMobile = useMedia(cssConfig.media.md);
   const hmsActions = useHMSActions();
   const [comment, setComment] = useState('');
   const [selectedReasons, setSelectedReasons] = useState(new Set<number>());
@@ -95,7 +96,7 @@ export const FeedbackContent = ({
       const reasons = [...selectedReasons].map((value: number) => ratings[indexSelected]?.reasons?.[value] || '');
       await hmsActions.submitSessionFeedback(
         {
-          question: ratings[indexSelected].question,
+          question: `${feedback?.title} | ${ratings[indexSelected].question || ''}`,
           rating: ratings[indexSelected].value || 1,
           min_rating: 1,
           max_rating: ratings.length,
@@ -139,7 +140,7 @@ export const FeedbackContent = ({
         type="submit"
         icon
         css={{
-          alignSelf: 'end',
+          alignSelf: isMobile ? '' : 'end',
         }}
         onClick={submitFeedback}
       >
@@ -157,6 +158,7 @@ export const FeedbackHeader = ({
   ratings: Rating[];
   indexSelected?: number;
 }) => {
+  const isMobile = useMedia(cssConfig.media.md);
   const { feedback } = useRoomLayoutLeaveScreen();
   return (
     <>
@@ -168,7 +170,7 @@ export const FeedbackHeader = ({
           }}
         >
           <Text
-            variant="h5"
+            variant={isMobile ? 'h6' : 'h5'}
             css={{
               c: '$on_surface_high',
               fontStyle: 'normal',
@@ -177,7 +179,7 @@ export const FeedbackHeader = ({
             {feedback?.title || 'How was your experience?'}
           </Text>
           <Text
-            variant="body1"
+            variant={isMobile ? 'body2' : 'body1'}
             css={{
               c: '$on_surface_medium',
               opacity: 0.9,
@@ -192,9 +194,13 @@ export const FeedbackHeader = ({
         ) : null}
       </Flex>
       <Flex
+        justify="between"
         css={{
           gap: '$17',
           c: '$on_surface_high',
+          '@md': {
+            gap: '0',
+          },
         }}
       >
         {ratings.map((element, index) => {
@@ -219,12 +225,15 @@ export const FeedbackHeader = ({
                   pb: '$1',
                   cursor: 'pointer',
                   opacity: indexSelected === index || indexSelected === FEEBACK_INDEX.INIT ? 1 : 0.2,
+                  '@md': {
+                    fontSize: '$h5',
+                  },
                 }}
               >
                 {element.emoji}
               </Text>
               <Text
-                variant="body1"
+                variant={isMobile ? 'body2' : 'body1'}
                 css={{
                   c:
                     indexSelected === index || indexSelected === FEEBACK_INDEX.INIT
@@ -319,6 +328,7 @@ export const FeedbackForm = ({
                     </Checkbox.Indicator>
                   </Checkbox.Root>
                   <Label
+                    htmlFor={`${option}-${index}`}
                     css={{
                       color: '$on_surface_high',
                       fontSize: '$sm',

package/src/Prebuilt/components/EndCallFeedback/ThankyouView.tsx

@@ -27,7 +27,7 @@ export const ThankyouView = () => {
     >
       <UserMusicIcon width="64px" height="64px" />
       <Flex direction="column" align={isMobile ? 'center' : 'start'}>
-        <Text variant="h5">Thank you for your feedback!</Text>
+        <Text variant="h5">Thank you for your feedback</Text>
         <Text
           variant="body1"
           css={{

package/src/Prebuilt/components/InsetTile.tsx

@@ -100,7 +100,7 @@ export const InsetTile = ({ peerId }: { peerId?: string }) => {
           position: 'absolute',
           bottom: 0,
           right: 0,
-          zIndex: 11,
+          zIndex: 10,
           boxShadow: '0 0 8px 0 rgba(0,0,0,0.3)',
           r: '$2',
           ...(!minimised

package/src/Prebuilt/components/Leave/LeaveSessionContent.tsx

@@ -47,7 +47,9 @@ export const LeaveSessionContent = ({
         <Button
           variant="danger"
           css={{ w: '100%' }}
-          onClick={async () => await leaveRoom()}
+          onClick={async () => {
+            await leaveRoom();
+          }}
           id="leaveRoom"
           data-testid="leave_room"
         >

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/PIP/PIPChat.tsx

@@ -50,7 +50,10 @@ export const PIPChat = () => {
   const isLocalPeerBlacklisted = useIsPeerBlacklisted({ local: true });
   const { elements } = useRoomLayoutConferencingScreen();
   const message_placeholder = elements?.chat?.message_placeholder || 'Send a message';
-  const canSendChatMessages = !!elements?.chat?.public_chat_enabled || !!elements?.chat?.roles_whitelist?.length;
+  const canSendChatMessages =
+    !!elements?.chat?.public_chat_enabled ||
+    !!elements?.chat?.roles_whitelist?.length ||
+    !!elements?.chat?.private_chat_enabled;
 
   const getChatStatus = useCallback(() => {
     if (isLocalPeerBlacklisted) return "You've been blocked from sending messages";
@@ -114,9 +117,13 @@ export const PIPChat = () => {
             <Text variant="h5" css={{ mt: '$8', c: '$on_surface_high' }}>
               {canSendChatMessages ? 'Start a conversation' : 'No messages yet'}
             </Text>
-            <Text variant="sm" style={{ maxWidth: '80%', textAlign: 'center', marginTop: '4px' }}>
-              There are no messages here yet. Start a conversation by sending a message.
-            </Text>
+            {canSendChatMessages ? (
+              <Text variant="sm" style={{ maxWidth: '80%', textAlign: 'center', marginTop: '4px' }}>
+                There are no messages here yet. Start a conversation by sending a message.
+              </Text>
+            ) : (
+              ''
+            )}
           </div>
         ) : (
           filteredMessages.map(message => (

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

@@ -1,7 +1,8 @@
 // Open issue with eslint-plugin-import https://github.com/import-js/eslint-plugin-import/issues/1810
 // eslint-disable-next-line
 import { HMSVBPlugin, HMSVirtualBackgroundTypes } from '@100mslive/hms-virtual-background/hmsvbplugin';
-
+import { parsedUserAgent } from '@100mslive/react-sdk';
+import { isSafari } from '../../common/constants';
 export class VBPlugin {
   private hmsPlugin?: HMSVBPlugin;
   private effectsPlugin?: any;
@@ -13,8 +14,8 @@ export class VBPlugin {
     if (effectsSDKKey) {
       try {
         // eslint-disable-next-line
-        const { HMSEffectsPlugin } = await import('@100mslive/hms-virtual-background/hmseffectsplugin');
-        this.effectsPlugin = new HMSEffectsPlugin(effectsSDKKey, onInit);
+        const effects = await import('@100mslive/hms-virtual-background/hmseffectsplugin');
+        this.effectsPlugin = new effects.HMSEffectsPlugin(effectsSDKKey, onInit);
       } catch (error) {
         console.error('Failed to initialise HMSEffectsPlugin:', error, 'Using HMSVBPlugin');
         this.hmsPlugin = new HMSVBPlugin(HMSVirtualBackgroundTypes.NONE, HMSVirtualBackgroundTypes.NONE);
@@ -101,6 +102,17 @@ export class VBPlugin {
     this.effectsPlugin = undefined;
     this.hmsPlugin = undefined;
   };
+
+  isEffectsSupported = () => {
+    if (!isSafari) {
+      return true;
+    }
+    const browserVersion = parsedUserAgent?.getBrowser()?.version || '16';
+    if (browserVersion && parseInt(browserVersion.split('.')[0]) < 17) {
+      return false;
+    }
+    return true;
+  };
 }
 
 export const VBHandler = new VBPlugin();

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

@@ -25,7 +25,6 @@ import {
 import { BlurPersonHighIcon, CrossCircleIcon, CrossIcon } from '@100mslive/react-icons';
 import { Box, config as cssConfig, Flex, Loading, Slider, Video } from '../../../index';
 import { Text } from '../../../Text';
-import { doesBrowserSupportEffectsSDK } from './util';
 import { VBCollection } from './VBCollection';
 import { VBHandler } from './VBHandler';
 // @ts-ignore
@@ -49,7 +48,7 @@ export const VBPicker = ({ backgroundMedia = [] }: { backgroundMedia: VirtualBac
   const [blurAmount, setBlurAmount] = useState(VBHandler.getBlurAmount() || 0.5);
   const roomState = useHMSStore(selectRoomState);
   const isLargeRoom = useHMSStore(selectIsLargeRoom);
-  const [isBlurSupported, setIsBlurSupported] = useState(false);
+  const isEffectsSupported = VBHandler.isEffectsSupported();
   const isEffectsEnabled = useHMSStore(selectIsEffectsEnabled);
   const effectsKey = useHMSStore(selectEffectsKey);
   const isMobile = useMedia(cssConfig.media.md);
@@ -64,14 +63,22 @@ export const VBPicker = ({ backgroundMedia = [] }: { backgroundMedia: VirtualBac
   const showVideoTile = isVideoOn && isLargeRoom && !inPreview;
 
   useEffect(() => {
+    const addHMSVBPlugin = async () => {
+      setLoadingEffects(false);
+      if (!role) {
+        return;
+      }
+      await VBHandler.initialisePlugin();
+      await hmsActions.addPluginToVideoTrack(
+        VBHandler.getVBObject() as HMSVBPlugin,
+        Math.floor(role.publishParams.video.frameRate / 2),
+      );
+    };
     const initializeVirtualBackground = async () => {
       if (!track?.id || pluginLoadingRef.current || isPluginAdded) {
         return;
       }
 
-      const isEffectsSupported = doesBrowserSupportEffectsSDK();
-      setIsBlurSupported(isEffectsSupported);
-
       try {
         pluginLoadingRef.current = true;
         if (isEffectsEnabled && isEffectsSupported && effectsKey) {
@@ -79,17 +86,14 @@ export const VBPicker = ({ backgroundMedia = [] }: { backgroundMedia: VirtualBac
           await VBHandler.initialisePlugin(effectsKey, () => {
             setLoadingEffects(false);
           });
-          hmsActions.addPluginsToVideoStream([VBHandler.getVBObject() as HMSMediaStreamPlugin]);
-        } else {
-          setLoadingEffects(false);
-          if (!role) {
-            return;
+          const vbInstance = VBHandler.getVBObject();
+          if (vbInstance.getName() === 'HMSEffects') {
+            hmsActions.addPluginsToVideoStream([VBHandler.getVBObject() as HMSMediaStreamPlugin]);
+          } else {
+            await addHMSVBPlugin();
           }
-          await VBHandler.initialisePlugin();
-          await hmsActions.addPluginToVideoTrack(
-            VBHandler.getVBObject() as HMSVBPlugin,
-            Math.floor(role.publishParams.video.frameRate / 2),
-          );
+        } else {
+          await addHMSVBPlugin();
         }
 
         const handleDefaultBackground = async () => {
@@ -117,6 +121,7 @@ export const VBPicker = ({ backgroundMedia = [] }: { backgroundMedia: VirtualBac
     role,
     isPluginAdded,
     isEffectsEnabled,
+    isEffectsSupported,
     effectsKey,
     track?.id,
     background,
@@ -185,7 +190,7 @@ export const VBPicker = ({ backgroundMedia = [] }: { backgroundMedia: VirtualBac
                 await VBHandler?.setBlur(blurAmount);
                 hmsActions.setAppData(APP_DATA.background, HMSVirtualBackgroundTypes.BLUR);
               },
-              supported: isBlurSupported,
+              supported: isEffectsSupported && isEffectsEnabled,
             },
           ]}
           activeBackground={background}

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/dist/Prebuilt/components/VirtualBackground/util.d.ts

@@ -1 +0,0 @@
-export declare const doesBrowserSupportEffectsSDK: () => boolean;