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: calendar event card not displaying as intended (#3731)

Richard Shiue1793a28cbc61
diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/calendar/application/calendar_event_editor_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/application/calendar_event_editor_bloc.dart
index a19450390e..ecf0aa7f05 100644
--- a/frontend/appflowy_flutter/lib/plugins/database_view/calendar/application/calendar_event_editor_bloc.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/application/calendar_event_editor_bloc.dart
@@ -26,7 +26,12 @@ class CalendarEventEditorBloc
final cells = rowController
.loadData()
.values
- .where((cellContext) => cellContext.isVisible())
+ .where(
+ (cellContext) =>
+ cellContext.isVisible() ||
+ cellContext.fieldId == layoutSettings.fieldId ||
+ cellContext.fieldInfo.isPrimary,
+ )
.toList();
if (!isClosed) {
add(
@@ -50,7 +55,12 @@ class CalendarEventEditorBloc
onRowChanged: (cells, reason) {
if (!isClosed) {
final cellData = cells.values
- .where((cellContext) => cellContext.isVisible())
+ .where(
+ (cellContext) =>
+ cellContext.isVisible() ||
+ cellContext.fieldId == layoutSettings.fieldId ||
+ cellContext.fieldInfo.isPrimary,
+ )
.toList();
add(
CalendarEventEditorEvent.didReceiveCellDatas(cellData),
diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_event_editor.dart b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_event_editor.dart
index 0f893a13e3..1c10a7c00d 100644
--- a/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_event_editor.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_event_editor.dart
@@ -126,9 +126,11 @@ class EventPropertyList extends StatelessWidget {
state.cells.firstWhereOrNull((cell) => cell.fieldInfo.isPrimary);
final dateFieldIndex =
reorderedList.indexWhere((cell) => cell.fieldId == dateFieldId);
+
if (primaryCellContext == null || dateFieldIndex == -1) {
return const SizedBox.shrink();
}
+
reorderedList.insert(0, reorderedList.removeAt(dateFieldIndex));
final children = <Widget>[