Skip to content

Commit 2fb1859

Browse files
committed
Updated for react 16.
1 parent 6a37159 commit 2fb1859

10 files changed

+136
-148
lines changed

Diff for: .nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.2.1
1+
6

Diff for: package.json

+6-5
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
},
2121
"homepage": "https://github.com/socialtables/react-infinity-menu",
2222
"dependencies": {
23-
"lodash": "^4.16.6",
23+
"lodash.get": "^4.4.2",
2424
"nested-objects": "0.0.2"
2525
},
2626
"devDependencies": {
@@ -37,17 +37,18 @@
3737
"eslint-plugin-react": "^6.9.0",
3838
"jsdom": "^6.5.1",
3939
"mocha": "^2.3.3",
40-
"react": "^0.14.3",
41-
"react-addons-test-utils": "^0.14.3",
42-
"react-dom": "^0.14.3",
40+
"prop-types": "^15.6.0",
41+
"react": "^16.0.0",
42+
"react-dom": "^16.0.0",
43+
"react-test-renderer": "^16.1.1",
4344
"should": "^7.1.0",
4445
"should-sinon": "0.0.3",
4546
"sinon": "^1.17.1",
4647
"style-loader": "^0.13.0",
4748
"webpack": "^1.12.2"
4849
},
4950
"peerDependencies": {
50-
"react": ">=0.13.2"
51+
"react": ">=0.16.0"
5152
},
5253
"directories": {
5354
"example": "example",

Diff for: src/infinity-menu.js

+16-15
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
import PropTypes from "prop-types";
12
import React from "react";
23
import SearchInput from "./search-input";
34
import NestedObjects from "nested-objects";
4-
import _get from "lodash/get";
5+
import _get from "lodash.get";
56

67
/*
78
* @class InfinityMenu
@@ -377,20 +378,20 @@ export default class InfinityMenu extends React.Component {
377378
}
378379

379380
InfinityMenu.propTypes = {
380-
tree: React.PropTypes.array,
381-
headerContent: React.PropTypes.any,
382-
disableDefaultHeaderContent: React.PropTypes.bool,
383-
headerProps: React.PropTypes.object,
384-
customComponentMappings: React.PropTypes.object,
385-
emptyTreeComponent: React.PropTypes.any,
386-
emptyTreeComponentProps: React.PropTypes.object,
387-
filter: React.PropTypes.func,
388-
onNodeMouseClick: React.PropTypes.func,
389-
onLeafMouseClick: React.PropTypes.func,
390-
onLeafMouseDown: React.PropTypes.func,
391-
onLeafMouseUp: React.PropTypes.func,
392-
shouldComponentUpdate: React.PropTypes.func,
393-
maxLeaves: React.PropTypes.number
381+
tree: PropTypes.array,
382+
headerContent: PropTypes.any,
383+
disableDefaultHeaderContent: PropTypes.bool,
384+
headerProps: PropTypes.object,
385+
customComponentMappings: PropTypes.object,
386+
emptyTreeComponent: PropTypes.any,
387+
emptyTreeComponentProps: PropTypes.object,
388+
filter: PropTypes.func,
389+
onNodeMouseClick: PropTypes.func,
390+
onLeafMouseClick: PropTypes.func,
391+
onLeafMouseDown: PropTypes.func,
392+
onLeafMouseUp: PropTypes.func,
393+
shouldComponentUpdate: PropTypes.func,
394+
maxLeaves: PropTypes.number
394395
};
395396

396397
InfinityMenu.defaultProps = {

Diff for: test/basic-render.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from "react";
22
import ReactDOM from "react-dom";
3-
import TestUtils from "react-addons-test-utils";
4-
let shallowRenderer = TestUtils.createRenderer();
3+
import { createRenderer } from "react-test-renderer/shallow";
4+
let shallowRenderer = createRenderer();
55
import InfinityMenu from "../src/infinity-menu";
66
import sinon from "sinon";
77
import "should-sinon";

Diff for: test/custom-component-prop.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import React from "react";
22
import ReactDOM from "react-dom";
3-
import TestUtils from "react-addons-test-utils";
4-
let shallowRenderer = TestUtils.createRenderer();
3+
import TestUtils from "react-dom/test-utils";
4+
import { createRenderer } from "react-test-renderer/shallow";
5+
let shallowRenderer = createRenderer();
56
import InfinityMenu from "../src/infinity-menu";
67
import sinon from "sinon";
78
import should from "should";

Diff for: test/empty-list-component-props.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import React from "react";
22
import ReactDOM from "react-dom";
3-
import TestUtils from "react-addons-test-utils";
43
import InfinityMenu from "../src/infinity-menu";
54
import sinon from "sinon";
65
import should from "should";
76
import "should-sinon";
8-
let shallowRenderer = TestUtils.createRenderer();
7+
import { createRenderer } from "react-test-renderer/shallow";
8+
let shallowRenderer = createRenderer();
9+
import TestUtils from "react-dom/test-utils";
910

1011
describe("Empty List Component props", function() {
1112
it("should render `emptyTreeComponent` prop if `tree` prop is empty Array", function() {

Diff for: test/header-props.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import React from "react";
22
import ReactDOM from "react-dom";
3-
import TestUtils from "react-addons-test-utils";
4-
let shallowRenderer = TestUtils.createRenderer();
3+
import { createRenderer } from "react-test-renderer/shallow";
4+
let shallowRenderer = createRenderer();
55
import InfinityMenu from "../src/infinity-menu";
66
import should from "should";
77
import "should-sinon";
8+
import TestUtils from "react-dom/test-utils";
89

910
describe("Header props", function() {
1011
it("should render correctly pass headerProps to the headerContent", function () {

Diff for: test/leaf-node-mouse-handler-props.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import React from "react";
22
import ReactDOM from "react-dom";
3-
import TestUtils from "react-addons-test-utils";
4-
let shallowRenderer = TestUtils.createRenderer();
3+
import { createRenderer } from "react-test-renderer/shallow";
4+
let shallowRenderer = createRenderer();
55
import InfinityMenu from "../src/infinity-menu";
66
import sinon from "sinon";
77
import "should-sinon";
8+
import TestUtils from "react-dom/test-utils";
89

910
describe("Leaf/Node Mouse Handlers", function() {
1011
let component;

Diff for: test/should-component-update.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import React from "react";
22
import ReactDOM from "react-dom";
3-
import TestUtils from "react-addons-test-utils";
43
import InfinityMenu from "../src/infinity-menu";
54
import should from "should";
65
import sinon from "sinon";
76
import "should-sinon";
7+
import TestUtils from "react-dom/test-utils";
88

99
describe("shouldComponentUpdate prop", function() {
1010
const shouldComponentUpdate = sinon.stub();

0 commit comments

Comments
 (0)