From 29b6ccff019e7652a060defe1c2bd3377af1a98e Mon Sep 17 00:00:00 2001 From: Alex Maclean Date: Tue, 7 Aug 2018 13:34:22 +1000 Subject: [PATCH 1/5] react sortable tree missing prop --- types/react-sortable-tree/index.d.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/types/react-sortable-tree/index.d.ts b/types/react-sortable-tree/index.d.ts index 0415db0414..3d0a7aa196 100644 --- a/types/react-sortable-tree/index.d.ts +++ b/types/react-sortable-tree/index.d.ts @@ -70,6 +70,12 @@ export interface OnDragPreviousAndNextLocation extends PreviousAndNextLocation { nextParent: TreeItem | null; } +export interface ShouldCopyData { + node: TreeItem, + prevPath: NumberArrayOrStringArray, + prevTreeIndex: number +} + export interface OnMovePreviousAndNextLocation extends PreviousAndNextLocation { nextParentNode: TreeItem | null; } @@ -186,6 +192,7 @@ export interface ReactSortableTreeProps { dndType?: string; placeholderRenderer?: PlaceholderRenderer; theme?: ThemeProps; + shouldCopyOnOutsideDrop?: boolean | ((data: ShouldCopyData) => boolean); } declare const SortableTree: React.ComponentClass; From f0d9be2343c4b9e499b9f618f6693cfcabdf4d0e Mon Sep 17 00:00:00 2001 From: Alex Maclean Date: Tue, 7 Aug 2018 13:36:39 +1000 Subject: [PATCH 2/5] Added myself! --- types/react-sortable-tree/index.d.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/types/react-sortable-tree/index.d.ts b/types/react-sortable-tree/index.d.ts index 3d0a7aa196..765cecf6c4 100644 --- a/types/react-sortable-tree/index.d.ts +++ b/types/react-sortable-tree/index.d.ts @@ -3,6 +3,7 @@ // Definitions by: Wouter Hardeman // Jovica Zoric // Kevin Perrine +// Alex Maclean // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped // TypeScript Version: 2.8 From b9cffcee563009ba1cad2fcf8e94432fc65b6abd Mon Sep 17 00:00:00 2001 From: Alex Maclean Date: Tue, 7 Aug 2018 14:27:33 +1000 Subject: [PATCH 3/5] semicolons? --- types/react-sortable-tree/index.d.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/types/react-sortable-tree/index.d.ts b/types/react-sortable-tree/index.d.ts index 765cecf6c4..e4678b399c 100644 --- a/types/react-sortable-tree/index.d.ts +++ b/types/react-sortable-tree/index.d.ts @@ -72,9 +72,9 @@ export interface OnDragPreviousAndNextLocation extends PreviousAndNextLocation { } export interface ShouldCopyData { - node: TreeItem, - prevPath: NumberArrayOrStringArray, - prevTreeIndex: number + node: TreeItem; + prevPath: NumberArrayOrStringArray; + prevTreeIndex: number; } export interface OnMovePreviousAndNextLocation extends PreviousAndNextLocation { From 4d292f7efdbd9ed8625bb52fd2117456fa0162b5 Mon Sep 17 00:00:00 2001 From: Alex Maclean Date: Tue, 7 Aug 2018 14:50:36 +1000 Subject: [PATCH 4/5] Fixed type --- types/react-sortable-tree/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/react-sortable-tree/index.d.ts b/types/react-sortable-tree/index.d.ts index e4678b399c..257e3aedf9 100644 --- a/types/react-sortable-tree/index.d.ts +++ b/types/react-sortable-tree/index.d.ts @@ -72,7 +72,7 @@ export interface OnDragPreviousAndNextLocation extends PreviousAndNextLocation { } export interface ShouldCopyData { - node: TreeItem; + node: TreeNode; prevPath: NumberArrayOrStringArray; prevTreeIndex: number; } From 46fd914aeb2c8183b1046bc02da68ef5f5be5a40 Mon Sep 17 00:00:00 2001 From: Alex Maclean Date: Fri, 17 Aug 2018 07:54:43 +1000 Subject: [PATCH 5/5] tests --- types/react-sortable-tree/react-sortable-tree-tests.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/types/react-sortable-tree/react-sortable-tree-tests.tsx b/types/react-sortable-tree/react-sortable-tree-tests.tsx index 6ed4b3e74b..695614caca 100644 --- a/types/react-sortable-tree/react-sortable-tree-tests.tsx +++ b/types/react-sortable-tree/react-sortable-tree-tests.tsx @@ -69,11 +69,13 @@ class Test extends React.Component { dndType="testNodeType" placeholderRenderer={PlaceholderRenderer} theme={theme} + shouldCopyOnOutsideDrop={true} /> {}} style={{width: "100px"}} + shouldCopyOnOutsideDrop={() => false} /> );