Skip to content

ForwardRefs supports propTypes #12911

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
bvaughn merged 3 commits into from
May 29, 2018
Merged

ForwardRefs supports propTypes #12911

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f8b08a
Moved some internal forwardRef tests to not be internal
May 25, 2018
26e098f
ForwardRef supports propTypes
May 25, 2018
dfa3dc6
Hoisted type
May 29, 2018
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
Prev Previous commit
Hoisted type
  • Loading branch information
Brian Vaughn committed May 29, 2018
commit dfa3dc628d34734979d640530a7242b1210e23fc
16 changes: 9 additions & 7 deletions packages/react/src/ReactElementValidator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,18 +46,20 @@ if (__DEV__) {
return '#text';
} else if (typeof element.type === 'string') {
return element.type;
} else if (element.type === REACT_FRAGMENT_TYPE) {
}

const type = element.type;
if (type === REACT_FRAGMENT_TYPE) {
return 'React.Fragment';
} else if (
typeof element.type === 'object' &&
element.type !== null &&
element.type.$$typeof === REACT_FORWARD_REF_TYPE
typeof type === 'object' &&
type !== null &&
type.$$typeof === REACT_FORWARD_REF_TYPE
) {
const functionName =
element.type.render.displayName || element.type.render.name || '';
const functionName = type.render.displayName || type.render.name || '';
return functionName !== '' ? `ForwardRef(${functionName})` : 'ForwardRef';
Copy link
Collaborator

@gaearon gaearon May 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this look like getComponentName duplication here? Can we unify?

Copy link
Contributor Author

@bvaughn bvaughn May 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it's similar. But getComponentName accepts a Fiber and this is a ReactElement.

We could refactor both to use a shared helper, but it didn't seem like the obvious correct thing to do in this case.

} else {
return element.type.displayName || element.type.name || 'Unknown';
return type.displayName || type.name || 'Unknown';
}
};

Expand Down