From 8483a439aeb4c006caa7c579148380da5f2d1617 Mon Sep 17 00:00:00 2001
From: "Manu Mtz.-Almeida" <manu.valladolid@gmail.com>
Date: Sat, 2 Jul 2016 11:33:16 +0200
Subject: [PATCH] fix(reorder): canceled reorder is animated smoothly back

references #7142
---
 src/components/item/item-reorder-gesture.ts | 14 ++++++++++++--
 src/components/item/item-reorder.scss       |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/components/item/item-reorder-gesture.ts b/src/components/item/item-reorder-gesture.ts
index 7fd7cddb10..c6bd82c013 100644
--- a/src/components/item/item-reorder-gesture.ts
+++ b/src/components/item/item-reorder-gesture.ts
@@ -113,8 +113,18 @@ export class ItemReorderGesture {
 
     let toIndex = this.lastToIndex;
     let fromIndex = indexForItem(this.selectedItemEle);
-    this.selectedItemEle.classList.remove(ITEM_REORDER_ACTIVE);
-    this.selectedItemEle = null;
+    let reorderInactive = () => {
+      this.selectedItemEle.style.transition = '';
+      this.selectedItemEle.classList.remove(ITEM_REORDER_ACTIVE);
+      this.selectedItemEle = null;
+    };
+
+    if (toIndex === fromIndex) {
+      this.selectedItemEle.style.transition = 'transform 200ms ease-in-out';
+      setTimeout(reorderInactive, 200);
+    } else {
+      reorderInactive();
+    }
     this.list.reorderEmit(fromIndex, toIndex);
   }
 
diff --git a/src/components/item/item-reorder.scss b/src/components/item/item-reorder.scss
index d3c80e46eb..78bafc8eed 100644
--- a/src/components/item/item-reorder.scss
+++ b/src/components/item/item-reorder.scss
@@ -49,7 +49,7 @@ ion-reorder {
 .reorder-active {
   z-index: 4;
 
-  box-shadow: 0 0 10px rgba(0, 0, 0, .5);
+  box-shadow: 0 0 10px rgba(0, 0, 0, .4);
   opacity: .8;
   transition: none;