From 00e184f4225f3a09483802cd08944c0700bcbde4 Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Tue, 22 Jun 2021 12:54:22 +0200 Subject: [PATCH] show modal using the nearest navigator --- packages/stream_chat_flutter/lib/src/message_widget.dart | 2 ++ packages/stream_chat_flutter/lib/src/utils.dart | 2 ++ packages/stream_chat_flutter/pubspec.yaml | 6 ------ packages/stream_chat_flutter_core/pubspec.yaml | 4 ---- packages/stream_chat_persistence/pubspec.yaml | 4 ---- 5 files changed, 4 insertions(+), 14 deletions(-) diff --git a/packages/stream_chat_flutter/lib/src/message_widget.dart b/packages/stream_chat_flutter/lib/src/message_widget.dart index 7fb092d6..753f201c 100644 --- a/packages/stream_chat_flutter/lib/src/message_widget.dart +++ b/packages/stream_chat_flutter/lib/src/message_widget.dart @@ -908,6 +908,7 @@ class _MessageWidgetState extends State final channel = StreamChannel.of(context).channel; showDialog( + useRootNavigator: false, context: context, barrierColor: _streamChatTheme.colorTheme.overlay, builder: (context) => StreamChannel( @@ -959,6 +960,7 @@ class _MessageWidgetState extends State void _showMessageReactionsModalBottomSheet(BuildContext context) { final channel = StreamChannel.of(context).channel; showDialog( + useRootNavigator: false, context: context, barrierColor: _streamChatTheme.colorTheme.overlay, builder: (context) => StreamChannel( diff --git a/packages/stream_chat_flutter/lib/src/utils.dart b/packages/stream_chat_flutter/lib/src/utils.dart index e98112fc..d923b752 100644 --- a/packages/stream_chat_flutter/lib/src/utils.dart +++ b/packages/stream_chat_flutter/lib/src/utils.dart @@ -30,6 +30,7 @@ Future showConfirmationDialog( }) { final chatThemeData = StreamChatTheme.of(context); return showModalBottomSheet( + useRootNavigator: false, backgroundColor: chatThemeData.colorTheme.white, context: context, shape: const RoundedRectangleBorder( @@ -114,6 +115,7 @@ Future showInfoDialog( }) { final chatThemeData = StreamChatTheme.of(context); return showModalBottomSheet( + useRootNavigator: false, backgroundColor: theme?.colorTheme.white ?? chatThemeData.colorTheme.white, context: context, shape: const RoundedRectangleBorder( diff --git a/packages/stream_chat_flutter/pubspec.yaml b/packages/stream_chat_flutter/pubspec.yaml index 4ef84ebc..bcebde99 100644 --- a/packages/stream_chat_flutter/pubspec.yaml +++ b/packages/stream_chat_flutter/pubspec.yaml @@ -53,12 +53,6 @@ flutter: - animations/ uses-material-design: true -dependency_overrides: - stream_chat: - path: ../stream_chat - stream_chat_flutter_core: - path: ../stream_chat_flutter_core - dev_dependencies: flutter_test: sdk: flutter diff --git a/packages/stream_chat_flutter_core/pubspec.yaml b/packages/stream_chat_flutter_core/pubspec.yaml index ff218936..14fa0f80 100644 --- a/packages/stream_chat_flutter_core/pubspec.yaml +++ b/packages/stream_chat_flutter_core/pubspec.yaml @@ -18,10 +18,6 @@ dependencies: rxdart: ^0.27.0 stream_chat: ^2.0.0-nullsafety.6 -dependency_overrides: - stream_chat: - path: ../stream_chat - dev_dependencies: fake_async: ^1.2.0 flutter_test: diff --git a/packages/stream_chat_persistence/pubspec.yaml b/packages/stream_chat_persistence/pubspec.yaml index ff1a8579..9d141198 100644 --- a/packages/stream_chat_persistence/pubspec.yaml +++ b/packages/stream_chat_persistence/pubspec.yaml @@ -20,10 +20,6 @@ dependencies: sqlite3_flutter_libs: ^0.5.0 stream_chat: ^2.0.0-nullsafety.5 -dependency_overrides: - stream_chat: - path: ../stream_chat - dev_dependencies: build_runner: ^2.0.1 mocktail: ^0.1.1