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.

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

Add 'todayInstantiator' property to allow custom today's Date creation #1083

Merged
merged 3 commits into from Nov 14, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions docs/pages/components/datepicker/api/datepicker.js
Expand Up @@ -22,6 +22,13 @@ export default [
values: '—',
default: '<code>(date) => new Date(Date.parse(date))</code>'
},
{
name: '<code>date-creator</code>',
description: 'Function used internally to create a new Date instance',
type: 'Function',
values: '—',
default: '<code>() => new Date()</code>'
},
{
name: '<code>min-date</code>',
description: 'Earliest date available for selection',
Expand Down
7 changes: 7 additions & 0 deletions docs/pages/installation/api/constructor-options.js
Expand Up @@ -86,6 +86,13 @@ export default [
values: '—',
default: '<code>Date.parse(date)</code>'
},
{
name: '<code>defaultDateCreator</code>',
description: `Default datepicker <code>date-creator</code> attribute`,
type: 'Function',
values: '—',
default: '<code>new Date()</code>'
},
{
name: '<code>defaultDayNames</code>',
description: `Default datepicker <code>day-names</code> attribute`,
Expand Down
19 changes: 16 additions & 3 deletions src/components/datepicker/Datepicker.vue
Expand Up @@ -109,6 +109,7 @@
:selectable-dates="selectableDates"
:events="events"
:indicators="indicators"
:date-creator="dateCreator"
@close="$refs.dropdown.isActive = false"/>

<footer
Expand Down Expand Up @@ -257,6 +258,16 @@
}
}
},
dateCreator: {
type: Function,
default: () => {
if (typeof config.defaultDateCreator === 'function') {
return config.defaultDateCreator()
} else {
return new Date()
}
}
},
mobileNative: {
type: Boolean,
default: () => {
Expand All @@ -271,7 +282,7 @@
}
},
data() {
const focusedDate = this.value || this.focusedDate || new Date()
const focusedDate = this.value || this.focusedDate || this.dateCreator()

return {
dateSelected: this.value,
Expand All @@ -291,7 +302,9 @@
listOfYears() {
const latestYear = this.maxDate
? this.maxDate.getFullYear()
: (Math.max(new Date().getFullYear(), this.focusedDateData.year) + 3)
: (Math.max(
this.dateCreator().getFullYear(),
this.focusedDateData.year) + 3)

const earliestYear = this.minDate
? this.minDate.getFullYear() : 1900
Expand Down Expand Up @@ -328,7 +341,7 @@
* Update internal focusedDateData
*/
dateSelected(value) {
const currentDate = !value ? new Date() : value
const currentDate = !value ? this.dateCreator() : value
this.focusedDateData = {
month: currentDate.getMonth(),
year: currentDate.getFullYear()
Expand Down
2 changes: 2 additions & 0 deletions src/components/datepicker/DatepickerTable.vue
Expand Up @@ -23,6 +23,7 @@
:selectable-dates="selectableDates"
:events="eventsInThisWeek(week, index)"
:indicators="indicators"
:date-creator="dateCreator"
@select="updateSelectedDate"/>
</div>
</section>
Expand All @@ -47,6 +48,7 @@
maxDate: Date,
focused: Object,
disabled: Boolean,
dateCreator: Function,
unselectableDates: Array,
unselectableDaysOfWeek: Array,
selectableDates: Array
Expand Down
5 changes: 4 additions & 1 deletion src/components/datepicker/DatepickerTableRow.spec.js
Expand Up @@ -14,7 +14,10 @@ describe('BDatepickerTableRow', () => {
new Date('Fri Jan 05 2018 00:00:00 GMT-0200 (-02)'),
new Date('Sat Jan 06 2018 00:00:00 GMT-0200 (-02)')
],
month: 12
month: 12,
dateCreator: function () {
return new Date()
}
}
})
expect(wrapper.name()).toBe('BDatepickerTableRow')
Expand Down
5 changes: 3 additions & 2 deletions src/components/datepicker/DatepickerTableRow.vue
Expand Up @@ -54,7 +54,8 @@
unselectableDaysOfWeek: Array,
selectableDates: Array,
events: Array,
indicators: String
indicators: String,
dateCreator: Function
},
methods: {
/*
Expand Down Expand Up @@ -154,7 +155,7 @@

return {
'is-selected': dateMatch(day, this.selectedDate),
'is-today': dateMatch(day, new Date()),
'is-today': dateMatch(day, this.dateCreator()),
'is-selectable': this.selectableDate(day) && !this.disabled,
'is-unselectable': !this.selectableDate(day) || this.disabled
}
Expand Down
1 change: 1 addition & 0 deletions src/utils/config.js
Expand Up @@ -10,6 +10,7 @@ let config = {
defaultInputAutocomplete: 'on',
defaultDateFormatter: null,
defaultDateParser: null,
defaultDateCreator: null,
defaultDayNames: null,
defaultMonthNames: null,
defaultFirstDayOfWeek: null,
Expand Down
1 change: 1 addition & 0 deletions types/index.d.ts
Expand Up @@ -26,6 +26,7 @@ export declare type BuefyConfig = {
defaultInputAutocomplete: 'on' | 'off';
defaultDateFormatter?: string;
defaultDateParser?: string;
defaultDateCreator?: string;
defaultDayNames?: string;
defaultMonthNames?: string;
defaultFirstDayOfWeek?: string;
Expand Down