Ensure the provided startYear and endYear in DateTime are used …

…properly (#637)
bdlukaa · Dec 1, 2022 · 4184c6f · 4184c6f
2 parents 2273483 + f37b5a2
commit 4184c6f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## [next]
+
+- Ensure the provided `startYear` and `endYear` in `DateTime` are used properly ([#627](https://github.com/bdlukaa/fluent_ui/issues/627))
+- Fix left arrow key not moving to parent item on collapsed `TreeViewItem` ([#632](https://github.com/bdlukaa/fluent_ui/issues/632)) 
+
 ## 4.1.0
 
 - Fixed `TreeView` selection state behavior for items that are not expanded ([#578](https://github.com/bdlukaa/fluent_ui/issues/578))
@@ -8,7 +13,6 @@
 - Ensure the TabView scroll controller has clients before using it ([#615](https://github.com/bdlukaa/fluent_ui/issues/615))
 - TabView now waits a time to resize after closed ([#617](https://github.com/bdlukaa/fluent_ui/issues/617))
 - `ToggleButton` border width is uniform ([#610](https://github.com/bdlukaa/fluent_ui/issues/610))
-- Fix left arrow key not moving to parent item on collapsed `TreeViewItem` ([#632](https://github.com/bdlukaa/fluent_ui/issues/632)) 
 
 ## 4.0.3+1
 

diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -91,7 +91,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "4.2.0"
+    version: "4.1.0"
   flutter:
     dependency: "direct main"
     description: flutter

diff --git a/lib/src/controls/form/pickers/date_picker.dart b/lib/src/controls/form/pickers/date_picker.dart
@@ -132,6 +132,7 @@ class DatePicker extends StatefulWidget {
   /// If null, the order is based on the current locale.
   ///
   /// See also:
+  ///
   ///  * [getDateOrderFromLocale], which returns the order of the fields based
   ///    on the current locale
   final List<DatePickerField>? fieldOrder;
@@ -158,7 +159,10 @@ class DatePicker extends StatefulWidget {
       ..add(ObjectFlagProperty.has('focusNode', focusNode))
       ..add(
           FlagProperty('autofocus', value: autofocus, ifFalse: 'manual focus'))
-      ..add(DoubleProperty('popupHeight', popupHeight));
+      ..add(DoubleProperty('popupHeight', popupHeight,
+          defaultValue: kPickerPopupHeight))
+      ..add(DiagnosticsProperty<Locale>('locale', locale))
+      ..add(IterableProperty<DatePickerField>('fieldOrder', fieldOrder));
   }
 }
 
@@ -170,8 +174,8 @@ class _DatePickerState extends State<DatePicker> {
   FixedExtentScrollController? _yearController;
 
   int get startYear =>
-      ((widget.startYear ?? DateTime.now().year) - 100).toInt();
-  int get endYear => ((widget.endYear ?? DateTime.now().year) + 25).toInt();
+      (widget.startYear ?? (DateTime.now().year - 100)).toInt();
+  int get endYear => (widget.endYear ?? (DateTime.now().year + 25)).toInt();
 
   int get currentYear {
     return List.generate(endYear - startYear, (index) {