Skip to content

Commit e5a2062

Browse files
authored
fix(react-compiler): JSXText emits incorrect with bracket (facebook#32138)
<!-- Thanks for submitting a pull request! We appreciate you spending the time to work on these changes. Please provide enough information so that others can review your pull request. The three fields below are mandatory. Before submitting a pull request, please make sure the following is done: 1. Fork [the repository](https://github.com/facebook/react) and create your branch from `main`. 2. Run `yarn` in the repository root. 3. If you've fixed a bug or added code that should be tested, add tests! 4. Ensure the test suite passes (`yarn test`). Tip: `yarn test --watch TestName` is helpful in development. 5. Run `yarn test --prod` to test in the production environment. It supports the same options as `yarn test`. 6. If you need a debugger, run `yarn test --debug --watch TestName`, open `chrome://inspect`, and press "Inspect". 7. Format your code with [prettier](https://github.com/prettier/prettier) (`yarn prettier`). 8. Make sure your code lints (`yarn lint`). Tip: `yarn linc` to only check changed files. 9. Run the [Flow](https://flowtype.org/) type checks (`yarn flow`). 10. If you haven't already, complete the CLA. Learn more about contributing: https://reactjs.org/docs/how-to-contribute.html --> ## Summary Our [LlamaIndex](https://www.llamaindex.ai/) Product is blocked by this bug Fixes: facebook#32137 <!-- Explain the **motivation** for making this change. What existing problem does the pull request solve? --> ## How did you test this change? <!-- Demonstrate the code is solid. Example: The exact commands you ran and their output, screenshots / videos if the pull request changes the user interface. How exactly did you verify that your PR solves the issue you wanted to solve? If you leave this empty, your PR will very likely be closed. -->
1 parent 9b62ee7 commit e5a2062

File tree

3 files changed

+65
-1
lines changed

3 files changed

+65
-1
lines changed

compiler/packages/babel-plugin-react-compiler/src/ReactiveScopes/CodegenReactiveFunction.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2327,7 +2327,7 @@ function codegenJsxAttribute(
23272327
}
23282328
}
23292329

2330-
const JSX_TEXT_CHILD_REQUIRES_EXPR_CONTAINER_PATTERN = /[<>&]/;
2330+
const JSX_TEXT_CHILD_REQUIRES_EXPR_CONTAINER_PATTERN = /[<>&{}]/;
23312331
function codegenJsxElement(
23322332
cx: Context,
23332333
place: Place,
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
2+
## Input
3+
4+
```javascript
5+
function Test() {
6+
return (
7+
<div>
8+
If the string contains the string &#123;pageNumber&#125; it will be
9+
replaced by the page number.
10+
</div>
11+
);
12+
}
13+
14+
export const FIXTURE_ENTRYPOINT = {
15+
fn: Test,
16+
params: [],
17+
};
18+
19+
```
20+
21+
## Code
22+
23+
```javascript
24+
import { c as _c } from "react/compiler-runtime";
25+
function Test() {
26+
const $ = _c(1);
27+
let t0;
28+
if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
29+
t0 = (
30+
<div>
31+
{
32+
"If the string contains the string {pageNumber} it will be replaced by the page number."
33+
}
34+
</div>
35+
);
36+
$[0] = t0;
37+
} else {
38+
t0 = $[0];
39+
}
40+
return t0;
41+
}
42+
43+
export const FIXTURE_ENTRYPOINT = {
44+
fn: Test,
45+
params: [],
46+
};
47+
48+
```
49+
50+
### Eval output
51+
(kind: ok) <div>If the string contains the string {pageNumber} it will be replaced by the page number.</div>
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
function Test() {
2+
return (
3+
<div>
4+
If the string contains the string &#123;pageNumber&#125; it will be
5+
replaced by the page number.
6+
</div>
7+
);
8+
}
9+
10+
export const FIXTURE_ENTRYPOINT = {
11+
fn: Test,
12+
params: [],
13+
};

0 commit comments

Comments
 (0)