chore: dart code cleanup (#4484)

* chore: use when instead of map in bloc event dispatch

* chore: dart code formatting, remove white space

* chore: remove unneeded hashmap for cell context

* fix: rebuild card content

frontend/appflowy_flutter/lib/mobile/presentation/database/board/widgets/mobile_hidden_groups_column.dart

@@ -160,7 +160,9 @@ class MobileHiddenGroup extends StatelessWidget {
         final cells = group.rows.map(
           (item) {
             final cellContext =
-                databaseController.rowCache.loadCells(item)[primaryField.id]!;
+                databaseController.rowCache.loadCells(item).firstWhere(
+                      (cellContext) => cellContext.fieldId == primaryField.id,
+                    );
 
             return TextButton(
               style: TextButton.styleFrom(

frontend/appflowy_flutter/lib/plugins/database/application/cell/select_option_cell_service.dart

@@ -29,7 +29,8 @@ class SelectOptionCellBackendService {
             final payload = RepeatedSelectOptionPayload()
               ..viewId = viewId
               ..fieldId = fieldId
-              ..rowId = rowId..items.add(option);
+              ..rowId = rowId
+              ..items.add(option);
 
             return DatabaseEventInsertOrUpdateSelectOption(payload).send();
           },

frontend/appflowy_flutter/lib/plugins/database/application/defines.dart

@@ -8,7 +8,6 @@ import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';
 import 'package:dartz/dartz.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 
-import 'cell/cell_controller.dart';
 import 'field/field_info.dart';
 import 'row/row_cache.dart';
 import 'row/row_service.dart';
@@ -34,8 +33,6 @@ typedef OnNumOfRowsChanged = void Function(
 
 typedef OnError = void Function(FlowyError);
 
-typedef CellContextByFieldId = LinkedHashMap<String, CellContext>;
-
 @freezed
 class LoadingState with _$LoadingState {
   const factory LoadingState.idle() = _Idle;

frontend/appflowy_flutter/lib/plugins/database/application/field/field_service.dart

@@ -168,7 +168,11 @@ class FieldBackendService {
   Future<Either<Unit, FlowyError>> updateType({
     required FieldType fieldType,
   }) {
-    return updateFieldType(viewId: viewId, fieldId: fieldId, fieldType: fieldType);
+    return updateFieldType(
+      viewId: viewId,
+      fieldId: fieldId,
+      fieldType: fieldType,
+    );
   }
 
   Future<Either<Unit, FlowyError>> delete() {

frontend/appflowy_flutter/lib/plugins/database/application/row/row_cache.dart

@@ -8,7 +8,6 @@ import 'package:freezed_annotation/freezed_annotation.dart';
 
 import '../cell/cell_cache.dart';
 import '../cell/cell_controller.dart';
-import '../defines.dart';
 import 'row_list.dart';
 import 'row_service.dart';
 
@@ -189,7 +188,7 @@ class RowCache {
 
   RowUpdateCallback addListener({
     required RowId rowId,
-    void Function(CellContextByFieldId, ChangedReason)? onRowChanged,
+    void Function(List<CellContext>, ChangedReason)? onRowChanged,
   }) {
     void listenerHandler() async {
       if (onRowChanged != null) {
@@ -209,7 +208,7 @@ class RowCache {
     _changedNotifier.removeListener(callback);
   }
 
-  CellContextByFieldId loadCells(RowMetaPB rowMeta) {
+  List<CellContext> loadCells(RowMetaPB rowMeta) {
     final rowInfo = _rowList.get(rowMeta.id);
     if (rowInfo == null) {
       _loadRow(rowMeta.id);
@@ -241,16 +240,15 @@ class RowCache {
     );
   }
 
-  CellContextByFieldId _makeCells(RowMetaPB rowMeta) {
+  List<CellContext> _makeCells(RowMetaPB rowMeta) {
-    // TODO(RS): no need to use HashMap
+    return _fieldDelegate.fieldInfos
-    final cellContextMap = CellContextByFieldId();
+        .map(
-    for (final fieldInfo in _fieldDelegate.fieldInfos) {
+          (fieldInfo) => CellContext(
-      cellContextMap[fieldInfo.id] = CellContext(
             rowId: rowMeta.id,
             fieldId: fieldInfo.id,
-      );
+          ),
-    }
+        )
-    return cellContextMap;
+        .toList();
   }
 
   RowInfo buildGridRow(RowMetaPB rowMetaPB) {

frontend/appflowy_flutter/lib/plugins/database/application/row/row_controller.dart

@@ -2,10 +2,10 @@ import 'package:appflowy_backend/protobuf/flowy-database2/row_entities.pb.dart';
 import 'package:flutter/material.dart';
 
 import '../cell/cell_cache.dart';
-import '../defines.dart';
+import '../cell/cell_controller.dart';
 import 'row_cache.dart';
 
-typedef OnRowChanged = void Function(CellContextByFieldId, ChangedReason);
+typedef OnRowChanged = void Function(List<CellContext>, ChangedReason);
 
 class RowController {
   final RowMetaPB rowMeta;
@@ -25,7 +25,7 @@ class RowController {
     this.groupId,
   }) : _rowCache = rowCache;
 
-  CellContextByFieldId loadData() {
+  List<CellContext> loadData() {
     return _rowCache.loadCells(rowMeta);
   }
 

frontend/appflowy_flutter/lib/plugins/database/board/presentation/widgets/board_hidden_groups.dart

@@ -386,7 +386,9 @@ class HiddenGroupPopupItemList extends StatelessWidget {
                   context.read<BoardBloc>().databaseController;
 
               return HiddenGroupPopupItem(
-                cellContext: rowCache.loadCells(item)[primaryFieldId]!,
+                cellContext: rowCache.loadCells(item).firstWhere(
+                      (cellContext) => cellContext.fieldId == primaryFieldId,
+                    ),
                 rowController: rowController,
                 rowMeta: item,
                 cellBuilder: CardCellBuilder(

frontend/appflowy_flutter/lib/plugins/database/calendar/application/calendar_event_editor_bloc.dart

@@ -30,7 +30,6 @@ class CalendarEventEditorBloc
               .id;
           final cells = rowController
               .loadData()
-              .values
               .where(
                 (cellContext) =>
                     _filterCellContext(cellContext, primaryFieldId),
@@ -61,7 +60,7 @@ class CalendarEventEditorBloc
         final primaryFieldId = fieldController.fieldInfos
             .firstWhere((fieldInfo) => fieldInfo.isPrimary)
             .id;
-        final cellData = cells.values
+        final cellData = cells
             .where(
               (cellContext) => _filterCellContext(cellContext, primaryFieldId),
             )

frontend/appflowy_flutter/lib/plugins/database/grid/application/row/row_bloc.dart

@@ -1,8 +1,6 @@
 import 'dart:async';
-import 'dart:collection';
 
 import 'package:appflowy/plugins/database/application/cell/cell_controller.dart';
-import 'package:appflowy/plugins/database/application/defines.dart';
 import 'package:appflowy/plugins/database/application/field/field_controller.dart';
 import 'package:appflowy/plugins/database/widgets/setting/field_visibility_extension.dart';
 import 'package:flutter/foundation.dart';
@@ -48,17 +46,19 @@ class RowBloc extends Bloc<RowEvent, RowState> {
           createRow: () {
             _rowBackendSvc.createRowAfter(rowId);
           },
-          didReceiveCells: (CellContextByFieldId cellByFieldId, reason) {
+          didReceiveCells: (List<CellContext> cellContexts, reason) {
-            cellByFieldId.removeWhere(
+            final visibleCellContexts = cellContexts
-              (_, cellContext) => !fieldController
+                .where(
+                  (cellContext) => fieldController
                       .getField(cellContext.fieldId)!
                       .fieldSettings!
                       .visibility
                       .isVisibleState(),
-            );
+                )
+                .toList();
             emit(
               state.copyWith(
-                cellByFieldId: cellByFieldId,
+                cellContexts: visibleCellContexts,
                 changeReason: reason,
               ),
             );
@@ -92,7 +92,7 @@ class RowBloc extends Bloc<RowEvent, RowState> {
 class RowEvent with _$RowEvent {
   const factory RowEvent.createRow() = _CreateRow;
   const factory RowEvent.didReceiveCells(
-    CellContextByFieldId cellsByFieldId,
+    List<CellContext> cellsByFieldId,
     ChangedReason reason,
   ) = _DidReceiveCells;
 }
@@ -100,13 +100,13 @@ class RowEvent with _$RowEvent {
 @freezed
 class RowState with _$RowState {
   const factory RowState({
-    required CellContextByFieldId cellByFieldId,
+    required List<CellContext> cellContexts,
     ChangedReason? changeReason,
   }) = _RowState;
 
   factory RowState.initial() {
-    return RowState(
+    return const RowState(
-      cellByFieldId: CellContextByFieldId(),
+      cellContexts: [],
       changeReason: null,
     );
   }

frontend/appflowy_flutter/lib/plugins/database/grid/application/row/row_detail_bloc.dart

@@ -92,7 +92,7 @@ class RowDetailBloc extends Bloc<RowDetailEvent, RowDetailState> {
           return;
         }
         allCells.clear();
-        allCells.addAll(cellMap.values);
+        allCells.addAll(cellMap);
         int numHiddenFields = 0;
         final visibleCells = <CellContext>[];
 
@@ -125,7 +125,7 @@ class RowDetailBloc extends Bloc<RowDetailEvent, RowDetailState> {
   }
 
   void _init() {
-    allCells.addAll(rowController.loadData().values);
+    allCells.addAll(rowController.loadData());
     int numHiddenFields = 0;
     final visibleCells = <CellContext>[];
     for (final cell in allCells) {

frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/row/mobile_row.dart

@@ -1,6 +1,6 @@
 import 'package:appflowy/generated/flowy_svgs.g.dart';
+import 'package:appflowy/plugins/database/application/cell/cell_controller.dart';
 import 'package:appflowy/plugins/database/application/database_controller.dart';
-import 'package:appflowy/plugins/database/application/defines.dart';
 import 'package:appflowy/plugins/database/application/field/field_controller.dart';
 import 'package:appflowy/plugins/database/application/row/row_cache.dart';
 import 'package:appflowy/plugins/database/application/row/row_controller.dart';
@@ -130,7 +130,7 @@ class RowContent extends StatelessWidget {
           child: Row(
             crossAxisAlignment: CrossAxisAlignment.stretch,
             children: [
-              ..._makeCells(context, state.cellByFieldId),
+              ..._makeCells(context, state.cellContexts),
               _finalCellDecoration(context),
             ],
           ),
@@ -141,9 +141,9 @@ class RowContent extends StatelessWidget {
 
   List<Widget> _makeCells(
     BuildContext context,
-    CellContextByFieldId cellByFieldId,
+    List<CellContext> cellContexts,
   ) {
-    return cellByFieldId.values.map(
+    return cellContexts.map(
       (cellContext) {
         final fieldInfo = fieldController.getField(cellContext.fieldId)!;
         final EditableCellWidget child = builder.buildStyled(

frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/row/row.dart

@@ -1,8 +1,8 @@
+import 'package:appflowy/plugins/database/application/cell/cell_controller.dart';
 import 'package:flutter/material.dart';
 
 import 'package:appflowy/generated/flowy_svgs.g.dart';
 import "package:appflowy/generated/locale_keys.g.dart";
-import 'package:appflowy/plugins/database/application/defines.dart';
 import 'package:appflowy/plugins/database/application/field/field_controller.dart';
 import 'package:appflowy/plugins/database/application/row/row_controller.dart';
 import 'package:appflowy/plugins/database/application/row/row_service.dart';
@@ -229,7 +229,7 @@ class RowContent extends StatelessWidget {
           child: Row(
             crossAxisAlignment: CrossAxisAlignment.stretch,
             children: [
-              ..._makeCells(context, state.cellByFieldId),
+              ..._makeCells(context, state.cellContexts),
               _finalCellDecoration(context),
             ],
           ),
@@ -240,9 +240,9 @@ class RowContent extends StatelessWidget {
 
   List<Widget> _makeCells(
     BuildContext context,
-    CellContextByFieldId cellByFieldId,
+    List<CellContext> cellContexts,
   ) {
-    return cellByFieldId.values.map(
+    return cellContexts.map(
       (cellContext) {
         final fieldInfo = fieldController.getField(cellContext.fieldId)!;
         final EditableCellWidget child = cellBuilder.buildStyled(

frontend/appflowy_flutter/lib/plugins/database/widgets/card/card.dart

@@ -10,7 +10,6 @@ import 'package:appflowy_popover/appflowy_popover.dart';
 import 'package:collection/collection.dart';
 import 'package:flowy_infra_ui/flowy_infra_ui.dart';
 import 'package:flowy_infra_ui/style_widget/hover.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
@@ -107,17 +106,6 @@ class _RowCardState extends State<RowCard> {
     return BlocProvider.value(
       value: _cardBloc,
       child: BlocBuilder<CardBloc, CardState>(
-        buildWhen: (previous, current) {
-          // Rebuild when:
-          // 1. If the length of the cells is not the same or isEditing changed
-          if (previous.cells.length != current.cells.length ||
-              previous.isEditing != current.isEditing) {
-            return true;
-          }
-
-          // 2. the content of the cells changed
-          return !listEquals(previous.cells, current.cells);
-        },
         builder: (context, state) =>
             PlatformExtension.isMobile ? _mobile(state) : _desktop(state),
       ),

frontend/appflowy_flutter/lib/plugins/database/widgets/card/card_bloc.dart

@@ -1,7 +1,6 @@
 import 'dart:async';
 
 import 'package:appflowy/plugins/database/application/cell/cell_controller.dart';
-import 'package:appflowy/plugins/database/application/defines.dart';
 import 'package:appflowy/plugins/database/application/field/field_controller.dart';
 import 'package:appflowy/plugins/database/application/row/row_cache.dart';
 import 'package:appflowy/plugins/database/application/row/row_listener.dart';
@@ -103,16 +102,16 @@ class CardBloc extends Bloc<CardEvent, CardState> {
 List<CellContext> _makeCells(
   FieldController fieldController,
   String? groupFieldId,
-  CellContextByFieldId cellMap,
+  List<CellContext> cellContexts,
 ) {
   // Only show the non-hidden cells and cells that aren't of the grouping field
-  cellMap.removeWhere((_, cellContext) {
+  cellContexts.removeWhere((cellContext) {
     final fieldInfo = fieldController.getField(cellContext.fieldId);
     return fieldInfo == null ||
         !fieldInfo.fieldSettings!.visibility.isVisibleState() ||
         (groupFieldId != null && cellContext.fieldId == groupFieldId);
   });
-  return cellMap.values.toList();
+  return cellContexts.toList();
 }
 
 @freezed

frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/select_option_cell/select_option_editor_bloc.dart

@@ -1,6 +1,7 @@
 import 'dart:async';
 
 import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';
+import 'package:appflowy/plugins/database/application/cell/select_option_cell_service.dart';
 import 'package:appflowy_backend/log.dart';
 import 'package:appflowy_backend/protobuf/flowy-database2/select_option.pb.dart';
 import 'package:dartz/dartz.dart';
@@ -8,8 +9,6 @@ import 'package:flutter/widgets.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 
-import '../../../../application/cell/select_option_cell_service.dart';
-
 part 'select_option_editor_bloc.freezed.dart';
 
 class SelectOptionCellEditorBloc
@@ -29,47 +28,47 @@ class SelectOptionCellEditorBloc
         super(SelectOptionEditorState.initial(cellController)) {
     on<SelectOptionEditorEvent>(
       (event, emit) async {
-        await event.map(
+        await event.when(
-          initial: (_Initial value) async {
+          initial: () async {
             _startListening();
             await _loadOptions();
           },
-          didReceiveOptions: (_DidReceiveOptions value) {
+          didReceiveOptions: (options, selectedOptions) {
-            final result = _makeOptions(state.filter, value.options);
+            final result = _makeOptions(state.filter, options);
             emit(
               state.copyWith(
-                allOptions: value.options,
+                allOptions: options,
                 options: result.options,
                 createOption: result.createOption,
-                selectedOptions: value.selectedOptions,
+                selectedOptions: selectedOptions,
               ),
             );
           },
-          newOption: (_NewOption value) async {
+          newOption: (optionName) async {
-            await _createOption(value.optionName);
+            await _createOption(optionName);
             emit(
               state.copyWith(
                 filter: none(),
               ),
             );
           },
-          deleteOption: (_DeleteOption value) async {
+          deleteOption: (option) async {
-            await _deleteOption([value.option]);
+            await _deleteOption([option]);
           },
-          deleteAllOptions: (_DeleteAllOptions value) async {
+          deleteAllOptions: () async {
             if (state.allOptions.isNotEmpty) {
               await _deleteOption(state.allOptions);
             }
           },
-          updateOption: (_UpdateOption value) async {
+          updateOption: (option) async {
-            await _updateOption(value.option);
+            await _updateOption(option);
           },
-          selectOption: (_SelectOption value) async {
+          selectOption: (optionId) async {
-            await _selectOptionService.select(optionIds: [value.optionId]);
+            await _selectOptionService.select(optionIds: [optionId]);
             final selectedOption = [
               ...state.selectedOptions,
               state.options.firstWhere(
-                (element) => element.id == value.optionId,
+                (element) => element.id == optionId,
               ),
             ];
             emit(
@@ -78,27 +77,27 @@ class SelectOptionCellEditorBloc
               ),
             );
           },
-          unSelectOption: (_UnSelectOption value) async {
+          unSelectOption: (optionId) async {
-            await _selectOptionService.unSelect(optionIds: [value.optionId]);
+            await _selectOptionService.unSelect(optionIds: [optionId]);
             final selectedOptions = [...state.selectedOptions]
-              ..removeWhere((e) => e.id == value.optionId);
+              ..removeWhere((e) => e.id == optionId);
             emit(
               state.copyWith(
                 selectedOptions: selectedOptions,
               ),
             );
           },
-          trySelectOption: (_TrySelectOption value) {
+          trySelectOption: (optionName) {
-            _trySelectOption(value.optionName, emit);
+            _trySelectOption(optionName, emit);
           },
-          selectMultipleOptions: (_SelectMultipleOptions value) {
+          selectMultipleOptions: (optionNames, remainder) {
-            if (value.optionNames.isNotEmpty) {
+            if (optionNames.isNotEmpty) {
-              _selectMultipleOptions(value.optionNames);
+              _selectMultipleOptions(optionNames);
             }
-            _filterOption(value.remainder, emit);
+            _filterOption(remainder, emit);
           },
-          filterOption: (_SelectOptionFilter value) {
+          filterOption: (optionName) {
-            _filterOption(value.optionName, emit);
+            _filterOption(optionName, emit);
           },
         );
       },