blackteay/vant
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant.git synced 2025-04-06 03:57:59 +08:00
Code Issues Projects Releases Wiki Activity

fix(Tabs): lock scroll not work when using scrollspy (#5727)

Browse Source
This commit is contained in:
chenjiahan 2020-03-02 19:41:07 +08:00
parent c401b8d7af
commit c4be70c4e8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tabs/index.js
View File

@ -306,16 +306,16 @@ export default createComponent({
if (el) { if (el) {
const to = getElementTop(el, this.scroller) - this.scrollOffset; const to = getElementTop(el, this.scroller) - this.scrollOffset;
this.clickedScroll = true; this.lockScroll = true;
scrollTopTo(this.scroller, to, +this.duration, () => { scrollTopTo(this.scroller, to, +this.duration, () => {
this.clickedScroll = false; this.lockScroll = false;
}); });
} }
} }
}, },
onScroll() { onScroll() {
if (this.scrollspy && !this.clickedScroll) { if (this.scrollspy && !this.lockScroll) {
const index = this.getCurrentIndexOnScroll(); const index = this.getCurrentIndexOnScroll();
this.setCurrentIndex(index); this.setCurrentIndex(index);
} }

2
src/tabs/utils.ts
View File

@ -49,7 +49,7 @@ export function scrollTopTo(
if ((isDown && current < to) || (!isDown && current > to)) { if ((isDown && current < to) || (!isDown && current > to)) {
raf(animate); raf(animate);
} else if (callback) { } else if (callback) {
callback(); raf(callback as FrameRequestCallback);
} }
} }