Skip to content

is null or no key, direct return #6

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
shepherdwind merged 1 commit into from
Dec 2, 2015
Merged

is null or no key, direct return #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/Animate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
findShownChildInChildrenByKey,
findChildInChildrenByKey,
isSameChildren,
} from './ChildrenUtils';
} from './ChildrenUtils';
import AnimateChild from './AnimateChild';
const defaultKey = 'rc_animate_' + Date.now();
import animUtil from './util';
Expand Down Expand Up @@ -271,8 +271,8 @@ const Animate = React.createClass({
let children = null;
if (stateChildren) {
children = stateChildren.map((child) => {
if (!child.key) {
throw new Error('must set key for <rc-animate> children');
if (!child || !child.key) {
return child;
}
return (<AnimateChild
key={child.key}
Expand Down