From 9445ac43fabe6c99e4bbb13922df2ef14af833bb Mon Sep 17 00:00:00 2001 From: Ravi theja Date: Mon, 9 Sep 2024 16:37:56 +0530 Subject: [PATCH] fix: rejoin not working sometimes (#3250) --- .../roomkit-react/src/Prebuilt/AppStateContext.tsx | 10 +++++----- .../src/Prebuilt/components/InsetTile.tsx | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/roomkit-react/src/Prebuilt/AppStateContext.tsx b/packages/roomkit-react/src/Prebuilt/AppStateContext.tsx index d9d6207297..eb55ac51e3 100644 --- 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 index e6872e7af7..e20fc32dc0 100644 --- 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