archive-gh-me/draggable
1
0
Fork 0
mirror of https://github.com/Shopify/draggable.git synced 2026-02-01 16:46:56 +00:00
Code Issues Projects Releases Wiki Activity

Fixes move logic for sortable by ignoring original source and mirror as container children

Browse Source
This commit is contained in:
Max Hoffmann 2017-11-01 19:08:17 -04:00
parent d06c10f8a0
commit e62322dea0
No known key found for this signature in database
GPG Key ID: 1DFA4D13DD27A676
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/Sortable/Sortable.js
View File

@ -11,6 +11,7 @@ const onDragStart = Symbol('onDragStart');
const onDragOverContainer = Symbol('onDragOverContainer');
const onDragOver = Symbol('onDragOver');
const onDragStop = Symbol('onDragStop');
const getContainerChildren = Symbol('getContainerChildren');
/**
* Sortable is built on top of Draggable and allows sorting of draggable elements. Sortable will keep
@ -76,9 +77,7 @@ export default class Sortable extends Draggable {
* @return {Number}
*/
index(element) {
return [...element.parentNode.children].filter((childElement) => {
return childElement !== this.originalSource && childElement !== this.mirror;
}).indexOf(element);
return this[getContainerChildren](element.parentNode).indexOf(element);
}
/**
@ -129,7 +128,8 @@ export default class Sortable extends Draggable {
return;
}
const moves = move(source, over, overContainer);
const children = this[getContainerChildren](overContainer);
const moves = move({source, over, overContainer, children});
if (!moves) {
return;
@ -175,7 +175,8 @@ export default class Sortable extends Draggable {
return;
}
const moves = move(source, over, overContainer);
const children = this[getContainerChildren](overContainer);
const moves = move({source, over, overContainer, children});
if (!moves) {
return;
@ -214,14 +215,26 @@ export default class Sortable extends Draggable {
this.startIndex = null;
this.startContainer = null;
}
/**
* Returns children elements for a container, excluding the original source and mirror, if present
* @private
* @param {HTMLElement} container - a container element
* @return {HTMLElement[]}
*/
[getContainerChildren](container) {
return [...container.children].filter((childElement) => {
return childElement !== this.originalSource && childElement !== this.mirror;
});
}
}
function index(element) {
return Array.prototype.indexOf.call(element.parentNode.children, element);
}
function move(source, over, overContainer) {
const emptyOverContainer = !overContainer.children.length;
function move({source, over, overContainer, children}) {
const emptyOverContainer = !children.length;
const differentContainer = over && (source.parentNode !== over.parentNode);
const sameContainer = over && (source.parentNode === over.parentNode);