Move brr-lwd-ui to its own package

voodoos · Aug 21, 2024 · 0376562 · 0376562
1 parent ffe4021
commit 0376562
Show file tree

Hide file tree

Showing 47 changed files with 112 additions and 28 deletions.
diff --git a/bin/db_worker/dune b/bin/db_worker/dune
@@ -4,4 +4,4 @@
  (js_of_ocaml
   (flags
    (:standard --no-inline --source-map-inline --pretty)))
- (libraries js_of_ocaml brrer lib data_source db))
+ (libraries js_of_ocaml brr-lwd-ui.brrer lib data_source db))
diff --git a/bin/dune b/bin/dune
@@ -7,10 +7,10 @@
  (flags :standard -open Brrer)
  (libraries
   js_of_ocaml
-  brrer
   lwd
   brr-lwd
-  ocamix.brr-lwd-ui
+  brr-lwd-ui
+  brr-lwd-ui.brrer
   lib
   data_source
   db

diff --git a/lib/brr_lwd_ui/dune b/lib/brr_lwd_ui/dune
diff --git a/lib/db/dune b/lib/db/dune
@@ -1,6 +1,6 @@
 (library
  (name db)
- (libraries std brrer yojson data_source worker_api)
+ (libraries std brr-lwd-ui.brrer yojson data_source worker_api)
  (flags :standard -open Ppx_yojson_conv_lib.Yojson_conv.Primitives)
  (preprocess
   (pps ppx_yojson_conv)))
diff --git a/lib/std/std.ml b/lib/std/std.ml
@@ -1,5 +1,4 @@
 include ContainersLabels
-module FFCache = FFCache
 
 module String = struct
   include String

diff --git a/vendor/brr_lwd_ui/.ocamlformat b/vendor/brr_lwd_ui/.ocamlformat
@@ -0,0 +1 @@
+version=0.26.2
diff --git a/lib/brrer/brrer.ml → vendor/brr_lwd_ui/brrer/brrer.ml b/lib/brrer/brrer.ml → vendor/brr_lwd_ui/brrer/brrer.ml
diff --git a/lib/brrer/dom_rect_read_only.ml → ...or/brr_lwd_ui/brrer/dom_rect_read_only.ml b/lib/brrer/dom_rect_read_only.ml → ...or/brr_lwd_ui/brrer/dom_rect_read_only.ml
diff --git a/lib/brrer/dom_rect_read_only.mli → ...r/brr_lwd_ui/brrer/dom_rect_read_only.mli b/lib/brrer/dom_rect_read_only.mli → ...r/brr_lwd_ui/brrer/dom_rect_read_only.mli
diff --git a/lib/brrer/dune → vendor/brr_lwd_ui/brrer/dune b/lib/brrer/dune → vendor/brr_lwd_ui/brrer/dune
@@ -1,4 +1,4 @@
 (library
  (name brrer)
- (public_name ocamix.brrer)
+ (public_name brr-lwd-ui.brrer)
  (libraries brr))
diff --git a/lib/brrer/indexed_db.ml → vendor/brr_lwd_ui/brrer/indexed_db.ml b/lib/brrer/indexed_db.ml → vendor/brr_lwd_ui/brrer/indexed_db.ml
diff --git a/lib/brrer/indexed_db.mli → vendor/brr_lwd_ui/brrer/indexed_db.mli b/lib/brrer/indexed_db.mli → vendor/brr_lwd_ui/brrer/indexed_db.mli
diff --git a/lib/brrer/intersection_observer.ml → ...brr_lwd_ui/brrer/intersection_observer.ml b/lib/brrer/intersection_observer.ml → ...brr_lwd_ui/brrer/intersection_observer.ml
diff --git a/lib/brrer/intersection_observer.mli → ...rr_lwd_ui/brrer/intersection_observer.mli b/lib/brrer/intersection_observer.mli → ...rr_lwd_ui/brrer/intersection_observer.mli
diff --git a/lib/brrer/media_session.ml → vendor/brr_lwd_ui/brrer/media_session.ml b/lib/brrer/media_session.ml → vendor/brr_lwd_ui/brrer/media_session.ml
diff --git a/lib/brrer/media_session.mli → vendor/brr_lwd_ui/brrer/media_session.mli b/lib/brrer/media_session.mli → vendor/brr_lwd_ui/brrer/media_session.mli
diff --git a/lib/brrer/mutation_observer.ml → vendor/brr_lwd_ui/brrer/mutation_observer.ml b/lib/brrer/mutation_observer.ml → vendor/brr_lwd_ui/brrer/mutation_observer.ml
diff --git a/lib/brrer/resize_observer.ml → vendor/brr_lwd_ui/brrer/resize_observer.ml b/lib/brrer/resize_observer.ml → vendor/brr_lwd_ui/brrer/resize_observer.ml
diff --git a/lib/brrer/resize_observer.mli → vendor/brr_lwd_ui/brrer/resize_observer.mli b/lib/brrer/resize_observer.mli → vendor/brr_lwd_ui/brrer/resize_observer.mli
diff --git a/lib/brrer/style.ml → vendor/brr_lwd_ui/brrer/style.ml b/lib/brrer/style.ml → vendor/brr_lwd_ui/brrer/style.ml
diff --git a/vendor/brr_lwd_ui/dune-project b/vendor/brr_lwd_ui/dune-project
@@ -0,0 +1,19 @@
+(lang dune 3.11)
+
+(generate_opam_files)
+
+(source
+ (github voodoos/brr-lwd-ui))
+
+(license AGPL-3.0)
+
+(authors "Ulysse G\195\169rard")
+
+(maintainers "")
+
+(package
+ (allow_empty)
+ (name brr-lwd-ui)
+ (synopsis "UI components for use with with brr_lwd")
+ (description "A _really_ long description")
+ (depends containers js_of_ocaml js_of_ocaml-ppx brr lwd brr-lwd))
diff --git a/vendor/brr_lwd_ui/examples/virtual-table/dune b/vendor/brr_lwd_ui/examples/virtual-table/dune
@@ -0,0 +1,8 @@
+(executable
+ (name main)
+ (modes js)
+ (promote (until-clean))
+ (js_of_ocaml
+  (flags
+   (:standard --no-inline)))
+ (libraries js_of_ocaml lwd brr-lwd brr-lwd-ui))
diff --git a/vendor/brr_lwd_ui/examples/virtual-table/index.html b/vendor/brr_lwd_ui/examples/virtual-table/index.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+	<title>OCAMIX</title>
+	<meta name="viewport" content="width=device-width, initial-scale=1" />
+	<link rel="stylesheet" href="./brr_lwd_ui.css">
+</head>
+
+<body>
+	<script src="main.bc.js"></script>
+</body>
+
+</html>
diff --git a/vendor/brr_lwd_ui/examples/virtual-table/main.ml b/vendor/brr_lwd_ui/examples/virtual-table/main.ml
@@ -0,0 +1,16 @@
+open Brr
+open Brr_lwd
+
+let app = Elwd.div [ `P (El.txt' "toto") ]
+
+let _ =
+  let on_load _ =
+    let app = Lwd.observe @@ app in
+    let on_invalidate _ =
+      ignore @@ G.request_animation_frame
+      @@ fun _ -> ignore @@ Lwd.quick_sample app
+    in
+    El.append_children (Document.body G.document) [ Lwd.quick_sample app ];
+    Lwd.set_on_invalidate app on_invalidate
+  in
+  Ev.listen Ev.dom_content_loaded on_load (Window.as_target G.window)
diff --git a/lib/brr_lwd_ui/attrs.ml → vendor/brr_lwd_ui/lib/attrs.ml b/lib/brr_lwd_ui/attrs.ml → vendor/brr_lwd_ui/lib/attrs.ml
@@ -1,4 +1,4 @@
-open Std
+open Import
 
 module Classes = struct
   include String.Set

diff --git a/lib/brr_lwd_ui/button.ml → vendor/brr_lwd_ui/lib/button.ml b/lib/brr_lwd_ui/button.ml → vendor/brr_lwd_ui/lib/button.ml
@@ -1,4 +1,4 @@
-open! Std
+open! Import
 open Brr
 open Brr_lwd
 

diff --git a/lib/brr_lwd_ui/button.mli → vendor/brr_lwd_ui/lib/button.mli b/lib/brr_lwd_ui/button.mli → vendor/brr_lwd_ui/lib/button.mli
@@ -1,4 +1,4 @@
-open! Std
+open! Import
 open Brr
 open Brr_lwd
 

diff --git a/lib/brr_lwd_ui/controlled_scroll.ml → vendor/brr_lwd_ui/lib/controlled_scroll.ml b/lib/brr_lwd_ui/controlled_scroll.ml → vendor/brr_lwd_ui/lib/controlled_scroll.ml
diff --git a/lib/brr_lwd_ui/controlled_scroll.mli → vendor/brr_lwd_ui/lib/controlled_scroll.mli b/lib/brr_lwd_ui/controlled_scroll.mli → vendor/brr_lwd_ui/lib/controlled_scroll.mli
diff --git a/vendor/brr_lwd_ui/lib/dune b/vendor/brr_lwd_ui/lib/dune
@@ -0,0 +1,6 @@
+(include_subdirs unqualified)
+
+(library
+ (name brr_lwd_ui)
+ (public_name brr-lwd-ui)
+ (libraries containers containers-data brrer lwd brr-lwd base64))
diff --git a/vendor/brr_lwd_ui/lib/encodings.ml b/vendor/brr_lwd_ui/lib/encodings.ml
@@ -0,0 +1,13 @@
+open Import
+
+let to_jstr t = Jv.repr t |> Brr.Json.encode
+let to_jv t = to_jstr t |> Jv.of_jstr
+
+let of_jstr jstr =
+  match Brr.Json.decode jstr with
+  | Ok v -> Ok (Obj.magic v)
+  | Error err ->
+      Brr.Console.error [ err ];
+      Error (`Msg "Failed to unmarshal data")
+
+let of_jv jv = Jv.to_jstr jv |> of_jstr
diff --git a/lib/brr_lwd_ui/forms/field.ml → vendor/brr_lwd_ui/lib/forms/field.ml b/lib/brr_lwd_ui/forms/field.ml → vendor/brr_lwd_ui/lib/forms/field.ml
@@ -1,5 +1,5 @@
-open! Std
-open! Brrer.Brr
+open! Import
+open Brrer.Brr
 open! Brr_lwd
 module A = Attrs
 

diff --git a/lib/brr_lwd_ui/forms/field_checkboxes.ml → .../brr_lwd_ui/lib/forms/field_checkboxes.ml b/lib/brr_lwd_ui/forms/field_checkboxes.ml → .../brr_lwd_ui/lib/forms/field_checkboxes.ml
@@ -1,5 +1,4 @@
-open! Std
-open! Brrer
+open! Import
 open! Brr
 open! Brr_lwd
 

diff --git a/lib/brr_lwd_ui/forms/field_select.ml → vendor/brr_lwd_ui/lib/forms/field_select.ml b/lib/brr_lwd_ui/forms/field_select.ml → vendor/brr_lwd_ui/lib/forms/field_select.ml
@@ -1,4 +1,4 @@
-open! Std
+open! Import
 open! Brrer
 open! Brr
 open! Brr_lwd

diff --git a/lib/brr_lwd_ui/forms/field_textinput.ml → ...r/brr_lwd_ui/lib/forms/field_textinput.ml b/lib/brr_lwd_ui/forms/field_textinput.ml → ...r/brr_lwd_ui/lib/forms/field_textinput.ml
@@ -1,4 +1,4 @@
-open! Std
+open! Import
 open! Brrer
 open! Brr
 open! Brr_lwd

diff --git a/lib/brr_lwd_ui/forms/form.ml → vendor/brr_lwd_ui/lib/forms/form.ml b/lib/brr_lwd_ui/forms/form.ml → vendor/brr_lwd_ui/lib/forms/form.ml
@@ -1,4 +1,4 @@
-open Std
+open Import
 open Brrer.Brr
 open Brr_lwd
 module Field = Field

diff --git a/lib/brr_lwd_ui/forms/form.mli → vendor/brr_lwd_ui/lib/forms/form.mli b/lib/brr_lwd_ui/forms/form.mli → vendor/brr_lwd_ui/lib/forms/form.mli
diff --git a/vendor/brr_lwd_ui/lib/import.ml b/vendor/brr_lwd_ui/lib/import.ml
@@ -0,0 +1,16 @@
+include ContainersLabels
+module Brr = Brrer.Brr
+
+(** [tee f x] applies [f] to [x] and returns [x] *)
+let tee f x =
+  let () = f x in
+  x
+
+module String = struct
+  include String
+  module Set = Set.Make (String)
+end
+
+module Lwd = struct
+  include Lwd
+end
diff --git a/lib/brr_lwd_ui/persistent.ml → vendor/brr_lwd_ui/lib/persistent.ml b/lib/brr_lwd_ui/persistent.ml → vendor/brr_lwd_ui/lib/persistent.ml
@@ -1,4 +1,4 @@
-open! Std
+open Import
 module B64 = Base64
 open! Brr
 module Storage = Brr_io.Storage

diff --git a/lib/brr_lwd_ui/persistent.mli → vendor/brr_lwd_ui/lib/persistent.mli b/lib/brr_lwd_ui/persistent.mli → vendor/brr_lwd_ui/lib/persistent.mli
diff --git a/lib/std/FFCache.ml → vendor/brr_lwd_ui/lib/table/FFCache.ml b/lib/std/FFCache.ml → vendor/brr_lwd_ui/lib/table/FFCache.ml
diff --git a/lib/std/FFCache.mli → vendor/brr_lwd_ui/lib/table/FFCache.mli b/lib/std/FFCache.mli → vendor/brr_lwd_ui/lib/table/FFCache.mli
diff --git a/lib/brr_lwd_ui/table/schema.ml → vendor/brr_lwd_ui/lib/table/schema.ml b/lib/brr_lwd_ui/table/schema.ml → vendor/brr_lwd_ui/lib/table/schema.ml
@@ -1,5 +1,4 @@
-open Std
-open Brrer
+open Import
 open Brr
 open Brr_lwd
 

diff --git a/lib/brr_lwd_ui/table/table.ml → vendor/brr_lwd_ui/lib/table/table.ml b/lib/brr_lwd_ui/table/table.ml → vendor/brr_lwd_ui/lib/table/table.ml
diff --git a/lib/brr_lwd_ui/table/virtual_table.ml → vendor/brr_lwd_ui/lib/table/virtual_table.ml b/lib/brr_lwd_ui/table/virtual_table.ml → vendor/brr_lwd_ui/lib/table/virtual_table.ml
@@ -5,7 +5,7 @@
     might be possible to optimize it (especially the "uniqueue" LRU thingy),
     but having too large a lwd_table is probably a hard limit. *)
 
-open Std
+open Import
 open Brrer
 open Brr
 open Brr_lwd
@@ -141,7 +141,7 @@ let make (type data) ~(ui_table : Schema.fixed_row_height)
           (* todo: We do way too much work and rebuild the queue each
              time... it's very ineficient *)
           add ~fetch ~max_items:(4 * List.length visible_rows) visible_rows)
-        in
+    in
     Lwd.map2 total_items update ~f:(fun total_items update ->
         prepare ~total_items ~render;
         update)

diff --git a/lib/brr_lwd_ui/translated.ml → vendor/brr_lwd_ui/lib/translated.ml b/lib/brr_lwd_ui/translated.ml → vendor/brr_lwd_ui/lib/translated.ml
diff --git a/lib/brr_lwd_ui/utils.ml → vendor/brr_lwd_ui/lib/utils.ml b/lib/brr_lwd_ui/utils.ml → vendor/brr_lwd_ui/lib/utils.ml
@@ -1,4 +1,4 @@
-open Std
+open Import
 open Brr
 
 type 'a one_maybe_reactive = [ `P of 'a | `R of 'a Lwd.t ]