Skip to content

Fix SortableJS#1866 #2164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix SortableJS#1866 #2164

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
92c88d1
Fix SortableJS#1866
kishtra May 30, 2022
a245450
rename lastSwapValidEl -> swapValidEl
kishtra May 31, 2022
6663852
Add accidentally removed swapValidEl check
kishtra May 31, 2022
89f4319
Remove canceling of _onDrop event
kishtra Jun 7, 2022
379459c
Remove unused drop parameter
kishtra Jun 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 37 additions & 32 deletions plugins/Swap/Swap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
index
} from '../../src/utils.js';

let lastSwapEl;
let swapValidEl;


function SwapPlugin() {
Expand All @@ -14,56 +14,61 @@ function SwapPlugin() {
}

Swap.prototype = {
dragStart({ dragEl }) {
lastSwapEl = dragEl;
},
dragOverValid({ completed, target, onMove, activeSortable, changed, cancel }) {
if (!activeSortable.options.swap) return;
dragOver({ activeSortable, target, dragEl, onMove, completed, cancel }) {
let el = this.sortable.el,
options = this.options;
if (target && target !== el) {
let prevSwapEl = lastSwapEl;
if (onMove(target) !== false) {
toggleClass(target, options.swapClass, true);
lastSwapEl = target;
} else {
lastSwapEl = null;
}

if (prevSwapEl && prevSwapEl !== lastSwapEl) {
toggleClass(prevSwapEl, options.swapClass, false);
}

if (!activeSortable.options.swap || !target || target === el || target.contains(dragEl) || onMove(target) === false) {
swapValidEl && toggleClass(swapValidEl, options.swapClass, false);
swapValidEl = null;

completed(false);
cancel();
}
},
dragOverValid({ target, changed, completed, cancel }) {
let options = this.options;

if (swapValidEl && swapValidEl !== target) {
toggleClass(swapValidEl, options.swapClass, false);
}

toggleClass(target, options.swapClass, true);
swapValidEl = target;

changed();

completed(true);
cancel();
},
drop({ activeSortable, putSortable, dragEl }) {
let toSortable = (putSortable || this.sortable);
let options = this.options;
lastSwapEl && toggleClass(lastSwapEl, options.swapClass, false);
if (lastSwapEl && (options.swap || putSortable && putSortable.options.swap)) {
if (dragEl !== lastSwapEl) {
toSortable.captureAnimationState();
if (toSortable !== activeSortable) activeSortable.captureAnimationState();
swapNodes(dragEl, lastSwapEl);

toSortable.animateAll();
if (toSortable !== activeSortable) activeSortable.animateAll();
}
if (!swapValidEl) return

let toSortable = putSortable || this.sortable,
options = this.options;

toggleClass(swapValidEl, options.swapClass, false);

if (options.swap || putSortable && putSortable.options.swap) {
toSortable.captureAnimationState();
if (toSortable !== activeSortable) activeSortable.captureAnimationState();

swapNodes(dragEl, swapValidEl);

toSortable.animateAll();
if (toSortable !== activeSortable) activeSortable.animateAll();
}
},
nulling() {
lastSwapEl = null;
swapValidEl = null;
}
};

return Object.assign(Swap, {
pluginName: 'swap',
eventProperties() {
return {
swapItem: lastSwapEl
swapItem: swapValidEl
};
}
});
Expand Down