From 954089fbe513e53f6f3a30c178f74b1b4263eb0d Mon Sep 17 00:00:00 2001
From: Mitchell McCaffrey <mitchemmc@gmail.com>
Date: Thu, 13 May 2021 16:27:07 +1000
Subject: [PATCH] Remove droppable from map
---
src/components/map/Map.js | 52 ++++++++++++++++++---------------------
1 file changed, 24 insertions(+), 28 deletions(-)
diff --git a/src/components/map/Map.js b/src/components/map/Map.js
index ba0df02..33fa62d 100644
--- a/src/components/map/Map.js
+++ b/src/components/map/Map.js
@@ -19,8 +19,6 @@ import TokenDragOverlay from "../token/TokenDragOverlay";
import NoteMenu from "../note/NoteMenu";
import NoteDragOverlay from "../note/NoteDragOverlay";
-import Droppable from "../Droppable";
-
import {
AddShapeAction,
CutShapeAction,
@@ -340,32 +338,30 @@ function Map({
return (
<Box sx={{ flexGrow: 1 }}>
- <Droppable id="map" disabled={!map}>
- <MapInteraction
- map={map}
- mapState={mapState}
- controls={
- <>
- {mapControls}
- {tokenMenu}
- {noteMenu}
- {tokenDragOverlay}
- {noteDragOverlay}
- </>
- }
- selectedToolId={selectedToolId}
- onSelectedToolChange={setSelectedToolId}
- disabledControls={disabledControls}
- >
- {mapGrid}
- {mapDrawing}
- {mapNotes}
- {mapTokens}
- {mapFog}
- {mapPointer}
- {mapMeasure}
- </MapInteraction>
- </Droppable>
+ <MapInteraction
+ map={map}
+ mapState={mapState}
+ controls={
+ <>
+ {mapControls}
+ {tokenMenu}
+ {noteMenu}
+ {tokenDragOverlay}
+ {noteDragOverlay}
+ </>
+ }
+ selectedToolId={selectedToolId}
+ onSelectedToolChange={setSelectedToolId}
+ disabledControls={disabledControls}
+ >
+ {mapGrid}
+ {mapDrawing}
+ {mapNotes}
+ {mapTokens}
+ {mapFog}
+ {mapPointer}
+ {mapMeasure}
+ </MapInteraction>
</Box>
);
}