Skip to content

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.

fix(flutter_desktop): grid bug (#7697)

Richard Shiue9e30b1816fe6
diff --git a/frontend/appflowy_flutter/integration_test/desktop/database/database_field_settings_test.dart b/frontend/appflowy_flutter/integration_test/desktop/database/database_field_settings_test.dart
index 9b9434d3d7..a71110f1e0 100644
--- a/frontend/appflowy_flutter/integration_test/desktop/database/database_field_settings_test.dart
+++ b/frontend/appflowy_flutter/integration_test/desktop/database/database_field_settings_test.dart
@@ -15,6 +15,7 @@ void main() {
await tester.initializeAppFlowy();
await tester.tapAnonymousSignInButton();
+ // create a database and add a linked database view
await tester.createNewPageWithNameUnderParent(layout: ViewLayoutPB.Grid);
await tester.tapCreateLinkedDatabaseViewButton(DatabaseLayoutPB.Grid);
@@ -29,6 +30,11 @@ void main() {
await tester.tapHidePropertyButton();
tester.noFieldWithName('New field 1');
+ // create another field, New field 1 to be hidden still
+ await tester.tapNewPropertyButton();
+ await tester.dismissFieldEditor();
+ tester.noFieldWithName('New field 1');
+
// go back to inline database view, expect field to be shown
await tester.tapTabBarLinkedViewByViewName('Untitled');
tester.findFieldWithName('New field 1');
@@ -60,5 +66,40 @@ void main() {
await tester.tapDatabaseSortButton();
await tester.tapCreateSortByFieldType(FieldType.RichText, "New field 1");
});
+
+ testWidgets('field cell width', (tester) async {
+ await tester.initializeAppFlowy();
+ await tester.tapAnonymousSignInButton();
+
+ // create a database and add a linked database view
+ await tester.createNewPageWithNameUnderParent(layout: ViewLayoutPB.Grid);
+ await tester.tapCreateLinkedDatabaseViewButton(DatabaseLayoutPB.Grid);
+
+ // create a field
+ await tester.scrollToRight(find.byType(GridPage));
+ await tester.tapNewPropertyButton();
+ await tester.renameField('New field 1');
+ await tester.dismissFieldEditor();
+
+ // check the width of the field
+ expect(tester.getFieldWidth('New field 1'), 150);
+
+ // change the width of the field
+ await tester.changeFieldWidth('New field 1', 200);
+ expect(tester.getFieldWidth('New field 1'), 205);
+
+ // create another field, New field 1 to be same width
+ await tester.tapNewPropertyButton();
+ await tester.dismissFieldEditor();
+ expect(tester.getFieldWidth('New field 1'), 205);
+
+ // go back to inline database view, expect New field 1 to be 150px
+ await tester.tapTabBarLinkedViewByViewName('Untitled');
+ expect(tester.getFieldWidth('New field 1'), 150);
+
+ // go back to linked database view, expect New field 1 to be 205px
+ await tester.tapTabBarLinkedViewByViewName('Grid');
+ expect(tester.getFieldWidth('New field 1'), 205);
+ });
});
}
diff --git a/frontend/appflowy_flutter/integration_test/shared/database_test_op.dart b/frontend/appflowy_flutter/integration_test/shared/database_test_op.dart
index 9a82c881e0..970965f294 100644
--- a/frontend/appflowy_flutter/integration_test/shared/database_test_op.dart
+++ b/frontend/appflowy_flutter/integration_test/shared/database_test_op.dart
@@ -942,6 +942,31 @@ extension AppFlowyDatabaseTest on WidgetTester {
await pumpAndSettle(const Duration(milliseconds: 200));
}
+ Future<void> changeFieldWidth(String fieldName, double width) async {
+ final field = find.byWidgetPredicate(
+ (widget) => widget is GridFieldCell && widget.fieldInfo.name == fieldName,
+ );
+ await hoverOnWidget(
+ field,
+ onHover: () async {
+ final dragHandle = find.descendant(
+ of: field,
+ matching: find.byType(DragToExpandLine),
+ );
+ await drag(dragHandle, Offset(width - getSize(field).width, 0));
+ await pumpAndSettle(const Duration(milliseconds: 200));
+ },
+ );
+ }
+
+ double getFieldWidth(String fieldName) {
+ final field = find.byWidgetPredicate(
+ (widget) => widget is GridFieldCell && widget.fieldInfo.name == fieldName,
+ );
+
+ return getSize(field).width;
+ }
+
Future<void> findDateEditor(dynamic matcher) async {
final finder = find.byType(DateCellEditor);
expect(finder, matcher);
diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/field/field_controller.dart b/frontend/appflowy_flutter/lib/plugins/database/application/field/field_controller.dart
index 8370bd9bff..93fd69bcfc 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/application/field/field_controller.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/application/field/field_controller.dart
@@ -411,23 +411,28 @@ class FieldController {
/// Listen for field setting changes in the backend.
void _listenOnFieldSettingsChanged() {
FieldInfo? updateFieldSettings(FieldSettingsPB updatedFieldSettings) {
- final List<FieldInfo> newFields = fieldInfos;
- var updatedField = newFields.firstOrNull;
+ final newFields = [...fieldInfos];
- if (updatedField == null) {
+ if (newFields.isEmpty) {
return null;
}
final index = newFields
.indexWhere((field) => field.id == updatedFieldSettings.fieldId);
+
if (index != -1) {
newFields[index] =
newFields[index].copyWith(fieldSettings: updatedFieldSettings);
- updatedField = newFields[index];
+ _fieldNotifier.fieldInfos = newFields;
+ _fieldSettings
+ ..removeWhere(
+ (field) => field.fieldId == updatedFieldSettings.fieldId,
+ )
+ ..add(updatedFieldSettings);
+ return newFields[index];
}
- _fieldNotifier.fieldInfos = newFields;
- return updatedField;
+ return null;
}
_fieldSettingsListener.start(
diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/header/desktop_field_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/header/desktop_field_cell.dart
index 23c2fe1f91..915bf70a61 100755
--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/header/desktop_field_cell.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/header/desktop_field_cell.dart
@@ -108,7 +108,7 @@ class _GridFieldCellState extends State<GridFieldCell> {
top: 0,
bottom: 0,
right: 0,
- child: _DragToExpandLine(),
+ child: DragToExpandLine(),
);
return _GridHeaderCellContainer(
@@ -158,8 +158,11 @@ class _GridHeaderCellContainer extends StatelessWidget {
}
}
-class _DragToExpandLine extends StatelessWidget {
- const _DragToExpandLine();
+@visibleForTesting
+class DragToExpandLine extends StatelessWidget {
+ const DragToExpandLine({
+ super.key,
+ });
@override
Widget build(BuildContext context) {