Skip to content

[compiler] InlineJSXTransform transforms jsx inside function expressions #31282

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
josephsavona merged 1 commit into from
Oct 18, 2024
Merged

[compiler] InlineJSXTransform transforms jsx inside function expressions #31282

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
11 changes: 11 additions & 0 deletions compiler/packages/babel-plugin-react-compiler/src/Optimization/InlineJsxTransform.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,17 @@ export function inlineJsxTransform(
nextInstructions.push(reactElementInstruction);
break;
}
case 'FunctionExpression':
case 'ObjectMethod': {
inlineJsxTransform(
instr.value.loweredFunc.func,
inlineJsxTransformConfig,
);
if (nextInstructions !== null) {
nextInstructions.push(instr);
}
break;
}
default: {
if (nextInstructions !== null) {
nextInstructions.push(instr);
Expand Down
96 changes: 65 additions & 31 deletions ...n-react-compiler/src/__tests__/fixtures/compiler/inline-jsx-transform.expect.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,15 @@ function ParentAndRefAndKey(props) {
}

function ParentAndChildren(props) {
const render = () => {
return <div key="d">{props.foo}</div>;
};
return (
<Parent>
<Child key="a" {...props} />
<Child key="b">
<GrandChild className={props.foo} {...props} />
<GrandChild key="c" className={props.foo} {...props} />
{render()}
</Child>
</Parent>
);
Expand All @@ -40,8 +44,8 @@ const propsToSpread = {a: 'a', b: 'b', c: 'c'};
function PropsSpread() {
return (
<>
<Test {...propsToSpread} />
<Test {...propsToSpread} a="z" />
<Test key="a" {...propsToSpread} />
<Test key="b" {...propsToSpread} a="z" />
</>
);
}
Expand Down Expand Up @@ -151,59 +155,89 @@ function ParentAndRefAndKey(props) {
}

function ParentAndChildren(props) {
const $ = _c2(7);
const $ = _c2(14);
let t0;
if ($[0] !== props) {
t0 = {
if ($[0] !== props.foo) {
t0 = () => ({
$$typeof: Symbol.for("react.transitional.element"),
type: Child,
type: "div",
ref: null,
key: "a",
props: props,
};
$[0] = props;
key: "d",
props: { children: props.foo },
});
Comment on lines +161 to +167
Copy link
Copy Markdown
Member Author

@josephsavona josephsavona Oct 17, 2024

Choose a reason for hiding this comment

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

this wasn't transformed before

$[0] = props.foo;
$[1] = t0;
} else {
t0 = $[1];
}
const render = t0;
let t1;
if ($[2] !== props) {
t1 = {
$$typeof: Symbol.for("react.transitional.element"),
type: Child,
ref: null,
key: "b",
props: {
children: {
$$typeof: Symbol.for("react.transitional.element"),
type: GrandChild,
ref: null,
key: null,
props: { className: props.foo, ...props },
},
},
key: "a",
props: props,
};
$[2] = props;
$[3] = t1;
} else {
t1 = $[3];
}
let t2;
if ($[4] !== t0 || $[5] !== t1) {
if ($[4] !== props) {
t2 = {
$$typeof: Symbol.for("react.transitional.element"),
type: GrandChild,
ref: null,
key: "c",
props: { className: props.foo, ...props },
};
$[4] = props;
$[5] = t2;
} else {
t2 = $[5];
}
let t3;
if ($[6] !== render) {
t3 = render();
$[6] = render;
$[7] = t3;
} else {
t3 = $[7];
}
let t4;
if ($[8] !== t2 || $[9] !== t3) {
t4 = {
$$typeof: Symbol.for("react.transitional.element"),
type: Child,
ref: null,
key: "b",
props: { children: [t2, t3] },
};
$[8] = t2;
$[9] = t3;
$[10] = t4;
} else {
t4 = $[10];
}
let t5;
if ($[11] !== t1 || $[12] !== t4) {
t5 = {
$$typeof: Symbol.for("react.transitional.element"),
type: Parent,
ref: null,
key: null,
props: { children: [t0, t1] },
props: { children: [t1, t4] },
};
$[4] = t0;
$[5] = t1;
$[6] = t2;
$[11] = t1;
$[12] = t4;
$[13] = t5;
} else {
t2 = $[6];
t5 = $[13];
}
return t2;
return t5;
}

const propsToSpread = { a: "a", b: "b", c: "c" };
Expand All @@ -222,14 +256,14 @@ function PropsSpread() {
$$typeof: Symbol.for("react.transitional.element"),
type: Test,
ref: null,
key: null,
key: "a",
props: propsToSpread,
},
{
$$typeof: Symbol.for("react.transitional.element"),
type: Test,
ref: null,
key: null,
key: "b",
props: { ...propsToSpread, a: "z" },
},
],
Expand All @@ -250,4 +284,4 @@ export const FIXTURE_ENTRYPOINT = {
```

### Eval output
(kind: ok) <div><span class="abc">Hello world</span></div>
(kind: ok) <div><span class="abc">Hello world</span><div>abc</div></div>
10 changes: 7 additions & 3 deletions ...kages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/inline-jsx-transform.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,15 @@ function ParentAndRefAndKey(props) {
}

function ParentAndChildren(props) {
const render = () => {
return <div key="d">{props.foo}</div>;
};
return (
<Parent>
<Child key="a" {...props} />
<Child key="b">
<GrandChild className={props.foo} {...props} />
<GrandChild key="c" className={props.foo} {...props} />
{render()}
</Child>
</Parent>
);
Expand All @@ -36,8 +40,8 @@ const propsToSpread = {a: 'a', b: 'b', c: 'c'};
function PropsSpread() {
return (
<>
<Test {...propsToSpread} />
<Test {...propsToSpread} a="z" />
<Test key="a" {...propsToSpread} />
<Test key="b" {...propsToSpread} a="z" />
</>
);
}
Expand Down