From 65efef29a61039f65c0bdbf607c1cd771646dacc Mon Sep 17 00:00:00 2001 From: tgpetrov Date: Fri, 1 Nov 2019 10:10:23 +0200 Subject: [PATCH] fix: issue happening on 31st --- src/datetimepicker.android.ts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/datetimepicker.android.ts b/src/datetimepicker.android.ts index 3f88c1b..7163c31 100644 --- a/src/datetimepicker.android.ts +++ b/src/datetimepicker.android.ts @@ -155,6 +155,11 @@ export class DateTimePicker extends DateTimePickerBase { const context = options.context; let dateTime: Date; if (value) { + if (nativePicker instanceof android.widget.DatePicker) { + const minDate = (options).minDate; + const maxDate = (options).maxDate; + value = DateTimePicker._trimDate(value, minDate, maxDate); + } dateTime = new Date(value.getTime()); } else { dateTime = (nativePicker instanceof android.widget.DatePicker) ? getDateToday() : getDateNow(); @@ -188,6 +193,17 @@ export class DateTimePicker extends DateTimePickerBase { } } + private static _trimDate(originalDate: Date, minDate: Date, maxDate: Date) { + let finalDate = originalDate; + if (minDate !== undefined && minDate > finalDate) { + finalDate = minDate; + } + if (maxDate !== undefined && maxDate < finalDate) { + finalDate = maxDate; + } + return finalDate; + } + private static _applyDialogColors(nativeDialog: android.app.AlertDialog, color: Color, backgroundColor: Color) { if (backgroundColor) { nativeDialog.getWindow().setBackgroundDrawable(new android.graphics.drawable.ColorDrawable(backgroundColor.android));