From a0449e7014c414c0887e7a10d5f5de4aae6363e6 Mon Sep 17 00:00:00 2001
From: raviteja83 <ravi.theja@100ms.live>
Date: Mon, 4 Mar 2024 11:18:19 +0530
Subject: [PATCH 1/7] fix: stream reloading on polls change

---
 .../src/Prebuilt/layouts/HLSView.jsx          | 42 +++++++++++--------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/packages/roomkit-react/src/Prebuilt/layouts/HLSView.jsx b/packages/roomkit-react/src/Prebuilt/layouts/HLSView.jsx
index 234b8e0098..760c973fc9 100644
--- a/packages/roomkit-react/src/Prebuilt/layouts/HLSView.jsx
+++ b/packages/roomkit-react/src/Prebuilt/layouts/HLSView.jsx
@@ -33,20 +33,32 @@ 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);
+  useEffect(() => {
+    if (sidepane === '' && isMobile && showChat) {
+      toggleChat();
+    }
+  }, [sidepane, isMobile, toggleChat, showChat]);
+  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 +75,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 +92,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 +177,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 +252,7 @@ const HLSView = () => {
         hlsPlayer.reset();
       };
     }
-  }, [hlsUrl, togglePollView, vanillaStore]);
+  }, [hlsUrl, vanillaStore, hmsActions]);
 
   /**
    * initialize and subscribe to hlsState
@@ -389,7 +395,7 @@ const HLSView = () => {
     >
       {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 +644,7 @@ const HLSView = () => {
           </HMSVideoPlayer.Root>
         </Flex>
       </HMSPlayerContext.Provider>
-
+      <ToggleChat />
       {isMobile && !isFullScreen && <HLSViewTitle />}
     </Flex>
   );

From 9438baa8941c23e8d3364a0214dd1a88fee62969 Mon Sep 17 00:00:00 2001
From: raviteja83 <ravi.theja@100ms.live>
Date: Mon, 4 Mar 2024 11:33:21 +0530
Subject: [PATCH 2/7] fix: toggle chat before stream start

---
 .../src/Prebuilt/layouts/HLSView.jsx          | 44 ++++++++++---------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/packages/roomkit-react/src/Prebuilt/layouts/HLSView.jsx b/packages/roomkit-react/src/Prebuilt/layouts/HLSView.jsx
index 760c973fc9..7cb4285943 100644
--- a/packages/roomkit-react/src/Prebuilt/layouts/HLSView.jsx
+++ b/packages/roomkit-react/src/Prebuilt/layouts/HLSView.jsx
@@ -358,28 +358,32 @@ 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 />
+
+        <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 (

From 2a6787bec9c8231ae1b3ef0ed3f1989b5fa8e296 Mon Sep 17 00:00:00 2001
From: raviteja83 <ravi.theja@100ms.live>
Date: Mon, 4 Mar 2024 11:55:16 +0530
Subject: [PATCH 3/7] fix: show chat when polls closed

---
 .../src/Prebuilt/components/AppData/useSidepane.js       | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/roomkit-react/src/Prebuilt/components/AppData/useSidepane.js b/packages/roomkit-react/src/Prebuilt/components/AppData/useSidepane.js
index c7ca47ff13..f07b828966 100644
--- a/packages/roomkit-react/src/Prebuilt/components/AppData/useSidepane.js
+++ b/packages/roomkit-react/src/Prebuilt/components/AppData/useSidepane.js
@@ -1,7 +1,9 @@
 import { useCallback } from 'react';
 import { match, P } from 'ts-pattern';
 import { selectAppData, useHMSActions, useHMSStore, useHMSVanillaStore } from '@100mslive/react-sdk';
+import { useRoomLayoutConferencingScreen } from '../../provider/roomLayoutProvider/hooks/useRoomLayoutScreen';
 import { usePollViewState } from './useUISettings';
+import { useMobileHLSStream } from '../../common/hooks';
 import { APP_DATA, POLL_STATE, POLL_VIEWS, SIDE_PANE_OPTIONS } from '../../common/constants';
 
 /**
@@ -43,6 +45,8 @@ export const usePollViewToggle = () => {
   const hmsActions = useHMSActions();
   const { view, setPollState } = usePollViewState();
   const isOpen = useSidepaneState() === SIDE_PANE_OPTIONS.POLLS;
+  const isMobileHLSStream = useMobileHLSStream();
+  const { elements } = useRoomLayoutConferencingScreen();
 
   const togglePollView = useCallback(
     id => {
@@ -69,7 +73,10 @@ export const usePollViewToggle = () => {
               [POLL_STATE.pollInView]: undefined,
               [POLL_STATE.view]: null,
             });
-            hmsActions.setAppData(APP_DATA.sidePane, '');
+            hmsActions.setAppData(
+              APP_DATA.sidePane,
+              isMobileHLSStream && !!elements?.chat ? SIDE_PANE_OPTIONS.CHAT : '',
+            );
           },
         )
         .otherwise(() => {

From 9015099cbb3d3960c6de29a4c89955ef7687c9eb Mon Sep 17 00:00:00 2001
From: KaustubhKumar05 <kaustubhkumar05@gmail.com>
Date: Mon, 4 Mar 2024 12:58:18 +0530
Subject: [PATCH 4/7] fix: chat toggle after closing poll

---
 .../src/Prebuilt/components/AppData/useSidepane.js       | 9 +--------
 packages/roomkit-react/src/Prebuilt/layouts/HLSView.jsx  | 2 +-
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/packages/roomkit-react/src/Prebuilt/components/AppData/useSidepane.js b/packages/roomkit-react/src/Prebuilt/components/AppData/useSidepane.js
index f07b828966..c7ca47ff13 100644
--- a/packages/roomkit-react/src/Prebuilt/components/AppData/useSidepane.js
+++ b/packages/roomkit-react/src/Prebuilt/components/AppData/useSidepane.js
@@ -1,9 +1,7 @@
 import { useCallback } from 'react';
 import { match, P } from 'ts-pattern';
 import { selectAppData, useHMSActions, useHMSStore, useHMSVanillaStore } from '@100mslive/react-sdk';
-import { useRoomLayoutConferencingScreen } from '../../provider/roomLayoutProvider/hooks/useRoomLayoutScreen';
 import { usePollViewState } from './useUISettings';
-import { useMobileHLSStream } from '../../common/hooks';
 import { APP_DATA, POLL_STATE, POLL_VIEWS, SIDE_PANE_OPTIONS } from '../../common/constants';
 
 /**
@@ -45,8 +43,6 @@ export const usePollViewToggle = () => {
   const hmsActions = useHMSActions();
   const { view, setPollState } = usePollViewState();
   const isOpen = useSidepaneState() === SIDE_PANE_OPTIONS.POLLS;
-  const isMobileHLSStream = useMobileHLSStream();
-  const { elements } = useRoomLayoutConferencingScreen();
 
   const togglePollView = useCallback(
     id => {
@@ -73,10 +69,7 @@ export const usePollViewToggle = () => {
               [POLL_STATE.pollInView]: undefined,
               [POLL_STATE.view]: null,
             });
-            hmsActions.setAppData(
-              APP_DATA.sidePane,
-              isMobileHLSStream && !!elements?.chat ? SIDE_PANE_OPTIONS.CHAT : '',
-            );
+            hmsActions.setAppData(APP_DATA.sidePane, '');
           },
         )
         .otherwise(() => {
diff --git a/packages/roomkit-react/src/Prebuilt/layouts/HLSView.jsx b/packages/roomkit-react/src/Prebuilt/layouts/HLSView.jsx
index 7cb4285943..8b15527cc0 100644
--- a/packages/roomkit-react/src/Prebuilt/layouts/HLSView.jsx
+++ b/packages/roomkit-react/src/Prebuilt/layouts/HLSView.jsx
@@ -48,7 +48,7 @@ const ToggleChat = () => {
   const showChat = !!elements?.chat;
   const isMobile = useMedia(config.media.md);
   useEffect(() => {
-    if (sidepane === '' && isMobile && showChat) {
+    if (!sidepane && isMobile && showChat) {
       toggleChat();
     }
   }, [sidepane, isMobile, toggleChat, showChat]);

From a66d06b2cde5504340e1d2ab93f0e2e1c2abea17 Mon Sep 17 00:00:00 2001
From: raviteja83 <ravi.theja@100ms.live>
Date: Mon, 4 Mar 2024 13:00:01 +0530
Subject: [PATCH 5/7] fix: role options crash

---
 .../src/Prebuilt/components/Footer/RoleOptions.tsx           | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/roomkit-react/src/Prebuilt/components/Footer/RoleOptions.tsx b/packages/roomkit-react/src/Prebuilt/components/Footer/RoleOptions.tsx
index 7d2314d1d0..9775196e7e 100644
--- a/packages/roomkit-react/src/Prebuilt/components/Footer/RoleOptions.tsx
+++ b/packages/roomkit-react/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;

From 2e07ef1ac469bfc5888d35de1a3d86da7a99a521 Mon Sep 17 00:00:00 2001
From: raviteja83 <ravi.theja@100ms.live>
Date: Mon, 4 Mar 2024 13:02:59 +0530
Subject: [PATCH 6/7] fix: cross icon on stream ended

---
 packages/roomkit-react/src/Prebuilt/layouts/HLSView.jsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/roomkit-react/src/Prebuilt/layouts/HLSView.jsx b/packages/roomkit-react/src/Prebuilt/layouts/HLSView.jsx
index 8b15527cc0..3c3310a2a2 100644
--- a/packages/roomkit-react/src/Prebuilt/layouts/HLSView.jsx
+++ b/packages/roomkit-react/src/Prebuilt/layouts/HLSView.jsx
@@ -360,7 +360,11 @@ const HLSView = () => {
     return (
       <>
         <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}`}

From 99f29029d6c835adc48ecdec810da1107a3cebc4 Mon Sep 17 00:00:00 2001
From: raviteja83 <ravi.theja@100ms.live>
Date: Mon, 4 Mar 2024 13:08:17 +0530
Subject: [PATCH 7/7] fix: fullscreen height in mweb

---
 packages/roomkit-react/src/Prebuilt/layouts/HLSView.jsx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/roomkit-react/src/Prebuilt/layouts/HLSView.jsx b/packages/roomkit-react/src/Prebuilt/layouts/HLSView.jsx
index 3c3310a2a2..3cc7e255fa 100644
--- a/packages/roomkit-react/src/Prebuilt/layouts/HLSView.jsx
+++ b/packages/roomkit-react/src/Prebuilt/layouts/HLSView.jsx
@@ -399,6 +399,11 @@ const HLSView = () => {
       justify="center"
       css={{
         flex: isLandscape ? '2 1 0' : '1 1 0',
+        '&:fullscreen': {
+          '& video': {
+            height: 'unset !important',
+          },
+        },
       }}
     >
       {hlsViewRef.current && (isMobile || isLandscape) && (