-
Notifications
You must be signed in to change notification settings - Fork 12.5k
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.
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
Add support for JSX fragment syntax #19249
Merged
Merged
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
abb3f58
Add support for JSX fragment syntax
uniqueiniquity 269d37a
Update tests
uniqueiniquity 5f8a1b5
Add baselines
uniqueiniquity 845f573
Update API baselines
uniqueiniquity 7566529
Respond to CR
uniqueiniquity a7f9ec0
Respond to CR
uniqueiniquity fb05886
Respond to CR
uniqueiniquity 961495b
Remove unnecessary type annotation
uniqueiniquity 5dd1a47
Error when using fragment with jsxFactory
uniqueiniquity a83ec41
Added test for preventing fragment with jsxFactory
uniqueiniquity 3ebb2e8
Merge branch 'master' into jsxFragment
uniqueiniquity File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13473,31 +13473,32 @@ namespace ts { | |
node.parent.openingElement.attributes : | ||
undefined; // node.parent is JsxFragment with no attributes | ||
|
||
if (jsxAttributes) { | ||
// When we trying to resolve JsxOpeningLikeElement as a stateless function element, we will already give its attributes a contextual type | ||
// which is a type of the parameter of the signature we are trying out. | ||
// If there is no contextual type (e.g. we are trying to resolve stateful component), get attributes type from resolving element's tagName | ||
const attributesType = getContextualType(jsxAttributes); | ||
if (!jsxAttributes) { | ||
return anyType; // don't check children of a fragment | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It's better to return There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Changed. |
||
} | ||
|
||
if (!attributesType || isTypeAny(attributesType)) { | ||
return undefined; | ||
} | ||
// When we trying to resolve JsxOpeningLikeElement as a stateless function element, we will already give its attributes a contextual type | ||
// which is a type of the parameter of the signature we are trying out. | ||
// If there is no contextual type (e.g. we are trying to resolve stateful component), get attributes type from resolving element's tagName | ||
const attributesType = getContextualType(jsxAttributes); | ||
|
||
if (isJsxAttribute(node.parent)) { | ||
// JSX expression is in JSX attribute | ||
return getTypeOfPropertyOfContextualType(attributesType, node.parent.name.escapedText); | ||
} | ||
else if (node.parent.kind === SyntaxKind.JsxElement) { | ||
// JSX expression is in children of JSX Element, we will look for an "children" atttribute (we get the name from JSX.ElementAttributesProperty) | ||
const jsxChildrenPropertyName = getJsxElementChildrenPropertyname(); | ||
return jsxChildrenPropertyName && jsxChildrenPropertyName !== "" ? getTypeOfPropertyOfContextualType(attributesType, jsxChildrenPropertyName) : anyType; | ||
} | ||
else { | ||
// JSX expression is in JSX spread attribute | ||
return attributesType; | ||
} | ||
if (!attributesType || isTypeAny(attributesType)) { | ||
return undefined; | ||
} | ||
|
||
if (isJsxAttribute(node.parent)) { | ||
// JSX expression is in JSX attribute | ||
return getTypeOfPropertyOfContextualType(attributesType, node.parent.name.escapedText); | ||
} | ||
else if (node.parent.kind === SyntaxKind.JsxElement) { | ||
// JSX expression is in children of JSX Element, we will look for an "children" atttribute (we get the name from JSX.ElementAttributesProperty) | ||
const jsxChildrenPropertyName = getJsxElementChildrenPropertyname(); | ||
return jsxChildrenPropertyName && jsxChildrenPropertyName !== "" ? getTypeOfPropertyOfContextualType(attributesType, jsxChildrenPropertyName) : anyType; | ||
} | ||
else { | ||
// JSX expression is in JSX spread attribute | ||
return attributesType; | ||
} | ||
return anyType; // don't check children of a fragment | ||
} | ||
|
||
function getContextualTypeForJsxAttribute(attribute: JsxAttribute | JsxSpreadAttribute) { | ||
|
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
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just do an early return of
undefined
here ifjsxAttributes
is undefinedThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changed.