Skip to content

Commit

Permalink
Merge pull request ml-in-barcelona#6 from ml-in-barcelona/stream
Browse files Browse the repository at this point in the history 
PR React 18
  • Loading branch information
@davesnx
davesnx authored Sep 7, 2023
2 parents 0e553f6 + f41b21d commit 6b10172
Show file tree
Hide file tree
Showing 15 changed files with 435 additions and 3,826 deletions.
37 changes: 24 additions & 13 deletions server/comments.re
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,18 @@ module Comments = {
};
};

module Layout = {
[@react.component]
let make = (~children) => {
<div style={ReactDOM.Style.make(~padding="20px", ~height="100%", ())}>
children
</div>;
};
};

module App = {
let make = () => {
<div style={ReactDOM.Style.make(~padding="20px", ~height="100%", ())}>
<Layout>
<nav> <a href="/"> {React.string("Home")} </a> </nav>
<main
style={ReactDOM.Style.make(~display="flex", ~marginTop="16px", ())}>
Expand All @@ -115,18 +124,20 @@ module App = {
style={ReactDOM.Style.make(~marginRight="16px", ())}>
<Sidebar />
</aside>
<article className="post">
<h1> {React.string("Hello world")} </h1>
<Post />
<section className="comments">
<h3> {React.string("Comments")} </h3>
<React.Suspense fallback={<Spinner />}>
<Comments />
</React.Suspense>
</section>
<h2> {React.string("Thanks for reading!")} </h2>
</article>
<React.Suspense fallback={<Spinner />}>
<article className="post">
<h1> {React.string("Hello world")} </h1>
<Post />
<section className="comments">
<h3> {React.string("Comments")} </h3>
<React.Suspense fallback={<Spinner />}>
<Comments />
</React.Suspense>
</section>
<h2> {React.string("Thanks for reading!")} </h2>
</article>
</React.Suspense>
</main>
</div>;
</Layout>;
};
};
127 changes: 81 additions & 46 deletions vendor/reason-react/React.re
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,23 @@ external createElementVariadic:
(component('props), 'props, array(element)) => element =
"createElement";

[@bs.module "react"] [@deprecated "Please use JSX syntax directly."]
external jsxKeyed: (component('props), 'props, string) => element = "jsx";
[@bs.module "react/jsx-runtime"]
external jsxKeyed:
(component('props), 'props, ~key: string=?, unit) => element =
"jsx";

[@bs.module "react"] [@deprecated "Please use JSX syntax directly."]
[@bs.module "react/jsx-runtime"]
external jsx: (component('props), 'props) => element = "jsx";

[@bs.module "react"] [@deprecated "Please use JSX syntax directly."]
[@bs.module "react/jsx-runtime"]
external jsxs: (component('props), 'props) => element = "jsxs";

[@bs.module "react"] [@deprecated "Please use JSX syntax directly."]
external jsxsKeyed: (component('props), 'props, string) => element = "jsxs";
[@bs.module "react/jsx-runtime"]
external jsxsKeyed:
(component('props), 'props, ~key: string=?, unit) => element =
"jsxs";

[@bs.module "react/jsx-runtime"] external jsxFragment: 'element = "Fragment";

type ref('value) = {mutable current: 'value};

Expand Down Expand Up @@ -120,24 +126,23 @@ external memoCustomCompareProps:

module Fragment = {
[@bs.obj]
external makeProps:
(~children: element, ~key: 'key=?, unit) => {. "children": element};
external makeProps: (~children: element, unit) => {. "children": element};

[@bs.module "react"]
external make: component({. "children": element}) = "Fragment";
};

module StrictMode = {
[@bs.obj]
external makeProps:
(~children: element, ~key: 'key=?, unit) => {. "children": element};
external makeProps: (~children: element, unit) => {. "children": element};
[@bs.module "react"]
external make: component({. "children": element}) = "StrictMode";
};

module Suspense = {
[@bs.obj]
external makeProps:
(~children: element=?, ~fallback: element=?, ~key: 'key=?, unit) =>
(~children: element=?, ~fallback: element=?, unit) =>
{
.
"children": option(element),
Expand All @@ -153,35 +158,6 @@ module Suspense = {
"Suspense";
};

/* Experimental React.SuspenseList */
module SuspenseList = {
type revealOrder;
type tail;
[@bs.obj]
external makeProps:
(
~children: element=?,
~revealOrder: [ | `forwards | `backwards | `together]=?,
~tail: [ | `collapsed | `hidden]=?,
unit
) =>
{
.
"children": option(element),
"revealOrder": option(revealOrder),
"tail": option(tail),
};

[@bs.module "react"]
external make:
component({
.
"children": option(element),
"revealOrder": option(revealOrder),
"tail": option(tail),
}) =
"SuspenseList";
};
/* HOOKS */

/*
Expand Down Expand Up @@ -211,6 +187,16 @@ external useReducerWithMapState:
('state, 'action => unit) =
"useReducer";

[@bs.module "react"]
external useSyncExternalStore:
(
~subscribe: [@bs.uncurry] (unit => unit),
~getSnapshot: [@bs.uncurry] (unit => 'snapshot),
~getServerSnapshot: [@bs.uncurry] (unit => 'snapshot)=?
) =>
'snapshot =
"useSyncExternalStore";

[@bs.module "react"]
external useEffect: ([@bs.uncurry] (unit => option(unit => unit))) => unit =
"useEffect";
Expand Down Expand Up @@ -254,6 +240,50 @@ external useEffect7:
unit =
"useEffect";

[@bs.module "react"]
external useInsertionEffect:
([@bs.uncurry] (unit => option(unit => unit))) => unit =
"useInsertionEffect";
[@bs.module "react"]
external useInsertionEffect0:
([@bs.uncurry] (unit => option(unit => unit)), [@bs.as {json|[]|json}] _) =>
unit =
"useInsertionEffect";
[@bs.module "react"]
external useInsertionEffect1:
([@bs.uncurry] (unit => option(unit => unit)), array('a)) => unit =
"useInsertionEffect";
[@bs.module "react"]
external useInsertionEffect2:
([@bs.uncurry] (unit => option(unit => unit)), ('a, 'b)) => unit =
"useInsertionEffect";
[@bs.module "react"]
external useInsertionEffect3:
([@bs.uncurry] (unit => option(unit => unit)), ('a, 'b, 'c)) => unit =
"useInsertionEffect";
[@bs.module "react"]
external useInsertionEffect4:
([@bs.uncurry] (unit => option(unit => unit)), ('a, 'b, 'c, 'd)) => unit =
"useInsertionEffect";
[@bs.module "react"]
external useInsertionEffect5:
([@bs.uncurry] (unit => option(unit => unit)), ('a, 'b, 'c, 'd, 'e)) =>
unit =
"useInsertionEffect";
[@bs.module "react"]
external useInsertionEffect6:
([@bs.uncurry] (unit => option(unit => unit)), ('a, 'b, 'c, 'd, 'e, 'f)) =>
unit =
"useInsertionEffect";
[@bs.module "react"]
external useInsertionEffect7:
(
[@bs.uncurry] (unit => option(unit => unit)),
('a, 'b, 'c, 'd, 'e, 'f, 'g)
) =>
unit =
"useInsertionEffect";

[@bs.module "react"]
external useLayoutEffect:
([@bs.uncurry] (unit => option(unit => unit))) => unit =
Expand Down Expand Up @@ -329,7 +359,7 @@ external useMemo7:
([@bs.uncurry] (unit => 'any), ('a, 'b, 'c, 'd, 'e, 'f, 'g)) => 'any =
"useMemo";

/* This is used as return values */
/* This is used as return values */
type callback('input, 'output) = 'input => 'output;

[@bs.module "react"]
Expand Down Expand Up @@ -379,6 +409,9 @@ external useCallback7:
external useContext: Context.t('any) => 'any = "useContext";

[@bs.module "react"] external useRef: 'value => ref('value) = "useRef";
[@bs.module "react"] external useId: unit => string = "useId";

[@bs.module "react"] external useDeferredValue: 'a => 'a = "useDeferredValue";

[@bs.module "react"]
external useImperativeHandle0:
Expand Down Expand Up @@ -523,16 +556,18 @@ module Uncurried = {
"useCallback";
};

type transitionConfig = {timeoutMs: int};

[@bs.module "react"]
external useTransition:
(~config: transitionConfig=?, unit) =>
(callback(callback(unit, unit), unit), bool) =
external useTransition: unit => (bool, callback(callback(unit, unit), unit)) =
"useTransition";

[@bs.module "react"] external use: Js.Promise.t('a) => 'a = "use";

[@bs.set]
external setDisplayName: (component('props), string) => unit = "displayName";

[@bs.get] [@bs.return nullable]
external displayName: component('props) => option(string) = "displayName";

[@bs.module "react"]
external useDebugValue: ('value, ~format: 'value => string=?, unit) => unit =
"useDebugValue";
Loading

0 comments on commit 6b10172

Please sign in to comment.