Skip to content

add a isPickMonthMode config in CalendarDatePicker2WithActionButtonsConfig #262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
parcool wants to merge 9 commits into
base: main
Choose a base branch
from
Open

add a isPickMonthMode config in CalendarDatePicker2WithActionButtonsConfig #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dcd7ac5
add autoTransitionToDayView.
parcool May 2, 2025
f8a66d2
add autoTransitionToDayView.
parcool May 2, 2025
60d42a0
add autoTransitionToDayView.
parcool May 2, 2025
dab989d
add autoTransitionToDayView.
parcool May 2, 2025
03437bb
move autoTransitionToDayView to isPickMonthMode and adjust relative UI.
parcool May 2, 2025
267ecf0
move autoTransitionToDayView to isPickMonthMode and adjust relative UI.
parcool May 2, 2025
5557da5
add onValueChanged callback after monthChanged.
parcool May 2, 2025
1aec6ce
add onValueChanged callback after yearChanged.
parcool May 2, 2025
2ad69f9
add onValueChanged callback after yearChanged.
parcool May 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions lib/src/models/calendar_date_picker2_config.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ class CalendarDatePicker2Config {
this.dayModeScrollDirection,
this.selectedRangeHighlightBuilder,
this.selectedRangeDecorationPredicate,
this.isPickMonthMode,
}) : calendarType = calendarType ?? CalendarDatePicker2Type.single,
firstDate = DateUtils.dateOnly(firstDate ?? DateTime(1970)),
lastDate =
Expand Down Expand Up @@ -431,6 +432,9 @@ class CalendarDatePicker2Config {
/// Predicate to determine the day widget box decoration for a day in selected range
final SelectedRangeDecorationPredicate? selectedRangeDecorationPredicate;

/// Flag to auto transition to day view when the user selects a month
final bool? isPickMonthMode;

/// Copy the current [CalendarDatePicker2Config] with some new values
CalendarDatePicker2Config copyWith({
CalendarDatePicker2Type? calendarType,
Expand Down Expand Up @@ -504,6 +508,7 @@ class CalendarDatePicker2Config {
Axis? dayModeScrollDirection,
SelectedRangeHighlightBuilder? selectedRangeHighlightBuilder,
SelectedRangeDecorationPredicate? selectedRangeDecorationPredicate,
bool? isPickMonthMode,
}) {
return CalendarDatePicker2Config(
calendarType: calendarType ?? this.calendarType,
Expand Down Expand Up @@ -607,6 +612,7 @@ class CalendarDatePicker2Config {
selectedRangeHighlightBuilder ?? this.selectedRangeHighlightBuilder,
selectedRangeDecorationPredicate: selectedRangeDecorationPredicate ??
this.selectedRangeDecorationPredicate,
isPickMonthMode: isPickMonthMode ?? this.isPickMonthMode,
);
}
}
Expand Down Expand Up @@ -695,6 +701,7 @@ class CalendarDatePicker2WithActionButtonsConfig
this.closeDialogOnCancelTapped,
this.closeDialogOnOkTapped,
this.buttonPadding,
bool? isPickMonthMode,
}) : super(
calendarType: calendarType,
firstDate: firstDate,
Expand Down Expand Up @@ -767,6 +774,7 @@ class CalendarDatePicker2WithActionButtonsConfig
dayModeScrollDirection: dayModeScrollDirection,
selectedRangeHighlightBuilder: selectedRangeHighlightBuilder,
selectedRangeDecorationPredicate: selectedRangeDecorationPredicate,
isPickMonthMode: isPickMonthMode,
);

/// The gap between calendar and action buttons
Expand Down Expand Up @@ -878,6 +886,7 @@ class CalendarDatePicker2WithActionButtonsConfig
Axis? dayModeScrollDirection,
SelectedRangeHighlightBuilder? selectedRangeHighlightBuilder,
SelectedRangeDecorationPredicate? selectedRangeDecorationPredicate,
bool? isPickMonthMode,
}) {
return CalendarDatePicker2WithActionButtonsConfig(
calendarType: calendarType ?? this.calendarType,
Expand Down Expand Up @@ -994,6 +1003,7 @@ class CalendarDatePicker2WithActionButtonsConfig
selectedRangeHighlightBuilder ?? this.selectedRangeHighlightBuilder,
selectedRangeDecorationPredicate: selectedRangeDecorationPredicate ??
this.selectedRangeDecorationPredicate,
isPickMonthMode: isPickMonthMode,
);
}
}
23 changes: 20 additions & 3 deletions lib/src/widgets/calendar_date_picker2.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,10 +228,19 @@ class _CalendarDatePicker2State extends State<CalendarDatePicker2> {

void _handleMonthChanged(DateTime value) {
_vibrate();

setState(() {
_mode = CalendarDatePicker2Mode.day;
if (widget.config.isPickMonthMode != true) {
_mode = CalendarDatePicker2Mode.day;
}

_handleDisplayedMonthDateChanged(value);

_selectedDates.removeLast();
_selectedDates.add(_currentDisplayedMonthDate);
});

widget.onValueChanged?.call(_selectedDates.whereType<DateTime>().toList());
}

void _handleYearChanged(DateTime value) {
Expand All @@ -244,9 +253,17 @@ class _CalendarDatePicker2State extends State<CalendarDatePicker2> {
}

setState(() {
_mode = CalendarDatePicker2Mode.day;
if (widget.config.calendarViewMode == CalendarDatePicker2Mode.month || widget.config.calendarViewMode == CalendarDatePicker2Mode.year) {
_mode = CalendarDatePicker2Mode.month;
} else {
_mode = CalendarDatePicker2Mode.day;
}
_handleDisplayedMonthDateChanged(value, fromYearPicker: true);
});

_selectedDates.removeLast();
_selectedDates.add(value);
widget.onValueChanged?.call(_selectedDates.whereType<DateTime>().toList());
}

void _handleDayChanged(DateTime value) {
Expand Down Expand Up @@ -393,7 +410,7 @@ class _CalendarDatePicker2State extends State<CalendarDatePicker2> {
mode: _mode,
monthDate: _currentDisplayedMonthDate,
onMonthPressed: () {
if (_mode == CalendarDatePicker2Mode.year) {
if (_mode == CalendarDatePicker2Mode.year || widget.config.isPickMonthMode == true) {
_handleModeChanged(CalendarDatePicker2Mode.month);
} else {
_handleModeChanged(
Expand Down