Skip to content

Fix warnings from deprecated imports in rc-util #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 21, 2016
Merged

Fix warnings from deprecated imports in rc-util #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21a7f3d
Merge pull request #1 from react-component/master
MathieuMz Jul 20, 2016
1cc3981
Fix warnings from deprecated imports in rc-util
Jul 20, 2016
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 src/Select.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, {PropTypes} from 'react';
import ReactDOM from 'react-dom';
import { KeyCode } from 'rc-util';
import KeyCode from 'rc-util/lib/KeyCode';
import classnames from 'classnames';
import assign from 'object-assign';
import Animate from 'rc-animate';
Expand Down
4 changes: 2 additions & 2 deletions src/SelectTrigger.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import classnames from 'classnames';
import Trigger from 'rc-trigger';
import Tree, { TreeNode } from 'rc-tree';
import { loopAllChildren, flatToHierarchy, getValuePropValue, labelCompatible } from './util';
import rcUtil from 'rc-util';
import toArray from 'rc-util/lib/Children/toArray';

const BUILT_IN_PLACEMENTS = {
bottomLeft: {
Expand Down Expand Up @@ -231,7 +231,7 @@ const SelectTrigger = React.createClass({

const recursive = children => {
// 注意: 如果用 React.Children.map 遍历，key 会被修改掉。
return rcUtil.Children.toArray(children).map(child => {
return toArray(children).map(child => {
if (child && child.props.children) {
// null or String has no Prop
return <TreeNode {...child.props} key={child.key}>{recursive(child.props.children)}</TreeNode>;
Expand Down