Skip to content

Commit 0ab286c

Browse files
committed
Merge branch 'develop'
2 parents a59ef29 + 48407eb commit 0ab286c

File tree

3 files changed

+20
-11
lines changed

3 files changed

+20
-11
lines changed

index.d.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ declare module "react-multi-date-picker" {
176176
selectedDate: DateObject | DateObject[],
177177
currentMonth: object,
178178
isSameDate(arg1: DateObject, arg2: DateObject): boolean
179-
}): object,
179+
}): object | void,
180180
disableMonthPicker?: boolean,
181181
disableYearPicker?: boolean,
182182
/**
@@ -216,9 +216,9 @@ declare module "react-multi-date-picker" {
216216
*
217217
* <DatePicker multiple sort />
218218
*/
219-
sort: boolean,
220-
numberOfMonths: number,
221-
currentDate: DateObject
219+
sort?: boolean,
220+
numberOfMonths?: number,
221+
currentDate?: DateObject
222222
}
223223

224224
interface DatePickerProps {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-multi-date-picker",
3-
"version": "2.2.5",
3+
"version": "2.2.6",
44
"description": "a simple React datepicker component for work with gregorian, persian, arabic and indian calendars",
55
"main": "./build/index.js",
66
"types": "index.d.ts",

src/components/header/header.js

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,19 @@ export default function Header({
1111
customMonths,
1212
numberOfMonths
1313
}) {
14-
let monthNames = []
14+
let monthNames = [],
15+
years = [],
16+
digits = state.date.digits
1517

1618
for (let monthIndex = 0; monthIndex < numberOfMonths; monthIndex++) {
17-
let monthName
18-
let index = state.date.month.index + monthIndex
19+
let monthName,
20+
year = state.date.year,
21+
index = state.date.month.index + monthIndex
1922

20-
if (index > 11) index -= 12
23+
if (index > 11) {
24+
index -= 12
25+
year++
26+
}
2127

2228
if (Array.isArray(customMonths) && customMonths.length >= 12) {
2329
let month = customMonths[index]
@@ -27,7 +33,10 @@ export default function Header({
2733
monthName = state.date.months[index].name
2834
}
2935

36+
year = year.toString().replace(/[0-9]/g, w => digits[w])
37+
3038
monthNames.push(monthName)
39+
years.push(year)
3140
}
3241

3342
return (
@@ -44,13 +53,13 @@ export default function Header({
4453
onClick={() => !disableMonthPicker && toggle("mustShowMonthPicker")}
4554
>
4655
{monthName},
47-
</span>
56+
</span>
4857
}
4958
<span
5059
style={{ cursor: disableYearPicker || state.onlyYearPicker ? "default" : "pointer" }}
5160
onClick={() => !disableYearPicker && toggle("mustShowYearPicker")}
5261
>
53-
{state.date.format("YYYY")}
62+
{years[index]}
5463
</span>
5564
</div>
5665
)

0 commit comments

Comments
 (0)