Skip to content
This repository was archived by the owner on Jun 15, 2023. It is now read-only.

Fix fragment optional children #704

Merged
merged 3 commits into from
Oct 26, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
- Fix issue where certain JSX expressions would be formatted differenctly in compiler 10.1.0-rc.1 https://github.com/rescript-lang/syntax/issues/675
- Fix issue where printing nested pipe discards await https://github.com/rescript-lang/syntax/issues/687
- Fix issue where the JSX key type is not an optional string https://github.com/rescript-lang/syntax/pull/693
- Fix issue where the JSX fragment withouth children build error https://github.com/rescript-lang/syntax/pull/704

#### :eyeglasses: Spec Compliance

Expand Down
24 changes: 11 additions & 13 deletions cli/reactjs_jsx_v4.ml
Original file line number Diff line number Diff line change
Expand Up @@ -1368,24 +1368,22 @@ let expr ~config mapper expression =
Exp.ident ~loc {loc; txt = Ldot (Lident "React", "fragment")}
in
let childrenExpr = transformChildrenIfList ~mapper listItems in
let recordOfChildren children =
Exp.record [(Location.mknoloc (Lident "children"), children)] None
in
let args =
[
(nolabel, fragment);
(match config.mode with
| "automatic" ->
| "automatic" -> (
( nolabel,
Exp.record
[
( Location.mknoloc @@ Lident "children",
match childrenExpr with
| {pexp_desc = Pexp_array children} -> (
match children with
| [] -> emptyRecord ~loc:Location.none
| [child] -> child
| _ -> childrenExpr)
| _ -> childrenExpr );
]
None )
match childrenExpr with
| {pexp_desc = Pexp_array children} -> (
match children with
| [] -> emptyRecord ~loc:Location.none
| [child] -> recordOfChildren child
| _ -> recordOfChildren childrenExpr)
| _ -> recordOfChildren childrenExpr ))
| "classic" | _ -> (nolabel, childrenExpr));
]
in
Expand Down
19 changes: 19 additions & 0 deletions tests/ppx/react/expected/fragment.res.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
@@jsxConfig({version: 4, mode: "classic"})

let _ = ReactDOM.createElement(React.fragment, [])
let _ = ReactDOM.createElement(React.fragment, [ReactDOM.createDOMElementVariadic("div", [])])
let _ = ReactDOM.createElement(React.fragment, [ReactDOM.createElement(React.fragment, [])])
let _ = React.createElement(Z.make, {})
let _ = React.createElement(Z.make, {children: ReactDOM.createDOMElementVariadic("div", [])})
let _ = ReactDOM.createDOMElementVariadic("div", [])
let _ = ReactDOM.createDOMElementVariadic("div", [ReactDOM.createDOMElementVariadic("div", [])])

@@jsxConfig({version: 4, mode: "automatic"})

let _ = React.jsx(React.jsxFragment, {})
let _ = React.jsx(React.jsxFragment, {children: ReactDOM.jsx("div", {})})
let _ = React.jsx(React.jsxFragment, {children: React.jsx(React.jsxFragment, {})})
let _ = React.jsx(Z.make, {})
let _ = React.jsx(Z.make, {children: ReactDOM.jsx("div", {})})
let _ = ReactDOM.jsx("div", {})
let _ = ReactDOM.jsx("div", {children: ?ReactDOM.someElement(ReactDOM.jsx("div", {}))})
19 changes: 19 additions & 0 deletions tests/ppx/react/fragment.res
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
@@jsxConfig({version:4, mode: "classic"})

let _ = <></>
let _ = <><div /></>
let _ = <><></></>
let _ = <Z />
let _ = <Z><div /></Z>
let _ = <div />
let _ = <div><div /></div>

@@jsxConfig({version:4, mode: "automatic"})

let _ = <></>
let _ = <><div /></>
let _ = <><></></>
let _ = <Z />
let _ = <Z><div /></Z>
let _ = <div />
let _ = <div><div /></div>