提交 a177a98e 编写于 作者: F fengweiyao

fix(scroll): nested scroll bug

when inner element can't scroll
上级 bc679483
......@@ -386,12 +386,18 @@
const reachBoundaryX = distX > 0 ? pos.x >= this.scroll.minScrollX : distX < 0 ? pos.x <= this.scroll.maxScrollX : false
const reachBoundaryY = distY > 0 ? pos.y >= this.scroll.minScrollY : distY < 0 ? pos.y <= this.scroll.maxScrollY : false
const freeScroll = this.scroll.freeScroll
const hasHorizontalScroll = this.scroll.hasHorizontalScroll
const hasVerticalScroll = this.scroll.hasVerticalScroll
if (!hasHorizontalScroll && !hasVerticalScroll) {
return true
}
let reachBoundary
if (freeScroll) {
return reachBoundaryX || reachBoundaryY
}
let reachBoundary
if (this.scroll.movingDirectionX) {
reachBoundary = reachBoundaryX
} else if (this.scroll.movingDirectionY) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册