From f1abe5a565b1cb8df725c7addcb3f16aa93ff3a6 Mon Sep 17 00:00:00 2001
From: Christian Pauly <christian-pauly@posteo.de>
Date: Sun, 26 Dec 2021 11:34:58 +0100
Subject: [PATCH] chore: Fix textfield focus

---
 lib/pages/story/story_page.dart | 6 ++++--
 lib/pages/story/story_view.dart | 2 --
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/pages/story/story_page.dart b/lib/pages/story/story_page.dart
index 8918c1c7..4c87b672 100644
--- a/lib/pages/story/story_page.dart
+++ b/lib/pages/story/story_page.dart
@@ -43,10 +43,11 @@ class StoryPageController extends State<StoryPage> {
   Event? get currentEvent => index < events.length ? events[index] : null;
 
   bool replyLoading = false;
+  bool _emojiSelector = false;
 
   void replyEmojiAction() async {
     if (replyLoading) return;
-    hold();
+    _emojiSelector = true;
     await showModalBottomSheet(
       context: context,
       builder: (context) => EmojiPicker(
@@ -56,7 +57,7 @@ class StoryPageController extends State<StoryPage> {
         },
       ),
     );
-    unhold();
+    _emojiSelector = false;
   }
 
   void replyAction([String? message]) async {
@@ -144,6 +145,7 @@ class StoryPageController extends State<StoryPage> {
     _progressTimer?.cancel();
     if (reset) progress = Duration.zero;
     _progressTimer = Timer.periodic(_step, (_) {
+      if (replyFocus.hasFocus || _emojiSelector) return;
       if (!mounted) {
         _progressTimer?.cancel();
         return;
diff --git a/lib/pages/story/story_view.dart b/lib/pages/story/story_view.dart
index a3906c71..7561f1c8 100644
--- a/lib/pages/story/story_view.dart
+++ b/lib/pages/story/story_view.dart
@@ -250,8 +250,6 @@ class StoryView extends StatelessWidget {
                       opacity: controller.isHold ? 0 : 1,
                       child: SafeArea(
                         child: TextField(
-                          onTap: controller.hold,
-                          onEditingComplete: controller.unhold,
                           focusNode: controller.replyFocus,
                           controller: controller.replyController,
                           minLines: 1,