Prevent RoomTiles from being dragged into other droppables

for the time being at least.
This commit is contained in:
lukebarnard 2018-01-25 22:51:40 +01:00
parent 2926154dce
commit 37fe3ac676
2 changed files with 12 additions and 7 deletions

View File

@ -572,13 +572,17 @@ var RoomSubList = React.createClass({
{ subList } { subList }
</div>; </div>;
return this.props.editable ? <Droppable droppableId={"room-sub-list-droppable_" + this.props.tagName}> return this.props.editable ?
{ (provided, snapshot) => ( <Droppable
<div ref={provided.innerRef}> droppableId={"room-sub-list-droppable_" + this.props.tagName}
{ subListContent } type="draggable-RoomTile"
</div> >
) } { (provided, snapshot) => (
</Droppable> : subListContent; <div ref={provided.innerRef}>
{ subListContent }
</div>
) }
</Droppable> : subListContent;
} }
else { else {
var Loader = sdk.getComponent("elements.Spinner"); var Loader = sdk.getComponent("elements.Spinner");

View File

@ -41,6 +41,7 @@ export default class DNDRoomTile extends React.Component {
key={props.room.roomId} key={props.room.roomId}
draggableId={props.tagName + '_' + props.room.roomId} draggableId={props.tagName + '_' + props.room.roomId}
index={props.index} index={props.index}
type="draggable-RoomTile"
> >
{ (provided, snapshot) => { { (provided, snapshot) => {
return ( return (