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: overlapped scrollbar in calendar (#3075)

Richard Shiue9330df4ce13b
diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_day.dart b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_day.dart
index 20a50d3a2a..28fe449561 100644
--- a/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_day.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_day.dart
@@ -254,18 +254,23 @@ class _EventList extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Flexible(
- child: ListView.separated(
- itemBuilder: (BuildContext context, int index) => EventCard(
- event: events[index],
- viewId: viewId,
- rowCache: rowCache,
- constraints: constraints,
+ child: ScrollConfiguration(
+ behavior: ScrollConfiguration.of(context).copyWith(
+ scrollbars: true,
+ ),
+ child: ListView.separated(
+ itemBuilder: (BuildContext context, int index) => EventCard(
+ event: events[index],
+ viewId: viewId,
+ rowCache: rowCache,
+ constraints: constraints,
+ ),
+ itemCount: events.length,
+ padding: const EdgeInsets.fromLTRB(8.0, 0, 8.0, 8.0),
+ separatorBuilder: (BuildContext context, int index) =>
+ VSpace(GridSize.typeOptionSeparatorHeight),
+ shrinkWrap: true,
),
- itemCount: events.length,
- padding: const EdgeInsets.fromLTRB(8.0, 0, 8.0, 8.0),
- separatorBuilder: (BuildContext context, int index) =>
- VSpace(GridSize.typeOptionSeparatorHeight),
- shrinkWrap: true,
),
);
}
diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_page.dart b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_page.dart
index 4cec3ee78a..71520f5fe5 100644
--- a/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_page.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_page.dart
@@ -190,17 +190,20 @@ class _CalendarPageState extends State<CalendarPage> {
padding: CalendarSize.contentInsets,
child: LayoutBuilder(
// must specify MonthView width for useAvailableVerticalSpace to work properly
- builder: (context, constraints) => MonthView(
- key: _calendarState,
- controller: _eventController,
- width: constraints.maxWidth,
- cellAspectRatio: 0.6,
- startDay: _weekdayFromInt(firstDayOfWeek),
- borderColor: Theme.of(context).dividerColor,
- headerBuilder: _headerNavigatorBuilder,
- weekDayBuilder: _headerWeekDayBuilder,
- cellBuilder: _calendarDayBuilder,
- useAvailableVerticalSpace: widget.shrinkWrap,
+ builder: (context, constraints) => ScrollConfiguration(
+ behavior: ScrollConfiguration.of(context).copyWith(scrollbars: false),
+ child: MonthView(
+ key: _calendarState,
+ controller: _eventController,
+ width: constraints.maxWidth,
+ cellAspectRatio: 0.6,
+ startDay: _weekdayFromInt(firstDayOfWeek),
+ borderColor: Theme.of(context).dividerColor,
+ headerBuilder: _headerNavigatorBuilder,
+ weekDayBuilder: _headerWeekDayBuilder,
+ cellBuilder: _calendarDayBuilder,
+ useAvailableVerticalSpace: widget.shrinkWrap,
+ ),
),
),
);