Skip to content

Commit

Permalink
fix(android): changing picker minDate/maxDate after open (#11622)
Browse files Browse the repository at this point in the history
Changing picker's minDate/maxDate after open would not let user choose value between new range.

Fixes TIMOB-27625
  • Loading branch information
jquick-axway committed Apr 28, 2020
1 parent 0f40de6 commit 8e8bcc6
Show file tree
Hide file tree
Showing 2 changed files with 117 additions and 32 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ public class TiUIDatePicker extends TiUIView implements OnDateChangedListener
private boolean suppressChangeEvent = false;
private static final String TAG = "TiUIDatePicker";

protected Date minDate, maxDate;
protected Date minDate;
protected Date maxDate;
protected int minuteInterval;

public TiUIDatePicker(TiViewProxy proxy)
Expand Down Expand Up @@ -81,29 +82,15 @@ public void processProperties(KrollDict d)
valueExistsInProxy = true;
}
if (d.containsKey(TiC.PROPERTY_MIN_DATE)) {
Calendar minDateCalendar = Calendar.getInstance();
minDateCalendar.setTime((Date) d.get(TiC.PROPERTY_MIN_DATE));
minDateCalendar.set(Calendar.HOUR_OF_DAY, 0);
minDateCalendar.set(Calendar.MINUTE, 0);
minDateCalendar.set(Calendar.SECOND, 0);
minDateCalendar.set(Calendar.MILLISECOND, 0);

this.minDate = minDateCalendar.getTime();
picker.setMinDate(minDateCalendar.getTimeInMillis());
this.minDate = createDateWithoutTimeFrom((Date) d.get(TiC.PROPERTY_MIN_DATE));
picker.setMinDate(this.minDate.getTime());
}
if (d.containsKey(TiC.PROPERTY_CALENDAR_VIEW_SHOWN)) {
setCalendarView(TiConvert.toBoolean(d, TiC.PROPERTY_CALENDAR_VIEW_SHOWN));
}
if (d.containsKey(TiC.PROPERTY_MAX_DATE)) {
Calendar maxDateCalendar = Calendar.getInstance();
maxDateCalendar.setTime((Date) d.get(TiC.PROPERTY_MAX_DATE));
maxDateCalendar.set(Calendar.HOUR_OF_DAY, 0);
maxDateCalendar.set(Calendar.MINUTE, 0);
maxDateCalendar.set(Calendar.SECOND, 0);
maxDateCalendar.set(Calendar.MILLISECOND, 0);

this.maxDate = maxDateCalendar.getTime();
picker.setMaxDate(maxDateCalendar.getTimeInMillis());
this.maxDate = createDateWithoutTimeFrom((Date) d.get(TiC.PROPERTY_MAX_DATE));
picker.setMaxDate(this.maxDate.getTime());
}
if (d.containsKey(TiC.PROPERTY_MINUTE_INTERVAL)) {
int mi = d.getInt(TiC.PROPERTY_MINUTE_INTERVAL);
Expand Down Expand Up @@ -136,13 +123,14 @@ public void propertyChanged(String key, Object oldValue, Object newValue, KrollP
if (key.equals(TiC.PROPERTY_VALUE)) {
Date date = (Date) newValue;
setValue(date.getTime());
}
if (key.equals(TiC.PROPERTY_CALENDAR_VIEW_SHOWN)) {
} else if (key.equals(TiC.PROPERTY_CALENDAR_VIEW_SHOWN)) {
setCalendarView(TiConvert.toBoolean(newValue));
} else if (TiC.PROPERTY_MIN_DATE.equals(key)) {
((DatePicker) getNativeView()).setMinDate(TiConvert.toDate(newValue).getTime());
this.minDate = createDateWithoutTimeFrom((Date) newValue);
((DatePicker) getNativeView()).setMinDate(this.minDate.getTime());
} else if (TiC.PROPERTY_MAX_DATE.equals(key)) {
((DatePicker) getNativeView()).setMaxDate(TiConvert.toDate(newValue).getTime());
this.maxDate = createDateWithoutTimeFrom((Date) newValue);
((DatePicker) getNativeView()).setMaxDate(this.maxDate.getTime());
}
super.propertyChanged(key, oldValue, newValue, proxy);
}
Expand All @@ -158,13 +146,13 @@ public void onDateChanged(DatePicker picker, int year, int monthOfYear, int dayO
targetCalendar.set(Calendar.SECOND, 0);
targetCalendar.set(Calendar.MILLISECOND, 0);

if ((null != minDate) && (targetCalendar.getTime().before(minDate))) {
targetCalendar.setTime(minDate);
setValue(minDate.getTime(), true);
if ((null != this.minDate) && (targetCalendar.getTime().before(this.minDate))) {
targetCalendar.setTime(this.minDate);
setValue(this.minDate.getTime(), true);
}
if ((null != maxDate) && (targetCalendar.getTime().after(maxDate))) {
targetCalendar.setTime(maxDate);
setValue(maxDate.getTime(), true);
if ((null != this.maxDate) && (targetCalendar.getTime().after(this.maxDate))) {
targetCalendar.setTime(this.maxDate);
setValue(this.maxDate.getTime(), true);
}

Date newTime = targetCalendar.getTime();
Expand Down Expand Up @@ -208,9 +196,22 @@ public void setValue(long value, boolean suppressEvent)

public void setCalendarView(boolean value)
{
if (Build.VERSION.SDK_INT >= 11) {
DatePicker picker = (DatePicker) getNativeView();
picker.setCalendarViewShown(value);
DatePicker picker = (DatePicker) getNativeView();
picker.setCalendarViewShown(value);
}

private Date createDateWithoutTimeFrom(Date value)
{
if (value == null) {
return null;
}

Calendar calendar = Calendar.getInstance();
calendar.setTime(value);
calendar.set(Calendar.HOUR_OF_DAY, 0);
calendar.set(Calendar.MINUTE, 0);
calendar.set(Calendar.SECOND, 0);
calendar.set(Calendar.MILLISECOND, 0);
return calendar.getTime();
}
}
84 changes: 84 additions & 0 deletions tests/Resources/ti.ui.picker.addontest.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
/*
* Appcelerator Titanium Mobile
* Copyright (c) 2011-2018 by Appcelerator, Inc. All Rights Reserved.
* Licensed under the terms of the Apache Public License
* Please see the LICENSE included with this distribution for details.
*/
/* eslint-env mocha */
/* eslint no-unused-expressions: "off" */
'use strict';
var should = require('./utilities/assertions');

describe('Titanium.UI.Picker', function () {
var win;

this.timeout(10000);

afterEach(function (done) {
if (win) {
// If `win` is already closed, we're done.
let t = setTimeout(function () {
if (win) {
win = null;
done();
}
}, 3000);

win.addEventListener('close', function listener () {
clearTimeout(t);

if (win) {
win.removeEventListener('close', listener);
}
win = null;
done();
});
win.close();
} else {
win = null;
done();
}
});

it('minDate/maxDate - change after open', (finish) => {
let minDate = new Date(2020, 4, 1);
let maxDate = new Date(2020, 6, 31);
const picker = Ti.UI.createPicker({
type: Ti.UI.PICKER_TYPE_DATE,
minDate: minDate,
maxDate: maxDate,
value: new Date(2020, 5, 1)
});

win = Ti.UI.createWindow();
win.addEventListener('open', () => {
try {
should(picker.minDate).be.eql(minDate);
should(picker.maxDate).be.eql(maxDate);
should(picker.value.getTime()).be.aboveOrEqual(minDate.getTime());
should(picker.value.getTime()).be.belowOrEqual(maxDate.getTime());
minDate = new Date(2018, 0, 1);
maxDate = new Date(2018, 2, 31);
picker.minDate = minDate;
picker.maxDate = maxDate;
picker.value = new Date(2018, 1, 1); // Used to crash Android after changing range.
} catch (err) {
finish(err);
}

setTimeout(() => {
try {
should(picker.minDate).be.eql(minDate);
should(picker.maxDate).be.eql(maxDate);
should(picker.value.getTime()).be.aboveOrEqual(minDate.getTime());
should(picker.value.getTime()).be.belowOrEqual(maxDate.getTime());
finish();
} catch (err) {
finish(err);
}
}, 1);
});
win.add(picker);
win.open();
});
});

0 comments on commit 8e8bcc6

Please sign in to comment.