Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@
"rc-form": "^0.5.1",
"rc-tools": "5.x",
"react": "^15.2.0",
"react-addons-test-utils": "^15.2.0",
"react-dom": "^15.2.0"
},
"pre-commit": [
"lint"
],
"dependencies": {
"array-tree-filter": "^1.0.0",
"prop-types": "^15.5.8",
"rc-trigger": "1.x",
"rc-util": "4.x",
"shallow-equal": "^1.0.0"
Expand Down
3 changes: 2 additions & 1 deletion src/Cascader.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes, cloneElement } from 'react';
import React, { Component, cloneElement } from 'react';
import PropTypes from 'prop-types';
import Trigger from 'rc-trigger';
import Menus from './Menus';
import KeyCode from 'rc-util/lib/KeyCode';
Expand Down
17 changes: 9 additions & 8 deletions src/Menus.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from 'react';
import PropTypes from 'prop-types';
import arrayTreeFilter from 'array-tree-filter';
import { findDOMNode } from 'react-dom';

Expand Down Expand Up @@ -128,14 +129,14 @@ Menus.defaultProps = {
};

Menus.propTypes = {
value: React.PropTypes.array,
activeValue: React.PropTypes.array,
options: React.PropTypes.array.isRequired,
prefixCls: React.PropTypes.string,
expandTrigger: React.PropTypes.string,
onSelect: React.PropTypes.func,
visible: React.PropTypes.bool,
dropdownMenuColumnStyle: React.PropTypes.object,
value: PropTypes.array,
activeValue: PropTypes.array,
options: PropTypes.array.isRequired,
prefixCls: PropTypes.string,
expandTrigger: PropTypes.string,
onSelect: PropTypes.func,
visible: PropTypes.bool,
dropdownMenuColumnStyle: PropTypes.object,
};

export default Menus;
24 changes: 14 additions & 10 deletions tests/index.spec.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const expect = require('expect.js');
const React = require('react');
const ReactDOM = require('react-dom');
const TestUtils = require('react-addons-test-utils');
const TestUtils = require('react-dom/test-utils');
const Simulate = TestUtils.Simulate;
const Cascader = require('../');
const addressOptions = require('./demoOptions').addressOptions;
Expand Down Expand Up @@ -315,23 +315,27 @@ describe('Cascader', () => {

// https://github.com/ant-design/ant-design/issues/5666
it('should have not change active value when value is not changed', (done) => {
const Demo = React.createClass({
getInitialState() {
return { value: [] };
},
class Demo extends React.Component {
state = {
value: [],
};

componentDidMount() {
this.timeout = setInterval(() => {
this.setState({
value: [],
});
}, 10);
},
}

componentWillUnmount() {
clearInterval(this.timeout);
},
}

getPopupDOMNode() {
return this.cascader.getPopupDOMNode();
},
}

render() {
return (
<Cascader
Expand All @@ -342,8 +346,8 @@ describe('Cascader', () => {
<input readOnly />
</Cascader>
);
},
});
}
}
instance = ReactDOM.render(<Demo />, div);
Simulate.click(ReactDOM.findDOMNode(instance));
let menus = instance.getPopupDOMNode().querySelectorAll('.rc-cascader-menu');
Expand Down
2 changes: 1 addition & 1 deletion tests/keyboard.spec.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const expect = require('expect.js');
const React = require('react');
const ReactDOM = require('react-dom');
const TestUtils = require('react-addons-test-utils');
const TestUtils = require('react-dom/test-utils');
const Simulate = TestUtils.Simulate;
const Cascader = require('../');
const addressOptions = require('./demoOptions').addressOptions;
Expand Down