fix the usage of spreaProps withouth other props

Author: mununki

cli/reactjs_jsx_v4.ml

@@ -208,20 +208,21 @@ let recordFromProps ~loc ~removeKey callArguments =
   let spreadFields =
     propsToSpread |> List.map (fun (_, expression) -> expression)
   in
-  match spreadFields with
-  | [] ->
+  match (fields, spreadFields) with
+  | [], [spreadProps] | [], spreadProps :: _ -> spreadProps
+  | _, [] ->
     {
       pexp_desc = Pexp_record (fields, None);
       pexp_loc = loc;
       pexp_attributes = [];
     }
-  | [spreadProps] ->
+  | _, [spreadProps] ->
     {
       pexp_desc = Pexp_record (fields, Some spreadProps);
       pexp_loc = loc;
       pexp_attributes = [];
     }
-  | spreadProps :: _ ->
+  | _, spreadProps :: _ ->
     {
       pexp_desc = Pexp_record (fields, Some spreadProps);
       pexp_loc = loc;

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

@@ -0,0 +1,10 @@
+let c0 = React.jsx(A.make, {...p, x: "x"})
+
+// ignore second one
+let c0 = React.jsx(A.make, {...p0, x: "x"})
+
+// only spread props
+let c1 = React.jsx(A.make, p)
+
+// reversed order
+let c2 = React.jsx(A.make, {...p, x: "x"})

tests/ppx/react/spreadProps.res

@@ -0,0 +1,10 @@
+let c0 = <A x="x" {...p} />
+
+// ignore second one
+let c0 = <A x="x" {...p0} {...p1} />
+
+// only spread props
+let c1 = <A {...p} />
+
+// reversed order
+let c2 = <A {...p} x="x" />