From 7bc9995fd2eb437debbc9d65dba926dd62e1e1d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Dole=C5=BEel?= Date: Tue, 19 Mar 2019 17:44:21 +0100 Subject: [PATCH] fix: Using DragDropContextConsumer directly (#466) * Using DragDropContextConsumer directly * Update package.json --- package.json | 6 +++--- rollup.config.js | 1 - src/react-sortable-tree.js | 2 +- yarn.lock | 42 ++++++++++++++++++++++++-------------- 4 files changed, 31 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index 15d131a4..4295541e 100644 --- a/package.json +++ b/package.json @@ -60,10 +60,10 @@ "> 1%" ], "dependencies": { - "frontend-collective-react-dnd-scrollzone": "^1.0.1", + "frontend-collective-react-dnd-scrollzone": "^1.0.2", "lodash.isequal": "^4.5.0", "prop-types": "^15.6.1", - "react-dnd": "^6.0.0 || ~7.0.0", + "react-dnd": "^7.3.0", "react-dnd-html5-backend": "^7.0.1", "react-lifecycles-compat": "^3.0.4", "react-sortable-tree": "^2.6.0", @@ -71,7 +71,7 @@ }, "peerDependencies": { "react": "^16.3.0", - "react-dnd": "^6.0.0 || ~7.0.0", + "react-dnd": "^7.3.0", "react-dom": "^16.3.0" }, "devDependencies": { diff --git a/rollup.config.js b/rollup.config.js index 8ce9ce69..df7644d4 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -23,7 +23,6 @@ export default { 'react', 'react-dom', 'react-dnd', - 'react-dnd/lib/DragDropContext', 'prop-types', 'react-dnd-html5-backend', 'frontend-collective-react-dnd-scrollzone', diff --git a/src/react-sortable-tree.js b/src/react-sortable-tree.js index 697f2351..1c4fb743 100644 --- a/src/react-sortable-tree.js +++ b/src/react-sortable-tree.js @@ -7,7 +7,7 @@ import withScrolling, { createVerticalStrength, createHorizontalStrength, } from 'frontend-collective-react-dnd-scrollzone'; -import { Consumer as DragDropContextConsumer } from 'react-dnd/lib/DragDropContext'; +import { DragDropContextConsumer } from 'react-dnd'; import { polyfill } from 'react-lifecycles-compat'; import 'react-virtualized/styles.css'; import TreeNode from './tree-node'; diff --git a/yarn.lock b/yarn.lock index 9121c833..2ce74e9d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4531,10 +4531,10 @@ dnd-core@^7.0.1: lodash "^4.17.11" redux "^4.0.1" -dnd-core@^7.0.2: - version "7.1.0" - resolved "https://registry.yarnpkg.com/dnd-core/-/dnd-core-7.1.0.tgz#fb0a51a2a2b0b47da900e3762e6bb92084dfa827" - integrity sha512-5ar9HY0PkF8RJZMoTBzzWwe5hMqsu3+pyCcqOFYTbwnkJByEKhXIFLIe5ALBmzgOJ+kbcddLx3UqcI+yWCU8bQ== +dnd-core@^7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/dnd-core/-/dnd-core-7.2.0.tgz#70d4ab6c0c6f90423c27b1711624b5d834025bf3" + integrity sha512-KUCI+m2Q4k3QlWWsiyUu2R/d0nJo3oGHknM/lGOD4u1XPA4O+LJyYe7PQBzY4J6ehaHGoQ/soTUu/KfaLSOL8w== dependencies: asap "^2.0.6" invariant "^2.2.4" @@ -6363,6 +6363,13 @@ hoist-non-react-statics@^3.1.0: dependencies: react-is "^16.3.2" +hoist-non-react-statics@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz#b09178f0122184fb95acf525daaecb4d8f45958b" + integrity sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA== + dependencies: + react-is "^16.7.0" + home-or-tmp@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8" @@ -10709,25 +10716,25 @@ react-dnd@2.5.4: lodash "^4.2.0" prop-types "^15.5.10" -"react-dnd@^6.0.0 || ~7.0.0": - version "7.0.2" - resolved "https://registry.yarnpkg.com/react-dnd/-/react-dnd-7.0.2.tgz#8f5611a6e877592932c082d6280c64d1c817f420" - integrity sha512-nJnHJo/tNQjyod234+hPNopWHPvgH0gujf3pcdJWRe3l0GL+jSXXwXJ2SFwIHkVmxPYrx8+gbKU3+Pq26p6fkg== +react-dnd@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/react-dnd/-/react-dnd-7.0.1.tgz#155f2f14054ac29c2ae87cb9543e98a3adb71025" + integrity sha512-Iql5+6v2KQzJlLY9rC0uMjmgN86HoiLpTFADKGTQKU0+vIVqUBsuBChmpkpPh4+1XmWs9Dn8AY9wyBlwZ2Cibw== dependencies: - dnd-core "^7.0.2" + dnd-core "^7.0.1" hoist-non-react-statics "^3.1.0" invariant "^2.1.0" lodash "^4.17.11" recompose "^0.30.0" shallowequal "^1.1.0" -react-dnd@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/react-dnd/-/react-dnd-7.0.1.tgz#155f2f14054ac29c2ae87cb9543e98a3adb71025" - integrity sha512-Iql5+6v2KQzJlLY9rC0uMjmgN86HoiLpTFADKGTQKU0+vIVqUBsuBChmpkpPh4+1XmWs9Dn8AY9wyBlwZ2Cibw== +react-dnd@^7.3.0: + version "7.3.2" + resolved "https://registry.yarnpkg.com/react-dnd/-/react-dnd-7.3.2.tgz#c8660f0266caf8995b8f5bdea962ce00bc7b664d" + integrity sha512-chMQT4y+6CTQdRSpNEl+0JTNevCAkE7TmDewqF2GVejsgdCtVEMz/3SGk+fluMXMYPfhYlMDMHa+xWWO5QfM8Q== dependencies: - dnd-core "^7.0.1" - hoist-non-react-statics "^3.1.0" + dnd-core "^7.2.0" + hoist-non-react-statics "^3.3.0" invariant "^2.1.0" lodash "^4.17.11" recompose "^0.30.0" @@ -10797,6 +10804,11 @@ react-is@^16.3.2, react-is@^16.6.1, react-is@^16.6.3: resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.6.3.tgz#d2d7462fcfcbe6ec0da56ad69047e47e56e7eac0" integrity sha512-u7FDWtthB4rWibG/+mFbVd5FvdI20yde86qKGx4lVUTWmPlSWQ4QxbBIrrs+HnXGbxOUlUzTAP/VDmvCwaP2yA== +react-is@^16.7.0: + version "16.8.4" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.4.tgz#90f336a68c3a29a096a3d648ab80e87ec61482a2" + integrity sha512-PVadd+WaUDOAciICm/J1waJaSvgq+4rHE/K70j0PFqKhkTBsPv/82UGQJNXAngz1fOQLLxI6z1sEDmJDQhCTAA== + react-lifecycles-compat@^3.0.0, react-lifecycles-compat@^3.0.2, react-lifecycles-compat@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"