Skip to content

Commit

Permalink
fix(calendar): resolve scroll and flex layout (#989)
Browse files Browse the repository at this point in the history 
* fix(calendar): resolve scroll and flex layout

* test(calendar): update snapshots
  • Loading branch information
@LeeJim
LeeJim authored Nov 7, 2022
1 parent 854b898 commit 81adfbb
Show file tree
Hide file tree
Showing 3 changed files with 103 additions and 74 deletions.
57 changes: 24 additions & 33 deletions src/calendar/__test__/__snapshots__/index.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,12 @@ exports[`calendar :base 1`] = `
六
</wx-view>
</wx-view>
<wx-view
<wx-scroll-view
class="t-calendar__months"
enhanced="{{true}}"
scrollWithAnimation="{{true}}"
scrollY="{{true}}"
showScrollbar="{{false}}"
>
<wx-view
class="t-calendar__month"
Expand All @@ -96,6 +100,24 @@ exports[`calendar :base 1`] = `
<wx-view
class="t-calendar__dates"
>
<wx-view
class="t-calendar__dates-item"
/>
<wx-view
class="t-calendar__dates-item"
/>
<wx-view
class="t-calendar__dates-item"
/>
<wx-view
class="t-calendar__dates-item"
/>
<wx-view
class="t-calendar__dates-item"
/>
<wx-view
class="t-calendar__dates-item"
/>
<wx-view
class="t-calendar__dates-item t-calendar__dates-item--"
data-date="{{
Expand All @@ -107,7 +129,6 @@ exports[`calendar :base 1`] = `
}}"
data-month="{{9}}"
data-year="{{2022}}"
style="margin-left: 294px"
bind:tap="handleSelect"
>
Expand All @@ -125,7 +146,6 @@ exports[`calendar :base 1`] = `
}}"
data-month="{{9}}"
data-year="{{2022}}"
style="margin-left: 0"
bind:tap="handleSelect"
>
Expand All @@ -143,7 +163,6 @@ exports[`calendar :base 1`] = `
}}"
data-month="{{9}}"
data-year="{{2022}}"
style="margin-left: 0"
bind:tap="handleSelect"
>
Expand All @@ -161,7 +180,6 @@ exports[`calendar :base 1`] = `
}}"
data-month="{{9}}"
data-year="{{2022}}"
style="margin-left: 0"
bind:tap="handleSelect"
>
Expand All @@ -179,7 +197,6 @@ exports[`calendar :base 1`] = `
}}"
data-month="{{9}}"
data-year="{{2022}}"
style="margin-left: 0"
bind:tap="handleSelect"
>
Expand All @@ -197,7 +214,6 @@ exports[`calendar :base 1`] = `
}}"
data-month="{{9}}"
data-year="{{2022}}"
style="margin-left: 0"
bind:tap="handleSelect"
>
Expand All @@ -215,7 +231,6 @@ exports[`calendar :base 1`] = `
}}"
data-month="{{9}}"
data-year="{{2022}}"
style="margin-left: 0"
bind:tap="handleSelect"
>
Expand All @@ -233,7 +248,6 @@ exports[`calendar :base 1`] = `
}}"
data-month="{{9}}"
data-year="{{2022}}"
style="margin-left: 0"
bind:tap="handleSelect"
>
Expand All @@ -251,7 +265,6 @@ exports[`calendar :base 1`] = `
}}"
data-month="{{9}}"
data-year="{{2022}}"
style="margin-left: 0"
bind:tap="handleSelect"
>
Expand All @@ -269,7 +282,6 @@ exports[`calendar :base 1`] = `
}}"
data-month="{{9}}"
data-year="{{2022}}"
style="margin-left: 0"
bind:tap="handleSelect"
>
Expand All @@ -287,7 +299,6 @@ exports[`calendar :base 1`] = `
}}"
data-month="{{9}}"
data-year="{{2022}}"
style="margin-left: 0"
bind:tap="handleSelect"
>
Expand All @@ -305,7 +316,6 @@ exports[`calendar :base 1`] = `
}}"
data-month="{{9}}"
data-year="{{2022}}"
style="margin-left: 0"
bind:tap="handleSelect"
>
Expand All @@ -323,7 +333,6 @@ exports[`calendar :base 1`] = `
}}"
data-month="{{9}}"
data-year="{{2022}}"
style="margin-left: 0"
bind:tap="handleSelect"
>
Expand All @@ -341,7 +350,6 @@ exports[`calendar :base 1`] = `
}}"
data-month="{{9}}"
data-year="{{2022}}"
style="margin-left: 0"
bind:tap="handleSelect"
>
Expand All @@ -359,7 +367,6 @@ exports[`calendar :base 1`] = `
}}"
data-month="{{9}}"
data-year="{{2022}}"
style="margin-left: 0"
bind:tap="handleSelect"
>
Expand All @@ -377,7 +384,6 @@ exports[`calendar :base 1`] = `
}}"
data-month="{{9}}"
data-year="{{2022}}"
style="margin-left: 0"
bind:tap="handleSelect"
>
Expand All @@ -395,7 +401,6 @@ exports[`calendar :base 1`] = `
}}"
data-month="{{9}}"
data-year="{{2022}}"
style="margin-left: 0"
bind:tap="handleSelect"
>
Expand All @@ -413,7 +418,6 @@ exports[`calendar :base 1`] = `
}}"
data-month="{{9}}"
data-year="{{2022}}"
style="margin-left: 0"
bind:tap="handleSelect"
>
Expand All @@ -431,7 +435,6 @@ exports[`calendar :base 1`] = `
}}"
data-month="{{9}}"
data-year="{{2022}}"
style="margin-left: 0"
bind:tap="handleSelect"
>
Expand All @@ -449,7 +452,6 @@ exports[`calendar :base 1`] = `
}}"
data-month="{{9}}"
data-year="{{2022}}"
style="margin-left: 0"
bind:tap="handleSelect"
>
Expand All @@ -467,7 +469,6 @@ exports[`calendar :base 1`] = `
}}"
data-month="{{9}}"
data-year="{{2022}}"
style="margin-left: 0"
bind:tap="handleSelect"
>
Expand All @@ -485,7 +486,6 @@ exports[`calendar :base 1`] = `
}}"
data-month="{{9}}"
data-year="{{2022}}"
style="margin-left: 0"
bind:tap="handleSelect"
>
Expand All @@ -503,7 +503,6 @@ exports[`calendar :base 1`] = `
}}"
data-month="{{9}}"
data-year="{{2022}}"
style="margin-left: 0"
bind:tap="handleSelect"
>
Expand All @@ -521,7 +520,6 @@ exports[`calendar :base 1`] = `
}}"
data-month="{{9}}"
data-year="{{2022}}"
style="margin-left: 0"
bind:tap="handleSelect"
>
Expand All @@ -539,7 +537,6 @@ exports[`calendar :base 1`] = `
}}"
data-month="{{9}}"
data-year="{{2022}}"
style="margin-left: 0"
bind:tap="handleSelect"
>
Expand All @@ -557,7 +554,6 @@ exports[`calendar :base 1`] = `
}}"
data-month="{{9}}"
data-year="{{2022}}"
style="margin-left: 0"
bind:tap="handleSelect"
>
Expand All @@ -575,7 +571,6 @@ exports[`calendar :base 1`] = `
}}"
data-month="{{9}}"
data-year="{{2022}}"
style="margin-left: 0"
bind:tap="handleSelect"
>
Expand All @@ -593,7 +588,6 @@ exports[`calendar :base 1`] = `
}}"
data-month="{{9}}"
data-year="{{2022}}"
style="margin-left: 0"
bind:tap="handleSelect"
>
Expand All @@ -611,7 +605,6 @@ exports[`calendar :base 1`] = `
}}"
data-month="{{9}}"
data-year="{{2022}}"
style="margin-left: 0"
bind:tap="handleSelect"
>
Expand All @@ -629,7 +622,6 @@ exports[`calendar :base 1`] = `
}}"
data-month="{{9}}"
data-year="{{2022}}"
style="margin-left: 0"
bind:tap="handleSelect"
>
Expand All @@ -647,15 +639,14 @@ exports[`calendar :base 1`] = `
}}"
data-month="{{9}}"
data-year="{{2022}}"
style="margin-left: 0"
bind:tap="handleSelect"
>
31
</wx-view>
</wx-view>
</wx-view>
</wx-scroll-view>
<wx-view
class="t-calendar__footer"
>
Expand Down
Loading

0 comments on commit 81adfbb

Please sign in to comment.