Skip to content

Fixed an issue with JSX children expression not being contextually discriminated #53502

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
merged 1 commit into from
Apr 17, 2023
Merged

Fixed an issue with JSX children expression not being contextually discriminated #53502

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29186,7 +29186,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
}

function getContextualTypeForChildJsxExpression(node: JsxElement, child: JsxChild, contextFlags: ContextFlags | undefined) {
const attributesType = getApparentTypeOfContextualType(node.openingElement.tagName, contextFlags);
const attributesType = getApparentTypeOfContextualType(node.openingElement.attributes, contextFlags);
// JSX expression is in children of JSX Element, we will look for an "children" attribute (we get the name from JSX.ElementAttributesProperty)
const jsxChildrenPropertyName = getJsxElementChildrenPropertyName(getJsxNamespaceAt(node));
if (!(attributesType && !isTypeAny(attributesType) && jsxChildrenPropertyName && jsxChildrenPropertyName !== "")) {
Expand Down
63 changes: 63 additions & 0 deletions tests/baselines/reference/checkJsxChildrenProperty16.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
=== tests/cases/conformance/jsx/checkJsxChildrenProperty16.tsx ===
/// <reference path="react16.d.ts" />

// repro from #53493

import React = require('react');
>React : Symbol(React, Decl(checkJsxChildrenProperty16.tsx, 0, 0))

export type Props =
>Props : Symbol(Props, Decl(checkJsxChildrenProperty16.tsx, 4, 32))

| { renderNumber?: false; children: (arg: string) => void }
>renderNumber : Symbol(renderNumber, Decl(checkJsxChildrenProperty16.tsx, 7, 5))
>children : Symbol(children, Decl(checkJsxChildrenProperty16.tsx, 7, 27))
>arg : Symbol(arg, Decl(checkJsxChildrenProperty16.tsx, 7, 39))

| {
renderNumber: true;
>renderNumber : Symbol(renderNumber, Decl(checkJsxChildrenProperty16.tsx, 8, 5))

children: (arg: number) => void;
>children : Symbol(children, Decl(checkJsxChildrenProperty16.tsx, 9, 25))
>arg : Symbol(arg, Decl(checkJsxChildrenProperty16.tsx, 10, 17))

};

export declare function Foo(props: Props): JSX.Element;
>Foo : Symbol(Foo, Decl(checkJsxChildrenProperty16.tsx, 11, 6))
>props : Symbol(props, Decl(checkJsxChildrenProperty16.tsx, 13, 28))
>Props : Symbol(Props, Decl(checkJsxChildrenProperty16.tsx, 4, 32))
>JSX : Symbol(JSX, Decl(react16.d.ts, 2493, 12))
>Element : Symbol(JSX.Element, Decl(react16.d.ts, 2494, 23))

export const Test = () => {
>Test : Symbol(Test, Decl(checkJsxChildrenProperty16.tsx, 15, 12))

return (
<>
<Foo>{(value) => {}}</Foo>
>Foo : Symbol(Foo, Decl(checkJsxChildrenProperty16.tsx, 11, 6))
>value : Symbol(value, Decl(checkJsxChildrenProperty16.tsx, 18, 13))
>Foo : Symbol(Foo, Decl(checkJsxChildrenProperty16.tsx, 11, 6))

<Foo renderNumber>{(value) => {}}</Foo>
>Foo : Symbol(Foo, Decl(checkJsxChildrenProperty16.tsx, 11, 6))
>renderNumber : Symbol(renderNumber, Decl(checkJsxChildrenProperty16.tsx, 19, 10))
>value : Symbol(value, Decl(checkJsxChildrenProperty16.tsx, 19, 26))
>Foo : Symbol(Foo, Decl(checkJsxChildrenProperty16.tsx, 11, 6))

<Foo children={(value) => {}} />
>Foo : Symbol(Foo, Decl(checkJsxChildrenProperty16.tsx, 11, 6))
>children : Symbol(children, Decl(checkJsxChildrenProperty16.tsx, 21, 10))
>value : Symbol(value, Decl(checkJsxChildrenProperty16.tsx, 21, 22))

<Foo renderNumber children={(value) => {}} />
>Foo : Symbol(Foo, Decl(checkJsxChildrenProperty16.tsx, 11, 6))
>renderNumber : Symbol(renderNumber, Decl(checkJsxChildrenProperty16.tsx, 22, 10))
>children : Symbol(children, Decl(checkJsxChildrenProperty16.tsx, 22, 23))
>value : Symbol(value, Decl(checkJsxChildrenProperty16.tsx, 22, 35))

</>
);
};
76 changes: 76 additions & 0 deletions tests/baselines/reference/checkJsxChildrenProperty16.types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
=== tests/cases/conformance/jsx/checkJsxChildrenProperty16.tsx ===
/// <reference path="react16.d.ts" />

// repro from #53493

import React = require('react');
>React : typeof React

export type Props =
>Props : { renderNumber?: false | undefined; children: (arg: string) => void; } | { renderNumber: true; children: (arg: number) => void; }

| { renderNumber?: false; children: (arg: string) => void }
>renderNumber : false | undefined
>false : false
>children : (arg: string) => void
>arg : string

| {
renderNumber: true;
>renderNumber : true
>true : true

children: (arg: number) => void;
>children : (arg: number) => void
>arg : number

};

export declare function Foo(props: Props): JSX.Element;
>Foo : (props: Props) => JSX.Element
>props : Props
>JSX : any

export const Test = () => {
>Test : () => JSX.Element
>() => { return ( <> <Foo>{(value) => {}}</Foo> <Foo renderNumber>{(value) => {}}</Foo> <Foo children={(value) => {}} /> <Foo renderNumber children={(value) => {}} /> </> );} : () => JSX.Element

return (
>( <> <Foo>{(value) => {}}</Foo> <Foo renderNumber>{(value) => {}}</Foo> <Foo children={(value) => {}} /> <Foo renderNumber children={(value) => {}} /> </> ) : JSX.Element

<>
><> <Foo>{(value) => {}}</Foo> <Foo renderNumber>{(value) => {}}</Foo> <Foo children={(value) => {}} /> <Foo renderNumber children={(value) => {}} /> </> : JSX.Element

<Foo>{(value) => {}}</Foo>
><Foo>{(value) => {}}</Foo> : JSX.Element
>Foo : (props: Props) => JSX.Element
>(value) => {} : (value: string) => void
>value : string
>Foo : (props: Props) => JSX.Element

<Foo renderNumber>{(value) => {}}</Foo>
><Foo renderNumber>{(value) => {}}</Foo> : JSX.Element
>Foo : (props: Props) => JSX.Element
>renderNumber : true
>(value) => {} : (value: number) => void
>value : number
>Foo : (props: Props) => JSX.Element

<Foo children={(value) => {}} />
><Foo children={(value) => {}} /> : JSX.Element
>Foo : (props: Props) => JSX.Element
>children : (value: string) => void
>(value) => {} : (value: string) => void
>value : string

<Foo renderNumber children={(value) => {}} />
><Foo renderNumber children={(value) => {}} /> : JSX.Element
>Foo : (props: Props) => JSX.Element
>renderNumber : true
>children : (value: number) => void
>(value) => {} : (value: number) => void
>value : number

</>
);
};
30 changes: 30 additions & 0 deletions tests/cases/conformance/jsx/checkJsxChildrenProperty16.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
// @strict: true
// @noEmit: true
// @jsx: preserve

/// <reference path="/.lib/react16.d.ts" />

// repro from #53493

import React = require('react');

export type Props =
| { renderNumber?: false; children: (arg: string) => void }
| {
renderNumber: true;
children: (arg: number) => void;
};

export declare function Foo(props: Props): JSX.Element;

export const Test = () => {
return (
<>
<Foo>{(value) => {}}</Foo>
<Foo renderNumber>{(value) => {}}</Foo>

<Foo children={(value) => {}} />
<Foo renderNumber children={(value) => {}} />
</>
);
};