Skip to content

Commit 6d72f29

Browse files
committed
Merge branch 'HMILogic-master'
2 parents fdce5ae + 9e8bb4a commit 6d72f29

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

src/index.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
1-
import SortableTree from './react-sortable-tree';
1+
import SortableTree, { SortableTreeWithoutDndContext } from './react-sortable-tree';
22

33
export * from './utils/default-handlers';
44
export * from './utils/tree-data-utils';
55
export default SortableTree;
6+
7+
// Export the tree component without the react-dnd DragDropContext,
8+
// for when component is used with other components using react-dnd.
9+
// see: https://github.com/gaearon/react-dnd/issues/186
10+
export { SortableTreeWithoutDndContext };

src/react-sortable-tree.js

+5
Original file line numberDiff line numberDiff line change
@@ -545,4 +545,9 @@ ReactSortableTree.defaultProps = {
545545
isVirtualized: true,
546546
};
547547

548+
// Export the tree component without the react-dnd DragDropContext,
549+
// for when component is used with other components using react-dnd.
550+
// see: https://github.com/gaearon/react-dnd/issues/186
551+
export { ReactSortableTree as SortableTreeWithoutDndContext };
552+
548553
export default dndWrapRoot(ReactSortableTree);

0 commit comments

Comments
 (0)