i2 - Add autoClose after invoke action

linagora · Mar 21, 2023 · 04972c5 · 04972c5
1 parent a0aa143
commit 04972c5
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/lib/material_date_range_picker_dialog.dart b/lib/material_date_range_picker_dialog.dart
@@ -21,6 +21,7 @@ class MaterialDateRangePickerDialog {
       String? last30daysTitle,
       String? last6monthsTitle,
       String? lastYearTitle,
+      bool autoClose = true,
       SelectDateRangeActionCallback? selectDateRangeActionCallback
     }
   ) {
@@ -56,6 +57,7 @@ class MaterialDateRangePickerDialog {
             startDate: initStartDate,
             endDate: initEndDate,
             radius: radius,
+            autoClose: autoClose,
             selectDateRangeActionCallback: selectDateRangeActionCallback
           ),
         ));
@@ -69,6 +71,7 @@ class MaterialDateRangePickerDialog {
       String? title,
       DateTime? currentDate,
       double? radius,
+      bool autoClose = true,
       SelectDateActionCallback? selectDateActionCallback
     }
   ) {
@@ -95,6 +98,7 @@ class MaterialDateRangePickerDialog {
           child: SingleViewDatePicker(
             title: title,
             radius: radius,
+            autoClose: autoClose,
             currentDate: currentDate,
             selectDateActionCallback: selectDateActionCallback
           ),

diff --git a/lib/multiple_view_date_range_picker.dart b/lib/multiple_view_date_range_picker.dart
@@ -35,6 +35,7 @@ class MultipleViewDateRangePicker extends StatefulWidget {
   final DateTime? endDate;
   final List<Widget>? customDateRangeButtons;
   final double? radius;
+  final bool autoClose;
 
   const MultipleViewDateRangePicker({
     Key? key,
@@ -53,7 +54,8 @@ class MultipleViewDateRangePicker extends StatefulWidget {
     this.startDateInputController,
     this.endDateInputController,
     this.customDateRangeButtons,
-    this.radius
+    this.radius,
+    this.autoClose = true
   }) : super(key: key);
 
   @override
@@ -395,7 +397,9 @@ class _MultipleViewDateRangePickerState extends State<MultipleViewDateRangePicke
             widget.confirmText,
             onTap: () {
               widget.selectDateRangeActionCallback?.call(_startDate, _endDate);
-              Navigator.maybeOf(context)?.maybePop();
+              if (widget.autoClose) {
+                Navigator.maybeOf(context)?.maybePop();
+              }
             },
           ),
         ),
@@ -457,7 +461,9 @@ class _MultipleViewDateRangePickerState extends State<MultipleViewDateRangePicke
             padding: const EdgeInsets.symmetric(horizontal: 20),
             onTap: () {
               widget.selectDateRangeActionCallback?.call(_startDate, _endDate);
-              Navigator.maybeOf(context)?.maybePop();
+              if (widget.autoClose) {
+                Navigator.maybeOf(context)?.maybePop();
+              }
             },
           )
         ]),

diff --git a/lib/single_view_date_picker.dart b/lib/single_view_date_picker.dart
@@ -15,14 +15,16 @@ class SingleViewDatePicker extends StatelessWidget {
   final DateRangePickerController? datePickerController;
   final DateTime? currentDate;
   final double? radius;
+  final bool autoClose;
 
   const SingleViewDatePicker({
     Key? key,
     this.title,
     this.currentDate,
     this.selectDateActionCallback,
     this.datePickerController,
-    this.radius
+    this.radius,
+    this.autoClose = true
   }) : super(key: key);
 
   @override
@@ -165,6 +167,8 @@ class SingleViewDatePicker extends StatelessWidget {
       final startDate = pickerDateRange.startDate;
       selectDateActionCallback?.call(startDate);
     }
-    Navigator.maybeOf(context)?.maybePop();
+    if (autoClose) {
+      Navigator.maybeOf(context)?.maybePop();
+    }
   }
 }