Skip to content

Commit be4e1ef

Browse files
committed
Merge branch 'GabiAxel-master'
2 parents 8a18222 + 357b172 commit be4e1ef

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ getNodeKey | func | defaultGetNodeKey | | De
5959
onMoveNode | func | | | Called after node move operation. <div>`({ treeData: object[], node: object, treeIndex: number, path: number[] or string[] }): void`</div>
6060
onVisibilityToggle | func | | | Called after children nodes collapsed or expanded. <div>`({ treeData: object[], node: object, expanded: bool }): void`</div>
6161
canDrag | func or bool | `true` | | Return false from callback to prevent node from dragging, by hiding the drag handle. Set prop to `false` to disable dragging on all nodes. <div>`({ node: object, path: number[] or string[], treeIndex: number, lowerSiblingCounts: number[], isSearchMatch: bool, isSearchFocus: bool }): bool`</div>
62-
canDrop | func | | | Return false to prevent node from dropping in the given location. <div>`({ node: object, prevPath: number[] or string[], prevParent: object, nextPath: number[] or string[], nextParent: object}): bool`</div>
62+
canDrop | func | | | Return false to prevent node from dropping in the given location. <div>`({ node: object, prevPath: number[] or string[], prevParent: object, prevTreeIndex: number, nextPath: number[] or string[], nextParent: object, nextTreeIndex: number}): bool`</div>
6363
reactVirtualizedListProps | object | | | Custom properties to hand to the [react-virtualized list](https://github.com/bvaughn/react-virtualized/blob/master/docs/List.md#prop-types)
6464
rowHeight | number or func | `62` | | Used by react-virtualized. Either a fixed row height (number) or a function that returns the height of a row given its index: `({ index: number }): number`
6565
slideRegionSize | number | `100` | | Size in px of the region near the edges that initiates scrolling on dragover.

src/utils/drag-and-drop-utils.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ const nodeDragSource = {
1919
node: props.node,
2020
parentNode: props.parentNode,
2121
path: props.path,
22+
treeIndex: props.treeIndex,
2223
};
2324
},
2425

@@ -90,10 +91,12 @@ function canDrop(dropTargetProps, monitor) {
9091

9192
return dropTargetProps.customCanDrop({
9293
node,
93-
prevPath: monitor.getItem().path,
94-
prevParent: monitor.getItem().parentNode,
95-
nextPath: addedResult.path,
96-
nextParent: addedResult.parentNode,
94+
prevPath: monitor.getItem().path,
95+
prevParent: monitor.getItem().parentNode,
96+
prevTreeIndex: monitor.getItem().treeIndex,
97+
nextPath: addedResult.path,
98+
nextParent: addedResult.parentNode,
99+
nextTreeIndex: addedResult.treeIndex,
97100
});
98101
}
99102

0 commit comments

Comments
 (0)