Skip to content

Commit 4fa4e0f

Browse files
authored
Merge pull request #3880 from legrego/ft/3714-dependencies-not-compatible-with-React-16
Fixes #3714: Update react-collapse and react-motion for React 16 support
2 parents 362f139 + 57a3be2 commit 4fa4e0f

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@
6161
"react-addons-perf": "^15.4.0",
6262
"react-addons-shallow-compare": "0.14.8",
6363
"react-addons-test-utils": "^15.6.2",
64-
"react-collapse": "2.3.1",
64+
"react-collapse": "^4.0.3",
6565
"react-dom": "^15.6.2",
6666
"react-height": "^2.0.0",
6767
"react-hot-loader": "1.3.1",
6868
"react-immutable-proptypes": "2.1.0",
6969
"react-markdown": "^2.5.0",
70-
"react-motion": "0.4.4",
70+
"react-motion": "^0.5.2",
7171
"react-object-inspector": "0.2.1",
7272
"react-redux": "^4.x.x",
7373
"react-split-pane": "0.1.57",

src/core/components/debug.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react"
22
import PropTypes from "prop-types"
3-
import Collapse from "react-collapse"
3+
import { Collapse } from "react-collapse"
44
import { presets } from "react-motion"
55
import ObjectInspector from "react-object-inspector"
66
import Perf from "react-addons-perf"

src/core/components/errors.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from "react"
22
import PropTypes from "prop-types"
33
import { List } from "immutable"
4-
import Collapse from "react-collapse"
4+
import { Collapse } from "react-collapse"
55

66
export default class Errors extends React.Component {
77

src/core/components/layout-utils.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react"
22
import PropTypes from "prop-types"
3-
import OriCollapse from "react-collapse"
3+
import { Collapse as OriCollapse } from "react-collapse"
44

55
function xclass(...args) {
66
return args.filter(a => !!a).join(" ").trim()

0 commit comments

Comments
 (0)