Skip to content

Update cool_datepicker.dart #6

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
hassanrehman01398 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update cool_datepicker.dart #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 12 additions & 11 deletions lib/cool_datepicker.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class CoolDatepicker extends StatefulWidget {
late List<Map> years = [];
Function onSelected;
List<DateTime>? _selectedItems;
Map<String, DateTime?>? _selectedRangeItem;
Map<String, DateTime?>? selectedRangeItem;
bool isRange;
String format;
int limitCount;
Expand Down Expand Up @@ -75,6 +75,7 @@ class CoolDatepicker extends StatefulWidget {
this.maxYear,
required this.onSelected,
this.isRange = false,
this.selectedRangeItem,
resultIcon,
placeholderTS,
this.isResultIconLabelReverse = false,
Expand Down Expand Up @@ -322,7 +323,7 @@ class _CoolDatepickerState extends State<CoolDatepicker>
getSelectedItems: (selectedItems) {
if (selectedItems is Map) {
setState(() {
widget._selectedRangeItem =
widget.selectedRangeItem =
selectedItems.cast<String, DateTime?>();
rangeLabel = selectedRangeString();
});
Expand All @@ -335,7 +336,7 @@ class _CoolDatepickerState extends State<CoolDatepicker>
}
},
selectedItems: widget._selectedItems,
selectedRangeItem: widget._selectedRangeItem,
selectedRangeItem: widget.selectedRangeItem,
isRange: widget.isRange,
datePickerIconPosition: datePickerIconPosition,
calendarSize: widget.calendarSize,
Expand Down Expand Up @@ -371,7 +372,7 @@ class _CoolDatepickerState extends State<CoolDatepicker>
setState(() {
if (widget.defaultValue != null) {
if (widget.isRange) {
widget._selectedRangeItem = widget.defaultValue;
widget.selectedRangeItem = widget.defaultValue;
rangeLabel = selectedRangeString();
} else {
widget._selectedItems = widget.defaultValue;
Expand Down Expand Up @@ -400,12 +401,12 @@ class _CoolDatepickerState extends State<CoolDatepicker>

String selectedRangeString() {
String result = '';
if (widget._selectedRangeItem!['start'] != null) {
if (widget.selectedRangeItem!['start'] != null) {
result +=
dateTimeToFormat(target: widget._selectedRangeItem!['start']) + ' ~ ';
dateTimeToFormat(target: widget.selectedRangeItem!['start']) + ' ~ ';
}
if (widget._selectedRangeItem!['end'] != null) {
result += dateTimeToFormat(target: widget._selectedRangeItem!['end']);
if (widget.selectedRangeItem!['end'] != null) {
result += dateTimeToFormat(target: widget.selectedRangeItem!['end']);
}
return result;
}
Expand Down Expand Up @@ -456,7 +457,7 @@ class _CoolDatepickerState extends State<CoolDatepicker>
if (widget.isResultLabel)
if ((widget._selectedItems == null ||
widget._selectedItems!.isEmpty) &&
widget._selectedRangeItem == null)
widget.selectedRangeItem == null)
Expanded(
child: SingleChildScrollView(
scrollDirection: Axis.horizontal,
Expand All @@ -466,7 +467,7 @@ class _CoolDatepickerState extends State<CoolDatepicker>
),
)),
if (widget.isResultLabel)
if (widget.isRange && widget._selectedRangeItem != null)
if (widget.isRange && widget.selectedRangeItem != null)
Expanded(
child: SingleChildScrollView(
scrollDirection: Axis.horizontal,
Expand Down Expand Up @@ -513,7 +514,7 @@ class _CoolDatepickerState extends State<CoolDatepicker>
fullSize: MediaQuery.of(context).size,
closeCalendar: (_) {},
selectedItems: widget._selectedItems,
selectedRangeItem: widget._selectedRangeItem,
selectedRangeItem: widget.selectedRangeItem,
parentBuildContext: context,
limitCount: widget.limitCount,
format: widget.format,
Expand Down