Skip to content
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

[compiler] Support enableRefAsProp in jsx transform #31558

Merged
merged 3 commits into from
Nov 18, 2024
Merged

[compiler] Support enableRefAsProp in jsx transform #31558

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b76ecd1
[compiler] Support enableRefAsProp in jsx transform
Nov 15, 2024
c3a8d6e
Use new place for ref prop
Nov 18, 2024
66854cb
lint
Nov 18, 2024
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
53 changes: 31 additions & 22 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 @@ -559,28 +559,37 @@
propAttributes.forEach(prop => {
switch (prop.kind) {
case 'JsxAttribute': {
if (prop.name === 'ref') {
refProperty = {
kind: 'ObjectProperty',
key: {name: 'ref', kind: 'string'},
type: 'property',
place: {...prop.place},
};
} else if (prop.name === 'key') {
keyProperty = {
kind: 'ObjectProperty',
key: {name: 'key', kind: 'string'},
type: 'property',
place: {...prop.place},
};
} else {
const attributeProperty: ObjectProperty = {
kind: 'ObjectProperty',
key: {name: prop.name, kind: 'string'},
type: 'property',
place: {...prop.place},
};
props.push(attributeProperty);
switch (prop.name) {
case 'key': {
keyProperty = {
kind: 'ObjectProperty',
key: {name: 'key', kind: 'string'},
type: 'property',
place: {...prop.place},
};
break;
}
// In the current JSX implementation, ref is both

Check failure on line 572 in compiler/packages/babel-plugin-react-compiler/src/Optimization/InlineJsxTransform.ts

View workflow job for this annotation

GitHub Actions / Lint babel-plugin-react-compiler 

Expected a block comment instead of consecutive line comments
// a property on the element and a property on props.
// Intentional fallthrough to push into props.
// @ts-expect-error

Check failure on line 575 in compiler/packages/babel-plugin-react-compiler/src/Optimization/InlineJsxTransform.ts

View workflow job for this annotation

GitHub Actions / Lint babel-plugin-react-compiler 

Include a description after the "@ts-expect-error" directive to explain why the @ts-expect-error is necessary. The description must be 3 characters or longer
case 'ref': {
refProperty = {
kind: 'ObjectProperty',
key: {name: 'ref', kind: 'string'},
type: 'property',
place: {...prop.place},
};
Copy link
Contributor

Choose a reason for hiding this comment

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

reusing the object property means reusing the Place instances, which is invalid. let's remove the fallthrough and just assign to both refProperty and push to props with distinct object property values and places

}
default: {
const attributeProperty: ObjectProperty = {
kind: 'ObjectProperty',
key: {name: prop.name, kind: 'string'},
type: 'property',
place: {...prop.place},
};
props.push(attributeProperty);
}
}
break;
}
Expand Down
4 changes: 2 additions & 2 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 @@ -91,7 +91,7 @@ function Parent(t0) {
type: "div",
ref: ref,
key: null,
props: { children: children },
props: { ref: ref, children: children },
};
}
$[0] = children;
Expand Down Expand Up @@ -180,7 +180,7 @@ function ParentAndRefAndKey(props) {
type: Parent,
ref: testRef,
key: "testKey",
props: { a: "a", b: { b: "b" }, c: C },
props: { a: "a", b: { b: "b" }, c: C, ref: testRef },
};
}
$[0] = t0;
Expand Down
Loading