Skip to content
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

Jump to bottom

refactor: simplify generating dropdown items #111

Merged
merged 1 commit into from
Jun 3, 2019
Merged

refactor: simplify generating dropdown items #111

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
53 changes: 24 additions & 29 deletions src/vaadin-time-picker.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,8 +274,7 @@
* not recommended to use it for better UX experience.
*/
step: {
type: Number,
observer: '__stepChanged'
type: Number
},

/**
Expand Down Expand Up @@ -365,13 +364,12 @@

static get observers() {
return [
'__updateDropdownItems(i18n.*, min, max)'
'__updateDropdownItems(i18n.*, min, max, step)'
];
}

ready() {
super.ready();
this.__updateDropdownItems();

// Not using declarative because we receive an event before text-element shadow is ready,
// thus querySelector in textField.focusElement raises an undefined exception on validate
Expand Down Expand Up @@ -461,41 +459,44 @@
return {hours: (hh < 24) ? hh : 0, minutes: mm, seconds: ss, milliseconds: msec};
}

__updateDropdownItems() {
this.__dropdownItems = this.__generateDropdownList();
__updateDropdownItems(i8n, min, max, step) {
const minTimeObj = this.__validateTime(this.__parseISO(min));
const minSec = this.__getSec(minTimeObj);

const maxTimeObj = this.__validateTime(this.__parseISO(max));
const maxSec = this.__getSec(maxTimeObj);

this.__adjustValue(minSec, maxSec, minTimeObj, maxTimeObj);

this.__dropdownItems = this.__generateDropdownList(minSec, maxSec, step);

if (step !== this.__oldStep) {
this.__oldStep = step;
const parsedObj = this.__validateTime(this.__parseISO(this.value));
this.__updateValue(parsedObj);
}

if (this.value) {
this.__dropdownElement.value = this.i18n.formatTime(this.i18n.parseTime(this.value));
}
}

__generateDropdownList() {
if (this.step < 15 * 60 || !this.__validDayDivisor(this.step)) {
__generateDropdownList(minSec, maxSec, step) {
if (step < 15 * 60 || !this.__validDayDivisor(step)) {
return [];
}

const generatedList = [];

// Default step in overlay items is 1 hour
const step = this.step || 3600;

const minTimeObj = this.__validateTime(this.__parseISO(this.min));
const minSec = this.__getSec(minTimeObj);

const maxTimeObj = this.__validateTime(this.__parseISO(this.max));
const maxSec = this.__getSec(maxTimeObj);

this.__adjustValue(minSec, maxSec, minTimeObj, maxTimeObj);
step = step || 3600;

let time = -step + minSec;
while (time + step >= minSec && time + step <= maxSec) {
const timeObj = this.__validateTime(this.__addStep(time * 1000, step));
time += step;
generatedList.push({
// we only pick items with minute resolution
label: this.i18n.formatTime(timeObj),
// but we set value with step defined resolution
value: this.i18n.formatTime(timeObj)
});
const formatted = this.i18n.formatTime(timeObj);
generatedList.push({label: formatted, value: formatted});
}

return generatedList;
Expand Down Expand Up @@ -587,12 +588,6 @@
return TimePickerElement.properties.i18n.value().parseTime(text);
}

__stepChanged(step) {
this.__updateDropdownItems();
const parsedObj = this.__validateTime(this.__parseISO(this.value));
this.__updateValue(parsedObj);
}

get __inputElement() {
return this.__memoInput ||
(this.__memoInput = this.shadowRoot.querySelector('vaadin-time-picker-text-field'));
Expand Down