Remove droppable from map

This commit is contained in:
Mitchell McCaffrey 2021-05-13 16:27:07 +10:00
parent aece31f89a
commit 954089fbe5

View File

@ -19,8 +19,6 @@ import TokenDragOverlay from "../token/TokenDragOverlay";
import NoteMenu from "../note/NoteMenu"; import NoteMenu from "../note/NoteMenu";
import NoteDragOverlay from "../note/NoteDragOverlay"; import NoteDragOverlay from "../note/NoteDragOverlay";
import Droppable from "../Droppable";
import { import {
AddShapeAction, AddShapeAction,
CutShapeAction, CutShapeAction,
@ -340,32 +338,30 @@ function Map({
return ( return (
<Box sx={{ flexGrow: 1 }}> <Box sx={{ flexGrow: 1 }}>
<Droppable id="map" disabled={!map}> <MapInteraction
<MapInteraction map={map}
map={map} mapState={mapState}
mapState={mapState} controls={
controls={ <>
<> {mapControls}
{mapControls} {tokenMenu}
{tokenMenu} {noteMenu}
{noteMenu} {tokenDragOverlay}
{tokenDragOverlay} {noteDragOverlay}
{noteDragOverlay} </>
</> }
} selectedToolId={selectedToolId}
selectedToolId={selectedToolId} onSelectedToolChange={setSelectedToolId}
onSelectedToolChange={setSelectedToolId} disabledControls={disabledControls}
disabledControls={disabledControls} >
> {mapGrid}
{mapGrid} {mapDrawing}
{mapDrawing} {mapNotes}
{mapNotes} {mapTokens}
{mapTokens} {mapFog}
{mapFog} {mapPointer}
{mapPointer} {mapMeasure}
{mapMeasure} </MapInteraction>
</MapInteraction>
</Droppable>
</Box> </Box>
); );
} }