Skip to content

Commit 05e914c

Browse files
authored
Merge pull request #4 from dolezel/fixing_dnd
Using DragDropContextConsumer directly
2 parents a8b2d80 + 19b2ff2 commit 05e914c

File tree

3 files changed

+25
-13
lines changed

3 files changed

+25
-13
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@
6262
"eslint-plugin-react": "^7.11.1",
6363
"in-publish": "^2.0.0",
6464
"mocha": "^5.2.0",
65-
"react-dnd": "^7.0.2",
65+
"react-dnd": "^7.3.0",
6666
"sinon": "^7.1.1",
6767
"sinon-chai": "^3.2.0"
6868
},
6969
"peerDependencies": {
70-
"react-dnd": "^6.0.0 || ^7.0.0"
70+
"react-dnd": "^7.3.0"
7171
}
7272
}

src/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { findDOMNode } from 'react-dom';
44
import throttle from 'lodash.throttle';
55
import raf from 'raf';
66
import getDisplayName from 'react-display-name';
7-
import { Consumer as DragDropContextConsumer } from 'react-dnd/lib/DragDropContext';
7+
import { DragDropContextConsumer } from 'react-dnd';
88
import hoist from 'hoist-non-react-statics';
99
import { noop, intBetween, getCoords } from './util';
1010

yarn.lock

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1276,10 +1276,10 @@ [email protected], diff@^3.5.0:
12761276
resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
12771277
integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
12781278

1279-
dnd-core@^7.0.2:
1280-
version "7.0.2"
1281-
resolved "https://registry.yarnpkg.com/dnd-core/-/dnd-core-7.0.2.tgz#6c080eb57243fa0372fd083b3db242d9eb525010"
1282-
integrity sha512-InwRBi6zTndtE3+3nTYpLJkYMEr7utSR7OziAoSFhtQsbUfJE1KeqxM+ZFRIMKn6ehxUTAC+QU6QC7IG9u86Mg==
1279+
dnd-core@^7.2.0:
1280+
version "7.2.0"
1281+
resolved "https://registry.yarnpkg.com/dnd-core/-/dnd-core-7.2.0.tgz#70d4ab6c0c6f90423c27b1711624b5d834025bf3"
1282+
integrity sha512-KUCI+m2Q4k3QlWWsiyUu2R/d0nJo3oGHknM/lGOD4u1XPA4O+LJyYe7PQBzY4J6ehaHGoQ/soTUu/KfaLSOL8w==
12831283
dependencies:
12841284
asap "^2.0.6"
12851285
invariant "^2.2.4"
@@ -1863,6 +1863,13 @@ hoist-non-react-statics@^3.1.0:
18631863
dependencies:
18641864
react-is "^16.3.2"
18651865

1866+
hoist-non-react-statics@^3.3.0:
1867+
version "3.3.0"
1868+
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz#b09178f0122184fb95acf525daaecb4d8f45958b"
1869+
integrity sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==
1870+
dependencies:
1871+
react-is "^16.7.0"
1872+
18661873
home-or-tmp@^3.0.0:
18671874
version "3.0.0"
18681875
resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-3.0.0.tgz#57a8fe24cf33cdd524860a15821ddc25c86671fb"
@@ -2872,13 +2879,13 @@ react-display-name@^0.2.0:
28722879
resolved "https://registry.yarnpkg.com/react-display-name/-/react-display-name-0.2.4.tgz#e2a670b81d79a2204335510c01246f4c92ff12cf"
28732880
integrity sha512-zvU6iouW+SWwHTyThwxGICjJYCMZFk/6r/+jmOdC7ntQoPlS/Pqb81MkxaMf2bHTSq9TN3K3zX2/ayMW/jCtyA==
28742881

2875-
react-dnd@^7.0.2:
2876-
version "7.0.2"
2877-
resolved "https://registry.yarnpkg.com/react-dnd/-/react-dnd-7.0.2.tgz#8f5611a6e877592932c082d6280c64d1c817f420"
2878-
integrity sha512-nJnHJo/tNQjyod234+hPNopWHPvgH0gujf3pcdJWRe3l0GL+jSXXwXJ2SFwIHkVmxPYrx8+gbKU3+Pq26p6fkg==
2882+
react-dnd@^7.3.0:
2883+
version "7.3.2"
2884+
resolved "https://registry.yarnpkg.com/react-dnd/-/react-dnd-7.3.2.tgz#c8660f0266caf8995b8f5bdea962ce00bc7b664d"
2885+
integrity sha512-chMQT4y+6CTQdRSpNEl+0JTNevCAkE7TmDewqF2GVejsgdCtVEMz/3SGk+fluMXMYPfhYlMDMHa+xWWO5QfM8Q==
28792886
dependencies:
2880-
dnd-core "^7.0.2"
2881-
hoist-non-react-statics "^3.1.0"
2887+
dnd-core "^7.2.0"
2888+
hoist-non-react-statics "^3.3.0"
28822889
invariant "^2.1.0"
28832890
lodash "^4.17.11"
28842891
recompose "^0.30.0"
@@ -2899,6 +2906,11 @@ react-is@^16.3.2:
28992906
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.6.3.tgz#d2d7462fcfcbe6ec0da56ad69047e47e56e7eac0"
29002907
integrity sha512-u7FDWtthB4rWibG/+mFbVd5FvdI20yde86qKGx4lVUTWmPlSWQ4QxbBIrrs+HnXGbxOUlUzTAP/VDmvCwaP2yA==
29012908

2909+
react-is@^16.7.0:
2910+
version "16.8.4"
2911+
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.4.tgz#90f336a68c3a29a096a3d648ab80e87ec61482a2"
2912+
integrity sha512-PVadd+WaUDOAciICm/J1waJaSvgq+4rHE/K70j0PFqKhkTBsPv/82UGQJNXAngz1fOQLLxI6z1sEDmJDQhCTAA==
2913+
29022914
react-lifecycles-compat@^3.0.2:
29032915
version "3.0.4"
29042916
resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"

0 commit comments

Comments
 (0)