javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-09 08:09:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(content): scrolling Y

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2018-08-10 02:16:06 +02:00
parent aa23d08a71
commit 01323acd6a
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/components/content/content.scss
View File

@ -54,7 +54,8 @@
overflow: hidden; overflow: hidden;
} }
.scroll-x.scroll.y { .scroll-y,
.scroll-x {
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
will-change: scroll-position; will-change: scroll-position;
} }
@ -67,13 +68,6 @@
overflow-x: auto; overflow-x: auto;
} }
.scroll-enabled {
overflow-x: hidden;
overflow-y: auto;
-webkit-overflow-scrolling: touch;
will-change: scroll-position;
}
.overscroll::before, .overscroll::before,
.overscroll::after { .overscroll::after {
position: absolute; position: absolute;

4
core/src/components/content/content.tsx
View File

@ -290,7 +290,6 @@ export class Content {
render() { render() {
const { scrollX, scrollY, forceOverscroll } = this; const { scrollX, scrollY, forceOverscroll } = this;
const scrollEnabled = scrollX || scrollY;
this.resize(); this.resize();
@ -300,8 +299,7 @@ export class Content {
'inner-scroll': true, 'inner-scroll': true,
'scroll-x': scrollX, 'scroll-x': scrollX,
'scroll-y': scrollY, 'scroll-y': scrollY,
'scroll-enabled': scrollEnabled, 'overscroll': (scrollX || scrollY) && !!forceOverscroll
'overscroll': scrollEnabled && !!forceOverscroll
}} }}
ref={el => this.scrollEl = el!} ref={el => this.scrollEl = el!}
onScroll={ev => this.onScroll(ev)}> onScroll={ev => this.onScroll(ev)}>