[Master] fix15742 #15789
Merged
[Master] fix15742 #15789
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mhegazy
reviewed
May 11, 2017
src/compiler/checker.ts
Outdated
| } | ||
| return getIntersectionType(propsApprentType); | ||
| } | ||
| return propsType; |
There was a problem hiding this comment.
what if it is not an intersection, you do not want to call getApparentType on it?
sandersn
requested changes
May 12, 2017
src/compiler/checker.ts
Outdated
| function getApparentTypeOfJsxPropsType(propsType: Type): Type { | ||
| if (propsType) { | ||
| if (propsType.flags & TypeFlags.Intersection) { | ||
| const propsApprentType: Type[] = []; |
src/compiler/checker.ts
Outdated
| if (propsType) { | ||
| if (propsType.flags & TypeFlags.Intersection) { | ||
| const propsApprentType: Type[] = []; | ||
| for (const t of (<UnionOrIntersectionType>propsType).types) { |
There was a problem hiding this comment.
doesn't getApparentType of an intersection type do this loop for you?
There was a problem hiding this comment.
Later: no it doesn't. :( You should be able to express this as getIntersectionType(t.types.map(getApparentType))) though, right?
src/compiler/checker.ts
Outdated
| @@ -13548,6 +13548,20 @@ namespace ts { | |||
| return _jsxElementChildrenPropertyName; | |||
| } | |||
|
|
|||
| function getApparentTypeOfJsxPropsType(propsType: Type): Type { | |||
| if (propsType) { | |||
There was a problem hiding this comment.
I like this better:
if (!propsType) {
return undefined;
}
|
Never mind, I looked more closely at |
|
@sandersn I wasn't expected that as well |
|
@yuit can you please port this to release-2.3 |
|
never mind, I ported it. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #15742
Note: There is still an issue when using generic with class see https://github.com/Microsoft/TypeScript/compare/master-fix15742?expand=1#diff-c5ae2fab8e9a760ddeda06b1b9128151
TODO
port to release
add more tests