Skip to content
Merged
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
4 changes: 3 additions & 1 deletion src/isomorphic/children/traverseAllChildren.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ var didWarnAboutMaps = false;
function getComponentKey(component, index) {
// Do some typechecking here since we call this blindly. We want to ensure
// that we don't block potential future ES APIs.
if (component && typeof component === 'object' && component.key != null) {
if (
typeof component === 'object' && component !== null && component.key != null
) {
// Explicit key
return KeyEscapeUtils.escape(component.key);
}
Expand Down