@100mslive/roomkit-react 0.2.8-alpha.10 → 0.2.8-alpha.12

package/dist/index.js

@@ -62,7 +62,7 @@ import {
   theme,
   useBorderAudioLevel,
   useTheme
-} from "./chunk-R2JJJQR3.js";
+} from "./chunk-B22UTHMR.js";
 export {
   Accordion,
   AudioLevel,

package/dist/meta.cjs.json

@@ -5935,7 +5935,7 @@
       "format": "esm"
     },
     "src/Prebuilt/components/Footer/RoleOptions.tsx": {
-      "bytes": 7053,
+      "bytes": 7089,
       "imports": [
         {
           "path": "react",
@@ -8446,7 +8446,7 @@
       "format": "esm"
     },
     "src/Prebuilt/components/Chat/Chat.tsx": {
-      "bytes": 4814,
+      "bytes": 4861,
       "imports": [
         {
           "path": "react",
@@ -10846,7 +10846,7 @@
       "format": "esm"
     },
     "src/Prebuilt/components/HMSVideo/HMSVideo.jsx": {
-      "bytes": 1301,
+      "bytes": 1333,
       "imports": [
         {
           "path": "react",
@@ -11259,7 +11259,7 @@
       "format": "esm"
     },
     "src/Prebuilt/components/HMSVideo/MwebHLSViewTitle.tsx": {
-      "bytes": 2461,
+      "bytes": 2527,
       "imports": [
         {
           "path": "react",
@@ -11315,7 +11315,7 @@
       "format": "esm"
     },
     "src/Prebuilt/layouts/HLSView.jsx": {
-      "bytes": 25579,
+      "bytes": 26567,
       "imports": [
         {
           "path": "react",
@@ -11337,6 +11337,11 @@
           "kind": "import-statement",
           "external": true
         },
+        {
+          "path": "ts-pattern",
+          "kind": "import-statement",
+          "external": true
+        },
         {
           "path": "@100mslive/react-sdk",
           "kind": "import-statement",
@@ -13602,7 +13607,7 @@
       "imports": [],
       "exports": [],
       "inputs": {},
-      "bytes": 3259526
+      "bytes": 3261627
     },
     "dist/index.cjs.js": {
       "imports": [
@@ -16071,6 +16076,11 @@
           "kind": "require-call",
           "external": true
         },
+        {
+          "path": "ts-pattern",
+          "kind": "require-call",
+          "external": true
+        },
         {
           "path": "@100mslive/react-sdk",
           "kind": "require-call",
@@ -16506,7 +16516,7 @@
       "entryPoint": "src/index.ts",
       "inputs": {
         "<define:process.env>": {
-          "bytesInOutput": 18240
+          "bytesInOutput": 18259
         },
         "src/Theme/base.config.ts": {
           "bytesInOutput": 6104
@@ -17079,7 +17089,7 @@
           "bytesInOutput": 1694
         },
         "src/Prebuilt/components/Footer/RoleOptions.tsx": {
-          "bytesInOutput": 8483
+          "bytesInOutput": 8531
         },
         "src/Prebuilt/components/Footer/RoleAccordion.tsx": {
           "bytesInOutput": 5338
@@ -17235,7 +17245,7 @@
           "bytesInOutput": 6106
         },
         "src/Prebuilt/components/Chat/Chat.tsx": {
-          "bytesInOutput": 5596
+          "bytesInOutput": 5683
         },
         "src/Prebuilt/components/Footer/PaginatedParticipants.tsx": {
           "bytesInOutput": 5344
@@ -17370,7 +17380,7 @@
           "bytesInOutput": 656
         },
         "src/Prebuilt/components/HMSVideo/HMSVideo.jsx": {
-          "bytesInOutput": 1860
+          "bytesInOutput": 1903
         },
         "src/Prebuilt/components/HMSVideo/PlayerContext.tsx": {
           "bytesInOutput": 489
@@ -17409,10 +17419,10 @@
           "bytesInOutput": 8496
         },
         "src/Prebuilt/components/HMSVideo/MwebHLSViewTitle.tsx": {
-          "bytesInOutput": 2852
+          "bytesInOutput": 2886
         },
         "src/Prebuilt/layouts/HLSView.jsx": {
-          "bytesInOutput": 29703
+          "bytesInOutput": 31039
         },
         "src/Prebuilt/layouts/VideoStreamingSection.tsx": {
           "bytesInOutput": 5017
@@ -17550,7 +17560,7 @@
           "bytesInOutput": 2980
         }
       },
-      "bytes": 1547557
+      "bytes": 1549124
     }
   }
 }

package/dist/meta.esbuild.json

@@ -5935,7 +5935,7 @@
       "format": "esm"
     },
     "src/Prebuilt/components/Footer/RoleOptions.tsx": {
-      "bytes": 7053,
+      "bytes": 7089,
       "imports": [
         {
           "path": "react",
@@ -8446,7 +8446,7 @@
       "format": "esm"
     },
     "src/Prebuilt/components/Chat/Chat.tsx": {
-      "bytes": 4814,
+      "bytes": 4861,
       "imports": [
         {
           "path": "react",
@@ -10846,7 +10846,7 @@
       "format": "esm"
     },
     "src/Prebuilt/components/HMSVideo/HMSVideo.jsx": {
-      "bytes": 1301,
+      "bytes": 1333,
       "imports": [
         {
           "path": "react",
@@ -11259,7 +11259,7 @@
       "format": "esm"
     },
     "src/Prebuilt/components/HMSVideo/MwebHLSViewTitle.tsx": {
-      "bytes": 2461,
+      "bytes": 2527,
       "imports": [
         {
           "path": "react",
@@ -11315,7 +11315,7 @@
       "format": "esm"
     },
     "src/Prebuilt/layouts/HLSView.jsx": {
-      "bytes": 25579,
+      "bytes": 26567,
       "imports": [
         {
           "path": "react",
@@ -11337,6 +11337,11 @@
           "kind": "import-statement",
           "external": true
         },
+        {
+          "path": "ts-pattern",
+          "kind": "import-statement",
+          "external": true
+        },
         {
           "path": "@100mslive/react-sdk",
           "kind": "import-statement",
@@ -13607,7 +13612,7 @@
     "dist/index.js": {
       "imports": [
         {
-          "path": "dist/chunk-R2JJJQR3.js",
+          "path": "dist/chunk-B22UTHMR.js",
           "kind": "import-statement"
         }
       ],
@@ -13680,16 +13685,16 @@
       "inputs": {},
       "bytes": 1822
     },
-    "dist/HLSView-FBEGJ3L7.js.map": {
+    "dist/HLSView-IIPEBXAG.js.map": {
       "imports": [],
       "exports": [],
       "inputs": {},
-      "bytes": 87085
+      "bytes": 88957
     },
-    "dist/HLSView-FBEGJ3L7.js": {
+    "dist/HLSView-IIPEBXAG.js": {
       "imports": [
         {
-          "path": "dist/chunk-R2JJJQR3.js",
+          "path": "dist/chunk-B22UTHMR.js",
           "kind": "import-statement"
         },
         {
@@ -13712,6 +13717,11 @@
           "kind": "import-statement",
           "external": true
         },
+        {
+          "path": "ts-pattern",
+          "kind": "import-statement",
+          "external": true
+        },
         {
           "path": "@100mslive/react-sdk",
           "kind": "import-statement",
@@ -13849,7 +13859,7 @@
       "entryPoint": "src/Prebuilt/layouts/HLSView.jsx",
       "inputs": {
         "src/Prebuilt/layouts/HLSView.jsx": {
-          "bytesInOutput": 24391
+          "bytesInOutput": 25432
         },
         "src/Prebuilt/components/HlsStatsOverlay.jsx": {
           "bytesInOutput": 3521
@@ -13861,7 +13871,7 @@
           "bytesInOutput": 416
         },
         "src/Prebuilt/components/HMSVideo/HMSVideo.jsx": {
-          "bytesInOutput": 1425
+          "bytesInOutput": 1464
         },
         "src/Prebuilt/components/HMSVideo/PlayPauseButton.tsx": {
           "bytesInOutput": 851
@@ -13897,18 +13907,18 @@
           "bytesInOutput": 7482
         },
         "src/Prebuilt/components/HMSVideo/MwebHLSViewTitle.tsx": {
-          "bytesInOutput": 2067
+          "bytesInOutput": 2101
         }
       },
-      "bytes": 53355
+      "bytes": 54476
     },
-    "dist/chunk-R2JJJQR3.js.map": {
+    "dist/chunk-B22UTHMR.js.map": {
       "imports": [],
       "exports": [],
       "inputs": {},
-      "bytes": 3167900
+      "bytes": 3168087
     },
-    "dist/chunk-R2JJJQR3.js": {
+    "dist/chunk-B22UTHMR.js": {
       "imports": [
         {
           "path": "react",
@@ -16276,7 +16286,7 @@
           "external": true
         },
         {
-          "path": "dist/HLSView-FBEGJ3L7.js",
+          "path": "dist/HLSView-IIPEBXAG.js",
           "kind": "dynamic-import"
         },
         {
@@ -16691,6 +16701,8 @@
         "Link",
         "Loading",
         "Logo",
+        "POLL_STATE",
+        "POLL_VIEWS",
         "PasswordInput",
         "Popover",
         "Progress",
@@ -16741,7 +16753,6 @@
         "useBorderAudioLevel",
         "useIsLandscape",
         "useIsSidepaneTypeOpen",
-        "usePollViewToggle",
         "useRoomLayoutConferencingScreen",
         "useRoomLayoutHeader",
         "useSidepaneToggle",
@@ -16749,7 +16760,7 @@
       ],
       "inputs": {
         "<define:process.env>": {
-          "bytesInOutput": 18240
+          "bytesInOutput": 18259
         },
         "../../node_modules/lodash/lodash.js": {
           "bytesInOutput": 224291
@@ -17304,7 +17315,7 @@
           "bytesInOutput": 4229
         },
         "src/Prebuilt/components/Footer/RoleOptions.tsx": {
-          "bytesInOutput": 7290
+          "bytesInOutput": 7326
         },
         "src/Prebuilt/components/Footer/PollsToggle.tsx": {
           "bytesInOutput": 1073
@@ -17412,7 +17423,7 @@
           "bytesInOutput": 7554
         },
         "src/Prebuilt/components/Chat/Chat.tsx": {
-          "bytesInOutput": 4425
+          "bytesInOutput": 4500
         },
         "src/Prebuilt/components/Chat/ChatBody.tsx": {
           "bytesInOutput": 14396
@@ -17703,7 +17714,7 @@
           "bytesInOutput": 651
         }
       },
-      "bytes": 1297975
+      "bytes": 1298112
     }
   }
 }

package/package.json

@@ -10,7 +10,7 @@
     "prebuilt",
     "roomkit"
   ],
-  "version": "0.2.8-alpha.10",
+  "version": "0.2.8-alpha.12",
   "author": "100ms",
   "license": "MIT",
   "repository": {
@@ -82,11 +82,11 @@
     "react": ">=17.0.2 <19.0.0"
   },
   "dependencies": {
-    "@100mslive/hls-player": "0.2.8-alpha.10",
+    "@100mslive/hls-player": "0.2.8-alpha.12",
     "@100mslive/hms-noise-cancellation": "0.0.0-alpha.1",
-    "@100mslive/hms-virtual-background": "1.12.8-alpha.10",
-    "@100mslive/react-icons": "0.9.8-alpha.10",
-    "@100mslive/react-sdk": "0.9.8-alpha.10",
+    "@100mslive/hms-virtual-background": "1.12.8-alpha.12",
+    "@100mslive/react-icons": "0.9.8-alpha.12",
+    "@100mslive/react-sdk": "0.9.8-alpha.12",
     "@100mslive/types-prebuilt": "0.12.7",
     "@emoji-mart/data": "^1.0.6",
     "@emoji-mart/react": "^1.0.1",
@@ -122,5 +122,5 @@
     "uuid": "^8.3.2",
     "worker-timers": "^7.0.40"
   },
-  "gitHead": "741a12014783f22c7302df3cbd3b01f2e343c16f"
+  "gitHead": "c5c687051efa9506328ae118b2bf8cd79b9a655c"
 }

package/src/Prebuilt/components/Chat/Chat.tsx

@@ -42,6 +42,10 @@ export const Chat = () => {
     [hmsActions, vanillaStore],
   );
 
+  if (!elements?.chat) {
+    return null;
+  }
+
   return (
     <Flex
       direction="column"

package/src/Prebuilt/components/Footer/RoleOptions.tsx

@@ -80,9 +80,12 @@ export const RoleOptions = ({ roleName, peerList }: { roleName: string; peerList
   const { on_stage_role, off_stage_roles = [] } = (elements as DefaultConferencingScreen_Elements)?.on_stage_exp || {};
   const canRemoveRoleFromStage = permissions?.changeRole && roleName === on_stage_role;
   const role = useHMSStore(selectRoleByRoleName(roleName));
+  const tracks = useHMSStore(selectTracksMap);
+  if (!role) {
+    return null;
+  }
   const canPublishAudio = role.publishParams.allowed.includes('audio');
   const canPublishVideo = role.publishParams.allowed.includes('video');
-  const tracks = useHMSStore(selectTracksMap);
 
   let isVideoOnForSomePeers = false;
   let isAudioOnForSomePeers = false;

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

@@ -46,6 +46,7 @@ export const HMSVideo = forwardRef(({ children, ...props }, videoRef) => {
         }}
         ref={videoRef}
         playsInline
+        disablePictureInPicture
       />
       {children}
     </Flex>

package/src/Prebuilt/components/HMSVideo/MwebHLSViewTitle.tsx

@@ -17,7 +17,7 @@ import { SIDE_PANE_OPTIONS } from '../../common/constants';
 	half page will have chat or participant view
 */
 export const HLSViewTitle = () => {
-  const { title, details } = useRoomLayoutHeader();
+  const { title, details, description } = useRoomLayoutHeader();
   const toggleDetailsPane = useSidepaneToggle(SIDE_PANE_OPTIONS.ROOM_DETAILS);
   const isDetailSidepaneOpen = useIsSidepaneTypeOpen(SIDE_PANE_OPTIONS.ROOM_DETAILS);
 
@@ -74,9 +74,11 @@ export const HLSViewTitle = () => {
         ) : null}
         <Flex>
           <RoomDetailsRow details={details} />
-          <Text variant="caption" css={{ color: '$on_surface_medium' }} onClick={toggleDetailsPane}>
-            &nbsp;...more
-          </Text>
+          {description ? (
+            <Text variant="caption" css={{ color: '$on_surface_medium' }} onClick={toggleDetailsPane}>
+              &nbsp;...more
+            </Text>
+          ) : null}
         </Flex>
       </Flex>
     </Flex>

package/src/Prebuilt/layouts/HLSView.jsx

@@ -2,6 +2,7 @@ import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { useFullscreen, useMedia, usePrevious, useToggle } from 'react-use';
 import { HLSPlaybackState, HMSHLSPlayer, HMSHLSPlayerEvents } from '@100mslive/hls-player';
 import screenfull from 'screenfull';
+import { match, P } from 'ts-pattern';
 import {
   HLSPlaylistType,
   HMSNotificationTypes,
@@ -33,20 +34,41 @@ import { Loading } from '../../Loading';
 import { Text } from '../../Text';
 import { config, theme, useTheme } from '../../Theme';
 import { Tooltip } from '../../Tooltip';
-import { usePollViewToggle, useSidepaneToggle } from '../components/AppData/useSidepane';
+import { useSidepaneToggle } from '../components/AppData/useSidepane';
 import { useRoomLayoutConferencingScreen } from '../provider/roomLayoutProvider/hooks/useRoomLayoutScreen';
 import { useIsLandscape } from '../common/hooks';
-import { APP_DATA, EMOJI_REACTION_TYPE, SIDE_PANE_OPTIONS } from '../common/constants';
+import { APP_DATA, EMOJI_REACTION_TYPE, POLL_STATE, POLL_VIEWS, SIDE_PANE_OPTIONS } from '../common/constants';
 
 let hlsPlayer;
 const toastMap = {};
 
+const ToggleChat = () => {
+  const { elements } = useRoomLayoutConferencingScreen();
+  const sidepane = useHMSStore(selectAppData(APP_DATA.sidePane));
+  const toggleChat = useSidepaneToggle(SIDE_PANE_OPTIONS.CHAT);
+  const showChat = !!elements?.chat;
+  const isMobile = useMedia(config.media.md);
+  const hmsActions = useHMSActions();
+
+  useEffect(() => {
+    match({ sidepane, isMobile, showChat })
+      .with({ isMobile: true, showChat: true, sidepane: P.when(value => !value) }, () => {
+        toggleChat();
+      })
+      .with({ showChat: false, isMobile: true, sidepane: SIDE_PANE_OPTIONS.CHAT }, () => {
+        hmsActions.setAppData(APP_DATA.sidePane, '');
+      })
+      .otherwise(() => {
+        //do nothing
+      });
+  }, [sidepane, isMobile, toggleChat, showChat, hmsActions]);
+  return null;
+};
 const HLSView = () => {
   const videoRef = useRef(null);
   const hlsViewRef = useRef();
   const hlsState = useHMSStore(selectHLSState);
   const enablHlsStats = useHMSStore(selectAppData(APP_DATA.hlsStats));
-  const { elements, screenType } = useRoomLayoutConferencingScreen();
   const notification = useHMSNotifications(HMSNotificationTypes.POLL_STOPPED);
   const hmsActions = useHMSActions();
   const { themeType } = useTheme();
@@ -63,17 +85,13 @@ const HLSView = () => {
   const [isPaused, setIsPaused] = useState(false);
   const [show, toggle] = useToggle(false);
   const lastHlsUrl = usePrevious(hlsUrl);
-  const togglePollView = usePollViewToggle();
   const vanillaStore = useHMSVanillaStore();
   const [controlsVisible, setControlsVisible] = useState(true);
   const [isUserSelectedAuto, setIsUserSelectedAuto] = useState(true);
   const [qualityDropDownOpen, setQualityDropDownOpen] = useState(false);
   const controlsRef = useRef(null);
   const controlsTimerRef = useRef();
-  const sidepane = useHMSStore(selectAppData(APP_DATA.sidePane));
-  const toggleChat = useSidepaneToggle(SIDE_PANE_OPTIONS.CHAT);
   const [seekProgress, setSeekProgress] = useState(false);
-  const showChat = !!elements?.chat;
   const isFullScreenSupported = screenfull.isEnabled;
 
   const isMobile = useMedia(config.media.md);
@@ -84,13 +102,6 @@ const HLSView = () => {
   });
   const [showLoader, setShowLoader] = useState(false);
 
-  const isMwebHLSStream = screenType === 'hls_live_streaming' && isMobile;
-
-  useEffect(() => {
-    if (sidepane === '' && isMwebHLSStream && showChat) {
-      toggleChat();
-    }
-  }, [sidepane, isMwebHLSStream, toggleChat, showChat]);
   // FIXME: move this logic to player controller in next release
   useEffect(() => {
     /**
@@ -176,7 +187,12 @@ const HLSView = () => {
             title: `${pollStartedBy} started a ${poll.type}: ${poll.title}`,
             action: (
               <Button
-                onClick={() => togglePollView(pollId)}
+                onClick={() => {
+                  hmsActions.setAppData({
+                    [POLL_STATE.pollInView]: pollId,
+                    [POLL_STATE.view]: POLL_VIEWS.VOTE,
+                  });
+                }}
                 variant="standard"
                 css={{
                   backgroundColor: '$surface_bright',
@@ -246,7 +262,7 @@ const HLSView = () => {
         hlsPlayer.reset();
       };
     }
-  }, [hlsUrl, togglePollView, vanillaStore]);
+  }, [hlsUrl, vanillaStore, hmsActions]);
 
   /**
    * initialize and subscribe to hlsState
@@ -352,28 +368,36 @@ const HLSView = () => {
 
   if (!hlsUrl || streamEnded) {
     return (
-      <Flex
-        key="hls-viewer"
-        id={`hls-viewer-${themeType}`}
-        ref={hlsViewRef}
-        direction={isMobile || isLandscape ? 'column' : 'row'}
-        justify="center"
-        css={{
-          flex: isLandscape ? '2 1 0' : '1 1 0',
-        }}
-      >
-        <Flex align="center" justify="center" direction="column" css={{ size: '100%', px: '$10' }}>
-          <Flex css={{ c: '$on_surface_high', r: '$round', bg: '$surface_default', p: '$2' }}>
-            {streamEnded ? <ColoredHandIcon height={56} width={56} /> : <GoLiveIcon height={56} width={56} />}
+      <>
+        <ToggleChat />
+        {hlsViewRef.current && (isMobile || isLandscape) && (
+          <Box css={{ position: 'fixed', left: '$4', top: '$4', zIndex: 11 }}>
+            <LeaveRoom screenType="hls_live_streaming" container={hlsViewRef.current} />
+          </Box>
+        )}
+        <Flex
+          key="hls-viewer"
+          id={`hls-viewer-${themeType}`}
+          ref={hlsViewRef}
+          direction={isMobile || isLandscape ? 'column' : 'row'}
+          justify="center"
+          css={{
+            flex: isLandscape ? '2 1 0' : '1 1 0',
+          }}
+        >
+          <Flex align="center" justify="center" direction="column" css={{ size: '100%', px: '$10' }}>
+            <Flex css={{ c: '$on_surface_high', r: '$round', bg: '$surface_default', p: '$2' }}>
+              {streamEnded ? <ColoredHandIcon height={56} width={56} /> : <GoLiveIcon height={56} width={56} />}
+            </Flex>
+            <Text variant="h5" css={{ c: '$on_surface_high', mt: '$10', mb: 0, textAlign: 'center' }}>
+              {streamEnded ? 'Stream has ended' : 'Stream yet to start'}
+            </Text>
+            <Text variant="md" css={{ textAlign: 'center', mt: '$4', c: '$on_surface_medium' }}>
+              {streamEnded ? 'Have a nice day!' : 'Sit back and relax'}
+            </Text>
           </Flex>
-          <Text variant="h5" css={{ c: '$on_surface_high', mt: '$10', mb: 0, textAlign: 'center' }}>
-            {streamEnded ? 'Stream has ended' : 'Stream yet to start'}
-          </Text>
-          <Text variant="md" css={{ textAlign: 'center', mt: '$4', c: '$on_surface_medium' }}>
-            {streamEnded ? 'Have a nice day!' : 'Sit back and relax'}
-          </Text>
         </Flex>
-      </Flex>
+      </>
     );
   }
   return (
@@ -385,11 +409,16 @@ const HLSView = () => {
       justify="center"
       css={{
         flex: isLandscape ? '2 1 0' : '1 1 0',
+        '&:fullscreen': {
+          '& video': {
+            height: 'unset !important',
+          },
+        },
       }}
     >
       {hlsViewRef.current && (isMobile || isLandscape) && (
         <Box css={{ position: 'fixed', left: '$4', top: '$4', zIndex: 11 }}>
-          <LeaveRoom screenType={screenType} container={hlsViewRef.current} />
+          <LeaveRoom screenType="hls_live_streaming" container={hlsViewRef.current} />
         </Box>
       )}
 
@@ -638,7 +667,7 @@ const HLSView = () => {
           </HMSVideoPlayer.Root>
         </Flex>
       </HMSPlayerContext.Provider>
-
+      <ToggleChat />
       {isMobile && !isFullScreen && <HLSViewTitle />}
     </Flex>
   );