From c821b8c4fedbddbc90b8b7dac177dfb7cc2b3ede Mon Sep 17 00:00:00 2001
From: Richard Shiue <71320345+richardshiue@users.noreply.github.com>
Date: Fri, 29 Dec 2023 11:35:53 +0800
Subject: [PATCH] fix: field editor bugs (#4241)

---
 .../presentation/database/field/mobile_edit_field_screen.dart | 4 ++--
 .../database/field/mobile_field_type_option_editor.dart       | 3 ++-
 .../database/field/mobile_quick_field_editor.dart             | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_edit_field_screen.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_edit_field_screen.dart
index 1a606bc61b..a4fc4d700f 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_edit_field_screen.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_edit_field_screen.dart
@@ -55,7 +55,7 @@ class _MobileEditPropertyScreenState extends State<MobileEditPropertyScreen> {
           LocaleKeys.grid_field_editProperty.tr(),
         ),
         leading: AppBarBackButton(
-          onTap: () => context.pop(),
+          onTap: () => context.pop(field),
         ),
       ),
       body: FieldOptionEditor(
@@ -108,7 +108,7 @@ class _MobileEditPropertyScreenState extends State<MobileEditPropertyScreen> {
               service.show();
               break;
           }
-          context.pop();
+          context.pop(field);
         },
       ),
     );
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_field_type_option_editor.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_field_type_option_editor.dart
index 9d28ba6b2e..da966dee12 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_field_type_option_editor.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_field_type_option_editor.dart
@@ -202,8 +202,9 @@ class _FieldOptionEditorState extends State<FieldOptionEditor> {
                   () {
                     if (widget.mode == FieldOptionMode.add) {
                       controller.text = type.i18n;
+                      _updateOptionValues(name: type.i18n);
                     }
-                    _updateOptionValues(type: type, name: type.i18n);
+                    _updateOptionValues(type: type);
                   },
                 ),
               ),
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_quick_field_editor.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_quick_field_editor.dart
index 95223f25b6..dc9e8a3a60 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_quick_field_editor.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/field/mobile_quick_field_editor.dart
@@ -77,6 +77,7 @@ class _QuickEditFieldState extends State<QuickEditField> {
             widget.fieldInfo.field.freeze();
             final field = widget.fieldInfo.field.rebuild((field) {
               field.name = controller.text;
+              field.fieldType = fieldType;
             });
             final optionValues = await showEditFieldScreen(
               context,