Merge pull request #12 from Shopify/fix-swappable

Fixing swappable swap logic
This commit is contained in:
Max Hoffmann 2017-09-29 16:04:22 -04:00 committed by GitHub
commit efbab0ee4a

View File

@ -51,19 +51,20 @@ export default class Swappable {
}
_onDragOver(event) {
if (event.over === event.source) {
return;
}
if (event.canceled()) {
if (event.over === event.source || event.canceled()) {
return;
}
// swap originally swapped element back
if (this.lastOver && this.lastOver !== event.over) {
swap(this.lastOver, event.source);
}
this.lastOver = event.over;
if (this.lastOver === event.over) {
this.lastOver = null;
} else {
this.lastOver = event.over;
}
swap(event.source, event.over);