Update flow examples to RescriptReact.

examples/flow-react-example/bsconfig.json

@@ -3,14 +3,11 @@
     "language": "flow",
     "module": "es6",
     "importPath": "relative",
-    "reasonReactPath": "reason-react/src/ReasonReact.js",
     "shims": {
       "Js": "Js",
       "Obj": "Obj",
-      "React": "ReactShim",
       "ReactEvent": "ReactEvent",
-      "RescriptPervasives": "RescriptPervasives",
-      "ReasonReact": "ReactShim"
+      "RescriptPervasives": "RescriptPervasives"
     },
     "debug": {
       "all": false
@@ -21,7 +18,7 @@
   "name": "flow-react-example",
   "bsc-flags": ["-bs-super-errors"],
   "reason": { "react-jsx": 3 },
-  "bs-dependencies": ["reason-react"],
+  "bs-dependencies": ["@rescript/react"],
   "sources": [
     {
       "dir": "src",

examples/flow-react-example/package.json

@@ -27,6 +27,7 @@
     "@babel/preset-env": "^7.11.5",
     "@babel/preset-flow": "^7.10.4",
     "@babel/preset-react": "^7.10.4",
+    "@rescript/react": "^0.10.3",
     "babel-loader": "^8.1.0",
     "concurrently": "^3.5.0",
     "rescript": "9.1.1",

examples/flow-react-example/src/AutoAnnotate.gen.js

@@ -4,27 +4,10 @@
  * @nolint
  */
 /* eslint-disable */
-// $FlowExpectedError[unclear-type]: Reason checked type sufficiently
-type $any = any;
-
-// $FlowExpectedError[untyped-import]: Reason checked type sufficiently
-import * as Curry from 'rescript/lib/es6/curry.js';
 
 // $FlowExpectedError[untyped-import]: Reason checked type sufficiently
 import * as AutoAnnotateBS from './AutoAnnotate.bs';
 
-// flowlint-next-line nonstrict-import:off
-import type {actionless as ReasonReact_actionless} from '../src/shims/ReactShim.shim';
-
-// flowlint-next-line nonstrict-import:off
-import type {componentSpec as ReasonReact_componentSpec} from '../src/shims/ReactShim.shim';
-
-// flowlint-next-line nonstrict-import:off
-import type {noRetainedProps as ReasonReact_noRetainedProps} from '../src/shims/ReactShim.shim';
-
-// flowlint-next-line nonstrict-import:off
-import type {stateless as ReasonReact_stateless} from '../src/shims/ReactShim.shim';
-
 export type variant = {| tag: "R", value: number |};
 
 export type record = {| +variant: variant |};
@@ -41,11 +24,4 @@ export type annotatedVariant =
 
 export type r5 = {| +r5: number |};
 
-export type r6 = {| +r6: number |};
-
 export const useR5: (r5) => r5 = AutoAnnotateBS.useR5;
-
-export const make: <T1>({| +r6: r6 |}, T1) => ReasonReact_componentSpec<ReasonReact_stateless,ReasonReact_stateless,ReasonReact_noRetainedProps,ReasonReact_noRetainedProps,ReasonReact_actionless> = function <T1>(Arg1: $any, Arg2: $any) {
-  const result = Curry._2(AutoAnnotateBS.make, Arg1.r6, Arg2);
-  return result
-};

examples/flow-react-example/src/AutoAnnotate.res

@@ -20,12 +20,3 @@ type r5 = {r5: int}
 let useR5 = (x: r5) => x
 
 type r6 = {r6: int}
-
-let component = ReasonReact.statelessComponent(__MODULE__)
-
-@genType
-let make = (~r6 as _: r6, _children) => {
-  ...component,
-  render: _ => ReasonReact.null,
-}
-

examples/flow-react-example/src/Component2.res

@@ -14,8 +14,8 @@ type action =
 let make = (~greeting) => {
   let message = "You've clicked this " ++ ("xx" ++ " times(s)")
   <div>
-    <button> {ReasonReact.string(message)} </button>
-    <button> {ReasonReact.string("Toggle greeting")} </button>
+    <button> {React.string(message)} </button>
+    <button> {React.string("Toggle greeting")} </button>
     {React.string(greeting)}
   </div>
 }

examples/flow-react-example/src/Hooks.gen.js

@@ -30,6 +30,8 @@ export type testReactRef = { current: (null | number), ... };
 
 export type testDomRef = React$Ref<mixed>;
 
+export type testDOMReft = React$Ref<mixed>;
+
 export type notAFunctionComponent = ({ current: (null | number), ... }) => React$Node;
 
 export type Props = {| +vehicle: vehicle |};

examples/flow-react-example/src/Hooks.res

@@ -49,7 +49,7 @@ module Inner = {
 
 module NoProps = {
   @genType @react.component
-  let make = () => <div> ReasonReact.null </div>
+  let make = () => <div> React.null </div>
 }
 
 type cb = (~_to: vehicle) => unit
@@ -71,7 +71,7 @@ let makeWithRef = (~vehicle) => {
   let _ = 42
   ref =>
     switch ref->Js.Nullable.toOption {
-    | Some(ref) => <button ref={ReactDOMRe.Ref.domRef(ref)}> {React.string(vehicle.name)} </button>
+    | Some(ref) => <button ref={ReactDOM.Ref.domRef(ref)}> {React.string(vehicle.name)} </button>
     | None => React.null
     }
 }
@@ -94,7 +94,10 @@ type testReactContext = React.Context.t<int>
 type testReactRef = React.ref<int>
 
 @genType
-type testDomRef = ReactDOMRe.domRef
+type testDomRef = ReactDOM.domRef
+
+@genType
+type testDOMReft = ReactDOM.Ref.t
 
 @genType @react.component
 let polymorphicComponent = (~p as (x, _)) => React.string(x.name)
@@ -116,4 +119,3 @@ let aComponentWithChildren = (~vehicle, ~children) =>
 
 @genType
 type notAFunctionComponent = React.ref<int> => React.element
-

examples/flow-react-example/src/Index.res

@@ -1,2 +1 @@
-ReactDOMRe.renderToElementWithId(<Component2 greeting="Hello!" />, "index2")
-
+ReactDOM.render(<Component2 greeting="Hello!" />, "index2"->Obj.magic)

examples/flow-react-example/src/components/Navigator.gen.js

@@ -7,25 +7,9 @@
 // $FlowExpectedError[unclear-type]: Reason checked type sufficiently
 type $any = any;
 
-// $FlowExpectedError[untyped-import]: Reason checked type sufficiently
-import * as Curry from 'rescript/lib/es6/curry.js';
-
 // $FlowExpectedError[untyped-import]: Reason checked type sufficiently
 import * as NavigatorBS from './Navigator.bs';
 
-// flowlint-next-line nonstrict-import:off
-import type {actionless as ReasonReact_actionless} from '../../src/shims/ReactShim.shim';
-
-// flowlint-next-line nonstrict-import:off
-import type {componentSpec as ReasonReact_componentSpec} from '../../src/shims/ReactShim.shim';
-
-// flowlint-next-line nonstrict-import:off
-import type {noRetainedProps as ReasonReact_noRetainedProps} from '../../src/shims/ReactShim.shim';
-
-// flowlint-next-line nonstrict-import:off
-import type {stateless as ReasonReact_stateless} from '../../src/shims/ReactShim.shim';
+export type Props<history,match> = {| +history: history, +match: match |};
 
-export const make: <T1,T2,T3>({| +history: T1, +match: T2 |}, T3) => ReasonReact_componentSpec<ReasonReact_stateless,ReasonReact_stateless,ReasonReact_noRetainedProps,ReasonReact_noRetainedProps,ReasonReact_actionless> = function <T1,T2,T3>(Arg1: $any, Arg2: $any) {
-  const result = Curry._3(NavigatorBS.make, Arg1.history, Arg1.match, Arg2);
-  return result
-};
+export const make: React$ComponentType<{| +history: $any, +match: $any |}> = NavigatorBS.make;

examples/flow-react-example/src/components/Navigator.res

@@ -1,16 +1,10 @@
-let component = ReasonReact.statelessComponent("Navigator")
-
 type action =
   | Navigate(string)
   | Logout
 
-@genType
-let make = (~history, ~match as match_, _children) => {
-  ...component,
-  render: _self => {
-    Js.log2("history", history)
-    Js.log2("match", match_)
-    <div />
-  },
+@genType @react.component
+let make = (~history, ~match as match_) => {
+  Js.log2("history", history)
+  Js.log2("match", match_)
+  <div />
 }
-