Merge branch 'develop' into updateReadMe

100mslive · Jul 24, 2024 · a45bcc5 · a45bcc5
2 parents b3a515a + 929c080
commit a45bcc5
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/packages/hms_room_kit/lib/src/meeting/meeting_store.dart b/packages/hms_room_kit/lib/src/meeting/meeting_store.dart
@@ -1433,6 +1433,7 @@ class MeetingStore extends ChangeNotifier
 
   void clearRoomState() async {
     // clearPIPState();
+    removeAllBottomSheets();
     removeListeners();
     toggleAlwaysScreenOn();
 

diff --git a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/chat_only_bottom_sheet.dart b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/chat_only_bottom_sheet.dart
@@ -24,6 +24,18 @@ class ChatOnlyBottomSheet extends StatefulWidget {
 }
 
 class _ChatOnlyBottomSheetState extends State<ChatOnlyBottomSheet> {
+  @override
+  void initState() {
+    super.initState();
+    context.read<MeetingStore>().addBottomSheet(context);
+  }
+
+  @override
+  void deactivate() {
+    context.read<MeetingStore>().removeBottomSheet(context);
+    super.deactivate();
+  }
+
   @override
   Widget build(BuildContext context) {
     return SafeArea(

diff --git a/packages/hms_room_kit/lib/src/widgets/tab_widgets/chat_participants_tab_bar.dart b/packages/hms_room_kit/lib/src/widgets/tab_widgets/chat_participants_tab_bar.dart
@@ -32,6 +32,7 @@ class _ChatParticipantsTabBarState extends State<ChatParticipantsTabBar>
   @override
   void initState() {
     super.initState();
+    context.read<MeetingStore>().addBottomSheet(context);
     _controller =
         TabController(length: 2, vsync: this, initialIndex: widget.tabIndex);
 
@@ -40,6 +41,12 @@ class _ChatParticipantsTabBarState extends State<ChatParticipantsTabBar>
     });
   }
 
+  @override
+  void deactivate() {
+    context.read<MeetingStore>().removeBottomSheet(context);
+    super.deactivate();
+  }
+
   @override
   Widget build(BuildContext context) {
     return SafeArea(