From a3562be3e0859388cca263e7e9e7fa331e5e8221 Mon Sep 17 00:00:00 2001
From: skedwards88 <skedwards88@github.com>
Date: Sun, 20 Aug 2023 09:31:47 -0700
Subject: [PATCH] dragend also clears pool index if needed

---
 TODO.md                  |  1 +
 src/logic/gameReducer.js | 29 ++++++++++++++++++++++++-----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/TODO.md b/TODO.md
index 9e41757..71316b0 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,5 +1,6 @@
 # TODO
 
+- use lodash deep clone
 - hide drag image do like did in sector
   
 - make small puzzle more interconnected -- maybe by limiting grid size during generation?
diff --git a/src/logic/gameReducer.js b/src/logic/gameReducer.js
index fb78572..f838785 100644
--- a/src/logic/gameReducer.js
+++ b/src/logic/gameReducer.js
@@ -625,12 +625,31 @@ export function gameReducer(currentGameState, payload) {
     // according to the HTML spec, the drop event fires before the dragEnd event,
     // so we can assume that we can safely clear any drag data now
     // (This is here to handle the case where the user drops the pieces somewhere
-    // that is not a drop target, meaning the drop event didn't fire)
+    // that is not a drop target, meaning the drop event didn't fire.)
+    // In this case, we need to clear the drag data.
+    // We also want to make sure that the dragged piece isn't registered both as on the board and on the pool
 
-    return {
-      ...currentGameState,
-      dragData: {},
-    };
+    const draggedPieceID = currentGameState.dragData?.pieceID;
+    if (
+      draggedPieceID != undefined &&
+      currentGameState.pieces[draggedPieceID].poolIndex != undefined &&
+      currentGameState.pieces[draggedPieceID].boardTop != undefined &&
+      currentGameState.pieces[draggedPieceID].boardLeft != undefined
+    ) {
+      let newPieces = JSON.parse(JSON.stringify(currentGameState.pieces));
+      newPieces[draggedPieceID].poolIndex = undefined;
+
+      return {
+        ...currentGameState,
+        dragData: {},
+        pieces: newPieces,
+      };
+    } else {
+      return {
+        ...currentGameState,
+        dragData: {},
+      };
+    }
   } else if (payload.action === "clearStreakIfNeeded") {
     const lastDateWon = currentGameState.stats.lastDateWon;
     const wonYesterday = isYesterday(lastDateWon);