diff --git a/src/js/js_pretty_post.ml b/src/js/js_pretty_post.ml index b47ad1e..18cae88 100644 --- a/src/js/js_pretty_post.ml +++ b/src/js/js_pretty_post.ml @@ -1,7 +1,6 @@ -let log = Format.printf +open Brr -(* TODO do like in render_time everywhere *) -let inner_html = Brr.El.Prop.jstr (Jstr.of_string "innerHTML") +let log = Format.printf type image_size = | Big @@ -14,42 +13,40 @@ let of_string = function let to_string = function Small -> "post-image" | Big -> "post-image-big" -let document = Jv.get Jv.global "document" - (*change postImage class to make it bigger/smaller on click*) let image_click post_image event = log "image_click@\n"; + let class_jstr = Jstr.of_string "class" in let current_class = - Jv.to_string @@ Jv.call post_image "getAttribute" [| Jv.of_string "class" |] + match El.at class_jstr post_image with + | None -> failwith "no class for post_image" + | Some c -> Jstr.to_string c in let new_class = match of_string current_class with | Some image_size -> ( match image_size with Big -> Small | Small -> Big ) | None -> failwith "invalid image class name" in - ignore - @@ Jv.call post_image "setAttribute" - [| Jv.of_string "class"; Jv.of_string (to_string new_class) |]; + El.set_at class_jstr (Some (Jstr.of_string (to_string new_class))) post_image; let id = - Jv.to_string - @@ Jv.call post_image "getAttribute" [| Jv.of_string "data-id" |] + match El.at (Jstr.of_string "data-id") post_image with + | None -> failwith "no data-id on post_image" + | Some id -> Jstr.to_string id in let src = match new_class with | Small -> Format.sprintf "/img/s/%s" id | Big -> Format.sprintf "/img/%s" id in - ignore - @@ Jv.call post_image "setAttribute" - [| Jv.of_string "src"; Jv.of_string src |]; + El.set_at (Jstr.of_string "src") (Some (Jstr.of_string src)) post_image; (*prevent redirect to /img/:img*) - ignore @@ Jv.call event "preventDefault" [||]; - ignore @@ Jv.call event "stopPropagation" [||] + Ev.prevent_default event; + Ev.stop_propagation event let render_time date_span = log "render time@\n"; let data_time = - match Brr.El.at (Jstr.of_string "data-time") date_span with + match El.at (Jstr.of_string "data-time") date_span with | None -> failwith "no attribute data-time for date element" | Some data_time -> Jstr.to_float data_time in @@ -64,7 +61,8 @@ let render_time date_span = Format.sprintf "%02d-%02d-%02d %02d:%02d" (1900 + t.tm_year) (1 + t.tm_mon) t.tm_mday t.tm_hour t.tm_min in - Brr.El.set_prop inner_html (Jstr.of_string date) date_span + let inner_html = El.Prop.jstr (Jstr.of_string "innerHTML") in + El.set_prop inner_html (Jstr.of_string date) date_span let preview_ref = ref None @@ -72,84 +70,103 @@ let highlighted_ref = ref None let selected_ref = ref None -(* todo use brr *) -let add_class name el = - let class_list = Jv.get el "classList" in - ignore @@ Jv.call class_list "add" [| Jv.of_string name |] - -let remove_class name el = - let class_list = Jv.get el "classList" in - ignore @@ Jv.call class_list "remove" [| Jv.of_string name |] - let on_hashchange _event = log "on hashchange"; - let frag = - Jstr.to_string @@ Brr.Uri.fragment @@ Brr.Window.location Brr.G.window + let frag = Jstr.to_string @@ Uri.fragment @@ Window.location G.window in + if frag = "" then () + else + match Document.find_el_by_id G.document (Jstr.of_string frag) with + | None -> log "fragment not found on the page" + | Some reply -> + let () = + match !selected_ref with + | None -> () + | Some item -> El.set_class (Jstr.of_string "selected") false item + in + El.set_class (Jstr.of_string "selected") true reply; + selected_ref := Some reply + +let clone_element el = + (* TODO: how to clone with Brr? *) + let id = + match El.at (Jstr.of_string "id") el with + | None -> failwith "element as no id for cloning" + | Some id -> Jstr.to_string id in - match Jv.find Jv.global frag with - | None -> log "fragment not found on the page" - | Some reply -> - let () = - match !selected_ref with - | None -> () - | Some item -> remove_class "selected" item - in - let () = add_class "selected" reply in - selected_ref := Some reply + (* get reply_div as a Jv.t *) + let original_div = Jv.get Jv.global id in + let div = Jv.call original_div "cloneNode" [| Jv.of_bool true |] in + ignore + @@ Jv.call div "setAttribute" + [| Jv.of_string "id"; Jv.of_string "floating-reply-preview" |]; + ignore + @@ Jv.call div "setAttribute" + [| Jv.of_string "class"; Jv.of_string "post highlight" |]; + + (* append to DOM *) + (* we needs to add it to `body` and not `original_div` or it might change the display + * and do buggy things with mouse events on `original_div`*) + let document = Jv.get Jv.global "document" in + let body = Jv.get document "body" in + ignore @@ Jv.call body "append" [| div |]; + (* go back to El *) + match + Document.find_el_by_id G.document (Jstr.of_string "floating-reply-preview") + with + | None -> failwith "error cloning element" + | Some el -> el let on_mouse_over el _event = log "on mouse over@\n"; - (*get id of reply *) + let reply_id = - Jv.to_string @@ Jv.call el "getAttribute" [| Jv.of_string "data-id" |] + match El.at (Jstr.of_string "data-id") el with + | None -> failwith "no data-id on element" + | Some data_id -> data_id in - (* (try to) get div of reply *) - match Jv.find Jv.global reply_id with + + match Document.find_el_by_id G.document reply_id with | None -> failwith "error getting reply_div, this reply is not on this page" | Some reply_div -> (* check if it in view, if it is, just make it of class `highlight` *) - let reply_bounding_rect = Jv.call reply_div "getBoundingClientRect" [||] in let window = Jv.get Jv.global "window" in let window_height = Jv.get window "innerHeight" |> Jv.to_int in - let reply_top = Jv.get reply_bounding_rect "top" |> Jv.to_int in - if reply_top < window_height - 50 then ( - let class_list = Jv.get reply_div "classList" in - ignore @@ Jv.call class_list "add" [| Jv.of_string "highlight" |]; + let reply_top = El.bound_y reply_div |> int_of_float in + if reply_top < window_height - 50 && reply_top + 50 > 0 then ( + (* just highlight if reply is in viewport *) + El.set_class (Jstr.of_string "highlight") true reply_div; highlighted_ref := Some reply_div ) else (* copy it to make new div `floating-reply-preview` *) - let preview_div = Jv.call reply_div "cloneNode" [| Jv.of_bool true |] in - ignore - @@ Jv.call preview_div "setAttribute" - [| Jv.of_string "class" - ; Jv.of_string "floating-reply-preview post" - |]; - ignore - @@ Jv.call preview_div "setAttribute" - [| Jv.of_string "id"; Jv.of_string "floating-reply-preview" |]; - (* append to DOM *) - ignore @@ Jv.call el "after" [| preview_div |]; + let preview_div = clone_element reply_div in + (* place it next to the reply-link el*) - let bounding_rect = Jv.call el "getBoundingClientRect" [||] in let top = - let el_top = Jv.get bounding_rect "top" |> Jv.to_int in - let reply_height = Jv.get reply_bounding_rect "height" |> Jv.to_int in - Int.min el_top (window_height - reply_height - 5) - |> Format.sprintf "%dpx" |> Jv.of_string + let el_top = El.bound_y el in + let h = El.bound_h preview_div in + (* clamp to viewport *) + let top = + Float.min + (el_top -. (0.5 *. h)) + (float_of_int window_height -. h -. 7.0) + in + let top = Float.max top 0.0 in + top |> int_of_float |> Format.sprintf "%dpx" |> Jstr.of_string in - let right = - Jv.get bounding_rect "right" - |> Jv.to_int |> Format.sprintf "%dpx" |> Jv.of_string + let left = + El.bound_x el +. El.bound_w el + |> int_of_float |> Format.sprintf "%dpx" |> Jstr.of_string in - let style = Jv.get preview_div "style" in - ignore @@ Jv.set style "position" (Jv.of_string "fixed"); - ignore @@ Jv.set style "z-index" (Jv.of_int 42); - ignore @@ Jv.set style "top" top; - ignore @@ Jv.set style "left" right; + El.set_inline_style El.Style.position (Jstr.of_string "fixed") preview_div; + El.set_inline_style El.Style.z_index (Jstr.of_string "42") preview_div; + El.set_inline_style El.Style.top top preview_div; + El.set_inline_style El.Style.left left preview_div; + (* also highlight class doesn't work if we set inline style idk why wtf css *) + El.set_inline_style El.Style.background_color (Jstr.of_string "#9dd162") + preview_div; (* set preview_div ref for on_mouse_out *) - preview_ref := Some preview_div; - () + preview_ref := Some preview_div let on_mouse_out _el _event = log "on mouse out@\n"; @@ -158,62 +175,46 @@ let on_mouse_out _el _event = match !highlighted_ref with | None -> () | Some highlighted_div -> - let class_list = Jv.get highlighted_div "classList" in - ignore @@ Jv.call class_list "remove" [| Jv.of_string "highlight" |] + El.set_class (Jstr.of_string "highlight") false highlighted_div in match !preview_ref with | None -> () - | Some preview_div -> - ignore @@ Jv.call preview_div "remove" [||]; - (* if None, get the `selected-reply-preview` element (by class) and remove this class *) - () + | Some preview_div -> El.remove preview_div let make_pretty _event = log "make pretty@\n"; let add_event_to_class ~name ~event handler = - (* TODO use brr? *) - let event = Brr.Ev.Type.create (Jstr.of_string event) in - let el_list = Brr.El.find_by_class (Jstr.of_string name) in - List.iter - (fun el -> - (* TODO handler should take Brr.El. ? *) - Brr.Ev.listen event (handler el) (Brr.El.as_target el) ) - el_list + let event = Ev.Type.create (Jstr.of_string event) in + let el_list = El.find_by_class (Jstr.of_string name) in + List.iter (fun el -> Ev.listen event (handler el) (El.as_target el)) el_list in - let dates = Brr.El.find_by_class (Jstr.of_string "date") in + let dates = El.find_by_class (Jstr.of_string "date") in List.iter render_time dates; - (*(*add event image_click to all postImage*) - let () = add_event_to_class ~name:"post-image" ~event:"click" image_click in + (*add event image_click to all postImage*) + let () = add_event_to_class ~name:"post-image" ~event:"click" image_click in - (*add event mouse_over/out to all reply-link *) - let () = - add_event_to_class ~name:"reply-link" ~event:"mouseover" on_mouse_over - in - *) + (*add event mouse_over/out to all reply-link *) + let () = + add_event_to_class ~name:"reply-link" ~event:"mouseover" on_mouse_over + in let () = add_event_to_class ~name:"reply-link" ~event:"mouseout" on_mouse_out in (* add fragment listener to mark as selected the linked post *) - let window = Jv.get Jv.global "window" in - ignore - @@ Jv.call window "addEventListener" - [| Jv.of_string "hashchange"; Jv.repr on_hashchange |] + (* TODO call with brr*) + let hashchange = Ev.Type.create (Jstr.of_string "hashchange") in + Ev.listen hashchange on_hashchange (Window.as_target G.window); + (* call hashchange on page load too *) + on_hashchange () (*make pretty after page load*) let () = log "add load eventlistener to make pretty@\n"; - let window = Jv.get Jv.global "window" in - ignore - @@ Jv.call window "addEventListener" - [| Jv.of_string "load"; Jv.repr make_pretty |] + let load = Ev.Type.create (Jstr.of_string "load") in + Ev.listen load make_pretty (Window.as_target G.window) -(* TODO add a selected class for post clicked / in fragment *) -(* see https://developer.mozilla.org/en-US/docs/Web/API/Window/hashchange_event *) (* TODO reply can be in another thread, how to display it? if displaying it on mouseover we need to fetch it. and display it in special color. need to change pp_post in pp_babillard *) -(* mouseout not fired when scrolling wtf *) -(* TODO link to post in comment should be of class reply-link *) -(* TODO preview should stay in viewport (bug if near the end of viewport) *)