fix(content): scrolling Y

ionic-team · Aug 10, 2018 · 01323ac · 01323ac
1 parent aa23d08
commit 01323ac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/core/src/components/content/content.scss b/core/src/components/content/content.scss
@@ -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;

diff --git a/core/src/components/content/content.tsx b/core/src/components/content/content.tsx
@@ -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)}>