From 9d4f899dfd6df25f6bef117d74593a90f796ba53 Mon Sep 17 00:00:00 2001
From: 21pages <pages21@163.com>
Date: Thu, 16 Feb 2023 15:16:54 +0800
Subject: [PATCH] fix using default onSubmit after tab tapped

Signed-off-by: 21pages <pages21@163.com>
---
 flutter/lib/common.dart | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/flutter/lib/common.dart b/flutter/lib/common.dart
index c01fe8910..0880fdb91 100644
--- a/flutter/lib/common.dart
+++ b/flutter/lib/common.dart
@@ -632,6 +632,7 @@ class CustomAlertDialog extends StatelessWidget {
       if (!scopeNode.hasFocus) scopeNode.requestFocus();
     });
     const double padding = 16;
+    bool tabTapped = false;
     return FocusScope(
       node: scopeNode,
       autofocus: true,
@@ -641,13 +642,15 @@ class CustomAlertDialog extends StatelessWidget {
             onCancel?.call();
           }
           return KeyEventResult.handled; // avoid TextField exception on escape
-        } else if (onSubmit != null &&
+        } else if (!tabTapped &&
+            onSubmit != null &&
             key.logicalKey == LogicalKeyboardKey.enter) {
           if (key is RawKeyDownEvent) onSubmit?.call();
           return KeyEventResult.handled;
         } else if (key.logicalKey == LogicalKeyboardKey.tab) {
           if (key is RawKeyDownEvent) {
             scopeNode.nextFocus();
+            tabTapped = true;
           }
           return KeyEventResult.handled;
         }