Skip to content

Commit 8483a43

Browse files
committed
fix(reorder): canceled reorder is animated smoothly back
references #7142
1 parent f1433c6 commit 8483a43

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

src/components/item/item-reorder-gesture.ts

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,18 @@ export class ItemReorderGesture {
113113

114114
let toIndex = this.lastToIndex;
115115
let fromIndex = indexForItem(this.selectedItemEle);
116-
this.selectedItemEle.classList.remove(ITEM_REORDER_ACTIVE);
117-
this.selectedItemEle = null;
116+
let reorderInactive = () => {
117+
this.selectedItemEle.style.transition = '';
118+
this.selectedItemEle.classList.remove(ITEM_REORDER_ACTIVE);
119+
this.selectedItemEle = null;
120+
};
121+
122+
if (toIndex === fromIndex) {
123+
this.selectedItemEle.style.transition = 'transform 200ms ease-in-out';
124+
setTimeout(reorderInactive, 200);
125+
} else {
126+
reorderInactive();
127+
}
118128
this.list.reorderEmit(fromIndex, toIndex);
119129
}
120130

src/components/item/item-reorder.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ ion-reorder {
4949
.reorder-active {
5050
z-index: 4;
5151

52-
box-shadow: 0 0 10px rgba(0, 0, 0, .5);
52+
box-shadow: 0 0 10px rgba(0, 0, 0, .4);
5353
opacity: .8;
5454
transition: none;
5555

0 commit comments

Comments
 (0)