Skip to content
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

make sure sortenter event is fired when a dragged element enters container the first time #492

Closed
wants to merge 14 commits into from
Closed

make sure sortenter event is fired when a dragged element enters container the first time #492

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
932e72c
allow handle in shadowRoot
christophe-g Feb 22, 2019
3fe0ff8
make sure we can pass placeholder as an element
christophe-g Feb 22, 2019
b615ea3
Merge branch 'support-shadowroot-handlers'
christophe-g Feb 22, 2019
6bd582a
sortable now dispatch a sortenter event on dragenter
christophe-g Mar 1, 2019
be6d7f9
reverted dist
christophe-g Mar 1, 2019
2605cca
revert docs
christophe-g Mar 1, 2019
ebc1d18
Merge branch 'support-shadowroot-handlers'
christophe-g Mar 1, 2019
9194fd2
Merge branch 'dispatch-sortenter'
christophe-g Mar 1, 2019
ed84993
make sure sortenter event is fired when a dragged element enters cont…
christophe-g Mar 1, 2019
73a466a
Merge branch 'dispatch-sortenter'
christophe-g Mar 1, 2019
88ad41f
cleanup previous container on drag end
christophe-g Mar 1, 2019
03932d3
Merge branch 'dispatch-sortenter'
christophe-g Mar 1, 2019
e1555c8
Merge remote-tracking branch 'upstream/master'
christophe-g Mar 1, 2019
c275f57
include original target on sortstart and sortenter
christophe-g Mar 1, 2019
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
28 changes: 27 additions & 1 deletion src/html5sortable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ let originItemsBeforeUpdate
// Destination List - data from before any item was changed
let destinationItemsBeforeUpdate

// Previous Sortable Container - we dispatch as sortenter event when a
// dragged item enters a sortableContainer for the first time
let previousContainer

/**
* remove event handlers from items
* @param {Array|NodeList} items
Expand Down Expand Up @@ -320,7 +324,8 @@ export default function sortable (sortableElements, options: object|string|undef
index: originIndex,
container: originContainer
},
item: dragging
item: dragging,
originalTarget: target
}
}))
})
Expand All @@ -336,6 +341,26 @@ export default function sortable (sortableElements, options: object|string|undef
const sortableContainer = findSortable(target, e)
destinationItemsBeforeUpdate = _filter(sortableContainer.children, _data(sortableContainer, 'items'))
.filter(item => item !== store(sortableElement).placeholder)

if(sortableContainer !== previousContainer) {
// dispatch sortenter event on each element in group
sortableContainer.dispatchEvent(new CustomEvent('sortenter', {
detail: {
origin: {
elementIndex: originElementIndex,
index: originIndex,
container: originContainer
},
destination: {
container: sortableContainer,
itemsBeforeUpdate: destinationItemsBeforeUpdate
},
item: dragging,
originalTarget: target
}
}));
}
previousContainer = sortableContainer
})
/*
* Dragend Event - https://developer.mozilla.org/en-US/docs/Web/Events/dragend
Expand Down Expand Up @@ -377,6 +402,7 @@ export default function sortable (sortableElements, options: object|string|undef
}
}))

previousContainer = null
dragging = null
draggingHeight = null
})
Expand Down