From ef53f249bcb0e26bd087405fe7bf72394f0c0486 Mon Sep 17 00:00:00 2001
From: "Manu Mtz.-Almeida" <manu.mtza@gmail.com>
Date: Tue, 23 Jan 2018 18:55:16 +0100
Subject: [PATCH] refactor(gesture): using disabled

---
 packages/core/src/components.d.ts             |  2 +-
 .../core/src/components/gesture/gesture.tsx   | 14 +++++-----
 .../core/src/components/gesture/readme.md     |  4 +--
 packages/core/src/components/menu/menu.tsx    |  2 +-
 packages/core/src/components/range/range.tsx  | 26 +++++++++----------
 .../src/components/refresher/refresher.tsx    |  2 +-
 .../reorder-group/reorder-group.tsx           |  2 +-
 .../core/src/components/toggle/toggle.tsx     |  2 +-
 8 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/packages/core/src/components.d.ts b/packages/core/src/components.d.ts
index 684cd6d79c..45aba8b4ac 100644
--- a/packages/core/src/components.d.ts
+++ b/packages/core/src/components.d.ts
@@ -952,8 +952,8 @@ declare global {
       block?: string;
       canStart?: GestureCallback;
       direction?: string;
+      disabled?: boolean;
       disableScroll?: boolean;
-      enabled?: boolean;
       gestureName?: string;
       gesturePriority?: number;
       maxAngle?: number;
diff --git a/packages/core/src/components/gesture/gesture.tsx b/packages/core/src/components/gesture/gesture.tsx
index af6db47c6e..66778dd121 100644
--- a/packages/core/src/components/gesture/gesture.tsx
+++ b/packages/core/src/components/gesture/gesture.tsx
@@ -30,7 +30,7 @@ export class Gesture {
   @Prop({ context: 'dom' }) dom: DomController;
   @Prop({ context: 'enableListener' }) enableListener: EventListenerEnable;
 
-  @Prop() enabled = true;
+  @Prop() disabled = false;
   @Prop() attachTo: ElementRef = 'child';
   @Prop() autoBlockAll = false;
   @Prop() block: string = null;
@@ -90,7 +90,7 @@ export class Gesture {
     }
     this.hasPress = (types.indexOf('press') > -1);
 
-    this.enabledChanged(this.enabled);
+    this.disabledChanged(this.disabled);
     if (this.pan || this.hasPress) {
       this.dom.write(() => {
         applyStyles(getElementReference(this.el, this.attachTo), GESTURE_INLINE_STYLES);
@@ -103,12 +103,12 @@ export class Gesture {
     }
   }
 
-  @Watch('enabled')
-  protected enabledChanged(isEnabled: boolean) {
+  @Watch('disabled')
+  protected disabledChanged(isDisabled: boolean) {
     if (this.pan || this.hasPress) {
-      this.enableListener(this, 'touchstart', isEnabled, this.attachTo, this.passive);
-      this.enableListener(this, 'mousedown', isEnabled, this.attachTo, this.passive);
-      if (!isEnabled) {
+      this.enableListener(this, 'touchstart', !isDisabled, this.attachTo, this.passive);
+      this.enableListener(this, 'mousedown', !isDisabled, this.attachTo, this.passive);
+      if (isDisabled) {
         this.abortGesture();
       }
     }
diff --git a/packages/core/src/components/gesture/readme.md b/packages/core/src/components/gesture/readme.md
index c588b8af96..4ad7895a53 100644
--- a/packages/core/src/components/gesture/readme.md
+++ b/packages/core/src/components/gesture/readme.md
@@ -37,7 +37,7 @@ string
 boolean
 
 
-#### enabled
+#### disabled
 
 boolean
 
@@ -134,7 +134,7 @@ string
 boolean
 
 
-#### enabled
+#### disabled
 
 boolean
 
diff --git a/packages/core/src/components/menu/menu.tsx b/packages/core/src/components/menu/menu.tsx
index 7987c02801..da40c32039 100644
--- a/packages/core/src/components/menu/menu.tsx
+++ b/packages/core/src/components/menu/menu.tsx
@@ -452,7 +452,7 @@ export class Menu {
         'onEnd': this.onDragEnd.bind(this),
         'maxEdgeStart': this.maxEdgeStart,
         'edge': this.side,
-        'enabled': this.isActive() && this.swipeEnabled,
+        'disabled': !this.isActive() || !this.swipeEnabled,
         'gestureName': 'menu-swipe',
         'gesturePriority': 10,
         'type': 'pan',
diff --git a/packages/core/src/components/range/range.tsx b/packages/core/src/components/range/range.tsx
index c0569f6da6..4b09ac0bcb 100644
--- a/packages/core/src/components/range/range.tsx
+++ b/packages/core/src/components/range/range.tsx
@@ -411,20 +411,18 @@ export class Range implements BaseInputComponent {
   render() {
     return [
       <slot name='start'></slot>,
-      <ion-gesture
-        {...{
-          disableScroll: true,
-          onStart: this.onDragStart.bind(this),
-          onMove: this.onDragMove.bind(this),
-          onEnd: this.onDragEnd.bind(this),
-          enabled: !this.disabled,
-          gestureName: 'range',
-          gesturePriority: 30,
-          type: 'pan',
-          direction: 'x',
-          threshold: 0
-        }}
-      >
+      <ion-gesture {...{
+        disableScroll: true,
+        onStart: this.onDragStart.bind(this),
+        onMove: this.onDragMove.bind(this),
+        onEnd: this.onDragEnd.bind(this),
+        disabled: this.disabled,
+        gestureName: 'range',
+        gesturePriority: 30,
+        type: 'pan',
+        direction: 'x',
+        threshold: 0
+      }}>
         <div class='range-slider'>
           {this.ticks.map(t =>
             <div
diff --git a/packages/core/src/components/refresher/refresher.tsx b/packages/core/src/components/refresher/refresher.tsx
index 39c13fed62..c011ed511a 100644
--- a/packages/core/src/components/refresher/refresher.tsx
+++ b/packages/core/src/components/refresher/refresher.tsx
@@ -361,7 +361,7 @@ export class Refresher {
 
   render() {
     return <ion-gesture {...this.gestureConfig}
-      enabled={this.enabled}>
+      disabled={!this.enabled}>
       <slot></slot>
     </ion-gesture>;
   }
diff --git a/packages/core/src/components/reorder-group/reorder-group.tsx b/packages/core/src/components/reorder-group/reorder-group.tsx
index 652d38be56..7f74ae37c3 100644
--- a/packages/core/src/components/reorder-group/reorder-group.tsx
+++ b/packages/core/src/components/reorder-group/reorder-group.tsx
@@ -268,7 +268,7 @@ export class ReorderGroup {
         onStart: this.onDragStart.bind(this),
         onMove: this.onDragMove.bind(this),
         onEnd: this.onDragEnd.bind(this),
-        enabled: this.enabled,
+        disabled: !this.enabled,
         disableScroll: true,
         gestureName: 'reorder',
         gesturePriority: 30,
diff --git a/packages/core/src/components/toggle/toggle.tsx b/packages/core/src/components/toggle/toggle.tsx
index 9768380978..f70505af68 100644
--- a/packages/core/src/components/toggle/toggle.tsx
+++ b/packages/core/src/components/toggle/toggle.tsx
@@ -207,7 +207,7 @@ export class Toggle implements CheckboxInput {
   render() {
     return [
       <ion-gesture {...this.gestureConfig}
-        enabled={!this.disabled} tabIndex={-1}>
+        disabled={this.disabled} tabIndex={-1}>
         <div class='toggle-icon'>
           <div class='toggle-inner'/>
         </div>