Skip to content

Fix dragging onto complex items #100

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.

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 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion dev/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ <h1>Samples</h1>
<li><a href="data-driven-list" target="_blank">Data-driven List</a></li>
<li><a href="ordered-data-driven-list" target="_blank">Ordered Data-driven List</a></li>
<li><a href="mapped-data-driven-list" target="_blank">Mapped Data-driven List</a></li>
<li><a href="styling-data-driven-list" target="_blank">Styling</a></li>
<li><a href="styling-data-driven-list" target="_blank">Styling - Data List</a></li>
<li><a href="styling-complex" target="_blank">Styling - Complex Items</a></li>
<li><a href="data-persistence-in-local-storage" target="_blank">Persisting Data in Local Storage</a></li>
<li><a href="enable-disable" target="_blank">Enable / Disable</a></li>
<li><a href="nesting-levels" target="_blank">Nesting Levels</a></li>
Expand Down
116 changes: 116 additions & 0 deletions dev/styling-complex.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">

<title>Nested Sort | Styling - Complex Items Demo</title>
<link href="https://fonts.googleapis.com/css2?family=Roboto:wght@300&display=swap" rel="stylesheet">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" integrity="sha512-SfTiTlX6kk+qitfevl/7LibUOeJWlt9rbyDn92a1DqWOw9vWG2MFoays0sgObmWazO5BQPiFucnnEAjpAB+/Sw==" crossorigin="anonymous" referrerpolicy="no-referrer" />
<link href="css/main.css" rel="stylesheet">
<style>
.nested-sort li {
padding: 0;
}

.nested-sort li>ul {
margin: 10px 10px 10px 20px;
}

.fancy {
display: flex;
column-gap: 2rem;
padding: 10px;
}
</style>
</head>
<body>

<div class="container">
<h1>Styling - Complex Items</h1>

<div class="sample-wrap">
<ul id="draggable">
<li data-id="1">
<div class="fancy">
<div class="icon"><i class="fa fa-arrows"></i></div>
<div class="title">Topic 1</div>
</div>
</li>
<li data-id="2">
<div class="fancy">
<div class="icon"><i class="fa fa-arrows"></i></div>
<div class="title">Topic 2</div>
</div>
</li>
<li data-id="3">
<div class="fancy">
<div class="icon"><i class="fa fa-arrows"></i></div>
<div class="title">Topic 3</div>
</div>
</li>
<li data-id="4">
<div class="fancy">
<div class="icon"><i class="fa fa-arrows"></i></div>
<div class="title">Topic 4</div>
</div>
</li>
<li data-id="5">
<div class="fancy">
<div class="icon"><i class="fa fa-arrows"></i></div>
<div class="title">Topic 5</div>
</div>
</li>
<li data-id="6">
<div class="fancy">
<div class="icon"><i class="fa fa-arrows"></i></div>
<div class="title">Topic 6</div>
</div>
</li>
<li data-id="7">
<div class="fancy">
<div class="icon"><i class="fa fa-arrows"></i></div>
<div class="title">Topic 7</div>
</div>
</li>
<li data-id="8">
<div class="fancy">
<div class="icon"><i class="fa fa-arrows"></i></div>
<div class="title">Topic 8</div>
</div>
</li>
<li data-id="9">
<div class="fancy">
<div class="icon"><i class="fa fa-arrows"></i></div>
<div class="title">Topic 9</div>
</div>
</li>
<li data-id="10">
<div class="fancy">
<div class="icon"><i class="fa fa-arrows"></i></div>
<div class="title">Topic 10</div>
</div>
</li>
</ul>
<pre class="result-wrap"></pre>
</div>
</div>

<!-- Scripts -->
<script src="../dist/nested-sort.umd.js"></script>
<script>
new NestedSort({
actions: {
onDrop: function (data) {
const resultWrap = document.querySelector('.result-wrap')
resultWrap.innerHTML = JSON.stringify(data, null, ' ')
console.log(data)
}
},
el: '#draggable',
droppingEdge: 5,
nestingLevels: -1
})
</script>
</body>
</html>
5 changes: 3 additions & 2 deletions src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -221,10 +221,11 @@ class NestedSort {
}

onDragEnter(e: DragEvent): void {
if (!this.canBeTargeted(e.target as HTMLElement)) return
const target = (e.target as HTMLElement)?.closest(`li[data-id],.${this.classNames.placeholder}`) as HTMLElement
if (!target || !this.canBeTargeted(target)) return

this.removeClassFromEl(this.classNames.targeted, this.targetedNode)
this.targetedNode = e.target as HTMLElement
this.targetedNode = target
this.targetedNode.classList.add(this.classNames.targeted)
}

Expand Down