From fdc4aba00901f16a3abd791aae7d16963a696684 Mon Sep 17 00:00:00 2001
From: Mitchell McCaffrey <mitchemmc@gmail.com>
Date: Tue, 10 Aug 2021 06:56:45 +1000
Subject: [PATCH] Fix issue with drag and drop breaking when dragging token bar
 token group

---
 package.json                                |  4 ++--
 src/components/token/TokenBarTokenGroup.tsx |  2 +-
 yarn.lock                                   | 16 ++++++++--------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index ed2b4e9..ece516d 100644
--- a/package.json
+++ b/package.json
@@ -5,8 +5,8 @@
   "dependencies": {
     "@babylonjs/core": "^4.2.0",
     "@babylonjs/loaders": "^4.2.0",
-    "@dnd-kit/core": "^3.0.4",
-    "@dnd-kit/sortable": "^3.1.0",
+    "@dnd-kit/core": "^3.1.1",
+    "@dnd-kit/sortable": "^4.0.0",
     "@mitchemmc/dexie-export-import": "^1.0.1",
     "@msgpack/msgpack": "^2.4.1",
     "@react-spring/konva": "^9.2.3",
diff --git a/src/components/token/TokenBarTokenGroup.tsx b/src/components/token/TokenBarTokenGroup.tsx
index c6837d7..19c770a 100644
--- a/src/components/token/TokenBarTokenGroup.tsx
+++ b/src/components/token/TokenBarTokenGroup.tsx
@@ -26,7 +26,7 @@ function TokenBarTokenGroup({
   draggable,
 }: TokenBarTokenGroupProps) {
   const { attributes, listeners, setNodeRef, isDragging } = useDraggable({
-    id: group.id,
+    id: draggable ? group.id : "",
     disabled: !draggable,
   });
   const [isOpen, setIsOpen] = useState(false);
diff --git a/yarn.lock b/yarn.lock
index 15214bc..3af6c6f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1810,19 +1810,19 @@
   dependencies:
     tslib "^2.0.0"
 
-"@dnd-kit/core@^3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@dnd-kit/core/-/core-3.0.4.tgz#b10a0ffc9300a665108a4f7387b1c55dc6bf9c7f"
-  integrity sha512-EoUNyRWnRm8l0okwqG0iUwB0zrPkqBfJrIPdb3kMrTjoG/+70i4RnIuAhdKDnOxldFynWahPfJV3YBoDgeudgg==
+"@dnd-kit/core@^3.1.1":
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@dnd-kit/core/-/core-3.1.1.tgz#c5ad6665931f5a51e74226220e58ac7514f3faf0"
+  integrity sha512-18YY5+1lTqJbGSg6JBSa/fjAOTUYAysFrQ5Ti8oppEPHFacQbC+owM51y2z2KN0LkDHBfGZKw2sFT7++ttwfpA==
   dependencies:
     "@dnd-kit/accessibility" "^3.0.0"
     "@dnd-kit/utilities" "^2.0.0"
     tslib "^2.0.0"
 
-"@dnd-kit/sortable@^3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@dnd-kit/sortable/-/sortable-3.1.0.tgz#4638ea3d9202287ffb186679b593b3407c7e737d"
-  integrity sha512-BwnNgqMTqwIASdu9/x5PdqnAaFakx4HrflDP/zHfZAnGm912+Y545PlztVtAdxK+U6L3pXPR1BQaZO7JQjDxmg==
+"@dnd-kit/sortable@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@dnd-kit/sortable/-/sortable-4.0.0.tgz#81dd2b014a16527cf89602dc40060d9ee4dad352"
+  integrity sha512-teYVFy6mQG/u6F6CaGxAkzPfiNJvguFzWfJ/zonYQRxfANHX6QJ6GziMG9KON/Ae9Q2ODJP8vib+guWJrDXeGg==
   dependencies:
     "@dnd-kit/utilities" "^2.0.0"
     tslib "^2.0.0"