mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2025-11-09 16:16:41 +08:00
fix(content): scrolling Y
This commit is contained in:
@ -54,7 +54,8 @@
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.scroll-x.scroll.y {
|
||||
.scroll-y,
|
||||
.scroll-x {
|
||||
-webkit-overflow-scrolling: touch;
|
||||
will-change: scroll-position;
|
||||
}
|
||||
@ -67,13 +68,6 @@
|
||||
overflow-x: auto;
|
||||
}
|
||||
|
||||
.scroll-enabled {
|
||||
overflow-x: hidden;
|
||||
overflow-y: auto;
|
||||
-webkit-overflow-scrolling: touch;
|
||||
will-change: scroll-position;
|
||||
}
|
||||
|
||||
.overscroll::before,
|
||||
.overscroll::after {
|
||||
position: absolute;
|
||||
|
||||
@ -290,7 +290,6 @@ export class Content {
|
||||
|
||||
render() {
|
||||
const { scrollX, scrollY, forceOverscroll } = this;
|
||||
const scrollEnabled = scrollX || scrollY;
|
||||
|
||||
this.resize();
|
||||
|
||||
@ -300,8 +299,7 @@ export class Content {
|
||||
'inner-scroll': true,
|
||||
'scroll-x': scrollX,
|
||||
'scroll-y': scrollY,
|
||||
'scroll-enabled': scrollEnabled,
|
||||
'overscroll': scrollEnabled && !!forceOverscroll
|
||||
'overscroll': (scrollX || scrollY) && !!forceOverscroll
|
||||
}}
|
||||
ref={el => this.scrollEl = el!}
|
||||
onScroll={ev => this.onScroll(ev)}>
|
||||
|
||||
Reference in New Issue
Block a user