Prevent RoomTiles from being dragged into other droppables

lukebarnard1 · lukebarnard1 · commit 37fe3ac676ee · 2018-01-25T22:51:40.000+01:00
for the time being at least.
diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
@@ -572,13 +572,17 @@ var RoomSubList = React.createClass({
                 { subList }
             </div>;
 
-            return this.props.editable ? <Droppable droppableId={"room-sub-list-droppable_" + this.props.tagName}>
-                { (provided, snapshot) => (
-                    <div ref={provided.innerRef}>
-                        { subListContent }
-                    </div>
-                ) }
-            </Droppable> : subListContent;
+            return this.props.editable ?
+                <Droppable
+                    droppableId={"room-sub-list-droppable_" + this.props.tagName}
+                    type="draggable-RoomTile"
+                >
+                    { (provided, snapshot) => (
+                        <div ref={provided.innerRef}>
+                            { subListContent }
+                        </div>
+                    ) }
+                </Droppable> : subListContent;
         }
         else {
             var Loader = sdk.getComponent("elements.Spinner");
diff --git a/src/components/views/rooms/DNDRoomTile.js b/src/components/views/rooms/DNDRoomTile.js
@@ -41,6 +41,7 @@ export default class DNDRoomTile extends React.Component {
                 key={props.room.roomId}
                 draggableId={props.tagName + '_' + props.room.roomId}
                 index={props.index}
+                type="draggable-RoomTile"
             >
                 { (provided, snapshot) => {
                     return (

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ export default class DNDRoomTile extends React.Component {`
`41`	`41`	`key={props.room.roomId}`
`42`	`42`	`draggableId={props.tagName + '_' + props.room.roomId}`
`43`	`43`	`index={props.index}`
	`44`	`+ type="draggable-RoomTile"`
`44`	`45`	`>`
`45`	`46`	`{ (provided, snapshot) => {`
`46`	`47`	`return (`