From 53d4e0550247444180a505810c79950f7f2e4758 Mon Sep 17 00:00:00 2001
From: Mitchell McCaffrey <mitchemmc@gmail.com>
Date: Mon, 22 Feb 2021 17:14:12 +1100
Subject: [PATCH] Clear map actions on reset

---
 src/components/map/Map.js             | 4 ++--
 src/components/map/MapControls.js     | 4 ++--
 src/components/map/SelectMapButton.js | 4 ++--
 src/modals/SelectMapModal.js          | 4 ++--
 src/network/NetworkedMapAndTokens.js  | 5 +++--
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/components/map/Map.js b/src/components/map/Map.js
index 885cbfd..19ad2be 100644
--- a/src/components/map/Map.js
+++ b/src/components/map/Map.js
@@ -32,7 +32,7 @@ function Map({
   onMapTokenStateChange,
   onMapTokenStateRemove,
   onMapChange,
-  onMapStateChange,
+  onMapReset,
   onMapDraw,
   onMapDrawUndo,
   onMapDrawRedo,
@@ -153,7 +153,7 @@ function Map({
   const mapControls = (
     <MapControls
       onMapChange={onMapChange}
-      onMapStateChange={onMapStateChange}
+      onMapReset={onMapReset}
       currentMap={map}
       currentMapState={mapState}
       onSelectedToolChange={setSelectedToolId}
diff --git a/src/components/map/MapControls.js b/src/components/map/MapControls.js
index 7ecca0e..44b3f77 100644
--- a/src/components/map/MapControls.js
+++ b/src/components/map/MapControls.js
@@ -24,7 +24,7 @@ import useSetting from "../../hooks/useSetting";
 
 function MapContols({
   onMapChange,
-  onMapStateChange,
+  onMapReset,
   currentMap,
   currentMapState,
   selectedToolId,
@@ -81,7 +81,7 @@ function MapContols({
       component: (
         <SelectMapButton
           onMapChange={onMapChange}
-          onMapStateChange={onMapStateChange}
+          onMapReset={onMapReset}
           currentMap={currentMap}
           currentMapState={currentMapState}
           disabled={disabledControls.includes("map")}
diff --git a/src/components/map/SelectMapButton.js b/src/components/map/SelectMapButton.js
index 8484ee9..d5f7d7f 100644
--- a/src/components/map/SelectMapButton.js
+++ b/src/components/map/SelectMapButton.js
@@ -9,7 +9,7 @@ import { useAuth } from "../../contexts/AuthContext";
 
 function SelectMapButton({
   onMapChange,
-  onMapStateChange,
+  onMapReset,
   currentMap,
   currentMapState,
   disabled,
@@ -43,7 +43,7 @@ function SelectMapButton({
         isOpen={isModalOpen}
         onDone={handleDone}
         onMapChange={onMapChange}
-        onMapStateChange={onMapStateChange}
+        onMapReset={onMapReset}
         currentMap={currentMap}
       />
     </>
diff --git a/src/modals/SelectMapModal.js b/src/modals/SelectMapModal.js
index 746dd5d..69cb5c5 100644
--- a/src/modals/SelectMapModal.js
+++ b/src/modals/SelectMapModal.js
@@ -50,7 +50,7 @@ function SelectMapModal({
   isOpen,
   onDone,
   onMapChange,
-  onMapStateChange,
+  onMapReset,
   // The map currently being view in the map screen
   currentMap,
 }) {
@@ -290,7 +290,7 @@ function SelectMapModal({
       const newState = await resetMap(id);
       // Reset the state of the current map if needed
       if (currentMap && currentMap.id === id) {
-        onMapStateChange(newState);
+        onMapReset(newState);
       }
     }
     setIsLoading(false);
diff --git a/src/network/NetworkedMapAndTokens.js b/src/network/NetworkedMapAndTokens.js
index 2238d7b..601fbe8 100644
--- a/src/network/NetworkedMapAndTokens.js
+++ b/src/network/NetworkedMapAndTokens.js
@@ -229,8 +229,9 @@ function NetworkedMapAndTokens({ session }) {
     await loadAssetManifestFromMap(newMap, newMapState);
   }
 
-  function handleMapStateChange(newMapState) {
+  function handleMapReset(newMapState) {
     setCurrentMapState(newMapState, true, true);
+    setMapActions(defaultMapActions);
   }
 
   const [mapActions, setMapActions] = useState(defaultMapActions);
@@ -569,7 +570,7 @@ function NetworkedMapAndTokens({ session }) {
         onMapTokenStateChange={handleMapTokenStateChange}
         onMapTokenStateRemove={handleMapTokenStateRemove}
         onMapChange={handleMapChange}
-        onMapStateChange={handleMapStateChange}
+        onMapReset={handleMapReset}
         onMapDraw={handleMapDraw}
         onMapDrawUndo={handleMapDrawUndo}
         onMapDrawRedo={handleMapDrawRedo}