Mirrored_Repos/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-08-30 18:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: calendar event card not displaying as intended (#3731)

Browse Source
This commit is contained in:
Richard Shiue 2023-10-19 18:19:50 +08:00 committed by GitHub
parent e565d0ee32
commit 1793a28cbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/appflowy_flutter/lib/plugins/database_view/calendar/application/calendar_event_editor_bloc.dart
View File

@ -26,7 +26,12 @@ class CalendarEventEditorBloc
final cells = rowController final cells = rowController
.loadData() .loadData()
.values .values
.where((cellContext) => cellContext.isVisible()) .where(
(cellContext) =>
cellContext.isVisible() ||
cellContext.fieldId == layoutSettings.fieldId ||
cellContext.fieldInfo.isPrimary,
)
.toList(); .toList();
if (!isClosed) { if (!isClosed) {
add( add(
@ -50,7 +55,12 @@ class CalendarEventEditorBloc
onRowChanged: (cells, reason) { onRowChanged: (cells, reason) {
if (!isClosed) { if (!isClosed) {
final cellData = cells.values final cellData = cells.values
.where((cellContext) => cellContext.isVisible()) .where(
(cellContext) =>
cellContext.isVisible() ||
cellContext.fieldId == layoutSettings.fieldId ||
cellContext.fieldInfo.isPrimary,
)
.toList(); .toList();
add( add(
CalendarEventEditorEvent.didReceiveCellDatas(cellData), CalendarEventEditorEvent.didReceiveCellDatas(cellData),

2
frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_event_editor.dart
View File

@ -126,9 +126,11 @@ class EventPropertyList extends StatelessWidget {
state.cells.firstWhereOrNull((cell) => cell.fieldInfo.isPrimary); state.cells.firstWhereOrNull((cell) => cell.fieldInfo.isPrimary);
final dateFieldIndex = final dateFieldIndex =
reorderedList.indexWhere((cell) => cell.fieldId == dateFieldId); reorderedList.indexWhere((cell) => cell.fieldId == dateFieldId);
if (primaryCellContext == null || dateFieldIndex == -1) { if (primaryCellContext == null || dateFieldIndex == -1) {
return const SizedBox.shrink(); return const SizedBox.shrink();
} }
reorderedList.insert(0, reorderedList.removeAt(dateFieldIndex)); reorderedList.insert(0, reorderedList.removeAt(dateFieldIndex));
final children = <Widget>[ final children = <Widget>[