Skip to content

Commit 31c320b

Browse files
committed
Refactor canDrop name internally to avoid confusion
1 parent 6a72d92 commit 31c320b

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

src/react-sortable-tree.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ class ReactSortableTree extends Component {
427427
getPrevRow={getPrevRow}
428428
treeData={this.state.draggingTreeData || this.state.treeData}
429429
getNodeKey={this.props.getNodeKey}
430-
canDrop={this.props.canDrop}
430+
customCanDrop={this.props.canDrop}
431431
node={node}
432432
path={path}
433433
lowerSiblingCounts={lowerSiblingCounts}

src/tree-node.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ const TreeNode = ({
1414
draggedNode,
1515
canDrop,
1616
treeIndex,
17-
canDrop: _canDrop, // Delete from otherProps
18-
dragHover: _dragHover, // Delete from otherProps
19-
getNodeKey: _getNodeKey, // Delete from otherProps
20-
getPrevRow: _getPrevRow, // Delete from otherProps
21-
maxDepth: _maxDepth, // Delete from otherProps
22-
node: _node, // Delete from otherProps
23-
path: _path, // Delete from otherProps
24-
treeData: _treeData, // Delete from otherProps
17+
customCanDrop: _customCanDrop, // Delete from otherProps
18+
dragHover: _dragHover, // Delete from otherProps
19+
getNodeKey: _getNodeKey, // Delete from otherProps
20+
getPrevRow: _getPrevRow, // Delete from otherProps
21+
maxDepth: _maxDepth, // Delete from otherProps
22+
node: _node, // Delete from otherProps
23+
path: _path, // Delete from otherProps
24+
treeData: _treeData, // Delete from otherProps
2525
...otherProps,
2626
}) => {
2727
// Construct the scaffold representing the structure of the tree

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ function canDrop(dropTargetProps, monitor) {
7676
return false;
7777
}
7878

79-
if (typeof dropTargetProps.canDrop === 'function') {
79+
if (typeof dropTargetProps.customCanDrop === 'function') {
8080
const draggedNode = monitor.getItem().node;
8181
const addedResult = memoizedInsertNode({
8282
treeData: dropTargetProps.treeData,
@@ -87,7 +87,7 @@ function canDrop(dropTargetProps, monitor) {
8787
expandParent: true,
8888
});
8989

90-
return dropTargetProps.canDrop({
90+
return dropTargetProps.customCanDrop({
9191
draggedNode,
9292
prevPath: monitor.getItem().path,
9393
nextPath: addedResult.path,

0 commit comments

Comments
 (0)