From 291dcfc192397c394d4a29433bc1b543170e22ff Mon Sep 17 00:00:00 2001 From: Kelrap Date: Mon, 12 Aug 2024 14:58:11 -0400 Subject: [PATCH] Toolbar can show downward --- lib/pangea/widgets/chat/message_toolbar.dart | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/lib/pangea/widgets/chat/message_toolbar.dart b/lib/pangea/widgets/chat/message_toolbar.dart index 3c63c81fc..7c5682933 100644 --- a/lib/pangea/widgets/chat/message_toolbar.dart +++ b/lib/pangea/widgets/chat/message_toolbar.dart @@ -59,8 +59,12 @@ class ToolbarDisplayController { } void showToolbar(BuildContext context, {MessageMode? mode}) { - // Close keyboard, if open - FocusManager.instance.primaryFocus?.unfocus(); + // Don't show toolbar if keyboard open + if (controller.inputFocus.hasFocus) { + FocusManager.instance.primaryFocus?.unfocus(); + return; + } + bool toolbarUp = true; if (highlighted) return; if (controller.selectMode) { @@ -86,13 +90,12 @@ class ToolbarDisplayController { if (targetOffset.dy < 320) { final spaceBeneath = MediaQuery.of(context).size.height - (targetOffset.dy + transformTargetSize.height); - // If toolbar is open, opening toolbar beneath without scrolling can cause issues - // if (spaceBeneath >= 320) { - // toolbarUp = false; - // } + if (spaceBeneath >= 320) { + toolbarUp = false; + } // See if it's possible to scroll up to make space - if (controller.scrollController.offset - targetOffset.dy + 320 >= + else if (controller.scrollController.offset - targetOffset.dy + 320 >= controller.scrollController.position.minScrollExtent && controller.scrollController.offset - targetOffset.dy + 320 <= controller.scrollController.position.maxScrollExtent) {