Skip to content

Commit 18b0030

Browse files
committed
fix(calendar): fixes calendar nested picker closes calendar
fixes #4378
1 parent 5f9e33b commit 18b0030

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

src/core/components/calendar/calendar-class.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1604,6 +1604,8 @@ class Calendar extends Framework7Class {
16041604
toolbar: calendar.params.monthPickerToolbar,
16051605
rotateEffect: false,
16061606
toolbarCloseText: calendar.params.monthPickerCloseText,
1607+
renderToolbar: (picker) =>
1608+
`<div class="toolbar toolbar-top"><div class="toolbar-inner"><div class="left"></div><div class="right"><a class="link popover-close"><i class="icon icon-close"></i>${picker.params.toolbarCloseText ? `<span>${picker.params.toolbarCloseText}</span>` : ''}</a></div></div></div>`,
16071609
cols: [
16081610
{
16091611
values,
@@ -1681,6 +1683,8 @@ class Calendar extends Framework7Class {
16811683
toolbar: calendar.params.yearPickerToolbar,
16821684
rotateEffect: false,
16831685
toolbarCloseText: calendar.params.yearPickerCloseText,
1686+
renderToolbar: (picker) =>
1687+
`<div class="toolbar toolbar-top"><div class="toolbar-inner"><div class="left"></div><div class="right"><a class="link popover-close"><i class="icon icon-close"></i>${picker.params.toolbarCloseText ? `<span>${picker.params.toolbarCloseText}</span>` : ''}</a></div></div></div>`,
16841688
cols: [
16851689
{
16861690
values: years,
@@ -1752,6 +1756,8 @@ class Calendar extends Framework7Class {
17521756
toolbar: calendar.params.timePickerToolbar,
17531757
rotateEffect: false,
17541758
toolbarCloseText: calendar.params.timePickerCloseText,
1759+
renderToolbar: (picker) =>
1760+
`<div class="toolbar toolbar-top"><div class="toolbar-inner"><div class="left"></div><div class="right"><a class="link popover-close"><i class="icon icon-close"></i>${picker.params.toolbarCloseText ? `<span>${picker.params.toolbarCloseText}</span>` : ''}</a></div></div></div>`,
17551761
cols: [
17561762
{
17571763
values: hoursArr,

0 commit comments

Comments
 (0)