fix: rejoin not working sometimes (#3250)

100mslive · Sep 9, 2024 · 9445ac4 · 9445ac4
1 parent 0fe4017
commit 9445ac4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/packages/roomkit-react/src/Prebuilt/AppStateContext.tsx b/packages/roomkit-react/src/Prebuilt/AppStateContext.tsx
@@ -68,12 +68,12 @@ export const useAppStateManager = () => {
         [HMSRoomState.Disconnected, HMSRoomState.Connecting],
         [HMSRoomState.Disconnected, HMSRoomState.Reconnecting],
         () => {
-          setActiveState(
-            match({ isLeaveScreenEnabled, isPreviewScreenEnabled })
-              .with({ isLeaveScreenEnabled: true }, () => PrebuiltStates.LEAVE)
+          setActiveState(prevState => {
+            return match({ isLeaveScreenEnabled, isPreviewScreenEnabled, prevState })
+              .with({ isLeaveScreenEnabled: true, prevState: PrebuiltStates.MEETING }, () => PrebuiltStates.LEAVE)
               .with({ isPreviewScreenEnabled: true }, () => PrebuiltStates.PREVIEW)
-              .otherwise(() => PrebuiltStates.MEETING),
-          );
+              .otherwise(() => PrebuiltStates.MEETING);
+          });
           VBHandler.reset();
           redirectToLeave(1000); // to clear toasts after 1 second
         },

diff --git a/packages/roomkit-react/src/Prebuilt/components/InsetTile.tsx b/packages/roomkit-react/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