use ReactPPX4Support module from compiler

Author: mununki

cli/reactjs_jsx_v4.ml

@@ -401,6 +401,9 @@ let transformUppercaseCall3 ~config modulePath mapper jsxExprLoc callExprLoc
  let makeID =
  Exp.ident ~loc:callExprLoc {txt = ident ~suffix:"make"; loc = callExprLoc}
  in
+ let makeReactCreateElement name =
+ Exp.ident {txt = Ldot (Lident "React", name); loc = Location.none}
+ in
  match config.mode with
  (* The new jsx transform *)
  | "automatic" ->
@@ -428,9 +431,14 @@ let transformUppercaseCall3 ~config modulePath mapper jsxExprLoc callExprLoc
  (Exp.ident
  {
  loc = Location.none;
- txt = Ldot (Lident "React", "createElementWithKey");
+ txt = Ldot (Lident "ReactPPX4Support", "createElementWithKey");
  })
- [key; (nolabel, makeID); (nolabel, props)]
+ [
+ key;
+ (nolabel, makeReactCreateElement "createElement");
+ (nolabel, makeID);
+ (nolabel, props);
+ ]
  | None, [] ->
  Exp.apply ~attrs
  (Exp.ident
@@ -441,9 +449,16 @@ let transformUppercaseCall3 ~config modulePath mapper jsxExprLoc callExprLoc
  (Exp.ident
  {
  loc = Location.none;
- txt = Ldot (Lident "React", "createElementVariadicWithKey");
+ txt =
+ Ldot (Lident "ReactPPX4Support", "createElementVariadicWithKey");
  })
- [key; (nolabel, makeID); (nolabel, props); (nolabel, children)]
+ [
+ key;
+ (nolabel, makeReactCreateElement "createElementVariadicWithKey");
+ (nolabel, makeID);
+ (nolabel, props);
+ (nolabel, children);
+ ]
  | Some children, [] ->
  Exp.apply ~attrs
  (Exp.ident

tests/ppx/react/expected/noPropsWithKey.res.txt

@@ -26,8 +26,8 @@ module V4C = {
  ReactDOM.createElement(
  React.fragment,
  [
- React.createElementWithKey(~key="k", V4CA.make, {}),
- React.createElementWithKey(~key="k", V4CB.make, {}),
+ ReactPPX4Support.createElementWithKey(~key="k", React.createElement, V4CA.make, {}),
+ ReactPPX4Support.createElementWithKey(~key="k", React.createElement, V4CB.make, {}),
  ],
  )
  let make = {

tests/ppx/react/expected/optionalKeyType.res.txt

@@ -30,9 +30,9 @@ let _ = ReactDOMRe.createDOMElementVariadic(
 
 @@jsxConfig({version: 4, mode: "classic"})
 
-let _ = React.createElementWithKey(~key="k", C.make, {})
-let _ = React.createElementWithKey(~key=?Some("k"), C.make, {})
-let _ = React.createElementWithKey(~key?, C.make, {})
+let _ = ReactPPX4Support.createElementWithKey(~key="k", React.createElement, C.make, {})
+let _ = ReactPPX4Support.createElementWithKey(~key=?Some("k"), React.createElement, C.make, {})
+let _ = ReactPPX4Support.createElementWithKey(~key?, React.createElement, C.make, {})
 let _ = ReactDOM.createDOMElementVariadic("div", ~props={key: "k"}, [])
 let _ = ReactDOM.createDOMElementVariadic("div", ~props={key: ?Some("k")}, [])
 let _ = ReactDOM.createDOMElementVariadic("div", ~props={key: ?key}, [])

tests/ppx/react/expected/removedKeyProp.res.txt

@@ -34,10 +34,16 @@ let make = (_: props) =>
  ReactDOM.createElement(
  React.fragment,
  [
- React.createElementWithKey(~key="k", Foo.make, {x: "x", y: "y"}),
+ ReactPPX4Support.createElementWithKey(
+ ~key="k",
+ React.createElement,
+ Foo.make,
+ {x: "x", y: "y"},
+ ),
  React.createElement(Foo.make, {x: "x", y: "y"}),
- React.createElementWithKey(
+ ReactPPX4Support.createElementWithKey(
  ~key="k",
+ React.createElement,
  HasChildren.make,
  {
  children: React.createElement(Foo.make, {x: "x", y: "y"}),