From 7f7471b1e9d27b63d5ca0936d439a7298ad2ff65 Mon Sep 17 00:00:00 2001
From: Mitchell McCaffrey <mitchemmc@gmail.com>
Date: Fri, 28 Aug 2020 15:17:52 +1000
Subject: [PATCH] Fix sorting bug when dragging token from tokens list

---
 src/components/map/Map.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/map/Map.js b/src/components/map/Map.js
index 50b674f..f3683b3 100644
--- a/src/components/map/Map.js
+++ b/src/components/map/Map.js
@@ -212,12 +212,14 @@ function Map({
         return bWeight - aWeight;
       } else if (
         draggingTokenOptions &&
+        draggingTokenOptions.dragging &&
         draggingTokenOptions.tokenState.id === a.id
       ) {
         // If dragging token a move above
         return 1;
       } else if (
         draggingTokenOptions &&
+        draggingTokenOptions.dragging &&
         draggingTokenOptions.tokenState.id === b.id
       ) {
         // If dragging token b move above