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

fix(IndexBar): fix error in click event (#2605)

Browse Source 
fix #2522
This commit is contained in:
rex 2019-12-26 16:00:45 +08:00 committed by GitHub
parent a44b3b4ed9
commit 36bf4762eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
packages/index-bar/index.ts
View File

@ -87,16 +87,18 @@ VantComponent({
setAnchorsRect() {
return Promise.all(
this.children.map(anchor => (
anchor.getRect('.van-index-anchor-wrapper').then(
(rect: WechatMiniprogram.BoundingClientRectCallbackResult) => {
Object.assign(anchor, {
height: rect.height,
top: rect.top + this.data.scrollTop
});
}
)
))
this.children.map(anchor =>
anchor
.getRect('.van-index-anchor-wrapper')
.then(
(rect: WechatMiniprogram.BoundingClientRectCallbackResult) => {
Object.assign(anchor, {
height: rect.height,
top: rect.top + this.data.scrollTop
});
}
)
)
);
},
@ -135,23 +137,17 @@ VantComponent({
},
getAnchorRect(anchor) {
return anchor.getRect('.van-index-anchor-wrapper').then(
(rect: WechatMiniprogram.BoundingClientRectCallbackResult) => (
{
height: rect.height,
top: rect.top
}
)
);
return anchor
.getRect('.van-index-anchor-wrapper')
.then((rect: WechatMiniprogram.BoundingClientRectCallbackResult) => ({
height: rect.height,
top: rect.top
}));
},
getActiveAnchorIndex() {
const { children } = this;
const {
sticky,
scrollTop,
stickyOffsetTop
} = this.data;
const { sticky, scrollTop, stickyOffsetTop } = this.data;
for (let i = this.children.length - 1; i >= 0; i--) {
const preAnchorHeight = i > 0 ? children[i - 1].height : 0;
@ -166,9 +162,7 @@ VantComponent({
},
onScroll() {
const {
children = []
} = this;
const { children = [] } = this;
if (!children.length) {
return;
@ -195,7 +189,8 @@ VantComponent({
let isActiveAnchorSticky = false;
if (active !== -1) {
isActiveAnchorSticky = children[active].top <= stickyOffsetTop + scrollTop;
isActiveAnchorSticky =
children[active].top <= stickyOffsetTop + scrollTop;
}
children.forEach((item, index) => {
@ -230,9 +225,10 @@ VantComponent({
const currentAnchor = children[index];
const currentOffsetTop = currentAnchor.top;
const targetOffsetTop = index === children.length - 1
? this.top
: children[index + 1].top;
const targetOffsetTop =
index === children.length - 1
? this.top
: children[index + 1].top;
const parentOffsetHeight = targetOffsetTop - currentOffsetTop;
const translateY = parentOffsetHeight - currentAnchor.height;
@ -257,7 +253,7 @@ VantComponent({
data: {
active: false,
anchorStyle: '',
wrapperStyle: '',
wrapperStyle: ''
}
});
}
@ -295,14 +291,18 @@ VantComponent({
this.scrollToAnchorIndex = index;
const anchor = this.children.filter(item => item.data.index === this.data.indexList[index])[0];
const anchor = this.children.find(
(item: WechatMiniprogram.Component.TrivialInstance) =>
item.data.index === this.data.indexList[index]
);
this.$emit('select', anchor.data.index);
anchor && wx.pageScrollTo({
duration: 0,
scrollTop: anchor.top
});
if (anchor) {
this.$emit('select', anchor.data.index);
wx.pageScrollTo({
duration: 0,
scrollTop: anchor.top
});
}
}
}
});