diff --git a/apple/Package.resolved b/apple/Package.resolved index cbd6fa75..0dcf7e4e 100644 --- a/apple/Package.resolved +++ b/apple/Package.resolved @@ -6,7 +6,7 @@ "kind" : "remoteSourceControl", "location" : "ssh://git@github.com/logseq/lui.git", "state" : { - "revision" : "f13b6f909ba63c888d189eede21bc0960e7de0d0" + "revision" : "87fcf6af90728bca313b9de991e5bf30564bbc05" } }, { diff --git a/apple/Package.swift b/apple/Package.swift index 9e598dde..8e3cf996 100644 --- a/apple/Package.swift +++ b/apple/Package.swift @@ -44,7 +44,7 @@ let package = Package( .library(name: "LogseqModel", type: .dynamic, targets: ["LogseqModel"]), ], dependencies: [ - .package(url: "ssh://git@github.com/logseq/lui.git", revision: "f13b6f909ba63c888d189eede21bc0960e7de0d0"), + .package(url: "ssh://git@github.com/logseq/lui.git", revision: "87fcf6af90728bca313b9de991e5bf30564bbc05"), .package(url: "https://github.com/getsentry/sentry-cocoa.git", exact: "9.27.0") ], targets: [ diff --git a/logseq.opam b/logseq.opam index 0f240eca..707c92fc 100644 --- a/logseq.opam +++ b/logseq.opam @@ -34,7 +34,7 @@ pin-depends: [ ["melange-transit-core.0.1.2" "git+https://github.com/logseq/melange-transit.git#main"] ["melange-transit-native.0.1.2" "git+https://github.com/logseq/melange-transit.git#main"] ["melange-transit-melange.0.1.2" "git+https://github.com/logseq/melange-transit.git#main"] - ["lui.0.1.0" "git+ssh://git@github.com/logseq/lui.git#f13b6f909ba63c888d189eede21bc0960e7de0d0"] + ["lui.0.1.0" "git+ssh://git@github.com/logseq/lui.git#87fcf6af90728bca313b9de991e5bf30564bbc05"] ["sdl3.0.0.1--alpha" "git+https://github.com/logseq/ocaml-sdl3.git#a9919c19bb4a0ba4857142f007ad93dd2563e799"] ["drive.dev" "git+https://github.com/logseq/drive.git#dd735a65ed525d1c36db38ac8e8114aa81d314a1"] ["ocaml-signal.0.1.0" "git+https://github.com/logseq/ocaml-signal.git#02e18cdc5e0ad672aa223f638eaa3ba52fc9421e"] diff --git a/scripts/cloud-agent-install.sh b/scripts/cloud-agent-install.sh new file mode 100755 index 00000000..a92b5813 --- /dev/null +++ b/scripts/cloud-agent-install.sh @@ -0,0 +1,149 @@ +#!/usr/bin/env bash +# Cloud Agent install for logseq/mobile (Linux OCaml core). +# Idempotent: safe to re-run. Does not start servers or run tests. +set -euo pipefail + +[ ! -d '/agent/repos/mobile' ] || cd '/agent/repos/mobile' || exit $? +cd "$(git rev-parse --show-toplevel 2>/dev/null || pwd)" + +export DEBIAN_FRONTEND=noninteractive +export GIT_TERMINAL_PROMPT=0 +export GIT_CONFIG_COUNT=3 +export GIT_CONFIG_KEY_0="url.https://github.com/.insteadOf" +export GIT_CONFIG_VALUE_0="git@github.com:" +export GIT_CONFIG_KEY_1="url.https://github.com/.insteadOf" +export GIT_CONFIG_VALUE_1="ssh://git@github.com/" +export GIT_CONFIG_KEY_2="url.https://github.com/.insteadOf" +export GIT_CONFIG_VALUE_2="git+ssh://git@github.com/" + +SDL3_PREFIX="${LOGSEQ_SDL3_PREFIX:-/opt/sdl3}" +export PKG_CONFIG_PATH="${SDL3_PREFIX}/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}" +export LD_LIBRARY_PATH="${SDL3_PREFIX}/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" +export LIBRARY_PATH="${SDL3_PREFIX}/lib${LIBRARY_PATH:+:$LIBRARY_PATH}" +export C_INCLUDE_PATH="${SDL3_PREFIX}/include${C_INCLUDE_PATH:+:$C_INCLUDE_PATH}" + +sudo apt-get update -qq +sudo apt-get install -y -qq \ + build-essential cmake ninja-build pkg-config \ + opam bubblewrap m4 \ + libsqlite3-dev libffi-dev \ + libsdl2-dev libsdl2-ttf-dev \ + libpango1.0-dev libcairo2-dev \ + libx11-dev libxext-dev libxrandr-dev libxcursor-dev libxfixes-dev \ + libxi-dev libxss-dev libxtst-dev libwayland-dev libxkbcommon-dev \ + libdbus-1-dev libibus-1.0-dev libudev-dev \ + libasound2-dev libpulse-dev libdrm-dev libgbm-dev \ + libegl1-mesa-dev libgles2-mesa-dev + +# Persist toolchain env for subsequent login shells / agent commands. +PROFILE_SNIPPET="$HOME/.profile" +MARKER='# logseq-mobile-cloud-agent' +if ! grep -qF "$MARKER" "$PROFILE_SNIPPET" 2>/dev/null; then + cat >> "$PROFILE_SNIPPET" </dev/null 2>&1; then + eval "\$(opam env --switch=5.5.0 --set-switch 2>/dev/null)" || true +fi +EOF +fi + +# SDL3 is not packaged on Ubuntu 24.04; build the pinned runtime once. +if ! PKG_CONFIG_PATH="${SDL3_PREFIX}/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}" \ + pkg-config --exists sdl3; then + sudo mkdir -p "$SDL3_PREFIX" + sudo chown "$(whoami)" "$SDL3_PREFIX" + TMP_SDL=$(mktemp -d) + trap 'rm -rf "$TMP_SDL"' EXIT + curl -fsSL \ + https://raw.githubusercontent.com/logseq/ocaml-sdl3/a9919c19bb4a0ba4857142f007ad93dd2563e799/tooling/install_sdl3.py \ + -o "$TMP_SDL/install_sdl3.py" + python3 "$TMP_SDL/install_sdl3.py" "$SDL3_PREFIX" + trap - EXIT + rm -rf "$TMP_SDL" +fi +sudo ldconfig || true + +# Opam switch (global ~/.opam — survives across checkouts). +if [ ! -d "${OPAMROOT:-$HOME/.opam}" ]; then + opam init --disable-sandboxing -a --bare +fi +if ! opam switch list --short 2>/dev/null | grep -qx '5.5.0'; then + opam switch create 5.5.0 +fi +eval "$(opam env --switch=5.5.0 --set-switch)" + +git config --global url."https://github.com/".insteadOf "git@github.com:" || true +git config --global url."https://github.com/".insteadOf "ssh://git@github.com/" || true +git config --global url."https://github.com/".insteadOf "git+ssh://git@github.com/" || true + +opam pin add -n -y melange-edn-core git+https://github.com/logseq/melange-edn.git#main +opam pin add -n -y melange-edn-native git+https://github.com/logseq/melange-edn.git#main +opam pin add -n -y melange-transit-core git+https://github.com/logseq/melange-transit.git#main +opam pin add -n -y melange-transit-native git+https://github.com/logseq/melange-transit.git#main + +# Fresh switch: install deps then drop lockfile-vendored packages (duniverse owns them). +# Re-runs skip the heavy deps pass when melange + opam-monorepo are already present. +if ! opam list --installed --short | grep -qx 'opam-monorepo'; then + opam install . --deps-only --yes --with-test --assume-depexts + if [ -f logseq.opam.locked ]; then + comm -12 \ + <(grep -oE '"[a-zA-Z0-9_.-]+" \{= "[^"]*" & \?vendor\}' logseq.opam.locked | cut -d'"' -f2 | sort) \ + <(opam list --installed --short | sort) \ + | xargs -r opam remove -y || true + fi + opam install -y melange.7.0.1-55 + opam install -y opam-monorepo.0.3.6 +else + opam install -y melange.7.0.1-55 opam-monorepo.0.3.6 +fi + +if [ ! -d duniverse ] || [ ! -d duniverse/lui ]; then + for attempt in 1 2 3; do + if opam exec -- opam-monorepo pull; then + break + fi + [ "$attempt" -lt 3 ] || exit 1 + sleep 10 + done +fi + +# Pin-depends that opam-monorepo does not vendor (logseq git pins). +if [ -f logseq.opam ]; then + for pin in $(grep -oE 'logseq/[A-Za-z0-9_-]+\.git#[A-Za-z0-9._/-]+' logseq.opam | sort -u); do + url="${pin%%#*}" + sha="${pin##*#}" + name="$(basename "$url" .git)" + if [ -d "duniverse/$name" ]; then + # Keep pin SHA current when logseq.opam changes. + if [ -d "duniverse/$name/.git" ]; then + current="$(git -C "duniverse/$name" rev-parse HEAD 2>/dev/null || true)" + if [ "$current" != "$sha" ] && [ "${#sha}" -ge 7 ]; then + git -C "duniverse/$name" fetch --quiet "https://github.com/$url" "$sha" || true + git -C "duniverse/$name" checkout --quiet "$sha" 2>/dev/null \ + || git -C "duniverse/$name" checkout --quiet FETCH_HEAD || true + fi + fi + continue + fi + git clone --quiet "https://github.com/$url" "duniverse/$name" + if ! git -C "duniverse/$name" checkout --quiet "$sha"; then + git -C "duniverse/$name" fetch --quiet "https://github.com/$url" "$sha" + git -C "duniverse/$name" checkout --quiet FETCH_HEAD + fi + done +fi + +mkdir -p "$HOME/.config/dune" +printf '(lang dune 3.0)\n(cache enabled)\n' > "$HOME/.config/dune/config" + +# Smoke: toolchain present (full runtest is for agents, not install). +ocaml -version +dune --version +test -d duniverse/lui +pkg-config --exists sdl3 +echo "cloud-agent-install: ok" diff --git a/shared/src/logseq/view_authentication.ml b/shared/src/logseq/view_authentication.ml index bccaa16a..06b4dadc 100644 --- a/shared/src/logseq/view_authentication.ml +++ b/shared/src/logseq/view_authentication.ml @@ -6,12 +6,12 @@ let send_action send action = Model.AuthenticationForm action |> send |> ignore let action send value = fun _ -> send_action send value let tr source value = View_base.tr (Signal.sample source) value -let mobile_input kind control : t = fun context parent -> +let mobile_input kind control : t = custom (fun context parent -> let scope = Lui_ui.extension context "native-auth-input" in Lui_ui.extension_property context scope "kind" (StringValue kind); - ignore (control context (Some scope)); + ignore (mount context ~parent:scope control); attach context parent scope; - scope + scope) let field source send key label kind = let value (current : Model.logseq_model) = @@ -22,7 +22,7 @@ let field source send key label kind = | key -> Option.value ~default:"" (List.assoc_opt (String.sub key 10 (String.length key - 10)) t.attributes) in let input = if kind = "password" || kind = "new-password" then secure_field else text_field in - fun context parent -> + custom (fun context parent -> let android = Lui_ui.host context = KotlinHost in let field_style value = if android then None else Some value in let control = @@ -36,11 +36,12 @@ let field source send key label kind = ~on_submit:(action send Auth_flow.Submit) [] in (* Compose's outlined control fills its parent in a form and supplies its own border. *) let control = if android then column ~style_class:"form" [control] else control in - column ~key:("auth." ^ key) ~gap:6 ~cross:`stretch [ - text ~padding_horizontal:(if android then 0 else 14) - ~value:(tr source label) ~foreground:"muted-foreground" ~style_class:"subheadline" []; - mobile_input kind control; - ] context parent + mount context ?parent + (column ~key:("auth." ^ key) ~gap:6 ~cross:`stretch [ + text ~padding_horizontal:(if android then 0 else 14) + ~value:(tr source label) ~foreground:"muted-foreground" ~style_class:"subheadline" []; + mobile_input kind control; + ])) let fields source send stage attributes choices = let email = field source send "email" "Email" "email" in @@ -81,7 +82,7 @@ let sheet source send : t = let link id label event = button ~variant:`ghost ~text:(tr source label) ~min_height:44 ~text_alignment:`center ~accessibility_identifier:id ~disabled_signal:busy ~on_press:(action send event) [] in let can_submit = Signal.map (fun current -> Auth_flow.can_submit (form current)) source in - fun context parent -> + custom (fun context parent -> let android = Lui_ui.host context = KotlinHost in let title = Signal.map (fun current -> tr source (Auth_flow.title (form current))) source in (* SwiftUI renders the sheet outside the node tree. Scope these tokens to its content. *) @@ -139,13 +140,14 @@ let sheet source send : t = ~on_press:(action send Auth_flow.Cancel) []; ] in let sheet_title = if android then Signal.constant context.ui_scheduler "" else title in - View_base.sheet ~model_source:source ~title:(reactive sheet_title) - ~height:680 ~style_class:"navigation-content navigation-inline-title" - ~detents_signal:(Signal.map (fun current -> match (form current).stage with - | Auth_flow.Register | NewPassword -> "0.82,large" - | ForgotPassword -> "0.48,large" - | Login -> "0.54,large" - | _ -> "0.62,large") source) - ~accessibility_identifier:"sheet.authentication" - ~on_dismiss:(action send Auth_flow.Dismiss) - (if android then [header; content] else [content; navigation_toolbar]) context parent + mount context ?parent + (View_base.sheet ~model_source:source ~title:(reactive sheet_title) + ~height:680 ~style_class:"navigation-content navigation-inline-title" + ~detents_signal:(Signal.map (fun current -> match (form current).stage with + | Auth_flow.Register | NewPassword -> "0.82,large" + | ForgotPassword -> "0.48,large" + | Login -> "0.54,large" + | _ -> "0.62,large") source) + ~accessibility_identifier:"sheet.authentication" + ~on_dismiss:(action send Auth_flow.Dismiss) + (if android then [header; content] else [content; navigation_toolbar]))) diff --git a/shared/src/logseq/view_base.ml b/shared/src/logseq/view_base.ml index e7dab65d..bdff20ab 100644 --- a/shared/src/logseq/view_base.ml +++ b/shared/src/logseq/view_base.ml @@ -19,7 +19,7 @@ let sheet ~model_source ?height ?style_class ?detents ?detents_signal ?accessibi ?on_dismiss ~title ?title_signal children : Lui_elements.t = let content = Lui_elements.sheet ?height ?style_class ?detents ?detents_signal ?accessibility_identifier ?on_dismiss ~title ?title_signal children in - fun context parent -> + Lui_elements.custom (fun context parent -> match Lui_ui.profile context with | { profile_os = IOS; profile_host = SwiftUIHost } -> (* The Apple modal host reads theme tokens from the sheet's ancestors. *) @@ -38,8 +38,8 @@ let sheet ~model_source ?height ?style_class ?detents ?detents_signal ?accessibi "primary", accent; "input-focus", accent; ]) theme in - Lui_elements.themed ~tokens_signal:tokens - (Lui_elements.stack [content]) context parent + Lui_elements.mount context ?parent + (Lui_elements.themed ~tokens_signal:tokens (Lui_elements.stack [content])) | { profile_os = AndroidOS; profile_host = KotlinHost } -> let tokens = Signal.map (fun (model : Model.logseq_model) -> if model.dark_theme = "black" then [ @@ -47,8 +47,9 @@ let sheet ~model_source ?height ?style_class ?detents ?detents_signal ?accessibi "surface", Lui_ui.Adaptive { light = "#FFFFFF"; dark = "#2E2E30" }; "card", Lui_ui.Adaptive { light = "#FFFFFF"; dark = "#2E2E30" }; ] else []) model_source in - Lui_elements.themed ~tokens_signal:tokens (Lui_elements.stack [content]) context parent - | _ -> content context parent + Lui_elements.mount context ?parent + (Lui_elements.themed ~tokens_signal:tokens (Lui_elements.stack [content])) + | _ -> Lui_elements.mount context ?parent content) let node_icon (current : Model.logseq_model) uuid = Option.value ~default:"" (String_map.find_opt uuid current.node_icons) @@ -59,13 +60,13 @@ let outliner_node_icon current (row : Model.outline_row) = let node_icon_view ?(muted = false) ~size source : Lui_elements.t = Lui_elements.if_ ~test:(Signal.map (fun value -> value <> "") source) - (fun context parent -> + (Lui_elements.custom (fun context parent -> let node = Lui_ui.extension context "node-icon" in Lui_elements.attach context parent node; Lui_ui.extension_property_signal context node "payload" (Signal.map (fun value -> StringValue value) source); Lui_ui.extension_property context node "size" (IntValue size); Lui_ui.extension_property context node "muted" (BoolValue muted); - node) + node)) let string_wire_value value = StringValue value let int_wire_value value = IntValue value @@ -1575,59 +1576,59 @@ let drawer_disabled_ (current : Model.logseq_model) = || sidebar_drag_disabled_ current let with_label label (elem : Lui_elements.t) : Lui_elements.t = - fun context parent -> - let node = elem context parent in + Lui_elements.custom (fun context parent -> + let node = Lui_elements.mount context ?parent elem in Lui_ui.string_property context node AccessibilityLabel label; - node + node) let with_label_signal label (elem : Lui_elements.t) : Lui_elements.t = - fun context parent -> - let node = elem context parent in + Lui_elements.custom (fun context parent -> + let node = Lui_elements.mount context ?parent elem in Lui_ui.string_property_signal context node AccessibilityLabel label; - node + node) let with_selected_signal selected (elem : Lui_elements.t) : Lui_elements.t = - fun context parent -> - let node = elem context parent in + Lui_elements.custom (fun context parent -> + let node = Lui_elements.mount context ?parent elem in Lui_ui.bool_property_signal context node Selected selected; - node + node) let with_string_prop prop value (elem : Lui_elements.t) : Lui_elements.t = - fun context parent -> - let node = elem context parent in + Lui_elements.custom (fun context parent -> + let node = Lui_elements.mount context ?parent elem in Lui_ui.string_property context node prop value; - node + node) let with_string_prop_signal prop signal_ (elem : Lui_elements.t) : Lui_elements.t = - fun context parent -> - let node = elem context parent in + Lui_elements.custom (fun context parent -> + let node = Lui_elements.mount context ?parent elem in Lui_ui.string_property_signal context node prop signal_; - node + node) let with_bool_prop_signal prop signal_ (elem : Lui_elements.t) : Lui_elements.t = - fun context parent -> - let node = elem context parent in + Lui_elements.custom (fun context parent -> + let node = Lui_elements.mount context ?parent elem in Lui_ui.bool_property_signal context node prop signal_; - node + node) let with_int_prop_signal prop signal_ (elem : Lui_elements.t) : Lui_elements.t = - fun context parent -> - let node = elem context parent in + Lui_elements.custom (fun context parent -> + let node = Lui_elements.mount context ?parent elem in Lui_ui.int_property_signal context node prop signal_; - node + node) let with_float_prop_signal prop signal_ (elem : Lui_elements.t) : Lui_elements.t = - fun context parent -> - let node = elem context parent in + Lui_elements.custom (fun context parent -> + let node = Lui_elements.mount context ?parent elem in Lui_ui.float_property_signal context node prop signal_; - node + node) let with_liquid_glass shape (elem : Lui_elements.t) : Lui_elements.t = - fun context parent -> + Lui_elements.custom (fun context parent -> match Lui_ui.profile context with | { Lui_protocol.profile_os = Lui_protocol.IOS; profile_host = Lui_protocol.SwiftUIHost; @@ -1635,23 +1636,23 @@ let with_liquid_glass shape (elem : Lui_elements.t) : Lui_elements.t = let tweak = Lui_ui.platform_tweak context "liquid-glass" in Lui_ui.extension_property context tweak "shape" (StringValue shape); - ignore (elem context (Some tweak)); + ignore (Lui_elements.mount context ~parent:tweak elem); Lui_elements.attach context parent tweak; tweak - | _ -> elem context parent + | _ -> Lui_elements.mount context ?parent elem) let with_reading_insets (elem : Lui_elements.t) : Lui_elements.t = - fun context parent -> + Lui_elements.custom (fun context parent -> match Lui_ui.profile context with | { profile_os = IOS; profile_host = SwiftUIHost } | { profile_os = AndroidOS; profile_host = KotlinHost } -> let tweak = Lui_ui.platform_tweak context "native-adaptive-insets" in Lui_ui.extension_property context tweak "breakpoint" (IntValue Model.wide_content_breakpoint); Lui_ui.extension_property context tweak "wide-inset" (IntValue 16); - ignore (elem context (Some tweak)); + ignore (Lui_elements.mount context ~parent:tweak elem); Lui_elements.attach context parent tweak; tweak - | _ -> elem context parent + | _ -> Lui_elements.mount context ?parent elem) let icon_of_wire_name (name : string) : Lui_elements.icon = if String_kit.starts_with ~prefix:"app:" name then diff --git a/shared/src/logseq/view_composer.ml b/shared/src/logseq/view_composer.ml index 5436a2b1..c0f1a0fd 100644 --- a/shared/src/logseq/view_composer.ml +++ b/shared/src/logseq/view_composer.ml @@ -161,11 +161,11 @@ let composer_task_status_button (context : Lui_ui.ui_context) model_source send [context_menu (task_status_context_items model_source send)] let with_press handler (elem : t) : t = - fun context parent -> - let node = elem context parent in + custom (fun context parent -> + let node = mount context ?parent elem in enable context node Lui_protocol.PressEnabled; register_press context node handler; - node + node) let composer_send_button model_source context ?send_icon send_disabled on_send : t = let android_icon = Option.value send_icon ~default:(`send : icon) in @@ -197,7 +197,7 @@ let composer_tag_chips model_source send : t = let composer_tag_picker model_source send : t = if_ ~test:(Signal.map (fun (model : Model.logseq_model) -> model.composer_tags_open && not model.composer_tags_loading) model_source) - (fun context parent -> + (custom (fun context parent -> let model : Model.logseq_model = Signal.sample model_source in let seen = Hashtbl.create 32 in let options = List.filter (fun (tag : Model.sidebar_page) -> @@ -210,27 +210,28 @@ let composer_tag_picker model_source send : t = `Assoc ["title", `String tag.title; "match", `List [`String tag.uuid]]) options); "raw", `Assoc ["type", `String "set"; "value", `List (List.map (fun (tag : Model.sidebar_page) -> `Assoc ["type", `String "ref-uuid"; "value", `String tag.uuid]) model.composer_tags)]] in - (View_query.property_editor ~id:"composer.tags" ~column:property model_source property - (fun () -> ignore (send Model.CloseComposerTags)) - ~submit:(fun fields -> - let strings name = match List.assoc_opt name fields with Some (`List values) -> - List.filter_map (function `String value -> Some value | _ -> None) values | _ -> [] in - let selected = List.filter_map (fun uuid -> List.find_opt (fun (tag : Model.sidebar_page) -> tag.uuid = uuid) options) - (strings "selectedValues") in - let created = List.map (fun title -> ({Model.uuid = "new:" ^ Dev_query.Unicode.lowercase title; title} : Model.sidebar_page)) - (strings "newValues") in - let seen = Hashtbl.create 8 in - let tags = List.filter (fun (tag : Model.sidebar_page) -> - let key = Dev_query.Unicode.lowercase tag.title in - if Hashtbl.mem seen key then false else (Hashtbl.add seen key (); true)) (selected @ created) in - ignore (send (Model.SetComposerTags tags)))) context parent) + mount context ?parent + (View_query.property_editor ~id:"composer.tags" ~column:property model_source property + (fun () -> ignore (send Model.CloseComposerTags)) + ~submit:(fun fields -> + let strings name = match List.assoc_opt name fields with Some (`List values) -> + List.filter_map (function `String value -> Some value | _ -> None) values | _ -> [] in + let selected = List.filter_map (fun uuid -> List.find_opt (fun (tag : Model.sidebar_page) -> tag.uuid = uuid) options) + (strings "selectedValues") in + let created = List.map (fun title -> ({Model.uuid = "new:" ^ Dev_query.Unicode.lowercase title; title} : Model.sidebar_page)) + (strings "newValues") in + let seen = Hashtbl.create 8 in + let tags = List.filter (fun (tag : Model.sidebar_page) -> + let key = Dev_query.Unicode.lowercase tag.title in + if Hashtbl.mem seen key then false else (Hashtbl.add seen key (); true)) (selected @ created) in + ignore (send (Model.SetComposerTags tags)))))) let composer_surface model_source ?key ?accessibility_identifier ?attachments ?tag_strip ?attachments_visible_signal ?(actions = []) ~placeholder ?label ?text ?text_signal ?(autofocus = false) ?autofocus_signal ?submit_on_enter ?send_icon ?send_disabled_signal ?on_input ?on_submit ?on_send ?on_press () : t = - fun context parent -> + custom (fun context parent -> (* A tap gesture around the whole capsule competes with its native menus. Only unused space should request focus; controls own their own touches. *) let focus_target ~height ~accessibility_identifier = @@ -306,7 +307,7 @@ let composer_surface model_source ?key ?accessibility_identifier ?attachments ?t @ send_button); ]) in - surface context parent + mount context ?parent surface) let collapsed_composer model_source (context : Lui_ui.ui_context) send : t = if Lui_ui.host context = KotlinHost then diff --git a/shared/src/logseq/view_flashcards.ml b/shared/src/logseq/view_flashcards.ml index a6b47c52..d757fb5b 100644 --- a/shared/src/logseq/view_flashcards.ml +++ b/shared/src/logseq/view_flashcards.ml @@ -148,10 +148,11 @@ let flashcard_review_content model_source send : t = []; ] -let flashcard_group_controls model_source send : t = fun context parent -> +let flashcard_group_controls model_source send : t = custom (fun context parent -> let own source = Signal.own_signal context.ui_scope source in let graphs = own (Signal.map (fun (model : Model.logseq_model) -> [model.selected_graph_id]) model_source) in - (keyed ~source:graphs ~key:Fun.id ~cmp:compare ~mount:(fun _ -> fun context parent -> + mount context ?parent + (keyed ~source:graphs ~key:Fun.id ~cmp:compare ~mount:(fun _ -> custom (fun context parent -> let own source = Signal.own_signal context.ui_scope source in let metadata = own (Signal.map deck_metadata model_source) in let selected = own (Signal.map (json_field "selectedUuid") metadata) in @@ -184,7 +185,7 @@ let flashcard_group_controls model_source send : t = fun context parent -> ~accessibility_identifier:"button.flashcards.deck.add" ~on_press:(fun _ -> Signal.set adding true) []; ] in - let picker = if_ ~test:(Signal.value adding) (fun context parent -> + let picker = if_ ~test:(Signal.value adding) (custom (fun context parent -> let own source = Signal.own_signal context.ui_scope source in let name = Signal.state context.ui_scheduler "" in let custom_name = ref false in @@ -235,50 +236,49 @@ let flashcard_group_controls model_source send : t = fun context parent -> emit ["action", `String "create"; "kind", `String (Signal.sample (Signal.value kind)); "targetUuid", `String uuid; "title", `String (Signal.sample (Signal.value name))]) [] in request_search "page" ""; - (View_base.sheet ~model_source ~title:(View_base.tr (Signal.sample model_source) "New card group") ~detents:"medium,large" ~style_class:"navigation-list navigation-inline-title" - ~accessibility_identifier:"sheet.flashcards.deck.create" ~on_dismiss:(fun _ -> Signal.set adding false) [ - list ~grow:1.0 ~style:`inset_grouped [ - list_section [ - list_section_item [text_field ~label:(View_base.tr (Signal.sample model_source) "Name") ~placeholder:(View_base.tr (Signal.sample model_source) "Card group name") ~text_signal:(Signal.value name) - ~accessibility_identifier:"field.flashcards.deck.name" - ~disabled_signal:(Signal.value submitting) - ~on_input:(fun value -> custom_name := true; Signal.set name value ) []]; - list_section_item [tabs ~label:(View_base.tr (Signal.sample model_source) "Filter by") ~grow:1.0 ~accessibility_identifier:"picker.flashcards.deck.kind" - (List.map (fun (value, label) -> - View_base.with_selected_signal (own (Signal.map ((=) value) (Signal.value kind))) - (button ~text:label ~grow:1.0 ~disabled_signal:(Signal.value submitting) - ~accessibility_identifier:("flashcards.deck.kind." ^ value) - ~on_press:(fun _ -> - Signal.set kind value; Signal.set query ""; Signal.set target None; - request_search value "") [])) ["page", "Page reference"; "tag", "Tag"])]; - ]; - list_section [ - list_section_item [search_field ~label:(View_base.tr (Signal.sample model_source) "Find a page or tag") ~placeholder:(View_base.tr (Signal.sample model_source) "Search pages or tags") - ~text_signal:(Signal.value query) ~accessibility_identifier:"field.flashcards.deck.search" - ~disabled_signal:(Signal.value submitting) - ~on_input:(fun value -> Signal.set query value; - request_search (Signal.sample (Signal.value kind)) value ) []]; - keyed_list_section_item ~source:targets ~key:(fun item -> json_text (json_field "uuid" item)) ~cmp:String.compare - ~mount:(fun source -> - let uuid = json_text (json_field "uuid" (Signal.sample source)) in - list_section_item ~height:44 ~padding_vertical:0 [menu_item ~height:44 ~padding_vertical:0 - ~text_signal:(own (Signal.map (fun item -> json_text (json_field "title" item)) source)) - ~selected_signal:(own (Signal.map ((=) (Some uuid)) (Signal.value target))) - ~disabled_signal:(Signal.value submitting) - ~accessibility_identifier:("flashcards.deck.target." ^ uuid) - ~on_press:(fun _ -> Signal.set target (Some uuid); - if not !custom_name then Signal.set name (json_text (json_field "title" (Signal.sample source)))) []]); - if_list_section_item ~test:(own (Signal.map ((=) []) targets)) - (list_section_item [text ~value:(View_base.tr (Signal.sample model_source) "No matching pages or tags") ~foreground:"muted-foreground" []]); - ]; - - ]; - (if Lui_ui.host context = KotlinHost then row ~main:`space_between ~padding:12 [cancel; create] - else toolbar ~label:(View_base.tr (Signal.sample model_source) "Card group actions") ~style_class:"navigation-actions" [toolbar_cancel; toolbar_create]); - ]) context parent) in - (column ~gap:0 [controls; + mount context ?parent + (View_base.sheet ~model_source ~title:(View_base.tr (Signal.sample model_source) "New card group") ~detents:"medium,large" ~style_class:"navigation-list navigation-inline-title" + ~accessibility_identifier:"sheet.flashcards.deck.create" ~on_dismiss:(fun _ -> Signal.set adding false) [ + list ~grow:1.0 ~style:`inset_grouped [ + list_section [ + list_section_item [text_field ~label:(View_base.tr (Signal.sample model_source) "Name") ~placeholder:(View_base.tr (Signal.sample model_source) "Card group name") ~text_signal:(Signal.value name) + ~accessibility_identifier:"field.flashcards.deck.name" + ~disabled_signal:(Signal.value submitting) + ~on_input:(fun value -> custom_name := true; Signal.set name value ) []]; + list_section_item [tabs ~label:(View_base.tr (Signal.sample model_source) "Filter by") ~grow:1.0 ~accessibility_identifier:"picker.flashcards.deck.kind" + (List.map (fun (value, label) -> + View_base.with_selected_signal (own (Signal.map ((=) value) (Signal.value kind))) + (button ~text:label ~grow:1.0 ~disabled_signal:(Signal.value submitting) + ~accessibility_identifier:("flashcards.deck.kind." ^ value) + ~on_press:(fun _ -> + Signal.set kind value; Signal.set query ""; Signal.set target None; + request_search value "") [])) ["page", "Page reference"; "tag", "Tag"])]; + ]; + list_section [ + list_section_item [search_field ~label:(View_base.tr (Signal.sample model_source) "Find a page or tag") ~placeholder:(View_base.tr (Signal.sample model_source) "Search pages or tags") + ~text_signal:(Signal.value query) ~accessibility_identifier:"field.flashcards.deck.search" + ~disabled_signal:(Signal.value submitting) + ~on_input:(fun value -> Signal.set query value; + request_search (Signal.sample (Signal.value kind)) value ) []]; + keyed_list_section_item ~source:targets ~key:(fun item -> json_text (json_field "uuid" item)) ~cmp:String.compare + ~mount:(fun source -> + let uuid = json_text (json_field "uuid" (Signal.sample source)) in + list_section_item ~height:44 ~padding_vertical:0 [menu_item ~height:44 ~padding_vertical:0 + ~text_signal:(own (Signal.map (fun item -> json_text (json_field "title" item)) source)) + ~selected_signal:(own (Signal.map ((=) (Some uuid)) (Signal.value target))) + ~disabled_signal:(Signal.value submitting) + ~accessibility_identifier:("flashcards.deck.target." ^ uuid) + ~on_press:(fun _ -> Signal.set target (Some uuid); + if not !custom_name then Signal.set name (json_text (json_field "title" (Signal.sample source)))) []]); + if_list_section_item ~test:(own (Signal.map ((=) []) targets)) + (list_section_item [text ~value:(View_base.tr (Signal.sample model_source) "No matching pages or tags") ~foreground:"muted-foreground" []]); + ]; - picker]) context parent)) context parent + ]; + (if Lui_ui.host context = KotlinHost then row ~main:`space_between ~padding:12 [cancel; create] + else toolbar ~label:(View_base.tr (Signal.sample model_source) "Card group actions") ~style_class:"navigation-actions" [toolbar_cancel; toolbar_create]); + ]))) in + mount context ?parent (column ~gap:0 [controls; picker]))))) let flashcard_screen model_source send : t = column ~accessibility_identifier:"screen.flashcards" ~grow:1.0 ~gap:0 @@ -287,7 +287,7 @@ let flashcard_screen model_source send : t = flashcard_group_controls model_source send; if_ ~test:(Signal.map View_base.flashcards_empty_ model_source) - (fun context parent -> + (custom (fun context parent -> let content = column ~accessibility_identifier:"layout.flashcards.empty" ~grow:1.0 ~main:`center ~cross:`center ~gap:10 ~padding:32 [ @@ -318,9 +318,10 @@ let flashcard_screen model_source send : t = (model.pending_effects @ model.in_flight_effects)) model_source) ~on_press:(fun _ -> deck_request model_source send ["action", `String "practice"]) [])]); ] in - (if Lui_ui.host context = Lui_protocol.KotlinHost then - row ~grow:1.0 ~main:`space_between [content] - else content) context parent); + mount context ?parent + (if Lui_ui.host context = Lui_protocol.KotlinHost then + row ~grow:1.0 ~main:`space_between [content] + else content))); if_ ~test:(Signal.map View_base.flashcards_present_ model_source) (flashcard_review_content model_source send); diff --git a/shared/src/logseq/view_graphs.ml b/shared/src/logseq/view_graphs.ml index 3411f35f..c90db2ff 100644 --- a/shared/src/logseq/view_graphs.ml +++ b/shared/src/logseq/view_graphs.ml @@ -357,7 +357,7 @@ let graph_delete_dialog (context : Lui_ui.ui_context) model_source send : t ] let graph_picker_overflow_menu model_source send : t = - fun context parent -> + custom (fun context parent -> let kotlin_host = Lui_ui.host context = KotlinHost in let entries = [ dropdown_menu_item ~text:(View_base.tr (Signal.sample model_source) "Settings") @@ -367,15 +367,16 @@ let graph_picker_overflow_menu model_source send : t = ] in if kotlin_host then - menu ~icon:(`app "more-vert") ~label:(View_base.tr (Signal.sample model_source) "More") - ~accessibility_identifier:"button.overflow-menu" entries context parent + mount context ?parent + (menu ~icon:(`app "more-vert") ~label:(View_base.tr (Signal.sample model_source) "More") + ~accessibility_identifier:"button.overflow-menu" entries) else - stack ~width:44 ~height:44 - [ box ~width:24 ~height:24 ~corner_radius:12 ~border_width:2 - ~border_color:"foreground" []; - menu ~icon:(`app "more-horiz") ~style_class:"capsule" ~label:(View_base.tr (Signal.sample model_source) "More") - ~accessibility_identifier:"button.connection" entries ] - context parent + mount context ?parent + (stack ~width:44 ~height:44 + [ box ~width:24 ~height:24 ~corner_radius:12 ~border_width:2 + ~border_color:"foreground" []; + menu ~icon:(`app "more-horiz") ~style_class:"capsule" ~label:(View_base.tr (Signal.sample model_source) "More") + ~accessibility_identifier:"button.connection" entries ])) let graph_password_sheet (context : Lui_ui.ui_context) model_source send : t = diff --git a/shared/src/logseq/view_outliner.ml b/shared/src/logseq/view_outliner.ml index 86d00208..af7abff2 100644 --- a/shared/src/logseq/view_outliner.ml +++ b/shared/src/logseq/view_outliner.ml @@ -8,7 +8,7 @@ let code_language row = let outliner_editor_view model_source block_id_source title_source caret_source send : t = - fun context parent -> + custom @@ fun context parent -> let node = Lui_ui.extension context "outliner-editor" in attach context parent node; Lui_ui.extension_property_signal context node "input-policy" @@ -44,7 +44,7 @@ let outliner_editor_view model_source block_id_source title_source caret_source let outliner_rich_block_view ?(show_code_language = true) model_source title_source markup_source youtube_target_source is_asset_source row_source asset_type_source local_path_source send : t = - fun context parent -> + custom @@ fun context parent -> let node = Lui_ui.extension context "outliner-block-content" in attach context parent node; Lui_ui.extension_property context node "show-code-language" (BoolValue show_code_language); @@ -112,7 +112,7 @@ let outliner_collapse_button (context : Lui_ui.ui_context) row_source send : [])) let outliner_indent_view width_source : t = - fun context parent -> + custom @@ fun context parent -> let node = Lui_ui.text context "" in attach context parent node; Lui_ui.int_property_signal context node WidthValue width_source; @@ -366,7 +366,7 @@ let code_language_control context model_source row_source send : t = [box ~height:28 [trigger]]) let code_block_content model_source retained_source row_source send : t = - fun context parent -> + custom @@ fun context parent -> let current_row = Signal.sample row_source in let source = Signal.map (fun retained -> if View_rows.retained_row_editing_ retained then View_rows.retained_row_editing_title retained else (View_rows.retained_row_value retained).Model.row_title) retained_source in @@ -391,7 +391,7 @@ let code_block_content model_source retained_source row_source send : t = (Signal.map View_base.outliner_row_asset_type row_source) (Signal.map View_base.outliner_row_local_path row_source) send) calculator]); ] in - (column ~gap:0 ~cross:`stretch ~corner_radius:8 + mount context ?parent (column ~gap:0 ~cross:`stretch ~corner_radius:8 ~background_signal:(Signal.map (fun retained -> if View_rows.retained_row_selected_ retained then "#00000000" else "code-container") retained_source) ~accessibility_identifier:("outliner.code." ^ current_row.Model.row_uuid) [ @@ -403,7 +403,7 @@ let code_block_content model_source retained_source row_source send : t = text ~value:(reactive (fun source -> String.concat "\n" (Node_presentation.calculator_results source)) source) ~font_family:"monospace" ~font_size:"17" ~foreground:"muted-foreground" ~accessibility_identifier:("outliner.calculator.results." ^ current_row.row_uuid) []]]) calculator; - ]) context parent + ]) let row_metadata (row : Model.outline_row) = try Yojson.Basic.from_string row.row_metadata_json with _ -> `Null @@ -525,7 +525,7 @@ let outliner_row_content context model_source retained_row_source ] let native_outliner_row model_source retained_source row_source send : t = - fun context parent -> + custom @@ fun context parent -> let node = Lui_ui.extension context "outliner-block-row" in attach context parent node; let summary (page : Model.sidebar_page) = `Assoc ["uuid", `String page.uuid; "title", `String page.title] in @@ -567,12 +567,12 @@ let native_outliner_row model_source retained_source row_source send : t = "tags", `List (List.map summary row.tags)]) in Lui_ui.extension_property_signal context node "payload" (Signal.map2 (fun current retained -> StringValue (payload current retained)) model_source retained_source); - ignore ((reactive (fun code -> if code then code_block_content model_source retained_source row_source send else + ignore (mount context ~parent:node (reactive (fun code -> if code then code_block_content model_source retained_source row_source send else if_ ~test:(reactive View_rows.retained_row_editing_ retained_source) (box ~padding:0 [outliner_editor_view model_source (Signal.map View_base.outliner_row_uuid row_source) (Signal.map View_rows.retained_row_editing_title retained_source) (Signal.map View_rows.retained_row_editing_caret retained_source) send])) - (Signal.map (fun (row : Model.outline_row) -> row.row_display_type = Some "code") row_source)) context (Some node)); + (Signal.map (fun (row : Model.outline_row) -> row.row_display_type = Some "code") row_source))); Lui_ui.on_event context node (function | ExtensionEvent (_, _, "remove-tag", values) -> (match String_map.find_opt "uuid" values with @@ -687,7 +687,7 @@ let outliner_text_leading context (row : Model.outline_row) = else (if status then 49 else if priority then 20 else 26) + (if priority then 25 else 0) in leading + row.depth * 22 -let outliner_continuation ?(is_body = false) row_source content : t = fun context parent -> +let outliner_continuation ?(is_body = false) row_source content : t = custom @@ fun context parent -> let node = Lui_ui.extension context "outliner-continuation" in attach context parent node; Lui_ui.extension_property_signal context node "guide-count" @@ -698,7 +698,7 @@ let outliner_continuation ?(is_body = false) row_source content : t = fun contex (if is_body && row.has_children && not row.is_collapsed then row.depth else -1)) row_source); Lui_ui.extension_property_signal context node "identifier" (Signal.map (fun (row : Model.outline_row) -> StringValue ((if is_body then "body." else "metadata.") ^ row.row_uuid)) row_source); - ignore (content context (Some node)); + ignore (mount context ~parent:node content); node let outliner_task_dates context model_source row_source send = @@ -740,7 +740,7 @@ let decorate_row model_source row_source send body = let with_embed_children model_source edit_scope row_source send render_row render_child : t = reactive (fun has_embed_children -> if not has_embed_children then render_row row_source send else - fun context parent -> + custom @@ fun context parent -> let initial = Signal.sample row_source in let child_scope = if initial.Model.row_is_embed then @@ -760,11 +760,11 @@ let with_embed_children model_source edit_scope row_source send render_row rende let children = Signal.map (fun (row : Model.outline_row) -> if row.is_collapsed then [] else List.map (fun (child : Model.outline_row) -> {child with depth = row.depth + 1}) row.row_embed_children) row_source in - (column ~gap:0 [ + mount context ?parent (column ~gap:0 [ render_row row_source row_send; keyed ~source:children ~key:View_base.outliner_row_uuid ~cmp:String.compare ~mount:(fun source -> render_child child_scope source send) - ]) context parent) + ])) (Signal.map (fun (row : Model.outline_row) -> row.row_embed_children <> []) row_source) let rec render_result_block_in_scope context model_source edit_scope row_source send = @@ -850,16 +850,16 @@ let outliner_row context model_source retained_row_source row_source send : t = (render_result_block_in_scope context model_source) let journal_heading model_source row_source send children : t = - fun context parent -> + custom @@ fun context parent -> let node = - (View_base.with_label_signal + mount context ?parent (View_base.with_label_signal (Signal.map2 View_base.outliner_journal_accessibility_label model_source row_source) (box ~padding:0 ~accessibility_identifier_signal: (Signal.map2 View_base.outliner_journal_button_identifier model_source row_source) - children)) context parent + children)) in Lui_ui.bool_property context node PressEnabled true; register_press context node (fun _ -> @@ -1100,7 +1100,7 @@ let outliner_autocomplete_row (context : Lui_ui.ui_context) let candidate = Signal.sample candidate_source in let choose () = ignore (send (Model.ChooseOutlinerAutocomplete (Signal.sample candidate_source : Model.outliner_autocomplete_candidate).candidate_value)) in - let reference_label context parent = + let reference_label = custom @@ fun context parent -> let node = Lui_ui.extension context "outliner-block-content" in attach context parent node; List.iter (fun (key, value) -> Lui_ui.extension_property context node key (StringValue value)) @@ -1158,7 +1158,7 @@ let outliner_autocomplete_bar (context : Lui_ui.ui_context) model_source send : keyed ~source ~key:Fun.id ~cmp:String.compare ~mount:(fun source -> let kind = Signal.sample source in let form = List.mem kind ["link"; "image"; "date"; "deadline"; "scheduled"; "youtube"] in - if form then (fun context parent -> + if form then (custom @@ fun context parent -> let temporal = List.mem kind ["date"; "deadline"; "scheduled"] in let date_kind = if kind = "date" then "date" else "datetime" in let value = Signal.state context.Lui_ui.ui_scheduler (if temporal then View_query.temporal_default date_kind else "") in @@ -1177,7 +1177,7 @@ let outliner_autocomplete_bar (context : Lui_ui.ui_context) model_source send : ~accessibility_identifier:"button.outliner.autocomplete.submit" ~on_press:confirm [] in let toolbar_done_ = Lui_elements.toolbar_button ~text:(View_base.tr (Signal.sample model_source) "Insert") ~variant:`ghost ~style_class:"confirmation-action" ~foreground:"foreground" ~accessibility_identifier:"button.outliner.autocomplete.submit" ~on_press:confirm [] in - (View_base.sheet ~model_source ~title:(title kind) ~detents:(if temporal then "large" else "medium,large") ~style_class:"navigation-list navigation-inline-title" + mount context ?parent (View_base.sheet ~model_source ~title:(title kind) ~detents:(if temporal then "large" else "medium,large") ~style_class:"navigation-list navigation-inline-title" ~accessibility_identifier:"sheet.outliner.autocomplete" ~on_dismiss:(fun _ -> dismiss ()) [ list ~grow:1.0 ~style:`inset_grouped [list_section ( if temporal then [list_section_item ~padding_horizontal:0 ~padding_vertical:0 [ @@ -1191,7 +1191,7 @@ let outliner_autocomplete_bar (context : Lui_ui.ui_context) model_source send : ~on_input:(input label) []]] else []))]; (if Lui_ui.host context = KotlinHost then row ~main:`space_between ~padding:12 [cancel; done_] else toolbar ~label:(View_base.tr (Signal.sample model_source) "Insert content") ~style_class:"navigation-actions" [toolbar_cancel; toolbar_done_]); - ]) context parent) + ])) else column ~gap:2 ~padding:8 ~height:220 ~max_height:220 ~cross:`stretch ~main:`start ~accessibility_identifier:"toolbar.outliner.autocomplete" [ row ~grow:0.0 ~main:`space_between ~cross:`center [ @@ -1431,13 +1431,13 @@ let page_loading_view model_source : t = text ~foreground:"muted-foreground" ~value:(View_base.tr (Signal.sample model_source) "Loading blocks…") [] ]) let placeholder_block context model_source (value : View_rows.placeholder) send : t = - let placeholder : t = fun mount_context parent -> - let node = box ~height:28 + let placeholder : t = custom @@ fun mount_context parent -> + let node = mount mount_context ?parent (box ~height:28 ~accessibility_identifier:("button.outliner.placeholder." ^ value.parent_uuid) [row ~cross:`center ~gap:0 ~padding_vertical:2 [box ~opacity:0.35 [icon ~name:(`app "outliner-bullet") ~width:24 ~height:24 ~foreground:"muted-foreground" ~accessibility_identifier:("outliner.placeholder.bullet." ^ value.parent_uuid) []]; - box ~grow:1.0 []]] mount_context parent in + box ~grow:1.0 []]]) in Lui_ui.string_property mount_context node AccessibilityLabel "Add block"; Lui_ui.bool_property mount_context node PressEnabled true; register_press mount_context node (fun _ -> ignore (send (Model.AddRootBlock value.parent_uuid))); @@ -1455,19 +1455,19 @@ let placeholder_block context model_source (value : View_rows.placeholder) send column ~padding_horizontal:8 ~gap:0 [ (if divider then column ~gap:0 [box ~height:26 []; separator ~accessibility_identifier:"journal.divider" []; box ~height:26 []] else box []); - (fun mount_context parent -> - let node = View_base.with_label_signal + (custom @@ fun mount_context parent -> + let node = mount mount_context ?parent (View_base.with_label_signal (Signal.constant mount_context.Lui_ui.ui_scheduler ("Open " ^ title)) (box ~accessibility_identifier:("button.journal." ^ value.parent_uuid) ~padding_horizontal:(if Lui_ui.host context = KotlinHost then 12 else 8) - [heading ~level:`h3 ~style_class:"scroll-section-title" ~value:title []]) mount_context parent in + [heading ~level:`h3 ~style_class:"scroll-section-title" ~value:title []])) in Lui_ui.bool_property mount_context node PressEnabled true; register_press mount_context node (fun _ -> ignore (send (Model.RequestAppNode value.parent_uuid))); node); box ~height:12 []; placeholder] let outliner_entries context model_source ~source send : t = - fun mount_context parent -> + custom @@ fun mount_context parent -> let entries = Signal.own_signal mount_context.Lui_ui.ui_scope (Signal.map2 View_rows.page_entries source model_source) in let first_section = Signal.own_signal mount_context.ui_scope @@ -1487,26 +1487,26 @@ let outliner_entries context model_source ~source send : t = let scroll_target = Signal.own_signal mount_context.ui_scope (Signal.map (fun current -> match View_base.active_node_projection current with | Some route -> Option.map (fun uuid -> "outline." ^ uuid) route.Model.node_scroll_target | None -> None) model_source) in - View_rows.windowed_keyed ~scroll_target ~first_section ~section_titles ~on_window - ~on_prefetch ~is_pinned:View_rows.page_entry_editor_ ~source:entries - ~key:View_rows.page_entry_identifier ~cmp:compare - ~mount:(fun entry_source -> - let render () = match Signal.sample entry_source with - | View_rows.Outline_entry _ -> - let retained = Signal.map View_rows.page_entry_outline entry_source in - outliner_entry context model_source retained - (Signal.map View_rows.retained_row_value retained) send - | View_rows.Placeholder_entry value -> placeholder_block context model_source value send - | View_rows.Reference_entry _ -> - reference_entry context model_source - (Signal.map View_rows.page_entry_reference entry_source) send in - box ~padding:0 - [ reactive (fun ready -> if ready then render () - else box ~height:32 ~padding_horizontal:16 - ~accessibility_identifier:"outliner.row-loading" - [box ~width:160 ~height:14 ~corner_radius:4 ~background:"muted" []]) - (Signal.map View_rows.page_entry_ready entry_source) ]) - mount_context parent + mount mount_context ?parent + (View_rows.windowed_keyed ~scroll_target ~first_section ~section_titles ~on_window + ~on_prefetch ~is_pinned:View_rows.page_entry_editor_ ~source:entries + ~key:View_rows.page_entry_identifier ~cmp:compare + ~mount:(fun entry_source -> + let render () = match Signal.sample entry_source with + | View_rows.Outline_entry _ -> + let retained = Signal.map View_rows.page_entry_outline entry_source in + outliner_entry context model_source retained + (Signal.map View_rows.retained_row_value retained) send + | View_rows.Placeholder_entry value -> placeholder_block context model_source value send + | View_rows.Reference_entry _ -> + reference_entry context model_source + (Signal.map View_rows.page_entry_reference entry_source) send in + box ~padding:0 + [ reactive (fun ready -> if ready then render () + else box ~height:32 ~padding_horizontal:16 + ~accessibility_identifier:"outliner.row-loading" + [box ~width:160 ~height:14 ~corner_radius:4 ~background:"muted" []]) + (Signal.map View_rows.page_entry_ready entry_source) ]) ()) let node_screen (context : Lui_ui.ui_context) model_source send : t = View_base.with_reading_insets diff --git a/shared/src/logseq/view_property.ml b/shared/src/logseq/view_property.ml index 8baf446a..943fa9a9 100644 --- a/shared/src/logseq/view_property.ml +++ b/shared/src/logseq/view_property.ml @@ -39,20 +39,21 @@ let display_value property = Printf.sprintf "%s, %02d:%02d" date value.tm_hour value.tm_min | _ -> raw -let adaptive_row stacked children : t = fun context parent -> +let adaptive_row stacked children : t = custom (fun context parent -> let node = Lui_ui.extension context "native-property-row" in attach context parent node; Lui_ui.extension_property_signal context node "stacked" (Signal.map (fun value -> Lui_protocol.BoolValue value) stacked); - List.iter (fun child -> ignore (child context (Some node))) children; - node + mount_children context node children; + node) let with_add_property_picker ?(in_tag_properties = false) model_source raw_source send render : t = - fun context parent -> + custom (fun context parent -> let own source = Signal.own_signal context.ui_scope source in let source = own (Signal.map decode raw_source) in let keys = own (Signal.map2 (fun (model : Model.logseq_model) json -> [Option.value ~default:"" model.selected_graph_id ^ ":" ^ text (field "ownerUuid" json)]) model_source source) in - (keyed ~source:keys ~key:Fun.id ~cmp:String.compare ~mount:(fun _ -> fun context parent -> + mount context ?parent + (keyed ~source:keys ~key:Fun.id ~cmp:String.compare ~mount:(fun _ -> custom (fun context parent -> let own source = Signal.own_signal context.ui_scope source in let owner = text (field "ownerUuid" (Signal.sample source)) in let graph = Option.value ~default:"" (Signal.sample model_source).Model.selected_graph_id in @@ -103,14 +104,15 @@ let with_add_property_picker ?(in_tag_properties = false) model_source raw_sourc ]; toolbar ~label:(View_base.tr (Signal.sample model_source) "Actions") ~style_class:"navigation-actions" [Lui_elements.toolbar_button ~text:(View_base.tr (Signal.sample model_source) "Cancel") ~variant:`ghost ~style_class:"cancellation-action" ~foreground:"foreground" ~accessibility_identifier:(add_id ^ ".cancel") ~on_press:(fun _ -> Signal.set adding false) []]]) in - (render action menu_action picker) context parent)) context parent + mount context ?parent (render action menu_action picker))))) let tag_properties model_source raw_source send close : t = - fun context parent -> + custom (fun context parent -> let own source = Signal.own_signal context.ui_scope source in let source = own (Signal.map decode raw_source) in let owner = text (field "ownerUuid" (Signal.sample source)) in let graph = Option.value ~default:"" (Signal.sample model_source).Model.selected_graph_id in + mount context ?parent (with_add_property_picker ~in_tag_properties:true model_source raw_source send (fun add _ picker -> View_base.sheet ~model_source ~title:(View_base.tr (Signal.sample model_source) "Tag properties") ~style_class:"navigation-list navigation-inline-title" ~detents:"large" @@ -138,14 +140,15 @@ let tag_properties model_source raw_source send close : t = toolbar ~label:(View_base.tr (Signal.sample model_source) "Actions") ~style_class:"navigation-actions" [ Lui_elements.toolbar_button ~text:(View_base.tr (Signal.sample model_source) "Done") ~variant:`ghost ~style_class:"confirmation-action" ~foreground:"foreground" ~accessibility_identifier:("sheet.tag-properties.done." ^ owner) ~on_press:(fun _ -> close ()) []] - ])) context parent + ]))) let view ?(compact = false) ~render_block model_source raw_source send : t = - fun context parent -> + custom (fun context parent -> let own source = Signal.own_signal context.ui_scope source in let source = own (Signal.map decode raw_source) in let owners = own (Signal.map (fun json -> let owner = text (field "ownerUuid" json) in if owner = "" || list (field "properties" json) = [] then [] else [owner]) source) in + mount context ?parent (keyed ~source:owners ~key:Fun.id ~cmp:String.compare ~mount:(fun owner_source -> let owner = Signal.sample owner_source in let expanded = Signal.state context.ui_scheduler false in @@ -159,7 +162,7 @@ let view ?(compact = false) ~render_block model_source raw_source send : t = ~accessibility_identifier:("properties." ^ owner) children in View_base.with_string_prop Lui_protocol.FontSize (if compact then "14" else "16") (layout [ keyed ~source:properties ~key:(fun property -> text (field "attr" property)) ~cmp:String.compare - ~mount:(fun property_source -> fun context parent -> + ~mount:(fun property_source -> custom (fun context parent -> let own source = Signal.own_signal context.ui_scope source in let first = Signal.sample property_source in let attr = text (field "attr" first) in @@ -241,32 +244,33 @@ let view ?(compact = false) ~render_block model_source raw_source send : t = "value", `String (string_of_bool value)]) [] in let fields children = if compact then row ~gap:6 ~cross:`center children else adaptive_row (own (Signal.map (fun p -> field "textLayout" p = `Bool true) property_source)) children in - (column ~gap:2 ~cross:(if compact then `start else `stretch) [ - fields [ - label; - reactive (fun text_layout -> if text_layout then - reactive (fun empty -> if empty then row [value] else box ~opacity:0.72 [ - View_query.block_values ~render_block owner (own (Signal.map (fun p -> - match list (field "blocks" p) with - | [] -> `List [`Assoc ["uuid", `String id; "title", field "text" p; - "markup", field "markup" p; "pageId", `String owner]] - | blocks -> `List blocks) property_source)) send_block]) - (own (Signal.map (fun p -> list (field "blocks" p) = [] && text (field "text" p) = "") property_source)) - else row ~gap:0 ~cross:`center ~accessibility_identifier:("property.inline." ^ owner ^ "." ^ attr) [ - if field "kind" first = `String "checkbox" then checkbox_value else node_value]) - (own (Signal.map (fun p -> field "textLayout" p = `Bool true) property_source)); - ]; - if_ ~test:(own (Signal.map Option.is_some (Signal.value editing))) - (reactive (function None -> box [] | Some property -> - let open_nodes = List.map (fun reference -> - let uuid = text (field "uuid" reference) in - uuid, View_base.tr_named (Signal.sample model_source) "Open {1}" (text (field "title" reference)), - (fun () -> ignore (send (View_base.request_node_action (Signal.sample model_source) uuid)))) - (list (field "references" property)) in - View_query.property_editor ~owner ~send ~open_nodes ~id ~column:property - ~submit:(fun fields -> submit (("textValueUuid", field "textValueUuid" property) :: fields)) - model_source property (fun () -> Signal.set editing None)) (Signal.value editing)); - ]) context parent); + mount context ?parent + (column ~gap:2 ~cross:(if compact then `start else `stretch) [ + fields [ + label; + reactive (fun text_layout -> if text_layout then + reactive (fun empty -> if empty then row [value] else box ~opacity:0.72 [ + View_query.block_values ~render_block owner (own (Signal.map (fun p -> + match list (field "blocks" p) with + | [] -> `List [`Assoc ["uuid", `String id; "title", field "text" p; + "markup", field "markup" p; "pageId", `String owner]] + | blocks -> `List blocks) property_source)) send_block]) + (own (Signal.map (fun p -> list (field "blocks" p) = [] && text (field "text" p) = "") property_source)) + else row ~gap:0 ~cross:`center ~accessibility_identifier:("property.inline." ^ owner ^ "." ^ attr) [ + if field "kind" first = `String "checkbox" then checkbox_value else node_value]) + (own (Signal.map (fun p -> field "textLayout" p = `Bool true) property_source)); + ]; + if_ ~test:(own (Signal.map Option.is_some (Signal.value editing))) + (reactive (function None -> box [] | Some property -> + let open_nodes = List.map (fun reference -> + let uuid = text (field "uuid" reference) in + uuid, View_base.tr_named (Signal.sample model_source) "Open {1}" (text (field "title" reference)), + (fun () -> ignore (send (View_base.request_node_action (Signal.sample model_source) uuid)))) + (list (field "references" property)) in + View_query.property_editor ~owner ~send ~open_nodes ~id ~column:property + ~submit:(fun fields -> submit (("textValueUuid", field "textValueUuid" property) :: fields)) + model_source property (fun () -> Signal.set editing None)) (Signal.value editing)); + ]))); if_ ~test:(own (Signal.map (fun values -> List.length values > 3) all_properties)) (button ~variant:`ghost ~foreground:"muted-foreground" ~text_alignment:`start ~min_height:32 ~padding:0 ~icon_signal:(own (Signal.map (fun expanded -> `app (if expanded then "chevron-up" else "chevron-down")) (Signal.value expanded))) @@ -274,4 +278,4 @@ let view ?(compact = false) ~render_block model_source raw_source send : t = (if expanded then "Collapse" else "Expand")) (Signal.value expanded)))) ~accessibility_identifier:("properties.expand." ^ owner) ~on_press:(fun _ -> Signal.set expanded (not (Signal.sample (Signal.value expanded)))) []); - ]))) context parent + ])))) diff --git a/shared/src/logseq/view_query.ml b/shared/src/logseq/view_query.ml index f589d8cc..db2d5736 100644 --- a/shared/src/logseq/view_query.ml +++ b/shared/src/logseq/view_query.ml @@ -35,7 +35,7 @@ let decode_json json = let decode raw = try decode_json (Yojson.Basic.from_string raw) with _ -> invalid_query let result_item owner render_block send source : t = - fun context parent -> + custom @@ fun context parent -> let initial = Signal.sample source in let expanded = Signal.state context.ui_scheduler Expanded.empty in let rows = Signal.own_signal context.ui_scope (Signal.map2 (fun item expanded -> @@ -54,11 +54,11 @@ let result_item owner render_block send source : t = true | action -> send action in let identifier = "query.result." ^ owner ^ "." ^ string_of_int initial.index in - (box ~padding:0 ~accessibility_identifier:identifier [ + mount context ?parent (box ~padding:0 ~accessibility_identifier:identifier [ (match initial.block with | Some _ -> keyed ~source:rows ~key:(fun row -> row.Model.row_uuid) ~cmp:String.compare ~mount:(fun source -> render_block source send) - | None -> text ~value:(reactive (Signal.map (fun item -> item.title) source)) ~text_alignment:`start [])]) context parent + | None -> text ~value:(reactive (Signal.map (fun item -> item.title) source)) ~text_alignment:`start [])]) let results_disclosure context identifier expanded label = let size = if Lui_ui.host context = KotlinHost then 24 else 10 in @@ -71,7 +71,7 @@ let results_disclosure context identifier expanded label = ] let legacy_view ~render_block model_source row_source send : t = - fun context parent -> + custom @@ fun context parent -> let owner = (Signal.sample row_source).Model.row_uuid in let identifier name = "query." ^ name ^ "." ^ owner in let own source = Signal.own_signal context.Lui_ui.ui_scope source in @@ -85,7 +85,7 @@ let legacy_view ~render_block model_source row_source send : t = | row :: rest -> take (row :: acc) (count - 1) rest in take [] count query.rows) query (Signal.value limit)) in let visible = own (Signal.map (fun row -> row.Model.query_json <> "" && not row.is_collapsed) row_source) in - (if_ ~test:visible + mount context ?parent (if_ ~test:visible (box ~padding_horizontal:16 ~padding_vertical:8 ~accessibility_identifier:(identifier "block") [column ~gap:4 [ @@ -107,7 +107,7 @@ let legacy_view ~render_block model_source row_source send : t = (button ~variant:`ghost ~text:(View_base.tr (Signal.sample model_source) "Show more") ~accessibility_identifier:(identifier "more") ~on_press:(fun _ -> Signal.set limit (Signal.sample (Signal.value limit) + 20)) []); ]); - ]])) context parent + ]])) let block_values ~render_block owner source send = let render_block source send = @@ -224,7 +224,7 @@ let temporal_default kind = if kind = "datetime" then Printf.sprintf "%.0f" (floor (now /. 60.) *. 60000.) else let t = Unix.localtime now in Printf.sprintf "%04d-%02d-%02d" (t.Unix.tm_year + 1900) (t.tm_mon + 1) t.tm_mday -let temporal_picker ?on_submit model_source kind id source set : t = fun context parent -> +let temporal_picker ?on_submit model_source kind id source set : t = custom @@ fun context parent -> let picker_value value = try if kind = "date" then Option.map (fun day -> @@ -252,7 +252,7 @@ let temporal_picker ?on_submit model_source kind id source set : t = fun context let update value = observed := value; set value in - let calendar : t = fun context parent -> + let calendar : t = custom @@ fun context parent -> let node = Lui_ui.extension context "native-property-date" in attach context parent node; Lui_ui.extension_property context node "kind" (Lui_protocol.StringValue kind); @@ -272,7 +272,7 @@ let temporal_picker ?on_submit model_source kind id source set : t = fun context | _ -> ()) | _ -> ()); node in - (column ~gap:8 [ + mount context ?parent (column ~gap:8 [ text_field ~text_signal:(Signal.value input) ~placeholder:"YYYY-MM-DD / tomorrow / next Friday" ~label:(View_base.tr (Signal.sample model_source) "Date picker") @@ -281,7 +281,7 @@ let temporal_picker ?on_submit model_source kind id source set : t = fun context Signal.set input value; Option.iter update (sync value)) ?on_submit []; - calendar]) context parent + calendar]) let filter_transition op value = let number = function `Int _ | `Float _ -> true | _ -> false in @@ -305,7 +305,7 @@ let filter_error (draft : filter_draft) = then Some "Enter a valid number." else None let settings_sheet mode owner feature view_source model_source send close : t = - fun context parent -> + custom @@ fun context parent -> let initial = Signal.sample view_source in let own value = Signal.own_signal context.ui_scope value in let state value = Signal.state context.ui_scheduler value in @@ -327,7 +327,7 @@ let settings_sheet mode owner feature view_source model_source send close : t = ~mount:(fun col -> let col = Signal.sample col in dropdown_menu_item ~text:(property_title (Signal.sample model_source) col) ~selected_signal:(own (Signal.map ((=) (jtext (jfield "attr" col))) value)) ~on_press:(fun _ -> choose (jtext (jfield "attr" col))) [])] in - let filter_row source : t = fun context parent -> + let filter_row source : t = custom @@ fun context parent -> let own value = Signal.own_signal context.ui_scope value in let state value = Signal.state context.ui_scheduler value in let first : filter_draft = Signal.sample source in @@ -424,7 +424,7 @@ let settings_sheet mode owner feature view_source model_source send close : t = if_ ~test:(own (Signal.map2 (fun custom (draft : filter_draft) -> custom || match draft.value with `Int _ | `Float _ -> true | _ -> false) (Signal.value custom) source)) (temporal "datetime") ] in - (list_section [ + mount context ?parent (list_section [ list_section_item ~padding_vertical:0 ~padding_horizontal:16 ~min_height:44 [row ~gap:4 ~cross:`center ~accessibility_identifier:(id "row") [ box ~grow:1.0 [menu ~text_signal:(own (Signal.map2 property_title model_source col)) ~label:(View_base.tr (Signal.sample model_source) "Property") [ keyed_dropdown_menu_item ~source:(own (Signal.map property_choices view_source)) ~key:(fun col -> jtext (jfield "attr" col)) ~cmp:String.compare @@ -456,7 +456,7 @@ let settings_sheet mode owner feature view_source model_source send close : t = (list_section_item ~padding_vertical:0 ~padding_horizontal:16 ~min_height:44 [text ~foreground:"destructive" ~accessibility_identifier:(id "error") ~value:(reactive (own (Signal.map (fun draft -> Option.value ~default:"" (filter_error draft)) source))) []]); if_list_section_item ~test:(Signal.value selecting) (list_section_item ~padding_vertical:0 ~padding_horizontal:16 ~min_height:44 [values_sheet]); - ]) context parent in + ]) in let sort_row source : t = let first : sort_draft = Signal.sample source in let attr_source = own (Signal.map (fun (value : sort_draft) -> value.attr) source) in @@ -502,7 +502,7 @@ let settings_sheet mode owner feature view_source model_source send close : t = ~disabled_signal:(own (Signal.map2 (fun waiting filters -> waiting || (mode = "filter" && List.exists (fun draft -> filter_error draft <> None) filters)) (waiting model_source initial.id) (Signal.value filters))) ~accessibility_identifier:("view.settings.save." ^ initial.id) ~on_press:save_action [] in - (View_base.sheet ~model_source ~title:(if mode = "filter" then "Filters" else "Sort") ~style_class:"navigation-list navigation-inline-title" ~detents:"medium,large" + mount context ?parent (View_base.sheet ~model_source ~title:(if mode = "filter" then "Filters" else "Sort") ~style_class:"navigation-list navigation-inline-title" ~detents:"medium,large" ~accessibility_identifier:("view.settings.sheet." ^ initial.id) ~on_dismiss:(fun _ -> close ()) [ list ~grow:1.0 ~style:`inset_grouped ~accessibility_identifier:("view." ^ mode ^ ".list." ^ initial.id) @@ -527,7 +527,7 @@ let settings_sheet mode owner feature view_source model_source send close : t = ])); (if Lui_ui.host context = KotlinHost then row ~main:`space_between ~padding:12 [cancel; save] else toolbar ~label:(View_base.tr (Signal.sample model_source) "View settings actions") ~style_class:"navigation-actions" [toolbar_cancel; toolbar_save]); - ]) context parent + ]) let rec raw_selection_values raw = match jtext (jfield "type" raw) with @@ -537,7 +537,7 @@ let rec raw_selection_values raw = | _ -> [text_value (jfield "value" raw)] let property_editor ?(owner = "") ?(send = fun _ -> false) ?open_node ?(open_nodes = []) ~id ~column:col ~submit:save model_source property close : t = - fun context parent -> + custom @@ fun context parent -> let view = {id; name = ""; typ = ""; data = `Null} in let own value = Signal.own_signal context.ui_scope value in let state value = Signal.state context.ui_scheduler value in @@ -629,7 +629,7 @@ let property_editor ?(owner = "") ?(send = fun _ -> false) ?open_node ?(open_nod ~accessibility_identifier:("view.edit.save." ^ view.id) ~disabled_signal:(waiting model_source view.id) ~on_press:confirm_input [] in let toolbar_controls = if plain || temporal || many then [toolbar_cancel; toolbar_confirm] else [toolbar_cancel] in - (View_base.sheet ~model_source ~title:(property_title (Signal.sample model_source) col) + mount context ?parent (View_base.sheet ~model_source ~title:(property_title (Signal.sample model_source) col) ~style_class:"navigation-list navigation-inline-title" ~detents:"medium,large" ~accessibility_identifier:("view.edit.sheet." ^ view.id) ~on_dismiss:(fun _ -> close ()) [ list ~grow:1.0 ~style:`inset_grouped ~track_visible_range:true @@ -688,7 +688,7 @@ let property_editor ?(owner = "") ?(send = fun _ -> false) ?open_node ?(open_nod reactive property_error model_source load_error; (if Lui_ui.host context = KotlinHost then row ~main:`space_between ~padding:12 controls else toolbar ~label:(View_base.tr (Signal.sample model_source) "Actions") ~style_class:"navigation-actions" toolbar_controls); - ]) context parent + ]) let value_sheet owner feature view model_source send item property close = let column = view_column view (jtext (jfield "attr" property)) in @@ -720,7 +720,7 @@ let gallery_image (row : Model.outline_row) = let normalized = String.lowercase_ascii format in if String.starts_with ~prefix:"image/" normalized || List.mem normalized ["jpg"; "jpeg"; "png"; "gif"; "heic"; "heif"; "webp"; "avif"; "bmp"; "wbmp"] - then Some (fun context parent -> + then Some (custom @@ fun context parent -> let node = Lui_ui.extension context "outliner-block-content" in attach context parent node; List.iter (fun (key, value) -> Lui_ui.extension_property context node key (Lui_protocol.StringValue value)) @@ -748,7 +748,7 @@ let table_column_window columns (offset, width) = collect 0 0 [] total columns let table_viewport ~fill_height identifier viewport children : t = - let mount context parent = + let viewport_el = custom @@ fun context parent -> let node = Lui_ui.extension context "native-table-viewport" in attach context parent node; Lui_ui.extension_property context node "identifier" (Lui_protocol.StringValue identifier); @@ -759,9 +759,9 @@ let table_viewport ~fill_height identifier viewport children : t = Signal.set viewport (max 0 offset, width) | _ -> ()) | _ -> ()); - List.iter (fun child -> ignore (child context (Some node))) children; + mount_children context node children; node in - if fill_height then box ~grow:1.0 [mount] else mount + if fill_height then box ~grow:1.0 [viewport_el] else viewport_el let loaded_rows context ~owner ~feature view_source input model_source send = let own signal = Signal.own_signal context.Lui_ui.ui_scope signal in @@ -880,7 +880,7 @@ let loaded_rows context ~owner ~feature view_source input model_source send = own (Signal.cutoff (=) (Signal.value page)), visible, Signal.value loading, Signal.value error, retry let collection_json ?(fill_height = false) ~render_block model_source parsed send : t = - fun context parent -> + custom @@ fun context parent -> let own value = Signal.own_signal context.ui_scope value in let initial = Signal.sample parsed in let grow = if fill_height then 1.0 else 0.0 in @@ -912,7 +912,7 @@ let collection_json ?(fill_height = false) ~render_block model_source parsed sen else Signal.set expanded next) [results_disclosure context ("query.disclosure." ^ owner) (Signal.value expanded) label]) in let mount view_source : t = - fun context parent -> + custom @@ fun context parent -> let own value = Signal.own_signal context.ui_scope value in let view_source, visible_rows, rows_loading, rows_error, retry_rows = loaded_rows context ~owner ~feature view_source (Signal.value search) model_source send in @@ -951,8 +951,9 @@ let collection_json ?(fill_height = false) ~render_block model_source parsed sen (if before = 0 then [] else [box ~width:before []]) @ cells @ (if after = 0 then [] else [box ~width:after []]) in let table_row item_source : t = - fun row_context parent -> - (reactive (fun ((view, item), ((_, visible_columns, _) as window)) -> row ~gap:0 ~cross:`stretch (windowed_cells window (table_cells view.id + custom @@ fun row_context parent -> + Lui_elements.mount row_context ?parent + (reactive (fun ((view, item), ((_, visible_columns, _) as window)) -> row ~gap:0 ~cross:`stretch (windowed_cells window (table_cells view.id (Option.value ~default:(string_of_int item.index) item.uuid) (List.map (fun col -> let attr = jtext (jfield "attr" col) in attr, if String.starts_with ~prefix:"query.result/" attr then @@ -979,10 +980,11 @@ let collection_json ?(fill_height = false) ~render_block model_source parsed sen else text ~value ~text_alignment:`start ~style_class:"single-line" ~width ~min_height:48 ~padding:12 ~accessibility_identifier:identifier []) visible_columns)))) (Signal.own_signal row_context.Lui_ui.ui_scope (Signal.map2 (fun values window -> values, window) - (Signal.map2 (fun view item -> view, item) view_source item_source) column_window))) row_context parent in + (Signal.map2 (fun view item -> view, item) view_source item_source) column_window))) in let gallery_card item_source : t = - fun card_context parent -> - (reactive (fun (view, item) -> + custom @@ fun card_context parent -> + Lui_elements.mount card_context ?parent + (reactive (fun (view, item) -> let image = Option.bind item.block (fun block -> gallery_image block.row) in column ~gap:10 ~padding:16 ~background:"secondary" ~border_color:"border" ~border_width:1 ~corner_radius:12 ~accessibility_identifier:("view.card." ^ view.id ^ "." ^ Option.value ~default:"" item.uuid) @@ -993,13 +995,14 @@ let collection_json ?(fill_height = false) ~render_block model_source parsed sen |> List.map (fun col -> let property = cell view item (jtext (jfield "attr" col)) in row ~gap:12 ~main:`space_between [text ~value:(property_title (Signal.sample model_source) col) ~foreground:"muted-foreground" ~style_class:"caption" []; text ~value:(jtext (jfield "text" property)) ~style_class:"caption" []]))])) - (Signal.own_signal card_context.Lui_ui.ui_scope (Signal.map2 (fun view item -> view, item) view_source item_source))) card_context parent in + (Signal.own_signal card_context.Lui_ui.ui_scope (Signal.map2 (fun view item -> view, item) view_source item_source))) in let item_key item = match item.uuid with | Some uuid -> "block:" ^ uuid | None -> "tuple:" ^ string_of_int item.index in let result_window ?width ?(gap = 0) ?(columns = 1) ~identifier ~extent ~source ~key ~mount () : t = - fun window_context parent -> + custom @@ fun window_context parent -> let own signal = Signal.own_signal window_context.Lui_ui.ui_scope signal in let searches = own (Signal.map (fun input -> [input]) (Signal.value search)) in + Lui_elements.mount window_context ?parent (if jfield "rowsDeferred" view.data = `Bool true then keyed ~source:searches ~key:Fun.id ~cmp:String.compare ~mount:(fun _ -> virtual_list ?width ?height:(if fill_height then None else Some 480) ~grow ~gap ~accessibility_identifier:identifier [ @@ -1015,10 +1018,10 @@ let collection_json ?(fill_height = false) ~render_block model_source parsed sen ~key:Fun.id ~cmp:String.compare ~mount:(fun _ -> virtual_list ?width ?height:(if fill_height then None else Some 480) ~grow ~gap ~accessibility_identifier:identifier [ View_rows.windowed_keyed ~window_size:12 ~identifier:("view.window." ^ view.id) - ~item_extent:extent ~source ~key ~cmp:String.compare ~mount]) + ~item_extent:extent ~source ~key ~cmp:String.compare ~mount ()]) else column ?width ~gap ~accessibility_identifier:identifier [ keyed ~source ~key ~cmp:String.compare ~mount]) - (own (Signal.map (fun rows -> List.length rows > 20) source))) window_context parent in + (own (Signal.map (fun rows -> List.length rows > 20) source))) in let gallery_columns = own (Signal.map (fun (model : Model.logseq_model) -> if model.viewport_width >= 700 then 2 else 1) model_source) in let gallery_rows = own (Signal.map2 (fun columns items -> @@ -1034,7 +1037,7 @@ let collection_json ?(fill_height = false) ~render_block model_source parsed sen && Json.equal sorting next_sorting && Json.equal filters next_filters) (own (Signal.map (fun view -> view.typ, choices view, jfield "sorting" view.data, jfield "filters" view.data) view_source))) in - (column ~grow ~gap:8 ~cross:`stretch [ + Lui_elements.mount context ?parent (column ~grow ~gap:8 ~cross:`stretch [ row ~gap:0 ~cross:`center ~accessibility_identifier:("view.toolbar." ^ owner) [ (if feature = "query-result" then results_toggle () else row ~grow:1.0 ~cross:`center [ @@ -1109,10 +1112,11 @@ let collection_json ?(fill_height = false) ~render_block model_source parsed sen result_window ~identifier:("view.gallery." ^ view.id) ~gap:12 ~columns:count ~extent:(96 + 24 * max 0 (List.length columns - 1)) ~source:gallery_rows ~key:(fun items -> item_key (List.hd items)) - ~mount:(fun source grid_context parent -> (grid ~columns:count ~gap:12 [ - keyed ~source ~key:item_key ~cmp:String.compare ~mount:gallery_card; - if_ ~test:(Signal.own_signal grid_context.Lui_ui.ui_scope - (Signal.map (fun items -> List.length items < count) source)) (box [])]) grid_context parent) ()) + ~mount:(fun source -> custom @@ fun grid_context parent -> + Lui_elements.mount grid_context ?parent (grid ~columns:count ~gap:12 [ + keyed ~source ~key:item_key ~cmp:String.compare ~mount:gallery_card; + if_ ~test:(Signal.own_signal grid_context.Lui_ui.ui_scope + (Signal.map (fun items -> List.length items < count) source)) (box [])])) ()) gallery_columns | _ when fill_height || jfield "rowsDeferred" view.data = `Bool true -> result_window ~identifier:("query.rows." ^ owner) ~extent:64 ~source:rows ~key:item_key @@ -1129,8 +1133,8 @@ let collection_json ?(fill_height = false) ~render_block model_source parsed sen if_ ~test:(own (Signal.map Option.is_some (Signal.value editing))) (reactive (function None -> box [] | Some (item, property) -> value_sheet owner feature view model_source send item property (fun () -> Signal.set editing None)) (Signal.value editing)); - ]) context parent in - (column ~grow ~gap:8 ~cross:`stretch ~accessibility_identifier:("query.block." ^ owner) [ + ]) in + Lui_elements.mount context ?parent (column ~grow ~gap:8 ~cross:`stretch ~accessibility_identifier:("query.block." ^ owner) [ (if feature = "query-result" then if_ ~test:(own (Signal.map not (Signal.value expanded))) @@ -1139,22 +1143,23 @@ let collection_json ?(fill_height = false) ~render_block model_source parsed sen if_ ~test:(Signal.value expanded) (column ~grow ~gap:8 ([keyed ~source:chosen ~key:(fun view -> view.id) ~cmp:String.compare ~mount] @ - if fill_height then [] else [box ~height:24 ~accessibility_identifier:("view.results-gap." ^ owner) []]))]) context parent + if fill_height then [] else [box ~height:24 ~accessibility_identifier:("view.results-gap." ^ owner) []]))]) -let collection ?fill_height ~render_block model_source raw_source send : t = fun context parent -> +let collection ?fill_height ~render_block model_source raw_source send : t = custom @@ fun context parent -> let own value = Signal.own_signal context.Lui_ui.ui_scope value in let raw = own (Signal.cutoff String.equal raw_source) in let parsed = own (Signal.map (fun raw -> try Json.from_string raw with _ -> `Null) raw) in - collection_json ?fill_height ~render_block model_source parsed send context parent + Lui_elements.mount context ?parent + (collection_json ?fill_height ~render_block model_source parsed send) -let view ~render_block model_source row_source send : t = fun context parent -> +let view ~render_block model_source row_source send : t = custom @@ fun context parent -> let own value = Signal.own_signal context.Lui_ui.ui_scope value in let raw_source = own (Signal.cutoff String.equal (own (Signal.map (fun (row : Model.outline_row) -> row.query_json) row_source))) in let parsed = own (Signal.map (fun raw -> try Json.from_string raw with _ -> `Null) raw_source) in - (reactive (fun has_views -> + Lui_elements.mount context ?parent (reactive (fun has_views -> if has_views then if_ ~test:(Signal.map (fun (row : Model.outline_row) -> not row.is_collapsed) row_source) (collection_json ~render_block model_source parsed send) else legacy_view ~render_block model_source row_source send) (own (Signal.cutoff Bool.equal (own (Signal.map (fun json -> saved_views_json json <> [] || - member "expanded" json <> None) parsed))))) context parent + member "expanded" json <> None) parsed))))) diff --git a/shared/src/logseq/view_rows.ml b/shared/src/logseq/view_rows.ml index 15e3f314..6aadbf47 100644 --- a/shared/src/logseq/view_rows.ml +++ b/shared/src/logseq/view_rows.ml @@ -77,34 +77,35 @@ let retained_row_editing_caret (retained : retained_row) = (* Only the native-visible window owns UI scopes and protocol nodes. The lightweight collection metadata keeps the entire outline scrollable. *) let paged_keyed ~identifier ~item_extent ~count ~offset ~on_visible_range ~source ~key ~cmp ~mount : Lui_elements.t = - fun context parent -> + Lui_elements.custom (fun context parent -> let viewport = Signal.state context.Lui_ui.ui_scheduler (0, 11) in let window offset rows (first, last) = let overscan = 2 in let length = max 1 (last - first + 1) + 2 * overscan in let start = max offset (min (first - overscan) (offset + List.length rows - length)) in start, List.filteri (fun index _ -> index + offset >= start && index + offset < start + length) rows in - (Lui_elements.list ~accessibility_identifier:identifier - ~data_attrs:(reactive (fun count offset rows viewport -> - let start, rows = window offset rows viewport in - ["data-virtual-count", string_of_int count; "data-virtual-start", string_of_int start; - "data-virtual-length", string_of_int (List.length rows); "data-item-extent", string_of_int item_extent; - "data-first-section-count", "0"; "data-first-section-inset", "136"; "data-pinned-index", "-1"]) - count offset source (Signal.value viewport)) ~track_visible_range:true - ~on_visible_range:(function - | Lui_elements.Range { first; last } when first >= 0 && last >= first -> - Signal.set viewport (first, last); on_visible_range first last - | _ -> ()) - [Lui_elements.keyed ~source:(reactive (fun offset rows viewport -> snd (window offset rows viewport)) - offset source (Signal.value viewport)) ~key ~cmp ~mount]) context parent + Lui_elements.mount context ?parent + (Lui_elements.list ~accessibility_identifier:identifier + ~data_attrs:(reactive (fun count offset rows viewport -> + let start, rows = window offset rows viewport in + ["data-virtual-count", string_of_int count; "data-virtual-start", string_of_int start; + "data-virtual-length", string_of_int (List.length rows); "data-item-extent", string_of_int item_extent; + "data-first-section-count", "0"; "data-first-section-inset", "136"; "data-pinned-index", "-1"]) + count offset source (Signal.value viewport)) ~track_visible_range:true + ~on_visible_range:(function + | Lui_elements.Range { first; last } when first >= 0 && last >= first -> + Signal.set viewport (first, last); on_visible_range first last + | _ -> ()) + [Lui_elements.keyed ~source:(reactive (fun offset rows viewport -> snd (window offset rows viewport)) + offset source (Signal.value viewport)) ~key ~cmp ~mount])) let windowed_keyed ?scroll_target ?first_section ?section_titles ?reset_key ?(window_size = 32) ?(identifier = "outliner.window") ?(item_extent = 32) ?(on_visible_range = fun _ _ -> ()) ?(on_window = fun _ -> ()) - ?(on_prefetch = fun _ -> ()) ?(is_pinned = fun _ -> false) ~source ~key ~cmp ~mount : Lui_elements.t = - fun context parent -> + ?(on_prefetch = fun _ -> ()) ?(is_pinned = fun _ -> false) ~source ~key ~cmp ~mount () : Lui_elements.t = + Lui_elements.custom (fun context parent -> if not (List.mem (Lui_ui.host context) [Lui_protocol.SwiftUIHost; Lui_protocol.KotlinHost]) then - Lui_elements.keyed ~source ~key ~cmp ~mount context parent + Lui_elements.mount context ?parent (Lui_elements.keyed ~source ~key ~cmp ~mount) else let own signal = Signal.own_signal context.Lui_ui.ui_scope signal in let items = own (Signal.map Array.of_list source) in @@ -170,25 +171,27 @@ let windowed_keyed ?scroll_target ?first_section ?section_titles ?reset_key let following = Array.sub items after (min 16 (Array.length items - after)) |> Array.to_list in preceding @ following) window) in ignore (Signal.own context.ui_scope (Signal.observe adjacent on_prefetch)); - Lui_elements.if_ ~test:(own (Signal.map (fun items -> Array.length items > 0) items)) - (Lui_elements.list ~accessibility_identifier:identifier - ~data_attrs_signal:metadata ~track_visible_range:true - ~on_visible_range:(function - | Lui_elements.Range { first; last } -> - on_visible_range first last; - let items, start, length = Signal.sample window in - let count = Array.length items in - if count > 0 && first >= 0 && last >= first then begin - let first = min first (count - 1) in - let last = min last (count - 1) in - if (first < start + 2 && start > 0) - || (last >= start + length - 2 && start + length < count) then - let next_start = min (max 0 (first - max 0 ((window_size - (last - first + 1)) / 2))) (max 0 (count - window_size)) in - if next_start <> start || length < min window_size count then - Signal.set range (next_start, window_size) - end - | _ -> ()) - [Lui_elements.keyed ~source:visible ~key ~cmp ~mount]) context parent + let content = + Lui_elements.if_ ~test:(own (Signal.map (fun items -> Array.length items > 0) items)) + (Lui_elements.list ~accessibility_identifier:identifier + ~data_attrs_signal:metadata ~track_visible_range:true + ~on_visible_range:(function + | Lui_elements.Range { first; last } -> + on_visible_range first last; + let items, start, length = Signal.sample window in + let count = Array.length items in + if count > 0 && first >= 0 && last >= first then begin + let first = min first (count - 1) in + let last = min last (count - 1) in + if (first < start + 2 && start > 0) + || (last >= start + length - 2 && start + length < count) then + let next_start = min (max 0 (first - max 0 ((window_size - (last - first + 1)) / 2))) (max 0 (count - window_size)) in + if next_start <> start || length < min window_size count then + Signal.set range (next_start, window_size) + end + | _ -> ()) + [Lui_elements.keyed ~source:visible ~key ~cmp ~mount]) in + Lui_elements.mount context ?parent content) type reference_entry = | Result_views of string diff --git a/shared/src/logseq/view_rows.mli b/shared/src/logseq/view_rows.mli index d12b47c0..ddc3ea3a 100644 --- a/shared/src/logseq/view_rows.mli +++ b/shared/src/logseq/view_rows.mli @@ -27,7 +27,8 @@ val windowed_keyed : ?on_visible_range:(int -> int -> unit) -> ?on_window:('a list -> unit) -> ?on_prefetch:('a list -> unit) -> ?is_pinned:('a -> bool) -> source:'a list Signal.signal -> key:('a -> string) -> - cmp:(string -> string -> int) -> mount:('a Signal.signal -> Lui_elements.t) -> Lui_elements.t + cmp:(string -> string -> int) -> mount:('a Signal.signal -> Lui_elements.t) -> + unit -> Lui_elements.t type reference_entry = | Result_views of string diff --git a/shared/src/logseq/view_screens.ml b/shared/src/logseq/view_screens.ml index fd1b1a65..23dfa4c0 100644 --- a/shared/src/logseq/view_screens.ml +++ b/shared/src/logseq/view_screens.ml @@ -2,7 +2,7 @@ open Lui_protocol open Lui_elements let search_result_row hit_source send : t = - fun context parent -> + custom @@ fun context parent -> let hit : Model.search_hit = Signal.sample hit_source in let native_list = Lui_ui.host context = SwiftUIHost in let elem = @@ -39,18 +39,18 @@ let search_result_row hit_source send : t = ]; ] in - let node = elem context parent in + let node = mount context ?parent elem in if hit.is_page then Lui_ui.string_property context node InlineIconName "app:document"; node let search_section_heading title identifier : t = - fun context parent -> + custom @@ fun context parent -> let title = heading ~level:`h5 ~foreground:"muted-foreground" ~accessibility_identifier:identifier ~value:title [] in - (if Lui_ui.host context = KotlinHost then + mount context ?parent (if Lui_ui.host context = KotlinHost then box ~padding_horizontal:20 ~padding_vertical:5 [title] - else list_item ~separator:`hidden ~padding_horizontal:16 ~padding_vertical:7 [title]) context parent + else list_item ~separator:`hidden ~padding_horizontal:16 ~padding_vertical:7 [title]) type search_entry = Search_heading of string * string | Search_hit of Model.search_hit @@ -67,22 +67,22 @@ let search_entry_key = function let mount_search_entry send entry_source = match Signal.sample entry_source with | Search_heading (title, identifier) -> search_section_heading title identifier - | Search_hit _ -> fun context parent -> + | Search_hit _ -> custom @@ fun context parent -> let hit = Signal.own_signal context.Lui_ui.ui_scope (Signal.map (function Search_hit hit -> hit | _ -> assert false) entry_source) in - search_result_row hit send context parent + mount context ?parent (search_result_row hit send) let search_result_entries model_source send : t = keyed ~source:(reactive search_entries model_source) ~key:search_entry_key ~cmp:compare ~mount:(mount_search_entry send) let search_result_list model_source send : t = - fun context parent -> + custom @@ fun context parent -> let load_more last = let current = Signal.sample model_source in if last >= current.Model.search_result_count - 6 then ignore (send Model.LoadMoreSearchResults) in - (if Lui_ui.host context = KotlinHost then + mount context ?parent (if Lui_ui.host context = KotlinHost then let count = Signal.own_signal context.Lui_ui.ui_scope (Signal.map (fun current -> List.length (search_entries current)) model_source) in let offset = Signal.own_signal context.Lui_ui.ui_scope @@ -99,7 +99,7 @@ let search_result_list model_source send : t = ~on_visible_range:(function | Range { last; _ } -> load_more last | _ -> ()) - [search_result_entries model_source send]) context parent + [search_result_entries model_source send]) let search_screen model_source send : t = column ~grow:1.0 ~accessibility_identifier:"screen.search" @@ -498,7 +498,7 @@ let main_header_sync (context : Lui_ui.ui_context) model_source send : t = ] let active_overflow_menu model_source send : t = - fun context parent -> + custom @@ fun context parent -> let page_actions_source = Signal.map View_base.active_page_actions_visible_ model_source in @@ -532,7 +532,7 @@ let active_overflow_menu model_source send : t = let kotlin_host = Lui_ui.host context = KotlinHost in (* iOS menu items carry no icons; the Kotlin popup did. *) let item_icon name = if kotlin_host then Some (`app name) else None in - (View_property.with_add_property_picker model_source raw_source send (fun _ add_property add_picker -> + mount context ?parent (View_property.with_add_property_picker model_source raw_source send (fun _ add_property add_picker -> let entries = [ if_dropdown_menu_item ~test:page_actions_source (if kotlin_host then @@ -623,7 +623,7 @@ let active_overflow_menu model_source send : t = ("graphId", `String (Option.value ~default:"" graph)) :: (if action = "tags" then ("action", `String "setTags") :: fields else fields))))))) model_source property (fun () -> Signal.set editing None)) (Signal.value editing)); - ])) context parent + ])) let main_header_connection model_source send : t = stack @@ -631,22 +631,22 @@ let main_header_connection model_source send : t = if_ ~test: (Signal.map View_base.connection_control_visible_ model_source) - (fun context parent -> - (stack [ + (custom @@ fun context parent -> + mount context ?parent (stack [ if_ ~test:(Signal.map View_base.connection_settings_visible_ model_source) (icon_button ~icon:(`app "calendar") ~label:(View_base.tr (Signal.sample model_source) "Go to journal") ~variant:`ghost ~size:`icon ~width:44 ~height:44 ~accessibility_identifier:"button.journal-calendar" ~on_press:(press send Model.OpenJournalCalendar) []); if_ ~test:(Signal.map View_base.active_page_actions_visible_ model_source) - (active_overflow_menu model_source send) ] context parent)); + (active_overflow_menu model_source send)])); ] let native_node_destination ~source:title_source content : t = - fun context parent -> + custom @@ fun context parent -> let node = Lui_ui.platform_tweak context "native-navigation-title" in Lui_ui.extension_property_signal context node "title" title_source; - ignore (content context (Some node)); + ignore (mount context ~parent:node content); attach context parent node; node @@ -696,7 +696,7 @@ let native_node_stack context model_source ~source:routes_source send = let native_search_view ?base (_context : Lui_ui.ui_context) model_source send : t = - fun context parent -> + custom @@ fun context parent -> let node = Lui_ui.extension context "native-search-presentation" in attach context parent node; let presented_source = @@ -732,7 +732,7 @@ let native_search_view ?base (_context : Lui_ui.ui_context) model_source send : ignore (View_base.handle_native_search_event input_event send)); if Lui_ui.host context = KotlinHost then let _ = - stack ~grow:1.0 + mount context ~parent:node (stack ~grow:1.0 [ column ~grow:1.0 ~display_signal:(Signal.map (fun current -> @@ -751,37 +751,33 @@ let native_search_view ?base (_context : Lui_ui.ui_context) model_source send : [ search_screen model_source send ]); native_node_stack context model_source ~source:(Signal.map View_base.search_node_routes model_source) send; - ] - context (Some node) + ]) in - ignore ((if_ ~test:(Signal.map (fun (current : Model.logseq_model) -> + ignore (mount context ~parent:node (if_ ~test:(Signal.map (fun (current : Model.logseq_model) -> current.search_open && current.search_navigation_path <> []) model_source) - (active_overflow_menu model_source send)) context (Some node)); + (active_overflow_menu model_source send))); node else ( ignore - ((match base with + (mount context ~parent:node (match base with | Some view -> box ~grow:1.0 [view] - | None -> logseq_main_view context (Signal.map View_base.navigation_root_model model_source) send) - context (Some node)); + | None -> logseq_main_view context (Signal.map View_base.navigation_root_model model_source) send)); ignore - ((column ~grow:1.0 [ search_screen model_source send ]) context - (Some node)); + (mount context ~parent:node (column ~grow:1.0 [ search_screen model_source send ])); (* Keep the chrome anchor present while idle so native route indices stay stable. *) ignore - ((column ~gap:0 + (mount context ~parent:node (column ~gap:0 [if_ ~test:(reactive View_base.search_editor_active_ model_source) - (main_bottom_chrome context model_source send)]) context (Some node)); - ignore ((main_header_connection model_source send) context (Some node)); + (main_bottom_chrome context model_source send)])); + ignore (mount context ~parent:node (main_header_connection model_source send)); ignore - ((native_node_stack context model_source - ~source:(reactive View_base.search_node_routes model_source) send) - context (Some node)); + (mount context ~parent:node (native_node_stack context model_source + ~source:(reactive View_base.search_node_routes model_source) send)); node) let native_navigation_view (_context : Lui_ui.ui_context) model_source send : t = - fun context parent -> + custom @@ fun context parent -> let node = Lui_ui.extension context "native-navigation-stack" in attach context parent node; let depth_source = @@ -826,7 +822,7 @@ let native_navigation_view (_context : Lui_ui.ui_context) model_source send bottomChromeIndex); inside the content column its internal `grow` props would starve the weighted journal content. *) ignore - ((stack ~grow:1.0 + (mount context ~parent:node (stack ~grow:1.0 [ column ~grow:1.0 [ @@ -858,48 +854,43 @@ let native_navigation_view (_context : Lui_ui.ui_context) model_source send (Signal.map View_base.asset_preview_path model_source) ~on_dismiss:(press send Model.DismissAssetPreview) []); - ]) - context (Some node)); + ])); ignore - ((main_bottom_chrome context model_source send) context (Some node)); + (mount context ~parent:node (main_bottom_chrome context model_source send)); node) else ( ignore - ((column + (mount context ~parent:node (column [ logseq_main_view context (Signal.map View_base.navigation_root_model model_source) send; if_ ~test:(Signal.map View_base.bottom_chrome_selection_ model_source) (View_outliner.outliner_selection_toolbar context model_source send); - ]) - context (Some node)); + ])); ignore - ((main_header_leading context model_source send) context - (Some node)); - ignore ((main_header_title context model_source) context (Some node)); + (mount context ~parent:node (main_header_leading context model_source send)); + ignore (mount context ~parent:node (main_header_title context model_source)); ignore - ((main_header_sync context model_source send) context (Some node)); + (mount context ~parent:node (main_header_sync context model_source send)); ignore - ((main_header_connection model_source send) context (Some node)); + (mount context ~parent:node (main_header_connection model_source send)); ignore - ((main_bottom_chrome context model_source send) context (Some node)); + (mount context ~parent:node (main_bottom_chrome context model_source send)); ignore - ((native_node_stack context model_source - ~source:(reactive Model.app_node_routes model_source) send) - context (Some node)); + (mount context ~parent:node (native_node_stack context model_source + ~source:(reactive Model.app_node_routes model_source) send)); ignore - ((if_ + (mount context ~parent:node (if_ ~test:(Signal.map View_base.asset_preview_ model_source) (file_preview ~path_signal: (Signal.map View_base.asset_preview_path model_source) ~on_dismiss:(press send Model.DismissAssetPreview) - [])) - context (Some node)); + []))); if Lui_ui.host context = SwiftUIHost then ignore - ((column ~gap:0 ~width:44 + (mount context ~parent:node (column ~gap:0 ~width:44 ~accessibility_identifier:"navigation.capture-controls" [ icon_button ~icon:(`app "toolbar-camera") ~variant:`ghost ~size:`icon @@ -926,7 +917,7 @@ let native_navigation_view (_context : Lui_ui.ui_context) model_source send ~label:(View_base.tr (Signal.sample model_source) "Capture") ~accessibility_identifier:"button.navigation.capture" ~on_press:(press send Model.ExpandComposer) []; - ]) context (Some node)); + ])); node) let authentication_content (context : Lui_ui.ui_context) model_source @@ -1072,10 +1063,10 @@ let application_main_content (context : Lui_ui.ui_context) model_source [text ~value:(View_base.tr (Signal.sample model_source) "✅") ~accessibility_identifier:"capture.confirmation.icon" []; text ~value:(View_base.tr (Signal.sample model_source) "Added to today") ~accessibility_identifier:"capture.confirmation" []] in if Lui_ui.platform context = IOS && Lui_ui.host context = SwiftUIHost then - box [(fun context parent -> + box [(custom @@ fun context parent -> let node = Lui_ui.extension context "native-top-notification" in attach context parent node; - ignore (notification context (Some node)); + ignore (mount context ~parent:node notification); node)] else notification) in let content = if stack_grow then @@ -1177,7 +1168,7 @@ let application_drawer_view (context : Lui_ui.ui_context) model_source send : t let application_view (context : Lui_ui.ui_context) model_source send : t = if Lui_ui.host context <> SwiftUIHost && Lui_ui.host context <> KotlinHost then application_drawer_view context model_source send - else fun context parent -> + else custom @@ fun context parent -> let node = Lui_ui.extension context "native-pdf-workspace" in attach context parent node; Lui_ui.extension_property_signal context node "payload" @@ -1189,7 +1180,7 @@ let application_view (context : Lui_ui.ui_context) model_source send : t = | Some (StringValue payload) -> ignore (send (Model.PdfWorkspaceEvent payload)) | _ -> ()) | _ -> ()); - ignore ((application_drawer_view context model_source send) context (Some node)); + ignore (mount context ~parent:node (application_drawer_view context model_source send)); node let logseq_view context model_source send : t = diff --git a/shared/src/logseq/view_settings.ml b/shared/src/logseq/view_settings.ml index d874e123..60a07880 100644 --- a/shared/src/logseq/view_settings.ml +++ b/shared/src/logseq/view_settings.ml @@ -2,15 +2,15 @@ open Lui_protocol open Lui_elements let with_native_control_tint role (control : t) : t = - fun context parent -> + custom (fun context parent -> match Lui_ui.profile context with | { profile_os = IOS; profile_host = SwiftUIHost } -> let tweak = Lui_ui.platform_tweak context "native-control-tint" in Lui_ui.extension_property context tweak "role" (StringValue role); - ignore (control context (Some tweak)); + ignore (mount context ~parent:tweak control); attach context parent tweak; tweak - | _ -> control context parent + | _ -> mount context ?parent control) let settings_language_choice_radio model_source (choice_source : Model.settings_language_choice Signal.signal) send : @@ -56,7 +56,8 @@ let settings_language_control (context : Lui_ui.ui_context) model_source ~test: (Signal.map View_base.model_settings_language_menu_open_ model_source) - (dropdown_menu_view (dropdown_menu ~anchor:`below ~anchor_alignment:`end_ + (dropdown_menu_view (dropdown_menu + ~target:(Menu_anchor { side = `below; align = `end_; offset = 0. }) ~min_width:220 ~on_dismiss:(press send Model.CloseSettingsLanguageMenu) [ @@ -120,7 +121,8 @@ let settings_theme_picker ~id ~label ~choices ~selected ~menu_open ~label ~accessibility_identifier:picker_id ~on_press:(press send open_menu) []; if_ ~test:(Signal.map menu_open model_source) - (dropdown_menu_view (dropdown_menu ~anchor:`below ~anchor_alignment:`end_ + (dropdown_menu_view (dropdown_menu + ~target:(Menu_anchor { side = `below; align = `end_; offset = 0. }) ~min_width:160 ~on_dismiss:(press send close_menu) (List.map (fun (choice, title) -> dropdown_menu_item ~text:(View_base.tr current title) diff --git a/shared/src/logseq/view_sidebar.ml b/shared/src/logseq/view_sidebar.ml index c3ab4533..aad2a8fd 100644 --- a/shared/src/logseq/view_sidebar.ml +++ b/shared/src/logseq/view_sidebar.ml @@ -28,21 +28,22 @@ let sidebar_page_row (context : Lui_ui.ui_context) model_source if_ ~test:(Signal.map (fun icon -> icon = "") icon_source) (item false)] let sidebar_graph_menu_item model_source graph_source send : t = - fun context parent -> + custom (fun context parent -> let graph = sample graph_source in - View_base.with_string_prop_signal InlineIconName - (Signal.map2 View_base.sidebar_graph_icon_name model_source - graph_source) - (View_base.with_selected_signal - (Signal.map2 View_base.sidebar_graph_selected_ model_source - graph_source) - (menu_item ?size:(if Lui_ui.host context = KotlinHost then Some `sm else None) - ~text:(reactive View_base.graph_title graph_source) - ~disabled:(reactive View_base.sidebar_graph_disabled_ graph_source) - ~accessibility_identifier:(View_base.sidebar_graph_identifier graph) - ~on_press:(fun _ -> - ignore (send (Model.SelectSidebarGraph (sample graph_source).id))) - [])) context parent + mount context ?parent + (View_base.with_string_prop_signal InlineIconName + (Signal.map2 View_base.sidebar_graph_icon_name model_source + graph_source) + (View_base.with_selected_signal + (Signal.map2 View_base.sidebar_graph_selected_ model_source + graph_source) + (menu_item ?size:(if Lui_ui.host context = KotlinHost then Some `sm else None) + ~text:(reactive View_base.graph_title graph_source) + ~disabled:(reactive View_base.sidebar_graph_disabled_ graph_source) + ~accessibility_identifier:(View_base.sidebar_graph_identifier graph) + ~on_press:(fun _ -> + ignore (send (Model.SelectSidebarGraph (sample graph_source).id))) + [])))) let sidebar_graph_menu_items keyed item model_source send = [ keyed @@ -186,7 +187,8 @@ let sidebar_view (context : Lui_ui.ui_context) model_source send : t = if_ ~test:(Signal.map (fun current -> Lui_ui.host context = KotlinHost && View_base.model_graph_menu_open_ current) model_source) - (dropdown_menu_view (dropdown_menu ~anchor:`below ~anchor_alignment:`start + (dropdown_menu_view (dropdown_menu + ~target:(Menu_anchor { side = `below; align = `start; offset = 0. }) ~min_width:240 ~accessibility_identifier:"menu.graph-switch" ~style_class:"anchored-popover" ~gap:0 ~on_dismiss:(press send Model.DismissGraphMenu) @@ -246,7 +248,7 @@ let sidebar_view (context : Lui_ui.ui_context) model_source send : t = ]) in if native_toolbar then box ~accessibility_identifier:"sidebar.navigation" ~grow:1.0 - [(fun context parent -> + [custom (fun context parent -> let node = Lui_ui.extension context "native-sidebar" in attach context parent node; let graph_width = Signal.state context.ui_scheduler 160 in @@ -257,7 +259,6 @@ let sidebar_view (context : Lui_ui.ui_context) model_source send : t = | _ -> ()); let switch = View_base.with_int_prop_signal WidthValue (Signal.value graph_width) (sidebar_graph_switch context model_source send) in - List.iter (fun child -> ignore (child context (Some node))) - [content; switch; settings]; + mount_children context node [content; switch; settings]; node)] else content