From 8c62ea67cde0ab5b80e82b43b3ca75c1039e8f16 Mon Sep 17 00:00:00 2001
From: agatemosu <agaatem@outlook.com>
Date: Wed, 24 Jul 2024 18:28:39 +0200
Subject: [PATCH] Replace dragula with SortableJS

---
 index.html      |  6 +-----
 script.js       | 53 ++++++++++++++++---------------------------------
 styles/main.css |  4 ++++
 3 files changed, 22 insertions(+), 41 deletions(-)

diff --git a/index.html b/index.html
index 347beb9..29e716a 100644
--- a/index.html
+++ b/index.html
@@ -11,15 +11,11 @@
 		<link rel="preload" href="./assets/check.svg" as="image" />
 		<style id="dynamic-styles"></style>
 
-		<link
-			rel="stylesheet"
-			href="https://cdnjs.cloudflare.com/ajax/libs/dragula/3.7.3/dragula.min.css"
-		/>
 		<link
 			rel="stylesheet"
 			href="https://cdn.jsdelivr.net/npm/@simonwep/pickr/dist/themes/monolith.min.css"
 		/>
-		<script src="https://cdnjs.cloudflare.com/ajax/libs/dragula/3.7.3/dragula.min.js"></script>
+		<script src="https://cdn.jsdelivr.net/npm/sortablejs@1.15.2/Sortable.min.js"></script>
 		<script src="https://cdn.jsdelivr.net/npm/@simonwep/pickr/dist/pickr.min.js"></script>
 		<script src="https://html2canvas.hertzen.com/dist/html2canvas.min.js"></script>
 	</head>
diff --git a/script.js b/script.js
index bc32241..b607979 100644
--- a/script.js
+++ b/script.js
@@ -10,9 +10,6 @@ const defaultColors = [
 ];
 const clearColor = "#778899";
 
-let scrollable = true;
-let drake;
-
 const mainContainer = document.querySelector("main");
 const imagesBar = document.querySelector("#images-bar");
 const dynamicStyles = document.querySelector("#dynamic-styles");
@@ -20,6 +17,9 @@ const exportContainer = document.querySelector("#export-container");
 const exportedImage = document.querySelector("#exported-image");
 const blackout = document.querySelector("#blackout");
 
+const draggables = [];
+addContainerDrag(imagesBar);
+
 document.querySelector("#new-tier").onclick = () => addRow();
 document.querySelector("#select-images").onclick = () => selectImages();
 document.querySelector("#export-image").onclick = () => exportImage();
@@ -34,18 +34,6 @@ for (const checkbox of document.querySelectorAll(".dynamic-style")) {
 	checkbox.addEventListener("change", () => dynamicStyle(checkbox));
 }
 
-document.addEventListener(
-	"touchmove",
-	(e) => {
-		if (!scrollable) {
-			e.preventDefault();
-		}
-	},
-	{
-		passive: false,
-	},
-);
-
 document.addEventListener("drop", (e) => {
 	e.preventDefault();
 	uploadImages(e.dataTransfer.files);
@@ -151,22 +139,31 @@ function addRow(tierName = "New tier", defaultColor = clearColor) {
 
 	mainContainer.appendChild(newRow);
 	addRowListeners(newRow, defaultColor);
-	initializeDragula();
 }
 
 function addRowListeners(row, defaultColor) {
 	const colorPicker = row.querySelector(".color-picker");
 	const tierLabel = row.querySelector(".tier-label");
 
+	const tierSort = row.querySelector(".sort");
+
 	const deleteButton = row.querySelector(".option.delete img");
 	const upButton = row.querySelector(".option.up img");
 	const downButton = row.querySelector(".option.down img");
 
 	const pickr = createColorPicker(colorPicker, tierLabel, defaultColor);
+	const dragInstance = addContainerDrag(tierSort);
 
 	deleteButton.onclick = () => {
 		pickr.destroyAndRemove();
 		row.remove();
+
+		const dragIndex = draggables.indexOf(dragInstance);
+
+		draggables[dragIndex].destroy();
+		draggables.splice(dragIndex, 1);
+
+		console.log(draggables);
 	};
 	upButton.onclick = () => {
 		moveRow(row, -1);
@@ -220,29 +217,13 @@ function uploadImages(files) {
 			imageEl.style.minHeight = `${Math.min(image.height, 80)}px`;
 		};
 	}
-
-	initializeDragula();
 }
 
-function initializeDragula() {
-	const containers = Array.from(document.querySelectorAll(".sort"));
-
-	if (drake) {
-		drake.containers.push(...containers);
-	} else {
-		drake = dragula(containers);
-	}
+function addContainerDrag(container) {
+	const dragInstance = new Sortable(container, { group: "tiers" });
+	draggables.push(dragInstance);
 
-	drake
-		.on("drag", () => {
-			scrollable = false;
-		})
-		.on("drop", () => {
-			scrollable = true;
-		})
-		.on("cancel", () => {
-			scrollable = true;
-		});
+	return dragInstance;
 }
 
 function dynamicStyle(checkbox) {
diff --git a/styles/main.css b/styles/main.css
index a9f4415..680a656 100644
--- a/styles/main.css
+++ b/styles/main.css
@@ -61,3 +61,7 @@ body {
 	background-repeat: no-repeat;
 	max-height: 80px;
 }
+
+.tier-element.sortable-ghost {
+	opacity: 0.2;
+}