chore: fix bugs

Author: appflowy

frontend/app_flowy/lib/workspace/application/grid/field/field_editor_bloc.dart

@@ -9,7 +9,7 @@ class FieldEditorBloc extends Bloc<FieldEditorEvent, FieldEditorState> {
   FieldEditorBloc({
     required String gridId,
     required String fieldName,
-    required FieldContextLoader fieldContextLoader,
+    required IFieldContextLoader fieldContextLoader,
   }) : super(FieldEditorState.initial(gridId, fieldName, fieldContextLoader)) {
     on<FieldEditorEvent>(
       (event, emit) async {
@@ -18,7 +18,7 @@ class FieldEditorBloc extends Bloc<FieldEditorEvent, FieldEditorState> {
             final fieldContext = GridFieldContext(gridId: gridId, loader: fieldContextLoader);
             await fieldContext.loadData().then((result) {
               result.fold(
-                (l) => emit(state.copyWith(fieldContext: Some(fieldContext))),
+                (l) => emit(state.copyWith(fieldContext: Some(fieldContext), name: fieldContext.field.name)),
                 (r) => null,
               );
             });
@@ -53,7 +53,7 @@ class FieldEditorState with _$FieldEditorState {
     required Option<GridFieldContext> fieldContext,
   }) = _FieldEditorState;
 
-  factory FieldEditorState.initial(String gridId, String fieldName, FieldContextLoader loader) => FieldEditorState(
+  factory FieldEditorState.initial(String gridId, String fieldName, IFieldContextLoader loader) => FieldEditorState(
         gridId: gridId,
         fieldContext: none(),
         errorText: '',

frontend/app_flowy/lib/workspace/application/grid/field/field_service.dart

@@ -15,15 +15,6 @@ class FieldService {
 
   FieldService({required this.gridId, required this.fieldId});
 
-  Future<Either<FieldTypeOptionData, FlowyError>> switchToField(FieldType fieldType) {
-    final payload = EditFieldPayload.create()
-      ..gridId = gridId
-      ..fieldId = fieldId
-      ..fieldType = fieldType;
-
-    return GridEventSwitchToField(payload).send();
-  }
-
   Future<Either<Unit, FlowyError>> moveField(int fromIndex, int toIndex) {
     final payload = MoveItemPayload.create()
       ..gridId = gridId
@@ -146,13 +137,22 @@ class GridFieldCellContext with _$GridFieldCellContext {
   }) = _GridFieldCellContext;
 }
 
-abstract class FieldContextLoader {
+abstract class IFieldContextLoader {
+  String get gridId;
   Future<Either<FieldTypeOptionData, FlowyError>> load();
 
-  Future<Either<FieldTypeOptionData, FlowyError>> switchToField(String fieldId, FieldType fieldType);
+  Future<Either<FieldTypeOptionData, FlowyError>> switchToField(String fieldId, FieldType fieldType) {
+    final payload = EditFieldPayload.create()
+      ..gridId = gridId
+      ..fieldId = fieldId
+      ..fieldType = fieldType;
+
+    return GridEventSwitchToField(payload).send();
+  }
 }
 
-class NewFieldContextLoader extends FieldContextLoader {
+class NewFieldContextLoader extends IFieldContextLoader {
+  @override
   final String gridId;
   NewFieldContextLoader({
     required this.gridId,
@@ -164,24 +164,16 @@ class NewFieldContextLoader extends FieldContextLoader {
       ..gridId = gridId
       ..fieldType = FieldType.RichText;
 
-    return GridEventGetFieldTypeOption(payload).send();
-  }
-
-  @override
-  Future<Either<FieldTypeOptionData, FlowyError>> switchToField(String fieldId, FieldType fieldType) {
-    final payload = EditFieldPayload.create()
-      ..gridId = gridId
-      ..fieldType = fieldType;
-
-    return GridEventGetFieldTypeOption(payload).send();
+    return GridEventCreateFieldTypeOption(payload).send();
   }
 }
 
-class DefaultFieldContextLoader extends FieldContextLoader {
+class FieldContextLoader extends IFieldContextLoader {
+  @override
   final String gridId;
   final Field field;
 
-  DefaultFieldContextLoader({
+  FieldContextLoader({
     required this.gridId,
     required this.field,
   });
@@ -195,24 +187,18 @@ class DefaultFieldContextLoader extends FieldContextLoader {
 
     return GridEventGetFieldTypeOption(payload).send();
   }
-
-  @override
-  Future<Either<FieldTypeOptionData, FlowyError>> switchToField(String fieldId, FieldType fieldType) async {
-    final fieldService = FieldService(gridId: gridId, fieldId: fieldId);
-    return fieldService.switchToField(fieldType);
-  }
 }
 
 class GridFieldContext {
   final String gridId;
-  final FieldContextLoader _loader;
+  final IFieldContextLoader _loader;
 
   late FieldTypeOptionData _data;
   ValueNotifier<Field>? _fieldNotifier;
 
   GridFieldContext({
     required this.gridId,
-    required FieldContextLoader loader,
+    required IFieldContextLoader loader,
   }) : _loader = loader;
 
   Future<Either<Unit, FlowyError>> loadData() async {
@@ -246,27 +232,27 @@ class GridFieldContext {
   List<int> get typeOptionData => _data.typeOptionData;
 
   set fieldName(String name) {
-    _updateData(name: name);
+    _updateData(newName: name);
   }
 
   set typeOptionData(List<int> typeOptionData) {
-    _updateData(typeOptionData: typeOptionData);
+    _updateData(newTypeOptionData: typeOptionData);
   }
 
-  void _updateData({String? name, Field? newField, List<int>? typeOptionData}) {
+  void _updateData({String? newName, Field? newField, List<int>? newTypeOptionData}) {
     _data = _data.rebuild((rebuildData) {
-      if (name != null) {
+      if (newName != null) {
         rebuildData.field_2 = rebuildData.field_2.rebuild((rebuildField) {
-          rebuildField.name = name;
+          rebuildField.name = newName;
         });
       }
 
       if (newField != null) {
         rebuildData.field_2 = newField;
       }
 
-      if (typeOptionData != null) {
-        rebuildData.typeOptionData = typeOptionData;
+      if (newTypeOptionData != null) {
+        rebuildData.typeOptionData = newTypeOptionData;
       }
     });
 
@@ -287,7 +273,7 @@ class GridFieldContext {
         (fieldTypeOptionData) {
           _updateData(
             newField: fieldTypeOptionData.field_2,
-            typeOptionData: fieldTypeOptionData.typeOptionData,
+            newTypeOptionData: fieldTypeOptionData.typeOptionData,
           );
         },
         (err) {

frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/field_cell.dart

@@ -64,7 +64,7 @@ class GridFieldCell extends StatelessWidget {
     FieldEditor(
       gridId: state.gridId,
       fieldName: state.field.name,
-      contextLoader: DefaultFieldContextLoader(
+      contextLoader: FieldContextLoader(
         gridId: state.gridId,
         field: state.field,
       ),

frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/field_editor.dart

@@ -14,7 +14,7 @@ class FieldEditor extends StatelessWidget with FlowyOverlayDelegate {
   final String gridId;
   final String fieldName;
 
-  final FieldContextLoader contextLoader;
+  final IFieldContextLoader contextLoader;
   const FieldEditor({
     required this.gridId,
     required this.fieldName,
@@ -97,7 +97,6 @@ class _FieldNameTextField extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return BlocBuilder<FieldEditorBloc, FieldEditorState>(
-      buildWhen: (p, c) => p.name != c.name,
       builder: (context, state) {
         return FieldNameTextField(
           name: state.name,

frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/field_name_input.dart

@@ -3,7 +3,7 @@ import 'package:flowy_infra_ui/widget/rounded_input_field.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
-class FieldNameTextField extends StatelessWidget {
+class FieldNameTextField extends StatefulWidget {
   final void Function(String) onNameChanged;
   final String name;
   final String errorText;
@@ -14,19 +14,41 @@ class FieldNameTextField extends StatelessWidget {
     Key? key,
   }) : super(key: key);
 
+  @override
+  State<FieldNameTextField> createState() => _FieldNameTextFieldState();
+}
+
+class _FieldNameTextFieldState extends State<FieldNameTextField> {
+  late String name;
+  TextEditingController controller = TextEditingController();
+
+  @override
+  void initState() {
+    controller.text = widget.name;
+    super.initState();
+  }
+
   @override
   Widget build(BuildContext context) {
     final theme = context.watch<AppTheme>();
     return RoundedInputField(
       height: 36,
       style: const TextStyle(fontSize: 13, fontWeight: FontWeight.w500),
-      initialValue: name,
+      controller: controller,
       normalBorderColor: theme.shader4,
       errorBorderColor: theme.red,
       focusBorderColor: theme.main1,
       cursorColor: theme.main1,
-      errorText: errorText,
-      onChanged: onNameChanged,
+      errorText: widget.errorText,
+      onChanged: widget.onNameChanged,
     );
   }
+
+  @override
+  void didUpdateWidget(covariant FieldNameTextField oldWidget) {
+    controller.text = widget.name;
+    controller.selection = TextSelection.fromPosition(TextPosition(offset: controller.text.length));
+
+    super.didUpdateWidget(oldWidget);
+  }
 }

frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/row/row_detail.dart

@@ -179,7 +179,7 @@ class _RowDetailCell extends StatelessWidget {
     FieldEditor(
       gridId: gridCell.gridId,
       fieldName: gridCell.field.name,
-      contextLoader: DefaultFieldContextLoader(
+      contextLoader: FieldContextLoader(
         gridId: gridCell.gridId,
         field: gridCell.field,
       ),

frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/toolbar/grid_property.dart

@@ -116,7 +116,7 @@ class _GridPropertyCell extends StatelessWidget {
         FieldEditor(
           gridId: gridId,
           fieldName: field.name,
-          contextLoader: DefaultFieldContextLoader(gridId: gridId, field: field),
+          contextLoader: FieldContextLoader(gridId: gridId, field: field),
         ).show(context, anchorDirection: AnchorDirection.bottomRight);
       },
     );

frontend/app_flowy/packages/flowy_sdk/lib/dispatch/dart_event/flowy-grid/dart_event.dart

@@ -188,6 +188,23 @@ class GridEventGetFieldTypeOption {
     }
 }
 
+class GridEventCreateFieldTypeOption {
+     EditFieldPayload request;
+     GridEventCreateFieldTypeOption(this.request);
+
+    Future<Either<FieldTypeOptionData, FlowyError>> send() {
+    final request = FFIRequest.create()
+          ..event = GridEvent.CreateFieldTypeOption.toString()
+          ..payload = requestToBytes(this.request);
+
+    return Dispatch.asyncRequest(request)
+        .then((bytesResult) => bytesResult.fold(
+           (okBytes) => left(FieldTypeOptionData.fromBuffer(okBytes)),
+           (errBytes) => right(FlowyError.fromBuffer(errBytes)),
+        ));
+    }
+}
+
 class GridEventNewSelectOption {
      CreateSelectOptionPayload request;
      GridEventNewSelectOption(this.request);