From 5c2678f7eabc078de92e5f15b662a67067678609 Mon Sep 17 00:00:00 2001
From: "Manu Mtz.-Almeida" <manu.mtza@gmail.com>
Date: Thu, 22 Mar 2018 17:14:51 +0100
Subject: [PATCH] feat(content): scrollEnabled

---
 core/src/components.d.ts                |  1 +
 core/src/components/content/content.tsx | 29 +++++++++++++++++++------
 core/src/components/content/readme.md   | 10 +++++++++
 3 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/core/src/components.d.ts b/core/src/components.d.ts
index 2787a2bb6b..5b43d3cde2 100644
--- a/core/src/components.d.ts
+++ b/core/src/components.d.ts
@@ -801,6 +801,7 @@ declare global {
     export interface IonContentAttributes extends HTMLAttributes {
       forceOverscroll?: boolean;
       fullscreen?: boolean;
+      scrollEnabled?: boolean;
       scrollEvents?: boolean;
     }
   }
diff --git a/core/src/components/content/content.tsx b/core/src/components/content/content.tsx
index d8a6f676af..1d362b402c 100644
--- a/core/src/components/content/content.tsx
+++ b/core/src/components/content/content.tsx
@@ -34,6 +34,7 @@ export class Content {
    */
   @Prop() forceOverscroll: boolean;
 
+  @Prop() scrollEnabled = true;
 
   @Prop() scrollEvents = false;
 
@@ -58,6 +59,9 @@ export class Content {
    */
   @Method()
   scrollToTop(duration = 300) {
+    if (!this.scrollEl) {
+      throw new Error('content is not scrollable');
+    }
     return this.scrollEl.scrollToTop(duration);
   }
 
@@ -69,16 +73,25 @@ export class Content {
    */
   @Method()
   scrollToBottom(duration = 300) {
+    if (!this.scrollEl) {
+      throw new Error('content is not scrollable');
+    }
     return this.scrollEl.scrollToBottom(duration);
   }
 
   @Method()
   scrollByPoint(x: number, y: number, duration: number, done?: Function): Promise<any> {
+    if (!this.scrollEl) {
+      throw new Error('content is not scrollable');
+    }
     return this.scrollEl.scrollByPoint(x, y, duration, done);
   }
 
   @Method()
   scrollToPoint(x: number, y: number, duration: number, done?: Function): Promise<any> {
+    if (!this.scrollEl) {
+      throw new Error('content is not scrollable');
+    }
     return this.scrollEl.scrollToPoint(x, y, duration, done);
   }
 
@@ -129,13 +142,15 @@ export class Content {
     this.resize();
 
     return [
-      <ion-scroll
-        ref={el => this.scrollEl = el as any}
-        mode={this.mode}
-        scrollEvents={this.scrollEvents}
-        forceOverscroll={this.forceOverscroll}>
-        <slot></slot>
-      </ion-scroll>,
+      (this.scrollEnabled)
+      ? <ion-scroll
+          ref={el => this.scrollEl = el as any}
+          mode={this.mode}
+          scrollEvents={this.scrollEvents}
+          forceOverscroll={this.forceOverscroll}>
+          <slot></slot>
+        </ion-scroll>
+      : <div class='scroll-inner'><slot></slot></div>,
       <slot name='fixed'></slot>
     ];
   }
diff --git a/core/src/components/content/readme.md b/core/src/components/content/readme.md
index 4ef9272ad0..581ba66cea 100644
--- a/core/src/components/content/readme.md
+++ b/core/src/components/content/readme.md
@@ -34,6 +34,11 @@ and footers. This effect can easily be seen by setting the toolbar
 to transparent.
 
 
+#### scrollEnabled
+
+boolean
+
+
 #### scrollEvents
 
 boolean
@@ -59,6 +64,11 @@ and footers. This effect can easily be seen by setting the toolbar
 to transparent.
 
 
+#### scroll-enabled
+
+boolean
+
+
 #### scroll-events
 
 boolean