Skip to content

Commit f183169

Browse files
authored
fix: 🐛 update lastOffset and fix full day event position when fullHeaderTitle is empty (#368)
1 parent 21dfbe0 commit f183169

File tree

2 files changed

+24
-18
lines changed

2 files changed

+24
-18
lines changed

lib/src/day_view/day_view.dart

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,8 @@ class DayViewState<T extends Object?> extends State<DayView<T>> {
354354
@override
355355
void initState() {
356356
super.initState();
357-
_lastScrollOffset = widget.scrollOffset ?? 0.0;
357+
_lastScrollOffset = widget.scrollOffset ??
358+
widget.startDuration.inMinutes * widget.heightPerMinute;
358359

359360
_reloadCallback = _reload;
360361
_setDateRange();
@@ -365,8 +366,8 @@ class DayViewState<T extends Object?> extends State<DayView<T>> {
365366

366367
_calculateHeights();
367368
_scrollController = ScrollController(
368-
initialScrollOffset: widget.scrollOffset ??
369-
widget.startDuration.inMinutes * widget.heightPerMinute);
369+
initialScrollOffset: _lastScrollOffset,
370+
);
370371
_pageController = PageController(initialPage: _currentIndex);
371372
_eventArranger = widget.eventArranger ?? SideEventArranger<T>();
372373
_assignBuilders();

lib/src/week_view/_internal_week_view_page.dart

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -293,21 +293,26 @@ class _InternalWeekViewPageState<T extends Object?>
293293
child: Row(
294294
crossAxisAlignment: CrossAxisAlignment.center,
295295
children: [
296-
if (widget.fullDayHeaderTitle.isNotEmpty)
297-
Container(
298-
width: widget.timeLineWidth +
299-
widget.hourIndicatorSettings.offset,
300-
padding: const EdgeInsets.symmetric(
301-
vertical: 2,
302-
horizontal: 1,
303-
),
304-
child: Text(
305-
widget.fullDayHeaderTitle,
306-
textAlign: widget.fullDayHeaderTextConfig.textAlign,
307-
maxLines: widget.fullDayHeaderTextConfig.maxLines,
308-
overflow: widget.fullDayHeaderTextConfig.textOverflow,
309-
),
310-
),
296+
SizedBox(
297+
width: widget.timeLineWidth +
298+
widget.hourIndicatorSettings.offset,
299+
child: widget.fullDayHeaderTitle.isNotEmpty
300+
? Padding(
301+
padding: const EdgeInsets.symmetric(
302+
vertical: 2,
303+
horizontal: 1,
304+
),
305+
child: Text(
306+
widget.fullDayHeaderTitle,
307+
textAlign:
308+
widget.fullDayHeaderTextConfig.textAlign,
309+
maxLines: widget.fullDayHeaderTextConfig.maxLines,
310+
overflow:
311+
widget.fullDayHeaderTextConfig.textOverflow,
312+
),
313+
)
314+
: SizedBox.shrink(),
315+
),
311316
...List.generate(
312317
filteredDates.length,
313318
(index) {

0 commit comments

Comments
 (0)