Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.
Dart blogconfluence-alternativecontent-managementcontent-servicesdocumentationflutternote-takingnotion-alternativeproject-managementtask-managementteam-collaborationwiki
refactor: database cell controller and builder (#4398)
Richard Shiuea1abcd7626b4
diff --git a/frontend/appflowy_flutter/analysis_options.yaml b/frontend/appflowy_flutter/analysis_options.yamlindex ef7374f24a..03997a9e3c 100644--- a/frontend/appflowy_flutter/analysis_options.yaml+++ b/frontend/appflowy_flutter/analysis_options.yaml@@ -30,6 +30,7 @@ linter:rules:- require_trailing_commas+ - prefer_collection_literals- prefer_final_fields- prefer_final_in_for_each- prefer_final_localsdiff --git a/frontend/appflowy_flutter/integration_test/board/board_add_row_test.dart b/frontend/appflowy_flutter/integration_test/board/board_add_row_test.dartindex 0aabb61e4f..e6e098f000 100644--- a/frontend/appflowy_flutter/integration_test/board/board_add_row_test.dart+++ b/frontend/appflowy_flutter/integration_test/board/board_add_row_test.dart@@ -3,7 +3,6 @@ import 'package:appflowy/plugins/database/board/presentation/widgets/board_columimport 'package:appflowy/plugins/database/widgets/card/container/card_container.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:appflowy_board/appflowy_board.dart';-import 'package:flowy_infra_ui/style_widget/text.dart';import 'package:flutter/material.dart';import 'package:flutter_test/flutter_test.dart';import 'package:integration_test/integration_test.dart';@@ -25,11 +24,11 @@ void main() {final findFirstCard = find.descendant(of: find.byType(AppFlowyGroupCard),- matching: find.byType(FlowyText),+ matching: find.byType(Text),);- FlowyText firstCardText = tester.firstWidget(findFirstCard);- expect(firstCardText.text, defaultFirstCardName);+ Text firstCardText = tester.firstWidget(findFirstCard);+ expect(firstCardText.data, defaultFirstCardName);await tester.tap(find@@ -51,13 +50,13 @@ void main() {),newCardName,);- await tester.pumpAndSettle();+ await tester.pumpAndSettle(const Duration(milliseconds: 500));await tester.tap(find.byType(AppFlowyBoard));await tester.pumpAndSettle();firstCardText = tester.firstWidget(findFirstCard);- expect(firstCardText.text, newCardName);+ expect(firstCardText.data, newCardName);});testWidgets('from footer', (tester) async {@@ -68,12 +67,11 @@ void main() {final findLastCard = find.descendant(of: find.byType(AppFlowyGroupCard),- matching: find.byType(FlowyText),+ matching: find.byType(Text),);- FlowyText? lastCardText =- tester.widgetList(findLastCard).last as FlowyText;- expect(lastCardText.text, defaultLastCardName);+ Text? lastCardText = tester.widgetList(findLastCard).last as Text;+ expect(lastCardText.data, defaultLastCardName);await tester.tap(find@@ -93,13 +91,13 @@ void main() {),newCardName,);- await tester.pumpAndSettle();+ await tester.pumpAndSettle(const Duration(milliseconds: 500));await tester.tap(find.byType(AppFlowyBoard));await tester.pumpAndSettle();- lastCardText = tester.widgetList(findLastCard).last as FlowyText;- expect(lastCardText.text, newCardName);+ lastCardText = tester.widgetList(findLastCard).last as Text;+ expect(lastCardText.data, newCardName);});});}diff --git a/frontend/appflowy_flutter/integration_test/board/board_group_test.dart b/frontend/appflowy_flutter/integration_test/board/board_group_test.dartindex 3774f76fc3..b7d411b048 100644--- a/frontend/appflowy_flutter/integration_test/board/board_group_test.dart+++ b/frontend/appflowy_flutter/integration_test/board/board_group_test.dart@@ -1,7 +1,7 @@import 'package:appflowy/plugins/database/widgets/row/cells/select_option_cell/extension.dart';import 'package:appflowy/plugins/database/widgets/row/row_property.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';-import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flutter/widgets.dart';import 'package:flutter_test/flutter_test.dart';import 'package:integration_test/integration_test.dart';import 'package:appflowy_board/appflowy_board.dart';@@ -19,10 +19,10 @@ void main() {await tester.createNewPageWithNameUnderParent(layout: ViewLayoutPB.Board);final card1 = find.ancestor(- of: find.findTextInFlowyText(card1Name),+ of: find.text(card1Name),matching: find.byType(AppFlowyGroupCard),);- final doingGroup = find.findTextInFlowyText('Doing');+ final doingGroup = find.text('Doing');final doingGroupCenter = tester.getCenter(doingGroup);final card1Center = tester.getCenter(card1);@@ -39,11 +39,11 @@ void main() {of: find.byType(RowPropertyList),matching: find.descendant(of: find.byType(SelectOptionTag),- matching: find.byType(FlowyText),+ matching: find.byType(Text),),);expect(card1StatusFinder, findsNWidgets(1));- final card1StatusText = tester.widget<FlowyText>(card1StatusFinder).text;+ final card1StatusText = tester.widget<Text>(card1StatusFinder).data;expect(card1StatusText, 'Doing');});});diff --git a/frontend/appflowy_flutter/integration_test/board/board_row_test.dart b/frontend/appflowy_flutter/integration_test/board/board_row_test.dartindex 388ab6919e..fae4e53482 100644--- a/frontend/appflowy_flutter/integration_test/board/board_row_test.dart+++ b/frontend/appflowy_flutter/integration_test/board/board_row_test.dart@@ -20,16 +20,16 @@ void main() {await tester.createNewPageWithNameUnderParent(layout: ViewLayoutPB.Board);const name = 'Card 1';- final card1 = find.findTextInFlowyText(name);+ final card1 = find.text(name);await tester.hoverOnWidget(card1,onHover: () async {- final moreOption = find.byType(CardMoreOption);+ final moreOption = find.byType(MoreCardOptionsAccessory);await tester.tapButton(moreOption);},);await tester.tapButtonWithName(LocaleKeys.button_delete.tr());- expect(find.findTextInFlowyText(name), findsNothing);+ expect(find.text(name), findsNothing);});testWidgets('duplicate item in ToDo card', (tester) async {@@ -38,11 +38,11 @@ void main() {await tester.createNewPageWithNameUnderParent(layout: ViewLayoutPB.Board);const name = 'Card 1';- final card1 = find.findTextInFlowyText(name);+ final card1 = find.text(name);await tester.hoverOnWidget(card1,onHover: () async {- final moreOption = find.byType(CardMoreOption);+ final moreOption = find.byType(MoreCardOptionsAccessory);await tester.tapButton(moreOption);},);diff --git a/frontend/appflowy_flutter/integration_test/database/database_cell_test.dart b/frontend/appflowy_flutter/integration_test/database/database_cell_test.dartindex 8887ed0a80..fbb8274390 100644--- a/frontend/appflowy_flutter/integration_test/database/database_cell_test.dart+++ b/frontend/appflowy_flutter/integration_test/database/database_cell_test.dart@@ -216,13 +216,13 @@ void main() {await tester.dismissCellEditor();- await tester.assertDateCellInGrid(+ tester.assertCellContent(rowIndex: 0,+ fieldType: FieldType.DateTime,content: DateFormat('MMM dd, y').format(today),);await tester.tapCellInGrid(rowIndex: 0, fieldType: fieldType);- await tester.findDateEditor(findsOneWidget);// Toggle include timefinal now = DateTime.now();@@ -230,8 +230,9 @@ void main() {await tester.dismissCellEditor();- await tester.assertDateCellInGrid(+ tester.assertCellContent(rowIndex: 0,+ fieldType: FieldType.DateTime,content: DateFormat('MMM dd, y HH:mm').format(now),);@@ -239,12 +240,14 @@ void main() {await tester.findDateEditor(findsOneWidget);// Change date format+ await tester.tapChangeDateTimeFormatButton();await tester.changeDateFormat();await tester.dismissCellEditor();- await tester.assertDateCellInGrid(+ tester.assertCellContent(rowIndex: 0,+ fieldType: FieldType.DateTime,content: DateFormat('dd/MM/y HH:mm').format(now),);@@ -252,12 +255,14 @@ void main() {await tester.findDateEditor(findsOneWidget);// Change time format+ await tester.tapChangeDateTimeFormatButton();await tester.changeTimeFormat();await tester.dismissCellEditor();- await tester.assertDateCellInGrid(+ tester.assertCellContent(rowIndex: 0,+ fieldType: FieldType.DateTime,content: DateFormat('dd/MM/y hh:mm a').format(now),);@@ -267,8 +272,9 @@ void main() {// Clear the date and timeawait tester.clearDate();- await tester.assertDateCellInGrid(+ tester.assertCellContent(rowIndex: 0,+ fieldType: FieldType.DateTime,content: '',);diff --git a/frontend/appflowy_flutter/integration_test/database/database_field_test.dart b/frontend/appflowy_flutter/integration_test/database/database_field_test.dartindex d4f7d1ffff..8c51a8b663 100644--- a/frontend/appflowy_flutter/integration_test/database/database_field_test.dart+++ b/frontend/appflowy_flutter/integration_test/database/database_field_test.dart@@ -1,10 +1,12 @@import 'package:appflowy/plugins/database/grid/presentation/grid_page.dart';import 'package:appflowy/plugins/database/grid/presentation/widgets/header/type_option/select/select_option.dart';+import 'package:appflowy/util/field_type_extension.dart';import 'package:appflowy_backend/protobuf/flowy-database2/field_entities.pbenum.dart';import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';import 'package:flutter/material.dart';import 'package:flutter_test/flutter_test.dart';import 'package:integration_test/integration_test.dart';+import 'package:intl/intl.dart';import '../util/database_test_op.dart';import '../util/util.dart';@@ -21,7 +23,7 @@ void main() {// Invoke the field editorawait tester.tapGridFieldWithName('Name');- await tester.tapEditPropertyButton();+ await tester.tapEditFieldButton();await tester.renameField('hello world');await tester.dismissFieldEditor();@@ -38,9 +40,9 @@ void main() {// Invoke the field editorawait tester.tapGridFieldWithName('Type');- await tester.tapEditPropertyButton();+ await tester.tapEditFieldButton();- await tester.tapTypeOptionButton();+ await tester.tapSwitchFieldTypeButton();await tester.selectFieldType(FieldType.Checkbox);await tester.dismissFieldEditor();@@ -139,7 +141,7 @@ void main() {await tester.tapNewPropertyButton();// Open the type option menu- await tester.tapTypeOptionButton();+ await tester.tapSwitchFieldTypeButton();await tester.selectFieldType(FieldType.Checklist);@@ -170,7 +172,7 @@ void main() {await tester.renameField(fieldType.name);// Open the type option menu- await tester.tapTypeOptionButton();+ await tester.tapSwitchFieldTypeButton();await tester.selectFieldType(fieldType);await tester.dismissFieldEditor();@@ -181,6 +183,84 @@ void main() {}});+ testWidgets('field types with empty type option editor', (tester) async {+ await tester.initializeAppFlowy();+ await tester.tapGoButton();++ await tester.createNewPageWithNameUnderParent(layout: ViewLayoutPB.Grid);++ for (final fieldType in [+ FieldType.RichText,+ FieldType.Checkbox,+ FieldType.Checklist,+ FieldType.URL,+ ]) {+ // create the field+ await tester.scrollToRight(find.byType(GridPage));+ await tester.tapNewPropertyButton();+ await tester.renameField(fieldType.i18n);++ // change field type+ await tester.tapSwitchFieldTypeButton();+ await tester.selectFieldType(fieldType);+ await tester.dismissFieldEditor();++ // open the field editor+ await tester.tapGridFieldWithName(fieldType.i18n);+ await tester.tapEditFieldButton();++ // check type option editor is empty+ tester.expectEmptyTypeOptionEditor();+ await tester.dismissFieldEditor();+ }+ });++ testWidgets('number field type option', (tester) async {+ await tester.initializeAppFlowy();+ await tester.tapGoButton();++ await tester.createNewPageWithNameUnderParent(layout: ViewLayoutPB.Grid);+ await tester.scrollToRight(find.byType(GridPage));++ // create a number field+ await tester.tapNewPropertyButton();+ await tester.renameField("Number");+ await tester.tapSwitchFieldTypeButton();+ await tester.selectFieldType(FieldType.Number);+ await tester.dismissFieldEditor();++ // enter some data into the first number cell+ await tester.editCell(+ rowIndex: 0,+ fieldType: FieldType.Number,+ input: '123',+ );+ // edit the next cell to force the previous cell at row 0 to lose focus+ await tester.editCell(+ rowIndex: 1,+ fieldType: FieldType.Number,+ input: '0.2',+ );+ tester.assertCellContent(+ rowIndex: 0,+ fieldType: FieldType.Number,+ content: '123',+ );++ // open editor and change number format+ await tester.tapGridFieldWithName('Number');+ await tester.tapEditFieldButton();+ await tester.changeNumberFieldFormat();+ await tester.dismissFieldEditor();++ // assert number format has been changed+ tester.assertCellContent(+ rowIndex: 0,+ fieldType: FieldType.Number,+ content: '\$123',+ );+ });+testWidgets('add option', (tester) async {await tester.initializeAppFlowy();await tester.tapGoButton();@@ -189,9 +269,9 @@ void main() {layout: ViewLayoutPB.Grid,);- // Invoke the field editor+ // invoke the field editorawait tester.tapGridFieldWithName('Type');- await tester.tapEditPropertyButton();+ await tester.tapEditFieldButton();// tap 'add option' buttonawait tester.tapAddSelectOptionButton();@@ -203,10 +283,115 @@ void main() {await tester.enterText(inputField, text);await tester.pumpAndSettle();await tester.testTextInput.receiveAction(TextInputAction.done);- await tester.pumpAndSettle(const Duration(seconds: 1));+ await tester.pumpAndSettle(const Duration(milliseconds: 500));// check the resulttester.expectToSeeText(text);});++ testWidgets('date time field type options', (tester) async {+ await tester.initializeAppFlowy();+ await tester.tapGoButton();++ await tester.createNewPageWithNameUnderParent(layout: ViewLayoutPB.Grid);+ await tester.scrollToRight(find.byType(GridPage));++ // create a date field+ await tester.tapNewPropertyButton();+ await tester.renameField(FieldType.DateTime.i18n);+ await tester.tapSwitchFieldTypeButton();+ await tester.selectFieldType(FieldType.DateTime);+ await tester.dismissFieldEditor();++ // edit the first date cell+ await tester.tapCellInGrid(rowIndex: 0, fieldType: FieldType.DateTime);+ await tester.toggleIncludeTime();+ final now = DateTime.now();+ await tester.selectDay(content: now.day);++ await tester.dismissCellEditor();++ tester.assertCellContent(+ rowIndex: 0,+ fieldType: FieldType.DateTime,+ content: DateFormat('MMM dd, y HH:mm').format(now),+ );++ // open editor and change date & time format+ await tester.tapGridFieldWithName(FieldType.DateTime.i18n);+ await tester.tapEditFieldButton();+ await tester.changeDateFormat();+ await tester.changeTimeFormat();+ await tester.dismissFieldEditor();++ // assert date format has been changed+ tester.assertCellContent(+ rowIndex: 0,+ fieldType: FieldType.DateTime,+ content: DateFormat('dd/MM/y hh:mm a').format(now),+ );+ });++ testWidgets('last modified and created at field type options',+ (tester) async {+ await tester.initializeAppFlowy();+ await tester.tapGoButton();++ await tester.createNewPageWithNameUnderParent(layout: ViewLayoutPB.Grid);+ final created = DateTime.now();++ // create a created at field+ await tester.tapNewPropertyButton();+ await tester.renameField(FieldType.CreatedTime.i18n);+ await tester.tapSwitchFieldTypeButton();+ await tester.selectFieldType(FieldType.CreatedTime);+ await tester.dismissFieldEditor();++ // create a last modified field+ await tester.tapNewPropertyButton();+ await tester.renameField(FieldType.LastEditedTime.i18n);+ await tester.tapSwitchFieldTypeButton();+ await tester.selectFieldType(FieldType.LastEditedTime);+ await tester.dismissFieldEditor();++ final modified = DateTime.now();++ tester.assertCellContent(+ rowIndex: 0,+ fieldType: FieldType.CreatedTime,+ content: DateFormat('MMM dd, y HH:mm').format(created),+ );+ tester.assertCellContent(+ rowIndex: 0,+ fieldType: FieldType.LastEditedTime,+ content: DateFormat('MMM dd, y HH:mm').format(modified),+ );++ // open field editor and change date & time format+ await tester.tapGridFieldWithName(FieldType.LastEditedTime.i18n);+ await tester.tapEditFieldButton();+ await tester.changeDateFormat();+ await tester.changeTimeFormat();+ await tester.dismissFieldEditor();++ // open field editor and change date & time format+ await tester.tapGridFieldWithName(FieldType.CreatedTime.i18n);+ await tester.tapEditFieldButton();+ await tester.changeDateFormat();+ await tester.changeTimeFormat();+ await tester.dismissFieldEditor();++ // assert format has been changed+ tester.assertCellContent(+ rowIndex: 0,+ fieldType: FieldType.CreatedTime,+ content: DateFormat('dd/MM/y hh:mm a').format(created),+ );+ tester.assertCellContent(+ rowIndex: 0,+ fieldType: FieldType.LastEditedTime,+ content: DateFormat('dd/MM/y hh:mm a').format(modified),+ );+ });});}diff --git a/frontend/appflowy_flutter/integration_test/database/database_reminder_test.dart b/frontend/appflowy_flutter/integration_test/database/database_reminder_test.dartindex dde29a8e4e..4fdfec6cbf 100644--- a/frontend/appflowy_flutter/integration_test/database/database_reminder_test.dart+++ b/frontend/appflowy_flutter/integration_test/database/database_reminder_test.dart@@ -20,10 +20,10 @@ void main() {// Invoke the field editorawait tester.tapGridFieldWithName('Type');- await tester.tapEditPropertyButton();+ await tester.tapEditFieldButton();// Change to date type- await tester.tapTypeOptionButton();+ await tester.tapSwitchFieldTypeButton();await tester.selectFieldType(FieldType.DateTime);await tester.dismissFieldEditor();@@ -68,10 +68,10 @@ void main() {// Invoke the field editorawait tester.tapGridFieldWithName('Type');- await tester.tapEditPropertyButton();+ await tester.tapEditFieldButton();// Change to date type- await tester.tapTypeOptionButton();+ await tester.tapSwitchFieldTypeButton();await tester.selectFieldType(FieldType.DateTime);await tester.dismissFieldEditor();diff --git a/frontend/appflowy_flutter/integration_test/database/database_row_page_test.dart b/frontend/appflowy_flutter/integration_test/database/database_row_page_test.dartindex 4d04527826..6bc5da5c5f 100644--- a/frontend/appflowy_flutter/integration_test/database/database_row_page_test.dart+++ b/frontend/appflowy_flutter/integration_test/database/database_row_page_test.dart@@ -14,8 +14,8 @@ import '../util/util.dart';void main() {IntegrationTestWidgetsFlutterBinding.ensureInitialized();- group('grid', () {- testWidgets('row details page opens', (tester) async {+ group('grid row detail page:', () {+ testWidgets('opens', (tester) async {await tester.initializeAppFlowy();await tester.tapGoButton();@@ -27,9 +27,12 @@ void main() {// Make sure that the row page is openedtester.assertRowDetailPageOpened();++ // Each row detail page should have a document+ await tester.assertDocumentExistInRowDetailPage();});- testWidgets('insert emoji in the row detail page', (tester) async {+ testWidgets('add emoji', (tester) async {await tester.initializeAppFlowy();await tester.tapGoButton();@@ -48,7 +51,7 @@ void main() {await tester.tapButton(find.byType(EmojiButton));});- testWidgets('update emoji in the row detail page', (tester) async {+ testWidgets('update emoji', (tester) async {await tester.initializeAppFlowy();await tester.tapGoButton();@@ -75,7 +78,7 @@ void main() {expect(emojiText, findsNWidgets(2));});- testWidgets('remove emoji in the row detail page', (tester) async {+ testWidgets('remove emoji', (tester) async {await tester.initializeAppFlowy();await tester.tapGoButton();@@ -96,7 +99,7 @@ void main() {expect(emojiText, findsNothing);});- testWidgets('create list of fields in row detail page', (tester) async {+ testWidgets('create list of fields', (tester) async {await tester.initializeAppFlowy();await tester.tapGoButton();@@ -120,7 +123,7 @@ void main() {await tester.renameField(fieldType.name);// Open the type option menu- await tester.tapTypeOptionButton();+ await tester.tapSwitchFieldTypeButton();await tester.selectFieldType(fieldType);@@ -211,20 +214,6 @@ void main() {tester.assertToggleShowHiddenFieldsVisibility(false);});- testWidgets('check document exists in row detail page', (tester) async {- await tester.initializeAppFlowy();- await tester.tapGoButton();-- // Create a new grid- await tester.createNewPageWithNameUnderParent(layout: ViewLayoutPB.Grid);-- // Hover first row and then open the row page- await tester.openFirstRowDetailPage();-- // Each row detail page should have a document- await tester.assertDocumentExistInRowDetailPage();- });-testWidgets('update the contents of the document and re-open it',(tester) async {await tester.initializeAppFlowy();@@ -305,7 +294,7 @@ void main() {expect(tester.takeException(), isNull);});- testWidgets('delete row in row detail page', (tester) async {+ testWidgets('delete row', (tester) async {await tester.initializeAppFlowy();await tester.tapGoButton();@@ -322,7 +311,7 @@ void main() {await tester.assertNumberOfRowsInGridPage(2);});- testWidgets('duplicate row in row detail page', (tester) async {+ testWidgets('duplicate row', (tester) async {await tester.initializeAppFlowy();await tester.tapGoButton();diff --git a/frontend/appflowy_flutter/integration_test/database/database_share_test.dart b/frontend/appflowy_flutter/integration_test/database/database_share_test.dartindex 134565131a..f756728725 100644--- a/frontend/appflowy_flutter/integration_test/database/database_share_test.dart+++ b/frontend/appflowy_flutter/integration_test/database/database_share_test.dart@@ -155,8 +155,9 @@ void main() {'',];for (final (index, content) in dateCells.indexed) {- await tester.assertDateCellInGrid(+ tester.assertCellContent(rowIndex: index,+ fieldType: FieldType.DateTime,content: content,);}diff --git a/frontend/appflowy_flutter/integration_test/document/document_with_database_test.dart b/frontend/appflowy_flutter/integration_test/document/document_with_database_test.dartindex da2f081d97..d01ead126f 100644--- a/frontend/appflowy_flutter/integration_test/document/document_with_database_test.dart+++ b/frontend/appflowy_flutter/integration_test/document/document_with_database_test.dart@@ -1,9 +1,9 @@import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/database/widgets/cell/editable_cell_skeleton/text.dart';import 'package:appflowy/plugins/inline_actions/widgets/inline_actions_handler.dart';import 'package:appflowy/plugins/database/board/presentation/board_page.dart';import 'package:appflowy/plugins/database/calendar/presentation/calendar_page.dart';import 'package:appflowy/plugins/database/grid/presentation/grid_page.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/text_cell/text_cell.dart';import 'package:appflowy/workspace/presentation/home/menu/view/view_item.dart';import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';import 'package:appflowy_editor/appflowy_editor.dart';@@ -40,7 +40,7 @@ void main() {Position(path: [1]),),);- final gridTextCell = find.byType(GridTextCell).first;+ final gridTextCell = find.byType(EditableTextCell).first;await tester.tapButton(gridTextCell);expect(tester.editor.getCurrentEditorState().selection, isNull);diff --git a/frontend/appflowy_flutter/integration_test/util/database_test_op.dart b/frontend/appflowy_flutter/integration_test/util/database_test_op.dartindex 1f71e1a17b..1103bc2860 100644--- a/frontend/appflowy_flutter/integration_test/util/database_test_op.dart+++ b/frontend/appflowy_flutter/integration_test/util/database_test_op.dart@@ -1,5 +1,16 @@import 'dart:io';+import 'package:appflowy/plugins/database/grid/presentation/widgets/common/type_option_separator.dart';+import 'package:appflowy/plugins/database/grid/presentation/widgets/header/type_option/number.dart';+import 'package:appflowy/plugins/database/widgets/cell/editable_cell_skeleton/checkbox.dart';+import 'package:appflowy/plugins/database/widgets/cell/editable_cell_skeleton/checklist.dart';+import 'package:appflowy/plugins/database/widgets/cell/editable_cell_skeleton/date.dart';+import 'package:appflowy/plugins/database/widgets/cell/editable_cell_skeleton/number.dart';+import 'package:appflowy/plugins/database/widgets/cell/editable_cell_skeleton/select_option.dart';+import 'package:appflowy/plugins/database/widgets/cell/editable_cell_skeleton/text.dart';+import 'package:appflowy/plugins/database/widgets/cell/editable_cell_skeleton/timestamp.dart';+import 'package:appflowy/plugins/database/widgets/cell/editable_cell_skeleton/url.dart';+import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';import 'package:flutter/gestures.dart';import 'package:flutter/material.dart';import 'package:flutter/services.dart';@@ -40,7 +51,6 @@ import 'package:appflowy/plugins/database/tab_bar/desktop/tab_bar_add_button.darimport 'package:appflowy/plugins/database/tab_bar/desktop/tab_bar_header.dart';import 'package:appflowy/plugins/database/widgets/database_layout_ext.dart';import 'package:appflowy/plugins/database/widgets/row/accessory/cell_accessory.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/cells.dart';import 'package:appflowy/plugins/database/widgets/row/cells/checklist_cell/checklist_cell_editor.dart';import 'package:appflowy/plugins/database/widgets/row/cells/checklist_cell/checklist_progress_bar.dart';import 'package:appflowy/plugins/database/widgets/row/cells/date_cell/date_editor.dart';@@ -64,8 +74,6 @@ import 'package:appflowy/workspace/presentation/widgets/date_picker/widgets/remiimport 'package:appflowy/workspace/presentation/widgets/dialogs.dart';import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';import 'package:appflowy/workspace/presentation/widgets/toggle/toggle.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/field_entities.pbenum.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/setting_entities.pbenum.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:appflowy_board/appflowy_board.dart';import 'package:calendar_view/calendar_view.dart';@@ -142,7 +150,6 @@ extension AppFlowyDatabaseTest on WidgetTester {await pumpAndSettle();}- ///Finder cellFinder(int rowIndex, FieldType fieldType, {int cellIndex = 0}) {final findRow = find.byType(GridRow, skipOffstage: false);final findCell = finderForFieldType(fieldType);@@ -174,10 +181,14 @@ extension AppFlowyDatabaseTest on WidgetTester {required bool isSelected,}) async {final cell = cellFinder(rowIndex, FieldType.Checkbox);- var finder = find.byType(CheckboxCellUncheck);- if (isSelected) {- finder = find.byType(CheckboxCellCheck);- }+ final finder = isSelected+ ? find.byWidgetPredicate(+ (widget) =>+ widget is FlowySvg && widget.svg == FlowySvgs.check_filled_s,+ )+ : find.byWidgetPredicate(+ (widget) => widget is FlowySvg && widget.svg == FlowySvgs.uncheck_s,+ );expect(find.descendant(@@ -210,14 +221,7 @@ extension AppFlowyDatabaseTest on WidgetTester {matching: find.text(content),skipOffstage: false,);-- final text = find.descendant(- of: find.byType(TextField),- matching: findContent,- skipOffstage: false,- );-- expect(text, findsOneWidget);+ expect(findContent, findsOneWidget);}Future<void> assertSingleSelectOption({@@ -275,44 +279,14 @@ extension AppFlowyDatabaseTest on WidgetTester {final finder = find.descendant(of: findCell,matching: find.byWidgetPredicate(- (widget) {- if (widget is ChecklistProgressBar) {- return widget.percent == percent;- }- return false;- },+ (widget) =>+ widget is ChecklistProgressBar && widget.percent == percent,),);expect(finder, findsOneWidget);}}- Future<void> assertDateCellInGrid({- required int rowIndex,- required String content,- }) async {- final findRow = find.byType(GridRow, skipOffstage: false);- final findCell = find.descendant(- of: findRow.at(rowIndex),- matching: find.byType(GridDateCell),- skipOffstage: false,- );-- final text = find.descendant(- of: findCell,- matching: find.byWidgetPredicate(- (widget) {- if (widget is FlowyText) {- return widget.text == content;- }- return false;- },- ),- skipOffstage: false,- );- expect(text, findsOneWidget);- }-Future<void> selectDay({required int content,}) async {@@ -374,15 +348,11 @@ extension AppFlowyDatabaseTest on WidgetTester {await tapButton(finder);}- Future<void> changeDateFormat() async {- final findDateEditor = find.byType(DateCellEditor);- final findDateTimeOptionButton = find.byType(DateTypeOptionButton);- final finder = find.descendant(- of: findDateEditor,- matching: findDateTimeOptionButton,- );- await tapButton(finder);+ Future<void> tapChangeDateTimeFormatButton() async {+ await tapButton(find.byType(DateTypeOptionButton));+ }+ Future<void> changeDateFormat() async {final findDateFormatButton = find.byType(DateFormatButton);await tapButton(findDateFormatButton);@@ -391,14 +361,6 @@ extension AppFlowyDatabaseTest on WidgetTester {}Future<void> changeTimeFormat() async {- final findDateEditor = find.byType(DateCellEditor);- final findDateTimeOptionButton = find.byType(DateTypeOptionButton);- final finder = find.descendant(- of: findDateEditor,- matching: findDateTimeOptionButton,- );- await tapButton(finder);-final findDateFormatButton = find.byType(TimeFormatButton);await tapButton(findDateFormatButton);@@ -512,7 +474,7 @@ extension AppFlowyDatabaseTest on WidgetTester {}void assertChecklistEditorVisible({required bool visible}) {- final editor = find.byType(GridChecklistCellEditor);+ final editor = find.byType(ChecklistCellEditor);if (visible) {expect(editor, findsOneWidget);} else {@@ -625,7 +587,7 @@ extension AppFlowyDatabaseTest on WidgetTester {}Future<void> editTitleInRowDetailPage(String title) async {- final titleField = find.byType(GridTextCell);+ final titleField = find.byType(EditableTextCell);await enterText(titleField, title);await pumpAndSettle();}@@ -643,11 +605,11 @@ extension AppFlowyDatabaseTest on WidgetTester {}Future<void> openEmojiPicker() async {- await tapButton(find.byType(EmojiPickerButton));+ await tapButton(find.byType(AddEmojiButton));}Future<void> tapDateCellInRowDetailPage() async {- final findDateCell = find.byType(GridDateCell);+ final findDateCell = find.byType(EditableDateCell);await tapButton(findDateCell);}@@ -738,7 +700,7 @@ extension AppFlowyDatabaseTest on WidgetTester {Future<void> scrollToRight(Finder find) async {final size = getSize(find);- await drag(find, Offset(-size.width, 0));+ await drag(find, Offset(-size.width, 0), warnIfMissed: false);await pumpAndSettle(const Duration(milliseconds: 500));}@@ -756,7 +718,7 @@ extension AppFlowyDatabaseTest on WidgetTester {}/// Should call [tapGridFieldWithName] first.- Future<void> tapEditPropertyButton() async {+ Future<void> tapEditFieldButton() async {await tapButtonWithName(LocaleKeys.grid_field_editProperty.tr());await pumpAndSettle(const Duration(milliseconds: 200));}@@ -770,7 +732,7 @@ extension AppFlowyDatabaseTest on WidgetTester {await tapButton(field);}- /// Should call [tapGridFieldWithName] first.+ /// A SimpleDialog must be shown first, e.g. when deleting a field.Future<void> tapDialogOkButton() async {final field = find.byWidgetPredicate((widget) =>@@ -838,7 +800,7 @@ extension AppFlowyDatabaseTest on WidgetTester {await tapButton(find.byType(RowDetailPageDuplicateButton));}- Future<void> tapTypeOptionButton() async {+ Future<void> tapSwitchFieldTypeButton() async {await tapButton(find.byType(SwitchFieldButton));}@@ -846,7 +808,7 @@ extension AppFlowyDatabaseTest on WidgetTester {await sendKeyEvent(LogicalKeyboardKey.escape);}- /// Must call [tapTypeOptionButton] first.+ /// Must call [tapSwitchFieldTypeButton] first.Future<void> selectFieldType(FieldType fieldType) async {final fieldTypeCell = find.byType(FieldTypeCell);final fieldTypeButton = find.descendant(@@ -858,6 +820,17 @@ extension AppFlowyDatabaseTest on WidgetTester {await tapButton(fieldTypeButton);}+ // Use in edit mode of FieldEditor+ void expectEmptyTypeOptionEditor() {+ expect(+ find.descendant(+ of: find.byType(FieldTypeOptionEditor),+ matching: find.byType(TypeOptionSeparator),+ ),+ findsNothing,+ );+ }+/// Each field has its own cell, so we can find the corresponding cell by/// the field type after create a new field.Future<void> findCellByFieldType(FieldType fieldType) async {@@ -979,7 +952,7 @@ extension AppFlowyDatabaseTest on WidgetTester {await scrollToRight(find.byType(GridPage));await tapNewPropertyButton();await renameField(name);- await tapTypeOptionButton();+ await tapSwitchFieldTypeButton();await selectFieldType(fieldType);await dismissFieldEditor();}@@ -1407,7 +1380,7 @@ extension AppFlowyDatabaseTest on WidgetTester {Future<void> dragDropRescheduleCalendarEvent() async {final findEventCard = find.byType(EventCard);await drag(findEventCard.first, const Offset(0, 300));- await pumpAndSettle();+ await pumpAndSettle(const Duration(microseconds: 300));}Future<void> openUnscheduledEventsPopup() async {@@ -1624,6 +1597,23 @@ extension AppFlowyDatabaseTest on WidgetTester {await tapButtonWithName(LocaleKeys.importPanel_database.tr());}+ // Use in edit mode of FieldEditor+ Future<void> changeNumberFieldFormat() async {+ final changeFormatButton = find.descendant(+ of: find.byType(FieldTypeOptionEditor),+ matching: find.text("Number"),+ );+ await tapButton(changeFormatButton);++ await tapButton(+ find.byWidgetPredicate(+ (widget) =>+ widget is NumberFormatCell && widget.format == NumberFormatPB.USD,+ ),+ );+ }++ // Use in edit mode of FieldEditorFuture<void> tapAddSelectOptionButton() async {await tapButtonWithName(LocaleKeys.grid_field_addSelectOption.tr());}@@ -1657,24 +1647,45 @@ Finder finderForDatabaseLayoutType(DatabaseLayoutPB layout) {Finder finderForFieldType(FieldType fieldType) {switch (fieldType) {case FieldType.Checkbox:- return find.byType(GridCheckboxCell, skipOffstage: false);+ return find.byType(EditableCheckboxCell, skipOffstage: false);case FieldType.DateTime:- return find.byType(GridDateCell, skipOffstage: false);+ return find.byType(EditableDateCell, skipOffstage: false);case FieldType.LastEditedTime:+ return find.byWidgetPredicate(+ (widget) =>+ widget is EditableTimestampCell &&+ widget.fieldType == FieldType.LastEditedTime,+ skipOffstage: false,+ );case FieldType.CreatedTime:- return find.byType(GridTimestampCell, skipOffstage: false);+ return find.byWidgetPredicate(+ (widget) =>+ widget is EditableTimestampCell &&+ widget.fieldType == FieldType.CreatedTime,+ skipOffstage: false,+ );case FieldType.SingleSelect:- return find.byType(GridSingleSelectCell, skipOffstage: false);+ return find.byWidgetPredicate(+ (widget) =>+ widget is EditableSelectOptionCell &&+ widget.fieldType == FieldType.SingleSelect,+ skipOffstage: false,+ );case FieldType.MultiSelect:- return find.byType(GridMultiSelectCell, skipOffstage: false);+ return find.byWidgetPredicate(+ (widget) =>+ widget is EditableSelectOptionCell &&+ widget.fieldType == FieldType.MultiSelect,+ skipOffstage: false,+ );case FieldType.Checklist:- return find.byType(GridChecklistCell, skipOffstage: false);+ return find.byType(EditableChecklistCell, skipOffstage: false);case FieldType.Number:- return find.byType(GridNumberCell, skipOffstage: false);+ return find.byType(EditableNumberCell, skipOffstage: false);case FieldType.RichText:- return find.byType(GridTextCell, skipOffstage: false);+ return find.byType(EditableTextCell, skipOffstage: false);case FieldType.URL:- return find.byType(GridURLCell, skipOffstage: false);+ return find.byType(EditableURLCell, skipOffstage: false);default:throw Exception('Unknown field type: $fieldType');}diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/board/mobile_board_content.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/board/mobile_board_content.dartindex 7a7b5bc659..f050945665 100644--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/board/mobile_board_content.dart+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/board/mobile_board_content.dart@@ -6,8 +6,8 @@ import 'package:appflowy/mobile/presentation/database/card/card.dart';import 'package:appflowy/plugins/database/board/application/board_bloc.dart';import 'package:appflowy/plugins/database/grid/presentation/widgets/header/field_type_extension.dart';import 'package:appflowy/plugins/database/widgets/card/card.dart';-import 'package:appflowy/plugins/database/widgets/card/card_cell_builder.dart';-import 'package:appflowy/plugins/database/widgets/card/cells/card_cell.dart';+import 'package:appflowy/plugins/database/widgets/cell/card_cell_builder.dart';+import 'package:appflowy/plugins/database/widgets/cell/card_cell_style_maps/mobile_board_card_cell_style.dart';import 'package:appflowy/workspace/application/settings/appearance/appearance_cubit.dart';import 'package:appflowy_board/appflowy_board.dart';import 'package:easy_localization/easy_localization.dart';@@ -26,28 +26,16 @@ class MobileBoardContent extends StatefulWidget {}class _MobileBoardContentState extends State<MobileBoardContent> {- final renderHook = RowCardRenderHook<String>();late final ScrollController scrollController;late final AppFlowyBoardScrollController scrollManager;@overridevoid initState() {super.initState();- //mobile may not need this- //scroll to bottom when add a new card+ // mobile may not need this+ // scroll to bottom when add a new cardscrollManager = AppFlowyBoardScrollController();scrollController = ScrollController();- renderHook.addSelectOptionHook((options, groupId, _) {- // The cell should hide if the option id is equal to the groupId.- final isInGroup =- options.where((element) => element.id == groupId).isNotEmpty;-- if (isInGroup || options.isEmpty) {- return const SizedBox.shrink();- }-- return null;- });}@override@@ -156,10 +144,10 @@ class _MobileBoardContentState extends State<MobileBoardContent> {/// Return placeholder widget if the rowCache is null.if (rowCache == null) return SizedBox.shrink(key: ObjectKey(groupItem));- final cellCache = rowCache.cellCache;final viewId = boardBloc.viewId;- final cellBuilder = CardCellBuilder<String>(cellCache);+ final cellBuilder =+ CardCellBuilder(databaseController: boardBloc.databaseController);final isEditing = boardBloc.state.isEditingRow &&boardBloc.state.editingRow?.row.id == groupItem.row.id;@@ -169,15 +157,14 @@ class _MobileBoardContentState extends State<MobileBoardContent> {key: ValueKey(groupItemId),margin: cardMargin,decoration: _makeBoxDecoration(context),- child: RowCard<String>(+ child: RowCard(+ fieldController: boardBloc.fieldController,rowMeta: rowMeta,viewId: viewId,rowCache: rowCache,- cardData: groupData.group.groupId,groupingFieldId: groupItem.fieldInfo.id,isEditing: isEditing,cellBuilder: cellBuilder,- renderHook: renderHook,openCard: (context) {context.push(MobileRowDetailPage.routeName,@@ -192,11 +179,9 @@ class _MobileBoardContentState extends State<MobileBoardContent> {.add(BoardEvent.startEditingRow(groupData.group, groupItem.row)),onEndEditing: () =>boardBloc.add(BoardEvent.endEditingRow(groupItem.row.id)),- styleConfiguration: const RowCardStyleConfiguration(+ styleConfiguration: RowCardStyleConfiguration(+ cellStyleMap: mobileBoardCardCellStyleMap(context),showAccessory: false,- hoverStyle: null,- cardPadding: EdgeInsets.all(8),- cellPadding: EdgeInsets.zero,),),);@@ -214,18 +199,15 @@ class _MobileBoardContentState extends State<MobileBoardContent> {),): null,- boxShadow:- // The shadow is only visible in light mode.- themeMode == ThemeMode.light- ? [- BoxShadow(- color:- Theme.of(context).colorScheme.outline.withOpacity(0.5),- blurRadius: 4,- offset: const Offset(0, 2),- ),- ]- : null,+ boxShadow: themeMode == ThemeMode.light+ ? [+ BoxShadow(+ color: Theme.of(context).colorScheme.outline.withOpacity(0.5),+ blurRadius: 4,+ offset: const Offset(0, 2),+ ),+ ]+ : null,);}}diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/board/widgets/mobile_hidden_groups_column.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/board/widgets/mobile_hidden_groups_column.dartindex 29f3e425eb..996ceba8f6 100644--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/board/widgets/mobile_hidden_groups_column.dart+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/board/widgets/mobile_hidden_groups_column.dart@@ -3,12 +3,9 @@ import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/mobile/presentation/database/card/card.dart';import 'package:appflowy/mobile/presentation/widgets/widgets.dart';import 'package:appflowy/plugins/database/application/database_controller.dart';-import 'package:appflowy/plugins/database/application/field/field_info.dart';-import 'package:appflowy/plugins/database/application/row/row_cache.dart';import 'package:appflowy/plugins/database/board/application/board_bloc.dart';-import 'package:appflowy/plugins/database/widgets/card/card_cell_builder.dart';-import 'package:appflowy/plugins/database/widgets/card/cells/card_cell.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/text_cell/text_cell_bloc.dart';+import 'package:appflowy/plugins/database/widgets/cell/card_cell_builder.dart';+import 'package:appflowy/plugins/database/widgets/cell/card_cell_skeleton/text_card_cell.dart';import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';import 'package:collection/collection.dart';import 'package:easy_localization/easy_localization.dart';@@ -107,7 +104,6 @@ class MobileHiddenGroupList extends StatelessWidget {@overrideWidget build(BuildContext context) {- final bloc = context.read<BoardBloc>();return BlocBuilder<BoardBloc, BoardState>(builder: (_, state) => ReorderableListView.builder(itemCount: state.hiddenGroups.length,@@ -115,7 +111,10 @@ class MobileHiddenGroupList extends StatelessWidget {key: ValueKey(state.hiddenGroups[index].groupId),group: state.hiddenGroups[index],index: index,- bloc: bloc,+ ),+ proxyDecorator: (child, index, animation) => BlocProvider.value(+ value: context.read<BoardBloc>(),+ child: Material(color: Colors.transparent, child: child),),physics: const ClampingScrollPhysics(),onReorder: (oldIndex, newIndex) {@@ -124,7 +123,9 @@ class MobileHiddenGroupList extends StatelessWidget {}final fromGroupId = state.hiddenGroups[oldIndex].groupId;final toGroupId = state.hiddenGroups[newIndex].groupId;- bloc.add(BoardEvent.reorderGroup(fromGroupId, toGroupId));+ context+ .read<BoardBloc>()+ .add(BoardEvent.reorderGroup(fromGroupId, toGroupId));},),);@@ -136,181 +137,111 @@ class MobileHiddenGroup extends StatelessWidget {super.key,required this.group,required this.index,- required this.bloc,});final GroupPB group;- final BoardBloc bloc;final int index;@overrideWidget build(BuildContext context) {- final databaseController = bloc.databaseController;+ final databaseController = context.read<BoardBloc>().databaseController;final primaryField = databaseController.fieldController.fieldInfos.firstWhereOrNull((element) => element.isPrimary)!;- return BlocProvider<BoardBloc>.value(- value: bloc,- child: BlocBuilder<BoardBloc, BoardState>(- builder: (context, state) {- final group = state.hiddenGroups.firstWhereOrNull(- (g) => g.groupId == this.group.groupId,- );- if (group == null) {- return const SizedBox.shrink();- }+ return BlocBuilder<BoardBloc, BoardState>(+ builder: (context, state) {+ final group = state.hiddenGroups.firstWhereOrNull(+ (g) => g.groupId == this.group.groupId,+ );+ if (group == null) {+ return const SizedBox.shrink();+ }- return ExpansionTile(- tilePadding: EdgeInsets.zero,- childrenPadding: EdgeInsets.zero,- title: Row(- children: [- Expanded(- child: Text(- group.groupName,- style: Theme.of(context).textTheme.bodyMedium,- maxLines: 2,- overflow: TextOverflow.ellipsis,- ),+ final cells = group.rows.map(+ (item) {+ final cellContext =+ databaseController.rowCache.loadCells(item)[primaryField.id]!;++ return TextButton(+ style: TextButton.styleFrom(+ textStyle: Theme.of(context).textTheme.bodyMedium,+ foregroundColor: Theme.of(context).colorScheme.onBackground,+ visualDensity: VisualDensity.compact,+ ),+ child: CardCellBuilder(+ databaseController:+ context.read<BoardBloc>().databaseController,+ ).build(+ cellContext: cellContext,+ styleMap: {FieldType.RichText: _titleCellStyle(context)},+ hasNotes: !item.isDocumentEmpty,+ ),+ onPressed: () {+ context.push(+ MobileRowDetailPage.routeName,+ extra: {+ MobileRowDetailPage.argRowId: item.id,+ MobileRowDetailPage.argDatabaseController:+ context.read<BoardBloc>().databaseController,+ },+ );+ },+ );+ },+ ).toList();++ return ExpansionTile(+ tilePadding: EdgeInsets.zero,+ childrenPadding: EdgeInsets.zero,+ title: Row(+ children: [+ Expanded(+ child: Text(+ group.groupName,+ style: Theme.of(context).textTheme.bodyMedium,+ maxLines: 2,+ overflow: TextOverflow.ellipsis,),- GestureDetector(- child: const Padding(- padding: EdgeInsets.all(4),- child: FlowySvg(- FlowySvgs.hide_m,- size: Size.square(20),- ),+ ),+ GestureDetector(+ child: const Padding(+ padding: EdgeInsets.all(4),+ child: FlowySvg(+ FlowySvgs.hide_m,+ size: Size.square(20),),- onTap: () => showFlowyMobileConfirmDialog(- context,- title: LocaleKeys.board_mobile_unhideGroup.tr(),- content: LocaleKeys.board_mobile_unhideGroupContent.tr(),- actionButtonTitle: LocaleKeys.button_yes.tr(),- actionButtonColor: Theme.of(context).colorScheme.primary,- onActionButtonPressed: () => context.read<BoardBloc>().add(- BoardEvent.toggleGroupVisibility(- group,- true,- ),+ ),+ onTap: () => showFlowyMobileConfirmDialog(+ context,+ title: LocaleKeys.board_mobile_unhideGroup.tr(),+ content: LocaleKeys.board_mobile_unhideGroupContent.tr(),+ actionButtonTitle: LocaleKeys.button_yes.tr(),+ actionButtonColor: Theme.of(context).colorScheme.primary,+ onActionButtonPressed: () => context.read<BoardBloc>().add(+ BoardEvent.toggleGroupVisibility(+ group,+ true,),- ),+ ),),- ],- ),- children: [- MobileHiddenGroupItemList(- bloc: bloc,- viewId: databaseController.viewId,- groupId: group.groupId,- primaryField: primaryField,- rowCache: databaseController.rowCache,),],- );- },- ),+ ),+ children: cells,+ );+ },);}-}--class MobileHiddenGroupItemList extends StatelessWidget {- const MobileHiddenGroupItemList({- required this.bloc,- required this.groupId,- required this.viewId,- required this.primaryField,- required this.rowCache,- super.key,- });-- final BoardBloc bloc;- final String groupId;- final String viewId;- final FieldInfo primaryField;- final RowCache rowCache;-- @override- Widget build(BuildContext context) {- return BlocProvider.value(- value: bloc,- child: BlocBuilder<BoardBloc, BoardState>(- builder: (context, state) {- final group = state.hiddenGroups.firstWhereOrNull(- (g) => g.groupId == groupId,- );- if (group == null) {- return const SizedBox.shrink();- }-- final cells = <Widget>[- ...group.rows.map(- (item) {- final cellContext = rowCache.loadCells(item)[primaryField.id]!;- final renderHook = RowCardRenderHook<String>();- renderHook.addTextCellHook((cellData, _, __) {- return BlocBuilder<TextCellBloc, TextCellState>(- builder: (context, state) {- final text = cellData.isEmpty- ? LocaleKeys.grid_row_titlePlaceholder.tr()- : cellData;- if (text.isEmpty) {- return const SizedBox.shrink();- }-- return Row(- children: [- if (!cellContext.rowMeta.isDocumentEmpty) ...[- const FlowySvg(FlowySvgs.notes_s),- const HSpace(4),- ],- Expanded(- child: Text(- text,- maxLines: 2,- overflow: TextOverflow.ellipsis,- ),- ),- ],- );- },- );- });-- return TextButton(- style: TextButton.styleFrom(- textStyle: Theme.of(context).textTheme.bodyMedium,- foregroundColor: Theme.of(context).colorScheme.onBackground,- visualDensity: VisualDensity.compact,- ),- child: CardCellBuilder<String>(rowCache.cellCache).buildCell(- cellContext: cellContext,- renderHook: renderHook,- hasNotes: !cellContext.rowMeta.isDocumentEmpty,- ),- onPressed: () {- context.push(- MobileRowDetailPage.routeName,- extra: {- MobileRowDetailPage.argRowId: item.id,- MobileRowDetailPage.argDatabaseController:- context.read<BoardBloc>().databaseController,- },- );- },- );- },- ),- ];-- return ListView.builder(- itemBuilder: (context, index) => cells[index],- itemCount: cells.length,- shrinkWrap: true,- physics: const ClampingScrollPhysics(),- );- },- ),+ TextCardCellStyle _titleCellStyle(BuildContext context) {+ return TextCardCellStyle(+ padding: EdgeInsets.zero,+ textStyle: Theme.of(context).textTheme.bodyMedium!,+ maxLines: 2,+ titleTextStyle: Theme.of(context)+ .textTheme+ .bodyMedium!+ .copyWith(fontSize: 11, overflow: TextOverflow.ellipsis),);}}diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card.dartindex d76eca81a4..64f41eceac 100644--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card.dart+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card.dart@@ -1,2 +1,2 @@export 'card_detail/mobile_card_detail_screen.dart';-export 'card_content/mobile_card_content.dart';+export 'mobile_card_content.dart';diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_content/card_cells/card_cells.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_content/card_cells/card_cells.dartdeleted file mode 100644index 10b81feabd..0000000000--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_content/card_cells/card_cells.dart+++ /dev/null@@ -1,9 +0,0 @@-export 'checkbox.dart';-export 'date.dart';-export 'style.dart';-export 'time_stamp.dart';-export 'number.dart';-export 'text.dart';-export 'select_option.dart';-export 'url.dart';-export 'checklist.dart';diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_content/card_cells/checkbox.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_content/card_cells/checkbox.dartdeleted file mode 100644index 87372ea87a..0000000000--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_content/card_cells/checkbox.dart+++ /dev/null@@ -1,68 +0,0 @@-import 'package:appflowy/generated/flowy_svgs.g.dart';-import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';-import 'package:appflowy/plugins/database/widgets/card/cells/card_cell.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/checkbox_cell/checkbox_cell_bloc.dart';-import 'package:flutter/material.dart';-import 'package:flutter_bloc/flutter_bloc.dart';--class MobileCheckboxCardCell extends CardCell {- const MobileCheckboxCardCell({- super.key,- required this.cellControllerBuilder,- });-- final CellControllerBuilder cellControllerBuilder;-- @override- State<MobileCheckboxCardCell> createState() => _CheckboxCellState();-}--class _CheckboxCellState extends State<MobileCheckboxCardCell> {- late final CheckboxCellBloc _cellBloc;-- @override- void initState() {- super.initState();- final cellController =- widget.cellControllerBuilder.build() as CheckboxCellController;- _cellBloc = CheckboxCellBloc(cellController: cellController)- ..add(const CheckboxCellEvent.initial());- }-- @override- Future<void> dispose() async {- _cellBloc.close();- super.dispose();- }-- @override- Widget build(BuildContext context) {- return BlocProvider.value(- value: _cellBloc,- child: BlocBuilder<CheckboxCellBloc, CheckboxCellState>(- buildWhen: (previous, current) =>- previous.isSelected != current.isSelected,- builder: (context, state) {- return Align(- alignment: Alignment.centerLeft,- child: IconButton(- padding: EdgeInsets.zero,- alignment: Alignment.centerLeft,- visualDensity: VisualDensity.compact,- icon: FlowySvg(- state.isSelected- ? FlowySvgs.check_filled_s- : FlowySvgs.uncheck_s,- blendMode: BlendMode.dst,- size: const Size.square(24),- ),- onPressed: () => context- .read<CheckboxCellBloc>()- .add(const CheckboxCellEvent.select()),- ),- );- },- ),- );- }-}diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_content/card_cells/checklist.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_content/card_cells/checklist.dartdeleted file mode 100644index 9a3bdfcb45..0000000000--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_content/card_cells/checklist.dart+++ /dev/null@@ -1,137 +0,0 @@-import 'package:appflowy/mobile/presentation/database/card/card_content/card_cells/card_cells.dart';-import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';-import 'package:appflowy/plugins/database/widgets/card/cells/card_cell.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/checklist_cell/checklist_cell_bloc.dart';-import 'package:flowy_infra/theme_extension.dart';-import 'package:flutter/material.dart';-import 'package:flutter_bloc/flutter_bloc.dart';-import 'package:percent_indicator/linear_percent_indicator.dart';--class MobileChecklistCardCell extends CardCell {- const MobileChecklistCardCell({- super.key,- required this.cellControllerBuilder,- });-- final CellControllerBuilder cellControllerBuilder;-- @override- State<MobileChecklistCardCell> createState() => _ChecklistCellState();-}--class _ChecklistCellState extends State<MobileChecklistCardCell> {- late final ChecklistCellBloc _cellBloc;-- @override- void initState() {- super.initState();- final cellController =- widget.cellControllerBuilder.build() as ChecklistCellController;- _cellBloc = ChecklistCellBloc(cellController: cellController)- ..add(const ChecklistCellEvent.initial());- }-- @override- void dispose() {- _cellBloc.close();- super.dispose();- }-- @override- Widget build(BuildContext context) {- final cellStyle = MobileCardCellStyle(context);- return BlocProvider.value(- value: _cellBloc,- child: BlocBuilder<ChecklistCellBloc, ChecklistCellState>(- builder: (context, state) {- if (state.tasks.isEmpty) {- return const SizedBox.shrink();- }- return Padding(- padding: cellStyle.padding,- child: MobileChecklistProgressBar(- tasks: state.tasks,- percent: state.percent,- ),- );- },- ),- );- }-}--class MobileChecklistProgressBar extends StatefulWidget {- const MobileChecklistProgressBar({- super.key,- required this.tasks,- required this.percent,- });-- final List<ChecklistSelectOption> tasks;- final double percent;- final int segmentLimit = 5;-- @override- State<MobileChecklistProgressBar> createState() =>- _MobileChecklistProgresssBarState();-}--class _MobileChecklistProgresssBarState- extends State<MobileChecklistProgressBar> {- @override- Widget build(BuildContext context) {- final cellStyle = MobileCardCellStyle(context);- final numFinishedTasks = widget.tasks.where((e) => e.isSelected).length;- final completedTaskColor = numFinishedTasks == widget.tasks.length- ? AFThemeExtension.of(context).success- : Theme.of(context).colorScheme.primary;-- return Row(- children: [- Expanded(- child: Row(- children: [- if (widget.tasks.isNotEmpty &&- widget.tasks.length <= widget.segmentLimit)- ...List<Widget>.generate(- widget.tasks.length,- (index) => Flexible(- child: Container(- decoration: BoxDecoration(- borderRadius:- const BorderRadius.all(Radius.circular(2)),- color: index < numFinishedTasks- ? completedTaskColor- : AFThemeExtension.of(context).progressBarBGColor,- ),- margin: const EdgeInsets.symmetric(horizontal: 1),- height: 6.0,- ),- ),- )- else- Expanded(- child: LinearPercentIndicator(- lineHeight: 6.0,- percent: widget.percent,- padding: EdgeInsets.zero,- progressColor: completedTaskColor,- backgroundColor:- AFThemeExtension.of(context).progressBarBGColor,- barRadius: const Radius.circular(2),- ),- ),- ],- ),- ),- Padding(- padding: const EdgeInsets.only(left: 8),- child: Text(- "${(widget.percent * 100).round()}%",- style: cellStyle.secondaryTextStyle(),- ),- ),- ],- );- }-}diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_content/card_cells/date.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_content/card_cells/date.dartdeleted file mode 100644index 440d6607ef..0000000000--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_content/card_cells/date.dart+++ /dev/null@@ -1,74 +0,0 @@-import 'package:appflowy/mobile/presentation/database/card/card_content/card_cells/style.dart';-import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';-import 'package:appflowy/plugins/database/widgets/card/cells/card_cell.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/date_cell/date_cell_bloc.dart';-import 'package:flutter/material.dart';-import 'package:flutter_bloc/flutter_bloc.dart';--class MobileDateCardCell<CustomCardData> extends CardCell {- const MobileDateCardCell({- super.key,- required this.cellControllerBuilder,- this.renderHook,- });-- final CellControllerBuilder cellControllerBuilder;- final CellRenderHook<dynamic, CustomCardData>? renderHook;-- @override- State<MobileDateCardCell> createState() => _DateCellState();-}--class _DateCellState extends State<MobileDateCardCell> {- late final DateCellBloc _cellBloc;-- @override- void initState() {- super.initState();- final cellController =- widget.cellControllerBuilder.build() as DateCellController;-- _cellBloc = DateCellBloc(cellController: cellController)- ..add(const DateCellEvent.initial());- }-- @override- Future<void> dispose() async {- _cellBloc.close();- super.dispose();- }-- @override- Widget build(BuildContext context) {- final cellStyle = MobileCardCellStyle(context);- return BlocProvider.value(- value: _cellBloc,- child: BlocBuilder<DateCellBloc, DateCellState>(- buildWhen: (previous, current) => previous.dateStr != current.dateStr,- builder: (context, state) {- if (state.dateStr.isEmpty) {- return const SizedBox();- } else {- final Widget? custom = widget.renderHook?.call(- state.data,- widget.cardData,- context,- );- if (custom != null) {- return custom;- }-- return Container(- alignment: Alignment.centerLeft,- padding: cellStyle.padding,- child: Text(- state.dateStr,- style: cellStyle.secondaryTextStyle(),- ),- );- }- },- ),- );- }-}diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_content/card_cells/number.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_content/card_cells/number.dartdeleted file mode 100644index 2976d7002a..0000000000--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_content/card_cells/number.dart+++ /dev/null@@ -1,76 +0,0 @@-import 'package:appflowy/mobile/presentation/database/card/card_content/card_cells/style.dart';-import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';-import 'package:appflowy/plugins/database/widgets/card/cells/card_cell.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/number_cell/number_cell_bloc.dart';-import 'package:flutter/material.dart';-import 'package:flutter_bloc/flutter_bloc.dart';--class MobileNumberCardCell<CustomCardData> extends CardCell {- const MobileNumberCardCell({- super.key,- required this.cellControllerBuilder,- CustomCardData? cardData,- this.renderHook,- });-- final CellRenderHook<String, CustomCardData>? renderHook;- final CellControllerBuilder cellControllerBuilder;-- @override- State<MobileNumberCardCell> createState() => _NumberCellState();-}--class _NumberCellState extends State<MobileNumberCardCell> {- late final NumberCellBloc _cellBloc;-- @override- void initState() {- super.initState();- final cellController =- widget.cellControllerBuilder.build() as NumberCellController;-- _cellBloc = NumberCellBloc(cellController: cellController)- ..add(const NumberCellEvent.initial());- }-- @override- Future<void> dispose() async {- _cellBloc.close();- super.dispose();- }-- @override- Widget build(BuildContext context) {- final cellStyle = MobileCardCellStyle(context);- return BlocProvider.value(- value: _cellBloc,- child: BlocBuilder<NumberCellBloc, NumberCellState>(- buildWhen: (previous, current) =>- previous.cellContent != current.cellContent,- builder: (context, state) {- if (state.cellContent.isEmpty) {- return const SizedBox();- } else {- final Widget? custom = widget.renderHook?.call(- state.cellContent,- widget.cardData,- context,- );- if (custom != null) {- return custom;- }-- return Container(- alignment: Alignment.centerLeft,- padding: cellStyle.padding,- child: Text(- state.cellContent,- style: cellStyle.primaryTextStyle(),- ),- );- }- },- ),- );- }-}diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_content/card_cells/select_option.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_content/card_cells/select_option.dartdeleted file mode 100644index 36fcfe4a0a..0000000000--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_content/card_cells/select_option.dart+++ /dev/null@@ -1,147 +0,0 @@-import 'package:appflowy/generated/flowy_svgs.g.dart';-import 'package:appflowy/mobile/presentation/database/card/card_content/card_cells/style.dart';-import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';-import 'package:appflowy/plugins/database/widgets/card/cells/card_cell.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/select_option_cell/extension.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/select_option_cell/select_option_cell_bloc.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/select_option.pb.dart';-import 'package:flowy_infra_ui/widget/spacing.dart';-import 'package:flutter/material.dart';-import 'package:flutter_bloc/flutter_bloc.dart';--class MobileSelectOptionCardCell<CustomCardData> extends CardCell {- const MobileSelectOptionCardCell({- super.key,- required this.cellControllerBuilder,- required CustomCardData? cardData,- this.renderHook,- });-- final CellControllerBuilder cellControllerBuilder;- final CellRenderHook<List<SelectOptionPB>, CustomCardData>? renderHook;-- @override- State<MobileSelectOptionCardCell> createState() => _SelectOptionCellState();-}--class _SelectOptionCellState extends State<MobileSelectOptionCardCell> {- late final SelectOptionCellBloc _cellBloc;-- @override- void initState() {- super.initState();- final cellController =- widget.cellControllerBuilder.build() as SelectOptionCellController;- _cellBloc = SelectOptionCellBloc(cellController: cellController)- ..add(const SelectOptionCellEvent.initial());- }-- @override- Future<void> dispose() async {- _cellBloc.close();- super.dispose();- }-- @override- Widget build(BuildContext context) {- final cellStyle = MobileCardCellStyle(context);- return BlocProvider.value(- value: _cellBloc,- child: BlocBuilder<SelectOptionCellBloc, SelectOptionCellState>(- buildWhen: (previous, current) {- return previous.selectedOptions != current.selectedOptions;- },- builder: (context, state) {- final Widget? custom = widget.renderHook?.call(- state.selectedOptions,- widget.cardData,- context,- );- if (custom != null) {- return custom;- }-- final children = state.selectedOptions- .map(- (option) => MobileSelectOptionTag.fromOption(- context: context,- option: option,- ),- )- .toList();-- return IntrinsicHeight(- child: Padding(- padding: cellStyle.padding,- child: SizedBox.expand(- child: Wrap(spacing: 4, runSpacing: 2, children: children),- ),- ),- );- },- ),- );- }-}--class MobileSelectOptionTag extends StatelessWidget {- const MobileSelectOptionTag({- super.key,- required this.name,- required this.color,- this.onSelected,- this.onRemove,- });-- factory MobileSelectOptionTag.fromOption({- required BuildContext context,- required SelectOptionPB option,- VoidCallback? onSelected,- Function(String)? onRemove,- }) {- return MobileSelectOptionTag(- name: option.name,- color: option.color.toColor(context),- onSelected: onSelected,- onRemove: onRemove,- );- }-- final String name;- final Color color;- final VoidCallback? onSelected;- final void Function(String)? onRemove;-- @override- Widget build(BuildContext context) {- final cellStyle = MobileCardCellStyle(context);-- return Container(- padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),- decoration: BoxDecoration(- color: color,- borderRadius: BorderRadius.circular(4),- ),- child: Row(- mainAxisSize: MainAxisSize.min,- children: [- Flexible(- child: Text(- name,- style: cellStyle.tagTextStyle(),- ),- ),- if (onRemove != null) ...[- const HSpace(2),- IconButton(- onPressed: () => onRemove?.call(name),- icon: const FlowySvg(- FlowySvgs.close_s,- ),- ),- ],- ],- ),- );- }-}diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_content/card_cells/style.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_content/card_cells/style.dartdeleted file mode 100644index af07701369..0000000000--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_content/card_cells/style.dart+++ /dev/null@@ -1,44 +0,0 @@-import 'package:flutter/material.dart';--class MobileCardCellStyle {- MobileCardCellStyle(this.context);-- BuildContext context;-- EdgeInsets get padding => const EdgeInsets.symmetric(- vertical: 4,- );-- TextStyle? primaryTextStyle() {- final theme = Theme.of(context);- return theme.textTheme.bodyMedium?.copyWith(- fontSize: 16,- color: theme.colorScheme.onBackground,- );- }-- TextStyle? secondaryTextStyle() {- final theme = Theme.of(context);- return theme.textTheme.bodyMedium?.copyWith(- color: theme.colorScheme.tertiary,- fontSize: 14,- );- }-- TextStyle? tagTextStyle() {- final theme = Theme.of(context);- return theme.textTheme.bodyMedium?.copyWith(- color: theme.colorScheme.onBackground,- fontSize: 12,- );- }-- TextStyle? urlTextStyle() {- final theme = Theme.of(context);- return theme.textTheme.bodyMedium?.copyWith(- color: theme.colorScheme.primary,- fontSize: 16,- decoration: TextDecoration.underline,- );- }-}diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_content/card_cells/text.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_content/card_cells/text.dartdeleted file mode 100644index 16b86c7e8c..0000000000--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_content/card_cells/text.dart+++ /dev/null@@ -1,79 +0,0 @@-import 'package:appflowy/mobile/presentation/database/card/card_content/card_cells/style.dart';-import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';-import 'package:appflowy/plugins/database/widgets/card/cells/card_cell.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/text_cell/text_cell_bloc.dart';-import 'package:flutter/material.dart';-import 'package:flutter_bloc/flutter_bloc.dart';--class MobileTextCardCell<CustomCardData> extends CardCell {- const MobileTextCardCell({- super.key,- required this.cellControllerBuilder,- CustomCardData? cardData,- this.renderHook,- });-- final CellRenderHook<String, CustomCardData>? renderHook;- final CellControllerBuilder cellControllerBuilder;-- @override- State<MobileTextCardCell> createState() => _MobileTextCardCellState();-}--class _MobileTextCardCellState extends State<MobileTextCardCell> {- late final TextCellBloc _cellBloc;-- @override- void initState() {- super.initState();- final cellController =- widget.cellControllerBuilder.build() as TextCellController;-- _cellBloc = TextCellBloc(cellController: cellController)- ..add(const TextCellEvent.initial());- }-- @override- Future<void> dispose() async {- _cellBloc.close();- super.dispose();- }-- @override- Widget build(BuildContext context) {- final cellStyle = MobileCardCellStyle(context);- return BlocProvider.value(- value: _cellBloc,- child: BlocBuilder<TextCellBloc, TextCellState>(- buildWhen: (previous, current) => previous.content != current.content,- builder: (context, state) {- // return custom widget if render hook is provided(for example, the title of the card on board view)- // if widget.cardData.isEmpty means there is no data for this cell- final Widget? custom = widget.renderHook?.call(- state.content,- widget.cardData,- context,- );- if (custom != null) {- return custom;- }-- // if there is no render hook- // the empty text cell will be hidden- if (state.content.isEmpty) {- return const SizedBox();- }-- return Container(- alignment: Alignment.centerLeft,- padding: cellStyle.padding,- child: Text(- state.content,- style: cellStyle.primaryTextStyle(),- ),- );- },- ),- );- }-}diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_content/card_cells/time_stamp.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_content/card_cells/time_stamp.dartdeleted file mode 100644index de7a3f539b..0000000000--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_content/card_cells/time_stamp.dart+++ /dev/null@@ -1,73 +0,0 @@-import 'package:appflowy/mobile/presentation/database/card/card_content/card_cells/style.dart';-import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';-import 'package:appflowy/plugins/database/widgets/card/cells/card_cell.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/timestamp_cell/timestamp_cell_bloc.dart';-import 'package:flutter/material.dart';-import 'package:flutter_bloc/flutter_bloc.dart';--class MobileTimestampCardCell<CustomCardData> extends CardCell {- const MobileTimestampCardCell({- super.key,- required this.cellControllerBuilder,- this.renderHook,- });-- final CellControllerBuilder cellControllerBuilder;- final CellRenderHook<dynamic, CustomCardData>? renderHook;-- @override- State<MobileTimestampCardCell> createState() => _TimestampCellState();-}--class _TimestampCellState extends State<MobileTimestampCardCell> {- late final TimestampCellBloc _cellBloc;-- @override- void initState() {- super.initState();- final cellController =- widget.cellControllerBuilder.build() as TimestampCellController;-- _cellBloc = TimestampCellBloc(cellController: cellController)- ..add(const TimestampCellEvent.initial());- }-- @override- Future<void> dispose() async {- _cellBloc.close();- super.dispose();- }-- @override- Widget build(BuildContext context) {- final cellStyle = MobileCardCellStyle(context);- return BlocProvider.value(- value: _cellBloc,- child: BlocBuilder<TimestampCellBloc, TimestampCellState>(- buildWhen: (previous, current) => previous.dateStr != current.dateStr,- builder: (context, state) {- if (state.dateStr.isEmpty) {- return const SizedBox.shrink();- }- final Widget? custom = widget.renderHook?.call(- state.data,- widget.cardData,- context,- );- if (custom != null) {- return custom;- }-- return Container(- alignment: Alignment.centerLeft,- padding: cellStyle.padding,- child: Text(- state.dateStr,- style: cellStyle.secondaryTextStyle(),- ),- );- },- ),- );- }-}diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_content/card_cells/url.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_content/card_cells/url.dartdeleted file mode 100644index 0aa59d1db0..0000000000--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_content/card_cells/url.dart+++ /dev/null@@ -1,63 +0,0 @@-import 'package:appflowy/mobile/presentation/database/card/card_content/card_cells/style.dart';-import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';-import 'package:appflowy/plugins/database/widgets/card/cells/card_cell.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/url_cell/url_cell_bloc.dart';-import 'package:flutter/material.dart';-import 'package:flutter_bloc/flutter_bloc.dart';--class MobileURLCardCell<CustomCardData> extends CardCell {- const MobileURLCardCell({- super.key,- required this.cellControllerBuilder,- });-- final CellControllerBuilder cellControllerBuilder;-- @override- State<MobileURLCardCell> createState() => _URLCellState();-}--class _URLCellState extends State<MobileURLCardCell> {- late final URLCellBloc _cellBloc;-- @override- void initState() {- super.initState();- final cellController =- widget.cellControllerBuilder.build() as URLCellController;-- _cellBloc = URLCellBloc(cellController: cellController)- ..add(const URLCellEvent.initial());- }-- @override- Future<void> dispose() async {- _cellBloc.close();- super.dispose();- }-- @override- Widget build(BuildContext context) {- final cellStyle = MobileCardCellStyle(context);- return BlocProvider.value(- value: _cellBloc,- child: BlocBuilder<URLCellBloc, URLCellState>(- buildWhen: (previous, current) => previous.content != current.content,- builder: (context, state) {- if (state.content.isEmpty) {- return const SizedBox();- } else {- return Container(- alignment: Alignment.centerLeft,- padding: cellStyle.padding,- child: Text(- state.content,- style: cellStyle.urlTextStyle(),- ),- );- }- },- ),- );- }-}diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_content/mobile_card_content.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_content/mobile_card_content.dartdeleted file mode 100644index 335aeebdad..0000000000--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_content/mobile_card_content.dart+++ /dev/null@@ -1,108 +0,0 @@-import 'package:appflowy/generated/flowy_svgs.g.dart';-import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/plugins/database/application/cell/cell_service.dart';-import 'package:appflowy/plugins/database/widgets/card/card.dart';-import 'package:appflowy/plugins/database/widgets/card/card_cell_builder.dart';-import 'package:appflowy/plugins/database/widgets/card/cells/card_cell.dart';-import 'package:easy_localization/easy_localization.dart';-import 'package:flowy_infra_ui/flowy_infra_ui.dart';-import 'package:flutter/material.dart';--class MobileCardContent<CustomCardData> extends StatelessWidget {- const MobileCardContent({- super.key,- required this.cellBuilder,- required this.cells,- required this.cardData,- required this.styleConfiguration,- this.renderHook,- });-- final CardCellBuilder<CustomCardData> cellBuilder;-- final List<DatabaseCellContext> cells;- final RowCardRenderHook<CustomCardData>? renderHook;- final CustomCardData? cardData;- final RowCardStyleConfiguration styleConfiguration;-- @override- Widget build(BuildContext context) {- return Padding(- padding: styleConfiguration.cardPadding,- child: Column(- mainAxisSize: MainAxisSize.min,- children: _makeCells(context, cells),- ),- );- }-- List<Widget> _makeCells(- BuildContext context,- List<DatabaseCellContext> cells,- ) {- final List<Widget> children = [];-- cells.asMap().forEach((int index, DatabaseCellContext cellContext) {- Widget child;- if (index == 0) {- // The title cell UI is different with a normal text cell.- // Use render hook to customize its UI- child = _buildTitleCell(cellContext);- } else {- child = Padding(- key: cellContext.key(),- padding: styleConfiguration.cellPadding,- child: cellBuilder.buildCell(- cellContext: cellContext,- cardData: cardData,- renderHook: renderHook,- hasNotes: !cellContext.rowMeta.isDocumentEmpty,- ),- );- }-- children.add(child);- });- return children;- }-- Widget _buildTitleCell(- DatabaseCellContext cellContext,- ) {- final renderHook = RowCardRenderHook<String>();- renderHook.addTextCellHook((cellData, cardData, context) {- final text = cellData.isEmpty- ? LocaleKeys.grid_row_titlePlaceholder.tr()- : cellData;- final color = cellData.isEmpty- ? Theme.of(context).hintColor- : Theme.of(context).colorScheme.onBackground;-- return Row(- children: [- if (!cellContext.rowMeta.isDocumentEmpty) ...[- const FlowySvg(FlowySvgs.notes_s),- const HSpace(4),- ],- Expanded(- child: FlowyText.medium(- text,- color: color,- overflow: TextOverflow.ellipsis,- ),- ),- ],- );- });-- return Padding(- key: cellContext.key(),- padding: styleConfiguration.cellPadding,- child: CardCellBuilder<String>(cellBuilder.cellCache).buildCell(- cellContext: cellContext,- renderHook: renderHook,- hasNotes: !cellContext.rowMeta.isDocumentEmpty,- ),- );- }-}diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/cells/checkbox_cell.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/cells/checkbox_cell.dartdeleted file mode 100644index a781f1dc4c..0000000000--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/cells/checkbox_cell.dart+++ /dev/null@@ -1,91 +0,0 @@-import 'package:appflowy/generated/flowy_svgs.g.dart';-import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';-import 'package:appflowy/plugins/database/widgets/row/cell_builder.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/checkbox_cell/checkbox_cell_bloc.dart';-import 'package:flutter/material.dart';-import 'package:flutter_bloc/flutter_bloc.dart';--class RowDetailCheckboxCell extends GridCellWidget {- RowDetailCheckboxCell({- super.key,- required this.cellControllerBuilder,- GridCellStyle? style,- });-- final CellControllerBuilder cellControllerBuilder;-- @override- GridCellState<RowDetailCheckboxCell> createState() =>- _RowDetailCheckboxCellState();-}--class _RowDetailCheckboxCellState extends GridCellState<RowDetailCheckboxCell> {- late final CheckboxCellBloc _cellBloc;-- @override- void initState() {- super.initState();- final cellController =- widget.cellControllerBuilder.build() as CheckboxCellController;- _cellBloc = CheckboxCellBloc(cellController: cellController)- ..add(const CheckboxCellEvent.initial());- }-- @override- Widget build(BuildContext context) {- return BlocProvider.value(- value: _cellBloc,- child: BlocBuilder<CheckboxCellBloc, CheckboxCellState>(- builder: (context, state) {- return InkWell(- onTap: () => context- .read<CheckboxCellBloc>()- .add(const CheckboxCellEvent.select()),- borderRadius: const BorderRadius.all(Radius.circular(14)),- child: Container(- constraints: const BoxConstraints(- minHeight: 48,- minWidth: double.infinity,- ),- decoration: BoxDecoration(- border: Border.fromBorderSide(- BorderSide(color: Theme.of(context).colorScheme.outline),- ),- borderRadius: const BorderRadius.all(Radius.circular(14)),- ),- child: Padding(- padding:- const EdgeInsets.symmetric(horizontal: 12, vertical: 13),- child: Align(- alignment: AlignmentDirectional.centerStart,- child: FlowySvg(- state.isSelected- ? FlowySvgs.check_filled_s- : FlowySvgs.uncheck_s,- color: Theme.of(context).colorScheme.onBackground,- blendMode: BlendMode.dst,- size: const Size.square(24),- ),- ),- ),- ),- );- },- ),- );- }-- @override- Future<void> dispose() async {- _cellBloc.close();- super.dispose();- }-- @override- void requestBeginFocus() {- _cellBloc.add(const CheckboxCellEvent.select());- }-- @override- String? onCopy() => _cellBloc.state.isSelected ? "Yes" : "No";-}diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/cells/number_cell.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/cells/number_cell.dartdeleted file mode 100644index 5e89a211eb..0000000000--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/cells/number_cell.dart+++ /dev/null@@ -1,105 +0,0 @@-import 'dart:async';-import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';-import 'package:appflowy/plugins/database/widgets/row/cell_builder.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/number_cell/number_cell_bloc.dart';-import 'package:flutter/material.dart';-import 'package:flutter_bloc/flutter_bloc.dart';--class RowDetailNumberCell extends GridCellWidget {- RowDetailNumberCell({- super.key,- required this.cellControllerBuilder,- this.hintText,- });-- final CellControllerBuilder cellControllerBuilder;- final String? hintText;-- @override- GridEditableTextCell<RowDetailNumberCell> createState() =>- _RowDetailNumberCellState();-}--class _RowDetailNumberCellState- extends GridEditableTextCell<RowDetailNumberCell> {- late final NumberCellBloc _cellBloc;- late final TextEditingController _controller;-- @override- SingleListenerFocusNode focusNode = SingleListenerFocusNode();-- @override- void initState() {- final cellController =- widget.cellControllerBuilder.build() as NumberCellController;- _cellBloc = NumberCellBloc(cellController: cellController)- ..add(const NumberCellEvent.initial());- _controller = TextEditingController(text: _cellBloc.state.cellContent);- super.initState();- }-- @override- Widget build(BuildContext context) {- return BlocProvider.value(- value: _cellBloc,- child: MultiBlocListener(- listeners: [- BlocListener<NumberCellBloc, NumberCellState>(- listenWhen: (p, c) => p.cellContent != c.cellContent,- listener: (context, state) => _controller.text = state.cellContent,- ),- ],- child: TextField(- controller: _controller,- keyboardType: const TextInputType.numberWithOptions(- signed: true,- decimal: true,- ),- focusNode: focusNode,- style: Theme.of(context).textTheme.bodyMedium?.copyWith(fontSize: 16),- decoration: InputDecoration(- enabledBorder:- _getInputBorder(color: Theme.of(context).colorScheme.outline),- focusedBorder:- _getInputBorder(color: Theme.of(context).colorScheme.primary),- hintText: widget.hintText,- contentPadding:- const EdgeInsets.symmetric(horizontal: 12, vertical: 14),- isCollapsed: true,- isDense: true,- constraints: const BoxConstraints(),- ),- // close keyboard when tapping outside of the text field- onTapOutside: (event) =>- FocusManager.instance.primaryFocus?.unfocus(),- ),- ),- );- }-- InputBorder _getInputBorder({Color? color}) {- return OutlineInputBorder(- borderSide: BorderSide(color: color!),- borderRadius: const BorderRadius.all(Radius.circular(14)),- gapPadding: 0,- );- }-- @override- Future<void> dispose() async {- _cellBloc.close();- super.dispose();- }-- @override- Future<void> focusChanged() async {- if (mounted &&- !_cellBloc.isClosed &&- _controller.text != _cellBloc.state.cellContent) {- _cellBloc.add(NumberCellEvent.updateCell(_controller.text));- }- }-- @override- String? onCopy() => _cellBloc.state.cellContent;-}diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/cells/text_cell.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/cells/text_cell.dartdeleted file mode 100644index 6adf79c595..0000000000--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/cells/text_cell.dart+++ /dev/null@@ -1,108 +0,0 @@-import 'dart:async';-import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';-import 'package:appflowy/plugins/database/widgets/row/cell_builder.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/text_cell/text_cell.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/text_cell/text_cell_bloc.dart';-import 'package:flutter/material.dart';-import 'package:flutter_bloc/flutter_bloc.dart';--class RowDetailTextCell extends GridCellWidget {- RowDetailTextCell({- super.key,- required this.cellControllerBuilder,- GridCellStyle? style,- }) {- if (style != null) {- cellStyle = (style as GridTextCellStyle);- } else {- cellStyle = const GridTextCellStyle();- }- }-- final CellControllerBuilder cellControllerBuilder;- late final GridTextCellStyle cellStyle;-- @override- GridEditableTextCell<RowDetailTextCell> createState() =>- _RowDetailTextCellState();-}--class _RowDetailTextCellState extends GridEditableTextCell<RowDetailTextCell> {- late final TextCellBloc _cellBloc;- late final TextEditingController _controller;-- @override- SingleListenerFocusNode focusNode = SingleListenerFocusNode();-- @override- void initState() {- super.initState();- final cellController =- widget.cellControllerBuilder.build() as TextCellController;- _cellBloc = TextCellBloc(cellController: cellController)- ..add(const TextCellEvent.initial());- _controller = TextEditingController(text: _cellBloc.state.content);- }-- @override- Widget build(BuildContext context) {- return BlocProvider.value(- value: _cellBloc,- child: BlocListener<TextCellBloc, TextCellState>(- listener: (context, state) {- if (_controller.text != state.content) {- _controller.text = state.content;- }- },- child: TextField(- controller: _controller,- focusNode: focusNode,- style: widget.cellStyle.textStyle,- maxLines: null,- decoration: InputDecoration(- enabledBorder:- _getInputBorder(color: Theme.of(context).colorScheme.outline),- focusedBorder:- _getInputBorder(color: Theme.of(context).colorScheme.primary),- hintText: widget.cellStyle.placeholder,- contentPadding: widget.cellStyle.cellPadding ??- const EdgeInsets.symmetric(horizontal: 12, vertical: 13),- isCollapsed: true,- isDense: true,- constraints: const BoxConstraints(minHeight: 48),- hintStyle: widget.cellStyle.textStyle- ?.copyWith(color: Theme.of(context).hintColor),- ),- onTapOutside: (event) =>- FocusManager.instance.primaryFocus?.unfocus(),- ),- ),- );- }-- InputBorder _getInputBorder({Color? color}) {- if (!widget.cellStyle.useRoundedBorder) {- return InputBorder.none;- }- return OutlineInputBorder(- borderSide: BorderSide(color: color!),- borderRadius: const BorderRadius.all(Radius.circular(14)),- gapPadding: 0,- );- }-- @override- Future<void> dispose() async {- _cellBloc.close();- super.dispose();- }-- @override- String? onCopy() => _cellBloc.state.content;-- @override- Future<void> focusChanged() {- _cellBloc.add(TextCellEvent.updateText(_controller.text));- return super.focusChanged();- }-}diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/cells/url_cell.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/cells/url_cell.dartdeleted file mode 100644index e37a2e477d..0000000000--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/cells/url_cell.dart+++ /dev/null@@ -1,125 +0,0 @@-import 'dart:async';-import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/mobile/presentation/bottom_sheet/show_mobile_bottom_sheet.dart';-import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';-import 'package:appflowy/plugins/database/widgets/row/cell_builder.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/url_cell/url_cell_bloc.dart';-import 'package:easy_localization/easy_localization.dart';-import 'package:flutter/material.dart';-import 'package:flutter_bloc/flutter_bloc.dart';-import 'package:go_router/go_router.dart';-import 'package:url_launcher/url_launcher_string.dart';--class RowDetailURLCell extends GridCellWidget {- RowDetailURLCell({- super.key,- required this.cellControllerBuilder,- this.hintText,- });-- final CellControllerBuilder cellControllerBuilder;- final String? hintText;-- @override- GridCellState<RowDetailURLCell> createState() => _RowDetailURLCellState();-}--class _RowDetailURLCellState extends GridCellState<RowDetailURLCell> {- late final URLCellBloc _cellBloc;- final FocusNode _focusNode = FocusNode();-- @override- void initState() {- super.initState();- final cellController =- widget.cellControllerBuilder.build() as URLCellController;- _cellBloc = URLCellBloc(cellController: cellController)- ..add(const URLCellEvent.initial());- }-- @override- Future<void> dispose() async {- _cellBloc.close();- _focusNode.dispose();- super.dispose();- }-- @override- Widget build(BuildContext context) {- return BlocProvider.value(- value: _cellBloc,- child: BlocSelector<URLCellBloc, URLCellState, String>(- selector: (state) => state.content,- builder: (context, content) {- return InkWell(- borderRadius: const BorderRadius.all(Radius.circular(14)),- onTap: () {- if (content.isEmpty) {- _showURLEditor(content);- return;- }- final shouldAddScheme = !['http', 'https']- .any((pattern) => content.startsWith(pattern));- final url = shouldAddScheme ? 'http://$content' : content;- canLaunchUrlString(url).then((value) => launchUrlString(url));- },- onLongPress: () => _showURLEditor(content),- child: Container(- constraints: const BoxConstraints(- minHeight: 48,- minWidth: double.infinity,- ),- decoration: BoxDecoration(- border: Border.fromBorderSide(- BorderSide(color: Theme.of(context).colorScheme.outline),- ),- borderRadius: const BorderRadius.all(Radius.circular(14)),- ),- child: Padding(- padding:- const EdgeInsets.symmetric(horizontal: 12, vertical: 14),- child: Text(- content.isEmpty ? widget.hintText ?? "" : content,- style: Theme.of(context).textTheme.bodyMedium?.copyWith(- fontSize: 16,- decoration:- content.isEmpty ? null : TextDecoration.underline,- color: content.isEmpty- ? Theme.of(context).hintColor- : Theme.of(context).colorScheme.primary,- ),- ),- ),- ),- );- },- ),- );- }-- void _showURLEditor(String content) {- showMobileBottomSheet(- context,- title: LocaleKeys.board_mobile_editURL.tr(),- showHeader: true,- showCloseButton: true,- builder: (_) {- final controller = TextEditingController(text: content);- return TextField(- controller: controller,- autofocus: true,- keyboardType: TextInputType.url,- onEditingComplete: () {- _cellBloc.add(URLCellEvent.updateURL(controller.text));- context.pop();- },- );- },- );- }-- @override- void requestBeginFocus() {- _focusNode.requestFocus();- }-}diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/mobile_card_detail_screen.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/mobile_card_detail_screen.dartindex addd2ad4e8..7a2cc336a4 100644--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/mobile_card_detail_screen.dart+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/mobile_card_detail_screen.dart@@ -2,18 +2,19 @@ import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/mobile/presentation/bottom_sheet/bottom_sheet.dart';import 'package:appflowy/mobile/presentation/widgets/flowy_mobile_quick_action_button.dart';-import 'package:appflowy/plugins/database/application/cell/cell_service.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/field/field_controller.dart';-import 'package:appflowy/plugins/database/application/field/field_info.dart';import 'package:appflowy/plugins/database/application/row/row_banner_bloc.dart';import 'package:appflowy/plugins/database/application/row/row_cache.dart';import 'package:appflowy/plugins/database/application/row/row_controller.dart';import 'package:appflowy/plugins/database/application/row/row_service.dart';import 'package:appflowy/plugins/database/grid/application/row/mobile_row_detail_bloc.dart';import 'package:appflowy/plugins/database/grid/application/row/row_detail_bloc.dart';-import 'package:appflowy/plugins/database/widgets/row/cell_builder.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/cells.dart';+import 'package:appflowy/plugins/database/widgets/cell/editable_cell_builder.dart';+import 'package:appflowy/plugins/database/widgets/cell/editable_cell_skeleton/text.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/text_cell/text_cell_bloc.dart';import 'package:appflowy/plugins/database/widgets/row/row_property.dart';import 'package:appflowy_backend/protobuf/flowy-database2/row_entities.pb.dart';import 'package:easy_localization/easy_localization.dart';@@ -316,7 +317,7 @@ class MobileRowDetailPageContent extends StatefulWidget {class MobileRowDetailPageContentStateextends State<MobileRowDetailPageContent> {late final RowController rowController;- late final MobileRowDetailPageCellBuilder cellBuilder;+ late final EditableCellBuilder cellBuilder;String get viewId => widget.databaseController.viewId;RowCache get rowCache => widget.databaseController.rowCache;@@ -332,16 +333,18 @@ class MobileRowDetailPageContentStateviewId: viewId,rowCache: rowCache,);- cellBuilder = MobileRowDetailPageCellBuilder(- cellCache: rowCache.cellCache,+ cellBuilder = EditableCellBuilder(+ databaseController: widget.databaseController,);}@overrideWidget build(BuildContext context) {return BlocProvider<RowDetailBloc>(- create: (_) => RowDetailBloc(rowController: rowController)- ..add(const RowDetailEvent.initial()),+ create: (_) => RowDetailBloc(+ fieldController: fieldController,+ rowController: rowController,+ ),child: BlocBuilder<RowDetailBloc, RowDetailState>(builder: (context, rowDetailState) {return Column(@@ -354,28 +357,17 @@ class MobileRowDetailPageContentStatechild: BlocBuilder<RowBannerBloc, RowBannerState>(builder: (context, state) {if (state.primaryField != null) {- final cellStyle = GridTextCellStyle(- placeholder: LocaleKeys.grid_row_titlePlaceholder.tr(),- textStyle:- Theme.of(context).textTheme.bodyMedium?.copyWith(- fontSize: 23,- fontWeight: FontWeight.w500,- ),- cellPadding: const EdgeInsets.symmetric(vertical: 9),- useRoundedBorder: false,- );-- final cellContext = DatabaseCellContext(- viewId: viewId,- rowMeta: rowController.rowMeta,- fieldInfo: FieldInfo.initial(state.primaryField!),+ final cellContext = CellContext(+ rowId: rowController.rowId,+ fieldId: state.primaryField!.id,);-return Padding(padding: const EdgeInsets.symmetric(horizontal: 16),- child: cellBuilder.build(+ child: cellBuilder.buildCustom(cellContext,- style: cellStyle,+ skinMap: EditableCellSkinMap(+ textSkin: _TitleSkin(),+ ),),);}@@ -390,9 +382,8 @@ class MobileRowDetailPageContentStatePadding(padding: const EdgeInsets.symmetric(horizontal: 16),child: MobileRowPropertyList(+ databaseController: widget.databaseController,cellBuilder: cellBuilder,- viewId: viewId,- fieldController: fieldController,),),Padding(@@ -420,3 +411,35 @@ class MobileRowDetailPageContentState);}}++class _TitleSkin extends IEditableTextCellSkin {+ @override+ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ TextCellBloc bloc,+ FocusNode focusNode,+ TextEditingController textEditingController,+ ) {+ return TextField(+ controller: textEditingController,+ focusNode: focusNode,+ maxLines: null,+ style: Theme.of(context).textTheme.bodyMedium?.copyWith(+ fontSize: 23,+ fontWeight: FontWeight.w500,+ ),+ decoration: InputDecoration(+ contentPadding: const EdgeInsets.symmetric(vertical: 9),+ border: InputBorder.none,+ focusedBorder: InputBorder.none,+ enabledBorder: InputBorder.none,+ errorBorder: InputBorder.none,+ disabledBorder: InputBorder.none,+ hintText: LocaleKeys.grid_row_titlePlaceholder.tr(),+ isDense: true,+ isCollapsed: true,+ ),+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/widgets/mobile_row_property_list.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/widgets/mobile_row_property_list.dartindex 13fa72f9b4..5b2806134e 100644--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/widgets/mobile_row_property_list.dart+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/widgets/mobile_row_property_list.dart@@ -1,13 +1,10 @@import 'package:appflowy/generated/flowy_svgs.g.dart';-import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/plugins/database/application/cell/cell_service.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/field/field_controller.dart';import 'package:appflowy/plugins/database/grid/application/row/row_detail_bloc.dart';import 'package:appflowy/plugins/database/grid/presentation/widgets/header/field_type_extension.dart';-import 'package:appflowy/plugins/database/widgets/row/cell_builder.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/cells.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/field_entities.pb.dart';-import 'package:easy_localization/easy_localization.dart';+import 'package:appflowy/plugins/database/widgets/cell/editable_cell_builder.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';@@ -15,22 +12,19 @@ import 'package:flutter_bloc/flutter_bloc.dart';class MobileRowPropertyList extends StatelessWidget {const MobileRowPropertyList({super.key,- required this.viewId,- required this.fieldController,+ required this.databaseController,required this.cellBuilder,});- final String viewId;- final FieldController fieldController;- final MobileRowDetailPageCellBuilder cellBuilder;+ final DatabaseController databaseController;+ final EditableCellBuilder cellBuilder;@overrideWidget build(BuildContext context) {return BlocBuilder<RowDetailBloc, RowDetailState>(builder: (context, state) {- final List<DatabaseCellContext> visibleCells = state.visibleCells- .where((element) => !element.fieldInfo.field.isPrimary)- .toList();+ final List<CellContext> visibleCells =+ state.visibleCells.where((cell) => !_isCellPrimary(cell)).toList();return ListView.separated(shrinkWrap: true,@@ -40,7 +34,7 @@ class MobileRowPropertyList extends StatelessWidget {itemBuilder: (context, index) => _PropertyCell(key: ValueKey('row_detail_${visibleCells[index].fieldId}'),cellContext: visibleCells[index],- fieldController: fieldController,+ fieldController: databaseController.fieldController,cellBuilder: cellBuilder,),separatorBuilder: (_, __) => const VSpace(22),@@ -48,6 +42,9 @@ class MobileRowPropertyList extends StatelessWidget {},);}++ bool _isCellPrimary(CellContext cell) =>+ databaseController.fieldController.getField(cell.fieldId)!.isPrimary;}class _PropertyCell extends StatefulWidget {@@ -58,9 +55,9 @@ class _PropertyCell extends StatefulWidget {required this.cellBuilder,});- final DatabaseCellContext cellContext;+ final CellContext cellContext;final FieldController fieldController;- final MobileRowDetailPageCellBuilder cellBuilder;+ final EditableCellBuilder cellBuilder;@overrideState<StatefulWidget> createState() => _PropertyCellState();@@ -69,8 +66,10 @@ class _PropertyCell extends StatefulWidget {class _PropertyCellState extends State<_PropertyCell> {@overrideWidget build(BuildContext context) {- final style = _customCellStyle(widget.cellContext.fieldType);- final cell = widget.cellBuilder.build(widget.cellContext, style: style);+ final fieldInfo =+ widget.fieldController.getField(widget.cellContext.fieldId)!;+ final cell = widget.cellBuilder+ .buildStyled(widget.cellContext, EditableCellStyle.mobileRowDetail);return Column(mainAxisSize: MainAxisSize.min,@@ -78,13 +77,13 @@ class _PropertyCellState extends State<_PropertyCell> {Row(children: [FlowySvg(- widget.cellContext.fieldInfo.field.fieldType.icon(),+ fieldInfo.fieldType.icon(),color: Theme.of(context).hintColor,),const HSpace(6),Expanded(child: FlowyText.regular(- widget.cellContext.fieldInfo.field.name,+ fieldInfo.name,overflow: TextOverflow.ellipsis,fontSize: 14,color: Theme.of(context).hintColor,@@ -98,60 +97,3 @@ class _PropertyCellState extends State<_PropertyCell> {);}}--GridCellStyle? _customCellStyle(FieldType fieldType) {- switch (fieldType) {- case FieldType.Checkbox:- return GridCheckboxCellStyle(- cellPadding: const EdgeInsets.symmetric(horizontal: 8, vertical: 5),- );- case FieldType.DateTime:- return DateCellStyle(- placeholder: LocaleKeys.grid_row_textPlaceholder.tr(),- alignment: Alignment.centerLeft,- cellPadding: const EdgeInsets.symmetric(horizontal: 12, vertical: 13),- useRoundedBorder: true,- );- case FieldType.LastEditedTime:- case FieldType.CreatedTime:- return TimestampCellStyle(- placeholder: LocaleKeys.grid_row_textPlaceholder.tr(),- alignment: Alignment.centerLeft,- cellPadding: const EdgeInsets.symmetric(horizontal: 12, vertical: 13),- useRoundedBorder: true,- );- case FieldType.MultiSelect:- return SelectOptionCellStyle(- placeholder: LocaleKeys.grid_row_textPlaceholder.tr(),- cellPadding: const EdgeInsets.symmetric(horizontal: 12, vertical: 13),- useRoundedBorder: true,- );- case FieldType.Checklist:- return ChecklistCellStyle(- placeholder: LocaleKeys.grid_row_textPlaceholder.tr(),- cellPadding: const EdgeInsets.symmetric(horizontal: 12, vertical: 13),- useRoundedBorders: true,- );- case FieldType.Number:- return GridNumberCellStyle(- placeholder: LocaleKeys.grid_row_textPlaceholder.tr(),- );- case FieldType.RichText:- return GridTextCellStyle(- placeholder: LocaleKeys.grid_row_textPlaceholder.tr(),- useRoundedBorder: true,- );- case FieldType.SingleSelect:- return SelectOptionCellStyle(- placeholder: LocaleKeys.grid_row_textPlaceholder.tr(),- cellPadding: const EdgeInsets.symmetric(horizontal: 12, vertical: 13),- useRoundedBorder: true,- );- case FieldType.URL:- return GridURLCellStyle(- placeholder: LocaleKeys.grid_row_textPlaceholder.tr(),- accessoryTypes: [],- );- }- throw UnimplementedError;-}diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/mobile_card_content.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/mobile_card_content.dartnew file mode 100644index 0000000000..057d3937cb--- /dev/null+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/mobile_card_content.dart@@ -0,0 +1,40 @@+import 'package:appflowy/plugins/database/application/cell/cell_controller.dart';+import 'package:appflowy/plugins/database/widgets/card/card.dart';+import 'package:appflowy/plugins/database/widgets/cell/card_cell_builder.dart';+import 'package:appflowy/plugins/database/widgets/cell/card_cell_style_maps/mobile_board_card_cell_style.dart';+import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';+import 'package:flutter/material.dart';++class MobileCardContent extends StatelessWidget {+ const MobileCardContent({+ super.key,+ required this.rowMeta,+ required this.cellBuilder,+ required this.cells,+ required this.styleConfiguration,+ });++ final RowMetaPB rowMeta;+ final CardCellBuilder cellBuilder;+ final List<CellContext> cells;+ final RowCardStyleConfiguration styleConfiguration;++ @override+ Widget build(BuildContext context) {+ return Padding(+ padding: styleConfiguration.cardPadding,+ child: Column(+ mainAxisSize: MainAxisSize.min,+ children: cells.map(+ (cellContext) {+ return cellBuilder.build(+ cellContext: cellContext,+ styleMap: mobileBoardCardCellStyleMap(context),+ hasNotes: !rowMeta.isDocumentEmpty,+ );+ },+ ).toList(),+ ),+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/cells.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/cells.dartdeleted file mode 100644index 1421685dcc..0000000000--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/cells.dart+++ /dev/null@@ -1,5 +0,0 @@-export 'mobile_checkbox_cell.dart';-export 'mobile_number_cell.dart';-export 'mobile_text_cell.dart';-export 'mobile_timestamp_cell.dart';-export 'mobile_url_cell.dart';diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/mobile_checkbox_cell.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/mobile_checkbox_cell.dartdeleted file mode 100644index ddbce136b9..0000000000--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/mobile_checkbox_cell.dart+++ /dev/null@@ -1,70 +0,0 @@-import 'package:appflowy/generated/flowy_svgs.g.dart';-import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';-import 'package:appflowy/plugins/database/widgets/row/cell_builder.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/checkbox_cell/checkbox_cell_bloc.dart';-import 'package:flutter/material.dart';-import 'package:flutter_bloc/flutter_bloc.dart';--class MobileCheckboxCell extends GridCellWidget {- MobileCheckboxCell({- super.key,- required this.cellControllerBuilder,- GridCellStyle? style,- });-- final CellControllerBuilder cellControllerBuilder;-- @override- GridCellState<MobileCheckboxCell> createState() => _CheckboxCellState();-}--class _CheckboxCellState extends GridCellState<MobileCheckboxCell> {- late final CheckboxCellBloc _cellBloc;-- @override- void initState() {- super.initState();- final cellController =- widget.cellControllerBuilder.build() as CheckboxCellController;- _cellBloc = CheckboxCellBloc(cellController: cellController)- ..add(const CheckboxCellEvent.initial());- }-- @override- Widget build(BuildContext context) {- return BlocProvider.value(- value: _cellBloc,- child: BlocBuilder<CheckboxCellBloc, CheckboxCellState>(- builder: (context, state) {- return Align(- alignment: Alignment.centerLeft,- child: Padding(- padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 12),- child: FlowySvg(- state.isSelected- ? FlowySvgs.check_filled_s- : FlowySvgs.uncheck_s,- blendMode: BlendMode.dst,- size: const Size.square(24),- ),- ),- );- },- ),- );- }-- @override- Future<void> dispose() async {- _cellBloc.close();- super.dispose();- }-- @override- void requestBeginFocus() {- _cellBloc.add(const CheckboxCellEvent.select());- }-- @override- String? onCopy() => _cellBloc.state.isSelected ? "Yes" : "No";-}diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/mobile_checklist_cell.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/mobile_checklist_cell.dartdeleted file mode 100644index 7a873fde4e..0000000000--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/mobile_checklist_cell.dart+++ /dev/null@@ -1,135 +0,0 @@-import 'package:appflowy/mobile/presentation/bottom_sheet/show_mobile_bottom_sheet.dart';-import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';-import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';-import 'package:appflowy/plugins/database/widgets/row/cell_builder.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/checklist_cell/checklist_cell.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/checklist_cell/checklist_cell_bloc.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/checklist_cell/checklist_progress_bar.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/checklist_cell/mobile_checklist_cell_editor.dart';-import 'package:flowy_infra_ui/flowy_infra_ui.dart';-import 'package:flutter/material.dart';-import 'package:flutter_bloc/flutter_bloc.dart';--class MobileChecklistCell extends GridCellWidget {- final CellControllerBuilder cellControllerBuilder;- late final ChecklistCellStyle cellStyle;- MobileChecklistCell({- required this.cellControllerBuilder,- GridCellStyle? style,- super.key,- }) {- if (style != null) {- cellStyle = (style as ChecklistCellStyle);- } else {- cellStyle = const ChecklistCellStyle();- }- }-- @override- GridCellState<MobileChecklistCell> createState() =>- _MobileChecklistCellState();-}--class _MobileChecklistCellState extends GridCellState<MobileChecklistCell> {- late ChecklistCellBloc _cellBloc;-- @override- void initState() {- super.initState();- final cellController =- widget.cellControllerBuilder.build() as ChecklistCellController;- _cellBloc = ChecklistCellBloc(cellController: cellController)- ..add(const ChecklistCellEvent.initial());- }-- @override- Widget build(BuildContext context) {- return BlocProvider.value(- value: _cellBloc,- child: BlocBuilder<ChecklistCellBloc, ChecklistCellState>(- builder: (context, state) {- if (widget.cellStyle.useRoundedBorders) {- return InkWell(- borderRadius: const BorderRadius.all(Radius.circular(14)),- onTap: () => showMobileBottomSheet(- context,- padding: EdgeInsets.zero,- backgroundColor: Theme.of(context).colorScheme.background,- builder: (context) {- return MobileChecklistCellEditScreen(- cellController: widget.cellControllerBuilder.build()- as ChecklistCellController,- );- },- ),- child: Container(- constraints: const BoxConstraints(- minHeight: 48,- minWidth: double.infinity,- ),- decoration: BoxDecoration(- border: Border.fromBorderSide(- BorderSide(color: Theme.of(context).colorScheme.outline),- ),- borderRadius: const BorderRadius.all(Radius.circular(14)),- ),- child: Padding(- padding: widget.cellStyle.cellPadding ?? EdgeInsets.zero,- child: Align(- alignment: AlignmentDirectional.centerStart,- child: state.tasks.isEmpty- ? FlowyText(- widget.cellStyle.placeholder,- fontSize: 15,- color: Theme.of(context).hintColor,- )- : ChecklistProgressBar(- tasks: state.tasks,- percent: state.percent,- fontSize: 15,- ),- ),- ),- ),- );- } else {- return FlowyButton(- radius: BorderRadius.zero,- hoverColor: Colors.transparent,- text: Container(- alignment: Alignment.centerLeft,- padding:- widget.cellStyle.cellPadding ?? GridSize.cellContentInsets,- child: state.tasks.isEmpty- ? FlowyText(- widget.cellStyle.placeholder,- fontSize: 15,- color: Theme.of(context).hintColor,- )- : ChecklistProgressBar(- tasks: state.tasks,- percent: state.percent,- fontSize: 15,- ),- ),- onTap: () => showMobileBottomSheet(- context,- padding: EdgeInsets.zero,- backgroundColor: Theme.of(context).colorScheme.background,- builder: (context) {- return MobileChecklistCellEditScreen(- cellController: widget.cellControllerBuilder.build()- as ChecklistCellController,- );- },- ),- );- }- },- ),- );- }-- @override- void requestBeginFocus() {}-}diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/mobile_number_cell.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/mobile_number_cell.dartdeleted file mode 100644index f9c209e9ee..0000000000--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/mobile_number_cell.dart+++ /dev/null@@ -1,87 +0,0 @@-import 'dart:async';-import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';-import 'package:appflowy/plugins/database/widgets/row/cell_builder.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/number_cell/number_cell_bloc.dart';-import 'package:flutter/material.dart';-import 'package:flutter_bloc/flutter_bloc.dart';--class MobileNumberCell extends GridCellWidget {- MobileNumberCell({- super.key,- required this.cellControllerBuilder,- this.hintText,- });-- final CellControllerBuilder cellControllerBuilder;- final String? hintText;-- @override- GridEditableTextCell<MobileNumberCell> createState() => _NumberCellState();-}--class _NumberCellState extends GridEditableTextCell<MobileNumberCell> {- late final NumberCellBloc _cellBloc;- late final TextEditingController _controller;-- @override- SingleListenerFocusNode focusNode = SingleListenerFocusNode();-- @override- void initState() {- final cellController =- widget.cellControllerBuilder.build() as NumberCellController;- _cellBloc = NumberCellBloc(cellController: cellController)- ..add(const NumberCellEvent.initial());- _controller = TextEditingController(text: _cellBloc.state.cellContent);- super.initState();- }-- @override- Widget build(BuildContext context) {- return BlocProvider.value(- value: _cellBloc,- child: MultiBlocListener(- listeners: [- BlocListener<NumberCellBloc, NumberCellState>(- listenWhen: (p, c) => p.cellContent != c.cellContent,- listener: (context, state) => _controller.text = state.cellContent,- ),- ],- child: TextField(- controller: _controller,- focusNode: focusNode,- style: Theme.of(context).textTheme.bodyMedium?.copyWith(fontSize: 15),- maxLines: 1,- decoration: InputDecoration(- enabledBorder: InputBorder.none,- focusedBorder: InputBorder.none,- hintText: widget.hintText,- contentPadding:- const EdgeInsets.symmetric(horizontal: 14, vertical: 12),- isCollapsed: true,- ),- onTapOutside: (event) =>- FocusManager.instance.primaryFocus?.unfocus(),- ),- ),- );- }-- @override- Future<void> dispose() async {- _cellBloc.close();- super.dispose();- }-- @override- Future<void> focusChanged() async {- if (mounted &&- _cellBloc.isClosed == false &&- _controller.text != _cellBloc.state.cellContent) {- _cellBloc.add(NumberCellEvent.updateCell(_controller.text));- }- }-- @override- String? onCopy() => _cellBloc.state.cellContent;-}diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/mobile_text_cell.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/mobile_text_cell.dartdeleted file mode 100644index 8cb7c00260..0000000000--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/mobile_text_cell.dart+++ /dev/null@@ -1,90 +0,0 @@-import 'dart:async';-import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';-import 'package:appflowy/plugins/database/widgets/row/cell_builder.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/text_cell/text_cell.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/text_cell/text_cell_bloc.dart';-import 'package:flutter/material.dart';-import 'package:flutter_bloc/flutter_bloc.dart';--class MobileTextCell extends GridCellWidget {- MobileTextCell({- super.key,- required this.cellControllerBuilder,- GridCellStyle? style,- }) {- if (style != null) {- cellStyle = (style as GridTextCellStyle);- } else {- cellStyle = const GridTextCellStyle();- }- }-- final CellControllerBuilder cellControllerBuilder;- late final GridTextCellStyle cellStyle;-- @override- GridEditableTextCell<MobileTextCell> createState() => _MobileTextCellState();-}--class _MobileTextCellState extends GridEditableTextCell<MobileTextCell> {- late final TextCellBloc _cellBloc;- late final TextEditingController _controller;-- @override- SingleListenerFocusNode focusNode = SingleListenerFocusNode();-- @override- void initState() {- super.initState();- final cellController =- widget.cellControllerBuilder.build() as TextCellController;- _cellBloc = TextCellBloc(cellController: cellController)- ..add(const TextCellEvent.initial());- _controller = TextEditingController(text: _cellBloc.state.content);- }-- @override- Widget build(BuildContext context) {- return BlocProvider.value(- value: _cellBloc,- child: BlocListener<TextCellBloc, TextCellState>(- listener: (context, state) {- if (_controller.text != state.content) {- _controller.text = state.content;- }- },- child: TextField(- controller: _controller,- focusNode: focusNode,- style: Theme.of(context).textTheme.bodyMedium?.copyWith(fontSize: 15),- maxLines: 1,- decoration: InputDecoration(- enabledBorder: InputBorder.none,- focusedBorder: InputBorder.none,- hintText: widget.cellStyle.placeholder,- contentPadding:- const EdgeInsets.symmetric(horizontal: 14, vertical: 12),- isCollapsed: true,- ),- onTapOutside: (event) =>- FocusManager.instance.primaryFocus?.unfocus(),- ),- ),- );- }-- @override- Future<void> dispose() async {- _cellBloc.close();- super.dispose();- }-- @override- String? onCopy() => _cellBloc.state.content;-- @override- Future<void> focusChanged() {- _cellBloc.add(TextCellEvent.updateText(_controller.text));- return super.focusChanged();- }-}diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/mobile_timestamp_cell.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/mobile_timestamp_cell.dartdeleted file mode 100644index cad0b51b9b..0000000000--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/mobile_timestamp_cell.dart+++ /dev/null@@ -1,65 +0,0 @@-import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';-import 'package:appflowy/plugins/database/widgets/row/cell_builder.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/timestamp_cell/timestamp_cell_bloc.dart';-import 'package:flowy_infra_ui/style_widget/text.dart';-import 'package:flutter/material.dart';-import 'package:flutter_bloc/flutter_bloc.dart';--class MobileTimestampCell extends GridCellWidget {- MobileTimestampCell({- super.key,- required this.cellControllerBuilder,- });-- final CellControllerBuilder cellControllerBuilder;-- @override- GridCellState<MobileTimestampCell> createState() => _TimestampCellState();-}--class _TimestampCellState extends GridCellState<MobileTimestampCell> {- late final TimestampCellBloc _cellBloc;-- @override- void initState() {- final cellController =- widget.cellControllerBuilder.build() as TimestampCellController;- _cellBloc = TimestampCellBloc(cellController: cellController)- ..add(const TimestampCellEvent.initial());- super.initState();- }-- @override- Widget build(BuildContext context) {- return BlocProvider.value(- value: _cellBloc,- child: BlocBuilder<TimestampCellBloc, TimestampCellState>(- builder: (context, state) {- return Align(- alignment: Alignment.centerLeft,- child: Padding(- padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 12),- child: FlowyText(- state.dateStr,- fontSize: 15,- maxLines: 1,- ),- ),- );- },- ),- );- }-- @override- Future<void> dispose() async {- _cellBloc.close();- super.dispose();- }-- @override- String? onCopy() => _cellBloc.state.dateStr;-- @override- void requestBeginFocus() {}-}diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/mobile_url_cell.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/mobile_url_cell.dartdeleted file mode 100644index 9c2b9f02b4..0000000000--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/row/cells/mobile_url_cell.dart+++ /dev/null@@ -1,128 +0,0 @@-import 'dart:async';-import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/mobile/presentation/bottom_sheet/show_mobile_bottom_sheet.dart';-import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';-import 'package:appflowy/plugins/database/widgets/row/cell_builder.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/url_cell/url_cell_bloc.dart';-import 'package:easy_localization/easy_localization.dart';-import 'package:flutter/material.dart';-import 'package:flutter_bloc/flutter_bloc.dart';-import 'package:go_router/go_router.dart';-import 'package:url_launcher/url_launcher_string.dart';--class MobileURLCell extends GridCellWidget {- MobileURLCell({- super.key,- required this.cellControllerBuilder,- this.hintText,- });-- final CellControllerBuilder cellControllerBuilder;- final String? hintText;-- @override- GridCellState<MobileURLCell> createState() => _GridURLCellState();-}--class _GridURLCellState extends GridCellState<MobileURLCell> {- late final URLCellBloc _cellBloc;- final FocusNode _focusNode = FocusNode();-- @override- void initState() {- super.initState();- final cellController =- widget.cellControllerBuilder.build() as URLCellController;- _cellBloc = URLCellBloc(cellController: cellController)- ..add(const URLCellEvent.initial());- }-- @override- Future<void> dispose() async {- _cellBloc.close();- _focusNode.dispose();- super.dispose();- }-- @override- Widget build(BuildContext context) {- return BlocProvider.value(- value: _cellBloc,- child: BlocSelector<URLCellBloc, URLCellState, String>(- selector: (state) => state.content,- builder: (context, content) {- if (content.isEmpty) {- return TextField(- focusNode: _focusNode,- keyboardType: TextInputType.url,- maxLines: 1,- decoration: InputDecoration(- enabledBorder: InputBorder.none,- focusedBorder: InputBorder.none,- hintText: widget.hintText,- contentPadding:- const EdgeInsets.symmetric(horizontal: 14, vertical: 12),- isCollapsed: true,- ),- onTapOutside: (event) =>- FocusManager.instance.primaryFocus?.unfocus(),- onSubmitted: (value) =>- _cellBloc.add(URLCellEvent.updateURL(value)),- );- }-- return Align(- alignment: Alignment.centerLeft,- child: GestureDetector(- onTap: () {- if (content.isEmpty) {- return;- }- final shouldAddScheme = !['http', 'https']- .any((pattern) => content.startsWith(pattern));- final url = shouldAddScheme ? 'http://$content' : content;- canLaunchUrlString(url).then((value) => launchUrlString(url));- },- onLongPress: () => showMobileBottomSheet(- context,- title: LocaleKeys.board_mobile_editURL.tr(),- showHeader: true,- showCloseButton: true,- builder: (_) {- final controller = TextEditingController(text: content);- return TextField(- controller: controller,- autofocus: true,- keyboardType: TextInputType.url,- onEditingComplete: () {- _cellBloc.add(URLCellEvent.updateURL(controller.text));- context.pop();- },- );- },- ),- child: SingleChildScrollView(- scrollDirection: Axis.horizontal,- padding:- const EdgeInsets.symmetric(horizontal: 12, vertical: 10),- child: Text(- content,- maxLines: 1,- style: Theme.of(context).textTheme.titleMedium?.copyWith(- decoration: TextDecoration.underline,- color: Theme.of(context).colorScheme.primary,- ),- ),- ),- ),- );- },- ),- );- }-- @override- void requestBeginFocus() {- _focusNode.requestFocus();- }-}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.dartindex 4d29762cb8..0f8ee5ddde 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@@ -77,7 +77,7 @@ class _MobileEditPropertyScreenState extends State<MobileEditPropertyScreen> {}if (newField.type != widget.field.fieldType) {- await fieldService.updateFieldType(fieldType: newField.type);+ await fieldService.updateType(fieldType: newField.type);}final data = newField.getTypeOptionData();diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/cell/cell_cache.dart b/frontend/appflowy_flutter/lib/plugins/database/application/cell/cell_cache.dartindex 86810aa7ee..16ce5b29fe 100644--- a/frontend/appflowy_flutter/lib/plugins/database/application/cell/cell_cache.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/application/cell/cell_cache.dart@@ -1,77 +1,36 @@-part of 'cell_service.dart';+import 'package:appflowy/plugins/database/application/row/row_service.dart';-typedef CellContextByFieldId = LinkedHashMap<String, DatabaseCellContext>;+import 'cell_controller.dart';-class DatabaseCell {- dynamic object;- DatabaseCell({- required this.object,- });-}--/// Use to index the cell in the grid.-/// We use [fieldId + rowId] to identify the cell.-class CellCacheKey {- final String fieldId;- final RowId rowId;- CellCacheKey({- required this.fieldId,- required this.rowId,- });-}--/// GridCellCache is used to cache cell data of each block.-/// We use GridCellCacheKey to index the cell in the cache.+/// CellMemCache is used to cache cell data of each block.+/// We use CellContext to index the cell in the cache./// Read https://appflowy.gitbook.io/docs/essential-documentation/contribute-to-appflowy/architecture/frontend/grid/// for more informationclass CellMemCache {- final String viewId;-- /// fieldId: {cacheKey: GridCell}+ /// fieldId: {rowId: cellData}final Map<String, Map<RowId, dynamic>> _cellByFieldId = {};- CellMemCache({- required this.viewId,- });++ CellMemCache();void removeCellWithFieldId(String fieldId) {_cellByFieldId.remove(fieldId);}- void remove(CellCacheKey key) {- final map = _cellByFieldId[key.fieldId];- if (map != null) {- map.remove(key.rowId);- }+ void remove(CellContext context) {+ _cellByFieldId[context.fieldId]?.remove(context.rowId);}- void insert<T extends DatabaseCell>(CellCacheKey key, T value) {- var map = _cellByFieldId[key.fieldId];- if (map == null) {- _cellByFieldId[key.fieldId] = {};- map = _cellByFieldId[key.fieldId];- }-- map![key.rowId] = value.object;+ void insert<T>(CellContext context, T data) {+ _cellByFieldId.putIfAbsent(context.fieldId, () => {});+ _cellByFieldId[context.fieldId]![context.rowId] = data;}- T? get<T>(CellCacheKey key) {- final map = _cellByFieldId[key.fieldId];- if (map == null) {- return null;- } else {- final value = map[key.rowId];- if (value is T) {- return value;- } else {- if (value != null) {- Log.error("Expected value type: $T, but receive $value");- }- return null;- }- }+ T? get<T>(CellContext context) {+ final value = _cellByFieldId[context.fieldId]?[context.rowId];+ return value is T ? value : null;}- Future<void> dispose() async {+ void dispose() {_cellByFieldId.clear();}}diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/cell/cell_controller.dart b/frontend/appflowy_flutter/lib/plugins/database/application/cell/cell_controller.dartindex 495354d7c6..bbccbfd4c6 100644--- a/frontend/appflowy_flutter/lib/plugins/database/application/cell/cell_controller.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/application/cell/cell_controller.dart@@ -1,32 +1,47 @@import 'dart:async';+import 'package:appflowy/plugins/database/application/field/field_controller.dart';import 'package:appflowy/plugins/database/application/field/field_info.dart';import 'package:appflowy/plugins/database/application/field/field_listener.dart';+import 'package:appflowy/plugins/database/application/field/type_option/type_option_data_parser.dart';+import 'package:appflowy/plugins/database/application/row/row_cache.dart';import 'package:appflowy/plugins/database/application/row/row_meta_listener.dart';import 'package:appflowy/plugins/database/application/row/row_service.dart';import 'package:appflowy_backend/log.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/field_entities.pbenum.dart';+import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:dartz/dartz.dart';-import 'package:equatable/equatable.dart';import 'package:flutter/foundation.dart';+import 'package:freezed_annotation/freezed_annotation.dart';-import '../field/type_option/type_option_data_parser.dart';+import 'cell_cache.dart';+import 'cell_data_loader.dart';+import 'cell_data_persistence.dart';import 'cell_listener.dart';-import 'cell_service.dart';-/// IGridCellController is used to manipulate the cell and receive notifications.-/// * Read/Write cell data-/// * Listen on field/cell notifications.+part 'cell_controller.freezed.dart';++@freezed+class CellContext with _$CellContext {+ const factory CellContext({+ required String fieldId,+ required RowId rowId,+ }) = _DatabaseCellContext;+}++/// [CellController] is used to manipulate the cell and receive notifications.+/// The cell data is stored in the [RowCache]'s [CellMemCache].///-/// Generic T represents the type of the cell data.-/// Generic D represents the type of data that will be saved to the disk+/// * Read/write cell data+/// * Listen on field/cell notifications.///-// ignore: must_be_immutable-class CellController<T, D> extends Equatable {- DatabaseCellContext _cellContext;- final CellMemCache _cellCache;- final CellCacheKey _cacheKey;+/// T represents the type of the cell data.+/// D represents the type of data that will be saved to the disk.+class CellController<T, D> {+ final String viewId;+ final CellContext _cellContext;+ final FieldController _fieldController;+ final RowCache _rowCache;final CellDataLoader<T> _cellDataLoader;final CellDataPersistence<D> _cellDataPersistence;@@ -35,48 +50,52 @@ class CellController<T, D> extends Equatable {SingleFieldListener? _fieldListener;CellDataNotifier<T?>? _cellDataNotifier;- VoidCallback? _onCellFieldChanged;+ void Function(FieldPB field)? _onCellFieldChanged;VoidCallback? _onRowMetaChanged;Timer? _loadDataOperation;Timer? _saveDataOperation;- String get viewId => _cellContext.viewId;-RowId get rowId => _cellContext.rowId;-- String get fieldId => _cellContext.fieldInfo.id;-- FieldInfo get fieldInfo => _cellContext.fieldInfo;-- FieldType get fieldType => _cellContext.fieldInfo.fieldType;-- String? get emoji => _cellContext.emoji;+ String get fieldId => _cellContext.fieldId;+ FieldInfo get fieldInfo => _fieldController.getField(_cellContext.fieldId)!;+ FieldType get fieldType =>+ _fieldController.getField(_cellContext.fieldId)!.fieldType;+ RowMetaPB? get rowMeta => _rowCache.getRow(rowId)?.rowMeta;+ String? get icon => rowMeta?.icon;+ CellMemCache get _cellCache => _rowCache.cellCache;CellController({- required DatabaseCellContext cellContext,- required CellMemCache cellCache,+ required this.viewId,+ required FieldController fieldController,+ required CellContext cellContext,+ required RowCache rowCache,required CellDataLoader<T> cellDataLoader,required CellDataPersistence<D> cellDataPersistence,- }) : _cellContext = cellContext,- _cellCache = cellCache,+ }) : _fieldController = fieldController,+ _cellContext = cellContext,+ _rowCache = rowCache,_cellDataLoader = cellDataLoader,_cellDataPersistence = cellDataPersistence,- _rowMetaListener = RowMetaListener(cellContext.rowId),_fieldListener = SingleFieldListener(fieldId: cellContext.fieldId),- _cacheKey = CellCacheKey(- rowId: cellContext.rowId,- fieldId: cellContext.fieldInfo.id,- ) {- _cellDataNotifier = CellDataNotifier(value: _cellCache.get(_cacheKey));+ _cellDataNotifier =+ CellDataNotifier(value: rowCache.cellCache.get(cellContext)) {+ _startListening();+ }++ /// casting method for painless type coersion+ CellController<A, B> as<A, B>() => this as CellController<A, B>;++ /// Start listening to backend changes+ void _startListening() {_cellListener = CellListener(- rowId: cellContext.rowId,- fieldId: cellContext.fieldInfo.id,+ rowId: _cellContext.rowId,+ fieldId: _cellContext.fieldId,);- /// 1.Listen on user edit event and load the new cell data if needed.- /// For example:- /// user input: 12- /// cell display: $12+ // 1. Listen on user edit event and load the new cell data if needed.+ // For example:+ // user input: 12+ // cell display: $12_cellListener?.start(onCellChanged: (result) {result.fold(@@ -86,38 +105,36 @@ class CellController<T, D> extends Equatable {},);- /// 2.Listen on the field event and load the cell data if needed.+ // 2. Listen on the field event and load the cell data if needed._fieldListener?.start(onFieldChanged: (fieldPB) {- /// reloadOnFieldChanged should be true if you need to load the data when the corresponding field is changed- /// For example:- /// ¥12 -> $12- if (_cellDataLoader.reloadOnFieldChanged) {- _cellContext = _cellContext.copyWith(- fieldInfo: _cellContext.fieldInfo.copyWith(field: fieldPB),- );+ // reloadOnFieldChanged should be true if you want to reload the cell+ // data when the corresponding field is changed.+ // For example:+ // ¥12 -> $12+ if (_cellDataLoader.reloadOnFieldChange) {_loadData();}- _onCellFieldChanged?.call();+ _onCellFieldChanged?.call(fieldPB);},);- // Only the primary can listen on the row meta changes.- if (_cellContext.fieldInfo.field.isPrimary) {+ // 3. If the field is primary listen to row meta changes.+ if (fieldInfo.field.isPrimary) {+ _rowMetaListener = RowMetaListener(_cellContext.rowId);_rowMetaListener?.start(callback: (newRowMeta) {- _cellContext = _cellContext.copyWith(rowMeta: newRowMeta);_onRowMetaChanged?.call();},);}}- /// Listen on the cell content or field changes- VoidCallback? startListening({+ /// Add a new listener+ VoidCallback? addListener({required void Function(T?) onCellChanged,+ void Function(FieldPB field)? onCellFieldChanged,VoidCallback? onRowMetaChanged,- VoidCallback? onCellFieldChanged,}) {_onCellFieldChanged = onCellFieldChanged;_onRowMetaChanged = onRowMetaChanged;@@ -134,11 +151,11 @@ class CellController<T, D> extends Equatable {_cellDataNotifier?.removeListener(fn);}- /// Return the cell data.- /// The cell data will be read from the Cache first, and load from disk if it does not exist.- /// You can set [loadIfNotExist] to false (default is true) to disable loading the cell data.+ /// Get the cell data. The cell data will be read from the cache first,+ /// and load from disk if it doesn't exist. You can set [loadIfNotExist] to+ /// false to disable this behavior.T? getCellData({bool loadIfNotExist = true}) {- final data = _cellCache.get(_cacheKey);+ final data = _cellCache.get(_cellContext);if (data == null && loadIfNotExist) {_loadData();}@@ -147,30 +164,34 @@ class CellController<T, D> extends Equatable {/// Return the TypeOptionPB that can be parsed into corresponding class using the [parser]./// [PD] is the type that the parser return.- PD getTypeOption<PD, P extends TypeOptionParser>(- P parser,- ) {- return parser.fromBuffer(_cellContext.fieldInfo.field.typeOptionData);+ PD getTypeOption<PD, P extends TypeOptionParser>(P parser) {+ return parser.fromBuffer(fieldInfo.field.typeOptionData);}- /// Save the cell data to disk- /// You can set [deduplicate] to true (default is false) to reduce the save operation.- /// It's useful when you call this method when user editing the [TextField].- /// The default debounce interval is 300 milliseconds.+ /// Saves the cell data to disk. You can set [debounce] to reduce the amount+ /// of save operations, which is useful when editing a [TextField].Future<void> saveCellData(D data, {- bool deduplicate = false,+ bool debounce = false,void Function(Option<FlowyError>)? onFinish,}) async {_loadDataOperation?.cancel();- if (deduplicate) {+ if (debounce) {_saveDataOperation?.cancel();_saveDataOperation = Timer(const Duration(milliseconds: 300), () async {- final result = await _cellDataPersistence.save(data);+ final result = await _cellDataPersistence.save(+ viewId: viewId,+ cellContext: _cellContext,+ data: data,+ );onFinish?.call(result);});} else {- final result = await _cellDataPersistence.save(data);+ final result = await _cellDataPersistence.save(+ viewId: viewId,+ cellContext: _cellContext,+ data: data,+ );onFinish?.call(result);}}@@ -180,11 +201,13 @@ class CellController<T, D> extends Equatable {_loadDataOperation?.cancel();_loadDataOperation = Timer(const Duration(milliseconds: 10), () {- _cellDataLoader.loadData().then((data) {+ _cellDataLoader+ .loadData(viewId: viewId, cellContext: _cellContext)+ .then((data) {if (data != null) {- _cellCache.insert(_cacheKey, DatabaseCell(object: data));+ _cellCache.insert(_cellContext, data);} else {- _cellCache.remove(_cacheKey);+ _cellCache.remove(_cellContext);}_cellDataNotifier?.value = data;});@@ -207,12 +230,6 @@ class CellController<T, D> extends Equatable {_cellDataNotifier = null;_onRowMetaChanged = null;}-- @override- List<Object> get props => [- _cellCache.get(_cacheKey) ?? "",- _cellContext.rowId + _cellContext.fieldInfo.id,- ];}class CellDataNotifier<T> extends ChangeNotifier {diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/cell/cell_controller_builder.dart b/frontend/appflowy_flutter/lib/plugins/database/application/cell/cell_controller_builder.dartindex 7d0458adcf..fbeb66b6c0 100644--- a/frontend/appflowy_flutter/lib/plugins/database/application/cell/cell_controller_builder.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/application/cell/cell_controller_builder.dart@@ -1,12 +1,9 @@-import 'package:appflowy_backend/protobuf/flowy-database2/checklist_entities.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/date_entities.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/field_entities.pbenum.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/select_option.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/timestamp_entities.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/url_entities.pb.dart';+import 'package:appflowy/plugins/database/application/database_controller.dart';+import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';import 'cell_controller.dart';-import 'cell_service.dart';+import 'cell_data_loader.dart';+import 'cell_data_persistence.dart';typedef TextCellController = CellController<String, String>;typedef CheckboxCellController = CellController<String, String>;@@ -18,125 +15,109 @@ typedef DateCellController = CellController<DateCellDataPB, String>;typedef TimestampCellController = CellController<TimestampCellDataPB, String>;typedef URLCellController = CellController<URLCellDataPB, String>;-class CellControllerBuilder {- final DatabaseCellContext _cellContext;- final CellMemCache _cellCache;-- CellControllerBuilder({- required DatabaseCellContext cellContext,- required CellMemCache cellCache,- }) : _cellCache = cellCache,- _cellContext = cellContext;-- CellController build() {- switch (_cellContext.fieldType) {- case FieldType.Checkbox:- final cellDataLoader = CellDataLoader(- cellContext: _cellContext,+CellController makeCellController(+ DatabaseController databaseController,+ CellContext cellContext,+) {+ final DatabaseController(:viewId, :rowCache, :fieldController) =+ databaseController;+ final fieldType = fieldController.getField(cellContext.fieldId)!.fieldType;+ switch (fieldType) {+ case FieldType.Checkbox:+ return TextCellController(+ viewId: viewId,+ fieldController: fieldController,+ cellContext: cellContext,+ rowCache: rowCache,+ cellDataLoader: CellDataLoader(parser: StringCellDataParser(),- );- return TextCellController(- cellContext: _cellContext,- cellCache: _cellCache,- cellDataLoader: cellDataLoader,- cellDataPersistence:- TextCellDataPersistence(cellContext: _cellContext),- );- case FieldType.DateTime:- final cellDataLoader = CellDataLoader(- cellContext: _cellContext,+ ),+ cellDataPersistence: TextCellDataPersistence(),+ );+ case FieldType.DateTime:+ return DateCellController(+ viewId: viewId,+ fieldController: fieldController,+ cellContext: cellContext,+ rowCache: rowCache,+ cellDataLoader: CellDataLoader(parser: DateCellDataParser(),- reloadOnFieldChanged: true,- );- return DateCellController(- cellContext: _cellContext,- cellCache: _cellCache,- cellDataLoader: cellDataLoader,- cellDataPersistence:- TextCellDataPersistence(cellContext: _cellContext),- );- case FieldType.LastEditedTime:- case FieldType.CreatedTime:- final cellDataLoader = CellDataLoader(- cellContext: _cellContext,+ reloadOnFieldChange: true,+ ),+ cellDataPersistence: TextCellDataPersistence(),+ );+ case FieldType.LastEditedTime:+ case FieldType.CreatedTime:+ return TimestampCellController(+ viewId: viewId,+ fieldController: fieldController,+ cellContext: cellContext,+ rowCache: rowCache,+ cellDataLoader: CellDataLoader(parser: TimestampCellDataParser(),- reloadOnFieldChanged: true,- );- return TimestampCellController(- cellContext: _cellContext,- cellCache: _cellCache,- cellDataLoader: cellDataLoader,- cellDataPersistence:- TextCellDataPersistence(cellContext: _cellContext),- );- case FieldType.Number:- final cellDataLoader = CellDataLoader(- cellContext: _cellContext,+ reloadOnFieldChange: true,+ ),+ cellDataPersistence: TextCellDataPersistence(),+ );+ case FieldType.Number:+ return NumberCellController(+ viewId: viewId,+ fieldController: fieldController,+ cellContext: cellContext,+ rowCache: rowCache,+ cellDataLoader: CellDataLoader(parser: NumberCellDataParser(),- reloadOnFieldChanged: true,- );- return NumberCellController(- cellContext: _cellContext,- cellCache: _cellCache,- cellDataLoader: cellDataLoader,- cellDataPersistence:- TextCellDataPersistence(cellContext: _cellContext),- );- case FieldType.RichText:- final cellDataLoader = CellDataLoader(- cellContext: _cellContext,+ reloadOnFieldChange: true,+ ),+ cellDataPersistence: TextCellDataPersistence(),+ );+ case FieldType.RichText:+ return TextCellController(+ viewId: viewId,+ fieldController: fieldController,+ cellContext: cellContext,+ rowCache: rowCache,+ cellDataLoader: CellDataLoader(parser: StringCellDataParser(),- );- return TextCellController(- cellContext: _cellContext,- cellCache: _cellCache,- cellDataLoader: cellDataLoader,- cellDataPersistence:- TextCellDataPersistence(cellContext: _cellContext),- );- case FieldType.MultiSelect:- case FieldType.SingleSelect:- final cellDataLoader = CellDataLoader(- cellContext: _cellContext,+ ),+ cellDataPersistence: TextCellDataPersistence(),+ );+ case FieldType.MultiSelect:+ case FieldType.SingleSelect:+ return SelectOptionCellController(+ viewId: viewId,+ fieldController: fieldController,+ cellContext: cellContext,+ rowCache: rowCache,+ cellDataLoader: CellDataLoader(parser: SelectOptionCellDataParser(),- reloadOnFieldChanged: true,- );-- return SelectOptionCellController(- cellContext: _cellContext,- cellCache: _cellCache,- cellDataLoader: cellDataLoader,- cellDataPersistence:- TextCellDataPersistence(cellContext: _cellContext),- );-- case FieldType.Checklist:- final cellDataLoader = CellDataLoader(- cellContext: _cellContext,+ reloadOnFieldChange: true,+ ),+ cellDataPersistence: TextCellDataPersistence(),+ );+ case FieldType.Checklist:+ return ChecklistCellController(+ viewId: viewId,+ fieldController: fieldController,+ cellContext: cellContext,+ rowCache: rowCache,+ cellDataLoader: CellDataLoader(parser: ChecklistCellDataParser(),- reloadOnFieldChanged: true,- );-- return ChecklistCellController(- cellContext: _cellContext,- cellCache: _cellCache,- cellDataLoader: cellDataLoader,- cellDataPersistence:- TextCellDataPersistence(cellContext: _cellContext),- );- case FieldType.URL:- final cellDataLoader = CellDataLoader(- cellContext: _cellContext,+ reloadOnFieldChange: true,+ ),+ cellDataPersistence: TextCellDataPersistence(),+ );+ case FieldType.URL:+ return URLCellController(+ viewId: viewId,+ fieldController: fieldController,+ cellContext: cellContext,+ rowCache: rowCache,+ cellDataLoader: CellDataLoader(parser: URLCellDataParser(),- );- return URLCellController(- cellContext: _cellContext,- cellCache: _cellCache,- cellDataLoader: cellDataLoader,- cellDataPersistence:- TextCellDataPersistence(cellContext: _cellContext),- );- }- throw UnimplementedError;+ ),+ cellDataPersistence: TextCellDataPersistence(),+ );}+ throw UnimplementedError;}diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/cell/cell_data_loader.dart b/frontend/appflowy_flutter/lib/plugins/database/application/cell/cell_data_loader.dartindex 5896e17204..a2b892a8e9 100644--- a/frontend/appflowy_flutter/lib/plugins/database/application/cell/cell_data_loader.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/application/cell/cell_data_loader.dart@@ -1,4 +1,10 @@-part of 'cell_service.dart';+import 'dart:convert';++import 'package:appflowy_backend/log.dart';+import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';++import 'cell_controller.dart';+import 'cell_service.dart';abstract class IGridCellDataConfig {// The cell data will reload if it receives the field's change notification.@@ -10,24 +16,28 @@ abstract class CellDataParser<T> {}class CellDataLoader<T> {- final CellBackendService service = CellBackendService();- final DatabaseCellContext cellContext;final CellDataParser<T> parser;- final bool reloadOnFieldChanged;++ /// Reload the cell data if the field is changed.+ final bool reloadOnFieldChange;CellDataLoader({- required this.cellContext,required this.parser,- this.reloadOnFieldChanged = false,+ this.reloadOnFieldChange = false,});- Future<T?> loadData() {- final fut = service.getCell(cellContext: cellContext);- return fut.then(+ Future<T?> loadData({+ required String viewId,+ required CellContext cellContext,+ }) {+ return CellBackendService.getCell(+ viewId: viewId,+ cellContext: cellContext,+ ).then((result) => result.fold((CellPB cell) {try {- // Return null the data of the cell is empty.+ // Return null if the data of the cell is empty.if (cell.data.isEmpty) {return null;} else {diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/cell/cell_data_persistence.dart b/frontend/appflowy_flutter/lib/plugins/database/application/cell/cell_data_persistence.dartindex ed64abf23e..1b0bc7a03a 100644--- a/frontend/appflowy_flutter/lib/plugins/database/application/cell/cell_data_persistence.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/application/cell/cell_data_persistence.dart@@ -1,22 +1,30 @@-part of 'cell_service.dart';+import 'package:appflowy_backend/protobuf/flowy-error/protobuf.dart';+import 'package:dartz/dartz.dart';++import 'cell_controller.dart';+import 'cell_service.dart';/// Save the cell data to disk/// You can extend this class to do custom operations.abstract class CellDataPersistence<D> {- Future<Option<FlowyError>> save(D data);+ Future<Option<FlowyError>> save({+ required String viewId,+ required CellContext cellContext,+ required D data,+ });}class TextCellDataPersistence implements CellDataPersistence<String> {- final DatabaseCellContext cellContext;- final _cellBackendSvc = CellBackendService();-- TextCellDataPersistence({- required this.cellContext,- });+ TextCellDataPersistence();@override- Future<Option<FlowyError>> save(String data) async {- final fut = _cellBackendSvc.updateCell(+ Future<Option<FlowyError>> save({+ required String viewId,+ required CellContext cellContext,+ required String data,+ }) async {+ final fut = CellBackendService.updateCell(+ viewId: viewId,cellContext: cellContext,data: data,);diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/cell/cell_listener.dart b/frontend/appflowy_flutter/lib/plugins/database/application/cell/cell_listener.dartindex be015b81bd..0399e61200 100644--- a/frontend/appflowy_flutter/lib/plugins/database/application/cell/cell_listener.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/application/cell/cell_listener.dart@@ -1,10 +1,11 @@+import 'dart:async';+import 'dart:typed_data';+import 'package:appflowy/core/notification/grid_notification.dart';-import 'package:dartz/dartz.dart';-import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database2/notification.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';+import 'package:dartz/dartz.dart';import 'package:flowy_infra/notifier.dart';-import 'dart:async';-import 'dart:typed_data';import '../row/row_service.dart';diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/cell/cell_service.dart b/frontend/appflowy_flutter/lib/plugins/database/application/cell/cell_service.dartindex 6ea4fe6cdb..74437cb280 100644--- a/frontend/appflowy_flutter/lib/plugins/database/application/cell/cell_service.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/application/cell/cell_service.dart@@ -1,85 +1,36 @@import 'dart:async';-import 'dart:collection';-import 'package:appflowy_backend/protobuf/flowy-database2/checklist_entities.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/date_entities.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/field_settings_entities.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/row_entities.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/select_option.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/timestamp_entities.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/url_entities.pb.dart';-import 'package:dartz/dartz.dart';++import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';import 'package:appflowy_backend/dispatch/dispatch.dart';-import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/cell_entities.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/field_entities.pb.dart';-import 'package:flutter/foundation.dart';-import 'package:freezed_annotation/freezed_annotation.dart';-import 'dart:convert' show utf8;+import 'package:dartz/dartz.dart';-import '../field/field_info.dart';-import '../row/row_service.dart';-part 'cell_service.freezed.dart';-part 'cell_data_loader.dart';-part 'cell_cache.dart';-part 'cell_data_persistence.dart';+import 'cell_controller.dart';class CellBackendService {CellBackendService();- Future<Either<void, FlowyError>> updateCell({- required DatabaseCellContext cellContext,+ static Future<Either<void, FlowyError>> updateCell({+ required String viewId,+ required CellContext cellContext,required String data,}) {- final payload = CellChangesetPB.create()- ..viewId = cellContext.viewId+ final payload = CellChangesetPB()+ ..viewId = viewId..fieldId = cellContext.fieldId..rowId = cellContext.rowId..cellChangeset = data;return DatabaseEventUpdateCell(payload).send();}- Future<Either<CellPB, FlowyError>> getCell({- required DatabaseCellContext cellContext,+ static Future<Either<CellPB, FlowyError>> getCell({+ required String viewId,+ required CellContext cellContext,}) {- final payload = CellIdPB.create()- ..viewId = cellContext.viewId+ final payload = CellIdPB()+ ..viewId = viewId..fieldId = cellContext.fieldId..rowId = cellContext.rowId;return DatabaseEventGetCell(payload).send();}}--/// We can locate the cell by using database + rowId + field.id.-@freezed-class DatabaseCellContext with _$DatabaseCellContext {- const factory DatabaseCellContext({- required String viewId,- required RowMetaPB rowMeta,- required FieldInfo fieldInfo,- }) = _DatabaseCellContext;-- // ignore: unused_element- const DatabaseCellContext._();-- String get rowId => rowMeta.id;-- String get fieldId => fieldInfo.field.id;-- FieldType get fieldType => fieldInfo.field.fieldType;-- ValueKey key() {- return ValueKey("${rowMeta.id}$fieldId${fieldInfo.field.fieldType}");- }-- /// Only the primary field can have an emoji.- String? get emoji => fieldInfo.field.isPrimary ? rowMeta.icon : null;-- /// Determines whether a database cell context should be visible.- /// It will be visible when the field is not hidden or when hidden fields- /// should be shown.- bool isVisible({bool showHiddenFields = false}) {- return showHiddenFields ||- fieldInfo.visibility != FieldVisibility.AlwaysHidden;- }-}diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/cell/select_option_cell_service.dart b/frontend/appflowy_flutter/lib/plugins/database/application/cell/select_option_cell_service.dartindex 33c25fd3a0..c3e385b4e7 100644--- a/frontend/appflowy_flutter/lib/plugins/database/application/cell/select_option_cell_service.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/application/cell/select_option_cell_service.dart@@ -26,16 +26,11 @@ class SelectOptionCellBackendService {(result) {return result.fold((option) {- final payload = RepeatedSelectOptionPayload.create()+ final payload = RepeatedSelectOptionPayload()..viewId = viewId..fieldId = fieldId- ..rowId = rowId;+ ..rowId = rowId..items.add(option);- if (isSelected) {- payload.items.add(option);- } else {- payload.items.add(option);- }return DatabaseEventInsertOrUpdateSelectOption(payload).send();},(r) => right(r),@@ -47,18 +42,19 @@ class SelectOptionCellBackendService {Future<Either<Unit, FlowyError>> update({required SelectOptionPB option,}) {- final payload = RepeatedSelectOptionPayload.create()+ final payload = RepeatedSelectOptionPayload()..items.add(option)..viewId = viewId..fieldId = fieldId..rowId = rowId;+return DatabaseEventInsertOrUpdateSelectOption(payload).send();}Future<Either<Unit, FlowyError>> delete({required Iterable<SelectOptionPB> options,}) {- final payload = RepeatedSelectOptionPayload.create()+ final payload = RepeatedSelectOptionPayload()..items.addAll(options)..viewId = viewId..fieldId = fieldId@@ -68,7 +64,7 @@ class SelectOptionCellBackendService {}Future<Either<SelectOptionCellDataPB, FlowyError>> getCellData() {- final payload = CellIdPB.create()+ final payload = CellIdPB()..viewId = viewId..fieldId = fieldId..rowId = rowId;@@ -79,23 +75,25 @@ class SelectOptionCellBackendService {Future<Either<void, FlowyError>> select({required Iterable<String> optionIds,}) {- final payload = SelectOptionCellChangesetPB.create()+ final payload = SelectOptionCellChangesetPB()..cellIdentifier = _cellIdentifier()..insertOptionIds.addAll(optionIds);+return DatabaseEventUpdateSelectOptionCell(payload).send();}Future<Either<void, FlowyError>> unSelect({required Iterable<String> optionIds,}) {- final payload = SelectOptionCellChangesetPB.create()+ final payload = SelectOptionCellChangesetPB()..cellIdentifier = _cellIdentifier()..deleteOptionIds.addAll(optionIds);+return DatabaseEventUpdateSelectOptionCell(payload).send();}CellIdPB _cellIdentifier() {- return CellIdPB.create()+ return CellIdPB()..viewId = viewId..fieldId = fieldId..rowId = rowId;diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/database_view_service.dart b/frontend/appflowy_flutter/lib/plugins/database/application/database_view_service.dartindex adb9fb59d0..1ac720dac0 100644--- a/frontend/appflowy_flutter/lib/plugins/database/application/database_view_service.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/application/database_view_service.dart@@ -1,15 +1,9 @@import 'package:appflowy/plugins/database/application/row/row_service.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/board_entities.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/calendar_entities.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/database_entities.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/group_changeset.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/setting_entities.pb.dart';-import 'package:dartz/dartz.dart';import 'package:appflowy_backend/dispatch/dispatch.dart';+import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/field_entities.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/group.pb.dart';+import 'package:dartz/dartz.dart';import 'layout/layout_service.dart';diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/defines.dart b/frontend/appflowy_flutter/lib/plugins/database/application/defines.dartindex 1ad4a9ea1c..a7f5b862d9 100644--- a/frontend/appflowy_flutter/lib/plugins/database/application/defines.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/application/defines.dart@@ -1,12 +1,14 @@import 'dart:collection';+// TODO(RS): remove dependency on presentation code+import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/filter_info.dart';import 'package:appflowy/plugins/database/grid/presentation/widgets/sort/sort_info.dart';import 'package:appflowy_backend/protobuf/flowy-database2/database_entities.pb.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:dartz/dartz.dart';import 'package:freezed_annotation/freezed_annotation.dart';-import '../grid/presentation/widgets/filter/filter_info.dart';+import 'cell/cell_controller.dart';import 'field/field_info.dart';import 'row/row_cache.dart';import 'row/row_service.dart';@@ -18,20 +20,22 @@ typedef OnFiltersChanged = void Function(List<FilterInfo>);typedef OnSortsChanged = void Function(List<SortInfo>);typedef OnDatabaseChanged = void Function(DatabasePB);-typedef OnRowsCreated = void Function(List<RowId> ids);+typedef OnRowsCreated = void Function(List<RowId> rowIds);typedef OnRowsUpdated = void Function(- List<RowId> ids,+ List<RowId> rowIds,ChangedReason reason,);-typedef OnRowsDeleted = void Function(List<RowId> ids);+typedef OnRowsDeleted = void Function(List<RowId> rowIds);typedef OnNumOfRowsChanged = void Function(UnmodifiableListView<RowInfo> rows,- UnmodifiableMapView<RowId, RowInfo> rowByRowId,+ UnmodifiableMapView<RowId, RowInfo> rowById,ChangedReason reason,);typedef OnError = void Function(FlowyError);+typedef CellContextByFieldId = LinkedHashMap<String, CellContext>;+@freezedclass LoadingState with _$LoadingState {const factory LoadingState.idle() = _Idle;diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/field/field_editor_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/application/field/field_editor_bloc.dartindex 21b3a6b8ea..3a66f66570 100644--- a/frontend/appflowy_flutter/lib/plugins/database/application/field/field_editor_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/application/field/field_editor_bloc.dart@@ -55,7 +55,7 @@ class FieldEditorBloc extends Bloc<FieldEditorEvent, FieldEditorState> {emit(state.copyWith(field: fieldController.getField(fieldId)!));},switchFieldType: (fieldType) async {- await fieldService.updateFieldType(fieldType: fieldType);+ await fieldService.updateType(fieldType: fieldType);},renameField: (newName) async {final result = await fieldService.updateField(name: newName);@@ -70,14 +70,14 @@ class FieldEditorBloc extends Bloc<FieldEditorEvent, FieldEditorState> {_logIfError(result);},insertLeft: () async {- final result = await fieldService.insertBefore();+ final result = await fieldService.createBefore();result.fold((newField) => onFieldInserted?.call(newField.id),(err) => Log.error("Failed creating field $err"),);},insertRight: () async {- final result = await fieldService.insertAfter();+ final result = await fieldService.createAfter();result.fold((newField) => onFieldInserted?.call(newField.id),(err) => Log.error("Failed creating field $err"),diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/field/field_info.dart b/frontend/appflowy_flutter/lib/plugins/database/application/field/field_info.dartindex b20087b1f2..41f1908dd3 100644--- a/frontend/appflowy_flutter/lib/plugins/database/application/field/field_info.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/application/field/field_info.dart@@ -1,6 +1,6 @@-import 'package:appflowy_backend/protobuf/flowy-database2/field_entities.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/field_settings_entities.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';import 'package:freezed_annotation/freezed_annotation.dart';+part 'field_info.freezed.dart';@freezeddiff --git a/frontend/appflowy_flutter/lib/plugins/database/application/field/field_listener.dart b/frontend/appflowy_flutter/lib/plugins/database/application/field/field_listener.dartindex 09ecaac807..9b8314e6fb 100644--- a/frontend/appflowy_flutter/lib/plugins/database/application/field/field_listener.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/application/field/field_listener.dart@@ -1,12 +1,12 @@+import 'dart:async';+import 'dart:typed_data';+import 'package:appflowy/core/notification/grid_notification.dart';import 'package:appflowy_backend/log.dart';-import 'package:dartz/dartz.dart';+import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/notification.pb.dart';+import 'package:dartz/dartz.dart';import 'package:flowy_infra/notifier.dart';-import 'dart:async';-import 'dart:typed_data';-import 'package:appflowy_backend/protobuf/flowy-database2/field_entities.pb.dart';typedef UpdateFieldNotifiedValue = FieldPB;diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/field/field_service.dart b/frontend/appflowy_flutter/lib/plugins/database/application/field/field_service.dartindex f0a1fa9289..da0e945f05 100644--- a/frontend/appflowy_flutter/lib/plugins/database/application/field/field_service.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/application/field/field_service.dart@@ -5,16 +5,17 @@ import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:dartz/dartz.dart';-/// FieldService consists of lots of event functions. We define the events in the backend(Rust),-/// you can find the corresponding event implementation in event_map.rs of the corresponding crate.-///-/// You could check out the rust-lib/flowy-database/event_map.rs for more information.+/// FieldService provides many field-related interfaces event functions. Check out+/// `rust-lib/flowy-database/event_map.rs` for a list of events and their+/// implementations.class FieldBackendService {- FieldBackendService({required this.viewId, required this.fieldId});-final String viewId;final String fieldId;+ FieldBackendService({required this.viewId, required this.fieldId});++ /// Create a field in a database view. The position will only be applicable+ /// in this view; for other views it will be appended to the endstatic Future<Either<FieldPB, FlowyError>> createField({required String viewId,FieldType fieldType = FieldType.RichText,@@ -33,40 +34,7 @@ class FieldBackendService {return DatabaseEventCreateField(payload).send();}- Future<Either<FieldPB, FlowyError>> insertBefore({- FieldType fieldType = FieldType.RichText,- String? fieldName,- Uint8List? typeOptionData,- }) {- return createField(- viewId: viewId,- fieldType: fieldType,- fieldName: fieldName,- typeOptionData: typeOptionData,- position: OrderObjectPositionPB(- position: OrderObjectPositionTypePB.Before,- objectId: fieldId,- ),- );- }-- Future<Either<FieldPB, FlowyError>> insertAfter({- FieldType fieldType = FieldType.RichText,- String? fieldName,- Uint8List? typeOptionData,- }) {- return createField(- viewId: viewId,- fieldType: fieldType,- fieldName: fieldName,- typeOptionData: typeOptionData,- position: OrderObjectPositionPB(- position: OrderObjectPositionTypePB.After,- objectId: fieldId,- ),- );- }-+ /// Reorder a field within a database viewstatic Future<Either<Unit, FlowyError>> moveField({required String viewId,required String fromFieldId,@@ -81,6 +49,7 @@ class FieldBackendService {return DatabaseEventMoveField(payload).send();}+ /// Delete a fieldstatic Future<Either<Unit, FlowyError>> deleteField({required String viewId,required String fieldId,@@ -93,6 +62,7 @@ class FieldBackendService {return DatabaseEventDeleteField(payload).send();}+ /// Duplicate a fieldstatic Future<Either<Unit, FlowyError>> duplicateField({required String viewId,required String fieldId,@@ -105,6 +75,7 @@ class FieldBackendService {return DatabaseEventDuplicateField(payload).send();}+ /// Update a field's propertiesFuture<Either<Unit, FlowyError>> updateField({String? name,bool? frozen,@@ -124,6 +95,21 @@ class FieldBackendService {return DatabaseEventUpdateField(payload).send();}+ /// Change a field's type+ static Future<Either<Unit, FlowyError>> updateFieldType({+ required String viewId,+ required String fieldId,+ required FieldType fieldType,+ }) {+ final payload = UpdateFieldTypePayloadPB()+ ..viewId = viewId+ ..fieldId = fieldId+ ..fieldType = fieldType;++ return DatabaseEventUpdateFieldType(payload).send();+ }++ /// Update a field's type option datastatic Future<Either<Unit, FlowyError>> updateFieldTypeOption({required String viewId,required String fieldId,@@ -137,15 +123,52 @@ class FieldBackendService {return DatabaseEventUpdateFieldTypeOption(payload).send();}- Future<Either<Unit, FlowyError>> updateFieldType({- required FieldType fieldType,+ /// Returns the primary field of the view.+ static Future<Either<FieldPB, FlowyError>> getPrimaryField({+ required String viewId,}) {- final payload = UpdateFieldTypePayloadPB.create()- ..viewId = viewId- ..fieldId = fieldId- ..fieldType = fieldType;+ final payload = DatabaseViewIdPB.create()..value = viewId;+ return DatabaseEventGetPrimaryField(payload).send();+ }- return DatabaseEventUpdateFieldType(payload).send();+ Future<Either<FieldPB, FlowyError>> createBefore({+ FieldType fieldType = FieldType.RichText,+ String? fieldName,+ Uint8List? typeOptionData,+ }) {+ return createField(+ viewId: viewId,+ fieldType: fieldType,+ fieldName: fieldName,+ typeOptionData: typeOptionData,+ position: OrderObjectPositionPB(+ position: OrderObjectPositionTypePB.Before,+ objectId: fieldId,+ ),+ );+ }++ Future<Either<FieldPB, FlowyError>> createAfter({+ FieldType fieldType = FieldType.RichText,+ String? fieldName,+ Uint8List? typeOptionData,+ }) {+ return createField(+ viewId: viewId,+ fieldType: fieldType,+ fieldName: fieldName,+ typeOptionData: typeOptionData,+ position: OrderObjectPositionPB(+ position: OrderObjectPositionTypePB.After,+ objectId: fieldId,+ ),+ );+ }++ Future<Either<Unit, FlowyError>> updateType({+ required FieldType fieldType,+ }) {+ return updateFieldType(viewId: viewId, fieldId: fieldId, fieldType: fieldType);}Future<Either<Unit, FlowyError>> delete() {@@ -155,12 +178,4 @@ class FieldBackendService {Future<Either<Unit, FlowyError>> duplicate() {return duplicateField(viewId: viewId, fieldId: fieldId);}-- /// Returns the primary field of the view.- static Future<Either<FieldPB, FlowyError>> getPrimaryField({- required String viewId,- }) {- final payload = DatabaseViewIdPB.create()..value = viewId;- return DatabaseEventGetPrimaryField(payload).send();- }}diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/row/row_banner_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/application/row/row_banner_bloc.dartindex 68516cfecc..afb18d718a 100644--- a/frontend/appflowy_flutter/lib/plugins/database/application/row/row_banner_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/application/row/row_banner_bloc.dart@@ -2,9 +2,7 @@ import 'package:appflowy/plugins/database/application/field/field_listener.dart'import 'package:appflowy/plugins/database/application/field/field_service.dart';import 'package:appflowy/plugins/database/application/row/row_service.dart';import 'package:appflowy_backend/log.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/field_entities.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/row_entities.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';@@ -25,11 +23,11 @@ class RowBannerBloc extends Bloc<RowBannerEvent, RowBannerState> {_metaListener = RowMetaListener(rowMeta.id),super(RowBannerState.initial(rowMeta)) {on<RowBannerEvent>(- (event, emit) async {+ (event, emit) {event.when(- initial: () async {+ initial: () {_loadPrimaryField();- await _listenRowMeteChanged();+ _listenRowMetaChanged();},didReceiveRowMeta: (RowMetaPB rowMeta) {emit(state.copyWith(rowMeta: rowMeta));@@ -84,32 +82,24 @@ class RowBannerBloc extends Bloc<RowBannerEvent, RowBannerState> {}/// Listen the changes of the row meta and then update the banner- Future<void> _listenRowMeteChanged() async {+ void _listenRowMetaChanged() {_metaListener.start(callback: (rowMeta) {- add(RowBannerEvent.didReceiveRowMeta(rowMeta));+ if (!isClosed) {+ add(RowBannerEvent.didReceiveRowMeta(rowMeta));+ }},);}/// Update the meta of the row and the view- Future<void> _updateMeta({- String? iconURL,- String? coverURL,- }) async {- // Most of the time, the result is success, so we don't need to handle it.- await _rowBackendSvc- .updateMeta(+ Future<void> _updateMeta({String? iconURL, String? coverURL}) async {+ final result = await _rowBackendSvc.updateMeta(iconURL: iconURL,coverURL: coverURL,rowId: state.rowMeta.id,- )- .then((result) {- result.fold(- (l) => null,- (err) => Log.error(err),- );- });+ );+ result.fold((l) => null, (err) => Log.error(err));}}@@ -127,13 +117,13 @@ class RowBannerEvent with _$RowBannerEvent {@freezedclass RowBannerState with _$RowBannerState {const factory RowBannerState({- ViewPB? view,- FieldPB? primaryField,+ required FieldPB? primaryField,required RowMetaPB rowMeta,required LoadingState loadingState,}) = _RowBannerState;factory RowBannerState.initial(RowMetaPB rowMetaPB) => RowBannerState(+ primaryField: null,rowMeta: rowMetaPB,loadingState: const LoadingState.loading(),);diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/row/row_cache.dart b/frontend/appflowy_flutter/lib/plugins/database/application/row/row_cache.dartindex c4f1f49bf2..e30e2ef507 100644--- a/frontend/appflowy_flutter/lib/plugins/database/application/row/row_cache.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/application/row/row_cache.dart@@ -1,13 +1,14 @@import 'dart:collection';import 'package:appflowy/plugins/database/application/field/field_info.dart';-import 'package:appflowy_backend/dispatch/dispatch.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';import 'package:flutter/foundation.dart';import 'package:freezed_annotation/freezed_annotation.dart';-import '../cell/cell_service.dart';+import '../cell/cell_cache.dart';+import '../cell/cell_controller.dart';+import '../defines.dart';import 'row_list.dart';import 'row_service.dart';@@ -53,12 +54,12 @@ class RowCache {required this.viewId,required RowFieldsDelegate fieldsDelegate,required RowLifeCycle rowLifeCycle,- }) : _cellMemCache = CellMemCache(viewId: viewId),+ }) : _cellMemCache = CellMemCache(),_changedNotifier = RowChangesetNotifier(),_rowLifeCycle = rowLifeCycle,_fieldDelegate = fieldsDelegate {- // Listen on the changed of the fields. If the fields changed, we need to- // clear the cell cache with the given field id.+ // Listen to field changes. If a field is deleted, we can safely remove the+ // cells corresponding to that field from our cache.fieldsDelegate.onFieldsChanged((fieldInfos) {for (final fieldInfo in fieldInfos) {_cellMemCache.removeCellWithFieldId(fieldInfo.id);@@ -79,10 +80,10 @@ class RowCache {_changedNotifier.receive(const ChangedReason.setInitialRows());}- Future<void> dispose() async {+ void dispose() {_rowLifeCycle.onRowDisposed();_changedNotifier.dispose();- await _cellMemCache.dispose();+ _cellMemCache.dispose();}void applyRowsChanged(RowsChangePB changeset) {@@ -142,7 +143,7 @@ class RowCache {final List<RowMetaPB> updatedList = [];for (final updatedRow in updatedRows) {for (final fieldId in updatedRow.fieldIds) {- final key = CellCacheKey(+ final key = CellContext(fieldId: fieldId,rowId: updatedRow.rowId,);@@ -217,11 +218,7 @@ class RowCache {}Future<void> _loadRow(RowId rowId) async {- final payload = RowIdPB.create()- ..viewId = viewId- ..rowId = rowId;-- final result = await DatabaseEventGetRowMeta(payload).send();+ final result = await RowBackendService.getRow(viewId: viewId, rowId: rowId);result.fold((rowMetaPB) {final rowInfo = _rowList.get(rowMetaPB.id);@@ -245,13 +242,12 @@ class RowCache {}CellContextByFieldId _makeCells(RowMetaPB rowMeta) {- // ignore: prefer_collection_literals+ // TODO(RS): no need to use HashMapfinal cellContextMap = CellContextByFieldId();for (final fieldInfo in _fieldDelegate.fieldInfos) {- cellContextMap[fieldInfo.id] = DatabaseCellContext(- rowMeta: rowMeta,- viewId: viewId,- fieldInfo: fieldInfo,+ cellContextMap[fieldInfo.id] = CellContext(+ rowId: rowMeta.id,+ fieldId: fieldInfo.id,);}return cellContextMap;diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/row/row_controller.dart b/frontend/appflowy_flutter/lib/plugins/database/application/row/row_controller.dartindex 945cc965f7..5fc751c380 100644--- a/frontend/appflowy_flutter/lib/plugins/database/application/row/row_controller.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/application/row/row_controller.dart@@ -1,6 +1,8 @@import 'package:appflowy_backend/protobuf/flowy-database2/row_entities.pb.dart';import 'package:flutter/material.dart';-import '../cell/cell_service.dart';++import '../cell/cell_cache.dart';+import '../defines.dart';import 'row_cache.dart';typedef OnRowChanged = void Function(CellContextByFieldId, ChangedReason);diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/row/row_list.dart b/frontend/appflowy_flutter/lib/plugins/database/application/row/row_list.dartindex 47663f0a44..b31a3022e9 100644--- a/frontend/appflowy_flutter/lib/plugins/database/application/row/row_list.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/application/row/row_list.dart@@ -1,5 +1,7 @@import 'dart:collection';+import 'package:appflowy_backend/protobuf/flowy-database2/row_entities.pb.dart';+import 'row_cache.dart';import 'row_service.dart';diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/row/row_service.dart b/frontend/appflowy_flutter/lib/plugins/database/application/row/row_service.dartindex c33dbbc605..0160a78989 100644--- a/frontend/appflowy_flutter/lib/plugins/database/application/row/row_service.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/application/row/row_service.dart@@ -61,12 +61,15 @@ class RowBackendService {);}- Future<Either<OptionalRowPB, FlowyError>> getRow(RowId rowId) {- final payload = RowIdPB.create()+ static Future<Either<RowMetaPB, FlowyError>> getRow({+ required String viewId,+ required String rowId,+ }) {+ final payload = RowIdPB()..viewId = viewId..rowId = rowId;- return DatabaseEventGetRow(payload).send();+ return DatabaseEventGetRowMeta(payload).send();}Future<Either<RowMetaPB, FlowyError>> getRowMeta(RowId rowId) {diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/view/view_cache.dart b/frontend/appflowy_flutter/lib/plugins/database/application/view/view_cache.dartindex e1ddc36f88..663e52b43c 100644--- a/frontend/appflowy_flutter/lib/plugins/database/application/view/view_cache.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/application/view/view_cache.dart@@ -123,7 +123,7 @@ class DatabaseViewCache {Future<void> dispose() async {await _databaseViewListener.stop();- await _rowCache.dispose();+ _rowCache.dispose();_callbacks.clear();}diff --git a/frontend/appflowy_flutter/lib/plugins/database/board/presentation/board_page.dart b/frontend/appflowy_flutter/lib/plugins/database/board/presentation/board_page.dartindex 9389147085..6034af1607 100644--- a/frontend/appflowy_flutter/lib/plugins/database/board/presentation/board_page.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/board/presentation/board_page.dart@@ -8,12 +8,12 @@ import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/mobile/presentation/database/board/mobile_board_content.dart';import 'package:appflowy/mobile/presentation/widgets/flowy_mobile_state_container.dart';import 'package:appflowy/plugins/database/application/database_controller.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';import 'package:appflowy/plugins/database/board/presentation/widgets/board_column_header.dart';import 'package:appflowy/plugins/database/grid/presentation/widgets/header/field_type_extension.dart';import 'package:appflowy/plugins/database/tab_bar/tab_bar_view.dart';+import 'package:appflowy/plugins/database/widgets/cell/card_cell_style_maps/desktop_board_card_cell_style.dart';import 'package:appflowy/plugins/database/widgets/row/row_detail.dart';import 'package:appflowy_backend/protobuf/flowy-database2/row_entities.pb.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';@@ -27,9 +27,7 @@ import 'package:flowy_infra_ui/widget/flowy_tooltip.dart';import 'package:flutter_bloc/flutter_bloc.dart';import '../../widgets/card/card.dart';-import '../../widgets/card/card_cell_builder.dart';-import '../../widgets/card/cells/card_cell.dart';-import '../../widgets/row/cell_builder.dart';+import '../../widgets/cell/card_cell_builder.dart';import '../application/board_bloc.dart';import 'toolbar/board_setting_bar.dart';@@ -126,7 +124,6 @@ class DesktopBoardContent extends StatefulWidget {}class _DesktopBoardContentState extends State<DesktopBoardContent> {- final renderHook = RowCardRenderHook<String>();final ScrollController scrollController = ScrollController();final AppFlowyBoardScrollController scrollManager =AppFlowyBoardScrollController();@@ -140,23 +137,6 @@ class _DesktopBoardContentState extends State<DesktopBoardContent> {stretchGroupHeight: false,);- @override- void initState() {- super.initState();-- renderHook.addSelectOptionHook((options, groupId, _) {- // The cell should hide if the option id is equal to the groupId.- final isInGroup =- options.where((element) => element.id == groupId).isNotEmpty;-- if (isInGroup || options.isEmpty) {- return const SizedBox.shrink();- }-- return null;- });- }-@overridevoid dispose() {scrollController.dispose();@@ -257,11 +237,10 @@ class _DesktopBoardContentState extends State<DesktopBoardContent> {return SizedBox.shrink(key: ObjectKey(groupItem));}- final cellCache = rowCache.cellCache;- final fieldController = boardBloc.fieldController;+ final databaseController = boardBloc.databaseController;final viewId = boardBloc.viewId;- final cellBuilder = CardCellBuilder<String>(cellCache);+ final cellBuilder = CardCellBuilder(databaseController: databaseController);final isEditing = boardBloc.state.isEditingRow &&boardBloc.state.editingRow?.row.id == groupItem.row.id;@@ -272,24 +251,22 @@ class _DesktopBoardContentState extends State<DesktopBoardContent> {key: ValueKey(groupItemId),margin: config.cardMargin,decoration: _makeBoxDecoration(context),- child: RowCard<String>(+ child: RowCard(+ fieldController: databaseController.fieldController,rowMeta: rowMeta,viewId: viewId,rowCache: rowCache,- cardData: groupData.group.groupId,groupingFieldId: groupItem.fieldInfo.id,isEditing: isEditing,cellBuilder: cellBuilder,- renderHook: renderHook,openCard: (context) => _openCard(context: context,- viewId: viewId,+ databaseController: databaseController,groupId: groupData.group.groupId,- fieldController: fieldController,rowMeta: rowMeta,- rowCache: rowCache,),styleConfiguration: RowCardStyleConfiguration(+ cellStyleMap: desktopBoardCardCellStyleMap(context),hoverStyle: HoverStyle(hoverColor: Theme.of(context).brightness == Brightness.light? const Color(0x0F1F2329)@@ -333,32 +310,30 @@ class _DesktopBoardContentState extends State<DesktopBoardContent> {void _openCard({required BuildContext context,- required String viewId,+ required DatabaseController databaseController,required String groupId,- required FieldController fieldController,required RowMetaPB rowMeta,- required RowCache rowCache,}) {final rowInfo = RowInfo(- viewId: viewId,- fields: UnmodifiableListView(fieldController.fieldInfos),+ viewId: databaseController.viewId,+ fields:+ UnmodifiableListView(databaseController.fieldController.fieldInfos),rowMeta: rowMeta,rowId: rowMeta.id,);- final dataController = RowController(+ final rowController = RowController(rowMeta: rowInfo.rowMeta,viewId: rowInfo.viewId,- rowCache: rowCache,+ rowCache: databaseController.rowCache,groupId: groupId,);FlowyOverlay.show(context: context,builder: (_) => RowDetailPage(- fieldController: fieldController,- cellBuilder: GridCellBuilder(cellCache: dataController.cellCache),- rowController: dataController,+ databaseController: databaseController,+ rowController: rowController,),);}diff --git a/frontend/appflowy_flutter/lib/plugins/database/board/presentation/widgets/board_hidden_groups.dart b/frontend/appflowy_flutter/lib/plugins/database/board/presentation/widgets/board_hidden_groups.dartindex ba60577c21..a0c89721f7 100644--- a/frontend/appflowy_flutter/lib/plugins/database/board/presentation/widgets/board_hidden_groups.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/board/presentation/widgets/board_hidden_groups.dart@@ -2,17 +2,14 @@ import 'dart:io';import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/plugins/database/application/cell/cell_service.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/field/field_info.dart';import 'package:appflowy/plugins/database/application/row/row_cache.dart';import 'package:appflowy/plugins/database/application/row/row_controller.dart';import 'package:appflowy/plugins/database/board/application/board_bloc.dart';import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';-import 'package:appflowy/plugins/database/widgets/card/card_cell_builder.dart';-import 'package:appflowy/plugins/database/widgets/card/cells/card_cell.dart';-import 'package:appflowy/plugins/database/widgets/row/cell_builder.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/text_cell/text_cell_bloc.dart';+import 'package:appflowy/plugins/database/widgets/cell/card_cell_builder.dart';+import 'package:appflowy/plugins/database/widgets/cell/card_cell_skeleton/text_card_cell.dart';import 'package:appflowy/plugins/database/widgets/row/row_detail.dart';import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';import 'package:appflowy_popover/appflowy_popover.dart';@@ -126,7 +123,6 @@ class HiddenGroupList extends StatelessWidget {@overrideWidget build(BuildContext context) {- final bloc = context.read<BoardBloc>();return BlocBuilder<BoardBloc, BoardState>(builder: (_, state) => ReorderableListView.builder(proxyDecorator: (child, index, animation) => Material(@@ -151,7 +147,7 @@ class HiddenGroupList extends StatelessWidget {child: HiddenGroupCard(group: state.hiddenGroups[index],index: index,- bloc: bloc,+ bloc: context.read<BoardBloc>(),),),onReorder: (oldIndex, newIndex) {@@ -160,7 +156,9 @@ class HiddenGroupList extends StatelessWidget {}final fromGroupId = state.hiddenGroups[oldIndex].groupId;final toGroupId = state.hiddenGroups[newIndex].groupId;- bloc.add(BoardEvent.reorderGroup(fromGroupId, toGroupId));+ context+ .read<BoardBloc>()+ .add(BoardEvent.reorderGroup(fromGroupId, toGroupId));},),);@@ -199,13 +197,17 @@ class _HiddenGroupCardState extends State<HiddenGroupCard> {direction: PopoverDirection.bottomWithCenterAligned,triggerActions: PopoverTriggerFlags.none,constraints: const BoxConstraints(maxWidth: 234, maxHeight: 300),- popupBuilder: (popoverContext) => HiddenGroupPopupItemList(- bloc: widget.bloc,- viewId: databaseController.viewId,- groupId: widget.group.groupId,- primaryField: primaryField,- rowCache: databaseController.rowCache,- ),+ popupBuilder: (popoverContext) {+ return BlocProvider.value(+ value: context.read<BoardBloc>(),+ child: HiddenGroupPopupItemList(+ viewId: databaseController.viewId,+ groupId: widget.group.groupId,+ primaryFieldId: primaryField.id,+ rowCache: databaseController.rowCache,+ ),+ );+ },child: HiddenGroupButtonContent(popoverController: _popoverController,groupId: widget.group.groupId,@@ -340,111 +342,81 @@ class HiddenGroupCardActions extends StatelessWidget {class HiddenGroupPopupItemList extends StatelessWidget {const HiddenGroupPopupItemList({- required this.bloc,required this.groupId,required this.viewId,- required this.primaryField,+ required this.primaryFieldId,required this.rowCache,super.key,});- final BoardBloc bloc;final String groupId;final String viewId;- final FieldInfo primaryField;+ final String primaryFieldId;final RowCache rowCache;@overrideWidget build(BuildContext context) {- return BlocProvider.value(- value: bloc,- child: BlocBuilder<BoardBloc, BoardState>(- builder: (context, state) {- final group = state.hiddenGroups.firstWhereOrNull(- (g) => g.groupId == groupId,- );- if (group == null) {- return const SizedBox.shrink();- }- final cells = <Widget>[- Padding(- padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 4),- child: FlowyText.medium(- group.groupName,- fontSize: 10,- color: Theme.of(context).hintColor,- overflow: TextOverflow.ellipsis,- ),+ return BlocBuilder<BoardBloc, BoardState>(+ builder: (context, state) {+ final group = state.hiddenGroups.firstWhereOrNull(+ (g) => g.groupId == groupId,+ );+ if (group == null) {+ return const SizedBox.shrink();+ }+ final cells = <Widget>[+ Padding(+ padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 4),+ child: FlowyText.medium(+ group.groupName,+ fontSize: 10,+ color: Theme.of(context).hintColor,+ overflow: TextOverflow.ellipsis,),- ...group.rows.map(- (item) {- final rowController = RowController(- rowMeta: item,- viewId: viewId,- rowCache: rowCache,- );- final renderHook = RowCardRenderHook<String>();- renderHook.addTextCellHook((cellData, _, __) {- return BlocBuilder<TextCellBloc, TextCellState>(- builder: (context, state) {- final text = cellData.isEmpty- ? LocaleKeys.grid_row_titlePlaceholder.tr()- : cellData;+ ),+ ...group.rows.map(+ (item) {+ final rowController = RowController(+ rowMeta: item,+ viewId: viewId,+ rowCache: rowCache,+ );- if (text.isEmpty) {- return const SizedBox.shrink();- }+ final databaseController =+ context.read<BoardBloc>().databaseController;- return Align(- alignment: Alignment.centerLeft,- child: FlowyText.medium(- text,- textAlign: TextAlign.left,- fontSize: 11,- maxLines: 1,- overflow: TextOverflow.ellipsis,- ),+ return HiddenGroupPopupItem(+ cellContext: rowCache.loadCells(item)[primaryFieldId]!,+ rowController: rowController,+ rowMeta: item,+ cellBuilder: CardCellBuilder(+ databaseController: databaseController,+ ),+ onPressed: () {+ FlowyOverlay.show(+ context: context,+ builder: (_) {+ return RowDetailPage(+ databaseController: databaseController,+ rowController: rowController,);},);- });-- return HiddenGroupPopupItem(- cellContext: rowCache.loadCells(item)[primaryField.id]!,- primaryField: primaryField,- rowController: rowController,- cellBuilder: CardCellBuilder<String>(rowController.cellCache),- renderHook: renderHook,- onPressed: () {- FlowyOverlay.show(- context: context,- builder: (_) {- return RowDetailPage(- fieldController:- context.read<BoardBloc>().fieldController,- cellBuilder: GridCellBuilder(- cellCache: rowController.cellCache,- ),- rowController: rowController,- );- },- );- PopoverContainer.of(context).close();- },- );- },- ),- ];+ PopoverContainer.of(context).close();+ },+ );+ },+ ),+ ];- return ListView.separated(- itemBuilder: (context, index) => cells[index],- itemCount: cells.length,- separatorBuilder: (context, index) =>- VSpace(GridSize.typeOptionSeparatorHeight),- shrinkWrap: true,- );- },- ),+ return ListView.separated(+ itemBuilder: (context, index) => cells[index],+ itemCount: cells.length,+ separatorBuilder: (context, index) =>+ VSpace(GridSize.typeOptionSeparatorHeight),+ shrinkWrap: true,+ );+ },);}}@@ -452,19 +424,17 @@ class HiddenGroupPopupItemList extends StatelessWidget {class HiddenGroupPopupItem extends StatelessWidget {const HiddenGroupPopupItem({super.key,+ required this.rowMeta,required this.cellContext,required this.onPressed,required this.cellBuilder,required this.rowController,- required this.primaryField,- required this.renderHook,});- final DatabaseCellContext cellContext;- final FieldInfo primaryField;+ final RowMetaPB rowMeta;+ final CellContext cellContext;final RowController rowController;final CardCellBuilder cellBuilder;- final RowCardRenderHook<String> renderHook;final VoidCallback onPressed;@override@@ -473,13 +443,24 @@ class HiddenGroupPopupItem extends StatelessWidget {height: 26,child: FlowyButton(margin: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 4.0),- text: cellBuilder.buildCell(+ text: cellBuilder.build(cellContext: cellContext,- renderHook: renderHook,- hasNotes: !cellContext.rowMeta.isDocumentEmpty,+ styleMap: {FieldType.RichText: _titleCellStyle(context)},+ hasNotes: !rowMeta.isDocumentEmpty,),onTap: onPressed,),);}++ TextCardCellStyle _titleCellStyle(BuildContext context) {+ return TextCardCellStyle(+ padding: EdgeInsets.zero,+ textStyle: Theme.of(context).textTheme.bodyMedium!,+ titleTextStyle: Theme.of(context)+ .textTheme+ .bodyMedium!+ .copyWith(fontSize: 11, overflow: TextOverflow.ellipsis),+ );+ }}diff --git a/frontend/appflowy_flutter/lib/plugins/database/calendar/application/calendar_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/calendar/application/calendar_bloc.dartindex c40a4f25d4..3fe56be033 100644--- a/frontend/appflowy_flutter/lib/plugins/database/calendar/application/calendar_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/calendar/application/calendar_bloc.dart@@ -1,4 +1,4 @@-import 'package:appflowy/plugins/database/application/cell/cell_service.dart';+import 'package:appflowy/plugins/database/application/cell/cell_cache.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/field/field_info.dart';diff --git a/frontend/appflowy_flutter/lib/plugins/database/calendar/application/calendar_event_editor_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/calendar/application/calendar_event_editor_bloc.dartindex c4a1bde938..9d6e36caa9 100644--- a/frontend/appflowy_flutter/lib/plugins/database/calendar/application/calendar_event_editor_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/calendar/application/calendar_event_editor_bloc.dart@@ -1,6 +1,8 @@-import 'package:appflowy/plugins/database/application/cell/cell_service.dart';+import 'package:appflowy/plugins/database/application/cell/cell_controller.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';+import 'package:appflowy/plugins/database/widgets/setting/field_visibility_extension.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-database2/calendar_entities.pb.dart';import 'package:bloc/bloc.dart';@@ -10,10 +12,12 @@ part 'calendar_event_editor_bloc.freezed.dart';class CalendarEventEditorBlocextends Bloc<CalendarEventEditorEvent, CalendarEventEditorState> {+ final FieldController fieldController;final RowController rowController;final CalendarLayoutSettingPB layoutSettings;CalendarEventEditorBloc({+ required this.fieldController,required this.rowController,required this.layoutSettings,}) : super(CalendarEventEditorState.initial()) {@@ -21,21 +25,18 @@ class CalendarEventEditorBlocawait event.when(initial: () {_startListening();+ final primaryFieldId = fieldController.fieldInfos+ .firstWhere((fieldInfo) => fieldInfo.isPrimary)+ .id;final cells = rowController.loadData().values.where((cellContext) =>- cellContext.isVisible() ||- cellContext.fieldId == layoutSettings.fieldId ||- cellContext.fieldInfo.isPrimary,+ _filterCellContext(cellContext, primaryFieldId),).toList();- if (!isClosed) {- add(- CalendarEventEditorEvent.didReceiveCellDatas(cells),- );- }+ add(CalendarEventEditorEvent.didReceiveCellDatas(cells));},didReceiveCellDatas: (cells) {emit(state.copyWith(cells: cells));@@ -54,23 +55,32 @@ class CalendarEventEditorBlocvoid _startListening() {rowController.addListener(onRowChanged: (cells, reason) {- if (!isClosed) {- final cellData = cells.values- .where(- (cellContext) =>- cellContext.isVisible() ||- cellContext.fieldId == layoutSettings.fieldId ||- cellContext.fieldInfo.isPrimary,- )- .toList();- add(- CalendarEventEditorEvent.didReceiveCellDatas(cellData),- );+ if (isClosed) {+ return;}+ final primaryFieldId = fieldController.fieldInfos+ .firstWhere((fieldInfo) => fieldInfo.isPrimary)+ .id;+ final cellData = cells.values+ .where(+ (cellContext) => _filterCellContext(cellContext, primaryFieldId),+ )+ .toList();+ add(CalendarEventEditorEvent.didReceiveCellDatas(cellData));},);}+ bool _filterCellContext(CellContext cellContext, String primaryFieldId) {+ return fieldController+ .getField(cellContext.fieldId)!+ .fieldSettings!+ .visibility+ .isVisibleState() ||+ cellContext.fieldId == layoutSettings.fieldId ||+ cellContext.fieldId == primaryFieldId;+ }+@overrideFuture<void> close() async {rowController.dispose();@@ -82,7 +92,7 @@ class CalendarEventEditorBlocclass CalendarEventEditorEvent with _$CalendarEventEditorEvent {const factory CalendarEventEditorEvent.initial() = _Initial;const factory CalendarEventEditorEvent.didReceiveCellDatas(- List<DatabaseCellContext> cells,+ List<CellContext> cells,) = _DidReceiveCellDatas;const factory CalendarEventEditorEvent.delete() = _Delete;}@@ -90,9 +100,9 @@ class CalendarEventEditorEvent with _$CalendarEventEditorEvent {@freezedclass CalendarEventEditorState with _$CalendarEventEditorState {const factory CalendarEventEditorState({- required List<DatabaseCellContext> cells,+ required List<CellContext> cells,}) = _CalendarEventEditorState;factory CalendarEventEditorState.initial() =>- CalendarEventEditorState(cells: List.empty());+ const CalendarEventEditorState(cells: []);}diff --git a/frontend/appflowy_flutter/lib/plugins/database/calendar/application/unschedule_event_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/calendar/application/unschedule_event_bloc.dartindex ff8d38ecf5..cefdbf6504 100644--- a/frontend/appflowy_flutter/lib/plugins/database/calendar/application/unschedule_event_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/calendar/application/unschedule_event_bloc.dart@@ -1,4 +1,4 @@-import 'package:appflowy/plugins/database/application/cell/cell_service.dart';+import 'package:appflowy/plugins/database/application/cell/cell_cache.dart';import 'package:appflowy/plugins/database/application/field/field_controller.dart';import 'package:appflowy/plugins/database/application/field/field_info.dart';import 'package:appflowy/plugins/database/application/row/row_service.dart';diff --git a/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_day.dart b/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_day.dartindex 9e18d8041c..9724cef993 100644--- a/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_day.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_day.dart@@ -78,54 +78,58 @@ class CalendarDayCard extends StatelessWidget {],);- return MouseRegion(- onEnter: (p) => notifyEnter(context, true),- onExit: (p) => notifyEnter(context, false),- opaque: false,- hitTestBehavior: HitTestBehavior.translucent,- child: GestureDetector(- onDoubleTap: () => onCreateEvent(date),- onTap: PlatformExtension.isMobile- ? () => _mobileOnTap(context)- : null,- behavior: HitTestBehavior.deferToChild,- child: Container(- color: date.isWeekend- ? AFThemeExtension.of(context).calendarWeekendBGColor- : Colors.transparent,- child: DragTarget<CalendarDayEvent>(- builder: (context, candidate, __) {- return Stack(- children: [- Container(- width: double.infinity,- height: double.infinity,- decoration: BoxDecoration(- color: candidate.isEmpty- ? null- : hoverBackgroundColor,- border: _borderFromPosition(context, position),- ),- padding: const EdgeInsets.only(top: 5.0),- child: child,+ return Stack(+ children: [+ GestureDetector(+ onDoubleTap: () => onCreateEvent(date),+ onTap: PlatformExtension.isMobile+ ? () => _mobileOnTap(context)+ : null,+ child: Container(+ decoration: BoxDecoration(+ color: date.isWeekend+ ? AFThemeExtension.of(context).calendarWeekendBGColor+ : Colors.transparent,+ border: _borderFromPosition(context, position),+ ),+ ),+ ),+ DragTarget<CalendarDayEvent>(+ hitTestBehavior: HitTestBehavior.translucent,+ builder: (context, candidate, __) {+ return Stack(+ children: [+ Container(+ width: double.infinity,+ height: double.infinity,+ color:+ candidate.isEmpty ? null : hoverBackgroundColor,+ padding: const EdgeInsets.only(top: 5.0),+ child: child,+ ),+ if (candidate.isEmpty && !PlatformExtension.isMobile)+ NewEventButton(+ onCreate: () => onCreateEvent(date),),- if (candidate.isEmpty && !PlatformExtension.isMobile)- NewEventButton(onCreate: () => onCreateEvent(date)),- ],- );- },- onAcceptWithDetails: (details) {- final event = details.data;- if (event.date == date) {- return;- }+ ],+ );+ },+ onAcceptWithDetails: (details) {+ final event = details.data;+ if (event.date != date) {context.read<CalendarBloc>().add(CalendarEvent.moveEvent(event, date));- },- ),+ }+ },),- ),+ MouseRegion(+ onEnter: (p) => notifyEnter(context, true),+ onExit: (p) => notifyEnter(context, false),+ opaque: false,+ hitTestBehavior: HitTestBehavior.translucent,+ ),+ ],);},);diff --git a/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_event_card.dart b/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_event_card.dartindex fbb190a6db..1752663473 100644--- a/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_event_card.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_event_card.dart@@ -1,19 +1,11 @@-import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/mobile/presentation/database/card/card_detail/mobile_card_detail_screen.dart';import 'package:appflowy/plugins/database/application/database_controller.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/widgets/card/card.dart';-import 'package:appflowy/plugins/database/widgets/card/card_cell_builder.dart';-import 'package:appflowy/plugins/database/widgets/card/cells/card_cell.dart';-import 'package:appflowy/plugins/database/widgets/card/cells/number_card_cell.dart';-import 'package:appflowy/plugins/database/widgets/card/cells/url_card_cell.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/select_option_cell/extension.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/text_cell/text_cell_bloc.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/field_entities.pb.dart';+import 'package:appflowy/plugins/database/widgets/cell/card_cell_builder.dart';+import 'package:appflowy/plugins/database/widgets/cell/card_cell_style_maps/calendar_card_cell_style.dart';import 'package:appflowy_editor/appflowy_editor.dart';import 'package:appflowy_popover/appflowy_popover.dart';-import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/size.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flowy_infra_ui/style_widget/hover.dart';@@ -47,17 +39,14 @@ class EventCard extends StatefulWidget {}class _EventCardState extends State<EventCard> {- late final PopoverController _popoverController;+ final PopoverController _popoverController = PopoverController();String get viewId => widget.databaseController.viewId;RowCache get rowCache => widget.databaseController.rowCache;- FieldController get fieldController =>- widget.databaseController.fieldController;@overridevoid initState() {super.initState();- _popoverController = PopoverController();if (widget.autoEdit) {WidgetsBinding.instance.addPostFrameCallback((_) {_popoverController.show();@@ -74,24 +63,19 @@ class _EventCardState extends State<EventCard> {if (rowInfo == null) {return const SizedBox.shrink();}- final styles = <FieldType, CardCellStyle>{- FieldType.Number: NumberCardCellStyle(10),- FieldType.URL: URLCardCellStyle(10),- };- final cellBuilder = CardCellBuilder<CalendarDayEvent>(- rowCache.cellCache,- styles: styles,++ final cellBuilder = CardCellBuilder(+ databaseController: widget.databaseController,);- final renderHook = _calendarEventCardRenderHook(context);- Widget card = RowCard<CalendarDayEvent>(+ Widget card = RowCard(// Add the key here to make sure the card is rebuilt when the cells// in this row are updated.key: ValueKey(widget.event.eventId),+ fieldController: widget.databaseController.fieldController,rowMeta: rowInfo.rowMeta,viewId: viewId,rowCache: rowCache,- cardData: widget.event,isEditing: false,cellBuilder: cellBuilder,openCard: (context) {@@ -109,8 +93,8 @@ class _EventCardState extends State<EventCard> {}},styleConfiguration: RowCardStyleConfiguration(+ cellStyleMap: desktopCalendarCardCellStyleMap(context),showAccessory: false,- cellPadding: EdgeInsets.zero,cardPadding: const EdgeInsets.all(6),hoverStyle: HoverStyle(hoverColor: Theme.of(context).brightness == Brightness.light@@ -119,7 +103,6 @@ class _EventCardState extends State<EventCard> {foregroundColorOnHover: Theme.of(context).colorScheme.onBackground,),),- renderHook: renderHook,onStartEditing: () {},onEndEditing: () {},);@@ -171,35 +154,29 @@ class _EventCardState extends State<EventCard> {return const SizedBox.shrink();}return CalendarEventEditor(- fieldController: fieldController,- rowCache: rowCache,+ databaseController: widget.databaseController,rowMeta: widget.event.event.rowMeta,- viewId: viewId,layoutSettings: settings,);},- child: Padding(+ child: Container(padding: widget.padding,- child: DecoratedBox(- decoration: decoration,- child: card,- ),+ decoration: decoration,+ child: card,),);if (widget.isDraggable) {return Draggable<CalendarDayEvent>(data: widget.event,- feedback: ConstrainedBox(+ feedback: Container(constraints: BoxConstraints(maxWidth: widget.constraints.maxWidth - 8.0,),+ decoration: decoration,child: Opacity(opacity: 0.6,- child: DecoratedBox(- decoration: decoration,- child: card,- ),+ child: card,),),child: card,@@ -208,117 +185,4 @@ class _EventCardState extends State<EventCard> {return card;}-- RowCardRenderHook<CalendarDayEvent> _calendarEventCardRenderHook(- BuildContext context,- ) {- final renderHook = RowCardRenderHook<CalendarDayEvent>();- renderHook.addTextCellHook((cellData, eventData, _) {- return BlocBuilder<TextCellBloc, TextCellState>(- builder: (context, state) {- final isTitle =- context.read<TextCellBloc>().cellController.fieldInfo.isPrimary;- final text = isTitle && cellData.isEmpty- ? LocaleKeys.grid_row_titlePlaceholder.tr()- : cellData;-- if (text.isEmpty) {- return const SizedBox.shrink();- }-- return Align(- alignment: Alignment.centerLeft,- child: FlowyText.medium(- text,- textAlign: TextAlign.left,- fontSize: isTitle ? 11 : 10,- maxLines: 1,- overflow: TextOverflow.ellipsis,- ),- );- },- );- });-- renderHook.addDateCellHook((cellData, cardData, _) {- return Align(- alignment: Alignment.centerLeft,- child: Padding(- padding: const EdgeInsets.symmetric(vertical: 2),- child: Row(- mainAxisAlignment: MainAxisAlignment.spaceBetween,- children: [- Flexible(- flex: 3,- child: FlowyText.regular(- cellData.date,- fontSize: 10,- color: Theme.of(context).hintColor,- overflow: TextOverflow.ellipsis,- ),- ),- if (cellData.includeTime)- Flexible(- child: FlowyText.regular(- cellData.time,- fontSize: 10,- color: Theme.of(context).hintColor,- overflow: TextOverflow.ellipsis,- ),- ),- ],- ),- ),- );- });-- renderHook.addTimestampCellHook((cellData, cardData, _) {- return Align(- alignment: Alignment.centerLeft,- child: Padding(- padding: const EdgeInsets.symmetric(vertical: 2),- child: Row(- mainAxisAlignment: MainAxisAlignment.spaceBetween,- children: [- Flexible(- flex: 3,- child: FlowyText.regular(- cellData.dateTime,- fontSize: 10,- color: Theme.of(context).hintColor,- overflow: TextOverflow.ellipsis,- ),- ),- ],- ),- ),- );- });-- renderHook.addSelectOptionHook((selectedOptions, cardData, _) {- if (selectedOptions.isEmpty) {- return const SizedBox.shrink();- }- final children = selectedOptions.map(- (option) {- return SelectOptionTag(- option: option,- fontSize: 9,- padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 1),- );- },- ).toList();-- return IntrinsicHeight(- child: Padding(- padding: const EdgeInsets.symmetric(vertical: 2),- child: SizedBox.expand(- child: Wrap(spacing: 4, runSpacing: 4, children: children),- ),- ),- );- });-- return renderHook;- }}diff --git a/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_event_editor.dart b/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_event_editor.dartindex d17e105118..d3fc975ee9 100644--- a/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_event_editor.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_event_editor.dart@@ -1,15 +1,19 @@import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/plugins/database/application/cell/cell_service.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/field/field_controller.dart';-import 'package:appflowy/plugins/database/application/row/row_cache.dart';import 'package:appflowy/plugins/database/application/row/row_controller.dart';+import 'package:appflowy/plugins/database/application/row/row_service.dart';import 'package:appflowy/plugins/database/calendar/application/calendar_event_editor_bloc.dart';import 'package:appflowy/plugins/database/grid/presentation/widgets/header/field_type_extension.dart';+import 'package:appflowy/plugins/database/widgets/cell/editable_cell_skeleton/text.dart';import 'package:appflowy/plugins/database/widgets/row/accessory/cell_accessory.dart';-import 'package:appflowy/plugins/database/widgets/row/cell_builder.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/cells.dart';+import 'package:appflowy/plugins/database/widgets/cell/editable_cell_builder.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/text_cell/text_cell_bloc.dart';import 'package:appflowy/plugins/database/widgets/row/row_detail.dart';+import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:collection/collection.dart';@@ -19,29 +23,30 @@ import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';class CalendarEventEditor extends StatelessWidget {+ final DatabaseController databaseController;final RowController rowController;- final FieldController fieldController;final CalendarLayoutSettingPB layoutSettings;- final GridCellBuilder cellBuilder;+ final EditableCellBuilder cellBuilder;CalendarEventEditor({super.key,- required RowCache rowCache,required RowMetaPB rowMeta,- required String viewId,required this.layoutSettings,- required this.fieldController,+ required this.databaseController,}) : rowController = RowController(rowMeta: rowMeta,- viewId: viewId,- rowCache: rowCache,+ viewId: databaseController.viewId,+ rowCache: databaseController.rowCache,),- cellBuilder = GridCellBuilder(cellCache: rowCache.cellCache);+ cellBuilder = EditableCellBuilder(+ databaseController: databaseController,+ );@overrideWidget build(BuildContext context) {return BlocProvider<CalendarEventEditorBloc>(create: (context) => CalendarEventEditorBloc(+ fieldController: databaseController.fieldController,rowController: rowController,layoutSettings: layoutSettings,)..add(const CalendarEventEditorEvent.initial()),@@ -50,10 +55,11 @@ class CalendarEventEditor extends StatelessWidget {children: [EventEditorControls(rowController: rowController,- fieldController: fieldController,+ databaseController: databaseController,),Flexible(child: EventPropertyList(+ fieldController: databaseController.fieldController,dateFieldId: layoutSettings.fieldId,cellBuilder: cellBuilder,),@@ -68,11 +74,11 @@ class EventEditorControls extends StatelessWidget {const EventEditorControls({super.key,required this.rowController,- required this.fieldController,+ required this.databaseController,});final RowController rowController;- final FieldController fieldController;+ final DatabaseController databaseController;@overrideWidget build(BuildContext context) {@@ -85,9 +91,13 @@ class EventEditorControls extends StatelessWidget {width: 20,icon: const FlowySvg(FlowySvgs.delete_s),iconColorOnHover: Theme.of(context).colorScheme.onSecondary,- onPressed: () => context- .read<CalendarEventEditorBloc>()- .add(const CalendarEventEditorEvent.delete()),+ onPressed: () async {+ final result = await RowBackendService.deleteRow(+ rowController.viewId,+ rowController.rowId,+ );+ result.fold((l) => null, (err) => Log.error(err));+ },),const HSpace(8.0),FlowyIconButton(@@ -100,10 +110,7 @@ class EventEditorControls extends StatelessWidget {context: context,builder: (BuildContext context) {return RowDetailPage(- fieldController: fieldController,- cellBuilder: GridCellBuilder(- cellCache: rowController.cellCache,- ),+ databaseController: databaseController,rowController: rowController,);},@@ -117,10 +124,13 @@ class EventEditorControls extends StatelessWidget {}class EventPropertyList extends StatelessWidget {+ final FieldController fieldController;final String dateFieldId;- final GridCellBuilder cellBuilder;+ final EditableCellBuilder cellBuilder;+const EventPropertyList({super.key,+ required this.fieldController,required this.dateFieldId,required this.cellBuilder,});@@ -129,11 +139,14 @@ class EventPropertyList extends StatelessWidget {Widget build(BuildContext context) {return BlocBuilder<CalendarEventEditorBloc, CalendarEventEditorState>(builder: (context, state) {- final reorderedList = List<DatabaseCellContext>.from(state.cells)- ..retainWhere((cell) => !cell.fieldInfo.isPrimary);+ final primaryFieldId = fieldController.fieldInfos+ .firstWhereOrNull((fieldInfo) => fieldInfo.isPrimary)!+ .id;+ final reorderedList = List<CellContext>.from(state.cells)+ ..retainWhere((cell) => cell.fieldId != primaryFieldId);- final primaryCellContext =- state.cells.firstWhereOrNull((cell) => cell.fieldInfo.isPrimary);+ final primaryCellContext = state.cells+ .firstWhereOrNull((cell) => cell.fieldId == primaryFieldId);final dateFieldIndex =reorderedList.indexWhere((cell) => cell.fieldId == dateFieldId);@@ -143,25 +156,20 @@ class EventPropertyList extends StatelessWidget {reorderedList.insert(0, reorderedList.removeAt(dateFieldIndex));- final children = <Widget>[+ final children = [Padding(padding: const EdgeInsets.fromLTRB(16.0, 12.0, 16.0, 8.0),- child: cellBuilder.build(+ child: cellBuilder.buildCustom(primaryCellContext,- style: GridTextCellStyle(- cellPadding: EdgeInsets.zero,- placeholder: LocaleKeys.calendar_defaultNewCalendarTitle.tr(),- textStyle: Theme.of(context)- .textTheme- .bodyMedium- ?.copyWith(fontSize: 11, overflow: TextOverflow.ellipsis),- autofocus: true,- useRoundedBorder: true,- ),+ skinMap: EditableCellSkinMap(textSkin: _TitleTextCellSkin()),),),...reorderedList.map(- (cell) => PropertyCell(cellContext: cell, cellBuilder: cellBuilder),+ (cellContext) => PropertyCell(+ fieldController: fieldController,+ cellContext: cellContext,+ cellBuilder: cellBuilder,+ ),),];@@ -176,9 +184,12 @@ class EventPropertyList extends StatelessWidget {}class PropertyCell extends StatefulWidget {- final DatabaseCellContext cellContext;- final GridCellBuilder cellBuilder;+ final FieldController fieldController;+ final CellContext cellContext;+ final EditableCellBuilder cellBuilder;+const PropertyCell({+ required this.fieldController,required this.cellContext,required this.cellBuilder,super.key,@@ -191,14 +202,16 @@ class PropertyCell extends StatefulWidget {class _PropertyCellState extends State<PropertyCell> {@overrideWidget build(BuildContext context) {- final style = _customCellStyle(widget.cellContext.fieldType);- final cell = widget.cellBuilder.build(widget.cellContext, style: style);+ final fieldInfo =+ widget.fieldController.getField(widget.cellContext.fieldId)!;+ final cell = widget.cellBuilder+ .buildStyled(widget.cellContext, EditableCellStyle.desktopRowDetail);final gesture = GestureDetector(behavior: HitTestBehavior.opaque,onTap: () => cell.requestFocus.notify(),child: AccessoryHover(- fieldType: widget.cellContext.fieldType,+ fieldType: fieldInfo.fieldType,child: cell,),);@@ -218,14 +231,14 @@ class _PropertyCellState extends State<PropertyCell> {child: Row(children: [FlowySvg(- widget.cellContext.fieldType.icon(),+ fieldInfo.fieldType.icon(),color: Theme.of(context).hintColor,size: const Size.square(14),),const HSpace(4.0),Expanded(child: FlowyText.regular(- widget.cellContext.fieldInfo.name,+ fieldInfo.name,color: Theme.of(context).hintColor,overflow: TextOverflow.ellipsis,fontSize: 11,@@ -241,58 +254,23 @@ class _PropertyCellState extends State<PropertyCell> {),);}+}- GridCellStyle? _customCellStyle(FieldType fieldType) {- switch (fieldType) {- case FieldType.Checkbox:- return GridCheckboxCellStyle(- cellPadding: const EdgeInsets.symmetric(horizontal: 8, vertical: 5),- );- case FieldType.DateTime:- return DateCellStyle(- placeholder: LocaleKeys.grid_row_textPlaceholder.tr(),- alignment: Alignment.centerLeft,- cellPadding: const EdgeInsets.symmetric(horizontal: 8, vertical: 6),- );- case FieldType.LastEditedTime:- case FieldType.CreatedTime:- return TimestampCellStyle(- placeholder: LocaleKeys.grid_row_textPlaceholder.tr(),- alignment: Alignment.centerLeft,- cellPadding: const EdgeInsets.symmetric(horizontal: 8, vertical: 6),- );- case FieldType.MultiSelect:- return SelectOptionCellStyle(- placeholder: LocaleKeys.grid_row_textPlaceholder.tr(),- cellPadding: const EdgeInsets.symmetric(horizontal: 8, vertical: 5),- );- case FieldType.Checklist:- return ChecklistCellStyle(- placeholder: LocaleKeys.grid_row_textPlaceholder.tr(),- cellPadding: const EdgeInsets.symmetric(horizontal: 8, vertical: 5),- );- case FieldType.Number:- return GridNumberCellStyle(- placeholder: LocaleKeys.grid_row_textPlaceholder.tr(),- );- case FieldType.RichText:- return GridTextCellStyle(- placeholder: LocaleKeys.grid_row_textPlaceholder.tr(),- );- case FieldType.SingleSelect:- return SelectOptionCellStyle(- placeholder: LocaleKeys.grid_row_textPlaceholder.tr(),- cellPadding: const EdgeInsets.symmetric(horizontal: 8, vertical: 5),- );- case FieldType.URL:- return GridURLCellStyle(- placeholder: LocaleKeys.grid_row_textPlaceholder.tr(),- accessoryTypes: [- GridURLCellAccessoryType.copyURL,- GridURLCellAccessoryType.visitURL,- ],- );- }- throw UnimplementedError;+class _TitleTextCellSkin extends IEditableTextCellSkin {+ @override+ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ TextCellBloc bloc,+ FocusNode focusNode,+ TextEditingController textEditingController,+ ) {+ return FlowyTextField(+ controller: textEditingController,+ textStyle: Theme.of(context).textTheme.bodyMedium?.copyWith(fontSize: 14),+ focusNode: focusNode,+ hintText: LocaleKeys.calendar_defaultNewCalendarTitle.tr(),+ onChanged: (text) => bloc.add(TextCellEvent.updateText(text)),+ );}}diff --git a/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_page.dart b/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_page.dartindex a217923279..a4f72d4420 100644--- a/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_page.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_page.dart@@ -6,7 +6,6 @@ import 'package:appflowy/mobile/presentation/bottom_sheet/bottom_sheet.dart';import 'package:appflowy/mobile/presentation/database/card/card.dart';import 'package:appflowy/mobile/presentation/presentation.dart';import 'package:appflowy/plugins/database/application/database_controller.dart';-import 'package:appflowy/plugins/database/application/field/field_controller.dart';import 'package:appflowy/plugins/database/calendar/application/calendar_bloc.dart';import 'package:appflowy/plugins/database/calendar/application/unschedule_event_bloc.dart';import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';@@ -24,9 +23,7 @@ import 'package:flowy_infra_ui/widget/flowy_tooltip.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:go_router/go_router.dart';-import '../../application/row/row_cache.dart';import '../../application/row/row_controller.dart';-import '../../widgets/row/cell_builder.dart';import '../../widgets/row/row_detail.dart';import 'calendar_day.dart';@@ -349,26 +346,21 @@ class _CalendarPageState extends State<CalendarPage> {void showEventDetails({required BuildContext context,+ required DatabaseController databaseController,required CalendarEventPB event,- required String viewId,- required RowCache rowCache,- required FieldController fieldController,}) {- final dataController = RowController(+ final rowController = RowController(rowMeta: event.rowMeta,- viewId: viewId,- rowCache: rowCache,+ viewId: databaseController.viewId,+ rowCache: databaseController.rowCache,);FlowyOverlay.show(context: context,builder: (BuildContext overlayContext) {return RowDetailPage(- cellBuilder: GridCellBuilder(- cellCache: rowCache.cellCache,- ),- rowController: dataController,- fieldController: fieldController,+ rowController: rowController,+ databaseController: databaseController,);},);@@ -508,9 +500,7 @@ class UnscheduleEventsList extends StatelessWidget {showEventDetails(context: context,event: event,- viewId: databaseController.viewId,- rowCache: databaseController.rowCache,- fieldController: databaseController.fieldController,+ databaseController: databaseController,);PopoverContainer.of(context).close();}diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/application/row/row_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/application/row/row_bloc.dartindex c94838300a..2fc7f2fc79 100644--- a/frontend/appflowy_flutter/lib/plugins/database/grid/application/row/row_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/application/row/row_bloc.dart@@ -1,13 +1,14 @@+import 'dart:async';import 'dart:collection';-import 'package:appflowy/plugins/database/application/field/field_info.dart';-import 'package:appflowy/plugins/database/application/row/row_listener.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';-import 'package:equatable/equatable.dart';++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';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';-import 'dart:async';-import '../../../application/cell/cell_service.dart';import '../../../application/row/row_cache.dart';import '../../../application/row/row_controller.dart';import '../../../application/row/row_service.dart';@@ -15,82 +16,81 @@ import '../../../application/row/row_service.dart';part 'row_bloc.freezed.dart';class RowBloc extends Bloc<RowEvent, RowState> {+ final FieldController fieldController;final RowBackendService _rowBackendSvc;- final RowController _dataController;- final RowListener _rowListener;+ final RowController _rowController;final String viewId;final String rowId;RowBloc({+ required this.fieldController,required this.rowId,required this.viewId,- required RowController dataController,+ required RowController rowController,}) : _rowBackendSvc = RowBackendService(viewId: viewId),- _dataController = dataController,- _rowListener = RowListener(rowId),- super(RowState.initial(dataController.loadData())) {+ _rowController = rowController,+ super(RowState.initial()) {+ _dispatch();+ _startListening();+ _init();+ }++ @override+ Future<void> close() async {+ _rowController.dispose();+ return super.close();+ }++ void _dispatch() {on<RowEvent>((event, emit) async {- await event.when(- initial: () async {- await _startListening();- },+ event.when(createRow: () {_rowBackendSvc.createRowAfter(rowId);},- didReceiveCells: (cellByFieldId, reason) async {- cellByFieldId- .removeWhere((_, cellContext) => !cellContext.isVisible());- final cells = cellByFieldId.values- .map((e) => GridCellEquatable(e.fieldInfo))- .toList();+ didReceiveCells: (CellContextByFieldId cellByFieldId, reason) {+ cellByFieldId.removeWhere(+ (_, cellContext) => !fieldController+ .getField(cellContext.fieldId)!+ .fieldSettings!+ .visibility+ .isVisibleState(),+ );emit(state.copyWith(cellByFieldId: cellByFieldId,- cells: UnmodifiableListView(cells),changeReason: reason,),);},- reloadRow: (DidFetchRowPB row) {- emit(state.copyWith(rowSource: RowSourece.remote(row)));- },);},);}- @override- Future<void> close() async {- _dataController.dispose();- await _rowListener.stop();- return super.close();- }-- Future<void> _startListening() async {- _dataController.addListener(+ void _startListening() {+ _rowController.addListener(onRowChanged: (cells, reason) {if (!isClosed) {add(RowEvent.didReceiveCells(cells, reason));}},);+ }- _rowListener.start(- onRowFetched: (fetchRow) {- if (!isClosed) {- add(RowEvent.reloadRow(fetchRow));- }- },+ void _init() {+ add(+ RowEvent.didReceiveCells(+ _rowController.loadData(),+ const ChangedReason.setInitialRows(),+ ),);}}@freezedclass RowEvent with _$RowEvent {- const factory RowEvent.initial() = _InitialRow;const factory RowEvent.createRow() = _CreateRow;- const factory RowEvent.reloadRow(DidFetchRowPB row) = _ReloadRow;const factory RowEvent.didReceiveCells(CellContextByFieldId cellsByFieldId,ChangedReason reason,@@ -101,45 +101,13 @@ class RowEvent with _$RowEvent {class RowState with _$RowState {const factory RowState({required CellContextByFieldId cellByFieldId,- required UnmodifiableListView<GridCellEquatable> cells,- required RowSourece rowSource,ChangedReason? changeReason,}) = _RowState;- factory RowState.initial(- CellContextByFieldId cellByFieldId,- ) {- cellByFieldId.removeWhere((_, cellContext) => !cellContext.isVisible());+ factory RowState.initial() {return RowState(- cellByFieldId: cellByFieldId,- cells: UnmodifiableListView(- cellByFieldId.values- .map((e) => GridCellEquatable(e.fieldInfo))- .toList(),- ),- rowSource: const RowSourece.disk(),+ cellByFieldId: CellContextByFieldId(),+ changeReason: null,);}}--class GridCellEquatable extends Equatable {- final FieldInfo _fieldInfo;-- const GridCellEquatable(FieldInfo field) : _fieldInfo = field;-- @override- List<Object?> get props => [- _fieldInfo.id,- _fieldInfo.fieldType,- _fieldInfo.field.visibility,- _fieldInfo.fieldSettings?.width,- ];-}--@freezed-class RowSourece with _$RowSourece {- const factory RowSourece.disk() = _Disk;- const factory RowSourece.remote(- DidFetchRowPB row,- ) = _Remote;-}diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/application/row/row_detail_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/application/row/row_detail_bloc.dartindex 4001d8062a..aa05bec883 100644--- a/frontend/appflowy_flutter/lib/plugins/database/grid/application/row/row_detail_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/application/row/row_detail_bloc.dart@@ -1,7 +1,10 @@-import 'package:appflowy/plugins/database/application/cell/cell_service.dart';+import 'package:appflowy/plugins/database/application/cell/cell_controller.dart';+import 'package:appflowy/plugins/database/application/field/field_controller.dart';+import 'package:appflowy/plugins/database/application/field/field_info.dart';import 'package:appflowy/plugins/database/application/field/field_service.dart';import 'package:appflowy/plugins/database/application/field_settings/field_settings_service.dart';import 'package:appflowy/plugins/database/application/row/row_controller.dart';+import 'package:appflowy/plugins/database/widgets/setting/field_visibility_extension.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-database2/field_settings_entities.pb.dart';import 'package:flutter_bloc/flutter_bloc.dart';@@ -10,26 +13,41 @@ import 'package:freezed_annotation/freezed_annotation.dart';part 'row_detail_bloc.freezed.dart';class RowDetailBloc extends Bloc<RowDetailEvent, RowDetailState> {+ final FieldController fieldController;final RowController rowController;+ final List<CellContext> allCells = [];+RowDetailBloc({+ required this.fieldController,required this.rowController,- }) : super(RowDetailState.initial(rowController.loadData())) {+ }) : super(RowDetailState.initial()) {+ _dispatch();+ _startListening();+ _init();+ }++ @override+ Future<void> close() async {+ rowController.dispose();+ return super.close();+ }++ void _dispatch() {on<RowDetailEvent>((event, emit) async {await event.when(- initial: () async {- await _startListening();- },- didReceiveCellDatas: (visibleCells, allCells, numHiddenFields) {+ didReceiveCellDatas: (visibleCells, numHiddenFields) {emit(state.copyWith(visibleCells: visibleCells,- allCells: allCells,numHiddenFields: numHiddenFields,),);},+ didUpdateFields: (fields) {+ emit(state.copyWith(fields: fields));+ },deleteField: (fieldId) async {final result = await FieldBackendService.deleteField(viewId: rowController.viewId,@@ -38,36 +56,23 @@ class RowDetailBloc extends Bloc<RowDetailEvent, RowDetailState> {result.fold((l) {}, (err) => Log.error(err));},toggleFieldVisibility: (fieldId) async {- final fieldInfo = state.allCells- .where((cellContext) => cellContext.fieldId == fieldId)- .first- .fieldInfo;- final fieldVisibility =- fieldInfo.visibility == FieldVisibility.AlwaysShown- ? FieldVisibility.AlwaysHidden- : FieldVisibility.AlwaysShown;- final result =- await FieldSettingsBackendService(viewId: rowController.viewId)- .updateFieldSettings(- fieldId: fieldId,- fieldVisibility: fieldVisibility,- );- result.fold(- (l) {},- (err) => Log.error(err),- );+ await _toggleFieldVisibility(fieldId, emit);},reorderField: (fromIndex, toIndex) async {await _reorderField(fromIndex, toIndex, emit);},toggleHiddenFieldVisibility: () {final showHiddenFields = !state.showHiddenFields;- final visibleCells = List<DatabaseCellContext>.from(state.allCells);- visibleCells.retainWhere(- (cellContext) =>- !cellContext.fieldInfo.isPrimary &&- cellContext.isVisible(showHiddenFields: showHiddenFields),+ final visibleCells = List<CellContext>.from(+ allCells.where((cellContext) {+ final fieldInfo = fieldController.getField(cellContext.fieldId);+ return fieldInfo != null &&+ !fieldInfo.isPrimary &&+ (fieldInfo.visibility!.isVisibleState() ||+ showHiddenFields);+ }),);+emit(state.copyWith(showHiddenFields: showHiddenFields,@@ -80,30 +85,27 @@ class RowDetailBloc extends Bloc<RowDetailEvent, RowDetailState> {);}- @override- Future<void> close() async {- rowController.dispose();- return super.close();- }-- Future<void> _startListening() async {+ void _startListening() {rowController.addListener(onRowChanged: (cellMap, reason) {if (isClosed) {return;}- final allCells = cellMap.values.toList();+ allCells.clear();+ allCells.addAll(cellMap.values);int numHiddenFields = 0;- final visibleCells = <DatabaseCellContext>[];- for (final cell in allCells) {- final isPrimary = cell.fieldInfo.isPrimary;+ final visibleCells = <CellContext>[];- if (cell.isVisible(showHiddenFields: state.showHiddenFields) &&- !isPrimary) {- visibleCells.add(cell);+ for (final cellContext in allCells) {+ final fieldInfo = fieldController.getField(cellContext.fieldId);+ if (fieldInfo == null || fieldInfo.isPrimary) {+ continue;}-- if (!cell.isVisible() && !isPrimary) {+ final isHidden = !fieldInfo.visibility!.isVisibleState();+ if (!isHidden || state.showHiddenFields) {+ visibleCells.add(cellContext);+ }+ if (isHidden) {numHiddenFields++;}}@@ -111,12 +113,57 @@ class RowDetailBloc extends Bloc<RowDetailEvent, RowDetailState> {add(RowDetailEvent.didReceiveCellDatas(visibleCells,- allCells,numHiddenFields,),);},);+ fieldController.addListener(+ onReceiveFields: (fields) => add(RowDetailEvent.didUpdateFields(fields)),+ listenWhen: () => !isClosed,+ );+ }++ void _init() {+ allCells.addAll(rowController.loadData().values);+ int numHiddenFields = 0;+ final visibleCells = <CellContext>[];+ for (final cell in allCells) {+ final fieldInfo = fieldController.getField(cell.fieldId);+ if (fieldInfo == null || fieldInfo.isPrimary) {+ continue;+ }+ final isHidden = !fieldInfo.visibility!.isVisibleState();+ if (!isHidden) {+ visibleCells.add(cell);+ } else {+ numHiddenFields++;+ }+ }+ add(+ RowDetailEvent.didReceiveCellDatas(+ visibleCells,+ numHiddenFields,+ ),+ );+ add(RowDetailEvent.didUpdateFields(fieldController.fieldInfos));+ }++ Future<void> _toggleFieldVisibility(+ String fieldId,+ Emitter<RowDetailState> emit,+ ) async {+ final fieldInfo = fieldController.getField(fieldId)!;+ final fieldVisibility = fieldInfo.visibility == FieldVisibility.AlwaysShown+ ? FieldVisibility.AlwaysHidden+ : FieldVisibility.AlwaysShown;+ final result =+ await FieldSettingsBackendService(viewId: rowController.viewId)+ .updateFieldSettings(+ fieldId: fieldId,+ fieldVisibility: fieldVisibility,+ );+ result.fold((l) {}, (err) => Log.error(err));}Future<void> _reorderField(@@ -130,7 +177,7 @@ class RowDetailBloc extends Bloc<RowDetailEvent, RowDetailState> {final fromId = state.visibleCells[fromIndex].fieldId;final toId = state.visibleCells[toIndex].fieldId;- final cells = List<DatabaseCellContext>.from(state.visibleCells);+ final cells = List<CellContext>.from(state.visibleCells);cells.insert(toIndex, cells.removeAt(fromIndex));emit(state.copyWith(visibleCells: cells));@@ -145,54 +192,46 @@ class RowDetailBloc extends Bloc<RowDetailEvent, RowDetailState> {@freezedclass RowDetailEvent with _$RowDetailEvent {- const factory RowDetailEvent.initial() = _Initial;+ const factory RowDetailEvent.didUpdateFields(List<FieldInfo> fields) =+ _DidUpdateFields;++ /// Triggered by listeners to update row data+ const factory RowDetailEvent.didReceiveCellDatas(+ List<CellContext> visibleCells,+ int numHiddenFields,+ ) = _DidReceiveCellDatas;++ /// Used to delete a fieldconst factory RowDetailEvent.deleteField(String fieldId) = _DeleteField;++ /// Used to show/hide a fieldconst factory RowDetailEvent.toggleFieldVisibility(String fieldId) =_ToggleFieldVisibility;++ /// Used to reorder a fieldconst factory RowDetailEvent.reorderField(int fromIndex,int toIndex,) = _ReorderField;++ /// Used to hide/show the hidden fields in the row detail pageconst factory RowDetailEvent.toggleHiddenFieldVisibility() =_ToggleHiddenFieldVisibility;- const factory RowDetailEvent.didReceiveCellDatas(- List<DatabaseCellContext> visibleCells,- List<DatabaseCellContext> allCells,- int numHiddenFields,- ) = _DidReceiveCellDatas;}@freezedclass RowDetailState with _$RowDetailState {const factory RowDetailState({- required List<DatabaseCellContext> visibleCells,- required List<DatabaseCellContext> allCells,+ required List<FieldInfo> fields,+ required List<CellContext> visibleCells,required bool showHiddenFields,required int numHiddenFields,}) = _RowDetailState;- factory RowDetailState.initial(CellContextByFieldId cellByFieldId) {- final allCells = cellByFieldId.values.toList();- int numHiddenFields = 0;- final visibleCells = <DatabaseCellContext>[];- for (final cell in allCells) {- final isVisible = cell.isVisible();- final isPrimary = cell.fieldInfo.isPrimary;-- if (isVisible && !isPrimary) {- visibleCells.add(cell);- }-- if (!isVisible && !isPrimary) {- numHiddenFields++;- }- }-- return RowDetailState(- visibleCells: visibleCells,- allCells: allCells,- showHiddenFields: false,- numHiddenFields: numHiddenFields,- );- }+ factory RowDetailState.initial() => const RowDetailState(+ fields: [],+ visibleCells: [],+ showHiddenFields: false,+ numHiddenFields: 0,+ );}diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/grid_page.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/grid_page.dartindex a4a2b8a706..c2b2bbc429 100755--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/grid_page.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/grid_page.dart@@ -4,8 +4,7 @@ import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/plugins/database/application/row/row_service.dart';import 'package:appflowy/plugins/database/grid/presentation/widgets/toolbar/grid_setting_bar.dart';import 'package:appflowy/plugins/database/tab_bar/desktop/setting_menu.dart';-import 'package:appflowy/plugins/database/widgets/row/cell_builder.dart';-import 'package:appflowy/startup/startup.dart';+import 'package:appflowy/plugins/database/widgets/cell/editable_cell_builder.dart';import 'package:appflowy/workspace/application/notifications/notification_action.dart';import 'package:appflowy/workspace/application/notifications/notification_action_bloc.dart';import 'package:appflowy_backend/log.dart';@@ -115,18 +114,11 @@ class _GridPageState extends State<GridPage> {@overrideWidget build(BuildContext context) {- return MultiBlocProvider(- providers: [- BlocProvider<NotificationActionBloc>.value(- value: getIt<NotificationActionBloc>(),- ),- BlocProvider<GridBloc>(- create: (context) => GridBloc(- view: widget.view,- databaseController: widget.databaseController,- )..add(const GridEvent.initial()),- ),- ],+ return BlocProvider<GridBloc>(+ create: (context) => GridBloc(+ view: widget.view,+ databaseController: widget.databaseController,+ )..add(const GridEvent.initial()),child: BlocListener<NotificationActionBloc, NotificationActionState>(listener: (context, state) {final action = state.action;@@ -182,7 +174,6 @@ class _GridPageState extends State<GridPage> {return;}- final fieldController = gridBloc.databaseController.fieldController;final rowController = RowController(viewId: widget.view.id,rowMeta: rowMeta,@@ -192,9 +183,8 @@ class _GridPageState extends State<GridPage> {FlowyOverlay.show(context: context,builder: (_) => RowDetailPage(- cellBuilder: GridCellBuilder(cellCache: rowController.cellCache),+ databaseController: context.read<GridBloc>().databaseController,rowController: rowController,- fieldController: fieldController,),);});@@ -288,7 +278,7 @@ class _GridRows extends StatelessWidget {reorderSingleRow: (reorderRow, rowInfo) => true,delete: (item) => true,insert: (item) => true,- orElse: () => false,+ orElse: () => true,),builder: (context, state) {final rowInfos = state.rowInfos;@@ -312,15 +302,17 @@ class _GridRows extends StatelessWidget {GridState state,List<RowInfo> rowInfos,) {- final children = rowInfos.mapIndexed((index, rowInfo) {- return _renderRow(- context,- rowInfo.rowId,- isDraggable: state.reorderable,- index: index,- );- }).toList()- ..add(const GridRowBottomBar(key: Key('gridFooter')));+ final children = [+ ...rowInfos.mapIndexed((index, rowInfo) {+ return _renderRow(+ context,+ rowInfo.rowId,+ isDraggable: state.reorderable,+ index: index,+ );+ }),+ const GridRowBottomBar(key: Key('gridFooter')),+ ];return ReorderableListView.builder(/// This is a workaround related to/// https://github.com/flutter/flutter/issues/25652@@ -333,12 +325,11 @@ class _GridRows extends StatelessWidget {),onReorder: (fromIndex, newIndex) {final toIndex = newIndex > fromIndex ? newIndex - 1 : newIndex;- if (fromIndex == toIndex) {- return;+ if (fromIndex != toIndex) {+ context.read<GridBloc>().add(GridEvent.moveRow(fromIndex, toIndex));}- context.read<GridBloc>().add(GridEvent.moveRow(fromIndex, toIndex));},- itemCount: rowInfos.length + 1, // the extra item is the footer+ itemCount: children.length,itemBuilder: (context, index) => children[index],);}@@ -350,7 +341,8 @@ class _GridRows extends StatelessWidget {required bool isDraggable,Animation<double>? animation,}) {- final rowCache = context.read<GridBloc>().getRowCache(rowId);+ final databaseController = context.read<GridBloc>().databaseController;+ final DatabaseController(:viewId, :rowCache) = databaseController;final rowMeta = rowCache.getRow(rowId)?.rowMeta;/// Return placeholder widget if the rowMeta is null.@@ -358,9 +350,6 @@ class _GridRows extends StatelessWidget {Log.warn('RowMeta is null for rowId: $rowId');return const SizedBox.shrink();}-- final fieldController =- context.read<GridBloc>().databaseController.fieldController;final rowController = RowController(viewId: viewId,rowMeta: rowMeta,@@ -369,20 +358,20 @@ class _GridRows extends StatelessWidget {final child = GridRow(key: ValueKey(rowMeta.id),+ fieldController: databaseController.fieldController,rowId: rowId,viewId: viewId,index: index,isDraggable: isDraggable,- dataController: rowController,- cellBuilder: GridCellBuilder(cellCache: rowController.cellCache),+ rowController: rowController,+ cellBuilder: EditableCellBuilder(databaseController: databaseController),openDetailPage: (context, cellBuilder) {FlowyOverlay.show(context: context,builder: (BuildContext context) {return RowDetailPage(- cellBuilder: cellBuilder,rowController: rowController,- fieldController: fieldController,+ databaseController: databaseController,);},);diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/header/field_editor.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/header/field_editor.dartindex ea7f6c76ed..635754efc4 100644--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/header/field_editor.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/header/field_editor.dart@@ -10,9 +10,7 @@ import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';import 'package:appflowy/plugins/database/grid/presentation/widgets/common/type_option_separator.dart';import 'package:appflowy/plugins/database/grid/presentation/widgets/header/field_type_extension.dart';import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/field_entities.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/field_settings_entities.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/field_settings_entities.pbenum.dart';+import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/row/mobile_row.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/row/mobile_row.dartindex 89c9975eae..eba7341ab1 100755--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/row/mobile_row.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/row/mobile_row.dart@@ -1,15 +1,15 @@import 'package:appflowy/generated/flowy_svgs.g.dart';-import 'package:appflowy/plugins/database/application/cell/cell_service.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';import 'package:appflowy/plugins/database/application/row/row_service.dart';import 'package:appflowy/plugins/database/grid/application/row/row_bloc.dart';-import 'package:appflowy/plugins/database/widgets/row/cell_builder.dart';+import 'package:appflowy/plugins/database/widgets/cell/editable_cell_builder.dart';import 'package:appflowy/plugins/database/widgets/row/cells/mobile_cell_container.dart';import 'package:flowy_infra/theme_extension.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';-import 'package:flutter/foundation.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';@@ -36,9 +36,8 @@ class MobileGridRow extends StatefulWidget {}class _MobileGridRowState extends State<MobileGridRow> {- late final RowBloc _rowBloc;late final RowController _rowController;- late final GridCellBuilder _cellBuilder;+ late final EditableCellBuilder _cellBuilder;String get viewId => widget.databaseController.viewId;RowCache get rowCache => widget.databaseController.rowCache;@@ -51,27 +50,28 @@ class _MobileGridRowState extends State<MobileGridRow> {viewId: viewId,rowCache: rowCache,);- _rowBloc = RowBloc(- rowId: widget.rowId,- dataController: _rowController,- viewId: viewId,- )..add(const RowEvent.initial());- _cellBuilder = GridCellBuilder(cellCache: rowCache.cellCache);+ _cellBuilder = EditableCellBuilder(+ databaseController: widget.databaseController,+ );}@overrideWidget build(BuildContext context) {- return BlocProvider.value(- value: _rowBloc,+ return BlocProvider(+ create: (context) => RowBloc(+ fieldController: widget.databaseController.fieldController,+ rowId: widget.rowId,+ rowController: _rowController,+ viewId: viewId,+ ),child: BlocBuilder<RowBloc, RowState>(- // The row need to rebuild when the cell count changes.- buildWhen: (p, c) => p.rowSource != c.rowSource,builder: (context, state) {return Row(children: [SizedBox(width: GridSize.leadingHeaderPadding),Expanded(child: RowContent(+ fieldController: widget.databaseController.fieldController,builder: _cellBuilder,onExpand: () => widget.openDetailPage(context),),@@ -85,7 +85,6 @@ class _MobileGridRowState extends State<MobileGridRow> {@overrideFuture<void> dispose() async {- _rowBloc.close();_rowController.dispose();super.dispose();}@@ -112,10 +111,12 @@ class InsertRowButton extends StatelessWidget {}class RowContent extends StatelessWidget {+ final FieldController fieldController;final VoidCallback onExpand;- final GridCellBuilder builder;+ final EditableCellBuilder builder;const RowContent({super.key,+ required this.fieldController,required this.builder,required this.onExpand,});@@ -123,8 +124,6 @@ class RowContent extends StatelessWidget {@overrideWidget build(BuildContext context) {return BlocBuilder<RowBloc, RowState>(- buildWhen: (previous, current) =>- !listEquals(previous.cells, current.cells),builder: (context, state) {return SizedBox(height: 52,@@ -145,11 +144,14 @@ class RowContent extends StatelessWidget {CellContextByFieldId cellByFieldId,) {return cellByFieldId.values.map(- (cellId) {- final GridCellWidget child = builder.build(cellId);-+ (cellContext) {+ final fieldInfo = fieldController.getField(cellContext.fieldId)!;+ final EditableCellWidget child = builder.buildStyled(+ cellContext,+ EditableCellStyle.mobileGrid,+ );return MobileCellContainer(- isPrimary: cellId.fieldInfo.field.isPrimary,+ isPrimary: fieldInfo.field.isPrimary,onPrimaryFieldCellTap: onExpand,child: child,);diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/row/row.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/row/row.dartindex 70b132d5e5..3d7b7b783b 100755--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/row/row.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/row/row.dart@@ -1,13 +1,13 @@-import 'package:flutter/foundation.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/cell/cell_service.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';import 'package:appflowy/plugins/database/grid/application/row/row_bloc.dart';-import 'package:appflowy/plugins/database/widgets/row/cell_builder.dart';+import 'package:appflowy/plugins/database/widgets/cell/editable_cell_builder.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/theme_extension.dart';@@ -22,20 +22,22 @@ import '../../layout/sizes.dart';import 'action.dart';class GridRow extends StatefulWidget {+ final FieldController fieldController;final RowId viewId;final RowId rowId;- final RowController dataController;- final GridCellBuilder cellBuilder;- final void Function(BuildContext, GridCellBuilder) openDetailPage;+ final RowController rowController;+ final EditableCellBuilder cellBuilder;+ final void Function(BuildContext, EditableCellBuilder) openDetailPage;final int? index;final bool isDraggable;const GridRow({super.key,+ required this.fieldController,required this.viewId,required this.rowId,- required this.dataController,+ required this.rowController,required this.cellBuilder,required this.openDetailPage,this.index,@@ -47,58 +49,37 @@ class GridRow extends StatefulWidget {}class _GridRowState extends State<GridRow> {- late final RowBloc _rowBloc;-- @override- void initState() {- super.initState();- _rowBloc = RowBloc(- rowId: widget.rowId,- dataController: widget.dataController,- viewId: widget.viewId,- )..add(const RowEvent.initial());- }-@overrideWidget build(BuildContext context) {- return BlocProvider.value(- value: _rowBloc,- child: BlocBuilder<RowBloc, RowState>(- // The row need to rebuild when the cell count changes.- buildWhen: (p, c) => p.rowSource != c.rowSource,- builder: (context, state) {- final content = Expanded(- child: RowContent(- builder: widget.cellBuilder,- onExpand: () => widget.openDetailPage(- context,- widget.cellBuilder,- ),+ return BlocProvider(+ create: (_) => RowBloc(+ fieldController: widget.fieldController,+ rowId: widget.rowId,+ rowController: widget.rowController,+ viewId: widget.viewId,+ ),+ child: _RowEnterRegion(+ child: Row(+ children: [+ _RowLeading(+ index: widget.index,+ isDraggable: widget.isDraggable,),- );-- return _RowEnterRegion(- key: ValueKey(state.rowSource),- child: Row(- children: [- _RowLeading(- index: widget.index,- isDraggable: widget.isDraggable,+ Expanded(+ child: RowContent(+ fieldController: widget.fieldController,+ cellBuilder: widget.cellBuilder,+ onExpand: () => widget.openDetailPage(+ context,+ widget.cellBuilder,),- content,- ],+ ),),- );- },+ ],+ ),),);}-- @override- Future<void> dispose() async {- _rowBloc.close();- super.dispose();- }}class _RowLeading extends StatefulWidget {@@ -231,18 +212,18 @@ class _RowMenuButtonState extends State<RowMenuButton> {class RowContent extends StatelessWidget {const RowContent({super.key,- required this.builder,+ required this.fieldController,+ required this.cellBuilder,required this.onExpand,});- final GridCellBuilder builder;+ final FieldController fieldController;final VoidCallback onExpand;+ final EditableCellBuilder cellBuilder;@overrideWidget build(BuildContext context) {return BlocBuilder<RowBloc, RowState>(- buildWhen: (previous, current) =>- !listEquals(previous.cells, current.cells),builder: (context, state) {return IntrinsicHeight(child: Row(@@ -262,20 +243,24 @@ class RowContent extends StatelessWidget {CellContextByFieldId cellByFieldId,) {return cellByFieldId.values.map(- (cellId) {- final GridCellWidget child = builder.build(cellId);+ (cellContext) {+ final fieldInfo = fieldController.getField(cellContext.fieldId)!;+ final EditableCellWidget child = cellBuilder.buildStyled(+ cellContext,+ EditableCellStyle.desktopGrid,+ );return CellContainer(- width: cellId.fieldInfo.fieldSettings!.width.toDouble(),- isPrimary: cellId.fieldInfo.field.isPrimary,+ width: fieldInfo.fieldSettings!.width.toDouble(),+ isPrimary: fieldInfo.field.isPrimary,accessoryBuilder: (buildContext) {final builder = child.accessoryBuilder;final List<GridCellAccessoryBuilder> accessories = [];- if (cellId.fieldInfo.field.isPrimary) {+ if (fieldInfo.field.isPrimary) {accessories.add(GridCellAccessoryBuilder(builder: (key) => PrimaryCellAccessory(key: key,- onTapCallback: onExpand,+ onTap: onExpand,isCellEditing: buildContext.isCellEditing,),),@@ -326,7 +311,7 @@ class RegionStateNotifier extends ChangeNotifier {class _RowEnterRegion extends StatefulWidget {final Widget child;- const _RowEnterRegion({required this.child, super.key});+ const _RowEnterRegion({required this.child});@overrideState<_RowEnterRegion> createState() => _RowEnterRegionState();diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/card/card.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/card/card.dartindex 97ee5b246e..9d1459f891 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/card/card.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/card/card.dart@@ -1,11 +1,13 @@import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/mobile/presentation/database/card/card.dart';-import 'package:appflowy/plugins/database/application/cell/cell_service.dart';+import 'package:appflowy/plugins/database/application/cell/cell_controller.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/grid/presentation/widgets/row/action.dart';import 'package:appflowy_backend/protobuf/flowy-database2/row_entities.pb.dart';import 'package:appflowy_editor/appflowy_editor.dart';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';@@ -13,26 +15,24 @@ import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'card_bloc.dart';-import 'card_cell_builder.dart';-import 'cells/card_cell.dart';+import '../cell/card_cell_builder.dart';+import '../cell/card_cell_skeleton/card_cell.dart';import 'container/accessory.dart';import 'container/card_container.dart';/// Edit a database row with card style widget-class RowCard<CustomCardData> extends StatefulWidget {+class RowCard extends StatefulWidget {+ final FieldController fieldController;final RowMetaPB rowMeta;final String viewId;final String? groupingFieldId;final String? groupId;- /// Allows passing a custom card data object to the card. The card will be- /// returned in the [CardCellBuilder] and can be used to build the card.- final CustomCardData? cardData;final bool isEditing;final RowCache rowCache;/// The [CardCellBuilder] is used to build the card cells.- final CardCellBuilder<CustomCardData> cellBuilder;+ final CardCellBuilder cellBuilder;/// Called when the user taps on the card.final void Function(BuildContext) openCard;@@ -43,14 +43,11 @@ class RowCard<CustomCardData> extends StatefulWidget {/// Called when the user ends editing the card.final VoidCallback onEndEditing;- /// The [RowCardRenderHook] is used to render the card's cell. Other than- /// using the default cell builder. For example the [SelectOptionCardCell]- final RowCardRenderHook<CustomCardData>? renderHook;-final RowCardStyleConfiguration styleConfiguration;const RowCard({super.key,+ required this.fieldController,required this.rowMeta,required this.viewId,required this.isEditing,@@ -59,41 +56,36 @@ class RowCard<CustomCardData> extends StatefulWidget {required this.openCard,required this.onStartEditing,required this.onEndEditing,+ required this.styleConfiguration,this.groupingFieldId,this.groupId,- this.cardData,- this.styleConfiguration = const RowCardStyleConfiguration(- showAccessory: true,- ),- this.renderHook,});@override- State<RowCard<CustomCardData>> createState() =>- _RowCardState<CustomCardData>();+ State<RowCard> createState() => _RowCardState();}-class _RowCardState<T> extends State<RowCard<T>> {+class _RowCardState extends State<RowCard> {final popoverController = PopoverController();late final CardBloc _cardBloc;late final EditableRowNotifier rowNotifier;- AccessoryType? accessoryType;@overridevoid initState() {super.initState();rowNotifier = EditableRowNotifier(isEditing: widget.isEditing);_cardBloc = CardBloc(+ fieldController: widget.fieldController,viewId: widget.viewId,groupFieldId: widget.groupingFieldId,isEditing: widget.isEditing,rowMeta: widget.rowMeta,rowCache: widget.rowCache,- )..add(const RowCardEvent.initial());+ )..add(const CardEvent.initial());rowNotifier.isEditing.addListener(() {if (!mounted) return;- _cardBloc.add(RowCardEvent.setIsEditing(rowNotifier.isEditing.value));+ _cardBloc.add(CardEvent.setIsEditing(rowNotifier.isEditing.value));if (rowNotifier.isEditing.value) {widget.onStartEditing();@@ -103,11 +95,18 @@ class _RowCardState<T> extends State<RowCard<T>> {});}+ @override+ Future<void> dispose() async {+ rowNotifier.dispose();+ _cardBloc.close();+ super.dispose();+ }+@overrideWidget build(BuildContext context) {return BlocProvider.value(value: _cardBloc,- child: BlocBuilder<CardBloc, RowCardState>(+ child: BlocBuilder<CardBloc, CardState>(buildWhen: (previous, current) {// Rebuild when:// 1. If the length of the cells is not the same or isEditing changed@@ -119,59 +118,61 @@ class _RowCardState<T> extends State<RowCard<T>> {// 2. the content of the cells changedreturn !listEquals(previous.cells, current.cells);},- builder: (context, state) {- if (PlatformExtension.isMobile) {- return GestureDetector(- child: MobileCardContent<T>(- cellBuilder: widget.cellBuilder,- styleConfiguration: widget.styleConfiguration,- cells: state.cells,- renderHook: widget.renderHook,- cardData: widget.cardData,- ),- onTap: () => widget.openCard(context),- );- }+ builder: (context, state) =>+ PlatformExtension.isMobile ? _mobile(state) : _desktop(state),+ ),+ );+ }- return AppFlowyPopover(- controller: popoverController,- triggerActions: PopoverTriggerFlags.none,- constraints: BoxConstraints.loose(const Size(140, 200)),- direction: PopoverDirection.rightWithCenterAligned,- popupBuilder: (_) {- return RowActionMenu.board(- viewId: _cardBloc.viewId,- rowId: _cardBloc.rowMeta.id,- groupId: widget.groupId,- );- },- child: RowCardContainer(- buildAccessoryWhen: () => state.isEditing == false,- accessories: [- if (widget.styleConfiguration.showAccessory) ...[- _CardEditOption(rowNotifier: rowNotifier),- const CardMoreOption(),- ],- ],- openAccessory: _handleOpenAccessory,- openCard: (context) => widget.openCard(context),- child: _CardContent<T>(- rowNotifier: rowNotifier,- cellBuilder: widget.cellBuilder,- styleConfiguration: widget.styleConfiguration,- cells: state.cells,- renderHook: widget.renderHook,- cardData: widget.cardData,- ),- ),- );- },+ Widget _mobile(CardState state) {+ return GestureDetector(+ onTap: () => widget.openCard(context),+ behavior: HitTestBehavior.opaque,+ child: MobileCardContent(+ rowMeta: state.rowMeta,+ cellBuilder: widget.cellBuilder,+ styleConfiguration: widget.styleConfiguration,+ cells: state.cells,+ ),+ );+ }++ Widget _desktop(CardState state) {+ final accessories = widget.styleConfiguration.showAccessory+ ? <CardAccessory>[+ EditCardAccessory(rowNotifier: rowNotifier),+ const MoreCardOptionsAccessory(),+ ]+ : null;+ return AppFlowyPopover(+ controller: popoverController,+ triggerActions: PopoverTriggerFlags.none,+ constraints: BoxConstraints.loose(const Size(140, 200)),+ direction: PopoverDirection.rightWithCenterAligned,+ popupBuilder: (_) {+ return RowActionMenu.board(+ viewId: _cardBloc.viewId,+ rowId: _cardBloc.rowId,+ groupId: widget.groupId,+ );+ },+ child: RowCardContainer(+ buildAccessoryWhen: () => state.isEditing == false,+ accessories: accessories ?? [],+ openAccessory: _handleOpenAccessory,+ openCard: widget.openCard,+ child: _CardContent(+ rowMeta: state.rowMeta,+ rowNotifier: rowNotifier,+ cellBuilder: widget.cellBuilder,+ styleConfiguration: widget.styleConfiguration,+ cells: state.cells,+ ),),);}void _handleOpenAccessory(AccessoryType newAccessoryType) {- accessoryType = newAccessoryType;switch (newAccessoryType) {case AccessoryType.edit:break;@@ -180,118 +181,70 @@ class _RowCardState<T> extends State<RowCard<T>> {break;}}-- @override- Future<void> dispose() async {- rowNotifier.dispose();- _cardBloc.close();- super.dispose();- }}-class _CardContent<CustomCardData> extends StatefulWidget {+class _CardContent extends StatelessWidget {const _CardContent({- super.key,+ required this.rowMeta,required this.rowNotifier,required this.cellBuilder,required this.cells,- required this.cardData,required this.styleConfiguration,- this.renderHook,});+ final RowMetaPB rowMeta;final EditableRowNotifier rowNotifier;- final CardCellBuilder<CustomCardData> cellBuilder;- final List<DatabaseCellContext> cells;- final CustomCardData? cardData;+ final CardCellBuilder cellBuilder;+ final List<CellContext> cells;final RowCardStyleConfiguration styleConfiguration;- final RowCardRenderHook<CustomCardData>? renderHook;-- @override- State<_CardContent<CustomCardData>> createState() =>- _CardContentState<CustomCardData>();-}--class _CardContentState<CustomCardData>- extends State<_CardContent<CustomCardData>> {- final List<EditableCardNotifier> _notifiers = [];-- @override- void dispose() {- for (final element in _notifiers) {- element.dispose();- }- _notifiers.clear();- super.dispose();- }@overrideWidget build(BuildContext context) {- if (widget.styleConfiguration.hoverStyle != null) {- return FlowyHover(- style: widget.styleConfiguration.hoverStyle,- buildWhenOnHover: () => !widget.rowNotifier.isEditing.value,- child: Padding(- padding: widget.styleConfiguration.cardPadding,- child: Column(- mainAxisSize: MainAxisSize.min,- children: _makeCells(context, widget.cells),- ),- ),- );- }- return Padding(- padding: widget.styleConfiguration.cardPadding,+ final child = Padding(+ padding: styleConfiguration.cardPadding,child: Column(mainAxisSize: MainAxisSize.min,- children: _makeCells(context, widget.cells),+ children: _makeCells(context, rowMeta, cells),),);+ return styleConfiguration.hoverStyle == null+ ? child+ : FlowyHover(+ style: styleConfiguration.hoverStyle,+ buildWhenOnHover: () => !rowNotifier.isEditing.value,+ child: child,+ );}List<Widget> _makeCells(BuildContext context,- List<DatabaseCellContext> cells,+ RowMetaPB rowMeta,+ List<CellContext> cells,) {- final List<Widget> children = [];// Remove all the cell listeners.- widget.rowNotifier.unbind();+ rowNotifier.unbind();- cells.asMap().forEach((int index, DatabaseCellContext cellContext) {- final isEditing = index == 0 ? widget.rowNotifier.isEditing.value : false;- final cellNotifier = EditableCardNotifier(isEditing: isEditing);+ return cells.mapIndexed((int index, CellContext cellContext) {+ EditableCardNotifier? cellNotifier;if (index == 0) {- // Only use the first cell to receive user's input when click the edit- // button- widget.rowNotifier.bindCell(cellContext, cellNotifier);- } else {- _notifiers.add(cellNotifier);+ cellNotifier =+ EditableCardNotifier(isEditing: rowNotifier.isEditing.value);+ rowNotifier.bindCell(cellContext, cellNotifier);}- final child = Padding(- key: cellContext.key(),- padding: widget.styleConfiguration.cellPadding,- child: widget.cellBuilder.buildCell(- cellContext: cellContext,- cellNotifier: cellNotifier,- renderHook: widget.renderHook,- cardData: widget.cardData,- hasNotes: !cellContext.rowMeta.isDocumentEmpty,- ),+ return cellBuilder.build(+ cellContext: cellContext,+ cellNotifier: cellNotifier,+ styleMap: styleConfiguration.cellStyleMap,+ hasNotes: !rowMeta.isDocumentEmpty,);-- children.add(child);- });- return children;+ }).toList();}}-class CardMoreOption extends StatelessWidget with CardAccessory {- const CardMoreOption({super.key});-- @override- AccessoryType get type => AccessoryType.more;+class MoreCardOptionsAccessory extends StatelessWidget with CardAccessory {+ const MoreCardOptionsAccessory({super.key});@overrideWidget build(BuildContext context) {@@ -303,11 +256,15 @@ class CardMoreOption extends StatelessWidget with CardAccessory {),);}++ @override+ AccessoryType get type => AccessoryType.more;}-class _CardEditOption extends StatelessWidget with CardAccessory {+class EditCardAccessory extends StatelessWidget with CardAccessory {final EditableRowNotifier rowNotifier;- const _CardEditOption({+ const EditCardAccessory({+ super.key,required this.rowNotifier,});@@ -330,14 +287,14 @@ class _CardEditOption extends StatelessWidget with CardAccessory {}class RowCardStyleConfiguration {+ final CardCellStyleMap cellStyleMap;final bool showAccessory;- final EdgeInsets cellPadding;final EdgeInsets cardPadding;final HoverStyle? hoverStyle;const RowCardStyleConfiguration({+ required this.cellStyleMap,this.showAccessory = true,- this.cellPadding = EdgeInsets.zero,this.cardPadding = const EdgeInsets.all(8),this.hoverStyle,});diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/card/card_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/card/card_bloc.dartindex 6a2415be25..9a7b7f265d 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/card/card_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/card/card_bloc.dart@@ -1,21 +1,22 @@-import 'dart:collection';+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';+import 'package:appflowy/plugins/database/widgets/setting/field_visibility_extension.dart';import 'package:appflowy_backend/protobuf/flowy-database2/row_entities.pb.dart';import 'package:flutter/foundation.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';-import 'dart:async';--import '../../application/cell/cell_service.dart';-import '../../application/row/row_cache.dart';-import '../../application/row/row_service.dart';part 'card_bloc.freezed.dart';-class CardBloc extends Bloc<RowCardEvent, RowCardState> {- final RowMetaPB rowMeta;+class CardBloc extends Bloc<CardEvent, CardState> {+ final FieldController fieldController;+ final String rowId;final String? groupFieldId;- final RowBackendService _rowBackendSvc;final RowCache _rowCache;final String viewId;final RowListener _rowListener;@@ -23,21 +24,27 @@ class CardBloc extends Bloc<RowCardEvent, RowCardState> {VoidCallback? _rowCallback;CardBloc({- required this.rowMeta,+ required this.fieldController,required this.groupFieldId,required this.viewId,+ required RowMetaPB rowMeta,required RowCache rowCache,required bool isEditing,- }) : _rowBackendSvc = RowBackendService(viewId: viewId),+ }) : rowId = rowMeta.id,_rowListener = RowListener(rowMeta.id),_rowCache = rowCache,super(- RowCardState.initial(- _makeCells(groupFieldId, rowCache.loadCells(rowMeta)),+ CardState.initial(+ rowMeta,+ _makeCells(+ fieldController,+ groupFieldId,+ rowCache.loadCells(rowMeta),+ ),isEditing,),) {- on<RowCardEvent>(+ on<CardEvent>((event, emit) async {await event.when(initial: () async {@@ -54,15 +61,8 @@ class CardBloc extends Bloc<RowCardEvent, RowCardState> {setIsEditing: (bool isEditing) {emit(state.copyWith(isEditing: isEditing));},- didReceiveRowMeta: (rowMeta) {- final cells = state.cells- .map(- (cell) => cell.rowMeta.id == rowMeta.id- ? cell.copyWith(rowMeta: rowMeta)- : cell,- )- .toList();- emit(state.copyWith(cells: cells));+ didUpdateRowMeta: (rowMeta) {+ emit(state.copyWith(rowMeta: rowMeta));},);},@@ -75,88 +75,75 @@ class CardBloc extends Bloc<RowCardEvent, RowCardState> {_rowCache.removeRowListener(_rowCallback!);_rowCallback = null;}+ await _rowListener.stop();return super.close();}- RowInfo rowInfo() {- return RowInfo(- viewId: _rowBackendSvc.viewId,- fields: UnmodifiableListView(- state.cells.map((cell) => cell.fieldInfo).toList(),- ),- rowId: rowMeta.id,- rowMeta: rowMeta,- );- }-Future<void> _startListening() async {_rowCallback = _rowCache.addListener(- rowId: rowMeta.id,+ rowId: rowId,onRowChanged: (cellMap, reason) {if (!isClosed) {- final cells = _makeCells(groupFieldId, cellMap);- add(RowCardEvent.didReceiveCells(cells, reason));+ final cells = _makeCells(fieldController, groupFieldId, cellMap);+ add(CardEvent.didReceiveCells(cells, reason));}},);_rowListener.start(- onMetaChanged: (meta) {+ onMetaChanged: (rowMeta) {if (!isClosed) {- add(RowCardEvent.didReceiveRowMeta(meta));+ add(CardEvent.didUpdateRowMeta(rowMeta));}},);}}-List<DatabaseCellContext> _makeCells(+List<CellContext> _makeCells(+ FieldController fieldController,String? groupFieldId,- CellContextByFieldId originalCellMap,+ CellContextByFieldId cellMap,) {- final List<DatabaseCellContext> cells = [];- originalCellMap- .removeWhere((fieldId, cellContext) => !cellContext.isVisible());- for (final entry in originalCellMap.entries) {- // Filter out the cell if it's fieldId equal to the groupFieldId- if (groupFieldId != null) {- if (entry.value.fieldId == groupFieldId) {- continue;- }- }-- cells.add(entry.value);- }- return cells;+ // Only show the non-hidden cells and cells that aren't of the grouping field+ cellMap.removeWhere((_, cellContext) {+ final fieldInfo = fieldController.getField(cellContext.fieldId);+ return fieldInfo == null ||+ !fieldInfo.fieldSettings!.visibility.isVisibleState() ||+ (groupFieldId != null && cellContext.fieldId == groupFieldId);+ });+ return cellMap.values.toList();}@freezed-class RowCardEvent with _$RowCardEvent {- const factory RowCardEvent.initial() = _InitialRow;- const factory RowCardEvent.setIsEditing(bool isEditing) = _IsEditing;- const factory RowCardEvent.didReceiveCells(- List<DatabaseCellContext> cells,+class CardEvent with _$CardEvent {+ const factory CardEvent.initial() = _InitialRow;+ const factory CardEvent.setIsEditing(bool isEditing) = _IsEditing;+ const factory CardEvent.didReceiveCells(+ List<CellContext> cells,ChangedReason reason,) = _DidReceiveCells;- const factory RowCardEvent.didReceiveRowMeta(- RowMetaPB meta,- ) = _DidReceiveRowMeta;+ const factory CardEvent.didUpdateRowMeta(RowMetaPB rowMeta) =+ _DidUpdateRowMeta;}@freezed-class RowCardState with _$RowCardState {- const factory RowCardState({- required List<DatabaseCellContext> cells,+class CardState with _$CardState {+ const factory CardState({+ required List<CellContext> cells,+ required RowMetaPB rowMeta,required bool isEditing,ChangedReason? changeReason,}) = _RowCardState;- factory RowCardState.initial(- List<DatabaseCellContext> cells,+ factory CardState.initial(+ RowMetaPB rowMeta,+ List<CellContext> cells,bool isEditing,) =>- RowCardState(+ CardState(cells: cells,+ rowMeta: rowMeta,isEditing: isEditing,);}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/card/card_cell_builder.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/card/card_cell_builder.dartdeleted file mode 100644index ba24cf7858..0000000000--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/card/card_cell_builder.dart+++ /dev/null@@ -1,218 +0,0 @@-import 'package:appflowy/mobile/presentation/database/card/card_content/card_cells/card_cells.dart';-import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';-import 'package:appflowy/plugins/database/widgets/card/cells/timestamp_card_cell.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/field_entities.pb.dart';-import 'package:appflowy_editor/appflowy_editor.dart';-import 'package:flutter/material.dart';--import '../../application/cell/cell_service.dart';-import 'cells/card_cell.dart';-import 'cells/checkbox_card_cell.dart';-import 'cells/checklist_card_cell.dart';-import 'cells/date_card_cell.dart';-import 'cells/number_card_cell.dart';-import 'cells/select_option_card_cell.dart';-import 'cells/text_card_cell.dart';-import 'cells/url_card_cell.dart';--// T represents as the Generic card data-class CardCellBuilder<CustomCardData> {- final CellMemCache cellCache;- final Map<FieldType, CardCellStyle>? styles;-- CardCellBuilder(this.cellCache, {this.styles});-- Widget buildCell({- CustomCardData? cardData,- required DatabaseCellContext cellContext,- EditableCardNotifier? cellNotifier,- RowCardRenderHook<CustomCardData>? renderHook,- required bool hasNotes,- }) {- final cellControllerBuilder = CellControllerBuilder(- cellContext: cellContext,- cellCache: cellCache,- );-- final key = cellContext.key();- final style = styles?[cellContext.fieldType];-- return PlatformExtension.isMobile- ? _getMobileCardCellWidget(- key: key,- cellContext: cellContext,- cellControllerBuilder: cellControllerBuilder,- style: style,- cardData: cardData,- cellNotifier: cellNotifier,- renderHook: renderHook,- hasNotes: hasNotes,- )- : _getDesktopCardCellWidget(- key: key,- cellContext: cellContext,- cellControllerBuilder: cellControllerBuilder,- style: style,- cardData: cardData,- cellNotifier: cellNotifier,- renderHook: renderHook,- hasNotes: hasNotes,- );- }-- Widget _getDesktopCardCellWidget({- required Key key,- required DatabaseCellContext cellContext,- required CellControllerBuilder cellControllerBuilder,- CardCellStyle? style,- CustomCardData? cardData,- EditableCardNotifier? cellNotifier,- RowCardRenderHook<CustomCardData>? renderHook,- required bool hasNotes,- }) {- switch (cellContext.fieldType) {- case FieldType.Checkbox:- return CheckboxCardCell(- cellControllerBuilder: cellControllerBuilder,- key: key,- );- case FieldType.DateTime:- return DateCardCell<CustomCardData>(- renderHook: renderHook?.renderHook[FieldType.DateTime],- cellControllerBuilder: cellControllerBuilder,- key: key,- );- case FieldType.LastEditedTime:- return TimestampCardCell<CustomCardData>(- renderHook: renderHook?.renderHook[FieldType.LastEditedTime],- cellControllerBuilder: cellControllerBuilder,- key: key,- );- case FieldType.CreatedTime:- return TimestampCardCell<CustomCardData>(- renderHook: renderHook?.renderHook[FieldType.CreatedTime],- cellControllerBuilder: cellControllerBuilder,- key: key,- );- case FieldType.SingleSelect:- return SelectOptionCardCell<CustomCardData>(- renderHook: renderHook?.renderHook[FieldType.SingleSelect],- cellControllerBuilder: cellControllerBuilder,- cardData: cardData,- key: key,- );- case FieldType.MultiSelect:- return SelectOptionCardCell<CustomCardData>(- renderHook: renderHook?.renderHook[FieldType.MultiSelect],- cellControllerBuilder: cellControllerBuilder,- cardData: cardData,- editableNotifier: cellNotifier,- key: key,- );- case FieldType.Checklist:- return ChecklistCardCell(- cellControllerBuilder: cellControllerBuilder,- key: key,- );- case FieldType.Number:- return NumberCardCell<CustomCardData>(- renderHook: renderHook?.renderHook[FieldType.Number],- style: isStyleOrNull<NumberCardCellStyle>(style),- cellControllerBuilder: cellControllerBuilder,- key: key,- );- case FieldType.RichText:- return TextCardCell<CustomCardData>(- key: key,- style: isStyleOrNull<TextCardCellStyle>(style),- cardData: cardData,- renderHook: renderHook?.renderHook[FieldType.RichText],- cellControllerBuilder: cellControllerBuilder,- editableNotifier: cellNotifier,- showNotes: cellContext.fieldInfo.isPrimary && hasNotes,- );- case FieldType.URL:- return URLCardCell<CustomCardData>(- style: isStyleOrNull<URLCardCellStyle>(style),- cellControllerBuilder: cellControllerBuilder,- key: key,- );- }- throw UnimplementedError;- }-- Widget _getMobileCardCellWidget({- required Key key,- required DatabaseCellContext cellContext,- required CellControllerBuilder cellControllerBuilder,- CardCellStyle? style,- CustomCardData? cardData,- EditableCardNotifier? cellNotifier,- RowCardRenderHook<CustomCardData>? renderHook,- required bool hasNotes,- }) {- switch (cellContext.fieldType) {- case FieldType.Checkbox:- return MobileCheckboxCardCell(- cellControllerBuilder: cellControllerBuilder,- key: key,- );- case FieldType.DateTime:- return MobileDateCardCell<CustomCardData>(- renderHook: renderHook?.renderHook[FieldType.DateTime],- cellControllerBuilder: cellControllerBuilder,- key: key,- );- case FieldType.LastEditedTime:- return MobileTimestampCardCell<CustomCardData>(- renderHook: renderHook?.renderHook[FieldType.LastEditedTime],- cellControllerBuilder: cellControllerBuilder,- key: key,- );- case FieldType.CreatedTime:- return MobileTimestampCardCell<CustomCardData>(- renderHook: renderHook?.renderHook[FieldType.CreatedTime],- cellControllerBuilder: cellControllerBuilder,- key: key,- );- case FieldType.SingleSelect:- return MobileSelectOptionCardCell<CustomCardData>(- renderHook: renderHook?.renderHook[FieldType.SingleSelect],- cellControllerBuilder: cellControllerBuilder,- cardData: cardData,- key: key,- );- case FieldType.MultiSelect:- return MobileSelectOptionCardCell<CustomCardData>(- renderHook: renderHook?.renderHook[FieldType.MultiSelect],- cellControllerBuilder: cellControllerBuilder,- cardData: cardData,- key: key,- );- case FieldType.Checklist:- return MobileChecklistCardCell(- cellControllerBuilder: cellControllerBuilder,- key: key,- );- case FieldType.Number:- return MobileNumberCardCell<CustomCardData>(- renderHook: renderHook?.renderHook[FieldType.Number],- cellControllerBuilder: cellControllerBuilder,- key: key,- );- case FieldType.RichText:- return MobileTextCardCell<CustomCardData>(- key: key,- cardData: cardData,- renderHook: renderHook?.renderHook[FieldType.RichText],- cellControllerBuilder: cellControllerBuilder,- );- case FieldType.URL:- return MobileURLCardCell<CustomCardData>(- cellControllerBuilder: cellControllerBuilder,- key: key,- );- }- throw UnimplementedError;- }-}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/card/cells/card_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/card/cells/card_cell.dartdeleted file mode 100644index 3f0ceb563c..0000000000--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/card/cells/card_cell.dart+++ /dev/null@@ -1,187 +0,0 @@-import 'package:appflowy/plugins/database/application/cell/cell_service.dart';-import 'package:appflowy/plugins/database/application/row/row_service.dart';-import 'package:appflowy_backend/log.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/date_entities.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/field_entities.pbenum.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/select_option.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/timestamp_entities.pb.dart';-import 'package:flutter/material.dart';--typedef CellRenderHook<C, CustomCardData> = Widget? Function(- C cellData,- CustomCardData cardData,- BuildContext buildContext,-);-typedef RenderHookByFieldType<C> = Map<FieldType, CellRenderHook<dynamic, C>>;--/// The [RowCardRenderHook] is used to customize the rendering of the-/// card cell. Each cell has its own field type. So the [renderHook]-/// is a map of [FieldType] to [CellRenderHook].-class RowCardRenderHook<CustomCardData> {- final RenderHookByFieldType<CustomCardData> renderHook = {};- RowCardRenderHook();-- /// Add render hook for the FieldType.SingleSelect and FieldType.MultiSelect- void addSelectOptionHook(- CellRenderHook<List<SelectOptionPB>, CustomCardData?> hook,- ) {- final hookFn = _typeSafeHook<List<SelectOptionPB>>(hook);- renderHook[FieldType.SingleSelect] = hookFn;- renderHook[FieldType.MultiSelect] = hookFn;- }-- /// Add a render hook for the [FieldType.RichText]- void addTextCellHook(- CellRenderHook<String, CustomCardData?> hook,- ) {- renderHook[FieldType.RichText] = _typeSafeHook<String>(hook);- }-- /// Add a render hook for the [FieldType.Number]- void addNumberCellHook(- CellRenderHook<String, CustomCardData?> hook,- ) {- renderHook[FieldType.Number] = _typeSafeHook<String>(hook);- }-- /// Add a render hook for the [FieldType.Date]- void addDateCellHook(- CellRenderHook<DateCellDataPB, CustomCardData?> hook,- ) {- renderHook[FieldType.DateTime] = _typeSafeHook<DateCellDataPB>(hook);- }-- /// Add a render hook for [FieldType.LastEditedTime] and [FieldType.CreatedTime]- void addTimestampCellHook(- CellRenderHook<TimestampCellDataPB, CustomCardData?> hook,- ) {- renderHook[FieldType.LastEditedTime] =- _typeSafeHook<TimestampCellDataPB>(hook);- renderHook[FieldType.CreatedTime] =- _typeSafeHook<TimestampCellDataPB>(hook);- }-- CellRenderHook<dynamic, CustomCardData> _typeSafeHook<C>(- CellRenderHook<C, CustomCardData?> hook,- ) {- Widget? hookFn(cellData, cardData, buildContext) {- if (cellData == null) {- return null;- }-- if (cellData is C) {- return hook(cellData, cardData, buildContext);- } else {- Log.debug("Unexpected cellData type: ${cellData.runtimeType}");- return null;- }- }-- return hookFn;- }-}--abstract class CardCellStyle {}--S? isStyleOrNull<S>(CardCellStyle? style) {- if (style is S) {- return style as S;- } else {- return null;- }-}--abstract class CardCell<T, S extends CardCellStyle> extends StatefulWidget {- final T? cardData;- final S? style;-- const CardCell({super.key, this.cardData, this.style});-}--class EditableCardNotifier {- final ValueNotifier<bool> isCellEditing;-- EditableCardNotifier({bool isEditing = false})- : isCellEditing = ValueNotifier(isEditing);-- void dispose() {- isCellEditing.dispose();- }-}--class EditableRowNotifier {- final Map<EditableCellId, EditableCardNotifier> _cells = {};- final ValueNotifier<bool> isEditing;-- EditableRowNotifier({required bool isEditing})- : isEditing = ValueNotifier(isEditing);-- void bindCell(- DatabaseCellContext cellIdentifier,- EditableCardNotifier notifier,- ) {- assert(- _cells.values.isEmpty,- 'Only one cell can receive the notification',- );- final id = EditableCellId.from(cellIdentifier);- _cells[id]?.dispose();-- notifier.isCellEditing.addListener(() {- isEditing.value = notifier.isCellEditing.value;- });-- _cells[EditableCellId.from(cellIdentifier)] = notifier;- }-- void becomeFirstResponder() {- if (_cells.values.isEmpty) return;- assert(- _cells.values.length == 1,- 'Only one cell can receive the notification',- );- _cells.values.first.isCellEditing.value = true;- }-- void resignFirstResponder() {- if (_cells.values.isEmpty) return;- assert(- _cells.values.length == 1,- 'Only one cell can receive the notification',- );- _cells.values.first.isCellEditing.value = false;- }-- void unbind() {- for (final notifier in _cells.values) {- notifier.dispose();- }- _cells.clear();- }-- void dispose() {- unbind();- isEditing.dispose();- }-}--abstract mixin class EditableCell {- // Each cell notifier will be bind to the [EditableRowNotifier], which enable- // the row notifier receive its cells event. For example: begin editing the- // cell or end editing the cell.- //- EditableCardNotifier? get editableNotifier;-}--class EditableCellId {- String fieldId;- RowId rowId;-- EditableCellId(this.rowId, this.fieldId);-- factory EditableCellId.from(DatabaseCellContext cellIdentifier) =>- EditableCellId(- cellIdentifier.rowId,- cellIdentifier.fieldId,- );-}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/card/cells/checkbox_card_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/card/cells/checkbox_card_cell.dartdeleted file mode 100644index 31c3db2914..0000000000--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/card/cells/checkbox_card_cell.dart+++ /dev/null@@ -1,72 +0,0 @@-import 'package:appflowy/generated/flowy_svgs.g.dart';-import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/checkbox_cell/checkbox_cell_bloc.dart';-import 'package:flowy_infra_ui/style_widget/icon_button.dart';-import 'package:flutter/material.dart';-import 'package:flutter_bloc/flutter_bloc.dart';--import '../define.dart';-import 'card_cell.dart';--class CheckboxCardCell extends CardCell {- final CellControllerBuilder cellControllerBuilder;-- const CheckboxCardCell({- required this.cellControllerBuilder,- super.key,- });-- @override- State<CheckboxCardCell> createState() => _CheckboxCellState();-}--class _CheckboxCellState extends State<CheckboxCardCell> {- late CheckboxCellBloc _cellBloc;-- @override- void initState() {- super.initState();- final cellController =- widget.cellControllerBuilder.build() as CheckboxCellController;- _cellBloc = CheckboxCellBloc(cellController: cellController)- ..add(const CheckboxCellEvent.initial());- }-- @override- Widget build(BuildContext context) {- return BlocProvider.value(- value: _cellBloc,- child: BlocBuilder<CheckboxCellBloc, CheckboxCellState>(- buildWhen: (previous, current) =>- previous.isSelected != current.isSelected,- builder: (context, state) {- final icon = FlowySvg(- state.isSelected ? FlowySvgs.check_filled_s : FlowySvgs.uncheck_s,- blendMode: BlendMode.dst,- );-- return Align(- alignment: Alignment.centerLeft,- child: Padding(- padding: CardSizes.cardCellPadding,- child: FlowyIconButton(- iconPadding: EdgeInsets.zero,- icon: icon,- width: 20,- onPressed: () => context- .read<CheckboxCellBloc>()- .add(const CheckboxCellEvent.select()),- ),- ),- );- },- ),- );- }-- @override- Future<void> dispose() async {- _cellBloc.close();- super.dispose();- }-}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/card/cells/checklist_card_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/card/cells/checklist_card_cell.dartdeleted file mode 100644index a2364987c7..0000000000--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/card/cells/checklist_card_cell.dart+++ /dev/null@@ -1,50 +0,0 @@-import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/checklist_cell/checklist_progress_bar.dart';-import 'package:flutter/material.dart';-import 'package:flutter_bloc/flutter_bloc.dart';--import '../../row/cells/checklist_cell/checklist_cell_bloc.dart';-import '../define.dart';-import 'card_cell.dart';--class ChecklistCardCell extends CardCell {- final CellControllerBuilder cellControllerBuilder;- const ChecklistCardCell({required this.cellControllerBuilder, super.key});-- @override- State<ChecklistCardCell> createState() => _ChecklistCellState();-}--class _ChecklistCellState extends State<ChecklistCardCell> {- late ChecklistCellBloc _cellBloc;-- @override- void initState() {- final cellController =- widget.cellControllerBuilder.build() as ChecklistCellController;- _cellBloc = ChecklistCellBloc(cellController: cellController);- _cellBloc.add(const ChecklistCellEvent.initial());- super.initState();- }-- @override- Widget build(BuildContext context) {- return BlocProvider.value(- value: _cellBloc,- child: BlocBuilder<ChecklistCellBloc, ChecklistCellState>(- builder: (context, state) {- if (state.tasks.isEmpty) {- return const SizedBox.shrink();- }- return Padding(- padding: CardSizes.cardCellPadding,- child: ChecklistProgressBar(- tasks: state.tasks,- percent: state.percent,- ),- );- },- ),- );- }-}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/card/cells/date_card_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/card/cells/date_card_cell.dartdeleted file mode 100644index 1898b0348c..0000000000--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/card/cells/date_card_cell.dart+++ /dev/null@@ -1,78 +0,0 @@-import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/date_cell/date_cell_bloc.dart';-import 'package:flowy_infra_ui/style_widget/text.dart';-import 'package:flutter/material.dart';-import 'package:flutter_bloc/flutter_bloc.dart';--import '../define.dart';-import 'card_cell.dart';--class DateCardCell<CustomCardData> extends CardCell {- final CellControllerBuilder cellControllerBuilder;- final CellRenderHook<dynamic, CustomCardData>? renderHook;-- const DateCardCell({- required this.cellControllerBuilder,- this.renderHook,- super.key,- });-- @override- State<DateCardCell> createState() => _DateCellState();-}--class _DateCellState extends State<DateCardCell> {- late DateCellBloc _cellBloc;-- @override- void initState() {- final cellController =- widget.cellControllerBuilder.build() as DateCellController;-- _cellBloc = DateCellBloc(cellController: cellController)- ..add(const DateCellEvent.initial());- super.initState();- }-- @override- Widget build(BuildContext context) {- return BlocProvider.value(- value: _cellBloc,- child: BlocBuilder<DateCellBloc, DateCellState>(- buildWhen: (previous, current) => previous.dateStr != current.dateStr,- builder: (context, state) {- if (state.dateStr.isEmpty) {- return const SizedBox.shrink();- }- final Widget? custom = widget.renderHook?.call(- state.data,- widget.cardData,- context,- );- if (custom != null) {- return custom;- }-- return Align(- alignment: Alignment.centerLeft,- child: Padding(- padding: CardSizes.cardCellPadding,- child: FlowyText.regular(- state.dateStr,- fontSize: 11,- color: Theme.of(context).hintColor,- overflow: TextOverflow.ellipsis,- ),- ),- );- },- ),- );- }-- @override- Future<void> dispose() async {- _cellBloc.close();- super.dispose();- }-}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/card/cells/number_card_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/card/cells/number_card_cell.dartdeleted file mode 100644index 752770052e..0000000000--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/card/cells/number_card_cell.dart+++ /dev/null@@ -1,87 +0,0 @@-import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/number_cell/number_cell_bloc.dart';-import 'package:flowy_infra_ui/style_widget/text.dart';-import 'package:flutter/material.dart';-import 'package:flutter_bloc/flutter_bloc.dart';--import '../define.dart';-import 'card_cell.dart';--class NumberCardCellStyle extends CardCellStyle {- final double fontSize;-- NumberCardCellStyle(this.fontSize);-}--class NumberCardCell<CustomCardData>- extends CardCell<CustomCardData, NumberCardCellStyle> {- final CellRenderHook<String, CustomCardData>? renderHook;- final CellControllerBuilder cellControllerBuilder;-- const NumberCardCell({- required this.cellControllerBuilder,- super.cardData,- super.style,- this.renderHook,- super.key,- });-- @override- State<NumberCardCell> createState() => _NumberCellState();-}--class _NumberCellState extends State<NumberCardCell> {- late NumberCellBloc _cellBloc;-- @override- void initState() {- final cellController =- widget.cellControllerBuilder.build() as NumberCellController;-- _cellBloc = NumberCellBloc(cellController: cellController)- ..add(const NumberCellEvent.initial());- super.initState();- }-- @override- Widget build(BuildContext context) {- return BlocProvider.value(- value: _cellBloc,- child: BlocBuilder<NumberCellBloc, NumberCellState>(- buildWhen: (previous, current) =>- previous.cellContent != current.cellContent,- builder: (context, state) {- if (state.cellContent.isEmpty) {- return const SizedBox.shrink();- }- final Widget? custom = widget.renderHook?.call(- state.cellContent,- widget.cardData,- context,- );- if (custom != null) {- return custom;- }-- return Align(- alignment: Alignment.centerLeft,- child: Padding(- padding: CardSizes.cardCellPadding,- child: FlowyText.regular(- state.cellContent,- fontSize: widget.style?.fontSize ?? 11,- color: Theme.of(context).hintColor,- ),- ),- );- },- ),- );- }-- @override- Future<void> dispose() async {- _cellBloc.close();- super.dispose();- }-}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/card/cells/select_option_card_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/card/cells/select_option_card_cell.dartdeleted file mode 100644index 41e4b04977..0000000000--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/card/cells/select_option_card_cell.dart+++ /dev/null@@ -1,92 +0,0 @@-import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/select_option_cell/extension.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/select_option_cell/select_option_cell_bloc.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/select_option.pb.dart';-import 'package:flutter/material.dart';-import 'package:flutter_bloc/flutter_bloc.dart';--import '../define.dart';-import 'card_cell.dart';--class SelectOptionCardCellStyle extends CardCellStyle {}--class SelectOptionCardCell<CustomCardData>- extends CardCell<CustomCardData, SelectOptionCardCellStyle>- with EditableCell {- final CellControllerBuilder cellControllerBuilder;- final CellRenderHook<List<SelectOptionPB>, CustomCardData>? renderHook;-- @override- final EditableCardNotifier? editableNotifier;-- SelectOptionCardCell({- required this.cellControllerBuilder,- required super.cardData,- this.renderHook,- this.editableNotifier,- super.key,- });-- @override- State<SelectOptionCardCell> createState() => _SelectOptionCellState();-}--class _SelectOptionCellState extends State<SelectOptionCardCell> {- late SelectOptionCellBloc _cellBloc;-- @override- void initState() {- final cellController =- widget.cellControllerBuilder.build() as SelectOptionCellController;- _cellBloc = SelectOptionCellBloc(cellController: cellController)- ..add(const SelectOptionCellEvent.initial());- super.initState();- }-- @override- Widget build(BuildContext context) {- return BlocProvider.value(- value: _cellBloc,- child: BlocBuilder<SelectOptionCellBloc, SelectOptionCellState>(- buildWhen: (previous, current) {- return previous.selectedOptions != current.selectedOptions;- },- builder: (context, state) {- final Widget? custom = widget.renderHook?.call(- state.selectedOptions,- widget.cardData,- context,- );- if (custom != null) {- return custom;- }-- final children = state.selectedOptions- .map(- (option) => SelectOptionTag(- option: option,- fontSize: 11,- padding:- const EdgeInsets.symmetric(horizontal: 4, vertical: 2),- ),- )- .toList();-- return Align(- alignment: AlignmentDirectional.topStart,- child: Padding(- padding: CardSizes.cardCellPadding,- child: Wrap(spacing: 4, runSpacing: 2, children: children),- ),- );- },- ),- );- }-- @override- Future<void> dispose() async {- _cellBloc.close();- super.dispose();- }-}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/card/cells/text_card_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/card/cells/text_card_cell.dartdeleted file mode 100644index 5b3c1933d7..0000000000--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/card/cells/text_card_cell.dart+++ /dev/null@@ -1,221 +0,0 @@-import 'package:appflowy/generated/flowy_svgs.g.dart';-import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/text_cell/text_cell_bloc.dart';-import 'package:easy_localization/easy_localization.dart';-import 'package:flowy_infra_ui/style_widget/text.dart';-import 'package:flowy_infra_ui/widget/flowy_tooltip.dart';-import 'package:flowy_infra_ui/widget/spacing.dart';-import 'package:flutter/material.dart';-import 'package:flutter_bloc/flutter_bloc.dart';--import '../../row/cell_builder.dart';-import '../define.dart';-import 'card_cell.dart';--class TextCardCellStyle extends CardCellStyle {- final double fontSize;-- TextCardCellStyle(this.fontSize);-}--class TextCardCell<CustomCardData>- extends CardCell<CustomCardData, TextCardCellStyle> with EditableCell {- const TextCardCell({- super.key,- super.cardData,- super.style,- required this.cellControllerBuilder,- this.editableNotifier,- this.renderHook,- this.showNotes = false,- });-- @override- final EditableCardNotifier? editableNotifier;-- final CellControllerBuilder cellControllerBuilder;- final CellRenderHook<String, CustomCardData>? renderHook;- final bool showNotes;-- @override- State<TextCardCell> createState() => _TextCellState();-}--class _TextCellState extends State<TextCardCell> {- late TextCellBloc _cellBloc;- late TextEditingController _controller;- bool focusWhenInit = false;- final focusNode = SingleListenerFocusNode();-- @override- void initState() {- final cellController =- widget.cellControllerBuilder.build() as TextCellController;- _cellBloc = TextCellBloc(cellController: cellController)- ..add(const TextCellEvent.initial());- _controller = TextEditingController(text: _cellBloc.state.content);- focusWhenInit = widget.editableNotifier?.isCellEditing.value ?? false;- if (focusWhenInit) {- focusNode.requestFocus();- }-- // If the focusNode lost its focus, the widget's editableNotifier will- // set to false, which will cause the [EditableRowNotifier] to receive- // end edit event.- focusNode.addListener(() {- if (!focusNode.hasFocus) {- focusWhenInit = false;- widget.editableNotifier?.isCellEditing.value = false;- _cellBloc.add(const TextCellEvent.enableEdit(false));- }- });- _bindEditableNotifier();- super.initState();- }-- void _bindEditableNotifier() {- widget.editableNotifier?.isCellEditing.addListener(() {- if (!mounted) return;-- final isEditing = widget.editableNotifier?.isCellEditing.value ?? false;- if (isEditing) {- WidgetsBinding.instance.addPostFrameCallback((_) {- focusNode.requestFocus();- });- }- _cellBloc.add(TextCellEvent.enableEdit(isEditing));- });- }-- @override- void didUpdateWidget(covariant oldWidget) {- _bindEditableNotifier();- super.didUpdateWidget(oldWidget);- }-- @override- Widget build(BuildContext context) {- return BlocProvider.value(- value: _cellBloc,- child: BlocListener<TextCellBloc, TextCellState>(- listener: (context, state) {- if (_controller.text != state.content) {- _controller.text = state.content;- }- },- child: BlocBuilder<TextCellBloc, TextCellState>(- buildWhen: (previous, current) {- if (previous.content != current.content &&- _controller.text == current.content &&- current.enableEdit) {- return false;- }-- return previous != current;- },- builder: (context, state) {- // Returns a custom render widget- final Widget? custom = widget.renderHook?.call(- state.content,- widget.cardData,- context,- );- if (custom != null) {- return custom;- }-- final isTitle =- context.read<TextCellBloc>().cellController.fieldInfo.isPrimary;- if (state.content.isEmpty &&- state.enableEdit == false &&- focusWhenInit == false &&- !isTitle) {- return const SizedBox.shrink();- }-- final child = state.enableEdit || focusWhenInit- ? _buildTextField()- : _buildText(state, isTitle);-- return Padding(- padding: CardSizes.cardCellPadding,- child: Row(- crossAxisAlignment: CrossAxisAlignment.start,- children: [- if (widget.showNotes) ...[- FlowyTooltip(- message: LocaleKeys.board_notesTooltip.tr(),- child: FlowySvg(- FlowySvgs.notes_s,- color: Theme.of(context).hintColor,- ),- ),- const HSpace(4),- ],- Expanded(child: child),- ],- ),- );- },- ),- ),- );- }-- Future<void> focusChanged() async {- _cellBloc.add(TextCellEvent.updateText(_controller.text));- }-- @override- Future<void> dispose() async {- _cellBloc.close();- _controller.dispose();- focusNode.dispose();- super.dispose();- }-- Widget _buildText(TextCellState state, bool isTitle) {- final text = state.content.isEmpty- ? LocaleKeys.grid_row_titlePlaceholder.tr()- : state.content;- final color = state.content.isEmpty ? Theme.of(context).hintColor : null;- return FlowyText(- text,- fontSize: _fontSize(isTitle),- fontWeight: _fontWeight(isTitle),- color: color,- maxLines: null, // Enable multiple lines- );- }-- double _fontSize(bool isTitle) {- return widget.style?.fontSize ?? (isTitle ? 12 : 11);- }-- FontWeight _fontWeight(bool isTitle) {- return isTitle ? FontWeight.w500 : FontWeight.w400;- }-- Widget _buildTextField() {- return TextField(- controller: _controller,- focusNode: focusNode,- onChanged: (value) => focusChanged(),- onEditingComplete: () => focusNode.unfocus(),- maxLines: null,- style: Theme.of(context)- .textTheme- .bodyMedium!- .copyWith(fontSize: _fontSize(true)),- decoration: InputDecoration(- contentPadding:- EdgeInsets.symmetric(vertical: CardSizes.cardCellPadding.top),- border: InputBorder.none,- isDense: true,- isCollapsed: true,- hintText: LocaleKeys.grid_row_titlePlaceholder.tr(),- ),- );- }-}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/card/cells/timestamp_card_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/card/cells/timestamp_card_cell.dartdeleted file mode 100644index f84d47842c..0000000000--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/card/cells/timestamp_card_cell.dart+++ /dev/null@@ -1,77 +0,0 @@-import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/timestamp_cell/timestamp_cell_bloc.dart';-import 'package:flowy_infra_ui/style_widget/text.dart';-import 'package:flutter/material.dart';-import 'package:flutter_bloc/flutter_bloc.dart';--import '../define.dart';-import 'card_cell.dart';--class TimestampCardCell<CustomCardData> extends CardCell {- final CellControllerBuilder cellControllerBuilder;- final CellRenderHook<dynamic, CustomCardData>? renderHook;-- const TimestampCardCell({- required this.cellControllerBuilder,- this.renderHook,- super.key,- });-- @override- State<TimestampCardCell> createState() => _TimestampCellState();-}--class _TimestampCellState extends State<TimestampCardCell> {- late TimestampCellBloc _cellBloc;-- @override- void initState() {- final cellController =- widget.cellControllerBuilder.build() as TimestampCellController;-- _cellBloc = TimestampCellBloc(cellController: cellController)- ..add(const TimestampCellEvent.initial());- super.initState();- }-- @override- Widget build(BuildContext context) {- return BlocProvider.value(- value: _cellBloc,- child: BlocBuilder<TimestampCellBloc, TimestampCellState>(- buildWhen: (previous, current) => previous.dateStr != current.dateStr,- builder: (context, state) {- if (state.dateStr.isEmpty) {- return const SizedBox.shrink();- }- final Widget? custom = widget.renderHook?.call(- state.data,- widget.cardData,- context,- );- if (custom != null) {- return custom;- }-- return Align(- alignment: Alignment.centerLeft,- child: Padding(- padding: CardSizes.cardCellPadding,- child: FlowyText.regular(- state.dateStr,- fontSize: 11,- color: Theme.of(context).hintColor,- ),- ),- );- },- ),- );- }-- @override- Future<void> dispose() async {- _cellBloc.close();- super.dispose();- }-}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/card/cells/url_card_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/card/cells/url_card_cell.dartdeleted file mode 100644index 39825f180c..0000000000--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/card/cells/url_card_cell.dart+++ /dev/null@@ -1,78 +0,0 @@-import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/url_cell/url_cell_bloc.dart';-import 'package:flutter/material.dart';-import 'package:flutter_bloc/flutter_bloc.dart';--import '../define.dart';-import 'card_cell.dart';--class URLCardCellStyle extends CardCellStyle {- final double fontSize;-- URLCardCellStyle(this.fontSize);-}--class URLCardCell<CustomCardData>- extends CardCell<CustomCardData, URLCardCellStyle> {- final CellControllerBuilder cellControllerBuilder;-- const URLCardCell({- required this.cellControllerBuilder,- super.style,- super.key,- });-- @override- State<URLCardCell> createState() => _URLCellState();-}--class _URLCellState extends State<URLCardCell> {- late URLCellBloc _cellBloc;-- @override- void initState() {- final cellController =- widget.cellControllerBuilder.build() as URLCellController;- _cellBloc = URLCellBloc(cellController: cellController);- _cellBloc.add(const URLCellEvent.initial());- super.initState();- }-- @override- Widget build(BuildContext context) {- return BlocProvider.value(- value: _cellBloc,- child: BlocBuilder<URLCellBloc, URLCellState>(- buildWhen: (previous, current) => previous.content != current.content,- builder: (context, state) {- if (state.content.isEmpty) {- return const SizedBox();- }- return Align(- alignment: Alignment.centerLeft,- child: Padding(- padding: CardSizes.cardCellPadding,- child: RichText(- textAlign: TextAlign.left,- text: TextSpan(- text: state.content,- style: Theme.of(context).textTheme.bodySmall!.copyWith(- fontSize: widget.style?.fontSize ?? 11,- color: Theme.of(context).colorScheme.primary,- decoration: TextDecoration.underline,- ),- ),- ),- ),- );- },- ),- );- }-- @override- Future<void> dispose() async {- _cellBloc.close();- super.dispose();- }-}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/card/define.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/card/define.dartdeleted file mode 100644index d96ea48418..0000000000--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/card/define.dart+++ /dev/null@@ -1,5 +0,0 @@-import 'package:flutter/widgets.dart';--class CardSizes {- static EdgeInsets get cardCellPadding => const EdgeInsets.all(4);-}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_builder.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_builder.dartnew file mode 100644index 0000000000..ecc6b7125a--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_builder.dart@@ -0,0 +1,90 @@+import 'package:appflowy/plugins/database/application/cell/cell_controller.dart';+import 'package:appflowy/plugins/database/application/database_controller.dart';+import 'package:appflowy/plugins/database/widgets/cell/card_cell_skeleton/timestamp_card_cell.dart';+import 'package:appflowy_backend/protobuf/flowy-database2/field_entities.pb.dart';+import 'package:flutter/widgets.dart';++import 'card_cell_skeleton/card_cell.dart';+import 'card_cell_skeleton/checkbox_card_cell.dart';+import 'card_cell_skeleton/checklist_card_cell.dart';+import 'card_cell_skeleton/date_card_cell.dart';+import 'card_cell_skeleton/number_card_cell.dart';+import 'card_cell_skeleton/select_option_card_cell.dart';+import 'card_cell_skeleton/text_card_cell.dart';+import 'card_cell_skeleton/url_card_cell.dart';++typedef CardCellStyleMap = Map<FieldType, CardCellStyle>;++class CardCellBuilder {+ final DatabaseController databaseController;++ CardCellBuilder({required this.databaseController});++ Widget build({+ required CellContext cellContext,+ required CardCellStyleMap styleMap,+ EditableCardNotifier? cellNotifier,+ required bool hasNotes,+ }) {+ final fieldType = databaseController.fieldController+ .getField(cellContext.fieldId)!+ .fieldType;+ final key = ValueKey(+ "${databaseController.viewId}${cellContext.fieldId}${cellContext.rowId}",+ );+ final style = styleMap[fieldType];+ return switch (fieldType) {+ FieldType.Checkbox => CheckboxCardCell(+ key: key,+ style: isStyleOrNull(style),+ databaseController: databaseController,+ cellContext: cellContext,+ ),+ FieldType.Checklist => ChecklistCardCell(+ key: key,+ style: isStyleOrNull(style),+ databaseController: databaseController,+ cellContext: cellContext,+ ),+ FieldType.DateTime => DateCardCell(+ key: key,+ style: isStyleOrNull(style),+ databaseController: databaseController,+ cellContext: cellContext,+ ),+ FieldType.LastEditedTime || FieldType.CreatedTime => TimestampCardCell(+ key: key,+ style: isStyleOrNull(style),+ databaseController: databaseController,+ cellContext: cellContext,+ ),+ FieldType.SingleSelect || FieldType.MultiSelect => SelectOptionCardCell(+ key: key,+ style: isStyleOrNull(style),+ databaseController: databaseController,+ cellContext: cellContext,+ ),+ FieldType.Number => NumberCardCell(+ style: isStyleOrNull(style),+ databaseController: databaseController,+ cellContext: cellContext,+ key: key,+ ),+ FieldType.RichText => TextCardCell(+ key: key,+ style: isStyleOrNull(style),+ databaseController: databaseController,+ cellContext: cellContext,+ editableNotifier: cellNotifier,+ showNotes: hasNotes,+ ),+ FieldType.URL => URLCardCell(+ key: key,+ style: isStyleOrNull(style),+ databaseController: databaseController,+ cellContext: cellContext,+ ),+ _ => throw UnimplementedError,+ };+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_skeleton/card_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_skeleton/card_cell.dartnew file mode 100644index 0000000000..0fb15ccbd5--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_skeleton/card_cell.dart@@ -0,0 +1,96 @@+import 'package:appflowy/plugins/database/application/cell/cell_controller.dart';+import 'package:flutter/material.dart';++abstract class CardCell<T extends CardCellStyle> extends StatefulWidget {+ final T style;++ const CardCell({super.key, required this.style});+}++abstract class CardCellStyle {+ final EdgeInsetsGeometry padding;++ const CardCellStyle({required this.padding});+}++S? isStyleOrNull<S>(CardCellStyle? style) {+ if (style is S) {+ return style as S;+ } else {+ return null;+ }+}++class EditableCardNotifier {+ final ValueNotifier<bool> isCellEditing;++ EditableCardNotifier({bool isEditing = false})+ : isCellEditing = ValueNotifier(isEditing);++ void dispose() {+ isCellEditing.dispose();+ }+}++class EditableRowNotifier {+ final Map<CellContext, EditableCardNotifier> _cells = {};+ final ValueNotifier<bool> isEditing;++ EditableRowNotifier({required bool isEditing})+ : isEditing = ValueNotifier(isEditing);++ void bindCell(+ CellContext cellIdentifier,+ EditableCardNotifier notifier,+ ) {+ assert(+ _cells.values.isEmpty,+ 'Only one cell can receive the notification',+ );+ _cells[cellIdentifier]?.dispose();++ notifier.isCellEditing.addListener(() {+ isEditing.value = notifier.isCellEditing.value;+ });++ _cells[cellIdentifier] = notifier;+ }++ void becomeFirstResponder() {+ if (_cells.values.isEmpty) return;+ assert(+ _cells.values.length == 1,+ 'Only one cell can receive the notification',+ );+ _cells.values.first.isCellEditing.value = true;+ }++ void resignFirstResponder() {+ if (_cells.values.isEmpty) return;+ assert(+ _cells.values.length == 1,+ 'Only one cell can receive the notification',+ );+ _cells.values.first.isCellEditing.value = false;+ }++ void unbind() {+ for (final notifier in _cells.values) {+ notifier.dispose();+ }+ _cells.clear();+ }++ void dispose() {+ unbind();+ isEditing.dispose();+ }+}++abstract mixin class EditableCell {+ // Each cell notifier will be bind to the [EditableRowNotifier], which enable+ // the row notifier receive its cells event. For example: begin editing the+ // cell or end editing the cell.+ //+ EditableCardNotifier? get editableNotifier;+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_skeleton/checkbox_card_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_skeleton/checkbox_card_cell.dartnew file mode 100644index 0000000000..f95840c83e--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_skeleton/checkbox_card_cell.dart@@ -0,0 +1,88 @@+import 'package:appflowy/generated/flowy_svgs.g.dart';+import 'package:appflowy/plugins/database/application/cell/cell_controller.dart';+import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';+import 'package:appflowy/plugins/database/application/database_controller.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/checkbox_cell/checkbox_cell_bloc.dart';+import 'package:flowy_infra_ui/style_widget/icon_button.dart';+import 'package:flowy_infra_ui/widget/spacing.dart';+import 'package:flutter/material.dart';+import 'package:flutter_bloc/flutter_bloc.dart';++import 'card_cell.dart';++class CheckboxCardCellStyle extends CardCellStyle {+ final Size iconSize;+ final bool showFieldName;+ final TextStyle? textStyle;++ CheckboxCardCellStyle({+ required super.padding,+ required this.iconSize,+ required this.showFieldName,+ this.textStyle,+ }) : assert(!showFieldName || showFieldName && textStyle != null);+}++class CheckboxCardCell extends CardCell<CheckboxCardCellStyle> {+ final DatabaseController databaseController;+ final CellContext cellContext;++ const CheckboxCardCell({+ super.key,+ required super.style,+ required this.databaseController,+ required this.cellContext,+ });++ @override+ State<CheckboxCardCell> createState() => _CheckboxCellState();+}++class _CheckboxCellState extends State<CheckboxCardCell> {+ @override+ Widget build(BuildContext context) {+ return BlocProvider(+ create: (_) {+ return CheckboxCellBloc(+ cellController: makeCellController(+ widget.databaseController,+ widget.cellContext,+ ).as(),+ )..add(const CheckboxCellEvent.initial());+ },+ child: BlocBuilder<CheckboxCellBloc, CheckboxCellState>(+ builder: (context, state) {+ return Container(+ alignment: AlignmentDirectional.centerStart,+ padding: widget.style.padding,+ child: Row(+ children: [+ FlowyIconButton(+ iconPadding: EdgeInsets.zero,+ icon: FlowySvg(+ state.isSelected+ ? FlowySvgs.check_filled_s+ : FlowySvgs.uncheck_s,+ blendMode: BlendMode.dst,+ size: widget.style.iconSize,+ ),+ width: 20,+ onPressed: () => context+ .read<CheckboxCellBloc>()+ .add(const CheckboxCellEvent.select()),+ ),+ if (widget.style.showFieldName) ...[+ const HSpace(6.0),+ Text(+ state.fieldName,+ style: widget.style.textStyle,+ ),+ ],+ ],+ ),+ );+ },+ ),+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_skeleton/checklist_card_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_skeleton/checklist_card_cell.dartnew file mode 100644index 0000000000..f78768ca01--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_skeleton/checklist_card_cell.dart@@ -0,0 +1,64 @@+import 'package:appflowy/plugins/database/application/cell/cell_controller.dart';+import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';+import 'package:appflowy/plugins/database/application/database_controller.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/checklist_cell/checklist_cell_bloc.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/checklist_cell/checklist_progress_bar.dart';+import 'package:flutter/material.dart';+import 'package:flutter_bloc/flutter_bloc.dart';++import 'card_cell.dart';++class ChecklistCardCellStyle extends CardCellStyle {+ final TextStyle textStyle;++ ChecklistCardCellStyle({+ required super.padding,+ required this.textStyle,+ });+}++class ChecklistCardCell extends CardCell<ChecklistCardCellStyle> {+ final DatabaseController databaseController;+ final CellContext cellContext;++ const ChecklistCardCell({+ super.key,+ required super.style,+ required this.databaseController,+ required this.cellContext,+ });++ @override+ State<ChecklistCardCell> createState() => _ChecklistCellState();+}++class _ChecklistCellState extends State<ChecklistCardCell> {+ @override+ Widget build(BuildContext context) {+ return BlocProvider(+ create: (_) {+ return ChecklistCellBloc(+ cellController: makeCellController(+ widget.databaseController,+ widget.cellContext,+ ).as(),+ )..add(const ChecklistCellEvent.initial());+ },+ child: BlocBuilder<ChecklistCellBloc, ChecklistCellState>(+ builder: (context, state) {+ if (state.tasks.isEmpty) {+ return const SizedBox.shrink();+ }+ return Padding(+ padding: widget.style.padding,+ child: ChecklistProgressBar(+ tasks: state.tasks,+ percent: state.percent,+ textStyle: widget.style.textStyle,+ ),+ );+ },+ ),+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_skeleton/date_card_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_skeleton/date_card_cell.dartnew file mode 100644index 0000000000..83824a77bf--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_skeleton/date_card_cell.dart@@ -0,0 +1,65 @@+import 'package:appflowy/plugins/database/application/cell/cell_controller.dart';+import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';+import 'package:appflowy/plugins/database/application/database_controller.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/date_cell/date_cell_bloc.dart';+import 'package:flutter/material.dart';+import 'package:flutter_bloc/flutter_bloc.dart';++import 'card_cell.dart';++class DateCardCellStyle extends CardCellStyle {+ final TextStyle textStyle;++ DateCardCellStyle({+ required super.padding,+ required this.textStyle,+ });+}++class DateCardCell extends CardCell<DateCardCellStyle> {+ final DatabaseController databaseController;+ final CellContext cellContext;++ const DateCardCell({+ super.key,+ required super.style,+ required this.databaseController,+ required this.cellContext,+ });++ @override+ State<DateCardCell> createState() => _DateCellState();+}++class _DateCellState extends State<DateCardCell> {+ @override+ Widget build(BuildContext context) {+ return BlocProvider(+ create: (context) {+ return DateCellBloc(+ cellController: makeCellController(+ widget.databaseController,+ widget.cellContext,+ ).as(),+ )..add(const DateCellEvent.initial());+ },+ child: BlocBuilder<DateCellBloc, DateCellState>(+ buildWhen: (previous, current) => previous.dateStr != current.dateStr,+ builder: (context, state) {+ if (state.dateStr.isEmpty) {+ return const SizedBox.shrink();+ }++ return Container(+ alignment: Alignment.centerLeft,+ padding: widget.style.padding,+ child: Text(+ state.dateStr,+ style: widget.style.textStyle,+ ),+ );+ },+ ),+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_skeleton/number_card_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_skeleton/number_card_cell.dartnew file mode 100644index 0000000000..c48922a694--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_skeleton/number_card_cell.dart@@ -0,0 +1,62 @@+import 'package:appflowy/plugins/database/application/cell/cell_controller.dart';+import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';+import 'package:appflowy/plugins/database/application/database_controller.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/number_cell/number_cell_bloc.dart';+import 'package:flutter/material.dart';+import 'package:flutter_bloc/flutter_bloc.dart';++import 'card_cell.dart';++class NumberCardCellStyle extends CardCellStyle {+ final TextStyle textStyle;++ const NumberCardCellStyle({+ required super.padding,+ required this.textStyle,+ });+}++class NumberCardCell extends CardCell<NumberCardCellStyle> {+ final DatabaseController databaseController;+ final CellContext cellContext;++ const NumberCardCell({+ super.key,+ required super.style,+ required this.databaseController,+ required this.cellContext,+ });++ @override+ State<NumberCardCell> createState() => _NumberCellState();+}++class _NumberCellState extends State<NumberCardCell> {+ @override+ Widget build(BuildContext context) {+ return BlocProvider(+ create: (context) {+ return NumberCellBloc(+ cellController: makeCellController(+ widget.databaseController,+ widget.cellContext,+ ).as(),+ )..add(const NumberCellEvent.initial());+ },+ child: BlocBuilder<NumberCellBloc, NumberCellState>(+ buildWhen: (previous, current) => previous.content != current.content,+ builder: (context, state) {+ if (state.content.isEmpty) {+ return const SizedBox.shrink();+ }++ return Container(+ alignment: AlignmentDirectional.centerStart,+ padding: widget.style.padding,+ child: Text(state.content, style: widget.style.textStyle),+ );+ },+ ),+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_skeleton/select_option_card_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_skeleton/select_option_card_cell.dartnew file mode 100644index 0000000000..7f2ee32979--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_skeleton/select_option_card_cell.dart@@ -0,0 +1,87 @@+import 'package:appflowy/plugins/database/application/cell/cell_controller.dart';+import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';+import 'package:appflowy/plugins/database/application/database_controller.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/select_option_cell/extension.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/select_option_cell/select_option_cell_bloc.dart';+import 'package:flutter/material.dart';+import 'package:flutter_bloc/flutter_bloc.dart';++import 'card_cell.dart';++class SelectOptionCardCellStyle extends CardCellStyle {+ final double tagFontSize;+ final bool wrap;+ final EdgeInsets tagPadding;++ SelectOptionCardCellStyle({+ required super.padding,+ required this.tagFontSize,+ required this.wrap,+ required this.tagPadding,+ });+}++class SelectOptionCardCell extends CardCell<SelectOptionCardCellStyle> {+ final DatabaseController databaseController;+ final CellContext cellContext;++ const SelectOptionCardCell({+ super.key,+ required super.style,+ required this.databaseController,+ required this.cellContext,+ });++ @override+ State<SelectOptionCardCell> createState() => _SelectOptionCellState();+}++class _SelectOptionCellState extends State<SelectOptionCardCell> {+ @override+ Widget build(BuildContext context) {+ return BlocProvider(+ create: (_) {+ return SelectOptionCellBloc(+ cellController: makeCellController(+ widget.databaseController,+ widget.cellContext,+ ).as(),+ )..add(const SelectOptionCellEvent.initial());+ },+ child: BlocBuilder<SelectOptionCellBloc, SelectOptionCellState>(+ buildWhen: (previous, current) {+ return previous.selectedOptions != current.selectedOptions;+ },+ builder: (context, state) {+ if (state.selectedOptions.isEmpty) {+ return const SizedBox.shrink();+ }++ final children = state.selectedOptions+ .map(+ (option) => SelectOptionTag(+ option: option,+ fontSize: widget.style.tagFontSize,+ padding: widget.style.tagPadding,+ ),+ )+ .toList();++ return Container(+ alignment: AlignmentDirectional.topStart,+ padding: widget.style.padding,+ child: widget.style.wrap+ ? Wrap(spacing: 4, runSpacing: 4, children: children)+ : SingleChildScrollView(+ scrollDirection: Axis.horizontal,+ child: Row(+ mainAxisSize: MainAxisSize.min,+ children: children,+ ),+ ),+ );+ },+ ),+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_skeleton/text_card_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_skeleton/text_card_cell.dartnew file mode 100644index 0000000000..84a3382cb2--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_skeleton/text_card_cell.dart@@ -0,0 +1,203 @@+import 'package:appflowy/generated/flowy_svgs.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/database/application/cell/cell_controller.dart';+import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';+import 'package:appflowy/plugins/database/application/database_controller.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/text_cell/text_cell_bloc.dart';+import 'package:easy_localization/easy_localization.dart';+import 'package:flowy_infra_ui/widget/flowy_tooltip.dart';+import 'package:flutter/material.dart';+import 'package:flutter_bloc/flutter_bloc.dart';++import '../editable_cell_builder.dart';+import 'card_cell.dart';++class TextCardCellStyle extends CardCellStyle {+ final TextStyle textStyle;+ final TextStyle titleTextStyle;+ final int? maxLines;++ TextCardCellStyle({+ required super.padding,+ required this.textStyle,+ required this.titleTextStyle,+ this.maxLines = 1,+ });+}++class TextCardCell extends CardCell<TextCardCellStyle> with EditableCell {+ final DatabaseController databaseController;+ final CellContext cellContext;++ final bool showNotes;++ const TextCardCell({+ super.key,+ required super.style,+ required this.databaseController,+ required this.cellContext,+ this.editableNotifier,+ this.showNotes = false,+ });++ @override+ final EditableCardNotifier? editableNotifier;++ @override+ State<TextCardCell> createState() => _TextCellState();+}++class _TextCellState extends State<TextCardCell> {+ late final cellBloc = TextCellBloc(+ cellController: makeCellController(+ widget.databaseController,+ widget.cellContext,+ ).as(),+ )..add(const TextCellEvent.initial());+ late final TextEditingController _textEditingController =+ TextEditingController(text: cellBloc.state.content);+ final focusNode = SingleListenerFocusNode();++ bool focusWhenInit = false;++ @override+ void initState() {+ super.initState();+ focusWhenInit = widget.editableNotifier?.isCellEditing.value ?? false;+ if (focusWhenInit) {+ focusNode.requestFocus();+ }++ // If the focusNode lost its focus, the widget's editableNotifier will+ // set to false, which will cause the [EditableRowNotifier] to receive+ // end edit event.+ focusNode.addListener(() {+ if (!focusNode.hasFocus) {+ focusWhenInit = false;+ widget.editableNotifier?.isCellEditing.value = false;+ cellBloc.add(const TextCellEvent.enableEdit(false));+ }+ });+ _bindEditableNotifier();+ }++ void _bindEditableNotifier() {+ widget.editableNotifier?.isCellEditing.addListener(() {+ if (!mounted) return;++ final isEditing = widget.editableNotifier?.isCellEditing.value ?? false;+ if (isEditing) {+ WidgetsBinding.instance.addPostFrameCallback((_) {+ focusNode.requestFocus();+ });+ }+ cellBloc.add(TextCellEvent.enableEdit(isEditing));+ });+ }++ @override+ void didUpdateWidget(covariant oldWidget) {+ _bindEditableNotifier();+ super.didUpdateWidget(oldWidget);+ }++ @override+ Widget build(BuildContext context) {+ return BlocProvider.value(+ value: cellBloc,+ child: BlocConsumer<TextCellBloc, TextCellState>(+ listener: (context, state) {+ if (_textEditingController.text != state.content) {+ _textEditingController.text = state.content;+ }+ },+ buildWhen: (previous, current) {+ if (previous.content != current.content &&+ _textEditingController.text == current.content &&+ current.enableEdit) {+ return false;+ }++ return previous != current;+ },+ builder: (context, state) {+ final isTitle = cellBloc.cellController.fieldInfo.isPrimary;+ if (state.content.isEmpty &&+ state.enableEdit == false &&+ focusWhenInit == false &&+ !isTitle) {+ return const SizedBox.shrink();+ }++ final child = state.enableEdit || focusWhenInit+ ? _buildTextField()+ : _buildText(state, isTitle);++ return Row(+ crossAxisAlignment: CrossAxisAlignment.center,+ children: [+ if (isTitle && widget.showNotes)+ FlowyTooltip(+ message: LocaleKeys.board_notesTooltip.tr(),+ child: FlowySvg(+ FlowySvgs.notes_s,+ color: Theme.of(context).hintColor,+ ),+ ),+ Expanded(child: child),+ ],+ );+ },+ ),+ );+ }++ @override+ void dispose() {+ _textEditingController.dispose();+ focusNode.dispose();+ cellBloc.close();+ super.dispose();+ }++ Widget _buildText(TextCellState state, bool isTitle) {+ final text = state.content.isEmpty+ ? isTitle+ ? LocaleKeys.grid_row_titlePlaceholder.tr()+ : LocaleKeys.grid_row_textPlaceholder.tr()+ : state.content;+ final color = state.content.isEmpty ? Theme.of(context).hintColor : null;+ final textStyle =+ isTitle ? widget.style.titleTextStyle : widget.style.textStyle;++ return Padding(+ padding: widget.style.padding,+ child: Text(+ text,+ style: textStyle.copyWith(color: color),+ maxLines: widget.style.maxLines,+ ),+ );+ }++ Widget _buildTextField() {+ final padding =+ widget.style.padding.add(const EdgeInsets.symmetric(vertical: 4.0));+ return TextField(+ controller: _textEditingController,+ focusNode: focusNode,+ onChanged: (_) =>+ cellBloc.add(TextCellEvent.updateText(_textEditingController.text)),+ onEditingComplete: () => focusNode.unfocus(),+ maxLines: null,+ style: widget.style.titleTextStyle,+ decoration: InputDecoration(+ contentPadding: padding,+ border: InputBorder.none,+ isDense: true,+ isCollapsed: true,+ hintText: LocaleKeys.grid_row_titlePlaceholder.tr(),+ ),+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_skeleton/timestamp_card_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_skeleton/timestamp_card_cell.dartnew file mode 100644index 0000000000..605eb7e671--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_skeleton/timestamp_card_cell.dart@@ -0,0 +1,65 @@+import 'package:appflowy/plugins/database/application/cell/cell_controller.dart';+import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';+import 'package:appflowy/plugins/database/application/database_controller.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/timestamp_cell/timestamp_cell_bloc.dart';+import 'package:flutter/material.dart';+import 'package:flutter_bloc/flutter_bloc.dart';++import 'card_cell.dart';++class TimestampCardCellStyle extends CardCellStyle {+ final TextStyle textStyle;++ TimestampCardCellStyle({+ required super.padding,+ required this.textStyle,+ });+}++class TimestampCardCell extends CardCell<TimestampCardCellStyle> {+ final DatabaseController databaseController;+ final CellContext cellContext;++ const TimestampCardCell({+ super.key,+ required super.style,+ required this.databaseController,+ required this.cellContext,+ });++ @override+ State<TimestampCardCell> createState() => _TimestampCellState();+}++class _TimestampCellState extends State<TimestampCardCell> {+ @override+ Widget build(BuildContext context) {+ return BlocProvider(+ create: (_) {+ return TimestampCellBloc(+ cellController: makeCellController(+ widget.databaseController,+ widget.cellContext,+ ).as(),+ )..add(const TimestampCellEvent.initial());+ },+ child: BlocBuilder<TimestampCellBloc, TimestampCellState>(+ buildWhen: (previous, current) => previous.dateStr != current.dateStr,+ builder: (context, state) {+ if (state.dateStr.isEmpty) {+ return const SizedBox.shrink();+ }++ return Container(+ alignment: AlignmentDirectional.centerStart,+ padding: widget.style.padding,+ child: Text(+ state.dateStr,+ style: widget.style.textStyle,+ ),+ );+ },+ ),+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_skeleton/url_card_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_skeleton/url_card_cell.dartnew file mode 100644index 0000000000..8e503edebb--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_skeleton/url_card_cell.dart@@ -0,0 +1,64 @@+import 'package:appflowy/plugins/database/application/cell/cell_controller.dart';+import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';+import 'package:appflowy/plugins/database/application/database_controller.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/url_cell/url_cell_bloc.dart';+import 'package:flutter/material.dart';+import 'package:flutter_bloc/flutter_bloc.dart';++import 'card_cell.dart';++class URLCardCellStyle extends CardCellStyle {+ final TextStyle textStyle;++ URLCardCellStyle({+ required super.padding,+ required this.textStyle,+ });+}++class URLCardCell extends CardCell<URLCardCellStyle> {+ final DatabaseController databaseController;+ final CellContext cellContext;++ const URLCardCell({+ super.key,+ required super.style,+ required this.databaseController,+ required this.cellContext,+ });++ @override+ State<URLCardCell> createState() => _URLCellState();+}++class _URLCellState extends State<URLCardCell> {+ @override+ Widget build(BuildContext context) {+ return BlocProvider(+ create: (context) {+ return URLCellBloc(+ cellController: makeCellController(+ widget.databaseController,+ widget.cellContext,+ ).as(),+ )..add(const URLCellEvent.initial());+ },+ child: BlocBuilder<URLCellBloc, URLCellState>(+ buildWhen: (previous, current) => previous.content != current.content,+ builder: (context, state) {+ if (state.content.isEmpty) {+ return const SizedBox.shrink();+ }+ return Container(+ alignment: AlignmentDirectional.centerStart,+ padding: widget.style.padding,+ child: Text(+ state.content,+ style: widget.style.textStyle,+ ),+ );+ },+ ),+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_style_maps/calendar_card_cell_style.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_style_maps/calendar_card_cell_style.dartnew file mode 100644index 0000000000..85101e9197--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_style_maps/calendar_card_cell_style.dart@@ -0,0 +1,77 @@+import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';+import 'package:flutter/material.dart';++import '../card_cell_builder.dart';+import '../card_cell_skeleton/checkbox_card_cell.dart';+import '../card_cell_skeleton/checklist_card_cell.dart';+import '../card_cell_skeleton/date_card_cell.dart';+import '../card_cell_skeleton/number_card_cell.dart';+import '../card_cell_skeleton/select_option_card_cell.dart';+import '../card_cell_skeleton/text_card_cell.dart';+import '../card_cell_skeleton/timestamp_card_cell.dart';+import '../card_cell_skeleton/url_card_cell.dart';++CardCellStyleMap desktopCalendarCardCellStyleMap(BuildContext context) {+ const EdgeInsetsGeometry padding = EdgeInsets.symmetric(vertical: 2);+ final TextStyle textStyle = Theme.of(context).textTheme.bodyMedium!.copyWith(+ fontSize: 10,+ overflow: TextOverflow.ellipsis,+ fontWeight: FontWeight.w400,+ );++ return {+ FieldType.Checkbox: CheckboxCardCellStyle(+ padding: padding,+ iconSize: const Size.square(16),+ showFieldName: true,+ textStyle: textStyle,+ ),+ FieldType.Checklist: ChecklistCardCellStyle(+ padding: padding,+ textStyle: textStyle.copyWith(color: Theme.of(context).hintColor),+ ),+ FieldType.CreatedTime: TimestampCardCellStyle(+ padding: padding,+ textStyle: textStyle,+ ),+ FieldType.DateTime: DateCardCellStyle(+ padding: padding,+ textStyle: textStyle,+ ),+ FieldType.LastEditedTime: TimestampCardCellStyle(+ padding: padding,+ textStyle: textStyle,+ ),+ FieldType.MultiSelect: SelectOptionCardCellStyle(+ padding: padding,+ tagFontSize: 9,+ wrap: true,+ tagPadding: const EdgeInsets.symmetric(horizontal: 4, vertical: 1),+ ),+ FieldType.Number: NumberCardCellStyle(+ padding: padding,+ textStyle: textStyle,+ ),+ FieldType.RichText: TextCardCellStyle(+ padding: padding,+ textStyle: textStyle,+ titleTextStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(+ fontSize: 11,+ overflow: TextOverflow.ellipsis,+ ),+ ),+ FieldType.SingleSelect: SelectOptionCardCellStyle(+ padding: padding,+ tagFontSize: 9,+ wrap: true,+ tagPadding: const EdgeInsets.symmetric(horizontal: 4, vertical: 1),+ ),+ FieldType.URL: URLCardCellStyle(+ padding: padding,+ textStyle: textStyle.copyWith(+ color: Theme.of(context).colorScheme.primary,+ decoration: TextDecoration.underline,+ ),+ ),+ };+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_style_maps/desktop_board_card_cell_style.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_style_maps/desktop_board_card_cell_style.dartnew file mode 100644index 0000000000..a7cef2fe6b--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_style_maps/desktop_board_card_cell_style.dart@@ -0,0 +1,77 @@+import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';+import 'package:flutter/material.dart';++import '../card_cell_builder.dart';+import '../card_cell_skeleton/checkbox_card_cell.dart';+import '../card_cell_skeleton/checklist_card_cell.dart';+import '../card_cell_skeleton/date_card_cell.dart';+import '../card_cell_skeleton/number_card_cell.dart';+import '../card_cell_skeleton/select_option_card_cell.dart';+import '../card_cell_skeleton/text_card_cell.dart';+import '../card_cell_skeleton/timestamp_card_cell.dart';+import '../card_cell_skeleton/url_card_cell.dart';++CardCellStyleMap desktopBoardCardCellStyleMap(BuildContext context) {+ const EdgeInsetsGeometry padding = EdgeInsets.all(4);+ final TextStyle textStyle = Theme.of(context).textTheme.bodyMedium!.copyWith(+ fontSize: 11,+ overflow: TextOverflow.ellipsis,+ fontWeight: FontWeight.w400,+ );++ return {+ FieldType.Checkbox: CheckboxCardCellStyle(+ padding: padding,+ iconSize: const Size.square(16),+ showFieldName: true,+ textStyle: textStyle,+ ),+ FieldType.Checklist: ChecklistCardCellStyle(+ padding: padding,+ textStyle: textStyle.copyWith(color: Theme.of(context).hintColor),+ ),+ FieldType.CreatedTime: TimestampCardCellStyle(+ padding: padding,+ textStyle: textStyle,+ ),+ FieldType.DateTime: DateCardCellStyle(+ padding: padding,+ textStyle: textStyle,+ ),+ FieldType.LastEditedTime: TimestampCardCellStyle(+ padding: padding,+ textStyle: textStyle,+ ),+ FieldType.MultiSelect: SelectOptionCardCellStyle(+ padding: padding,+ tagFontSize: 11,+ wrap: true,+ tagPadding: const EdgeInsets.symmetric(horizontal: 4, vertical: 2),+ ),+ FieldType.Number: NumberCardCellStyle(+ padding: padding,+ textStyle: textStyle,+ ),+ FieldType.RichText: TextCardCellStyle(+ padding: padding,+ textStyle: textStyle,+ maxLines: null,+ titleTextStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(+ overflow: TextOverflow.ellipsis,+ ),+ ),+ FieldType.SingleSelect: SelectOptionCardCellStyle(+ padding: padding,+ tagFontSize: 11,+ wrap: true,+ tagPadding: const EdgeInsets.symmetric(horizontal: 4, vertical: 2),+ ),+ FieldType.URL: URLCardCellStyle(+ padding: padding,+ textStyle: textStyle.copyWith(+ color: Theme.of(context).colorScheme.primary,+ decoration: TextDecoration.underline,+ ),+ ),+ };+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_style_maps/mobile_board_card_cell_style.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_style_maps/mobile_board_card_cell_style.dartnew file mode 100644index 0000000000..d4c9bc57fc--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/card_cell_style_maps/mobile_board_card_cell_style.dart@@ -0,0 +1,76 @@+import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';+import 'package:flutter/material.dart';++import '../card_cell_builder.dart';+import '../card_cell_skeleton/checkbox_card_cell.dart';+import '../card_cell_skeleton/checklist_card_cell.dart';+import '../card_cell_skeleton/date_card_cell.dart';+import '../card_cell_skeleton/number_card_cell.dart';+import '../card_cell_skeleton/select_option_card_cell.dart';+import '../card_cell_skeleton/text_card_cell.dart';+import '../card_cell_skeleton/timestamp_card_cell.dart';+import '../card_cell_skeleton/url_card_cell.dart';++CardCellStyleMap mobileBoardCardCellStyleMap(BuildContext context) {+ const EdgeInsetsGeometry padding = EdgeInsets.all(4);+ final TextStyle textStyle = Theme.of(context).textTheme.bodyMedium!.copyWith(+ fontSize: 14,+ overflow: TextOverflow.ellipsis,+ fontWeight: FontWeight.w400,+ );++ return {+ FieldType.Checkbox: CheckboxCardCellStyle(+ padding: padding,+ iconSize: const Size.square(24),+ showFieldName: true,+ textStyle: textStyle,+ ),+ FieldType.Checklist: ChecklistCardCellStyle(+ padding: padding,+ textStyle: textStyle.copyWith(color: Theme.of(context).hintColor),+ ),+ FieldType.CreatedTime: TimestampCardCellStyle(+ padding: padding,+ textStyle: textStyle,+ ),+ FieldType.DateTime: DateCardCellStyle(+ padding: padding,+ textStyle: textStyle,+ ),+ FieldType.LastEditedTime: TimestampCardCellStyle(+ padding: padding,+ textStyle: textStyle,+ ),+ FieldType.MultiSelect: SelectOptionCardCellStyle(+ padding: padding,+ tagFontSize: 12,+ wrap: true,+ tagPadding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),+ ),+ FieldType.Number: NumberCardCellStyle(+ padding: padding,+ textStyle: textStyle,+ ),+ FieldType.RichText: TextCardCellStyle(+ padding: padding,+ textStyle: textStyle,+ titleTextStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(+ overflow: TextOverflow.ellipsis,+ ),+ ),+ FieldType.SingleSelect: SelectOptionCardCellStyle(+ padding: padding,+ tagFontSize: 12,+ wrap: true,+ tagPadding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),+ ),+ FieldType.URL: URLCardCellStyle(+ padding: padding,+ textStyle: textStyle.copyWith(+ color: Theme.of(context).colorScheme.primary,+ decoration: TextDecoration.underline,+ ),+ ),+ };+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/cell.dartnew file mode 100644index 0000000000..e69de29bb2diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_checkbox_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_checkbox_cell.dartnew file mode 100644index 0000000000..6de68d989f--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_checkbox_cell.dart@@ -0,0 +1,33 @@+import 'package:appflowy/generated/flowy_svgs.g.dart';+import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/checkbox_cell/checkbox_cell_bloc.dart';+import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flutter/material.dart';++import '../editable_cell_skeleton/checkbox.dart';++class DesktopGridCheckboxCellSkin extends IEditableCheckboxCellSkin {+ @override+ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ CheckboxCellBloc bloc,+ CheckboxCellState state,+ ) {+ return Container(+ alignment: AlignmentDirectional.centerStart,+ padding: GridSize.cellContentInsets,+ child: FlowyIconButton(+ hoverColor: Colors.transparent,+ onPressed: () => bloc.add(const CheckboxCellEvent.select()),+ icon: FlowySvg(+ state.isSelected ? FlowySvgs.check_filled_s : FlowySvgs.uncheck_s,+ blendMode: BlendMode.dst,+ size: const Size.square(20),+ ),+ width: 20,+ ),+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_checklist_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_checklist_cell.dartnew file mode 100644index 0000000000..4a43752a23--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_checklist_cell.dart@@ -0,0 +1,52 @@+import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/checklist_cell/checklist_cell_bloc.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/checklist_cell/checklist_cell_editor.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/checklist_cell/checklist_progress_bar.dart';+import 'package:appflowy_popover/appflowy_popover.dart';+import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flutter/material.dart';+import 'package:flutter_bloc/flutter_bloc.dart';++import '../editable_cell_skeleton/checklist.dart';++class DesktopGridChecklistCellSkin extends IEditableChecklistCellSkin {+ @override+ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ ChecklistCellBloc bloc,+ ChecklistCellState state,+ PopoverController popoverController,+ ) {+ return AppFlowyPopover(+ margin: EdgeInsets.zero,+ controller: popoverController,+ constraints: BoxConstraints.loose(const Size(360, 400)),+ direction: PopoverDirection.bottomWithLeftAligned,+ triggerActions: PopoverTriggerFlags.none,+ popupBuilder: (BuildContext popoverContext) {+ WidgetsBinding.instance.addPostFrameCallback((_) {+ cellContainerNotifier.isFocus = true;+ });+ return BlocProvider.value(+ value: bloc,+ child: ChecklistCellEditor(+ cellController: bloc.cellController,+ ),+ );+ },+ onClose: () => cellContainerNotifier.isFocus = false,+ child: Container(+ alignment: AlignmentDirectional.centerStart,+ padding: GridSize.cellContentInsets,+ child: state.tasks.isEmpty+ ? const SizedBox.shrink()+ : ChecklistProgressBar(+ tasks: state.tasks,+ percent: state.percent,+ ),+ ),+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_date_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_date_cell.dartnew file mode 100644index 0000000000..2727ab3c6b--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_date_cell.dart@@ -0,0 +1,63 @@+import 'package:appflowy/generated/flowy_svgs.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/date_cell/date_cell_bloc.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/date_cell/date_editor.dart';+import 'package:appflowy_popover/appflowy_popover.dart';+import 'package:easy_localization/easy_localization.dart';+import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flowy_infra_ui/widget/flowy_tooltip.dart';+import 'package:flutter/widgets.dart';++import '../editable_cell_skeleton/date.dart';++class DesktopGridDateCellSkin extends IEditableDateCellSkin {+ @override+ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ DateCellBloc bloc,+ DateCellState state,+ PopoverController popoverController,+ ) {+ return AppFlowyPopover(+ controller: popoverController,+ triggerActions: PopoverTriggerFlags.none,+ direction: PopoverDirection.bottomWithLeftAligned,+ constraints: BoxConstraints.loose(const Size(260, 620)),+ margin: EdgeInsets.zero,+ child: Container(+ alignment: AlignmentDirectional.centerStart,+ padding: GridSize.cellContentInsets,+ child: Row(+ mainAxisSize: MainAxisSize.min,+ children: [+ Flexible(+ child: FlowyText.medium(+ state.dateStr,+ overflow: TextOverflow.ellipsis,+ ),+ ),+ if (state.data?.reminderId.isNotEmpty ?? false) ...[+ const HSpace(4),+ FlowyTooltip(+ message: LocaleKeys.grid_field_reminderOnDateTooltip.tr(),+ child: const FlowySvg(FlowySvgs.clock_alarm_s),+ ),+ ],+ ],+ ),+ ),+ popupBuilder: (BuildContext popoverContent) {+ return DateCellEditor(+ cellController: bloc.cellController,+ onDismissed: () => cellContainerNotifier.isFocus = false,+ );+ },+ onClose: () {+ cellContainerNotifier.isFocus = false;+ },+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_number_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_number_cell.dartnew file mode 100644index 0000000000..3176397b2a--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_number_cell.dart@@ -0,0 +1,36 @@+import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/number_cell/number_cell_bloc.dart';+import 'package:flutter/material.dart';++import '../editable_cell_skeleton/number.dart';++class DesktopGridNumberCellSkin extends IEditableNumberCellSkin {+ @override+ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ NumberCellBloc bloc,+ FocusNode focusNode,+ TextEditingController textEditingController,+ ) {+ return TextField(+ controller: textEditingController,+ focusNode: focusNode,+ onEditingComplete: () => focusNode.unfocus(),+ onSubmitted: (_) => focusNode.unfocus(),+ maxLines: null,+ style: Theme.of(context).textTheme.bodyMedium,+ textInputAction: TextInputAction.done,+ decoration: InputDecoration(+ contentPadding: GridSize.cellContentInsets,+ border: InputBorder.none,+ focusedBorder: InputBorder.none,+ enabledBorder: InputBorder.none,+ errorBorder: InputBorder.none,+ disabledBorder: InputBorder.none,+ isDense: true,+ ),+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_select_option_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_select_option_cell.dartnew file mode 100644index 0000000000..6ebc862d5a--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_select_option_cell.dart@@ -0,0 +1,65 @@+import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/select_option_cell/extension.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/select_option_cell/select_option_cell_bloc.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/select_option_cell/select_option_editor.dart';+import 'package:appflowy_backend/protobuf/flowy-database2/select_option.pb.dart';+import 'package:appflowy_popover/appflowy_popover.dart';+import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flutter/widgets.dart';++import '../editable_cell_skeleton/select_option.dart';++class DesktopGridSelectOptionCellSkin extends IEditableSelectOptionCellSkin {+ @override+ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ SelectOptionCellBloc bloc,+ SelectOptionCellState state,+ PopoverController popoverController,+ ) {+ return AppFlowyPopover(+ controller: popoverController,+ constraints: BoxConstraints.loose(const Size.square(300)),+ margin: EdgeInsets.zero,+ direction: PopoverDirection.bottomWithLeftAligned,+ popupBuilder: (BuildContext popoverContext) {+ WidgetsBinding.instance.addPostFrameCallback((_) {+ cellContainerNotifier.isFocus = true;+ });+ return SelectOptionCellEditor(+ cellController: bloc.cellController,+ );+ },+ onClose: () => cellContainerNotifier.isFocus = false,+ child: Container(+ alignment: AlignmentDirectional.centerStart,+ padding: GridSize.cellContentInsets,+ child: state.selectedOptions.isEmpty+ ? const SizedBox.shrink()+ : _buildOptions(context, state.selectedOptions),+ ),+ );+ }++ Widget _buildOptions(context, List<SelectOptionPB> options) {+ return Wrap(+ runSpacing: 4,+ children: options.map(+ (option) {+ return Padding(+ padding: const EdgeInsets.only(right: 4),+ child: SelectOptionTag(+ option: option,+ padding: const EdgeInsets.symmetric(+ vertical: 1,+ horizontal: 8,+ ),+ ),+ );+ },+ ).toList(),+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_text_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_text_cell.dartnew file mode 100644index 0000000000..16d8ef48b4--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_text_cell.dart@@ -0,0 +1,64 @@+import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/text_cell/text_cell_bloc.dart';+import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flutter/material.dart';+import 'package:flutter_bloc/flutter_bloc.dart';++import '../editable_cell_skeleton/text.dart';++class DesktopGridTextCellSkin extends IEditableTextCellSkin {+ @override+ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ TextCellBloc bloc,+ FocusNode focusNode,+ TextEditingController textEditingController,+ ) {+ return Padding(+ padding: GridSize.cellContentInsets,+ child: Row(+ children: [+ BlocBuilder<TextCellBloc, TextCellState>(+ buildWhen: (p, c) => p.emoji != c.emoji,+ builder: (context, state) {+ if (state.emoji.isEmpty) {+ return const SizedBox.shrink();+ }+ return Center(+ child: Row(+ mainAxisSize: MainAxisSize.min,+ children: [+ FlowyText(+ state.emoji,+ fontSize: 16,+ ),+ const HSpace(6),+ ],+ ),+ );+ },+ ),+ Expanded(+ child: TextField(+ controller: textEditingController,+ focusNode: focusNode,+ maxLines: null,+ style: Theme.of(context).textTheme.bodyMedium,+ decoration: const InputDecoration(+ border: InputBorder.none,+ focusedBorder: InputBorder.none,+ enabledBorder: InputBorder.none,+ errorBorder: InputBorder.none,+ disabledBorder: InputBorder.none,+ isDense: true,+ isCollapsed: true,+ ),+ ),+ ),+ ],+ ),+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_timestamp_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_timestamp_cell.dartnew file mode 100644index 0000000000..2fb038e06b--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_timestamp_cell.dart@@ -0,0 +1,26 @@+import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/timestamp_cell/timestamp_cell_bloc.dart';+import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flutter/widgets.dart';++import '../editable_cell_skeleton/timestamp.dart';++class DesktopGridTimestampCellSkin extends IEditableTimestampCellSkin {+ @override+ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ TimestampCellBloc bloc,+ TimestampCellState state,+ ) {+ return Container(+ alignment: AlignmentDirectional.centerStart,+ padding: GridSize.cellContentInsets,+ child: FlowyText.medium(+ state.dateStr,+ maxLines: null,+ ),+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_url_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_url_cell.dartnew file mode 100644index 0000000000..6b612dfa23--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_url_cell.dart@@ -0,0 +1,213 @@+import 'package:appflowy/generated/flowy_svgs.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';+import 'package:appflowy/plugins/database/widgets/row/accessory/cell_accessory.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/url_cell/url_cell_bloc.dart';+import 'package:appflowy/workspace/presentation/home/toast.dart';+import 'package:easy_localization/easy_localization.dart';+import 'package:flowy_infra/theme_extension.dart';+import 'package:flowy_infra_ui/widget/flowy_tooltip.dart';+import 'package:flutter/material.dart';+import 'package:flutter/services.dart';+import 'package:url_launcher/url_launcher_string.dart';++import '../editable_cell_skeleton/url.dart';++class DesktopGridURLSkin extends IEditableURLCellSkin {+ @override+ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ URLCellBloc bloc,+ FocusNode focusNode,+ TextEditingController textEditingController,+ URLCellDataNotifier cellDataNotifier,+ ) {+ return TextField(+ controller: textEditingController,+ focusNode: focusNode,+ maxLines: null,+ style: Theme.of(context).textTheme.bodyMedium?.copyWith(+ color: Theme.of(context).colorScheme.primary,+ decoration: TextDecoration.underline,+ ),+ autofocus: false,+ decoration: InputDecoration(+ contentPadding: GridSize.cellContentInsets,+ border: InputBorder.none,+ focusedBorder: InputBorder.none,+ enabledBorder: InputBorder.none,+ errorBorder: InputBorder.none,+ disabledBorder: InputBorder.none,+ hintStyle: Theme.of(context)+ .textTheme+ .bodyMedium+ ?.copyWith(color: Theme.of(context).hintColor),+ isDense: true,+ ),+ onTapOutside: (_) => focusNode.unfocus(),+ );+ }++ @override+ List<GridCellAccessoryBuilder> accessoryBuilder(+ GridCellAccessoryBuildContext context,+ URLCellDataNotifier cellDataNotifier,+ ) {+ return [+ accessoryFromType(+ GridURLCellAccessoryType.visitURL,+ cellDataNotifier,+ ),+ accessoryFromType(+ GridURLCellAccessoryType.copyURL,+ cellDataNotifier,+ ),+ ];+ }+}++GridCellAccessoryBuilder accessoryFromType(+ GridURLCellAccessoryType ty,+ URLCellDataNotifier cellDataNotifier,+) {+ switch (ty) {+ case GridURLCellAccessoryType.visitURL:+ return VisitURLCellAccessoryBuilder(+ builder: (Key key) => _VisitURLAccessory(+ key: key,+ cellDataNotifier: cellDataNotifier,+ ),+ );+ case GridURLCellAccessoryType.copyURL:+ return CopyURLCellAccessoryBuilder(+ builder: (Key key) => _CopyURLAccessory(+ key: key,+ cellDataNotifier: cellDataNotifier,+ ),+ );+ }+}++enum GridURLCellAccessoryType {+ copyURL,+ visitURL,+}++typedef CopyURLCellAccessoryBuilder+ = GridCellAccessoryBuilder<State<_CopyURLAccessory>>;++class _CopyURLAccessory extends StatefulWidget {+ const _CopyURLAccessory({+ super.key,+ required this.cellDataNotifier,+ });++ final URLCellDataNotifier cellDataNotifier;++ @override+ State<_CopyURLAccessory> createState() => _CopyURLAccessoryState();+}++class _CopyURLAccessoryState extends State<_CopyURLAccessory>+ with GridCellAccessoryState {+ @override+ Widget build(BuildContext context) {+ if (widget.cellDataNotifier.value.isNotEmpty) {+ return FlowyTooltip(+ message: LocaleKeys.tooltip_urlCopyAccessory.tr(),+ preferBelow: false,+ child: _URLAccessoryIconContainer(+ child: FlowySvg(+ FlowySvgs.copy_s,+ color: AFThemeExtension.of(context).textColor,+ ),+ ),+ );+ } else {+ return const SizedBox.shrink();+ }+ }++ @override+ void onTap() {+ final content = widget.cellDataNotifier.value;+ if (content.isEmpty) {+ return;+ }+ Clipboard.setData(ClipboardData(text: content));+ showMessageToast(LocaleKeys.grid_row_copyProperty.tr());+ }+}++typedef VisitURLCellAccessoryBuilder+ = GridCellAccessoryBuilder<State<_VisitURLAccessory>>;++class _VisitURLAccessory extends StatefulWidget {+ const _VisitURLAccessory({+ super.key,+ required this.cellDataNotifier,+ });++ final URLCellDataNotifier cellDataNotifier;++ @override+ State<_VisitURLAccessory> createState() => _VisitURLAccessoryState();+}++class _VisitURLAccessoryState extends State<_VisitURLAccessory>+ with GridCellAccessoryState {+ @override+ Widget build(BuildContext context) {+ if (widget.cellDataNotifier.value.isNotEmpty) {+ return FlowyTooltip(+ message: LocaleKeys.tooltip_urlLaunchAccessory.tr(),+ preferBelow: false,+ child: _URLAccessoryIconContainer(+ child: FlowySvg(+ FlowySvgs.attach_s,+ color: AFThemeExtension.of(context).textColor,+ ),+ ),+ );+ } else {+ return const SizedBox.shrink();+ }+ }++ @override+ bool enable() {+ return widget.cellDataNotifier.value.isNotEmpty;+ }++ @override+ void onTap() {+ final content = widget.cellDataNotifier.value;+ if (content.isEmpty) {+ return;+ }+ final shouldAddScheme =+ !['http', 'https'].any((pattern) => content.startsWith(pattern));+ final url = shouldAddScheme ? 'http://$content' : content;+ canLaunchUrlString(url).then((value) => launchUrlString(url));+ }+}++class _URLAccessoryIconContainer extends StatelessWidget {+ const _URLAccessoryIconContainer({required this.child});++ final Widget child;++ @override+ Widget build(BuildContext context) {+ return SizedBox(+ width: 26,+ height: 26,+ child: Padding(+ padding: const EdgeInsets.all(3.0),+ child: child,+ ),+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_checkbox_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_checkbox_cell.dartnew file mode 100644index 0000000000..ed33e7844a--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_checkbox_cell.dart@@ -0,0 +1,32 @@+import 'package:appflowy/generated/flowy_svgs.g.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/checkbox_cell/checkbox_cell_bloc.dart';+import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flutter/material.dart';++import '../editable_cell_skeleton/checkbox.dart';++class DesktopRowDetailCheckboxCellSkin extends IEditableCheckboxCellSkin {+ @override+ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ CheckboxCellBloc bloc,+ CheckboxCellState state,+ ) {+ return Container(+ alignment: AlignmentDirectional.centerStart,+ padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 5),+ child: FlowyIconButton(+ hoverColor: Colors.transparent,+ onPressed: () => bloc.add(const CheckboxCellEvent.select()),+ icon: FlowySvg(+ state.isSelected ? FlowySvgs.check_filled_s : FlowySvgs.uncheck_s,+ blendMode: BlendMode.dst,+ size: const Size.square(20),+ ),+ width: 20,+ ),+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_checklist_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_checklist_cell.dartnew file mode 100644index 0000000000..da11c1c85c--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_checklist_cell.dart@@ -0,0 +1,184 @@+import 'package:appflowy/generated/flowy_svgs.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/checklist_cell/checklist_cell_bloc.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/checklist_cell/checklist_cell_editor.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/checklist_cell/checklist_progress_bar.dart';+import 'package:appflowy_popover/appflowy_popover.dart';+import 'package:collection/collection.dart';+import 'package:easy_localization/easy_localization.dart';+import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flowy_infra_ui/widget/flowy_tooltip.dart';+import 'package:flutter/material.dart';+import 'package:flutter_bloc/flutter_bloc.dart';++import '../editable_cell_skeleton/checklist.dart';++class DesktopRowDetailChecklistCellSkin extends IEditableChecklistCellSkin {+ @override+ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ ChecklistCellBloc bloc,+ ChecklistCellState state,+ PopoverController popoverController,+ ) {+ return ChecklistItems(+ context: context,+ cellContainerNotifier: cellContainerNotifier,+ bloc: bloc,+ state: state,+ popoverController: popoverController,+ );+ }+}++class ChecklistItems extends StatefulWidget {+ const ChecklistItems({+ super.key,+ required this.context,+ required this.cellContainerNotifier,+ required this.bloc,+ required this.state,+ required this.popoverController,+ });++ final BuildContext context;+ final CellContainerNotifier cellContainerNotifier;+ final ChecklistCellBloc bloc;+ final ChecklistCellState state;+ final PopoverController popoverController;++ @override+ State<ChecklistItems> createState() => _ChecklistItemsState();+}++class _ChecklistItemsState extends State<ChecklistItems> {+ bool showIncompleteOnly = false;++ @override+ Widget build(BuildContext context) {+ final tasks = [...widget.state.tasks];+ if (showIncompleteOnly) {+ tasks.removeWhere((task) => task.isSelected);+ }+ final children = tasks+ .mapIndexed(+ (index, task) => ChecklistItem(+ task: task,+ autofocus: widget.state.newTask && index == tasks.length - 1,+ onSubmitted: () {+ if (index == tasks.length - 1) {+ widget.bloc.add(const ChecklistCellEvent.createNewTask(""));+ }+ },+ ),+ )+ .toList();+ return Align(+ alignment: AlignmentDirectional.centerStart,+ child: Column(+ mainAxisSize: MainAxisSize.min,+ children: [+ Padding(+ padding: const EdgeInsets.only(left: 8.0),+ child: Row(+ mainAxisSize: MainAxisSize.min,+ children: [+ Flexible(+ child: ChecklistProgressBar(+ tasks: widget.state.tasks,+ percent: widget.state.percent,+ ),+ ),+ const HSpace(6.0),+ FlowyIconButton(+ tooltipText: showIncompleteOnly+ ? LocaleKeys.grid_checklist_showComplete.tr()+ : LocaleKeys.grid_checklist_hideComplete.tr(),+ width: 32,+ iconColorOnHover: Theme.of(context).colorScheme.onSurface,+ icon: FlowySvg(+ showIncompleteOnly ? FlowySvgs.show_m : FlowySvgs.hide_m,+ size: const Size.square(16),+ ),+ onPressed: () {+ setState(+ () => showIncompleteOnly = !showIncompleteOnly,+ );+ },+ ),+ ],+ ),+ ),+ const VSpace(4),+ ...children,+ const ChecklistItemControl(),+ ],+ ),+ );+ }+}++class ChecklistItemControl extends StatefulWidget {+ const ChecklistItemControl({super.key});++ @override+ State<ChecklistItemControl> createState() => _ChecklistItemControlState();+}++class _ChecklistItemControlState extends State<ChecklistItemControl> {+ bool _isHover = false;++ @override+ Widget build(BuildContext context) {+ return MouseRegion(+ onHover: (_) => setState(() => _isHover = true),+ onExit: (_) => setState(() => _isHover = false),+ child: GestureDetector(+ behavior: HitTestBehavior.opaque,+ onTap: () => context+ .read<ChecklistCellBloc>()+ .add(const ChecklistCellEvent.createNewTask("")),+ child: Padding(+ padding: const EdgeInsets.fromLTRB(8.0, 4.0, 8.0, 0),+ child: SizedBox(+ height: 12,+ child: AnimatedSwitcher(+ duration: const Duration(milliseconds: 150),+ child: _isHover+ ? FlowyTooltip(+ message: LocaleKeys.grid_checklist_addNew.tr(),+ child: Row(+ children: [+ const Flexible(child: Center(child: Divider())),+ const HSpace(12.0),+ FilledButton(+ style: FilledButton.styleFrom(+ minimumSize: const Size.square(12),+ maximumSize: const Size.square(12),+ padding: EdgeInsets.zero,+ ),+ onPressed: () => context+ .read<ChecklistCellBloc>()+ .add(+ const ChecklistCellEvent.createNewTask(""),+ ),+ child: FlowySvg(+ FlowySvgs.add_s,+ color: Theme.of(context).colorScheme.onPrimary,+ ),+ ),+ const HSpace(12.0),+ const Flexible(child: Center(child: Divider())),+ ],+ ),+ )+ : const SizedBox.expand(),+ ),+ ),+ ),+ ),+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_date_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_date_cell.dartnew file mode 100644index 0000000000..3aba9bf715--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_date_cell.dart@@ -0,0 +1,67 @@+import 'package:appflowy/generated/flowy_svgs.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/database/widgets/cell/editable_cell_skeleton/date.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/date_cell/date_cell_bloc.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/date_cell/date_editor.dart';+import 'package:appflowy_popover/appflowy_popover.dart';+import 'package:easy_localization/easy_localization.dart';+import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flowy_infra_ui/widget/flowy_tooltip.dart';+import 'package:flutter/material.dart';++class DesktopRowDetailDateCellSkin extends IEditableDateCellSkin {+ @override+ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ DateCellBloc bloc,+ DateCellState state,+ PopoverController popoverController,+ ) {+ final text = state.dateStr.isEmpty+ ? LocaleKeys.grid_row_textPlaceholder.tr()+ : state.dateStr;+ final color = state.dateStr.isEmpty ? Theme.of(context).hintColor : null;++ return AppFlowyPopover(+ controller: popoverController,+ triggerActions: PopoverTriggerFlags.none,+ direction: PopoverDirection.bottomWithLeftAligned,+ constraints: BoxConstraints.loose(const Size(260, 620)),+ margin: EdgeInsets.zero,+ child: Container(+ alignment: AlignmentDirectional.centerStart,+ padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 6),+ child: Row(+ mainAxisSize: MainAxisSize.min,+ children: [+ Flexible(+ child: FlowyText.medium(+ text,+ color: color,+ overflow: TextOverflow.ellipsis,+ ),+ ),+ if (state.data?.reminderId.isNotEmpty ?? false) ...[+ const HSpace(4),+ FlowyTooltip(+ message: LocaleKeys.grid_field_reminderOnDateTooltip.tr(),+ child: const FlowySvg(FlowySvgs.clock_alarm_s),+ ),+ ],+ ],+ ),+ ),+ popupBuilder: (BuildContext popoverContent) {+ return DateCellEditor(+ cellController: bloc.cellController,+ onDismissed: () => cellContainerNotifier.isFocus = false,+ );+ },+ onClose: () {+ cellContainerNotifier.isFocus = false;+ },+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_number_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_number_cell.dartnew file mode 100644index 0000000000..7d72357345--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_number_cell.dart@@ -0,0 +1,40 @@+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/number_cell/number_cell_bloc.dart';+import 'package:easy_localization/easy_localization.dart';+import 'package:flutter/material.dart';++import '../editable_cell_skeleton/number.dart';++class DesktopRowDetailNumberCellSkin extends IEditableNumberCellSkin {+ @override+ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ NumberCellBloc bloc,+ FocusNode focusNode,+ TextEditingController textEditingController,+ ) {+ return TextField(+ controller: textEditingController,+ focusNode: focusNode,+ onEditingComplete: () => focusNode.unfocus(),+ onSubmitted: (_) => focusNode.unfocus(),+ style: Theme.of(context).textTheme.bodyMedium,+ textInputAction: TextInputAction.done,+ decoration: InputDecoration(+ contentPadding: const EdgeInsets.symmetric(horizontal: 8, vertical: 9),+ border: InputBorder.none,+ focusedBorder: InputBorder.none,+ enabledBorder: InputBorder.none,+ errorBorder: InputBorder.none,+ disabledBorder: InputBorder.none,+ hintText: LocaleKeys.grid_row_textPlaceholder.tr(),+ hintStyle: Theme.of(context).textTheme.bodyMedium?.copyWith(+ color: Theme.of(context).hintColor,+ ),+ isDense: true,+ ),+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_select_option_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_select_option_cell.dartnew file mode 100644index 0000000000..fe24e9501d--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_select_option_cell.dart@@ -0,0 +1,74 @@+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/select_option_cell/extension.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/select_option_cell/select_option_cell_bloc.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/select_option_cell/select_option_editor.dart';+import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';+import 'package:appflowy_popover/appflowy_popover.dart';+import 'package:easy_localization/easy_localization.dart';+import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flutter/material.dart';++import '../editable_cell_skeleton/select_option.dart';++class DesktopRowDetailSelectOptionCellSkin+ extends IEditableSelectOptionCellSkin {+ @override+ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ SelectOptionCellBloc bloc,+ SelectOptionCellState state,+ PopoverController popoverController,+ ) {+ return AppFlowyPopover(+ controller: popoverController,+ constraints: BoxConstraints.loose(const Size.square(300)),+ margin: EdgeInsets.zero,+ direction: PopoverDirection.bottomWithLeftAligned,+ popupBuilder: (BuildContext popoverContext) {+ WidgetsBinding.instance.addPostFrameCallback((_) {+ cellContainerNotifier.isFocus = true;+ });+ return SelectOptionCellEditor(+ cellController: bloc.cellController,+ );+ },+ onClose: () => cellContainerNotifier.isFocus = false,+ child: Container(+ alignment: AlignmentDirectional.centerStart,+ padding: state.selectedOptions.isEmpty+ ? const EdgeInsets.symmetric(horizontal: 8.0, vertical: 6.0)+ : const EdgeInsets.symmetric(horizontal: 8.0, vertical: 5.0),+ child: state.selectedOptions.isEmpty+ ? _buildPlaceholder(context)+ : _buildOptions(context, state.selectedOptions),+ ),+ );+ }++ Widget _buildPlaceholder(BuildContext context) {+ return FlowyText(+ LocaleKeys.grid_row_textPlaceholder.tr(),+ color: Theme.of(context).hintColor,+ );+ }++ Widget _buildOptions(BuildContext context, List<SelectOptionPB> options) {+ return Wrap(+ runSpacing: 4,+ spacing: 4,+ children: options.map(+ (option) {+ return SelectOptionTag(+ option: option,+ padding: const EdgeInsets.symmetric(+ vertical: 1,+ horizontal: 8,+ ),+ );+ },+ ).toList(),+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_text_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_text_cell.dartnew file mode 100644index 0000000000..843188129b--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_text_cell.dart@@ -0,0 +1,38 @@+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/text_cell/text_cell_bloc.dart';+import 'package:easy_localization/easy_localization.dart';+import 'package:flutter/material.dart';++import '../editable_cell_skeleton/text.dart';++class DesktopRowDetailTextCellSkin extends IEditableTextCellSkin {+ @override+ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ TextCellBloc bloc,+ FocusNode focusNode,+ TextEditingController textEditingController,+ ) {+ return TextField(+ controller: textEditingController,+ focusNode: focusNode,+ maxLines: null,+ style: Theme.of(context).textTheme.bodyMedium,+ decoration: InputDecoration(+ contentPadding: const EdgeInsets.symmetric(horizontal: 8, vertical: 9),+ border: InputBorder.none,+ focusedBorder: InputBorder.none,+ enabledBorder: InputBorder.none,+ errorBorder: InputBorder.none,+ disabledBorder: InputBorder.none,+ hintText: LocaleKeys.grid_row_textPlaceholder.tr(),+ hintStyle: Theme.of(context).textTheme.bodyMedium?.copyWith(+ color: Theme.of(context).hintColor,+ ),+ isDense: true,+ ),+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_timestamp_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_timestamp_cell.dartnew file mode 100644index 0000000000..29cc70f864--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_timestamp_cell.dart@@ -0,0 +1,25 @@+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/timestamp_cell/timestamp_cell_bloc.dart';+import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flutter/widgets.dart';++import '../editable_cell_skeleton/timestamp.dart';++class DesktopRowDetailTimestampCellSkin extends IEditableTimestampCellSkin {+ @override+ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ TimestampCellBloc bloc,+ TimestampCellState state,+ ) {+ return Container(+ alignment: AlignmentDirectional.centerStart,+ padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 6.0),+ child: FlowyText.medium(+ state.dateStr,+ maxLines: null,+ ),+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_url_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_url_cell.dartnew file mode 100644index 0000000000..75273ecb9e--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_url_cell.dart@@ -0,0 +1,57 @@+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/database/widgets/cell/desktop_grid/desktop_grid_url_cell.dart';+import 'package:appflowy/plugins/database/widgets/row/accessory/cell_accessory.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/url_cell/url_cell_bloc.dart';+import 'package:easy_localization/easy_localization.dart';+import 'package:flutter/material.dart';++import '../editable_cell_skeleton/url.dart';++class DesktopRowDetailURLSkin extends IEditableURLCellSkin {+ @override+ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ URLCellBloc bloc,+ FocusNode focusNode,+ TextEditingController textEditingController,+ URLCellDataNotifier cellDataNotifier,+ ) {+ return TextField(+ controller: textEditingController,+ focusNode: focusNode,+ style: Theme.of(context).textTheme.bodyMedium?.copyWith(+ color: Theme.of(context).colorScheme.primary,+ decoration: TextDecoration.underline,+ ),+ autofocus: false,+ decoration: InputDecoration(+ contentPadding: const EdgeInsets.symmetric(horizontal: 8, vertical: 9),+ border: InputBorder.none,+ focusedBorder: InputBorder.none,+ enabledBorder: InputBorder.none,+ errorBorder: InputBorder.none,+ disabledBorder: InputBorder.none,+ hintText: LocaleKeys.grid_row_textPlaceholder.tr(),+ hintStyle: Theme.of(context).textTheme.bodyMedium?.copyWith(+ color: Theme.of(context).hintColor,+ ),+ isDense: true,+ ),+ );+ }++ @override+ List<GridCellAccessoryBuilder> accessoryBuilder(+ GridCellAccessoryBuildContext context,+ URLCellDataNotifier cellDataNotifier,+ ) {+ return [+ accessoryFromType(+ GridURLCellAccessoryType.visitURL,+ cellDataNotifier,+ ),+ ];+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_builder.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_builder.dartnew file mode 100755index 0000000000..af6114de61--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_builder.dart@@ -0,0 +1,390 @@+import 'package:appflowy/plugins/database/application/cell/cell_controller.dart';+import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';+import 'package:appflowy/plugins/database/application/database_controller.dart';+import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';+import 'package:flutter/material.dart';+import 'package:flutter/widgets.dart';++import 'editable_cell_skeleton/checkbox.dart';+import 'editable_cell_skeleton/checklist.dart';+import 'editable_cell_skeleton/date.dart';+import 'editable_cell_skeleton/number.dart';+import 'editable_cell_skeleton/select_option.dart';+import 'editable_cell_skeleton/text.dart';+import 'editable_cell_skeleton/timestamp.dart';+import 'editable_cell_skeleton/url.dart';+import '../row/accessory/cell_accessory.dart';+import '../row/accessory/cell_shortcuts.dart';+import '../row/cells/cell_container.dart';++enum EditableCellStyle {+ desktopGrid,+ desktopRowDetail,+ mobileGrid,+ mobileRowDetail,+}++/// Build an editable cell widget+class EditableCellBuilder {+ final DatabaseController databaseController;++ EditableCellBuilder({+ required this.databaseController,+ });++ EditableCellWidget buildStyled(+ CellContext cellContext,+ EditableCellStyle style,+ ) {+ final fieldType = databaseController.fieldController+ .getField(cellContext.fieldId)!+ .fieldType;+ final key = ValueKey(+ "${databaseController.viewId}${cellContext.fieldId}${cellContext.rowId}",+ );+ return switch (fieldType) {+ FieldType.Checkbox => EditableCheckboxCell(+ databaseController: databaseController,+ cellContext: cellContext,+ skin: IEditableCheckboxCellSkin.fromStyle(style),+ key: key,+ ),+ FieldType.Checklist => EditableChecklistCell(+ databaseController: databaseController,+ cellContext: cellContext,+ skin: IEditableChecklistCellSkin.fromStyle(style),+ key: key,+ ),+ FieldType.CreatedTime => EditableTimestampCell(+ databaseController: databaseController,+ cellContext: cellContext,+ skin: IEditableTimestampCellSkin.fromStyle(style),+ key: key,+ fieldType: FieldType.CreatedTime,+ ),+ FieldType.DateTime => EditableDateCell(+ databaseController: databaseController,+ cellContext: cellContext,+ skin: IEditableDateCellSkin.fromStyle(style),+ key: key,+ ),+ FieldType.LastEditedTime => EditableTimestampCell(+ databaseController: databaseController,+ cellContext: cellContext,+ skin: IEditableTimestampCellSkin.fromStyle(style),+ key: key,+ fieldType: FieldType.LastEditedTime,+ ),+ FieldType.MultiSelect => EditableSelectOptionCell(+ databaseController: databaseController,+ cellContext: cellContext,+ skin: IEditableSelectOptionCellSkin.fromStyle(style),+ key: key,+ fieldType: FieldType.MultiSelect,+ ),+ FieldType.Number => EditableNumberCell(+ databaseController: databaseController,+ cellContext: cellContext,+ skin: IEditableNumberCellSkin.fromStyle(style),+ key: key,+ ),+ FieldType.RichText => EditableTextCell(+ databaseController: databaseController,+ cellContext: cellContext,+ skin: IEditableTextCellSkin.fromStyle(style),+ key: key,+ ),+ FieldType.SingleSelect => EditableSelectOptionCell(+ databaseController: databaseController,+ cellContext: cellContext,+ skin: IEditableSelectOptionCellSkin.fromStyle(style),+ key: key,+ fieldType: FieldType.SingleSelect,+ ),+ FieldType.URL => EditableURLCell(+ databaseController: databaseController,+ cellContext: cellContext,+ skin: IEditableURLCellSkin.fromStyle(style),+ key: key,+ ),+ _ => throw UnimplementedError(),+ };+ }++ EditableCellWidget buildCustom(+ CellContext cellContext, {+ required EditableCellSkinMap skinMap,+ }) {+ final cellController = makeCellController(databaseController, cellContext);+ final key = ValueKey(+ "${databaseController.viewId}${cellContext.fieldId}${cellContext.rowId}",+ );+ final fieldType = cellController.fieldType;+ assert(skinMap.has(fieldType));+ return switch (fieldType) {+ FieldType.Checkbox => EditableCheckboxCell(+ databaseController: databaseController,+ cellContext: cellContext,+ skin: skinMap.checkboxSkin!,+ key: key,+ ),+ FieldType.Checklist => EditableChecklistCell(+ databaseController: databaseController,+ cellContext: cellContext,+ skin: skinMap.checklistSkin!,+ key: key,+ ),+ FieldType.CreatedTime => EditableTimestampCell(+ databaseController: databaseController,+ cellContext: cellContext,+ skin: skinMap.timestampSkin!,+ key: key,+ fieldType: FieldType.CreatedTime,+ ),+ FieldType.DateTime => EditableDateCell(+ databaseController: databaseController,+ cellContext: cellContext,+ skin: skinMap.dateSkin!,+ key: key,+ ),+ FieldType.LastEditedTime => EditableTimestampCell(+ databaseController: databaseController,+ cellContext: cellContext,+ skin: skinMap.timestampSkin!,+ key: key,+ fieldType: FieldType.LastEditedTime,+ ),+ FieldType.MultiSelect => EditableSelectOptionCell(+ databaseController: databaseController,+ cellContext: cellContext,+ skin: skinMap.selectOptionSkin!,+ key: key,+ fieldType: FieldType.MultiSelect,+ ),+ FieldType.Number => EditableNumberCell(+ databaseController: databaseController,+ cellContext: cellContext,+ skin: skinMap.numberSkin!,+ key: key,+ ),+ FieldType.RichText => EditableTextCell(+ databaseController: databaseController,+ cellContext: cellContext,+ skin: skinMap.textSkin!,+ key: key,+ ),+ FieldType.SingleSelect => EditableSelectOptionCell(+ databaseController: databaseController,+ cellContext: cellContext,+ skin: skinMap.selectOptionSkin!,+ key: key,+ fieldType: FieldType.SingleSelect,+ ),+ FieldType.URL => EditableURLCell(+ databaseController: databaseController,+ cellContext: cellContext,+ skin: skinMap.urlSkin!,+ key: key,+ ),+ _ => throw UnimplementedError(),+ };+ }+}++abstract class CellEditable {+ RequestFocusListener get requestFocus;++ CellContainerNotifier get cellContainerNotifier;++ // ValueNotifier<bool> get onCellEditing;+}++typedef AccessoryBuilder = List<GridCellAccessoryBuilder> Function(+ GridCellAccessoryBuildContext buildContext,+);++abstract class CellAccessory extends Widget {+ const CellAccessory({super.key});++ // The hover will show if the isHover's value is true+ ValueNotifier<bool>? get onAccessoryHover;++ AccessoryBuilder? get accessoryBuilder;+}++abstract class EditableCellWidget extends StatefulWidget+ implements CellAccessory, CellEditable, CellShortcuts {+ EditableCellWidget({super.key});++ @override+ final CellContainerNotifier cellContainerNotifier = CellContainerNotifier();++ // When the cell is focused, we assume that the accessory also be hovered.+ @override+ ValueNotifier<bool> get onAccessoryHover => ValueNotifier(false);++ // @override+ // final ValueNotifier<bool> onCellEditing = ValueNotifier<bool>(false);++ @override+ List<GridCellAccessoryBuilder> Function(+ GridCellAccessoryBuildContext buildContext,+ )? get accessoryBuilder => null;++ @override+ final RequestFocusListener requestFocus = RequestFocusListener();++ @override+ final Map<CellKeyboardKey, CellKeyboardAction> shortcutHandlers = {};+}++abstract class GridCellState<T extends EditableCellWidget> extends State<T> {+ @override+ void initState() {+ super.initState();++ widget.requestFocus.setListener(requestBeginFocus);+ }++ @override+ void didUpdateWidget(covariant T oldWidget) {+ if (oldWidget != this) {+ widget.requestFocus.setListener(requestBeginFocus);+ }+ super.didUpdateWidget(oldWidget);+ }++ @override+ void dispose() {+ widget.onAccessoryHover.dispose();+ widget.requestFocus.removeAllListener();+ widget.requestFocus.dispose();+ super.dispose();+ }++ /// Subclass can override this method to request focus.+ void requestBeginFocus();++ String? onCopy() => null;+}++abstract class GridEditableTextCell<T extends EditableCellWidget>+ extends GridCellState<T> {+ SingleListenerFocusNode get focusNode;++ @override+ void initState() {+ super.initState();+ widget.shortcutHandlers[CellKeyboardKey.onEnter] =+ () => focusNode.unfocus();+ _listenOnFocusNodeChanged();+ }++ @override+ void dispose() {+ widget.shortcutHandlers.clear();+ focusNode.removeAllListener();+ focusNode.dispose();+ super.dispose();+ }++ @override+ void requestBeginFocus() {+ if (!focusNode.hasFocus && focusNode.canRequestFocus) {+ FocusScope.of(context).requestFocus(focusNode);+ }+ }++ void _listenOnFocusNodeChanged() {+ widget.cellContainerNotifier.isFocus = focusNode.hasFocus;+ focusNode.setListener(() {+ widget.cellContainerNotifier.isFocus = focusNode.hasFocus;+ focusChanged();+ });+ }++ Future<void> focusChanged() async {}+}++class RequestFocusListener extends ChangeNotifier {+ VoidCallback? _listener;++ void setListener(VoidCallback listener) {+ if (_listener != null) {+ removeListener(_listener!);+ }++ _listener = listener;+ addListener(listener);+ }++ void removeAllListener() {+ if (_listener != null) {+ removeListener(_listener!);+ _listener = null;+ }+ }++ void notify() {+ notifyListeners();+ }+}++class SingleListenerFocusNode extends FocusNode {+ VoidCallback? _listener;++ void setListener(VoidCallback listener) {+ if (_listener != null) {+ removeListener(_listener!);+ }++ _listener = listener;+ super.addListener(listener);+ }++ void removeAllListener() {+ if (_listener != null) {+ removeListener(_listener!);+ }+ }+}++class EditableCellSkinMap {+ EditableCellSkinMap({+ this.checkboxSkin,+ this.checklistSkin,+ this.timestampSkin,+ this.dateSkin,+ this.selectOptionSkin,+ this.numberSkin,+ this.textSkin,+ this.urlSkin,+ });++ final IEditableCheckboxCellSkin? checkboxSkin;+ final IEditableChecklistCellSkin? checklistSkin;+ final IEditableTimestampCellSkin? timestampSkin;+ final IEditableDateCellSkin? dateSkin;+ final IEditableSelectOptionCellSkin? selectOptionSkin;+ final IEditableNumberCellSkin? numberSkin;+ final IEditableTextCellSkin? textSkin;+ final IEditableURLCellSkin? urlSkin;++ bool has(FieldType fieldType) {+ return switch (fieldType) {+ FieldType.Checkbox => checkboxSkin != null,+ FieldType.Checklist => checklistSkin != null,+ FieldType.CreatedTime ||+ FieldType.LastEditedTime =>+ throw timestampSkin != null,+ FieldType.DateTime => dateSkin != null,+ FieldType.MultiSelect ||+ FieldType.SingleSelect =>+ selectOptionSkin != null,+ FieldType.Number => numberSkin != null,+ FieldType.RichText => textSkin != null,+ FieldType.URL => urlSkin != null,+ _ => throw UnimplementedError(),+ };+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/checkbox.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/checkbox.dartnew file mode 100644index 0000000000..64d231e9e0--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/checkbox.dart@@ -0,0 +1,95 @@+import 'package:appflowy/plugins/database/application/cell/cell_controller.dart';+import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';+import 'package:appflowy/plugins/database/application/database_controller.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/checkbox_cell/checkbox_cell_bloc.dart';+import 'package:appflowy/plugins/database/widgets/cell/editable_cell_builder.dart';+import 'package:flutter/material.dart';+import 'package:flutter_bloc/flutter_bloc.dart';++import '../desktop_grid/desktop_grid_checkbox_cell.dart';+import '../desktop_row_detail/desktop_row_detail_checkbox_cell.dart';+import '../mobile_grid/mobile_grid_checkbox_cell.dart';+import '../mobile_row_detail/mobile_row_detail_checkbox_cell.dart';++abstract class IEditableCheckboxCellSkin {+ const IEditableCheckboxCellSkin();++ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ CheckboxCellBloc bloc,+ CheckboxCellState state,+ );++ factory IEditableCheckboxCellSkin.fromStyle(EditableCellStyle style) {+ return switch (style) {+ EditableCellStyle.desktopGrid => DesktopGridCheckboxCellSkin(),+ EditableCellStyle.desktopRowDetail => DesktopRowDetailCheckboxCellSkin(),+ EditableCellStyle.mobileGrid => MobileGridCheckboxCellSkin(),+ EditableCellStyle.mobileRowDetail => MobileRowDetailCheckboxCellSkin(),+ };+ }+}++class EditableCheckboxCell extends EditableCellWidget {+ final DatabaseController databaseController;+ final CellContext cellContext;+ final IEditableCheckboxCellSkin skin;++ EditableCheckboxCell({+ super.key,+ required this.databaseController,+ required this.cellContext,+ required this.skin,+ });++ @override+ GridCellState<EditableCheckboxCell> createState() => _CheckboxCellState();+}++class _CheckboxCellState extends GridCellState<EditableCheckboxCell> {+ late final cellBloc = CheckboxCellBloc(+ cellController: makeCellController(+ widget.databaseController,+ widget.cellContext,+ ).as(),+ )..add(const CheckboxCellEvent.initial());++ @override+ void dispose() {+ cellBloc.close();+ super.dispose();+ }++ @override+ Widget build(BuildContext context) {+ return BlocProvider.value(+ value: cellBloc,+ child: BlocBuilder<CheckboxCellBloc, CheckboxCellState>(+ builder: (context, state) {+ return widget.skin.build(+ context,+ widget.cellContainerNotifier,+ cellBloc,+ state,+ );+ },+ ),+ );+ }++ @override+ void requestBeginFocus() {+ cellBloc.add(const CheckboxCellEvent.select());+ }++ @override+ String? onCopy() {+ if (cellBloc.state.isSelected) {+ return "Yes";+ } else {+ return "No";+ }+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/checklist.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/checklist.dartnew file mode 100644index 0000000000..35c172a14c--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/checklist.dart@@ -0,0 +1,93 @@+import 'package:appflowy/plugins/database/application/cell/cell_controller.dart';+import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';+import 'package:appflowy/plugins/database/application/database_controller.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/checklist_cell/checklist_cell_bloc.dart';+import 'package:appflowy/plugins/database/widgets/cell/editable_cell_builder.dart';+import 'package:appflowy_popover/appflowy_popover.dart';+import 'package:flutter/material.dart';+import 'package:flutter_bloc/flutter_bloc.dart';++import '../desktop_grid/desktop_grid_checklist_cell.dart';+import '../desktop_row_detail/desktop_row_detail_checklist_cell.dart';+import '../mobile_grid/mobile_grid_checklist_cell.dart';+import '../mobile_row_detail/mobile_row_detail_checklist_cell.dart';++abstract class IEditableChecklistCellSkin {+ const IEditableChecklistCellSkin();++ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ ChecklistCellBloc bloc,+ ChecklistCellState state,+ PopoverController popoverController,+ );++ factory IEditableChecklistCellSkin.fromStyle(EditableCellStyle style) {+ return switch (style) {+ EditableCellStyle.desktopGrid => DesktopGridChecklistCellSkin(),+ EditableCellStyle.desktopRowDetail => DesktopRowDetailChecklistCellSkin(),+ EditableCellStyle.mobileGrid => MobileGridChecklistCellSkin(),+ EditableCellStyle.mobileRowDetail => MobileRowDetailChecklistCellSkin(),+ };+ }+}++class EditableChecklistCell extends EditableCellWidget {+ final DatabaseController databaseController;+ final CellContext cellContext;+ final IEditableChecklistCellSkin skin;++ EditableChecklistCell({+ super.key,+ required this.databaseController,+ required this.cellContext,+ required this.skin,+ });++ @override+ GridCellState<EditableChecklistCell> createState() =>+ GridChecklistCellState();+}++class GridChecklistCellState extends GridCellState<EditableChecklistCell> {+ final PopoverController _popover = PopoverController();+ late final cellBloc = ChecklistCellBloc(+ cellController: makeCellController(+ widget.databaseController,+ widget.cellContext,+ ).as(),+ )..add(const ChecklistCellEvent.initial());++ @override+ void dispose() {+ cellBloc.close();+ super.dispose();+ }++ @override+ Widget build(BuildContext context) {+ return BlocProvider.value(+ value: cellBloc,+ child: BlocBuilder<ChecklistCellBloc, ChecklistCellState>(+ builder: (context, state) {+ return widget.skin.build(+ context,+ widget.cellContainerNotifier,+ cellBloc,+ state,+ _popover,+ );+ },+ ),+ );+ }++ @override+ void requestBeginFocus() {+ if (widget.skin is DesktopGridChecklistCellSkin) {+ _popover.show();+ }+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/date.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/date.dartnew file mode 100644index 0000000000..5913eaa53d--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/date.dart@@ -0,0 +1,94 @@+import 'package:appflowy/plugins/database/application/cell/cell_controller.dart';+import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';+import 'package:appflowy/plugins/database/application/database_controller.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/date_cell/date_cell_bloc.dart';+import 'package:appflowy/plugins/database/widgets/cell/editable_cell_builder.dart';+import 'package:appflowy_popover/appflowy_popover.dart';+import 'package:flutter/material.dart';+import 'package:flutter_bloc/flutter_bloc.dart';++import '../desktop_grid/desktop_grid_date_cell.dart';+import '../desktop_row_detail/desktop_row_detail_date_cell.dart';+import '../mobile_grid/mobile_grid_date_cell.dart';+import '../mobile_row_detail/mobile_row_detail_date_cell.dart';++abstract class IEditableDateCellSkin {+ const IEditableDateCellSkin();++ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ DateCellBloc bloc,+ DateCellState state,+ PopoverController popoverController,+ );++ factory IEditableDateCellSkin.fromStyle(EditableCellStyle style) {+ return switch (style) {+ EditableCellStyle.desktopGrid => DesktopGridDateCellSkin(),+ EditableCellStyle.desktopRowDetail => DesktopRowDetailDateCellSkin(),+ EditableCellStyle.mobileGrid => MobileGridDateCellSkin(),+ EditableCellStyle.mobileRowDetail => MobileRowDetailDateCellSkin(),+ };+ }+}++class EditableDateCell extends EditableCellWidget {+ final DatabaseController databaseController;+ final CellContext cellContext;+ final IEditableDateCellSkin skin;++ EditableDateCell({+ super.key,+ required this.databaseController,+ required this.cellContext,+ required this.skin,+ });++ @override+ GridCellState<EditableDateCell> createState() => _DateCellState();+}++class _DateCellState extends GridCellState<EditableDateCell> {+ final PopoverController _popover = PopoverController();+ late final cellBloc = DateCellBloc(+ cellController: makeCellController(+ widget.databaseController,+ widget.cellContext,+ ).as(),+ )..add(const DateCellEvent.initial());++ @override+ void dispose() {+ cellBloc.close();+ super.dispose();+ }++ @override+ Widget build(BuildContext context) {+ return BlocProvider.value(+ value: cellBloc,+ child: BlocBuilder<DateCellBloc, DateCellState>(+ builder: (context, state) {+ return widget.skin.build(+ context,+ widget.cellContainerNotifier,+ cellBloc,+ state,+ _popover,+ );+ },+ ),+ );+ }++ @override+ void requestBeginFocus() {+ _popover.show();+ widget.cellContainerNotifier.isFocus = true;+ }++ @override+ String? onCopy() => cellBloc.state.dateStr;+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/number.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/number.dartnew file mode 100644index 0000000000..9bff95c289--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/number.dart@@ -0,0 +1,116 @@+import 'dart:async';++import 'package:appflowy/plugins/database/application/cell/cell_controller.dart';+import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';+import 'package:appflowy/plugins/database/application/database_controller.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/number_cell/number_cell_bloc.dart';+import 'package:appflowy/plugins/database/widgets/cell/editable_cell_builder.dart';+import 'package:flutter/material.dart';+import 'package:flutter_bloc/flutter_bloc.dart';++import '../desktop_grid/desktop_grid_number_cell.dart';+import '../desktop_row_detail/desktop_row_detail_number_cell.dart';+import '../mobile_grid/mobile_grid_number_cell.dart';+import '../mobile_row_detail/mobile_row_detail_number_cell.dart';++abstract class IEditableNumberCellSkin {+ const IEditableNumberCellSkin();++ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ NumberCellBloc bloc,+ FocusNode focusNode,+ TextEditingController textEditingController,+ );++ factory IEditableNumberCellSkin.fromStyle(EditableCellStyle style) {+ return switch (style) {+ EditableCellStyle.desktopGrid => DesktopGridNumberCellSkin(),+ EditableCellStyle.desktopRowDetail => DesktopRowDetailNumberCellSkin(),+ EditableCellStyle.mobileGrid => MobileGridNumberCellSkin(),+ EditableCellStyle.mobileRowDetail => MobileRowDetailNumberCellSkin(),+ };+ }+}++class EditableNumberCell extends EditableCellWidget {+ final DatabaseController databaseController;+ final CellContext cellContext;+ final IEditableNumberCellSkin skin;++ EditableNumberCell({+ super.key,+ required this.databaseController,+ required this.cellContext,+ required this.skin,+ });++ @override+ GridEditableTextCell<EditableNumberCell> createState() => _NumberCellState();+}++class _NumberCellState extends GridEditableTextCell<EditableNumberCell> {+ late final TextEditingController _textEditingController;+ late final cellBloc = NumberCellBloc(+ cellController: makeCellController(+ widget.databaseController,+ widget.cellContext,+ ).as(),+ )..add(const NumberCellEvent.initial());++ @override+ void initState() {+ super.initState();+ _textEditingController =+ TextEditingController(text: cellBloc.state.content);+ }++ @override+ Future<void> dispose() async {+ _textEditingController.dispose();+ cellBloc.close();+ super.dispose();+ }++ @override+ Widget build(BuildContext context) {+ return BlocProvider.value(+ value: cellBloc,+ child: BlocListener<NumberCellBloc, NumberCellState>(+ listener: (context, state) =>+ _textEditingController.text = state.content,+ child: widget.skin.build(+ context,+ widget.cellContainerNotifier,+ cellBloc,+ focusNode,+ _textEditingController,+ ),+ ),+ );+ }++ @override+ SingleListenerFocusNode focusNode = SingleListenerFocusNode();++ @override+ void requestBeginFocus() {+ focusNode.requestFocus();+ }++ @override+ String? onCopy() => cellBloc.state.content;++ @override+ Future<void> focusChanged() async {+ if (mounted &&+ !cellBloc.isClosed &&+ cellBloc.state.content != _textEditingController.text.trim()) {+ cellBloc+ .add(NumberCellEvent.updateCell(_textEditingController.text.trim()));+ }+ return super.focusChanged();+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/select_option.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/select_option.dartnew file mode 100644index 0000000000..3d8fabe19a--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/select_option.dart@@ -0,0 +1,96 @@+import 'package:appflowy/plugins/database/application/cell/cell_controller.dart';+import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';+import 'package:appflowy/plugins/database/application/database_controller.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/select_option_cell/select_option_cell_bloc.dart';+import 'package:appflowy/plugins/database/widgets/cell/editable_cell_builder.dart';+import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';+import 'package:appflowy_popover/appflowy_popover.dart';+import 'package:flutter/material.dart';+import 'package:flutter_bloc/flutter_bloc.dart';++import '../desktop_grid/desktop_grid_select_option_cell.dart';+import '../desktop_row_detail/desktop_row_detail_select_option_cell.dart';+import '../mobile_grid/mobile_grid_select_option_cell.dart';+import '../mobile_row_detail/mobile_row_detail_select_cell_option.dart';++abstract class IEditableSelectOptionCellSkin {+ const IEditableSelectOptionCellSkin();++ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ SelectOptionCellBloc bloc,+ SelectOptionCellState state,+ PopoverController popoverController,+ );++ factory IEditableSelectOptionCellSkin.fromStyle(EditableCellStyle style) {+ return switch (style) {+ EditableCellStyle.desktopGrid => DesktopGridSelectOptionCellSkin(),+ EditableCellStyle.desktopRowDetail =>+ DesktopRowDetailSelectOptionCellSkin(),+ EditableCellStyle.mobileGrid => MobileGridSelectOptionCellSkin(),+ EditableCellStyle.mobileRowDetail =>+ MobileRowDetailSelectOptionCellSkin(),+ };+ }+}++class EditableSelectOptionCell extends EditableCellWidget {+ final DatabaseController databaseController;+ final CellContext cellContext;+ final IEditableSelectOptionCellSkin skin;++ final FieldType fieldType;++ EditableSelectOptionCell({+ super.key,+ required this.databaseController,+ required this.cellContext,+ required this.skin,+ required this.fieldType,+ });++ @override+ GridCellState<EditableSelectOptionCell> createState() =>+ _SelectOptionCellState();+}++class _SelectOptionCellState extends GridCellState<EditableSelectOptionCell> {+ final PopoverController _popover = PopoverController();++ late final cellBloc = SelectOptionCellBloc(+ cellController: makeCellController(+ widget.databaseController,+ widget.cellContext,+ ).as(),+ )..add(const SelectOptionCellEvent.initial());++ @override+ void dispose() {+ cellBloc.close();+ super.dispose();+ }++ @override+ Widget build(BuildContext context) {+ return BlocProvider.value(+ value: cellBloc,+ child: BlocBuilder<SelectOptionCellBloc, SelectOptionCellState>(+ builder: (context, state) {+ return widget.skin.build(+ context,+ widget.cellContainerNotifier,+ cellBloc,+ state,+ _popover,+ );+ },+ ),+ );+ }++ @override+ void requestBeginFocus() => _popover.show();+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/text.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/text.dartnew file mode 100644index 0000000000..98b33cc0ae--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/text.dart@@ -0,0 +1,115 @@+import 'package:appflowy/plugins/database/application/cell/cell_controller.dart';+import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';+import 'package:appflowy/plugins/database/application/database_controller.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/text_cell/text_cell_bloc.dart';+import 'package:appflowy/plugins/database/widgets/cell/editable_cell_builder.dart';+import 'package:flutter/material.dart';+import 'package:flutter_bloc/flutter_bloc.dart';++import '../desktop_grid/desktop_grid_text_cell.dart';+import '../desktop_row_detail/desktop_row_detail_text_cell.dart';+import '../mobile_grid/mobile_grid_text_cell.dart';+import '../mobile_row_detail/mobile_row_detail_text_cell.dart';++abstract class IEditableTextCellSkin {+ const IEditableTextCellSkin();++ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ TextCellBloc bloc,+ FocusNode focusNode,+ TextEditingController textEditingController,+ );++ factory IEditableTextCellSkin.fromStyle(EditableCellStyle style) {+ return switch (style) {+ EditableCellStyle.desktopGrid => DesktopGridTextCellSkin(),+ EditableCellStyle.desktopRowDetail => DesktopRowDetailTextCellSkin(),+ EditableCellStyle.mobileGrid => MobileGridTextCellSkin(),+ EditableCellStyle.mobileRowDetail => MobileRowDetailTextCellSkin(),+ };+ }+}++class EditableTextCell extends EditableCellWidget {+ final DatabaseController databaseController;+ final CellContext cellContext;+ final IEditableTextCellSkin skin;++ EditableTextCell({+ super.key,+ required this.databaseController,+ required this.cellContext,+ required this.skin,+ });++ @override+ GridEditableTextCell<EditableTextCell> createState() => _TextCellState();+}++class _TextCellState extends GridEditableTextCell<EditableTextCell> {+ late final TextEditingController _textEditingController;+ late final cellBloc = TextCellBloc(+ cellController: makeCellController(+ widget.databaseController,+ widget.cellContext,+ ).as(),+ )..add(const TextCellEvent.initial());++ @override+ void initState() {+ super.initState();+ _textEditingController =+ TextEditingController(text: cellBloc.state.content);+ }++ @override+ Future<void> dispose() async {+ _textEditingController.dispose();+ cellBloc.close();+ super.dispose();+ }++ @override+ Widget build(BuildContext context) {+ return BlocProvider.value(+ value: cellBloc,+ child: BlocListener<TextCellBloc, TextCellState>(+ listener: (context, state) {+ _textEditingController.text = state.content;+ },+ child: widget.skin.build(+ context,+ widget.cellContainerNotifier,+ cellBloc,+ focusNode,+ _textEditingController,+ ),+ ),+ );+ }++ @override+ SingleListenerFocusNode focusNode = SingleListenerFocusNode();++ @override+ void requestBeginFocus() {+ focusNode.requestFocus();+ }++ @override+ String? onCopy() => cellBloc.state.content;++ @override+ Future<void> focusChanged() {+ if (mounted &&+ !cellBloc.isClosed &&+ cellBloc.state.content != _textEditingController.text.trim()) {+ cellBloc+ .add(TextCellEvent.updateText(_textEditingController.text.trim()));+ }+ return super.focusChanged();+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/timestamp.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/timestamp.dartnew file mode 100644index 0000000000..6f3fa620cc--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/timestamp.dart@@ -0,0 +1,93 @@+import 'package:appflowy/plugins/database/application/cell/cell_controller.dart';+import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';+import 'package:appflowy/plugins/database/application/database_controller.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/timestamp_cell/timestamp_cell_bloc.dart';+import 'package:appflowy/plugins/database/widgets/cell/editable_cell_builder.dart';+import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';+import 'package:flutter/material.dart';+import 'package:flutter_bloc/flutter_bloc.dart';++import '../desktop_grid/desktop_grid_timestamp_cell.dart';+import '../desktop_row_detail/desktop_row_detail_timestamp_cell.dart';+import '../mobile_grid/mobile_grid_timestamp_cell.dart';+import '../mobile_row_detail/mobile_row_detail_timestamp_cell.dart';++abstract class IEditableTimestampCellSkin {+ const IEditableTimestampCellSkin();++ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ TimestampCellBloc bloc,+ TimestampCellState state,+ );++ factory IEditableTimestampCellSkin.fromStyle(EditableCellStyle style) {+ return switch (style) {+ EditableCellStyle.desktopGrid => DesktopGridTimestampCellSkin(),+ EditableCellStyle.desktopRowDetail => DesktopRowDetailTimestampCellSkin(),+ EditableCellStyle.mobileGrid => MobileGridTimestampCellSkin(),+ EditableCellStyle.mobileRowDetail => MobileRowDetailTimestampCellSkin(),+ };+ }+}++class EditableTimestampCell extends EditableCellWidget {+ final DatabaseController databaseController;+ final CellContext cellContext;+ final IEditableTimestampCellSkin skin;++ final FieldType fieldType;++ EditableTimestampCell({+ super.key,+ required this.databaseController,+ required this.cellContext,+ required this.skin,+ required this.fieldType,+ });++ @override+ GridCellState<EditableTimestampCell> createState() => _TimestampCellState();+}++class _TimestampCellState extends GridCellState<EditableTimestampCell> {+ late final cellBloc = TimestampCellBloc(+ cellController: makeCellController(+ widget.databaseController,+ widget.cellContext,+ ).as(),+ )..add(const TimestampCellEvent.initial());++ @override+ void dispose() {+ cellBloc.close();+ super.dispose();+ }++ @override+ Widget build(BuildContext context) {+ return BlocProvider.value(+ value: cellBloc,+ child: BlocBuilder<TimestampCellBloc, TimestampCellState>(+ builder: (context, state) {+ return widget.skin.build(+ context,+ widget.cellContainerNotifier,+ cellBloc,+ state,+ );+ },+ ),+ );+ }++ @override+ void requestBeginFocus() {+ widget.cellContainerNotifier.isFocus = true;+ }++ @override+ String? onCopy() => cellBloc.state.dateStr;+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/url.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/url.dartnew file mode 100644index 0000000000..a35285d9e4--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/url.dart@@ -0,0 +1,131 @@+import 'dart:async';++import 'package:appflowy/plugins/database/application/cell/cell_controller.dart';+import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';+import 'package:appflowy/plugins/database/application/database_controller.dart';+import 'package:appflowy/plugins/database/widgets/row/accessory/cell_accessory.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/url_cell/url_cell_bloc.dart';+import 'package:appflowy/plugins/database/widgets/cell/editable_cell_builder.dart';+import 'package:flutter/material.dart';+import 'package:flutter_bloc/flutter_bloc.dart';++import '../desktop_grid/desktop_grid_url_cell.dart';+import '../desktop_row_detail/desktop_row_detail_url_cell.dart';+import '../mobile_grid/mobile_grid_url_cell.dart';+import '../mobile_row_detail/mobile_row_detail_url_cell.dart';++abstract class IEditableURLCellSkin {+ const IEditableURLCellSkin();++ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ URLCellBloc bloc,+ FocusNode focusNode,+ TextEditingController textEditingController,+ URLCellDataNotifier cellDataNotifier,+ );++ List<GridCellAccessoryBuilder> accessoryBuilder(+ GridCellAccessoryBuildContext context,+ URLCellDataNotifier cellDataNotifier,+ );++ factory IEditableURLCellSkin.fromStyle(EditableCellStyle style) {+ return switch (style) {+ EditableCellStyle.desktopGrid => DesktopGridURLSkin(),+ EditableCellStyle.desktopRowDetail => DesktopRowDetailURLSkin(),+ EditableCellStyle.mobileGrid => MobileGridURLCellSkin(),+ EditableCellStyle.mobileRowDetail => MobileRowDetailURLCellSkin(),+ };+ }+}++typedef URLCellDataNotifier = CellDataNotifier<String>;++class EditableURLCell extends EditableCellWidget {+ final DatabaseController databaseController;+ final CellContext cellContext;+ final IEditableURLCellSkin skin;+ final URLCellDataNotifier _cellDataNotifier;++ EditableURLCell({+ super.key,+ required this.databaseController,+ required this.cellContext,+ required this.skin,+ }) : _cellDataNotifier = CellDataNotifier(value: '');++ @override+ List<GridCellAccessoryBuilder> Function(+ GridCellAccessoryBuildContext buildContext,+ ) get accessoryBuilder => (context) {+ return skin.accessoryBuilder(context, _cellDataNotifier);+ };++ @override+ GridCellState<EditableURLCell> createState() => _GridURLCellState();+}++class _GridURLCellState extends GridEditableTextCell<EditableURLCell> {+ late final TextEditingController _textEditingController;+ late final cellBloc = URLCellBloc(+ cellController: makeCellController(+ widget.databaseController,+ widget.cellContext,+ ).as(),+ )..add(const URLCellEvent.initial());++ @override+ SingleListenerFocusNode focusNode = SingleListenerFocusNode();++ @override+ void initState() {+ super.initState();+ _textEditingController =+ TextEditingController(text: cellBloc.state.content);+ }++ @override+ void dispose() {+ _textEditingController.dispose();+ cellBloc.close();+ super.dispose();+ }++ @override+ Widget build(BuildContext context) {+ return BlocProvider.value(+ value: cellBloc,+ child: BlocListener<URLCellBloc, URLCellState>(+ listenWhen: (previous, current) => previous.content != current.content,+ listener: (context, state) {+ _textEditingController.text = state.content;+ widget._cellDataNotifier.value = state.content;+ },+ child: widget.skin.build(+ context,+ widget.cellContainerNotifier,+ cellBloc,+ focusNode,+ _textEditingController,+ widget._cellDataNotifier,+ ),+ ),+ );+ }++ @override+ Future<void> focusChanged() async {+ if (mounted &&+ !cellBloc.isClosed &&+ cellBloc.state.content != _textEditingController.text.trim()) {+ cellBloc.add(URLCellEvent.updateURL(_textEditingController.text.trim()));+ }+ return super.focusChanged();+ }++ @override+ String? onCopy() => cellBloc.state.content;+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_checkbox_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_checkbox_cell.dartnew file mode 100644index 0000000000..b3ccca610b--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_checkbox_cell.dart@@ -0,0 +1,28 @@+import 'package:appflowy/generated/flowy_svgs.g.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/checkbox_cell/checkbox_cell_bloc.dart';+import 'package:flutter/material.dart';++import '../editable_cell_skeleton/checkbox.dart';++class MobileGridCheckboxCellSkin extends IEditableCheckboxCellSkin {+ @override+ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ CheckboxCellBloc bloc,+ CheckboxCellState state,+ ) {+ return Align(+ alignment: Alignment.centerLeft,+ child: Padding(+ padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 12),+ child: FlowySvg(+ state.isSelected ? FlowySvgs.check_filled_s : FlowySvgs.uncheck_s,+ blendMode: BlendMode.dst,+ size: const Size.square(24),+ ),+ ),+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_checklist_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_checklist_cell.dartnew file mode 100644index 0000000000..213a89f203--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_checklist_cell.dart@@ -0,0 +1,53 @@+import 'package:appflowy/mobile/presentation/bottom_sheet/show_mobile_bottom_sheet.dart';+import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/checklist_cell/checklist_cell_bloc.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/checklist_cell/checklist_progress_bar.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/checklist_cell/mobile_checklist_cell_editor.dart';+import 'package:appflowy_popover/appflowy_popover.dart';+import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flutter/material.dart';+import 'package:flutter_bloc/flutter_bloc.dart';++import '../editable_cell_skeleton/checklist.dart';++class MobileGridChecklistCellSkin extends IEditableChecklistCellSkin {+ @override+ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ ChecklistCellBloc bloc,+ ChecklistCellState state,+ PopoverController popoverController,+ ) {+ return FlowyButton(+ radius: BorderRadius.zero,+ hoverColor: Colors.transparent,+ text: Container(+ alignment: Alignment.centerLeft,+ padding: GridSize.cellContentInsets,+ child: state.tasks.isEmpty+ ? const SizedBox.shrink()+ : ChecklistProgressBar(+ tasks: state.tasks,+ percent: state.percent,+ textStyle: Theme.of(context)+ .textTheme+ .bodyMedium+ ?.copyWith(fontSize: 15),+ ),+ ),+ onTap: () => showMobileBottomSheet(+ context,+ padding: EdgeInsets.zero,+ backgroundColor: Theme.of(context).colorScheme.background,+ builder: (context) {+ return BlocProvider.value(+ value: bloc,+ child: const MobileChecklistCellEditScreen(),+ );+ },+ ),+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_date_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_date_cell.dartnew file mode 100644index 0000000000..e6c91f8a8f--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_date_cell.dart@@ -0,0 +1,49 @@+import 'package:appflowy/mobile/presentation/bottom_sheet/show_mobile_bottom_sheet.dart';+import 'package:appflowy/mobile/presentation/database/date_picker/mobile_date_picker_screen.dart';+import 'package:appflowy/plugins/database/widgets/cell/editable_cell_skeleton/date.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/date_cell/date_cell_bloc.dart';+import 'package:appflowy_popover/appflowy_popover.dart';+import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flutter/material.dart';++class MobileGridDateCellSkin extends IEditableDateCellSkin {+ @override+ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ DateCellBloc bloc,+ DateCellState state,+ PopoverController popoverController,+ ) {+ return FlowyButton(+ radius: BorderRadius.zero,+ hoverColor: Colors.transparent,+ margin: EdgeInsets.zero,+ text: Align(+ alignment: AlignmentDirectional.centerStart,+ child: SingleChildScrollView(+ scrollDirection: Axis.horizontal,+ padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),+ child: FlowyText(+ state.dateStr,+ fontSize: 15,+ ),+ ),+ ),+ onTap: () {+ showMobileBottomSheet(+ context,+ padding: EdgeInsets.zero,+ backgroundColor: Theme.of(context).colorScheme.secondaryContainer,+ builder: (context) {+ return MobileDateCellEditScreen(+ controller: bloc.cellController,+ showAsFullScreen: false,+ );+ },+ );+ },+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_number_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_number_cell.dartnew file mode 100644index 0000000000..6b45672e73--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_number_cell.dart@@ -0,0 +1,30 @@+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/number_cell/number_cell_bloc.dart';+import 'package:flutter/material.dart';++import '../editable_cell_skeleton/number.dart';++class MobileGridNumberCellSkin extends IEditableNumberCellSkin {+ @override+ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ NumberCellBloc bloc,+ FocusNode focusNode,+ TextEditingController textEditingController,+ ) {+ return TextField(+ controller: textEditingController,+ focusNode: focusNode,+ style: Theme.of(context).textTheme.bodyMedium?.copyWith(fontSize: 15),+ maxLines: 1,+ decoration: const InputDecoration(+ enabledBorder: InputBorder.none,+ focusedBorder: InputBorder.none,+ contentPadding: EdgeInsets.symmetric(horizontal: 14, vertical: 12),+ isCollapsed: true,+ ),+ onTapOutside: (event) => FocusManager.instance.primaryFocus?.unfocus(),+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_select_option_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_select_option_cell.dartnew file mode 100644index 0000000000..e6c9c85c35--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_select_option_cell.dart@@ -0,0 +1,66 @@+import 'package:appflowy/mobile/presentation/bottom_sheet/show_mobile_bottom_sheet.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/select_option_cell/extension.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/select_option_cell/mobile_select_option_editor.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/select_option_cell/select_option_cell_bloc.dart';+import 'package:appflowy_backend/protobuf/flowy-database2/select_option.pb.dart';+import 'package:appflowy_popover/appflowy_popover.dart';+import 'package:collection/collection.dart';+import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flutter/material.dart';++import '../editable_cell_skeleton/select_option.dart';++class MobileGridSelectOptionCellSkin extends IEditableSelectOptionCellSkin {+ @override+ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ SelectOptionCellBloc bloc,+ SelectOptionCellState state,+ PopoverController popoverController,+ ) {+ return FlowyButton(+ hoverColor: Colors.transparent,+ radius: BorderRadius.zero,+ margin: EdgeInsets.zero,+ text: Align(+ alignment: AlignmentDirectional.centerStart,+ child: state.selectedOptions.isEmpty+ ? const SizedBox.shrink()+ : _buildOptions(context, state.selectedOptions),+ ),+ onTap: () {+ showMobileBottomSheet(+ context,+ padding: EdgeInsets.zero,+ builder: (context) {+ return MobileSelectOptionEditor(+ cellController: bloc.cellController,+ );+ },+ );+ },+ );+ }++ Widget _buildOptions(BuildContext context, List<SelectOptionPB> options) {+ final children = options+ .mapIndexed(+ (index, option) => SelectOptionTag(+ option: option,+ fontSize: 14,+ padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),+ ),+ )+ .toList();++ return ListView.separated(+ scrollDirection: Axis.horizontal,+ separatorBuilder: (context, index) => const HSpace(8),+ itemCount: children.length,+ itemBuilder: (context, index) => children[index],+ padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 9),+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_text_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_text_cell.dartnew file mode 100644index 0000000000..9f191822db--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_text_cell.dart@@ -0,0 +1,50 @@+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/text_cell/text_cell_bloc.dart';+import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flutter/material.dart';+import 'package:flutter_bloc/flutter_bloc.dart';++import '../editable_cell_skeleton/text.dart';++class MobileGridTextCellSkin extends IEditableTextCellSkin {+ @override+ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ TextCellBloc bloc,+ FocusNode focusNode,+ TextEditingController textEditingController,+ ) {+ return Row(+ children: [+ BlocBuilder<TextCellBloc, TextCellState>(+ buildWhen: (p, c) => p.emoji != c.emoji,+ builder: (context, state) => Center(+ child: FlowyText(+ state.emoji,+ fontSize: 16,+ ),+ ),+ ),+ const HSpace(6),+ Expanded(+ child: TextField(+ controller: textEditingController,+ focusNode: focusNode,+ style:+ Theme.of(context).textTheme.bodyMedium?.copyWith(fontSize: 15),+ maxLines: 1,+ decoration: const InputDecoration(+ enabledBorder: InputBorder.none,+ focusedBorder: InputBorder.none,+ contentPadding:+ EdgeInsets.symmetric(horizontal: 14, vertical: 12),+ isCollapsed: true,+ ),+ onTapOutside: (event) => focusNode.unfocus(),+ ),+ ),+ ],+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_timestamp_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_timestamp_cell.dartnew file mode 100644index 0000000000..95568c3b37--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_timestamp_cell.dart@@ -0,0 +1,28 @@+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/timestamp_cell/timestamp_cell_bloc.dart';+import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flutter/material.dart';++import '../editable_cell_skeleton/timestamp.dart';++class MobileGridTimestampCellSkin extends IEditableTimestampCellSkin {+ @override+ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ TimestampCellBloc bloc,+ TimestampCellState state,+ ) {+ return Align(+ alignment: Alignment.centerLeft,+ child: Padding(+ padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 12),+ child: FlowyText(+ state.dateStr,+ fontSize: 15,+ maxLines: 1,+ ),+ ),+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_url_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_url_cell.dartnew file mode 100644index 0000000000..94471b6596--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_url_cell.dart@@ -0,0 +1,101 @@+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/mobile/presentation/bottom_sheet/show_mobile_bottom_sheet.dart';+import 'package:appflowy/plugins/database/widgets/row/accessory/cell_accessory.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/url_cell/url_cell_bloc.dart';+import 'package:easy_localization/easy_localization.dart';+import 'package:flutter/material.dart';+import 'package:flutter_bloc/flutter_bloc.dart';+import 'package:go_router/go_router.dart';+import 'package:url_launcher/url_launcher_string.dart';++import '../editable_cell_skeleton/url.dart';++class MobileGridURLCellSkin extends IEditableURLCellSkin {+ @override+ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ URLCellBloc bloc,+ FocusNode focusNode,+ TextEditingController textEditingController,+ URLCellDataNotifier cellDataNotifier,+ ) {+ return BlocSelector<URLCellBloc, URLCellState, String>(+ selector: (state) => state.content,+ builder: (context, content) {+ if (content.isEmpty) {+ return TextField(+ focusNode: focusNode,+ keyboardType: TextInputType.url,+ maxLines: 1,+ decoration: const InputDecoration(+ enabledBorder: InputBorder.none,+ focusedBorder: InputBorder.none,+ contentPadding: EdgeInsets.symmetric(+ horizontal: 14,+ vertical: 12,+ ),+ isCollapsed: true,+ ),+ onTapOutside: (event) =>+ FocusManager.instance.primaryFocus?.unfocus(),+ onSubmitted: (value) => bloc.add(URLCellEvent.updateURL(value)),+ );+ }++ return GestureDetector(+ onTap: () {+ if (content.isEmpty) {+ return;+ }+ final shouldAddScheme = !['http', 'https']+ .any((pattern) => content.startsWith(pattern));+ final url = shouldAddScheme ? 'http://$content' : content;+ canLaunchUrlString(url).then((value) => launchUrlString(url));+ },+ onLongPress: () => showMobileBottomSheet(+ context,+ title: LocaleKeys.board_mobile_editURL.tr(),+ showHeader: true,+ showCloseButton: true,+ builder: (_) {+ final controller = TextEditingController(text: content);+ return TextField(+ controller: controller,+ autofocus: true,+ keyboardType: TextInputType.url,+ onEditingComplete: () {+ bloc.add(URLCellEvent.updateURL(controller.text));+ context.pop();+ },+ );+ },+ ),+ child: Container(+ alignment: AlignmentDirectional.centerStart,+ padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),+ child: SingleChildScrollView(+ scrollDirection: Axis.horizontal,+ child: Text(+ content,+ maxLines: 1,+ style: Theme.of(context).textTheme.titleMedium?.copyWith(+ decoration: TextDecoration.underline,+ color: Theme.of(context).colorScheme.primary,+ ),+ ),+ ),+ ),+ );+ },+ );+ }++ @override+ List<GridCellAccessoryBuilder<State<StatefulWidget>>> accessoryBuilder(+ GridCellAccessoryBuildContext context,+ URLCellDataNotifier cellDataNotifier,+ ) =>+ const [];+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_checkbox_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_checkbox_cell.dartnew file mode 100644index 0000000000..15c7ecee6b--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_checkbox_cell.dart@@ -0,0 +1,41 @@+import 'package:appflowy/generated/flowy_svgs.g.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/checkbox_cell/checkbox_cell_bloc.dart';+import 'package:flutter/material.dart';++import '../editable_cell_skeleton/checkbox.dart';++class MobileRowDetailCheckboxCellSkin extends IEditableCheckboxCellSkin {+ @override+ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ CheckboxCellBloc bloc,+ CheckboxCellState state,+ ) {+ return InkWell(+ onTap: () => bloc.add(const CheckboxCellEvent.select()),+ borderRadius: const BorderRadius.all(Radius.circular(14)),+ child: Container(+ constraints: const BoxConstraints(+ minHeight: 48,+ minWidth: double.infinity,+ ),+ decoration: BoxDecoration(+ border: Border.fromBorderSide(+ BorderSide(color: Theme.of(context).colorScheme.outline),+ ),+ borderRadius: const BorderRadius.all(Radius.circular(14)),+ ),+ padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 13),+ alignment: AlignmentDirectional.centerStart,+ child: FlowySvg(+ state.isSelected ? FlowySvgs.check_filled_s : FlowySvgs.uncheck_s,+ color: Theme.of(context).colorScheme.onBackground,+ blendMode: BlendMode.dst,+ size: const Size.square(24),+ ),+ ),+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_checklist_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_checklist_cell.dartnew file mode 100644index 0000000000..fe6659268a--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_checklist_cell.dart@@ -0,0 +1,67 @@+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/mobile/presentation/bottom_sheet/show_mobile_bottom_sheet.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/checklist_cell/checklist_cell_bloc.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/checklist_cell/checklist_progress_bar.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/checklist_cell/mobile_checklist_cell_editor.dart';+import 'package:appflowy_popover/appflowy_popover.dart';+import 'package:easy_localization/easy_localization.dart';+import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flutter/material.dart';+import 'package:flutter_bloc/flutter_bloc.dart';++import '../editable_cell_skeleton/checklist.dart';++class MobileRowDetailChecklistCellSkin extends IEditableChecklistCellSkin {+ @override+ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ ChecklistCellBloc bloc,+ ChecklistCellState state,+ PopoverController popoverController,+ ) {+ return InkWell(+ borderRadius: const BorderRadius.all(Radius.circular(14)),+ onTap: () => showMobileBottomSheet(+ context,+ padding: EdgeInsets.zero,+ backgroundColor: Theme.of(context).colorScheme.background,+ builder: (context) {+ return BlocProvider.value(+ value: bloc,+ child: const MobileChecklistCellEditScreen(),+ );+ },+ ),+ child: Container(+ constraints: const BoxConstraints(+ minHeight: 48,+ minWidth: double.infinity,+ ),+ decoration: BoxDecoration(+ border: Border.fromBorderSide(+ BorderSide(color: Theme.of(context).colorScheme.outline),+ ),+ borderRadius: const BorderRadius.all(Radius.circular(14)),+ ),+ padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 13),+ alignment: AlignmentDirectional.centerStart,+ child: state.tasks.isEmpty+ ? FlowyText(+ LocaleKeys.grid_row_textPlaceholder.tr(),+ fontSize: 15,+ color: Theme.of(context).hintColor,+ )+ : ChecklistProgressBar(+ tasks: state.tasks,+ percent: state.percent,+ textStyle: Theme.of(context).textTheme.bodyMedium?.copyWith(+ fontSize: 15,+ color: Theme.of(context).hintColor,+ ),+ ),+ ),+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_date_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_date_cell.dartnew file mode 100644index 0000000000..359ed3961c--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_date_cell.dart@@ -0,0 +1,59 @@+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/mobile/presentation/bottom_sheet/show_mobile_bottom_sheet.dart';+import 'package:appflowy/mobile/presentation/database/date_picker/mobile_date_picker_screen.dart';+import 'package:appflowy/plugins/database/widgets/cell/editable_cell_skeleton/date.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/date_cell/date_cell_bloc.dart';+import 'package:appflowy_popover/appflowy_popover.dart';+import 'package:easy_localization/easy_localization.dart';+import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flutter/material.dart';++class MobileRowDetailDateCellSkin extends IEditableDateCellSkin {+ @override+ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ DateCellBloc bloc,+ DateCellState state,+ PopoverController popoverController,+ ) {+ final text = state.dateStr.isEmpty+ ? LocaleKeys.grid_row_textPlaceholder.tr()+ : state.dateStr;+ final color = state.dateStr.isEmpty ? Theme.of(context).hintColor : null;++ return InkWell(+ borderRadius: const BorderRadius.all(Radius.circular(14)),+ onTap: () => showMobileBottomSheet(+ context,+ padding: EdgeInsets.zero,+ builder: (context) {+ return MobileDateCellEditScreen(+ controller: bloc.cellController,+ showAsFullScreen: false,+ );+ },+ ),+ child: Container(+ constraints: const BoxConstraints(+ minHeight: 48,+ minWidth: double.infinity,+ ),+ decoration: BoxDecoration(+ border: Border.fromBorderSide(+ BorderSide(color: Theme.of(context).colorScheme.outline),+ ),+ borderRadius: const BorderRadius.all(Radius.circular(14)),+ ),+ padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 13),+ child: FlowyText.regular(+ text,+ fontSize: 16,+ color: color,+ maxLines: null,+ ),+ ),+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_number_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_number_cell.dartnew file mode 100644index 0000000000..824fbded85--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_number_cell.dart@@ -0,0 +1,50 @@+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/number_cell/number_cell_bloc.dart';+import 'package:easy_localization/easy_localization.dart';+import 'package:flutter/material.dart';++import '../editable_cell_skeleton/number.dart';++class MobileRowDetailNumberCellSkin extends IEditableNumberCellSkin {+ @override+ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ NumberCellBloc bloc,+ FocusNode focusNode,+ TextEditingController textEditingController,+ ) {+ return TextField(+ controller: textEditingController,+ keyboardType: const TextInputType.numberWithOptions(+ signed: true,+ decimal: true,+ ),+ focusNode: focusNode,+ style: Theme.of(context).textTheme.bodyMedium?.copyWith(fontSize: 16),+ decoration: InputDecoration(+ enabledBorder:+ _getInputBorder(color: Theme.of(context).colorScheme.outline),+ focusedBorder:+ _getInputBorder(color: Theme.of(context).colorScheme.primary),+ hintText: LocaleKeys.grid_row_textPlaceholder.tr(),+ contentPadding:+ const EdgeInsets.symmetric(horizontal: 12, vertical: 13),+ isCollapsed: true,+ isDense: true,+ constraints: const BoxConstraints(),+ ),+ // close keyboard when tapping outside of the text field+ onTapOutside: (event) => FocusManager.instance.primaryFocus?.unfocus(),+ );+ }++ InputBorder _getInputBorder({Color? color}) {+ return OutlineInputBorder(+ borderSide: BorderSide(color: color!),+ borderRadius: const BorderRadius.all(Radius.circular(14)),+ gapPadding: 0,+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_select_cell_option.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_select_cell_option.dartnew file mode 100644index 0000000000..fc7ad185b7--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_select_cell_option.dart@@ -0,0 +1,107 @@+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/mobile/presentation/bottom_sheet/show_mobile_bottom_sheet.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/select_option_cell/extension.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/select_option_cell/mobile_select_option_editor.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/select_option_cell/select_option_cell_bloc.dart';+import 'package:appflowy_backend/protobuf/flowy-database2/select_option.pb.dart';+import 'package:appflowy_popover/appflowy_popover.dart';+import 'package:collection/collection.dart';+import 'package:easy_localization/easy_localization.dart';+import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flutter/material.dart';++import '../editable_cell_skeleton/select_option.dart';++class MobileRowDetailSelectOptionCellSkin+ extends IEditableSelectOptionCellSkin {+ @override+ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ SelectOptionCellBloc bloc,+ SelectOptionCellState state,+ PopoverController popoverController,+ ) {+ return InkWell(+ borderRadius: const BorderRadius.all(Radius.circular(14)),+ onTap: () => showMobileBottomSheet(+ context,+ padding: EdgeInsets.zero,+ builder: (context) {+ return MobileSelectOptionEditor(+ cellController: bloc.cellController,+ );+ },+ ),+ child: Container(+ constraints: const BoxConstraints(+ minHeight: 48,+ minWidth: double.infinity,+ ),+ padding: EdgeInsets.symmetric(+ horizontal: 12,+ vertical: state.selectedOptions.isEmpty ? 13 : 10,+ ),+ decoration: BoxDecoration(+ border: Border.fromBorderSide(+ BorderSide(color: Theme.of(context).colorScheme.outline),+ ),+ borderRadius: const BorderRadius.all(Radius.circular(14)),+ ),+ child: Row(+ children: [+ Expanded(+ child: state.selectedOptions.isEmpty+ ? _buildPlaceholder(context)+ : _buildOptions(context, state.selectedOptions),+ ),+ const HSpace(6),+ RotatedBox(+ quarterTurns: 3,+ child: Icon(+ Icons.chevron_left,+ color: Theme.of(context).hintColor,+ ),+ ),+ const HSpace(2),+ ],+ ),+ ),+ );+ }++ Widget _buildPlaceholder(BuildContext context) {+ return Container(+ alignment: Alignment.centerLeft,+ padding: const EdgeInsets.symmetric(vertical: 1),+ child: FlowyText(+ LocaleKeys.grid_row_textPlaceholder.tr(),+ color: Theme.of(context).hintColor,+ ),+ );+ }++ Widget _buildOptions(BuildContext context, List<SelectOptionPB> options) {+ final children = options.mapIndexed(+ (index, option) {+ return Padding(+ padding: EdgeInsets.only(left: index == 0 ? 0 : 4),+ child: SelectOptionTag(+ option: option,+ fontSize: 14,+ padding: const EdgeInsets.symmetric(horizontal: 11, vertical: 5),+ ),+ );+ },+ ).toList();++ return Align(+ alignment: AlignmentDirectional.centerStart,+ child: Wrap(+ runSpacing: 4,+ children: children,+ ),+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_text_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_text_cell.dartnew file mode 100644index 0000000000..47bcc95300--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_text_cell.dart@@ -0,0 +1,49 @@+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/text_cell/text_cell_bloc.dart';+import 'package:easy_localization/easy_localization.dart';+import 'package:flutter/material.dart';++import '../editable_cell_skeleton/text.dart';++class MobileRowDetailTextCellSkin extends IEditableTextCellSkin {+ @override+ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ TextCellBloc bloc,+ FocusNode focusNode,+ TextEditingController textEditingController,+ ) {+ return TextField(+ controller: textEditingController,+ focusNode: focusNode,+ maxLines: null,+ decoration: InputDecoration(+ enabledBorder:+ _getInputBorder(color: Theme.of(context).colorScheme.outline),+ focusedBorder:+ _getInputBorder(color: Theme.of(context).colorScheme.primary),+ hintText: LocaleKeys.grid_row_textPlaceholder.tr(),+ contentPadding:+ const EdgeInsets.symmetric(horizontal: 12, vertical: 13),+ isCollapsed: true,+ isDense: true,+ constraints: const BoxConstraints(minHeight: 48),+ hintStyle: Theme.of(context)+ .textTheme+ .bodyMedium+ ?.copyWith(color: Theme.of(context).hintColor),+ ),+ onTapOutside: (event) => FocusManager.instance.primaryFocus?.unfocus(),+ );+ }++ InputBorder _getInputBorder({Color? color}) {+ return OutlineInputBorder(+ borderSide: BorderSide(color: color!),+ borderRadius: const BorderRadius.all(Radius.circular(14)),+ gapPadding: 0,+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_timestamp_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_timestamp_cell.dartnew file mode 100644index 0000000000..8387520849--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_timestamp_cell.dart@@ -0,0 +1,40 @@+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/timestamp_cell/timestamp_cell_bloc.dart';+import 'package:easy_localization/easy_localization.dart';+import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flutter/material.dart';++import '../editable_cell_skeleton/timestamp.dart';++class MobileRowDetailTimestampCellSkin extends IEditableTimestampCellSkin {+ @override+ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ TimestampCellBloc bloc,+ TimestampCellState state,+ ) {+ return Container(+ constraints: const BoxConstraints(+ minHeight: 48,+ minWidth: double.infinity,+ ),+ decoration: BoxDecoration(+ border: Border.fromBorderSide(+ BorderSide(color: Theme.of(context).colorScheme.outline),+ ),+ borderRadius: const BorderRadius.all(Radius.circular(14)),+ ),+ padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 13),+ child: FlowyText.medium(+ state.dateStr.isEmpty+ ? LocaleKeys.grid_row_textPlaceholder.tr()+ : state.dateStr,+ fontSize: 16,+ color: state.dateStr.isEmpty ? Theme.of(context).hintColor : null,+ maxLines: null,+ ),+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_url_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_url_cell.dartnew file mode 100644index 0000000000..d623575d29--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_url_cell.dart@@ -0,0 +1,100 @@+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/mobile/presentation/bottom_sheet/show_mobile_bottom_sheet.dart';+import 'package:appflowy/plugins/database/widgets/row/accessory/cell_accessory.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/url_cell/url_cell_bloc.dart';+import 'package:easy_localization/easy_localization.dart';+import 'package:flutter/material.dart';+import 'package:flutter_bloc/flutter_bloc.dart';+import 'package:go_router/go_router.dart';+import 'package:url_launcher/url_launcher_string.dart';++import '../editable_cell_skeleton/url.dart';++class MobileRowDetailURLCellSkin extends IEditableURLCellSkin {+ @override+ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ URLCellBloc bloc,+ FocusNode focusNode,+ TextEditingController textEditingController,+ URLCellDataNotifier cellDataNotifier,+ ) {+ return BlocSelector<URLCellBloc, URLCellState, String>(+ selector: (state) => state.content,+ builder: (context, content) {+ return InkWell(+ borderRadius: const BorderRadius.all(Radius.circular(14)),+ onTap: () {+ if (content.isEmpty) {+ _showURLEditor(context, bloc, content);+ return;+ }+ final shouldAddScheme = !['http', 'https']+ .any((pattern) => content.startsWith(pattern));+ final url = shouldAddScheme ? 'http://$content' : content;+ canLaunchUrlString(url).then((value) => launchUrlString(url));+ },+ onLongPress: () => _showURLEditor(context, bloc, content),+ child: Container(+ constraints: const BoxConstraints(+ minHeight: 48,+ minWidth: double.infinity,+ ),+ decoration: BoxDecoration(+ border: Border.fromBorderSide(+ BorderSide(color: Theme.of(context).colorScheme.outline),+ ),+ borderRadius: const BorderRadius.all(Radius.circular(14)),+ ),+ child: Padding(+ padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 14),+ child: Text(+ content.isEmpty+ ? LocaleKeys.grid_row_textPlaceholder.tr()+ : content,+ style: Theme.of(context).textTheme.bodyMedium?.copyWith(+ fontSize: 16,+ decoration:+ content.isEmpty ? null : TextDecoration.underline,+ color: content.isEmpty+ ? Theme.of(context).hintColor+ : Theme.of(context).colorScheme.primary,+ ),+ ),+ ),+ ),+ );+ },+ );+ }++ @override+ List<GridCellAccessoryBuilder<State<StatefulWidget>>> accessoryBuilder(+ GridCellAccessoryBuildContext context,+ URLCellDataNotifier cellDataNotifier,+ ) =>+ const [];++ void _showURLEditor(BuildContext context, URLCellBloc bloc, String content) {+ showMobileBottomSheet(+ context,+ title: LocaleKeys.board_mobile_editURL.tr(),+ showHeader: true,+ showCloseButton: true,+ builder: (_) {+ final controller = TextEditingController(text: content);+ return TextField(+ controller: controller,+ autofocus: true,+ keyboardType: TextInputType.url,+ onEditingComplete: () {+ bloc.add(URLCellEvent.updateURL(controller.text));+ context.pop();+ },+ );+ },+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/accessory/cell_accessory.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/accessory/cell_accessory.dartindex 29d0cd6f43..17888f8f05 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/accessory/cell_accessory.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/accessory/cell_accessory.dart@@ -10,7 +10,7 @@ import 'package:flowy_infra_ui/style_widget/hover.dart';import 'package:flowy_infra_ui/widget/flowy_tooltip.dart';import 'package:styled_widget/styled_widget.dart';-import '../cell_builder.dart';+import '../../cell/editable_cell_builder.dart';class GridCellAccessoryBuildContext {final BuildContext anchorContext;@@ -54,11 +54,11 @@ abstract mixin class GridCellAccessoryState {class PrimaryCellAccessory extends StatefulWidget {const PrimaryCellAccessory({super.key,- required this.onTapCallback,+ required this.onTap,required this.isCellEditing,});- final VoidCallback onTapCallback;+ final VoidCallback onTap;final bool isCellEditing;@override@@ -86,7 +86,7 @@ class _PrimaryCellAccessoryState extends State<PrimaryCellAccessory>}@override- void onTap() => widget.onTapCallback();+ void onTap() => widget.onTap();@overridebool enable() => !widget.isCellEditing;diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cell_builder.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cell_builder.dartdeleted file mode 100755index aa9234ab1d..0000000000--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cell_builder.dart+++ /dev/null@@ -1,444 +0,0 @@-import 'package:appflowy/mobile/presentation/database/card/card_detail/cells/checkbox_cell.dart';-import 'package:appflowy/mobile/presentation/database/card/card_detail/cells/number_cell.dart';-import 'package:appflowy/mobile/presentation/database/card/card_detail/cells/text_cell.dart';-import 'package:appflowy/mobile/presentation/database/card/card_detail/cells/url_cell.dart';-import 'package:appflowy/mobile/presentation/database/card/row/cells/cells.dart';-import 'package:appflowy/mobile/presentation/database/card/row/cells/mobile_checklist_cell.dart';-import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/field_entities.pb.dart';-import 'package:appflowy_editor/appflowy_editor.dart';-import 'package:flutter/material.dart';-import 'package:flutter/widgets.dart';--import '../../application/cell/cell_service.dart';-import 'accessory/cell_accessory.dart';-import 'accessory/cell_shortcuts.dart';-import 'cells/cell_container.dart';-import 'cells/checkbox_cell/checkbox_cell.dart';-import 'cells/checklist_cell/checklist_cell.dart';-import 'cells/date_cell/date_cell.dart';-import 'cells/number_cell/number_cell.dart';-import 'cells/select_option_cell/select_option_cell.dart';-import 'cells/text_cell/text_cell.dart';-import 'cells/timestamp_cell/timestamp_cell.dart';-import 'cells/url_cell/url_cell.dart';--/// Build the cell widget in Grid style.-class GridCellBuilder {- final CellMemCache cellCache;- GridCellBuilder({- required this.cellCache,- });-- GridCellWidget build(- DatabaseCellContext cellContext, {- GridCellStyle? style,- }) {- final cellControllerBuilder = CellControllerBuilder(- cellContext: cellContext,- cellCache: cellCache,- );-- final key = cellContext.key();-- if (PlatformExtension.isMobile) {- return _getMobileCardCellWidget(- key,- cellContext,- cellControllerBuilder,- style,- );- }-- return _getDesktopGridCellWidget(- key,- cellContext,- cellControllerBuilder,- style,- );- }-- GridCellWidget _getDesktopGridCellWidget(- ValueKey key,- DatabaseCellContext cellContext,- CellControllerBuilder cellControllerBuilder,- GridCellStyle? style,- ) {- switch (cellContext.fieldType) {- case FieldType.Checkbox:- return GridCheckboxCell(- cellControllerBuilder: cellControllerBuilder,- style: style,- key: key,- );- case FieldType.DateTime:- return GridDateCell(- cellControllerBuilder: cellControllerBuilder,- key: key,- style: style,- );- case FieldType.LastEditedTime:- case FieldType.CreatedTime:- return GridTimestampCell(- cellControllerBuilder: cellControllerBuilder,- key: key,- style: style,- fieldType: cellContext.fieldType,- );- case FieldType.SingleSelect:- return GridSingleSelectCell(- cellControllerBuilder: cellControllerBuilder,- style: style,- key: key,- );- case FieldType.MultiSelect:- return GridMultiSelectCell(- cellControllerBuilder: cellControllerBuilder,- style: style,- key: key,- );- case FieldType.Checklist:- return GridChecklistCell(- cellControllerBuilder: cellControllerBuilder,- style: style,- key: key,- );- case FieldType.Number:- return GridNumberCell(- cellControllerBuilder: cellControllerBuilder,- style: style,- key: key,- );- case FieldType.RichText:- return GridTextCell(- cellControllerBuilder: cellControllerBuilder,- style: style,- key: key,- );- case FieldType.URL:- return GridURLCell(- cellControllerBuilder: cellControllerBuilder,- style: style,- key: key,- );- }-- throw UnimplementedError;- }--// editable cell/(card's propery value) widget- GridCellWidget _getMobileCardCellWidget(- ValueKey key,- DatabaseCellContext cellContext,- CellControllerBuilder cellControllerBuilder,- GridCellStyle? style,- ) {- switch (cellContext.fieldType) {- case FieldType.RichText:- style as GridTextCellStyle?;- return MobileTextCell(- cellControllerBuilder: cellControllerBuilder,- style: style,- );- case FieldType.Number:- style as GridNumberCellStyle?;- return MobileNumberCell(- cellControllerBuilder: cellControllerBuilder,- hintText: style?.placeholder,- );- case FieldType.LastEditedTime:- case FieldType.CreatedTime:- return MobileTimestampCell(- cellControllerBuilder: cellControllerBuilder,- key: key,- );- case FieldType.Checkbox:- return MobileCheckboxCell(- cellControllerBuilder: cellControllerBuilder,- key: key,- );- case FieldType.DateTime:- style as DateCellStyle?;- return GridDateCell(- cellControllerBuilder: cellControllerBuilder,- style: style,- );- case FieldType.URL:- style as GridURLCellStyle?;- return MobileURLCell(- cellControllerBuilder: cellControllerBuilder,- hintText: style?.placeholder,- key: key,- );- case FieldType.SingleSelect:- return GridSingleSelectCell(- cellControllerBuilder: cellControllerBuilder,- style: style,- key: key,- );- case FieldType.MultiSelect:- return GridMultiSelectCell(- cellControllerBuilder: cellControllerBuilder,- style: style,- key: key,- );- case FieldType.Checklist:- return MobileChecklistCell(- cellControllerBuilder: cellControllerBuilder,- style: style,- key: key,- );- }- throw UnimplementedError;- }-}--class MobileRowDetailPageCellBuilder {- final CellMemCache cellCache;- MobileRowDetailPageCellBuilder({- required this.cellCache,- });-- GridCellWidget build(- DatabaseCellContext cellContext, {- GridCellStyle? style,- }) {- final cellControllerBuilder = CellControllerBuilder(- cellContext: cellContext,- cellCache: cellCache,- );-- final key = cellContext.key();-- switch (cellContext.fieldType) {- case FieldType.RichText:- style as GridTextCellStyle?;- return RowDetailTextCell(- cellControllerBuilder: cellControllerBuilder,- style: style,- );- case FieldType.Number:- style as GridNumberCellStyle?;- return RowDetailNumberCell(- cellControllerBuilder: cellControllerBuilder,- hintText: style?.placeholder,- );- case FieldType.LastEditedTime:- case FieldType.CreatedTime:- return GridTimestampCell(- cellControllerBuilder: cellControllerBuilder,- fieldType: cellContext.fieldType,- style: style,- key: key,- );- case FieldType.Checkbox:- return RowDetailCheckboxCell(- cellControllerBuilder: cellControllerBuilder,- key: key,- );- case FieldType.DateTime:- style as DateCellStyle?;- return GridDateCell(- cellControllerBuilder: cellControllerBuilder,- style: style,- );- case FieldType.URL:- style as GridURLCellStyle?;- return RowDetailURLCell(- cellControllerBuilder: cellControllerBuilder,- hintText: style?.placeholder,- key: key,- );- case FieldType.SingleSelect:- return GridSingleSelectCell(- cellControllerBuilder: cellControllerBuilder,- style: style,- key: key,- );- case FieldType.MultiSelect:- return GridMultiSelectCell(- cellControllerBuilder: cellControllerBuilder,- style: style,- key: key,- );- case FieldType.Checklist:- return MobileChecklistCell(- cellControllerBuilder: cellControllerBuilder,- style: style,- key: key,- );- }- throw UnimplementedError;- }-}--class BlankCell extends StatelessWidget {- const BlankCell({super.key});-- @override- Widget build(BuildContext context) {- return const SizedBox.shrink();- }-}--abstract class CellEditable {- RequestFocusListener get requestFocus;-- CellContainerNotifier get cellContainerNotifier;-- // ValueNotifier<bool> get onCellEditing;-}--typedef AccessoryBuilder = List<GridCellAccessoryBuilder> Function(- GridCellAccessoryBuildContext buildContext,-);--abstract class CellAccessory extends Widget {- const CellAccessory({super.key});-- // The hover will show if the isHover's value is true- ValueNotifier<bool>? get onAccessoryHover;-- AccessoryBuilder? get accessoryBuilder;-}--abstract class GridCellWidget extends StatefulWidget- implements CellAccessory, CellEditable, CellShortcuts {- GridCellWidget({super.key});-- @override- final CellContainerNotifier cellContainerNotifier = CellContainerNotifier();-- // When the cell is focused, we assume that the accessory also be hovered.- @override- ValueNotifier<bool> get onAccessoryHover => ValueNotifier(false);-- // @override- // final ValueNotifier<bool> onCellEditing = ValueNotifier<bool>(false);-- @override- List<GridCellAccessoryBuilder> Function(- GridCellAccessoryBuildContext buildContext,- )? get accessoryBuilder => null;-- @override- final RequestFocusListener requestFocus = RequestFocusListener();-- @override- final Map<CellKeyboardKey, CellKeyboardAction> shortcutHandlers = {};-}--abstract class GridCellState<T extends GridCellWidget> extends State<T> {- @override- void initState() {- super.initState();-- widget.requestFocus.setListener(requestBeginFocus);- }-- @override- void didUpdateWidget(covariant T oldWidget) {- if (oldWidget != this) {- widget.requestFocus.setListener(requestBeginFocus);- }- super.didUpdateWidget(oldWidget);- }-- @override- void dispose() {- widget.onAccessoryHover.dispose();- widget.requestFocus.removeAllListener();- widget.requestFocus.dispose();- super.dispose();- }-- /// Subclass can override this method to request focus.- void requestBeginFocus();-- String? onCopy() => null;-}--abstract class GridEditableTextCell<T extends GridCellWidget>- extends GridCellState<T> {- SingleListenerFocusNode get focusNode;-- @override- void initState() {- super.initState();- widget.shortcutHandlers[CellKeyboardKey.onEnter] =- () => focusNode.unfocus();- _listenOnFocusNodeChanged();- }-- @override- void dispose() {- widget.shortcutHandlers.clear();- focusNode.removeAllListener();- focusNode.dispose();- super.dispose();- }-- @override- void requestBeginFocus() {- if (!focusNode.hasFocus && focusNode.canRequestFocus) {- FocusScope.of(context).requestFocus(focusNode);- }- }-- void _listenOnFocusNodeChanged() {- widget.cellContainerNotifier.isFocus = focusNode.hasFocus;- focusNode.setListener(() {- widget.cellContainerNotifier.isFocus = focusNode.hasFocus;- focusChanged();- });- }-- Future<void> focusChanged() async {}-}--class RequestFocusListener extends ChangeNotifier {- VoidCallback? _listener;-- void setListener(VoidCallback listener) {- if (_listener != null) {- removeListener(_listener!);- }-- _listener = listener;- addListener(listener);- }-- void removeAllListener() {- if (_listener != null) {- removeListener(_listener!);- _listener = null;- }- }-- void notify() {- notifyListeners();- }-}--abstract class GridCellStyle {- const GridCellStyle();-}--class SingleListenerFocusNode extends FocusNode {- VoidCallback? _listener;-- void setListener(VoidCallback listener) {- if (_listener != null) {- removeListener(_listener!);- }-- _listener = listener;- super.addListener(listener);- }-- void removeAllListener() {- if (_listener != null) {- removeListener(_listener!);- }- }-}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/cell_container.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/cell_container.dartindex 43d03a4917..b6788eebc8 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/cell_container.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/cell_container.dart@@ -6,10 +6,10 @@ import '../../../grid/presentation/layout/sizes.dart';import '../../../grid/presentation/widgets/row/row.dart';import '../accessory/cell_accessory.dart';import '../accessory/cell_shortcuts.dart';-import '../cell_builder.dart';+import '../../cell/editable_cell_builder.dart';class CellContainer extends StatelessWidget {- final GridCellWidget child;+ final EditableCellWidget child;final AccessoryBuilder? accessoryBuilder;final double width;final bool isPrimary;diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/cells.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/cells.dartdeleted file mode 100644index 372b71fcce..0000000000--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/cells.dart+++ /dev/null@@ -1,8 +0,0 @@-export 'checkbox_cell/checkbox_cell.dart';-export 'checklist_cell/checklist_cell.dart';-export 'date_cell/date_cell.dart';-export 'number_cell/number_cell.dart';-export 'select_option_cell/select_option_cell.dart';-export 'text_cell/text_cell.dart';-export 'timestamp_cell/timestamp_cell.dart';-export 'url_cell/url_cell.dart';diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/checkbox_cell/checkbox_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/checkbox_cell/checkbox_cell.dartdeleted file mode 100644index eec41de69d..0000000000--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/checkbox_cell/checkbox_cell.dart+++ /dev/null@@ -1,124 +0,0 @@-import 'package:appflowy/generated/flowy_svgs.g.dart';-import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';-import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';-import 'package:appflowy/plugins/database/widgets/row/cell_builder.dart';-import 'package:flowy_infra_ui/style_widget/icon_button.dart';-import 'package:flutter/material.dart';-import 'package:flutter_bloc/flutter_bloc.dart';--import 'checkbox_cell_bloc.dart';--class GridCheckboxCellStyle extends GridCellStyle {- EdgeInsets? cellPadding;-- GridCheckboxCellStyle({- this.cellPadding,- });-}--class GridCheckboxCell extends GridCellWidget {- final CellControllerBuilder cellControllerBuilder;- late final GridCheckboxCellStyle cellStyle;-- GridCheckboxCell({- required this.cellControllerBuilder,- GridCellStyle? style,- super.key,- }) {- if (style != null) {- cellStyle = (style as GridCheckboxCellStyle);- } else {- cellStyle = GridCheckboxCellStyle();- }- }-- @override- GridCellState<GridCheckboxCell> createState() => _CheckboxCellState();-}--class _CheckboxCellState extends GridCellState<GridCheckboxCell> {- late CheckboxCellBloc _cellBloc;-- @override- void initState() {- final cellController =- widget.cellControllerBuilder.build() as CheckboxCellController;- _cellBloc = CheckboxCellBloc(cellController: cellController)- ..add(const CheckboxCellEvent.initial());- super.initState();- }-- @override- Widget build(BuildContext context) {- return BlocProvider.value(- value: _cellBloc,- child: BlocBuilder<CheckboxCellBloc, CheckboxCellState>(- builder: (context, state) {- final icon = state.isSelected- ? const CheckboxCellCheck()- : const CheckboxCellUncheck();- return Align(- alignment: Alignment.centerLeft,- child: Padding(- padding:- widget.cellStyle.cellPadding ?? GridSize.cellContentInsets,- child: FlowyIconButton(- hoverColor: Colors.transparent,- onPressed: () => context- .read<CheckboxCellBloc>()- .add(const CheckboxCellEvent.select()),- iconPadding: EdgeInsets.zero,- icon: icon,- width: 20,- ),- ),- );- },- ),- );- }-- @override- Future<void> dispose() async {- _cellBloc.close();- super.dispose();- }-- @override- void requestBeginFocus() {- _cellBloc.add(const CheckboxCellEvent.select());- }-- @override- String? onCopy() {- if (_cellBloc.state.isSelected) {- return "Yes";- } else {- return "No";- }- }-}--class CheckboxCellCheck extends StatelessWidget {- const CheckboxCellCheck({super.key});-- @override- Widget build(BuildContext context) {- return const FlowySvg(- FlowySvgs.check_filled_s,- blendMode: BlendMode.dst,- );- }-}--class CheckboxCellUncheck extends StatelessWidget {- const CheckboxCellUncheck({super.key});-- @override- Widget build(BuildContext context) {- return const FlowySvg(- FlowySvgs.uncheck_s,- blendMode: BlendMode.dst,- );- }-}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/checkbox_cell/checkbox_cell_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/checkbox_cell/checkbox_cell_bloc.dartindex b447b0bfbe..f289404bbc 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/checkbox_cell/checkbox_cell_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/checkbox_cell/checkbox_cell_bloc.dart@@ -1,7 +1,8 @@+import 'dart:async';+import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';-import 'dart:async';part 'checkbox_cell_bloc.freezed.dart';@@ -13,16 +14,17 @@ class CheckboxCellBloc extends Bloc<CheckboxCellEvent, CheckboxCellState> {required this.cellController,}) : super(CheckboxCellState.initial(cellController)) {on<CheckboxCellEvent>(- (event, emit) async {- await event.when(- initial: () {- _startListening();+ (event, emit) {+ event.when(+ initial: () => _startListening(),+ didUpdateCell: (isSelected) {+ emit(state.copyWith(isSelected: isSelected));},- didReceiveCellUpdate: (cellData) {- emit(state.copyWith(isSelected: _isSelected(cellData)));+ didUpdateField: (fieldName) {+ emit(state.copyWith(fieldName: fieldName));},- select: () async {- cellController.saveCellData(!state.isSelected ? "Yes" : "No");+ select: () {+ cellController.saveCellData(state.isSelected ? "No" : "Yes");},);},@@ -41,12 +43,17 @@ class CheckboxCellBloc extends Bloc<CheckboxCellEvent, CheckboxCellState> {}void _startListening() {- _onCellChangedFn = cellController.startListening(- onCellChanged: ((cellData) {+ _onCellChangedFn = cellController.addListener(+ onCellChanged: (cellData) {+ if (!isClosed) {+ add(CheckboxCellEvent.didUpdateCell(_isSelected(cellData)));+ }+ },+ onCellFieldChanged: (field) {if (!isClosed) {- add(CheckboxCellEvent.didReceiveCellUpdate(cellData));+ add(CheckboxCellEvent.didUpdateField(field.name));}- }),+ },);}}@@ -55,18 +62,24 @@ class CheckboxCellBloc extends Bloc<CheckboxCellEvent, CheckboxCellState> {class CheckboxCellEvent with _$CheckboxCellEvent {const factory CheckboxCellEvent.initial() = _Initial;const factory CheckboxCellEvent.select() = _Selected;- const factory CheckboxCellEvent.didReceiveCellUpdate(String? cellData) =- _DidReceiveCellUpdate;+ const factory CheckboxCellEvent.didUpdateCell(bool isSelected) =+ _DidUpdateCell;+ const factory CheckboxCellEvent.didUpdateField(String fieldName) =+ _DidUpdateField;}@freezedclass CheckboxCellState with _$CheckboxCellState {const factory CheckboxCellState({required bool isSelected,+ required String fieldName,}) = _CheckboxCellState;- factory CheckboxCellState.initial(TextCellController context) {- return CheckboxCellState(isSelected: _isSelected(context.getCellData()));+ factory CheckboxCellState.initial(CheckboxCellController cellController) {+ return CheckboxCellState(+ isSelected: _isSelected(cellController.getCellData()),+ fieldName: cellController.fieldInfo.field.name,+ );}}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/checklist_cell/checklist_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/checklist_cell/checklist_cell.dartdeleted file mode 100644index 85f2d53203..0000000000--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/checklist_cell/checklist_cell.dart+++ /dev/null@@ -1,250 +0,0 @@-import 'package:appflowy/generated/flowy_svgs.g.dart';-import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';-import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';-import 'package:appflowy_popover/appflowy_popover.dart';-import 'package:collection/collection.dart';-import 'package:easy_localization/easy_localization.dart';-import 'package:flowy_infra_ui/flowy_infra_ui.dart';-import 'package:flowy_infra_ui/widget/flowy_tooltip.dart';-import 'package:flutter/material.dart';-import 'package:flutter_bloc/flutter_bloc.dart';--import '../../cell_builder.dart';-import 'checklist_cell_bloc.dart';-import 'checklist_cell_editor.dart';-import 'checklist_progress_bar.dart';--class ChecklistCellStyle extends GridCellStyle {- final String placeholder;- final EdgeInsets? cellPadding;- final bool showTasksInline;- final bool useRoundedBorders;-- const ChecklistCellStyle({- this.placeholder = "",- this.cellPadding,- this.showTasksInline = false,- this.useRoundedBorders = false,- });-}--class GridChecklistCell extends GridCellWidget {- final CellControllerBuilder cellControllerBuilder;- late final ChecklistCellStyle cellStyle;- GridChecklistCell({- required this.cellControllerBuilder,- GridCellStyle? style,- super.key,- }) {- if (style != null) {- cellStyle = (style as ChecklistCellStyle);- } else {- cellStyle = const ChecklistCellStyle();- }- }-- @override- GridCellState<GridChecklistCell> createState() => GridChecklistCellState();-}--class GridChecklistCellState extends GridCellState<GridChecklistCell> {- late ChecklistCellBloc _cellBloc;- late final PopoverController _popover;- bool showIncompleteOnly = false;-- @override- void initState() {- _popover = PopoverController();- final cellController =- widget.cellControllerBuilder.build() as ChecklistCellController;- _cellBloc = ChecklistCellBloc(cellController: cellController)- ..add(const ChecklistCellEvent.initial());- super.initState();- }-- @override- Widget build(BuildContext context) {- return BlocProvider.value(- value: _cellBloc,- child: BlocBuilder<ChecklistCellBloc, ChecklistCellState>(- builder: (context, state) {- if (widget.cellStyle.showTasksInline) {- final tasks = List.from(state.tasks);- if (showIncompleteOnly) {- tasks.removeWhere((task) => task.isSelected);- }- final children = tasks- .mapIndexed(- (index, task) => ChecklistItem(- task: task,- autofocus: state.newTask && index == tasks.length - 1,- onSubmitted: () {- if (index == tasks.length - 1) {- context- .read<ChecklistCellBloc>()- .add(const ChecklistCellEvent.createNewTask(""));- }- },- ),- )- .toList();- return Align(- alignment: Alignment.centerLeft,- child: Padding(- padding:- widget.cellStyle.cellPadding ?? GridSize.cellContentInsets,- child: Column(- mainAxisSize: MainAxisSize.min,- children: [- Padding(- padding: const EdgeInsets.only(left: 8.0),- child: Row(- mainAxisSize: MainAxisSize.min,- children: [- Flexible(- child: ChecklistProgressBar(- tasks: state.tasks,- percent: state.percent,- ),- ),- const HSpace(6.0),- FlowyIconButton(- tooltipText: showIncompleteOnly- ? LocaleKeys.grid_checklist_showComplete.tr()- : LocaleKeys.grid_checklist_hideComplete.tr(),- width: 32,- iconColorOnHover:- Theme.of(context).colorScheme.onSurface,- icon: FlowySvg(- showIncompleteOnly- ? FlowySvgs.show_m- : FlowySvgs.hide_m,- size: const Size.square(16),- ),- onPressed: () {- setState(- () => showIncompleteOnly = !showIncompleteOnly,- );- },- ),- ],- ),- ),- const VSpace(4),- ...children,- const ChecklistItemControl(),- ],- ),- ),- );- }-- return AppFlowyPopover(- margin: EdgeInsets.zero,- controller: _popover,- constraints: BoxConstraints.loose(const Size(360, 400)),- direction: PopoverDirection.bottomWithLeftAligned,- triggerActions: PopoverTriggerFlags.none,- popupBuilder: (BuildContext popoverContext) {- WidgetsBinding.instance.addPostFrameCallback((_) {- widget.cellContainerNotifier.isFocus = true;- });- return GridChecklistCellEditor(- cellController: widget.cellControllerBuilder.build()- as ChecklistCellController,- );- },- onClose: () => widget.cellContainerNotifier.isFocus = false,- child: Align(- alignment: Alignment.centerLeft,- child: Padding(- padding:- widget.cellStyle.cellPadding ?? GridSize.cellContentInsets,- child: state.tasks.isEmpty- ? FlowyText.medium(- widget.cellStyle.placeholder,- color: Theme.of(context).hintColor,- )- : ChecklistProgressBar(- tasks: state.tasks,- percent: state.percent,- ),- ),- ),- );- },- ),- );- }-- @override- void requestBeginFocus() {- if (!widget.cellStyle.showTasksInline) {- _popover.show();- }- }-}--class ChecklistItemControl extends StatefulWidget {- const ChecklistItemControl({super.key});-- @override- State<ChecklistItemControl> createState() => _ChecklistItemControlState();-}--class _ChecklistItemControlState extends State<ChecklistItemControl> {- bool _isHover = false;-- @override- Widget build(BuildContext context) {- return MouseRegion(- onHover: (_) => setState(() => _isHover = true),- onExit: (_) => setState(() => _isHover = false),- child: GestureDetector(- behavior: HitTestBehavior.opaque,- onTap: () => context- .read<ChecklistCellBloc>()- .add(const ChecklistCellEvent.createNewTask("")),- child: Padding(- padding: const EdgeInsets.fromLTRB(8.0, 4.0, 8.0, 0),- child: SizedBox(- height: 12,- child: AnimatedSwitcher(- duration: const Duration(milliseconds: 150),- child: _isHover- ? FlowyTooltip(- message: LocaleKeys.grid_checklist_addNew.tr(),- child: Row(- children: [- const Flexible(child: Center(child: Divider())),- const HSpace(12.0),- FilledButton(- style: FilledButton.styleFrom(- minimumSize: const Size.square(12),- maximumSize: const Size.square(12),- padding: EdgeInsets.zero,- ),- onPressed: () => context- .read<ChecklistCellBloc>()- .add(- const ChecklistCellEvent.createNewTask(""),- ),- child: FlowySvg(- FlowySvgs.add_s,- color: Theme.of(context).colorScheme.onPrimary,- ),- ),- const HSpace(12.0),- const Flexible(child: Center(child: Divider())),- ],- ),- )- : const SizedBox.expand(),- ),- ),- ),- ),- );- }-}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/checklist_cell/checklist_cell_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/checklist_cell/checklist_cell_bloc.dartindex 267978f56f..b316570314 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/checklist_cell/checklist_cell_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/checklist_cell/checklist_cell_bloc.dart@@ -84,7 +84,7 @@ class ChecklistCellBloc extends Bloc<ChecklistCellEvent, ChecklistCellState> {}void _startListening() {- _onCellChangedFn = cellController.startListening(+ _onCellChangedFn = cellController.addListener(onCellChanged: (data) {if (!isClosed) {add(ChecklistCellEvent.didReceiveOptions(data));diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/checklist_cell/checklist_cell_editor.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/checklist_cell/checklist_cell_editor.dartindex 2b5e54ef62..6b34473421 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/checklist_cell/checklist_cell_editor.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/checklist_cell/checklist_cell_editor.dart@@ -17,17 +17,15 @@ import 'package:flutter_bloc/flutter_bloc.dart';import 'checklist_cell_bloc.dart';import 'checklist_progress_bar.dart';-class GridChecklistCellEditor extends StatefulWidget {+class ChecklistCellEditor extends StatefulWidget {final ChecklistCellController cellController;- const GridChecklistCellEditor({required this.cellController, super.key});+ const ChecklistCellEditor({required this.cellController, super.key});@override- State<GridChecklistCellEditor> createState() => _GridChecklistCellState();+ State<ChecklistCellEditor> createState() => _GridChecklistCellState();}-class _GridChecklistCellState extends State<GridChecklistCellEditor> {- late ChecklistCellBloc _bloc;-+class _GridChecklistCellState extends State<ChecklistCellEditor> {/// Focus node for the new task text fieldlate final FocusNode newTaskFocusNode;@@ -44,56 +42,50 @@ class _GridChecklistCellState extends State<GridChecklistCellEditor> {return KeyEventResult.ignored;},);- _bloc = ChecklistCellBloc(cellController: widget.cellController)- ..add(const ChecklistCellEvent.initial());}@overrideWidget build(BuildContext context) {- return BlocProvider.value(- value: _bloc,- child: BlocConsumer<ChecklistCellBloc, ChecklistCellState>(- listener: (context, state) {- if (state.tasks.isEmpty) {- newTaskFocusNode.requestFocus();- }- },- builder: (context, state) {- return Column(- mainAxisSize: MainAxisSize.min,- children: [- AnimatedSwitcher(- duration: const Duration(milliseconds: 300),- child: state.tasks.isEmpty- ? const SizedBox.shrink()- : Padding(- padding: const EdgeInsets.fromLTRB(16, 16, 16, 4),- child: ChecklistProgressBar(- tasks: state.tasks,- percent: state.percent,- ),+ return BlocConsumer<ChecklistCellBloc, ChecklistCellState>(+ listener: (context, state) {+ if (state.tasks.isEmpty) {+ newTaskFocusNode.requestFocus();+ }+ },+ builder: (context, state) {+ return Column(+ mainAxisSize: MainAxisSize.min,+ children: [+ AnimatedSwitcher(+ duration: const Duration(milliseconds: 300),+ child: state.tasks.isEmpty+ ? const SizedBox.shrink()+ : Padding(+ padding: const EdgeInsets.fromLTRB(16, 16, 16, 4),+ child: ChecklistProgressBar(+ tasks: state.tasks,+ percent: state.percent,),- ),- ChecklistItemList(- options: state.tasks,- onUpdateTask: () => newTaskFocusNode.requestFocus(),- ),- if (state.tasks.isNotEmpty)- const TypeOptionSeparator(spacing: 0.0),- Padding(- padding: const EdgeInsets.symmetric(vertical: 8),- child: NewTaskItem(focusNode: newTaskFocusNode),- ),- ],- );- },- ),+ ),+ ),+ ChecklistItemList(+ options: state.tasks,+ onUpdateTask: () => newTaskFocusNode.requestFocus(),+ ),+ if (state.tasks.isNotEmpty) const TypeOptionSeparator(spacing: 0.0),+ Padding(+ padding: const EdgeInsets.symmetric(vertical: 8),+ child: NewTaskItem(focusNode: newTaskFocusNode),+ ),+ ],+ );+ },);}@overridevoid dispose() {- _bloc.close();+ newTaskFocusNode.dispose();super.dispose();}}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/checklist_cell/checklist_progress_bar.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/checklist_cell/checklist_progress_bar.dartindex 1fac096364..983a06dce2 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/checklist_cell/checklist_progress_bar.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/checklist_cell/checklist_progress_bar.dart@@ -1,6 +1,5 @@import 'package:appflowy_editor/appflowy_editor.dart';import 'package:flowy_infra/theme_extension.dart';-import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flutter/material.dart';import 'package:percent_indicator/percent_indicator.dart';import 'checklist_cell_bloc.dart';@@ -9,13 +8,13 @@ class ChecklistProgressBar extends StatefulWidget {final List<ChecklistSelectOption> tasks;final double percent;final int segmentLimit = 5;- final double fontSize;+ final TextStyle? textStyle;const ChecklistProgressBar({super.key,required this.tasks,required this.percent,- this.fontSize = 11,+ this.textStyle,});@override@@ -72,12 +71,9 @@ class _ChecklistProgressBarState extends State<ChecklistProgressBar> {width: PlatformExtension.isDesktop ? 36 : 45,child: Align(alignment: AlignmentDirectional.centerEnd,- child: FlowyText.regular(+ child: Text("${(widget.percent * 100).round()}%",- fontSize: widget.fontSize,- color: PlatformExtension.isDesktop- ? Theme.of(context).hintColor- : null,+ style: widget.textStyle,),),),diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/checklist_cell/mobile_checklist_cell_editor.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/checklist_cell/mobile_checklist_cell_editor.dartindex 972fbb2e47..f2d992ce43 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/checklist_cell/mobile_checklist_cell_editor.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/checklist_cell/mobile_checklist_cell_editor.dart@@ -4,7 +4,6 @@ import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/mobile/presentation/bottom_sheet/show_mobile_bottom_sheet.dart';import 'package:appflowy/plugins/base/drag_handler.dart';-import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';import 'package:appflowy/plugins/database/widgets/row/cells/checklist_cell/checklist_cell_bloc.dart';import 'package:collection/collection.dart';import 'package:easy_localization/easy_localization.dart';@@ -16,11 +15,8 @@ import 'package:go_router/go_router.dart';class MobileChecklistCellEditScreen extends StatefulWidget {const MobileChecklistCellEditScreen({super.key,- required this.cellController,});- final ChecklistCellController cellController;-@overrideState<MobileChecklistCellEditScreen> createState() =>_MobileChecklistCellEditScreenState();@@ -32,26 +28,21 @@ class _MobileChecklistCellEditScreenStateWidget build(BuildContext context) {return ConstrainedBox(constraints: const BoxConstraints.tightFor(height: 420),- child: BlocProvider(- create: (context) => ChecklistCellBloc(- cellController: widget.cellController,- )..add(const ChecklistCellEvent.initial()),- child: BlocBuilder<ChecklistCellBloc, ChecklistCellState>(- builder: (context, state) {- return Column(- mainAxisSize: MainAxisSize.min,- children: [- const DragHandler(),- Padding(- padding: const EdgeInsets.symmetric(horizontal: 8.0),- child: _buildHeader(context),- ),- const Divider(),- const Expanded(child: _TaskList()),- ],- );- },- ),+ child: BlocBuilder<ChecklistCellBloc, ChecklistCellState>(+ builder: (context, state) {+ return Column(+ mainAxisSize: MainAxisSize.min,+ children: [+ const DragHandler(),+ Padding(+ padding: const EdgeInsets.symmetric(horizontal: 8.0),+ child: _buildHeader(context),+ ),+ const Divider(),+ const Expanded(child: _TaskList()),+ ],+ );+ },),);}@@ -109,10 +100,8 @@ class _TaskList extends StatelessWidget {cells.add(const _NewTaskButton());return ListView.separated(- shrinkWrap: true,itemCount: cells.length,separatorBuilder: (_, __) => const VSpace(8),- physics: const NeverScrollableScrollPhysics(),itemBuilder: (_, int index) => cells[index],padding: const EdgeInsets.only(bottom: 12.0),);diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/date_cell/date_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/date_cell/date_cell.dartdeleted file mode 100644index 1f1a35420a..0000000000--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/date_cell/date_cell.dart+++ /dev/null@@ -1,215 +0,0 @@-import 'package:flutter/material.dart';--import 'package:appflowy/generated/flowy_svgs.g.dart';-import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/mobile/presentation/bottom_sheet/bottom_sheet.dart';-import 'package:appflowy/mobile/presentation/database/date_picker/mobile_date_picker_screen.dart';-import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';-import 'package:appflowy_editor/appflowy_editor.dart';-import 'package:appflowy_popover/appflowy_popover.dart';-import 'package:easy_localization/easy_localization.dart';-import 'package:flowy_infra_ui/flowy_infra_ui.dart';-import 'package:flowy_infra_ui/widget/flowy_tooltip.dart';-import 'package:flutter_bloc/flutter_bloc.dart';--import '../../../../grid/presentation/layout/sizes.dart';-import '../../cell_builder.dart';--import 'date_cell_bloc.dart';-import 'date_editor.dart';--class DateCellStyle extends GridCellStyle {- String placeholder;- Alignment alignment;- EdgeInsets? cellPadding;- final bool useRoundedBorder;-- DateCellStyle({- this.placeholder = "",- this.alignment = Alignment.centerLeft,- this.cellPadding,- this.useRoundedBorder = false,- });-}--class GridDateCell extends GridCellWidget {- final CellControllerBuilder cellControllerBuilder;- late final DateCellStyle cellStyle;-- GridDateCell({- super.key,- GridCellStyle? style,- required this.cellControllerBuilder,- }) {- if (style != null) {- cellStyle = (style as DateCellStyle);- } else {- cellStyle = DateCellStyle();- }- }-- @override- GridCellState<GridDateCell> createState() => _DateCellState();-}--class _DateCellState extends GridCellState<GridDateCell> {- final PopoverController _popover = PopoverController();- late final DateCellController _cellController;- late DateCellBloc _cellBloc;-- @override- void initState() {- super.initState();- _cellController =- widget.cellControllerBuilder.build() as DateCellController;- _cellBloc = DateCellBloc(cellController: _cellController)- ..add(const DateCellEvent.initial());- }-- @override- Widget build(BuildContext context) {- return BlocProvider.value(- value: _cellBloc,- child: BlocBuilder<DateCellBloc, DateCellState>(- builder: (context, state) {- final text = state.dateStr.isEmpty- ? widget.cellStyle.placeholder- : state.dateStr;- final color =- state.dateStr.isEmpty ? Theme.of(context).hintColor : null;- final padding =- widget.cellStyle.cellPadding ?? GridSize.cellContentInsets;- final alignment = widget.cellStyle.alignment;-- if (PlatformExtension.isDesktopOrWeb) {- return AppFlowyPopover(- controller: _popover,- triggerActions: PopoverTriggerFlags.none,- direction: PopoverDirection.bottomWithLeftAligned,- constraints: BoxConstraints.loose(const Size(260, 620)),- margin: EdgeInsets.zero,- child: Container(- alignment: alignment,- padding: padding,- child: Row(- mainAxisSize: MainAxisSize.min,- children: [- Flexible(- child: FlowyText.medium(- text,- color: color,- overflow: TextOverflow.ellipsis,- ),- ),- if (state.data?.reminderId.isNotEmpty == true) ...[- const HSpace(5),- FlowyTooltip(- message:- LocaleKeys.grid_field_reminderOnDateTooltip.tr(),- child: const FlowySvg(FlowySvgs.clock_alarm_s),- ),- ],- ],- ),- ),- popupBuilder: (_) => DateCellEditor(- cellController: _cellController,- onDismissed: () => widget.cellContainerNotifier.isFocus = false,- ),- onClose: () => widget.cellContainerNotifier.isFocus = false,- );- } else if (widget.cellStyle.useRoundedBorder) {- return InkWell(- borderRadius: const BorderRadius.all(Radius.circular(14)),- onTap: () => showMobileBottomSheet(- context,- padding: EdgeInsets.zero,- builder: (_) => MobileDateCellEditScreen(- controller: _cellController,- showAsFullScreen: false,- ),- ),- child: Container(- constraints: const BoxConstraints(- minHeight: 48,- minWidth: double.infinity,- ),- decoration: BoxDecoration(- border: Border.fromBorderSide(- BorderSide(color: Theme.of(context).colorScheme.outline),- ),- borderRadius: const BorderRadius.all(Radius.circular(14)),- ),- padding: padding,- child: FlowyText.regular(- text,- fontSize: 16,- color: color,- maxLines: null,- ),- ),- );- } else {- return FlowyButton(- radius: BorderRadius.zero,- hoverColor: Colors.transparent,- margin: EdgeInsets.zero,- text: Align(- alignment: alignment,- child: SingleChildScrollView(- scrollDirection: Axis.horizontal,- padding:- const EdgeInsets.symmetric(horizontal: 12, vertical: 10),- child: Row(- children: [- if (state.data?.reminderId.isNotEmpty == true) ...[- FlowyTooltip(- message:- LocaleKeys.grid_field_reminderOnDateTooltip.tr(),- child: const FlowySvg(FlowySvgs.clock_alarm_s),- ),- const HSpace(5),- ],- FlowyText(- text,- color: color,- fontSize: 15,- maxLines: 1,- ),- ],- ),- ),- ),- onTap: () => showMobileBottomSheet(- context,- padding: EdgeInsets.zero,- backgroundColor:- Theme.of(context).colorScheme.secondaryContainer,- builder: (_) => MobileDateCellEditScreen(- controller: _cellController,- showAsFullScreen: false,- ),- ),- );- }- },- ),- );- }-- @override- Future<void> dispose() async {- _cellBloc.close();- _cellController.dispose();- super.dispose();- }-- @override- void requestBeginFocus() {- _popover.show();- widget.cellContainerNotifier.isFocus = true;- }-- @override- String? onCopy() => _cellBloc.state.dateStr;-}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/date_cell/date_cell_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/date_cell/date_cell_bloc.dartindex 1c7cb1696b..719204c276 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/date_cell/date_cell_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/date_cell/date_cell_bloc.dart@@ -41,7 +41,7 @@ class DateCellBloc extends Bloc<DateCellEvent, DateCellState> {}void _startListening() {- _onCellChangedFn = cellController.startListening(+ _onCellChangedFn = cellController.addListener(onCellChanged: ((data) {if (!isClosed) {add(DateCellEvent.didReceiveCellUpdate(data));diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/date_cell/date_cell_editor_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/date_cell/date_cell_editor_bloc.dartindex 1d810dfec7..f2aafbfc25 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/date_cell/date_cell_editor_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/date_cell/date_cell_editor_bloc.dart@@ -339,7 +339,7 @@ class DateCellEditorBloc}void _startListening() {- _onCellChangedFn = cellController.startListening(+ _onCellChangedFn = cellController.addListener(onCellChanged: (cell) {if (!isClosed) {add(DateCellEditorEvent.didReceiveCellUpdate(cell));diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/mobile_cell_container.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/mobile_cell_container.dartindex 8b9ed51eb8..399432d452 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/mobile_cell_container.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/mobile_cell_container.dart@@ -2,11 +2,11 @@ import 'package:flutter/material.dart';import 'package:provider/provider.dart';import '../accessory/cell_shortcuts.dart';-import '../cell_builder.dart';+import '../../cell/editable_cell_builder.dart';import 'cell_container.dart';class MobileCellContainer extends StatelessWidget {- final GridCellWidget child;+ final EditableCellWidget child;final bool isPrimary;final VoidCallback? onPrimaryFieldCellTap;diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/number_cell/number_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/number_cell/number_cell.dartdeleted file mode 100644index c944e5d738..0000000000--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/number_cell/number_cell.dart+++ /dev/null@@ -1,115 +0,0 @@-import 'dart:async';-import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';-import 'package:flutter/material.dart';-import 'package:flutter_bloc/flutter_bloc.dart';--import 'number_cell_bloc.dart';-import '../../../../grid/presentation/layout/sizes.dart';-import '../../cell_builder.dart';--class GridNumberCellStyle extends GridCellStyle {- String? placeholder;- TextStyle? textStyle;- EdgeInsets? cellPadding;-- GridNumberCellStyle({- this.placeholder,- this.textStyle,- this.cellPadding,- });-}--class GridNumberCell extends GridCellWidget {- final CellControllerBuilder cellControllerBuilder;- late final GridNumberCellStyle cellStyle;-- GridNumberCell({- required this.cellControllerBuilder,- required GridCellStyle? style,- super.key,- }) {- if (style != null) {- cellStyle = (style as GridNumberCellStyle);- } else {- cellStyle = GridNumberCellStyle();- }- }-- @override- GridEditableTextCell<GridNumberCell> createState() => _NumberCellState();-}--class _NumberCellState extends GridEditableTextCell<GridNumberCell> {- late NumberCellBloc _cellBloc;- late TextEditingController _controller;-- @override- SingleListenerFocusNode focusNode = SingleListenerFocusNode();-- @override- void initState() {- final cellController =- widget.cellControllerBuilder.build() as NumberCellController;- _cellBloc = NumberCellBloc(cellController: cellController)- ..add(const NumberCellEvent.initial());- _controller = TextEditingController(text: _cellBloc.state.cellContent);- super.initState();- }-- @override- Widget build(BuildContext context) {- return BlocProvider.value(- value: _cellBloc,- child: MultiBlocListener(- listeners: [- BlocListener<NumberCellBloc, NumberCellState>(- listenWhen: (p, c) => p.cellContent != c.cellContent,- listener: (context, state) => _controller.text = state.cellContent,- ),- ],- child: TextField(- controller: _controller,- focusNode: focusNode,- onEditingComplete: () => focusNode.unfocus(),- onSubmitted: (_) => focusNode.unfocus(),- maxLines: null,- style: Theme.of(context).textTheme.bodyMedium,- textInputAction: TextInputAction.done,- decoration: InputDecoration(- contentPadding:- widget.cellStyle.cellPadding ?? GridSize.cellContentInsets,- border: InputBorder.none,- focusedBorder: InputBorder.none,- enabledBorder: InputBorder.none,- errorBorder: InputBorder.none,- disabledBorder: InputBorder.none,- hintText: widget.cellStyle.placeholder,- isDense: true,- ),- onTapOutside: (_) => focusNode.unfocus(),- ),- ),- );- }-- @override- Future<void> dispose() async {- _cellBloc.close();- super.dispose();- }-- @override- Future<void> focusChanged() async {- if (mounted) {- if (_cellBloc.isClosed == false &&- _controller.text != _cellBloc.state.cellContent) {- _cellBloc.add(NumberCellEvent.updateCell(_controller.text));- }- }- }-- @override- String? onCopy() {- return _cellBloc.state.cellContent;- }-}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/number_cell/number_cell_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/number_cell/number_cell_bloc.dartindex 513792abce..7691d6ce22 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/number_cell/number_cell_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/number_cell/number_cell_bloc.dart@@ -5,7 +5,6 @@ import 'dart:async';part 'number_cell_bloc.freezed.dart';-//class NumberCellBloc extends Bloc<NumberCellEvent, NumberCellState> {final NumberCellController cellController;void Function()? _onCellChangedFn;@@ -19,12 +18,12 @@ class NumberCellBloc extends Bloc<NumberCellEvent, NumberCellState> {initial: () {_startListening();},- didReceiveCellUpdate: (cellContent) {- emit(state.copyWith(cellContent: cellContent ?? ""));+ didReceiveCellUpdate: (cellData) {+ emit(state.copyWith(content: cellData ?? ""));},updateCell: (text) async {- if (state.cellContent != text) {- emit(state.copyWith(cellContent: text));+ if (state.content != text) {+ emit(state.copyWith(content: text));await cellController.saveCellData(text);// If the input content is "abc" that can't parsered as number then the data stored in the backend will be an empty string.@@ -53,7 +52,7 @@ class NumberCellBloc extends Bloc<NumberCellEvent, NumberCellState> {}void _startListening() {- _onCellChangedFn = cellController.startListening(+ _onCellChangedFn = cellController.addListener(onCellChanged: ((cellContent) {if (!isClosed) {add(NumberCellEvent.didReceiveCellUpdate(cellContent));@@ -74,12 +73,12 @@ class NumberCellEvent with _$NumberCellEvent {@freezedclass NumberCellState with _$NumberCellState {const factory NumberCellState({- required String cellContent,+ required String content,}) = _NumberCellState;- factory NumberCellState.initial(TextCellController context) {+ factory NumberCellState.initial(TextCellController cellController) {return NumberCellState(- cellContent: context.getCellData() ?? "",+ content: cellController.getCellData() ?? "",);}}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/select_option_cell/extension.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/select_option_cell/extension.dartindex 587622261a..6486a4380e 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/select_option_cell/extension.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/select_option_cell/extension.dart@@ -1,8 +1,8 @@import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy_backend/protobuf/flowy-database2/select_option.pb.dart';+import 'package:appflowy_editor/appflowy_editor.dart';import 'package:easy_localization/easy_localization.dart';-import 'package:flowy_infra/size.dart';import 'package:flowy_infra/theme_extension.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flutter/material.dart';@@ -87,7 +87,11 @@ class SelectOptionTag extends StatelessWidget {padding: onRemove == null ? padding : padding.copyWith(right: 2.0),decoration: BoxDecoration(color: optionColor,- borderRadius: Corners.s6Border,+ borderRadius: BorderRadius.all(+ Radius.circular(+ PlatformExtension.isDesktopOrWeb ? 6 : 11,+ ),+ ),),child: Row(mainAxisSize: MainAxisSize.min,@@ -145,8 +149,7 @@ class SelectOptionTagCell extends StatelessWidget {),child: SelectOptionTag(option: option,- padding:- const EdgeInsets.symmetric(horizontal: 8),+ padding: const EdgeInsets.symmetric(horizontal: 8),),),),diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/select_option_cell/select_option_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/select_option_cell/select_option_cell.dartdeleted file mode 100644index 05b1cb8c76..0000000000--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/select_option_cell/select_option_cell.dart+++ /dev/null@@ -1,349 +0,0 @@-import 'package:appflowy/mobile/presentation/bottom_sheet/bottom_sheet.dart';-import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/select_option_cell/mobile_select_option_editor.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/select_option.pb.dart';-import 'package:appflowy_editor/appflowy_editor.dart';-import 'package:appflowy_popover/appflowy_popover.dart';-import 'package:collection/collection.dart';-import 'package:flowy_infra_ui/flowy_infra_ui.dart';-import 'package:flutter/material.dart';-import 'package:flutter_bloc/flutter_bloc.dart';--import '../../../../grid/presentation/layout/sizes.dart';-import '../../cell_builder.dart';-import 'extension.dart';-import 'select_option_cell_bloc.dart';-import 'select_option_editor.dart';--class SelectOptionCellStyle extends GridCellStyle {- String placeholder;- EdgeInsets? cellPadding;- bool useRoundedBorder;-- SelectOptionCellStyle({- this.placeholder = "",- this.cellPadding,- this.useRoundedBorder = false,- });-}--class GridSingleSelectCell extends GridCellWidget {- final CellControllerBuilder cellControllerBuilder;- late final SelectOptionCellStyle cellStyle;-- GridSingleSelectCell({- super.key,- required this.cellControllerBuilder,- GridCellStyle? style,- }) {- if (style != null) {- cellStyle = (style as SelectOptionCellStyle);- } else {- cellStyle = SelectOptionCellStyle();- }- }-- @override- GridCellState<GridSingleSelectCell> createState() => _SingleSelectCellState();-}--class _SingleSelectCellState extends GridCellState<GridSingleSelectCell> {- final PopoverController _popoverController = PopoverController();- late SelectOptionCellBloc _cellBloc;-- @override- void initState() {- super.initState();- final cellController =- widget.cellControllerBuilder.build() as SelectOptionCellController;- _cellBloc = SelectOptionCellBloc(cellController: cellController)- ..add(const SelectOptionCellEvent.initial());- }-- @override- Widget build(BuildContext context) {- return BlocProvider.value(- value: _cellBloc,- child: BlocBuilder<SelectOptionCellBloc, SelectOptionCellState>(- builder: (context, state) {- return SelectOptionWrap(- selectOptions: state.selectedOptions,- cellStyle: widget.cellStyle,- onCellEditing: (isFocus) =>- widget.cellContainerNotifier.isFocus = isFocus,- popoverController: _popoverController,- cellControllerBuilder: widget.cellControllerBuilder,- );- },- ),- );- }-- @override- Future<void> dispose() async {- _cellBloc.close();- super.dispose();- }-- @override- void requestBeginFocus() => _popoverController.show();-}--//-----------------------------------------------------------------class GridMultiSelectCell extends GridCellWidget {- final CellControllerBuilder cellControllerBuilder;- late final SelectOptionCellStyle cellStyle;-- GridMultiSelectCell({- super.key,- required this.cellControllerBuilder,- GridCellStyle? style,- }) {- if (style != null) {- cellStyle = (style as SelectOptionCellStyle);- } else {- cellStyle = SelectOptionCellStyle();- }- }-- @override- GridCellState<GridMultiSelectCell> createState() => _MultiSelectCellState();-}--class _MultiSelectCellState extends GridCellState<GridMultiSelectCell> {- final PopoverController _popoverController = PopoverController();- late SelectOptionCellBloc _cellBloc;-- @override- void initState() {- super.initState();- final cellController =- widget.cellControllerBuilder.build() as SelectOptionCellController;- _cellBloc = SelectOptionCellBloc(cellController: cellController)- ..add(const SelectOptionCellEvent.initial());- }-- @override- Widget build(BuildContext context) {- return BlocProvider.value(- value: _cellBloc,- child: BlocBuilder<SelectOptionCellBloc, SelectOptionCellState>(- builder: (context, state) {- return SelectOptionWrap(- selectOptions: state.selectedOptions,- cellStyle: widget.cellStyle,- onCellEditing: (isFocus) =>- widget.cellContainerNotifier.isFocus = isFocus,- popoverController: _popoverController,- cellControllerBuilder: widget.cellControllerBuilder,- );- },- ),- );- }-- @override- Future<void> dispose() async {- _cellBloc.close();- super.dispose();- }-- @override- void requestBeginFocus() => _popoverController.show();-}--class SelectOptionWrap extends StatefulWidget {- final List<SelectOptionPB> selectOptions;- final SelectOptionCellStyle cellStyle;- final CellControllerBuilder cellControllerBuilder;- final PopoverController popoverController;- final void Function(bool) onCellEditing;-- const SelectOptionWrap({- super.key,- required this.selectOptions,- required this.cellControllerBuilder,- required this.onCellEditing,- required this.popoverController,- required this.cellStyle,- });-- @override- State<StatefulWidget> createState() => _SelectOptionWrapState();-}--class _SelectOptionWrapState extends State<SelectOptionWrap> {- @override- Widget build(BuildContext context) {- final constraints = BoxConstraints.loose(- Size(SelectOptionCellEditor.editorPanelWidth, 300),- );- final cellController =- widget.cellControllerBuilder.build() as SelectOptionCellController;-- if (PlatformExtension.isDesktopOrWeb) {- return AppFlowyPopover(- controller: widget.popoverController,- constraints: constraints,- margin: EdgeInsets.zero,- direction: PopoverDirection.bottomWithLeftAligned,- popupBuilder: (BuildContext popoverContext) {- WidgetsBinding.instance.addPostFrameCallback((_) {- widget.onCellEditing(true);- });- return SelectOptionCellEditor(- cellController: cellController,- );- },- onClose: () => widget.onCellEditing(false),- child: Padding(- padding: widget.cellStyle.cellPadding ?? GridSize.cellContentInsets,- child: _buildOptions(context),- ),- );- } else if (widget.cellStyle.useRoundedBorder) {- return InkWell(- borderRadius: const BorderRadius.all(Radius.circular(14)),- onTap: () => showMobileBottomSheet(- context,- padding: EdgeInsets.zero,- builder: (context) {- return MobileSelectOptionEditor(- cellController: cellController,- );- },- ),- child: Container(- constraints: const BoxConstraints(- minHeight: 48,- minWidth: double.infinity,- ),- padding: EdgeInsets.symmetric(- horizontal: 12,- vertical: widget.selectOptions.isEmpty ? 13 : 10,- ),- decoration: BoxDecoration(- border: Border.fromBorderSide(- BorderSide(color: Theme.of(context).colorScheme.outline),- ),- borderRadius: const BorderRadius.all(Radius.circular(14)),- ),- child: Row(- children: [- Expanded(child: _buildMobileOptions(isInRowDetail: true)),- const HSpace(6),- RotatedBox(- quarterTurns: 3,- child: Icon(- Icons.chevron_left,- color: Theme.of(context).hintColor,- ),- ),- const HSpace(2),- ],- ),- ),- );- } else {- return FlowyButton(- hoverColor: Colors.transparent,- radius: BorderRadius.zero,- margin: EdgeInsets.zero,- text: Padding(- padding: widget.cellStyle.cellPadding ?? EdgeInsets.zero,- child: _buildMobileOptions(isInRowDetail: false),- ),- onTap: () {- showMobileBottomSheet(- context,- padding: EdgeInsets.zero,- builder: (context) {- return MobileSelectOptionEditor(- cellController: cellController,- );- },- );- },- );- }- }-- Widget _buildOptions(BuildContext context) {- final Widget child;- if (widget.selectOptions.isEmpty) {- child = Padding(- padding: const EdgeInsets.symmetric(vertical: 1),- child: FlowyText.medium(- widget.cellStyle.placeholder,- color: Theme.of(context).hintColor,- ),- );- } else {- final children = widget.selectOptions.map(- (option) {- return Padding(- padding: const EdgeInsets.only(right: 4),- child: SelectOptionTag(- option: option,- padding: const EdgeInsets.symmetric(vertical: 1, horizontal: 8),- ),- );- },- ).toList();-- child = Wrap(- runSpacing: 4,- children: children,- );- }- return Align(alignment: Alignment.centerLeft, child: child);- }-- Widget _buildMobileOptions({required bool isInRowDetail}) {- if (widget.selectOptions.isEmpty) {- return Container(- alignment: Alignment.centerLeft,- padding: const EdgeInsets.symmetric(vertical: 1),- child: FlowyText(- widget.cellStyle.placeholder,- color: Theme.of(context).hintColor,- ),- );- } else {- final children = widget.selectOptions.mapIndexed(- (index, option) {- return Padding(- padding: EdgeInsets.only(left: index == 0 ? 0 : 4),- child: SelectOptionTag(- option: option,- fontSize: 14,- padding: isInRowDetail- ? const EdgeInsets.symmetric(horizontal: 11, vertical: 5)- : const EdgeInsets.symmetric(horizontal: 12, vertical: 6),- ),- );- },- ).toList();-- return isInRowDetail- ? Align(- alignment: Alignment.centerLeft,- child: Wrap(- runSpacing: 4,- children: children,- ),- )- : Align(- alignment: Alignment.centerLeft,- child: ListView.separated(- separatorBuilder: (context, index) => const HSpace(4),- itemCount: children.length,- itemBuilder: (context, index) => children[index],- scrollDirection: Axis.horizontal,- padding:- const EdgeInsets.symmetric(horizontal: 12, vertical: 10),- ),- );- }- }-}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/select_option_cell/select_option_cell_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/select_option_cell/select_option_cell_bloc.dartindex 74ce9cc368..083b50a1e2 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/select_option_cell/select_option_cell_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/select_option_cell/select_option_cell_bloc.dart@@ -16,14 +16,14 @@ class SelectOptionCellBloc}) : super(SelectOptionCellState.initial(cellController)) {on<SelectOptionCellEvent>((event, emit) async {- await event.map(- initial: (_InitialCell value) async {+ await event.when(+ initial: () async {_startListening();},- didReceiveOptions: (_DidReceiveOptions value) {+ didReceiveOptions: (List<SelectOptionPB> selectedOptions) {emit(state.copyWith(- selectedOptions: value.selectedOptions,+ selectedOptions: selectedOptions,),);},@@ -43,16 +43,16 @@ class SelectOptionCellBloc}void _startListening() {- _onCellChangedFn = cellController.startListening(- onCellChanged: ((selectOptionContext) {+ _onCellChangedFn = cellController.addListener(+ onCellChanged: (selectOptionCellData) {if (!isClosed) {add(SelectOptionCellEvent.didReceiveOptions(- selectOptionContext?.selectOptions ?? [],+ selectOptionCellData?.selectOptions ?? [],),);}- }),+ },);}}@@ -71,8 +71,10 @@ class SelectOptionCellState with _$SelectOptionCellState {required List<SelectOptionPB> selectedOptions,}) = _SelectOptionCellState;- factory SelectOptionCellState.initial(SelectOptionCellController context) {- final data = context.getCellData();+ factory SelectOptionCellState.initial(+ SelectOptionCellController cellController,+ ) {+ final data = cellController.getCellData();return SelectOptionCellState(selectedOptions: data?.selectOptions ?? [],diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/select_option_cell/select_option_editor.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/select_option_cell/select_option_editor.dartindex 218b276ab0..b27a36b35a 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/select_option_cell/select_option_editor.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/select_option_cell/select_option_editor.dart@@ -21,11 +21,9 @@ import 'select_option_editor_bloc.dart';import 'text_field.dart';const double _editorPanelWidth = 300;-const double _padding = 12.0;class SelectOptionCellEditor extends StatefulWidget {final SelectOptionCellController cellController;- static double editorPanelWidth = 300;const SelectOptionCellEditor({super.key, required this.cellController});@@ -112,7 +110,7 @@ class _OptionList extends StatelessWidget {VSpace(GridSize.typeOptionSeparatorHeight),physics: StyledScrollPhysics(),itemBuilder: (_, int index) => cells[index],- padding: const EdgeInsets.only(top: 6.0, bottom: 12.0),+ padding: const EdgeInsets.symmetric(vertical: 8.0),);},);@@ -149,7 +147,7 @@ class _TextField extends StatelessWidget {);return Padding(- padding: const EdgeInsets.all(_padding),+ padding: const EdgeInsets.all(12.0),child: SelectOptionTextField(options: state.options,selectedOptionMap: optionMap,@@ -199,7 +197,7 @@ class _Title extends StatelessWidget {@overrideWidget build(BuildContext context) {return Padding(- padding: const EdgeInsets.symmetric(horizontal: 12.0),+ padding: const EdgeInsets.symmetric(horizontal: 16.0),child: SizedBox(height: GridSize.popoverItemHeight,child: Row(@@ -241,7 +239,7 @@ class _CreateOptionCell extends StatelessWidget {@overrideWidget build(BuildContext context) {return Padding(- padding: const EdgeInsets.symmetric(horizontal: 12.0),+ padding: const EdgeInsets.symmetric(horizontal: 8.0),child: SizedBox(height: 28,child: FlowyButton(@@ -342,7 +340,7 @@ class _SelectOptionCellState extends State<_SelectOptionCell> {mutex: widget.popoverMutex,clickHandler: PopoverClickHandler.gestureDetector,child: Padding(- padding: const EdgeInsets.symmetric(horizontal: 12.0),+ padding: const EdgeInsets.symmetric(horizontal: 8.0),child: FlowyHover(resetHoverOnRebuild: false,style: HoverStyle(diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/select_option_cell/select_option_editor_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/select_option_cell/select_option_editor_bloc.dartindex 28479dce0d..ab0844a7e5 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/select_option_cell/select_option_editor_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/select_option_cell/select_option_editor_bloc.dart@@ -4,6 +4,7 @@ import 'package:appflowy/plugins/database/application/cell/cell_controller_buildimport 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-database2/select_option.pb.dart';import 'package:dartz/dartz.dart';+import 'package:flutter/widgets.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';@@ -16,6 +17,8 @@ class SelectOptionCellEditorBlocfinal SelectOptionCellBackendService _selectOptionService;final SelectOptionCellController cellController;+ VoidCallback? _onCellChangedFn;+SelectOptionCellEditorBloc({required this.cellController,}) : _selectOptionService = SelectOptionCellBackendService(@@ -104,7 +107,10 @@ class SelectOptionCellEditorBloc@overrideFuture<void> close() async {- await cellController.dispose();+ if (_onCellChangedFn != null) {+ cellController.removeListener(_onCellChangedFn!);+ _onCellChangedFn = null;+ }return super.close();}@@ -241,11 +247,11 @@ class SelectOptionCellEditorBloc}void _startListening() {- cellController.startListening(+ _onCellChangedFn = cellController.addListener(onCellChanged: ((selectOptionContext) {_loadOptions();}),- onCellFieldChanged: () {+ onCellFieldChanged: (field) {_loadOptions();},);diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/text_cell/text_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/text_cell/text_cell.dartdeleted file mode 100644index 27b6b00c5a..0000000000--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/text_cell/text_cell.dart+++ /dev/null@@ -1,154 +0,0 @@-import 'dart:async';--import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/text_cell/text_cell_bloc.dart';-import 'package:flowy_infra_ui/flowy_infra_ui.dart';-import 'package:flutter/material.dart';-import 'package:flutter_bloc/flutter_bloc.dart';--import '../../../../grid/presentation/layout/sizes.dart';-import '../../cell_builder.dart';--class GridTextCellStyle extends GridCellStyle {- final String? placeholder;- final TextStyle? textStyle;- final EdgeInsets? cellPadding;- final bool autofocus;- final double emojiFontSize;- final double emojiHPadding;- final bool showEmoji;- final bool useRoundedBorder;-- const GridTextCellStyle({- this.placeholder,- this.textStyle,- this.cellPadding,- this.autofocus = false,- this.showEmoji = true,- this.emojiFontSize = 16,- this.emojiHPadding = 4,- this.useRoundedBorder = false,- });-}--class GridTextCell extends GridCellWidget {- final CellControllerBuilder cellControllerBuilder;- late final GridTextCellStyle cellStyle;- GridTextCell({- required this.cellControllerBuilder,- GridCellStyle? style,- super.key,- }) {- if (style != null) {- cellStyle = (style as GridTextCellStyle);- } else {- cellStyle = const GridTextCellStyle();- }- }-- @override- GridEditableTextCell<GridTextCell> createState() => _GridTextCellState();-}--class _GridTextCellState extends GridEditableTextCell<GridTextCell> {- late TextCellBloc _cellBloc;- late TextEditingController _controller;-- @override- SingleListenerFocusNode focusNode = SingleListenerFocusNode();-- @override- void initState() {- super.initState();- final cellController =- widget.cellControllerBuilder.build() as TextCellController;- _cellBloc = TextCellBloc(cellController: cellController)- ..add(const TextCellEvent.initial());- _controller = TextEditingController(text: _cellBloc.state.content);- }-- @override- Widget build(BuildContext context) {- return BlocProvider.value(- value: _cellBloc,- child: BlocListener<TextCellBloc, TextCellState>(- listener: (context, state) {- if (_controller.text != state.content) {- _controller.text = state.content;- }- },- child: Row(- children: [- if (widget.cellStyle.showEmoji) ...[- // Only build the emoji when it changes- BlocBuilder<TextCellBloc, TextCellState>(- buildWhen: (p, c) => p.emoji != c.emoji,- builder: (context, state) => Center(- child: FlowyText(- state.emoji,- fontSize: widget.cellStyle.emojiFontSize,- ),- ),- ),- HSpace(widget.cellStyle.emojiHPadding),- ],- Expanded(- child: widget.cellStyle.useRoundedBorder- ? FlowyTextField(- controller: _controller,- textStyle: widget.cellStyle.textStyle ??- Theme.of(context).textTheme.bodyMedium,- focusNode: focusNode,- autoFocus: widget.cellStyle.autofocus,- hintText: widget.cellStyle.placeholder,- onChanged: (text) => _cellBloc.add(- TextCellEvent.updateText(text),- ),- debounceDuration: const Duration(milliseconds: 300),- )- : TextField(- controller: _controller,- focusNode: focusNode,- maxLines: null,- style: widget.cellStyle.textStyle ??- Theme.of(context).textTheme.bodyMedium,- autofocus: widget.cellStyle.autofocus,- decoration: InputDecoration(- contentPadding: widget.cellStyle.cellPadding ??- GridSize.cellContentInsets,- border: InputBorder.none,- focusedBorder: InputBorder.none,- enabledBorder: InputBorder.none,- errorBorder: InputBorder.none,- disabledBorder: InputBorder.none,- hintText: widget.cellStyle.placeholder,- isDense: true,- isCollapsed: true,- ),- onTapOutside: (_) => focusNode.unfocus(),- ),- ),- ],- ),- ),- );- }-- @override- Future<void> dispose() async {- _controller.dispose();- _cellBloc.close();- super.dispose();- }-- @override- String? onCopy() => _cellBloc.state.content;-- @override- Future<void> focusChanged() {- _cellBloc.add(- TextCellEvent.updateText(_controller.text),- );- return super.focusChanged();- }-}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/text_cell/text_cell_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/text_cell/text_cell_bloc.dartindex 038e9f6dbd..89ca22b165 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/text_cell/text_cell_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/text_cell/text_cell_bloc.dart@@ -1,13 +1,15 @@+import 'dart:async';+import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';-import 'dart:async';part 'text_cell_bloc.freezed.dart';class TextCellBloc extends Bloc<TextCellEvent, TextCellState> {final TextCellController cellController;void Function()? _onCellChangedFn;+TextCellBloc({required this.cellController,}) : super(TextCellState.initial(cellController)) {@@ -17,18 +19,17 @@ class TextCellBloc extends Bloc<TextCellEvent, TextCellState> {initial: () {_startListening();},- updateText: (text) {- if (state.content != text) {- cellController.saveCellData(text);- emit(state.copyWith(content: text));- }- },- didReceiveCellUpdate: (content) {+ didReceiveCellUpdate: (String content) {emit(state.copyWith(content: content));},didUpdateEmoji: (String emoji) {emit(state.copyWith(emoji: emoji));},+ updateText: (String text) {+ if (state.content != text) {+ cellController.saveCellData(text, debounce: true);+ }+ },enableEdit: (bool enabled) {emit(state.copyWith(enableEdit: enabled));},@@ -48,15 +49,15 @@ class TextCellBloc extends Bloc<TextCellEvent, TextCellState> {}void _startListening() {- _onCellChangedFn = cellController.startListening(+ _onCellChangedFn = cellController.addListener(onCellChanged: ((cellContent) {if (!isClosed) {add(TextCellEvent.didReceiveCellUpdate(cellContent ?? ""));}}),onRowMetaChanged: () {- if (!isClosed) {- add(TextCellEvent.didUpdateEmoji(cellController.emoji ?? ""));+ if (!isClosed && cellController.fieldInfo.isPrimary) {+ add(TextCellEvent.didUpdateEmoji(cellController.icon ?? ""));}},);@@ -81,9 +82,11 @@ class TextCellState with _$TextCellState {required bool enableEdit,}) = _TextCellState;- factory TextCellState.initial(TextCellController context) => TextCellState(- content: context.getCellData() ?? "",- emoji: context.emoji ?? "",+ factory TextCellState.initial(TextCellController cellController) =>+ TextCellState(+ content: cellController.getCellData() ?? "",+ emoji:+ cellController.fieldInfo.isPrimary ? cellController.icon ?? "" : "",enableEdit: false,);}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/timestamp_cell/timestamp_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/timestamp_cell/timestamp_cell.dartdeleted file mode 100644index c8abcc332e..0000000000--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/timestamp_cell/timestamp_cell.dart+++ /dev/null@@ -1,132 +0,0 @@-import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';-import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';-import 'package:appflowy/plugins/database/widgets/row/cell_builder.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/timestamp_cell/timestamp_cell_bloc.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/field_entities.pbenum.dart';-import 'package:appflowy_editor/appflowy_editor.dart';-import 'package:flowy_infra/theme_extension.dart';-import 'package:flowy_infra_ui/flowy_infra_ui.dart';-import 'package:flutter/material.dart';-import 'package:flutter_bloc/flutter_bloc.dart';--class TimestampCellStyle extends GridCellStyle {- String? placeholder;- Alignment alignment;- EdgeInsets? cellPadding;- final bool useRoundedBorder;-- TimestampCellStyle({- this.placeholder,- this.alignment = Alignment.center,- this.cellPadding,- this.useRoundedBorder = false,- });-}--class GridTimestampCell extends GridCellWidget {- /// The [GridTimestampCell] is used by both [FieldType.CreatedTime]- /// and [FieldType.LastEditedTime]. So it needs to know the field type.- final FieldType fieldType;- final CellControllerBuilder cellControllerBuilder;- late final TimestampCellStyle? cellStyle;-- GridTimestampCell({- super.key,- GridCellStyle? style,- required this.fieldType,- required this.cellControllerBuilder,- }) {- if (style != null) {- cellStyle = (style as TimestampCellStyle);- } else {- cellStyle = null;- }- }-- @override- GridCellState<GridTimestampCell> createState() => _TimestampCellState();-}--class _TimestampCellState extends GridCellState<GridTimestampCell> {- late TimestampCellBloc _cellBloc;-- @override- void initState() {- super.initState();- final cellController =- widget.cellControllerBuilder.build() as TimestampCellController;- _cellBloc = TimestampCellBloc(cellController: cellController)- ..add(const TimestampCellEvent.initial());- }-- @override- Widget build(BuildContext context) {- final alignment = widget.cellStyle?.alignment ?? Alignment.centerLeft;- final placeholder = widget.cellStyle?.placeholder ?? "";- final padding = widget.cellStyle?.cellPadding ?? GridSize.cellContentInsets;-- return BlocProvider.value(- value: _cellBloc,- child: BlocBuilder<TimestampCellBloc, TimestampCellState>(- builder: (context, state) {- final isEmpty = state.dateStr.isEmpty;- final text = isEmpty ? placeholder : state.dateStr;-- if (PlatformExtension.isDesktopOrWeb ||- widget.cellStyle == null ||- !widget.cellStyle!.useRoundedBorder) {- return Align(- alignment: alignment,- child: Padding(- padding: padding,- child: FlowyText.medium(- text,- color: isEmpty ? Theme.of(context).hintColor : null,- maxLines: null,- ),- ),- );- } else {- return Container(- constraints: const BoxConstraints(- minHeight: 48,- minWidth: double.infinity,- ),- decoration: BoxDecoration(- border: Border.fromBorderSide(- BorderSide(color: Theme.of(context).colorScheme.outline),- ),- borderRadius: const BorderRadius.all(Radius.circular(14)),- ),- child: Padding(- padding: padding,- child: FlowyText.medium(- text,- fontSize: 16,- color: isEmpty- ? Theme.of(context).hintColor- : AFThemeExtension.of(context).textColor,- maxLines: null,- ),- ),- );- }- },- ),- );- }-- @override- Future<void> dispose() async {- _cellBloc.close();- super.dispose();- }-- @override- String? onCopy() => _cellBloc.state.dateStr;-- @override- void requestBeginFocus() {- return;- }-}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/timestamp_cell/timestamp_cell_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/timestamp_cell/timestamp_cell_bloc.dartindex dcc10dc1db..0a14354616 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/timestamp_cell/timestamp_cell_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/timestamp_cell/timestamp_cell_bloc.dart@@ -42,7 +42,7 @@ class TimestampCellBloc extends Bloc<TimestampCellEvent, TimestampCellState> {}void _startListening() {- _onCellChangedFn = cellController.startListening(+ _onCellChangedFn = cellController.addListener(onCellChanged: ((data) {if (!isClosed) {add(TimestampCellEvent.didReceiveCellUpdate(data));diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/url_cell/url_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/url_cell/url_cell.dartdeleted file mode 100644index 953b1aafa5..0000000000--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/url_cell/url_cell.dart+++ /dev/null@@ -1,299 +0,0 @@-import 'dart:async';-import 'package:appflowy/generated/flowy_svgs.g.dart';-import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/plugins/database/application/cell/cell_controller.dart';-import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';-import 'package:appflowy/workspace/presentation/home/toast.dart';-import 'package:easy_localization/easy_localization.dart';-import 'package:flowy_infra/theme_extension.dart';-import 'package:flowy_infra_ui/widget/flowy_tooltip.dart';-import 'package:flutter/material.dart';-import 'package:flutter/services.dart';-import 'package:flutter_bloc/flutter_bloc.dart';-import 'package:url_launcher/url_launcher_string.dart';-import '../../../../grid/presentation/layout/sizes.dart';-import '../../accessory/cell_accessory.dart';-import '../../cell_builder.dart';-import 'url_cell_bloc.dart';--class GridURLCellStyle extends GridCellStyle {- String? placeholder;- TextStyle? textStyle;- bool? autofocus;- EdgeInsets? cellPadding;-- List<GridURLCellAccessoryType> accessoryTypes;-- GridURLCellStyle({- this.placeholder,- this.accessoryTypes = const [],- this.cellPadding,- });-}--enum GridURLCellAccessoryType {- copyURL,- visitURL,-}--typedef URLCellDataNotifier = CellDataNotifier<String>;--class GridURLCell extends GridCellWidget {- GridURLCell({- super.key,- required this.cellControllerBuilder,- GridCellStyle? style,- }) : _cellDataNotifier = CellDataNotifier(value: '') {- if (style != null) {- cellStyle = (style as GridURLCellStyle);- } else {- cellStyle = GridURLCellStyle();- }- }-- /// Use- final URLCellDataNotifier _cellDataNotifier;- final CellControllerBuilder cellControllerBuilder;- late final GridURLCellStyle cellStyle;-- @override- GridCellState<GridURLCell> createState() => _GridURLCellState();-- @override- List<GridCellAccessoryBuilder> Function(- GridCellAccessoryBuildContext buildContext,- ) get accessoryBuilder => (buildContext) {- final List<GridCellAccessoryBuilder> accessories = [];- accessories.addAll(- cellStyle.accessoryTypes.map((ty) {- return _accessoryFromType(ty, buildContext);- }),- );-- // If the accessories is empty then the default accessory will be GridURLCellAccessoryType.visitURL- if (accessories.isEmpty) {- accessories.add(- _accessoryFromType(- GridURLCellAccessoryType.visitURL,- buildContext,- ),- );- }-- return accessories;- };-- GridCellAccessoryBuilder _accessoryFromType(- GridURLCellAccessoryType ty,- GridCellAccessoryBuildContext buildContext,- ) {- switch (ty) {- case GridURLCellAccessoryType.visitURL:- return VisitURLCellAccessoryBuilder(- builder: (Key key) => _VisitURLAccessory(- key: key,- cellDataNotifier: _cellDataNotifier,- ),- );- case GridURLCellAccessoryType.copyURL:- return CopyURLCellAccessoryBuilder(- builder: (Key key) => _CopyURLAccessory(- key: key,- cellDataNotifier: _cellDataNotifier,- ),- );- }- }-}--class _GridURLCellState extends GridEditableTextCell<GridURLCell> {- late final URLCellBloc _cellBloc;- late final TextEditingController _controller;-- @override- SingleListenerFocusNode focusNode = SingleListenerFocusNode();-- @override- void initState() {- super.initState();-- final cellController =- widget.cellControllerBuilder.build() as URLCellController;- _cellBloc = URLCellBloc(cellController: cellController)- ..add(const URLCellEvent.initial());- _controller = TextEditingController(text: _cellBloc.state.content);- }-- @override- Future<void> dispose() async {- _cellBloc.close();- super.dispose();- }-- @override- Widget build(BuildContext context) {- return BlocProvider.value(- value: _cellBloc,- child: BlocConsumer<URLCellBloc, URLCellState>(- listenWhen: (previous, current) => previous.content != current.content,- listener: (context, state) {- _controller.text = state.content;- },- builder: (context, state) {- final style = widget.cellStyle.textStyle ??- Theme.of(context).textTheme.bodyMedium!;- widget._cellDataNotifier.value = state.content;- return TextField(- controller: _controller,- focusNode: focusNode,- maxLines: null,- style: style.copyWith(- color: Theme.of(context).colorScheme.primary,- decoration: TextDecoration.underline,- ),- autofocus: false,- decoration: InputDecoration(- contentPadding:- widget.cellStyle.cellPadding ?? GridSize.cellContentInsets,- border: InputBorder.none,- focusedBorder: InputBorder.none,- enabledBorder: InputBorder.none,- errorBorder: InputBorder.none,- disabledBorder: InputBorder.none,- hintText: widget.cellStyle.placeholder,- hintStyle: style.copyWith(color: Theme.of(context).hintColor),- isDense: true,- ),- onTapOutside: (_) => focusNode.unfocus(),- );- },- ),- );- }-- @override- Future<void> focusChanged() async {- _cellBloc.add(URLCellEvent.updateURL(_controller.text.trim()));- return super.focusChanged();- }-- @override- String? onCopy() => _cellBloc.state.content;-}--typedef CopyURLCellAccessoryBuilder- = GridCellAccessoryBuilder<State<_CopyURLAccessory>>;--class _CopyURLAccessory extends StatefulWidget {- const _CopyURLAccessory({- super.key,- required this.cellDataNotifier,- });-- final URLCellDataNotifier cellDataNotifier;-- @override- State<_CopyURLAccessory> createState() => _CopyURLAccessoryState();-}--class _CopyURLAccessoryState extends State<_CopyURLAccessory>- with GridCellAccessoryState {- @override- Widget build(BuildContext context) {- if (widget.cellDataNotifier.value.isNotEmpty) {- return FlowyTooltip(- message: LocaleKeys.tooltip_urlCopyAccessory.tr(),- preferBelow: false,- child: _URLAccessoryIconContainer(- child: FlowySvg(- FlowySvgs.copy_s,- color: AFThemeExtension.of(context).textColor,- ),- ),- );- } else {- return const SizedBox.shrink();- }- }-- @override- void onTap() {- final content = widget.cellDataNotifier.value;- if (content.isEmpty) {- return;- }- Clipboard.setData(ClipboardData(text: content));- showMessageToast(LocaleKeys.grid_row_copyProperty.tr());- }-}--typedef VisitURLCellAccessoryBuilder- = GridCellAccessoryBuilder<State<_VisitURLAccessory>>;--class _VisitURLAccessory extends StatefulWidget {- const _VisitURLAccessory({- super.key,- required this.cellDataNotifier,- });-- final URLCellDataNotifier cellDataNotifier;-- @override- State<_VisitURLAccessory> createState() => _VisitURLAccessoryState();-}--class _VisitURLAccessoryState extends State<_VisitURLAccessory>- with GridCellAccessoryState {- @override- Widget build(BuildContext context) {- if (widget.cellDataNotifier.value.isNotEmpty) {- return FlowyTooltip(- message: LocaleKeys.tooltip_urlLaunchAccessory.tr(),- preferBelow: false,- child: _URLAccessoryIconContainer(- child: FlowySvg(- FlowySvgs.attach_s,- color: AFThemeExtension.of(context).textColor,- ),- ),- );- } else {- return const SizedBox.shrink();- }- }-- @override- bool enable() {- return widget.cellDataNotifier.value.isNotEmpty;- }-- @override- void onTap() {- final content = widget.cellDataNotifier.value;- if (content.isEmpty) {- return;- }- final shouldAddScheme =- !['http', 'https'].any((pattern) => content.startsWith(pattern));- final url = shouldAddScheme ? 'http://$content' : content;- canLaunchUrlString(url).then((value) => launchUrlString(url));- }-}--class _URLAccessoryIconContainer extends StatelessWidget {- const _URLAccessoryIconContainer({required this.child});-- final Widget child;-- @override- Widget build(BuildContext context) {- return SizedBox(- width: 26,- height: 26,- child: Padding(- padding: const EdgeInsets.all(3.0),- child: child,- ),- );- }-}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/url_cell/url_cell_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/url_cell/url_cell_bloc.dartindex 788cd1fa24..5194b2d471 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/url_cell/url_cell_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/url_cell/url_cell_bloc.dart@@ -27,7 +27,7 @@ class URLCellBloc extends Bloc<URLCellEvent, URLCellState> {);},updateURL: (String url) {- cellController.saveCellData(url, deduplicate: true);+ cellController.saveCellData(url, debounce: true);},);},@@ -45,7 +45,7 @@ class URLCellBloc extends Bloc<URLCellEvent, URLCellState> {}void _startListening() {- _onCellChangedFn = cellController.startListening(+ _onCellChangedFn = cellController.addListener(onCellChanged: ((cellData) {if (!isClosed) {add(URLCellEvent.didReceiveCellUpdate(cellData));diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/url_cell/url_cell_editor_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/url_cell/url_cell_editor_bloc.dartindex 978604298d..3308f6cfac 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/url_cell/url_cell_editor_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/url_cell/url_cell_editor_bloc.dart@@ -46,7 +46,7 @@ class URLCellEditorBloc extends Bloc<URLCellEditorEvent, URLCellEditorState> {}void _startListening() {- _onCellChangedFn = cellController.startListening(+ _onCellChangedFn = cellController.addListener(onCellChanged: ((cellData) {if (!isClosed) {add(URLCellEditorEvent.didReceiveCellUpdate(cellData));diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_banner.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_banner.dartindex 8802f918ef..3da1c03963 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_banner.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_banner.dart@@ -1,9 +1,12 @@import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/plugins/database/application/cell/cell_service.dart';-import 'package:appflowy/plugins/database/application/field/field_info.dart';+import 'package:appflowy/plugins/database/application/cell/cell_controller.dart';import 'package:appflowy/plugins/database/application/row/row_banner_bloc.dart';import 'package:appflowy/plugins/database/application/row/row_controller.dart';+import 'package:appflowy/plugins/database/widgets/cell/editable_cell_builder.dart';+import 'package:appflowy/plugins/database/widgets/cell/editable_cell_skeleton/text.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/text_cell/text_cell_bloc.dart';import 'package:appflowy/plugins/database/widgets/row/row_action.dart';import 'package:appflowy/workspace/presentation/settings/widgets/emoji_picker/emoji_picker.dart';import 'package:appflowy_popover/appflowy_popover.dart';@@ -12,12 +15,12 @@ import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';-import 'cell_builder.dart';-import 'cells/cells.dart';+typedef OnSubmittedEmoji = void Function(String emoji);+const _kBannerActionHeight = 40.0;class RowBanner extends StatefulWidget {final RowController rowController;- final GridCellBuilder cellBuilder;+ final EditableCellBuilder cellBuilder;const RowBanner({required this.rowController,@@ -33,6 +36,12 @@ class _RowBannerState extends State<RowBanner> {final _isHovering = ValueNotifier(false);final popoverController = PopoverController();+ @override+ void dispose() {+ _isHovering.dispose();+ super.dispose();+ }+@overrideWidget build(BuildContext context) {return BlocProvider<RowBannerBloc>(@@ -57,7 +66,7 @@ class _RowBannerState extends State<RowBanner> {popoverController: popoverController,),),- const HSpace(4),+ const VSpace(4),_BannerTitle(cellBuilder: widget.cellBuilder,popoverController: popoverController,@@ -81,6 +90,7 @@ class _RowBannerState extends State<RowBanner> {class _BannerAction extends StatelessWidget {final ValueNotifier<bool> isHovering;final PopoverController popoverController;+const _BannerAction({required this.isHovering,required this.popoverController,@@ -88,48 +98,43 @@ class _BannerAction extends StatelessWidget {@overrideWidget build(BuildContext context) {- return ValueListenableBuilder(- valueListenable: isHovering,- builder: (BuildContext context, bool value, Widget? child) {- if (!value) {- return const SizedBox(height: _kBannerActionHeight);- }+ return SizedBox(+ height: _kBannerActionHeight,+ child: ValueListenableBuilder(+ valueListenable: isHovering,+ builder: (BuildContext context, bool isHovering, Widget? child) {+ if (!isHovering) {+ return const SizedBox.shrink();+ }- return BlocBuilder<RowBannerBloc, RowBannerState>(- builder: (context, state) {- final children = <Widget>[];- final rowMeta = state.rowMeta;- if (rowMeta.icon.isEmpty) {- children.add(- EmojiPickerButton(- showEmojiPicker: () => popoverController.show(),- ),- );- } else {- children.add(- RemoveEmojiButton(- onRemoved: () {- context- .read<RowBannerBloc>()- .add(const RowBannerEvent.setIcon(''));- },- ),+ return BlocBuilder<RowBannerBloc, RowBannerState>(+ builder: (context, state) {+ return Row(+ mainAxisSize: MainAxisSize.min,+ crossAxisAlignment: CrossAxisAlignment.center,+ children: [+ if (state.rowMeta.icon.isEmpty)+ AddEmojiButton(+ onTap: () => popoverController.show(),+ )+ else+ RemoveEmojiButton(+ onTap: () => context+ .read<RowBannerBloc>()+ .add(const RowBannerEvent.setIcon('')),+ ),+ ],);- }- return Row(- mainAxisSize: MainAxisSize.min,- crossAxisAlignment: CrossAxisAlignment.start,- children: children,- );- },- );- },+ },+ );+ },+ ),);}}-class _BannerTitle extends StatefulWidget {- final GridCellBuilder cellBuilder;+class _BannerTitle extends StatelessWidget {+ final EditableCellBuilder cellBuilder;final PopoverController popoverController;final RowController rowController;@@ -139,57 +144,41 @@ class _BannerTitle extends StatefulWidget {required this.rowController,});- @override- State<_BannerTitle> createState() => _BannerTitleState();-}--class _BannerTitleState extends State<_BannerTitle> {@overrideWidget build(BuildContext context) {return BlocBuilder<RowBannerBloc, RowBannerState>(builder: (context, state) {- final children = <Widget>[];-- if (state.rowMeta.icon.isNotEmpty) {- children.add(+ final children = <Widget>[+ if (state.rowMeta.icon.isNotEmpty)EmojiButton(emoji: state.rowMeta.icon,- showEmojiPicker: () => widget.popoverController.show(),+ showEmojiPicker: () => popoverController.show(),),- );- }-- children.add(const HSpace(4));-- if (state.primaryField != null) {- final style = GridTextCellStyle(- placeholder: LocaleKeys.grid_row_titlePlaceholder.tr(),- textStyle: Theme.of(context).textTheme.titleLarge,- showEmoji: false,- autofocus: true,- cellPadding: EdgeInsets.zero,- );- final cellContext = DatabaseCellContext(- viewId: widget.rowController.viewId,- rowMeta: widget.rowController.rowMeta,- fieldInfo: FieldInfo.initial(state.primaryField!),- );- children.add(+ const HSpace(4),+ if (state.primaryField != null)Expanded(- child: widget.cellBuilder.build(cellContext, style: style),+ child: cellBuilder.buildCustom(+ CellContext(+ fieldId: state.primaryField!.id,+ rowId: rowController.rowId,+ ),+ skinMap: EditableCellSkinMap(textSkin: _TitleSkin()),+ ),),- );- }+ ];return AppFlowyPopover(- controller: widget.popoverController,+ controller: popoverController,triggerActions: PopoverTriggerFlags.none,direction: PopoverDirection.bottomWithLeftAligned,constraints: const BoxConstraints(maxWidth: 380, maxHeight: 300),- popupBuilder: (popoverContext) => _buildEmojiPicker((emoji) {- context.read<RowBannerBloc>().add(RowBannerEvent.setIcon(emoji));- widget.popoverController.close();- }),+ popupBuilder: (popoverContext) => EmojiSelectionMenu(+ onSubmitted: (emoji) {+ popoverController.close();+ context.read<RowBannerBloc>().add(RowBannerEvent.setIcon(emoji));+ },+ onExit: () {},+ ),child: Row(children: children),);},@@ -197,9 +186,6 @@ class _BannerTitleState extends State<_BannerTitle> {}}-typedef OnSubmittedEmoji = void Function(String emoji);-const _kBannerActionHeight = 40.0;-class EmojiButton extends StatelessWidget {final String emoji;final VoidCallback showEmojiPicker;@@ -213,7 +199,6 @@ class EmojiButton extends StatelessWidget {@overrideWidget build(BuildContext context) {return SizedBox(- height: _kBannerActionHeight,width: _kBannerActionHeight,child: FlowyButton(margin: EdgeInsets.zero,@@ -228,18 +213,13 @@ class EmojiButton extends StatelessWidget {}}-class EmojiPickerButton extends StatefulWidget {- final VoidCallback showEmojiPicker;- const EmojiPickerButton({+class AddEmojiButton extends StatelessWidget {+ final VoidCallback onTap;+ const AddEmojiButton({super.key,- required this.showEmojiPicker,+ required this.onTap,});- @override- State<EmojiPickerButton> createState() => _EmojiPickerButtonState();-}--class _EmojiPickerButtonState extends State<EmojiPickerButton> {@overrideWidget build(BuildContext context) {return SizedBox(@@ -250,7 +230,7 @@ class _EmojiPickerButtonState extends State<EmojiPickerButton> {LocaleKeys.document_plugins_cover_addIcon.tr(),),leftIcon: const FlowySvg(FlowySvgs.emoji_s),- onTap: widget.showEmojiPicker,+ onTap: onTap,margin: const EdgeInsets.all(4),),);@@ -258,14 +238,12 @@ class _EmojiPickerButtonState extends State<EmojiPickerButton> {}class RemoveEmojiButton extends StatelessWidget {- final VoidCallback onRemoved;- RemoveEmojiButton({+ final VoidCallback onTap;+ const RemoveEmojiButton({super.key,- required this.onRemoved,+ required this.onTap,});- final popoverController = PopoverController();-@overrideWidget build(BuildContext context) {return SizedBox(@@ -276,20 +254,13 @@ class RemoveEmojiButton extends StatelessWidget {LocaleKeys.document_plugins_cover_removeIcon.tr(),),leftIcon: const FlowySvg(FlowySvgs.emoji_s),- onTap: onRemoved,+ onTap: onTap,margin: const EdgeInsets.all(4),),);}}-Widget _buildEmojiPicker(OnSubmittedEmoji onSubmitted) {- return EmojiSelectionMenu(- onSubmitted: onSubmitted,- onExit: () {},- );-}-class RowActionButton extends StatelessWidget {final RowController rowController;const RowActionButton({super.key, required this.rowController});@@ -308,3 +279,34 @@ class RowActionButton extends StatelessWidget {);}}++class _TitleSkin extends IEditableTextCellSkin {+ @override+ Widget build(+ BuildContext context,+ CellContainerNotifier cellContainerNotifier,+ TextCellBloc bloc,+ FocusNode focusNode,+ TextEditingController textEditingController,+ ) {+ return TextField(+ controller: textEditingController,+ focusNode: focusNode,+ maxLines: null,+ autofocus: true,+ style: Theme.of(context).textTheme.bodyMedium?.copyWith(fontSize: 28),+ decoration: InputDecoration(+ contentPadding: EdgeInsets.zero,+ border: InputBorder.none,+ focusedBorder: InputBorder.none,+ enabledBorder: InputBorder.none,+ errorBorder: InputBorder.none,+ disabledBorder: InputBorder.none,+ hintText: LocaleKeys.grid_row_titlePlaceholder.tr(),+ isDense: true,+ isCollapsed: true,+ ),+ onChanged: (text) => bloc.add(TextCellEvent.updateText(text.trim())),+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_detail.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_detail.dartindex 3c83045465..d92df79c8d 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_detail.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_detail.dart@@ -1,4 +1,4 @@-import 'package:appflowy/plugins/database/application/field/field_controller.dart';+import 'package:appflowy/plugins/database/application/database_controller.dart';import 'package:appflowy/plugins/database/application/row/row_controller.dart';import 'package:appflowy/plugins/database/grid/application/row/row_detail_bloc.dart';import 'package:appflowy/plugins/database/widgets/row/row_document.dart';@@ -8,32 +8,29 @@ import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';-import 'cell_builder.dart';+import '../cell/editable_cell_builder.dart';import 'row_banner.dart';import 'row_property.dart';class RowDetailPage extends StatefulWidget with FlowyOverlayDelegate {- final FieldController fieldController;+ final DatabaseController databaseController;final RowController rowController;- final GridCellBuilder cellBuilder;const RowDetailPage({super.key,- required this.fieldController,required this.rowController,- required this.cellBuilder,+ required this.databaseController,});@overrideState<RowDetailPage> createState() => _RowDetailPageState();-- static String identifier() {- return (RowDetailPage).toString();- }}class _RowDetailPageState extends State<RowDetailPage> {final scrollController = ScrollController();+ late final cellBuilder = EditableCellBuilder(+ databaseController: widget.databaseController,+ );@overridevoid dispose() {@@ -47,9 +44,10 @@ class _RowDetailPageState extends State<RowDetailPage> {child: MultiBlocProvider(providers: [BlocProvider(- create: (context) =>- RowDetailBloc(rowController: widget.rowController)- ..add(const RowDetailEvent.initial()),+ create: (context) => RowDetailBloc(+ fieldController: widget.databaseController.fieldController,+ rowController: widget.rowController,+ ),),BlocProvider.value(value: getIt<ReminderBloc>(),@@ -60,15 +58,15 @@ class _RowDetailPageState extends State<RowDetailPage> {children: [RowBanner(rowController: widget.rowController,- cellBuilder: widget.cellBuilder,+ cellBuilder: cellBuilder,),const VSpace(16),Padding(padding: const EdgeInsets.only(left: 40, right: 60),child: RowPropertyList(- cellBuilder: widget.cellBuilder,- viewId: widget.rowController.viewId,- fieldController: widget.fieldController,+ cellBuilder: cellBuilder,+ viewId: widget.databaseController.viewId,+ fieldController: widget.databaseController.fieldController,),),const VSpace(20),@@ -80,7 +78,6 @@ class _RowDetailPageState extends State<RowDetailPage> {RowDocument(viewId: widget.rowController.viewId,rowId: widget.rowController.rowId,- scrollController: scrollController,),],),diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_document.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_document.dartindex cdaad96d42..04211ffba2 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_document.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_document.dart@@ -15,12 +15,10 @@ class RowDocument extends StatelessWidget {super.key,required this.viewId,required this.rowId,- required this.scrollController,});final String viewId;final String rowId;- final ScrollController scrollController;@overrideWidget build(BuildContext context) {@@ -39,7 +37,6 @@ class RowDocument extends StatelessWidget {),finish: () => RowEditor(viewPB: state.viewPB!,- scrollController: scrollController,onIsEmptyChanged: (isEmpty) => context.read<RowDocumentBloc>().add(RowDocumentEvent.updateIsEmpty(isEmpty)),@@ -55,12 +52,10 @@ class RowEditor extends StatefulWidget {const RowEditor({super.key,required this.viewPB,- required this.scrollController,this.onIsEmptyChanged,});final ViewPB viewPB;- final ScrollController scrollController;final void Function(bool)? onIsEmptyChanged;@override@@ -119,7 +114,7 @@ class _RowEditorState extends State<RowEditor> {shrinkWrap: true,autoFocus: false,editorState: editorState,- scrollController: widget.scrollController,+ // scrollController: widget.scrollController,styleCustomizer: EditorStyleCustomizer(context: context,padding: const EdgeInsets.only(left: 16, right: 54),diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_property.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_property.dartindex 6a4af5cb2c..e0e99c6194 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_property.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_property.dart@@ -2,13 +2,13 @@ import 'dart:io';import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/plugins/database/application/cell/cell_service.dart';+import 'package:appflowy/plugins/database/application/cell/cell_controller.dart';import 'package:appflowy/plugins/database/application/field/field_controller.dart';+import 'package:appflowy/plugins/database/application/field/field_info.dart';import 'package:appflowy/plugins/database/application/field/field_service.dart';import 'package:appflowy/plugins/database/grid/application/row/row_detail_bloc.dart';import 'package:appflowy/plugins/database/grid/presentation/widgets/header/desktop_field_cell.dart';import 'package:appflowy/plugins/database/grid/presentation/widgets/header/field_editor.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/cells.dart';import 'package:appflowy/plugins/document/presentation/editor_plugins/actions/block_action_button.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-database2/field_entities.pb.dart';@@ -18,18 +18,18 @@ import 'package:collection/collection.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/theme_extension.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flutter/foundation.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'accessory/cell_accessory.dart';-import 'cell_builder.dart';+import '../cell/editable_cell_builder.dart';-/// Display the row properties in a list. Only use this widget in the-/// [RowDetailPage].+/// Display the row properties in a list. Only used in [RowDetailPage].class RowPropertyList extends StatelessWidget {final String viewId;final FieldController fieldController;- final GridCellBuilder cellBuilder;+ final EditableCellBuilder cellBuilder;const RowPropertyList({super.key,@@ -41,9 +41,11 @@ class RowPropertyList extends StatelessWidget {@overrideWidget build(BuildContext context) {return BlocBuilder<RowDetailBloc, RowDetailState>(+ buildWhen: (previous, current) =>+ previous.showHiddenFields != current.showHiddenFields ||+ !listEquals(previous.visibleCells, current.visibleCells),builder: (context, state) {final children = state.visibleCells- .where((element) => !element.fieldInfo.field.isPrimary).mapIndexed((index, cell) => _PropertyCell(key: ValueKey('row_detail_${cell.fieldId}'),@@ -58,17 +60,18 @@ class RowPropertyList extends StatelessWidget {return ReorderableListView(shrinkWrap: true,physics: const NeverScrollableScrollPhysics(),- onReorder: (from, to) {- context- .read<RowDetailBloc>()- .add(RowDetailEvent.reorderField(from, to));- },+ onReorder: (from, to) => context+ .read<RowDetailBloc>()+ .add(RowDetailEvent.reorderField(from, to)),buildDefaultDragHandles: false,proxyDecorator: (child, index, animation) => Material(color: Colors.transparent,child: Stack(children: [- child,+ BlocProvider.value(+ value: context.read<RowDetailBloc>(),+ child: child,+ ),MouseRegion(cursor: Platform.isWindows? SystemMouseCursors.click@@ -86,7 +89,7 @@ class RowPropertyList extends StatelessWidget {padding: const EdgeInsets.only(left: 20),child: Column(children: [- if (context.read<RowDetailBloc>().state.numHiddenFields != 0)+ if (context.watch<RowDetailBloc>().state.numHiddenFields != 0)const Padding(padding: EdgeInsets.only(bottom: 4.0),child: ToggleHiddenFieldsVisibilityButton(),@@ -106,8 +109,8 @@ class RowPropertyList extends StatelessWidget {}class _PropertyCell extends StatefulWidget {- final DatabaseCellContext cellContext;- final GridCellBuilder cellBuilder;+ final CellContext cellContext;+ final EditableCellBuilder cellBuilder;final FieldController fieldController;final int index;@@ -131,9 +134,6 @@ class _PropertyCellState extends State<_PropertyCell> {@overrideWidget build(BuildContext context) {- final style = customCellStyle(widget.cellContext.fieldType);- final cell = widget.cellBuilder.build(widget.cellContext, style: style);-final dragThumb = MouseRegion(cursor: Platform.isWindows? SystemMouseCursors.click@@ -147,12 +147,17 @@ class _PropertyCellState extends State<_PropertyCell> {margin: EdgeInsets.zero,triggerActions: PopoverTriggerFlags.none,direction: PopoverDirection.bottomWithLeftAligned,- popupBuilder: (popoverContext) => buildFieldEditor(),+ popupBuilder: (popoverContext) => FieldEditor(+ viewId: widget.fieldController.viewId,+ field: widget.fieldController+ .getField(widget.cellContext.fieldId)!+ .field,+ fieldController: widget.fieldController,+ ),child: ValueListenableBuilder(valueListenable: _isFieldHover,- builder: ((context, value, child) {- return value ? child! : const SizedBox.shrink();- }),+ builder: (_, isHovering, child) =>+ isHovering ? child! : const SizedBox.shrink(),child: BlockActionButton(onTap: () => _fieldPopoverController.show(),svg: FlowySvgs.drag_element_s,@@ -165,11 +170,17 @@ class _PropertyCellState extends State<_PropertyCell> {),);+ final cell = widget.cellBuilder.buildStyled(+ widget.cellContext,+ EditableCellStyle.desktopRowDetail,+ );final gesture = GestureDetector(behavior: HitTestBehavior.opaque,onTap: () => cell.requestFocus.notify(),child: AccessoryHover(- fieldType: widget.cellContext.fieldType,+ fieldType: widget.fieldController+ .getField(widget.cellContext.fieldId)!+ .fieldType,child: cell,),);@@ -195,30 +206,46 @@ class _PropertyCellState extends State<_PropertyCell> {},),const HSpace(4),- AppFlowyPopover(- controller: _popoverController,- constraints: BoxConstraints.loose(const Size(240, 600)),- margin: EdgeInsets.zero,- triggerActions: PopoverTriggerFlags.none,- direction: PopoverDirection.bottomWithLeftAligned,- popupBuilder: (popoverContext) => buildFieldEditor(),- child: SizedBox(- width: 160,- height: 30,- child: Tooltip(- waitDuration: const Duration(seconds: 1),- preferBelow: false,- verticalOffset: 15,- message: widget.cellContext.fieldInfo.field.name,- child: FieldCellButton(- field: widget.cellContext.fieldInfo.field,- onTap: () => _popoverController.show(),- radius: BorderRadius.circular(6),- margin:- const EdgeInsets.symmetric(horizontal: 4, vertical: 6),- ),- ),+ BlocSelector<RowDetailBloc, RowDetailState, FieldInfo?>(+ selector: (state) => state.fields.firstWhereOrNull(+ (fieldInfo) => fieldInfo.field.id == widget.cellContext.fieldId,),+ builder: (context, fieldInfo) {+ if (fieldInfo == null) {+ return const SizedBox.shrink();+ }+ return AppFlowyPopover(+ controller: _popoverController,+ constraints: BoxConstraints.loose(const Size(240, 600)),+ margin: EdgeInsets.zero,+ triggerActions: PopoverTriggerFlags.none,+ direction: PopoverDirection.bottomWithLeftAligned,+ popupBuilder: (popoverContext) => FieldEditor(+ viewId: widget.fieldController.viewId,+ field: fieldInfo.field,+ fieldController: widget.fieldController,+ ),+ child: SizedBox(+ width: 160,+ height: 30,+ child: Tooltip(+ waitDuration: const Duration(seconds: 1),+ preferBelow: false,+ verticalOffset: 15,+ message: fieldInfo.name,+ child: FieldCellButton(+ field: fieldInfo.field,+ onTap: () => _popoverController.show(),+ radius: BorderRadius.circular(6),+ margin: const EdgeInsets.symmetric(+ horizontal: 4,+ vertical: 6,+ ),+ ),+ ),+ ),+ );+ },),const HSpace(8),Expanded(child: gesture),@@ -227,74 +254,6 @@ class _PropertyCellState extends State<_PropertyCell> {),);}-- Widget buildFieldEditor() {- return FieldEditor(- viewId: widget.cellContext.viewId,- field: widget.cellContext.fieldInfo.field,- fieldController: widget.fieldController,- );- }-}--GridCellStyle? customCellStyle(FieldType fieldType) {- switch (fieldType) {- case FieldType.Checkbox:- return GridCheckboxCellStyle(- cellPadding: const EdgeInsets.symmetric(horizontal: 8, vertical: 5),- );- case FieldType.DateTime:- return DateCellStyle(- placeholder: LocaleKeys.grid_row_textPlaceholder.tr(),- alignment: Alignment.centerLeft,- cellPadding: const EdgeInsets.symmetric(horizontal: 8, vertical: 6),- );- case FieldType.LastEditedTime:- case FieldType.CreatedTime:- return TimestampCellStyle(- placeholder: LocaleKeys.grid_row_textPlaceholder.tr(),- alignment: Alignment.centerLeft,- cellPadding: const EdgeInsets.symmetric(horizontal: 8, vertical: 6),- );- case FieldType.MultiSelect:- return SelectOptionCellStyle(- placeholder: LocaleKeys.grid_row_textPlaceholder.tr(),- cellPadding: const EdgeInsets.symmetric(horizontal: 8, vertical: 5),- );- case FieldType.Checklist:- return ChecklistCellStyle(- placeholder: LocaleKeys.grid_row_textPlaceholder.tr(),- cellPadding: EdgeInsets.zero,- showTasksInline: true,- );- case FieldType.Number:- return GridNumberCellStyle(- placeholder: LocaleKeys.grid_row_textPlaceholder.tr(),- cellPadding: const EdgeInsets.symmetric(horizontal: 8, vertical: 10),- );- case FieldType.RichText:- return GridTextCellStyle(- cellPadding: const EdgeInsets.symmetric(horizontal: 8, vertical: 10),- placeholder: LocaleKeys.grid_row_textPlaceholder.tr(),- showEmoji: false,- );- case FieldType.SingleSelect:- return SelectOptionCellStyle(- placeholder: LocaleKeys.grid_row_textPlaceholder.tr(),- cellPadding: const EdgeInsets.symmetric(horizontal: 8, vertical: 5),- );-- case FieldType.URL:- return GridURLCellStyle(- placeholder: LocaleKeys.grid_row_textPlaceholder.tr(),- cellPadding: const EdgeInsets.symmetric(horizontal: 8, vertical: 10),- accessoryTypes: [- GridURLCellAccessoryType.copyURL,- GridURLCellAccessoryType.visitURL,- ],- );- }- throw UnimplementedError;}class ToggleHiddenFieldsVisibilityButton extends StatelessWidget {@@ -303,76 +262,84 @@ class ToggleHiddenFieldsVisibilityButton extends StatelessWidget {@overrideWidget build(BuildContext context) {return BlocBuilder<RowDetailBloc, RowDetailState>(+ buildWhen: (previous, current) =>+ previous.showHiddenFields != current.showHiddenFields ||+ previous.numHiddenFields != current.numHiddenFields,builder: (context, state) {- final text = switch (state.showHiddenFields) {- false => LocaleKeys.grid_rowPage_showHiddenFields.plural(- state.numHiddenFields,- namedArgs: {'count': '${state.numHiddenFields}'},- ),- true => LocaleKeys.grid_rowPage_hideHiddenFields.plural(- state.numHiddenFields,- namedArgs: {'count': '${state.numHiddenFields}'},+ final text = state.showHiddenFields+ ? LocaleKeys.grid_rowPage_hideHiddenFields.plural(+ state.numHiddenFields,+ namedArgs: {'count': '${state.numHiddenFields}'},+ )+ : LocaleKeys.grid_rowPage_showHiddenFields.plural(+ state.numHiddenFields,+ namedArgs: {'count': '${state.numHiddenFields}'},+ );+ final quarterTurns = state.showHiddenFields ? 1 : 3;+ return PlatformExtension.isDesktopOrWeb+ ? _desktop(context, text, quarterTurns)+ : _mobile(context, text, quarterTurns);+ },+ );+ }++ Widget _desktop(BuildContext context, String text, int quarterTurns) {+ return SizedBox(+ height: 30,+ child: FlowyButton(+ text: FlowyText.medium(text, color: Theme.of(context).hintColor),+ hoverColor: AFThemeExtension.of(context).lightGreyHover,+ leftIcon: RotatedBox(+ quarterTurns: quarterTurns,+ child: FlowySvg(+ FlowySvgs.arrow_left_s,+ color: Theme.of(context).hintColor,+ ),+ ),+ margin: const EdgeInsets.symmetric(horizontal: 4, vertical: 6),+ onTap: () => context.read<RowDetailBloc>().add(+ const RowDetailEvent.toggleHiddenFieldVisibility(),),- };+ ),+ );+ }- if (PlatformExtension.isDesktop) {- return SizedBox(- height: 30,- child: FlowyButton(- text: FlowyText.medium(text, color: Theme.of(context).hintColor),- hoverColor: AFThemeExtension.of(context).lightGreyHover,- leftIcon: RotatedBox(- quarterTurns: state.showHiddenFields ? 1 : 3,- child: FlowySvg(- FlowySvgs.arrow_left_s,- color: Theme.of(context).hintColor,+ Widget _mobile(BuildContext context, String text, int quarterTurns) {+ return ConstrainedBox(+ constraints: const BoxConstraints(minWidth: double.infinity),+ child: TextButton.icon(+ style: Theme.of(context).textButtonTheme.style?.copyWith(+ shape: MaterialStateProperty.all<RoundedRectangleBorder>(+ RoundedRectangleBorder(+ borderRadius: BorderRadius.circular(12.0),+ side: BorderSide.none,),),- margin: const EdgeInsets.symmetric(horizontal: 4, vertical: 6),- onTap: () => context.read<RowDetailBloc>().add(- const RowDetailEvent.toggleHiddenFieldVisibility(),- ),- ),- );- } else {- return ConstrainedBox(- constraints: const BoxConstraints(minWidth: double.infinity),- child: TextButton.icon(- style: Theme.of(context).textButtonTheme.style?.copyWith(- shape: MaterialStateProperty.all<RoundedRectangleBorder>(- RoundedRectangleBorder(- borderRadius: BorderRadius.circular(12.0),- side: BorderSide.none,- ),- ),- overlayColor: MaterialStateProperty.all<Color>(- Theme.of(context).hoverColor,- ),- alignment: AlignmentDirectional.centerStart,- splashFactory: NoSplash.splashFactory,- padding: const MaterialStatePropertyAll(- EdgeInsets.symmetric(vertical: 14, horizontal: 6),- ),- ),- label: FlowyText.medium(- text,- fontSize: 15,- color: Theme.of(context).hintColor,+ overlayColor: MaterialStateProperty.all<Color>(+ Theme.of(context).hoverColor,),- onPressed: () => context- .read<RowDetailBloc>()- .add(const RowDetailEvent.toggleHiddenFieldVisibility()),- icon: RotatedBox(- quarterTurns: state.showHiddenFields ? 1 : 3,- child: FlowySvg(- FlowySvgs.arrow_left_s,- color: Theme.of(context).hintColor,- ),+ alignment: AlignmentDirectional.centerStart,+ splashFactory: NoSplash.splashFactory,+ padding: const MaterialStatePropertyAll(+ EdgeInsets.symmetric(vertical: 14, horizontal: 6),),),- );- }- },+ label: FlowyText.medium(+ text,+ fontSize: 15,+ color: Theme.of(context).hintColor,+ ),+ onPressed: () => context+ .read<RowDetailBloc>()+ .add(const RowDetailEvent.toggleHiddenFieldVisibility()),+ icon: RotatedBox(+ quarterTurns: quarterTurns,+ child: FlowySvg(+ FlowySvgs.arrow_left_s,+ color: Theme.of(context).hintColor,+ ),+ ),+ ),);}}diff --git a/frontend/appflowy_flutter/test/bloc_test/board_test/group_by_multi_select_field_test.dart b/frontend/appflowy_flutter/test/bloc_test/board_test/group_by_multi_select_field_test.dartindex e5c33cab02..fbc47c4a46 100644--- a/frontend/appflowy_flutter/test/bloc_test/board_test/group_by_multi_select_field_test.dart+++ b/frontend/appflowy_flutter/test/bloc_test/board_test/group_by_multi_select_field_test.dart@@ -67,8 +67,9 @@ void main() {final multiSelectField = context.fieldContexts.last.field;// Create options- final cellController = await context.makeCellController(multiSelectField.id)- as SelectOptionCellController;+ final cellController =+ context.makeCellControllerFromFieldId(multiSelectField.id)+ as SelectOptionCellController;final multiSelectOptionBloc =SelectOptionCellEditorBloc(cellController: cellController);diff --git a/frontend/appflowy_flutter/test/bloc_test/board_test/util.dart b/frontend/appflowy_flutter/test/bloc_test/board_test/util.dartindex 6f943fc963..8bcbad60c6 100644--- a/frontend/appflowy_flutter/test/bloc_test/board_test/util.dart+++ b/frontend/appflowy_flutter/test/bloc_test/board_test/util.dart@@ -5,9 +5,7 @@ import 'package:appflowy/plugins/database/application/field/field_controller.darimport 'package:appflowy/plugins/database/application/field/field_editor_bloc.dart';import 'package:appflowy/plugins/database/application/field/field_info.dart';import 'package:appflowy/plugins/database/application/row/row_cache.dart';-import 'package:appflowy/plugins/database/application/row/row_controller.dart';import 'package:appflowy/plugins/database/board/board.dart';-import 'package:appflowy/plugins/database/grid/application/row/row_bloc.dart';import 'package:appflowy/workspace/application/view/view_service.dart';import 'package:appflowy_backend/protobuf/flowy-database2/field_entities.pb.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';@@ -89,33 +87,10 @@ class BoardTestContext {return editorBloc;}- Future<CellController> makeCellController(String fieldId) async {- final builder = await makeCellControllerBuilder(fieldId);- return builder.build();- }-- Future<CellControllerBuilder> makeCellControllerBuilder(- String fieldId,- ) async {- final RowInfo rowInfo = rowInfos.last;- final rowCache = _boardDataController.rowCache;-- final rowDataController = RowController(- viewId: rowInfo.viewId,- rowMeta: rowInfo.rowMeta,- rowCache: rowCache,- );-- final rowBloc = RowBloc(- viewId: rowInfo.viewId,- dataController: rowDataController,- rowId: rowInfo.rowMeta.id,- )..add(const RowEvent.initial());- await gridResponseFuture();-- return CellControllerBuilder(- cellContext: rowBloc.state.cellByFieldId[fieldId]!,- cellCache: rowCache.cellCache,+ CellController makeCellControllerFromFieldId(String fieldId) {+ return makeCellController(+ _boardDataController,+ CellContext(fieldId: fieldId, rowId: rowInfos.last.rowId),);}diff --git a/frontend/appflowy_flutter/test/bloc_test/grid_test/cell/select_option_cell_test.dart b/frontend/appflowy_flutter/test/bloc_test/grid_test/cell/select_option_cell_test.dartindex 18e0c5e376..930a85de35 100644--- a/frontend/appflowy_flutter/test/bloc_test/grid_test/cell/select_option_cell_test.dart+++ b/frontend/appflowy_flutter/test/bloc_test/grid_test/cell/select_option_cell_test.dart@@ -15,7 +15,7 @@ void main() {test('create options', () async {await cellTest.createTestGrid();await cellTest.createTestRow();- final cellController = await cellTest.makeSelectOptionCellController(+ final cellController = cellTest.makeSelectOptionCellController(FieldType.SingleSelect,0,);@@ -34,7 +34,7 @@ void main() {test('update options', () async {await cellTest.createTestGrid();await cellTest.createTestRow();- final cellController = await cellTest.makeSelectOptionCellController(+ final cellController = cellTest.makeSelectOptionCellController(FieldType.SingleSelect,0,);@@ -59,7 +59,7 @@ void main() {test('delete options', () async {await cellTest.createTestGrid();await cellTest.createTestRow();- final cellController = await cellTest.makeSelectOptionCellController(+ final cellController = cellTest.makeSelectOptionCellController(FieldType.SingleSelect,0,);@@ -101,7 +101,7 @@ void main() {test('select/unselect option', () async {await cellTest.createTestGrid();await cellTest.createTestRow();- final cellController = await cellTest.makeSelectOptionCellController(+ final cellController = cellTest.makeSelectOptionCellController(FieldType.SingleSelect,0,);@@ -128,7 +128,7 @@ void main() {test('select an option or create one', () async {await cellTest.createTestGrid();await cellTest.createTestRow();- final cellController = await cellTest.makeSelectOptionCellController(+ final cellController = cellTest.makeSelectOptionCellController(FieldType.SingleSelect,0,);@@ -154,7 +154,7 @@ void main() {test('select multiple options', () async {await cellTest.createTestGrid();await cellTest.createTestRow();- final cellController = await cellTest.makeSelectOptionCellController(+ final cellController = cellTest.makeSelectOptionCellController(FieldType.SingleSelect,0,);@@ -185,7 +185,7 @@ void main() {test('filter options', () async {await cellTest.createTestGrid();await cellTest.createTestRow();- final cellController = await cellTest.makeSelectOptionCellController(+ final cellController = cellTest.makeSelectOptionCellController(FieldType.SingleSelect,0,);diff --git a/frontend/appflowy_flutter/test/bloc_test/grid_test/field/field_cell_bloc_test.dart b/frontend/appflowy_flutter/test/bloc_test/grid_test/field/field_cell_bloc_test.dartindex f741d36698..c9344a4917 100644--- a/frontend/appflowy_flutter/test/bloc_test/grid_test/field/field_cell_bloc_test.dart+++ b/frontend/appflowy_flutter/test/bloc_test/grid_test/field/field_cell_bloc_test.dart@@ -22,7 +22,7 @@ void main() {blocTest('update field width',build: () => FieldCellBloc(- fieldInfo: context.fieldContexts[0],+ fieldInfo: context.fieldInfos[0],viewId: context.gridView.id,),act: (bloc) {@@ -40,7 +40,7 @@ void main() {'field width should not be lesser than 50px',build: () => FieldCellBloc(viewId: context.gridView.id,- fieldInfo: context.fieldContexts[0],+ fieldInfo: context.fieldInfos[0],),act: (bloc) {bloc.add(const FieldCellEvent.onResizeStart());diff --git a/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/create_filter_test.dart b/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/create_filter_test.dartindex b9d3dbe827..f0c3ac4770 100644--- a/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/create_filter_test.dart+++ b/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/create_filter_test.dart@@ -93,7 +93,7 @@ void main() {);await gridResponseFuture();- final controller = await context.makeTextCellController(0);+ final controller = context.makeTextCellController(0);controller.saveCellData("edit text cell content");await gridResponseFuture();assert(gridBloc.state.rowInfos.length == 2);diff --git a/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/filter_rows_by_checkbox_test.dart b/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/filter_rows_by_checkbox_test.dartindex d12faf2dc6..cf6ddf6a6f 100644--- a/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/filter_rows_by_checkbox_test.dart+++ b/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/filter_rows_by_checkbox_test.dart@@ -15,7 +15,7 @@ void main() {final context = await createTestFilterGrid(gridTest);final service = FilterBackendService(viewId: context.gridView.id);- final controller = await context.makeCheckboxCellController(0);+ final controller = context.makeCheckboxCellController(0);controller.saveCellData("Yes");await gridResponseFuture();@@ -36,7 +36,7 @@ void main() {final context = await createTestFilterGrid(gridTest);final service = FilterBackendService(viewId: context.gridView.id);- final controller = await context.makeCheckboxCellController(0);+ final controller = context.makeCheckboxCellController(0);controller.saveCellData("Yes");await gridResponseFuture();diff --git a/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/filter_util.dart b/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/filter_util.dartindex 28e4147f58..9b8fbf2052 100644--- a/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/filter_util.dart+++ b/frontend/appflowy_flutter/test/bloc_test/grid_test/filter/filter_util.dart@@ -33,8 +33,8 @@ Future<GridTestContext> createTestFilterGrid(AppFlowyGridTest gridTest) async {}Future<void> editCells(GridTestContext context) async {- final controller0 = await context.makeTextCellController(0);- final controller1 = await context.makeTextCellController(1);+ final controller0 = context.makeTextCellController(0);+ final controller1 = context.makeTextCellController(1);controller0.saveCellData('A');await gridResponseFuture();diff --git a/frontend/appflowy_flutter/test/bloc_test/grid_test/util.dart b/frontend/appflowy_flutter/test/bloc_test/grid_test/util.dartindex 3fe6c6fbe5..62e50161f6 100644--- a/frontend/appflowy_flutter/test/bloc_test/grid_test/util.dart+++ b/frontend/appflowy_flutter/test/bloc_test/grid_test/util.dart@@ -5,10 +5,8 @@ import 'package:appflowy/plugins/database/application/field/field_editor_bloc.daimport 'package:appflowy/plugins/database/application/field/field_info.dart';import 'package:appflowy/plugins/database/application/field/field_service.dart';import 'package:appflowy/plugins/database/application/row/row_cache.dart';-import 'package:appflowy/plugins/database/application/row/row_controller.dart';import 'package:appflowy/plugins/database/application/database_controller.dart';import 'package:appflowy/plugins/database/application/row/row_service.dart';-import 'package:appflowy/plugins/database/grid/application/row/row_bloc.dart';import 'package:appflowy/workspace/application/view/view_service.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:appflowy_backend/protobuf/flowy-database2/field_entities.pb.dart';@@ -25,46 +23,12 @@ class GridTestContext {return gridController.rowCache.rowInfos;}- List<FieldInfo> get fieldContexts => fieldController.fieldInfos;+ List<FieldInfo> get fieldInfos => fieldController.fieldInfos;FieldController get fieldController {return gridController.fieldController;}- Future<CellController> makeCellController(- String fieldId,- int rowIndex,- ) async {- final builder = await makeCellControllerBuilder(fieldId, rowIndex);- return builder.build();- }-- Future<CellControllerBuilder> makeCellControllerBuilder(- String fieldId,- int rowIndex,- ) async {- final RowInfo rowInfo = rowInfos[rowIndex];- final rowCache = gridController.rowCache;-- final rowDataController = RowController(- rowMeta: rowInfo.rowMeta,- viewId: rowInfo.viewId,- rowCache: rowCache,- );-- final rowBloc = RowBloc(- viewId: rowInfo.viewId,- dataController: rowDataController,- rowId: rowInfo.rowMeta.id,- )..add(const RowEvent.initial());- await gridResponseFuture();-- return CellControllerBuilder(- cellContext: rowBloc.state.cellByFieldId[fieldId]!,- cellCache: rowCache.cellCache,- );- }-Future<FieldEditorBloc> createField(FieldType fieldType) async {final editorBloc =await createFieldEditor(databaseController: gridController)@@ -76,52 +40,54 @@ class GridTestContext {}FieldInfo singleSelectFieldContext() {- final fieldInfo = fieldContexts+ final fieldInfo = fieldInfos.firstWhere((element) => element.fieldType == FieldType.SingleSelect);return fieldInfo;}FieldInfo textFieldContext() {- final fieldInfo = fieldContexts+ final fieldInfo = fieldInfos.firstWhere((element) => element.fieldType == FieldType.RichText);return fieldInfo;}FieldInfo checkboxFieldContext() {- final fieldInfo = fieldContexts+ final fieldInfo = fieldInfos.firstWhere((element) => element.fieldType == FieldType.Checkbox);return fieldInfo;}- Future<SelectOptionCellController> makeSelectOptionCellController(+ SelectOptionCellController makeSelectOptionCellController(FieldType fieldType,int rowIndex,- ) async {+ ) {assert(fieldType == FieldType.SingleSelect || fieldType == FieldType.MultiSelect,);-final field =- fieldContexts.firstWhere((element) => element.fieldType == fieldType);- final cellController = await makeCellController(field.id, rowIndex)- as SelectOptionCellController;- return cellController;+ fieldInfos.firstWhere((fieldInfo) => fieldInfo.fieldType == fieldType);+ return makeCellController(+ gridController,+ CellContext(fieldId: field.id, rowId: rowInfos[rowIndex].rowId),+ ).as();}- Future<TextCellController> makeTextCellController(int rowIndex) async {- final field = fieldContexts+ TextCellController makeTextCellController(int rowIndex) {+ final field = fieldInfos.firstWhere((element) => element.fieldType == FieldType.RichText);- final cellController =- await makeCellController(field.id, rowIndex) as TextCellController;- return cellController;+ return makeCellController(+ gridController,+ CellContext(fieldId: field.id, rowId: rowInfos[rowIndex].rowId),+ ).as();}- Future<TextCellController> makeCheckboxCellController(int rowIndex) async {- final field = fieldContexts+ CheckboxCellController makeCheckboxCellController(int rowIndex) {+ final field = fieldInfos.firstWhere((element) => element.fieldType == FieldType.Checkbox);- final cellController =- await makeCellController(field.id, rowIndex) as TextCellController;- return cellController;+ return makeCellController(+ gridController,+ CellContext(fieldId: field.id, rowId: rowInfos[rowIndex].rowId),+ ).as();}}@@ -202,12 +168,11 @@ class AppFlowyGridCellTest {await RowBackendService.createRow(viewId: context.gridView.id);}- Future<SelectOptionCellController> makeSelectOptionCellController(+ SelectOptionCellController makeSelectOptionCellController(FieldType fieldType,int rowIndex,- ) async {- return await context.makeSelectOptionCellController(fieldType, rowIndex);- }+ ) =>+ context.makeSelectOptionCellController(fieldType, rowIndex);}Future<void> gridResponseFuture({int milliseconds = 200}) {diff --git a/frontend/rust-lib/flowy-database2/src/services/field/type_options/type_option.rs b/frontend/rust-lib/flowy-database2/src/services/field/type_options/type_option.rsindex e54db1d58a..e83d33c3f2 100644--- a/frontend/rust-lib/flowy-database2/src/services/field/type_options/type_option.rs+++ b/frontend/rust-lib/flowy-database2/src/services/field/type_options/type_option.rs@@ -16,8 +16,8 @@ use crate::entities::{use crate::services::cell::{CellDataDecoder, FromCellChangeset, ToCellChangeset};use crate::services::field::checklist_type_option::ChecklistTypeOption;use crate::services::field::{- CheckboxTypeOption, DateFormat, DateTypeOption, MultiSelectTypeOption, NumberTypeOption,- RichTextTypeOption, SingleSelectTypeOption, TimeFormat, TimestampTypeOption, URLTypeOption,+ CheckboxTypeOption, DateTypeOption, MultiSelectTypeOption, NumberTypeOption, RichTextTypeOption,+ SingleSelectTypeOption, TimestampTypeOption, URLTypeOption,};use crate::services::filter::FromFilterString;use crate::services::sort::SortCondition;@@ -271,9 +271,8 @@ pub fn default_type_option_data_from_type(field_type: &FieldType) -> TypeOptionDFieldType::DateTime => DateTypeOption::default().into(),FieldType::LastEditedTime | FieldType::CreatedTime => TimestampTypeOption {field_type: *field_type,- date_format: DateFormat::Friendly,- time_format: TimeFormat::TwelveHour,include_time: true,+ ..Default::default()}.into(),FieldType::SingleSelect => SingleSelectTypeOption::default().into(),