fix uncurried forwardRef component

Author: mununki

res_syntax/cli/reactjs_jsx_v4.ml

@@ -817,12 +817,21 @@ let transformStructureItem ~config mapper item =
           React_jsx_common.raiseErrorMultipleReactComponent ~loc:pstr_loc
         else (
           config.hasReactComponent <- true;
-          let binding =
-            match binding.pvb_expr.pexp_desc with
+          let rec removeArityRecord expr =
+            match expr.pexp_desc with
             | Pexp_record
                 ([({txt = Ldot (Ldot (Lident "Js", "Fn"), _)}, e)], None) ->
-              {binding with pvb_expr = e}
-            | _ -> binding
+              e
+            | Pexp_apply (forwardRef, [(label, e)]) ->
+              {
+                expr with
+                pexp_desc =
+                  Pexp_apply (forwardRef, [(label, removeArityRecord e)]);
+              }
+            | _ -> expr
+          in
+          let binding =
+            {binding with pvb_expr = removeArityRecord binding.pvb_expr}
           in
           let coreTypeOfAttr =
             React_jsx_common.coreTypeOfAttrs binding.pvb_attributes

res_syntax/tests/ppx/react/expected/forwardRef.res.txt

@@ -124,6 +124,63 @@ module V4C = {
   }
 }
 
+module V4CUncurried = {
+  module FancyInput = {
+    type props<'className, 'children, 'ref> = {
+      className?: 'className,
+      children: 'children,
+      ref?: 'ref,
+    }
+
+    @react.component
+    let make = (
+      {?className, children, _}: props<'className, 'children, ReactRef.currentDomRef>,
+      ref: Js.Nullable.t<ReactRef.currentDomRef>,
+    ) =>
+      ReactDOM.createDOMElementVariadic(
+        "div",
+        [
+          ReactDOM.createDOMElementVariadic(
+            "input",
+            ~props={
+              type_: "text",
+              ?className,
+              ref: ?Js.Nullable.toOption(ref)->Belt.Option.map(React.Ref.domRef),
+            },
+            [],
+          ),
+          children,
+        ],
+      )
+    let make = React.forwardRef({
+      let \"ForwardRef$V4CUncurried$FancyInput" = (props: props<_>, ref) => make(props, ref)
+
+      \"ForwardRef$V4CUncurried$FancyInput"
+    })
+  }
+  type props = {}
+
+  @react.component
+  let make = (_: props) => {
+    let input = React.useRef(Js.Nullable.null)
+
+    ReactDOM.createDOMElementVariadic(
+      "div",
+      [
+        React.createElement(
+          FancyInput.make,
+          {ref: input, children: {React.string("Click to focus")}},
+        ),
+      ],
+    )
+  }
+  let make = {
+    let \"ForwardRef$V4CUncurried" = props => make(props)
+
+    \"ForwardRef$V4CUncurried"
+  }
+}
+
 @@jsxConfig({version: 4, mode: "automatic"})
 
 module V4A = {
@@ -181,3 +238,59 @@ module V4A = {
     \"ForwardRef$V4A"
   }
 }
+
+module V4AUncurried = {
+  module FancyInput = {
+    type props<'className, 'children, 'ref> = {
+      className?: 'className,
+      children: 'children,
+      ref?: 'ref,
+    }
+
+    @react.component
+    let make = (
+      {?className, children, _}: props<'className, 'children, ReactDOM.Ref.currentDomRef>,
+      ref,
+    ) =>
+      ReactDOM.jsxs(
+        "div",
+        {
+          children: React.array([
+            ReactDOM.jsx(
+              "input",
+              {
+                type_: "text",
+                ?className,
+                ref: ?Js.Nullable.toOption(ref)->Belt.Option.map(ReactDOM.Ref.domRef),
+              },
+            ),
+            children,
+          ]),
+        },
+      )
+    let make = React.forwardRef({
+      let \"ForwardRef$V4AUncurried$FancyInput" = (props: props<_>, ref) => make(props, ref)
+
+      \"ForwardRef$V4AUncurried$FancyInput"
+    })
+  }
+  type props = {}
+
+  @react.component
+  let make = (_: props) => {
+    let input = React.useRef(Js.Nullable.null)
+    ReactDOM.jsx(
+      "div",
+      {
+        children: ?ReactDOM.someElement(
+          React.jsx(FancyInput.make, {ref: input, children: {React.string("Click to focus")}}),
+        ),
+      },
+    )
+  }
+  let make = {
+    let \"ForwardRef$V4AUncurried" = props => make(props)
+
+    \"ForwardRef$V4AUncurried"
+  }
+}

res_syntax/tests/ppx/react/forwardRef.res

@@ -52,6 +52,31 @@ module V4C = {
   }
 }
 
+module V4CUncurried = {
+  module FancyInput = {
+    @react.component
+    let make = React.forwardRef((. ~className=?, ~children, ref: Js.Nullable.t<ReactRef.currentDomRef>) =>
+      <div>
+        <input
+          type_="text"
+          ?className
+          ref=?{Js.Nullable.toOption(ref)->Belt.Option.map(React.Ref.domRef)}
+        />
+        children
+      </div>
+    )
+  }
+
+  @react.component
+  let make = () => {
+    let input = React.useRef(Js.Nullable.null)
+
+    <div>
+      <FancyInput ref=input> {React.string("Click to focus")} </FancyInput>
+    </div>
+  }
+}
+
 @@jsxConfig({version: 4, mode: "automatic"})
 
 module V4A = {
@@ -78,3 +103,28 @@ module V4A = {
     </div>
   }
 }
+
+module V4AUncurried = {
+  module FancyInput = {
+    @react.component
+    let make = React.forwardRef((. ~className=?, ~children, ref) =>
+      <div>
+        <input
+          type_="text"
+          ?className
+          ref=?{Js.Nullable.toOption(ref)->Belt.Option.map(ReactDOM.Ref.domRef)}
+        />
+        children
+      </div>
+    )
+  }
+
+  @react.component
+  let make = () => {
+    let input = React.useRef(Js.Nullable.null)
+
+    <div>
+      <FancyInput ref=input> {React.string("Click to focus")} </FancyInput>
+    </div>
+  }
+}