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: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,9 @@
"babel-runtime": "6.x",
"classnames": "2.x",
"component-classes": "1.x",
"create-react-class": "^15.5.2",
"dom-scroll-into-view": "1.x",
"prop-types": "^15.5.8",
"rc-animate": "2.x",
"rc-menu": "5.x || 4.x",
"rc-trigger": "1.x",
Expand Down
7 changes: 5 additions & 2 deletions src/DropdownMenu.jsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import React, { cloneElement, PropTypes } from 'react';
import React, { cloneElement } from 'react';
import { findDOMNode } from 'react-dom';
import PropTypes from 'prop-types';
import createClass from 'create-react-class';
import toArray from 'rc-util/lib/Children/toArray';
import Menu from 'rc-menu';
import scrollIntoView from 'dom-scroll-into-view';
import { getSelectKeys, preventDefaultEvent } from './util';

const DropdownMenu = React.createClass({
const DropdownMenu = createClass({
propTypes: {
defaultActiveFirstOption: PropTypes.bool,
value: PropTypes.any,
Expand Down Expand Up @@ -141,4 +143,5 @@ const DropdownMenu = React.createClass({
},
});

DropdownMenu.displayName = 'DropdownMenu';
export default DropdownMenu;
3 changes: 2 additions & 1 deletion src/Option.jsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import React from 'react';
import PropTypes from 'prop-types';

export default class Option extends React.Component {
static propTypes = {
value: React.PropTypes.string,
value: PropTypes.string,
};

static isSelectOption = true;
Expand Down
2 changes: 1 addition & 1 deletion src/PropTypes.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { PropTypes } from 'react';
import PropTypes from 'prop-types';

function valueType(props, propName, componentName) {
const labelInValueShape = PropTypes.shape({
Expand Down
4 changes: 3 additions & 1 deletion src/Select.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React from 'react';
import ReactDOM from 'react-dom';
import createClass from 'create-react-class';
import KeyCode from 'rc-util/lib/KeyCode';
import classnames from 'classnames';
import Animate from 'rc-animate';
Expand Down Expand Up @@ -38,7 +39,7 @@ function chaining(...fns) {
};
}

const Select = React.createClass({
const Select = createClass({
propTypes: SelectPropTypes,

mixins: [FilterMixin],
Expand Down Expand Up @@ -928,4 +929,5 @@ const Select = React.createClass({
},
});

Select.displayName = 'Select';
export default Select;
10 changes: 8 additions & 2 deletions src/SelectTrigger.jsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
import Trigger from 'rc-trigger';
import React, { PropTypes } from 'react';
import React from 'react';
import PropTypes from 'prop-types';
import createClass from 'create-react-class';
import classnames from 'classnames';
import DropdownMenu from './DropdownMenu';
import ReactDOM from 'react-dom';
import { isSingleMode } from './util';

Trigger.displayName = 'Trigger';

const BUILT_IN_PLACEMENTS = {
bottomLeft: {
points: ['tl', 'bl'],
Expand All @@ -24,7 +28,7 @@ const BUILT_IN_PLACEMENTS = {
},
};

const SelectTrigger = React.createClass({
const SelectTrigger = createClass({
propTypes: {
onPopupFocus: PropTypes.func,
dropdownMatchSelectWidth: PropTypes.bool,
Expand Down Expand Up @@ -134,4 +138,6 @@ const SelectTrigger = React.createClass({
},
});

SelectTrigger.displayName = 'SelectTrigger';

export default SelectTrigger;
6 changes: 4 additions & 2 deletions tests/FilterMixin.spec.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
/* eslint-disable no-undef */
import React, { PropTypes } from 'react';
import React from 'react';
import PropTypes from 'prop-types';
import createClass from 'create-react-class';
import FilterMixin from '../src/FilterMixin';
import Menu from 'rc-menu';
import OptGroup from '../src/OptGroup';
import Option from '../src/Option';
import { render, mount } from 'enzyme';

describe('FilterMixin', () => {
const Select = React.createClass({
const Select = createClass({
propTypes: {
value: PropTypes.any,
inputValue: PropTypes.string,
Expand Down
7 changes: 4 additions & 3 deletions tests/Select.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -448,8 +448,9 @@ describe('Select', () => {
);
}).toThrow();
expect(spy.mock.calls[0][0]).toMatch(
'Invalid prop `value` supplied to `Select`, when you set `labelInValue` ' +
'to `true`, `value` should in shape of `{ key: string, label?: string }`'
'Warning: Failed prop type: Invalid prop `value` supplied to `Select`, ' +
'when you set `labelInValue` to `true`,' +
' `value` should in shape of `{ key: string, label?: string }`'
);
});

Expand All @@ -458,7 +459,7 @@ describe('Select', () => {
<Select multiple value="" />
);
expect(spy.mock.calls[0][0]).toMatch(
'Invalid prop `value` of type `string` supplied to `Select`, ' +
'Warning: Failed prop type: Invalid prop `value` of type `string` supplied to `Select`, ' +
'expected `array` when `multiple` is `true`'
);
});
Expand Down
1 change: 0 additions & 1 deletion tests/__snapshots__/SelectTrigger.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ exports[`SelectTrigger renders correctly 1`] = `
<div
onClick={[Function]}
onMouseDown={[Function]}
onTouchStart={[Function]}
>
foo
</div>
Expand Down