Skip to content

Refine Detail typography, Copy, and native feedback #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RCmerci merged 11 commits into from
Oct 11, 2026
+805 −172
Merged

Refine Detail typography, Copy, and native feedback #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ceb45bd
Refine Detail typography and add scoped subtree Copy
RCmerci Oct 10, 2026
b48ac5d
Register native Copy menu symbol
RCmerci Oct 10, 2026
f6702eb
Increase Detail page budget to 128 items
RCmerci Oct 11, 2026
72e93d5
Compose feedback and bottom controls with native LUI insets
RCmerci Oct 11, 2026
2c87b20
Keep operation feedback inside its native route page
RCmerci Oct 11, 2026
eb0ea77
Reserve root control space above operation feedback
RCmerci Oct 11, 2026
69a4d23
Update LUI to merged iOS button touch target fixes
RCmerci Oct 11, 2026
e6e0fe8
Use merged LUI native Menu toolbar touch targets
RCmerci Oct 11, 2026
1436d53
Freeze latest merged LUI dependency snapshot
RCmerci Oct 11, 2026
3bbcf68
Apply native Menu styles in the Detail toolbar
RCmerci Oct 11, 2026
318f4de
Let the Detail menu capsule own its toolbar background
RCmerci Oct 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
150 changes: 89 additions & 61 deletions app/application.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,17 @@ type composer_owner =
| Timeline_composer
| Detail_composer of string * int64

type detail_copy_phase =
| Copying
| Copied
| Copy_failed_detail of string

type detail_copy_feedback =
{ copy_scope : string
; copy_owner : int * int64
; copy_phase : detail_copy_phase
}

type state =
{ favorites : Journal_routes.Favorites.t
; favorites_media_roots : string Rrbvec.t
Expand Down Expand Up @@ -276,6 +287,7 @@ type state =
; capture_error : capture_failure option
; capture_error_owner : composer_owner option
; timeline_notice : timeline_notice option
; detail_copy_feedback : detail_copy_feedback option
; write_enabled : bool
; graph_ready : bool
; feed_loaded : bool
Expand Down Expand Up @@ -366,6 +378,7 @@ let initial_state =
; capture_error = None
; capture_error_owner = None
; timeline_notice = None
; detail_copy_feedback = None
; write_enabled = false
; graph_ready = false
; feed_loaded = false
Expand Down Expand Up @@ -2807,14 +2820,8 @@ module Detail_list = struct
~on_visible_range
~children
=
let depth = function
| Journal_detail.Block row -> row.depth
| More row -> row.depth
in
let rec siblings level items =
match items with
| (row, label) :: rest when depth row = level ->
let nested, rest = siblings (level + 1) rest in
let rows =
List.map2 (fun row label ->
let row_key = Ui.Key.string (Journal_detail.row_key row) in
let item =
match row with
Expand All @@ -2827,7 +2834,7 @@ module Detail_list = struct
let context_menu =
V.Context_menu.create
~actions:
[ V.Context_menu.action
([ V.Context_menu.action
~key:(Ui.Key.string "open")
~title:"Open block"
~symbol:"arrow.up.right.square"
Expand All @@ -2849,31 +2856,21 @@ module Detail_list = struct
~on_press:(bind_action on_action (Copy_block id))
()
]
|> fun actions ->
if leaf then actions else
V.Context_menu.action
~key:(Ui.Key.string (if expanded then "collapse" else "expand"))
~title:(if expanded then "Hide children" else "Show children")
~on_press:(bind_action on_action
(if expanded then Detail_collapse id else Detail_expand id))
() :: actions)
()
in
if leaf
then V.Native_list.row ~key:row_key ~separator:Hidden ~context_menu label
else
V.Native_list.disclosure_row
~key:row_key
~separator:Hidden
~context_menu
~test_id:(Ui.Test_id.string ("detail-disclosure:" ^ id))
~expanded
~on_expanded_changed:
(Ui.Event.Handler.create (function
| Ui.Event.Payload.Bool expanded ->
on_action.send
(if expanded then Detail_expand id else Detail_collapse id)
| _ -> ()))
~label
nested
V.Native_list.row ~key:row_key ~separator:Hidden ~context_menu label
in
let siblings, rest = siblings level rest in
item :: siblings, rest
| _ -> [], items
item)
(Journal_detail.rows detail) children
in
let rows, _ = siblings 0 (List.combine (Journal_detail.rows detail) children) in
let scroll_request =
Option.map
(fun id ->
Expand All @@ -2883,18 +2880,15 @@ module Detail_list = struct
(V.Native_list.target
~section:(Ui.Key.string "outline")
~row_path:
[ Ui.Key.string
("block:" ^ Journal_model.id (Journal_detail.root detail))
; Ui.Key.string ("block:" ^ id)
])
[ Ui.Key.string ("block:" ^ id) ])
~anchor:Bottom
~animated:false
())
(Journal_detail.reveal_id detail)
in
V.Native_list.vertical
~key
~style:Plain
~style:Detail
?scroll_request
~on_scroll_completed
~on_visible_range
Expand Down Expand Up @@ -2958,7 +2952,7 @@ let detail_page
then "Retry loading children"
else "Load more")
])
| Block { block; _ } ->
| Block { block; depth; _ } ->
let source =
if Journal_model.task_state block = No_status
then render_source state (Journal_model.source block)
Expand All @@ -2967,16 +2961,25 @@ let detail_page
^ " "
^ render_source state (Journal_model.source block)
in
V.text ~key:(Ui.Key.string ("detail-label:" ^ Journal_model.id block)) source
|> V.with_test_id (Ui.Test_id.string ("detail-block:" ^ Journal_model.id block))
let id = "detail-block:" ^ Journal_model.id block in
Journal_header.detail_text ~id ~depth source
|> fun text ->
let tags = Journal_model.tag_titles block in
V.column ~spacing:8. (text ::
(if tags = [] then [] else
[ Journal_header.detail_text
~id:("detail-tags:" ^ Journal_model.id block) ~depth:2
(String.concat " " (List.map (fun title -> "#" ^ title) tags)) ]))
|> V.with_test_id (Ui.Test_id.string id)
|> media_label
~store:media_store
~on_region
~detail:true
state
dispatch
~title:(Journal_model.source block)
~root:(Journal_model.id block))
~root:(Journal_model.id block)
|> Journal_header.detail_row ~depth)
(Journal_detail.rows detail)
in
let content =
Expand Down Expand Up @@ -3026,6 +3029,15 @@ let detail_page
|> Journal_header.detail
~capture_enabled:actions_enabled
~on_capture:(on_action Open_append)
~copy_enabled:(state.graph_ready && Option.is_some detail)

@chatgpt-codex-connector chatgpt-codex-connector Bot Oct 10, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Disable Detail copy while a subtree deletion is pending

When a descendant is deleted from Detail, hide_deleted immediately removes it from the rendered outline but delays the worker deletion during the undo window; this new header action remains enabled because it ignores pending_delete. Copying the root during that window therefore reads the unchanged worker subtree and puts the now-hidden descendant on the clipboard, and it can race the later delete commit. Gate this action on the pending mutation state, as the existing Detail actions already do.

Useful? React with 👍 / 👎.

~on_copy:(on_action (Copy_block
(Option.fold ~none:"" ~some:(fun d -> Journal_model.id (Journal_detail.root d)) detail)))
~copy_feedback:(Option.bind state.detail_copy_feedback (fun feedback ->
if feedback.copy_scope <> scope then None else Some
(match feedback.copy_phase with
| Copying -> "Copying block and descendants…"
| Copied -> "Copied block and descendants"
| Copy_failed_detail message -> "Copy failed: " ^ message)))
|> Journal_asset_import.view
~key:(Ui.Key.string (scope ^ "import"))
~enabled:actions_enabled
Expand Down Expand Up @@ -3638,6 +3650,7 @@ let start
let state, _ = Journal_graph_runtime.Copy.step !copy_state Cancel in
copy_state := state;
copy_owner := None;
set_state (fun state -> { state with detail_copy_feedback = None }) ();
Hashtbl.iter
(fun request_id (_, _, protocol_id) ->
!projection_request_finished protocol_id;
Expand All @@ -3654,7 +3667,11 @@ let start
let copy_error owner message =
set_state (fun state ->
if copy_current owner
then { state with timeline_notice = Some (Copy_failed message) }
then (match state.detail_copy_feedback with
| Some feedback when feedback.copy_owner = owner ->
{ state with detail_copy_feedback = Some
{ feedback with copy_phase = Copy_failed_detail message } }
| _ -> { state with timeline_notice = Some (Copy_failed message) })
else state)
in
let rec copy_transition owner event =
Expand Down Expand Up @@ -3682,7 +3699,12 @@ let start
then Effect.ignore
else (
match Result.bind result Journal_platform.decode_copy_text_response with
| Ok () -> Effect.ignore
| Ok () -> set_state (fun state ->
match state.detail_copy_feedback with
| Some feedback when feedback.copy_owner = owner ->
{ state with detail_copy_feedback = Some
{ feedback with copy_phase = Copied } }
| _ -> state)
| Error message -> copy_error owner message)))
| Read (ticket, command) ->
Effect.bind
Expand Down Expand Up @@ -3721,7 +3743,14 @@ let start
copy_sequence := Int64.succ !copy_sequence;
let owner = !state_ref.graph_state.generation, !copy_sequence in
copy_owner := Some owner;
copy_transition owner (Start root)
Effect.many
[ set_state (fun state ->
{ state with detail_copy_feedback =
Option.map (fun _ ->
{ copy_scope = Detail_outline.scope state.routes; copy_owner = owner
; copy_phase = Copying })
(Journal_routes.detail state.routes) })
; copy_transition owner (Start root) ]
in
let graph_runtime =
Journal_graph_runtime.create
Expand Down Expand Up @@ -5078,7 +5107,7 @@ let start
with_direct_request
{ snapshot with routes; next_request_generation = Int64.succ generation }
(Journal_graph_request.Load_detail
{ block_id; after = None; limit = 64; request_generation = generation })
{ block_id; after = None; limit = 128; request_generation = generation })
in
let open_favorite membership_id =
match
Expand Down Expand Up @@ -6208,6 +6237,7 @@ let start
&& left.asset_import_request = right.asset_import_request
&& left.asset_import_owner = right.asset_import_owner
&& left.graph_ready = right.graph_ready
&& left.detail_copy_feedback = right.detail_copy_feedback
&& operation_failure left.timeline_notice = operation_failure right.timeline_notice
in
let equal_modal_presentation left right =
Expand Down Expand Up @@ -6511,6 +6541,18 @@ let start
~on_select:assets.on_event
(V.Body.static (V.empty ())))
in
let feedback =
region
"feedback"
~equal:(fun left right ->
left.timeline_notice = right.timeline_notice
&& left.failed_capture_imports == right.failed_capture_imports)
(fun current ->
(* Keep the same inset/body owner while its visibility changes.
Wrapping retained root content lets native safe-area layout
reserve room for Capture and navigation above the feedback. *)
operation_feedback ~scope:"root" ~state:current dispatch (V.Body.static root))
in
let navigator =
V.of_lui (fun context parent ->
let mapped =
Expand All @@ -6533,7 +6575,10 @@ let start
if routes == current.routes
then current
else { current with routes; modal = No_modal }))))
~root:(Lui_elements.column ~grow:1.0 [ Journal_view.mount root ])
~root:
(* Keep feedback in the root native page so a pushed destination
covers it together with the retained Timeline/Favorites. *)
(Lui_elements.column ~grow:1.0 [ Journal_view.mount feedback ])
~destination:(fun entry ->
let initial =
Option.value
Expand Down Expand Up @@ -6724,22 +6769,6 @@ let start
dispatch
(V.empty ()))
in
let feedback =
region
"feedback"
~equal:(fun left right ->
left.timeline_notice = right.timeline_notice
&& left.failed_capture_imports == right.failed_capture_imports)
(fun current ->
if current.timeline_notice = None
then V.empty ()
else
operation_feedback
~scope:"root"
~state:current
dispatch
(V.Body.static (V.empty ())))
in
let settings =
region
"settings"
Expand All @@ -6764,7 +6793,6 @@ let start
; capture_adapter
; modal
; confirmations
; feedback
; settings
]
in
Expand Down
2 changes: 1 addition & 1 deletion app/journal_detail.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ let load (t : t) id =
Journal_graph_request.Load_detail
{ block_id = id
; after = current.continuation
; limit = 64
; limit = 128
; request_generation = generation
}
in
Expand Down
21 changes: 18 additions & 3 deletions app/journal_graph_runtime.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2147,6 +2147,21 @@ let detail_children t ~generation ~page ~root ~limit ~after =
]
;;

let detail_projection t ~page ~time_context ~root children =
Result.map
(fun (detail : Projection.detail) ->
let tagged block =
Journal_model.with_tag_titles block
~tag_titles:(Option.value
(Hashtbl.find_opt t.tag_titles (Journal_model.id block)) ~default:[])
in
(* This is the already returned, bounded child page; metadata needs no reads. *)
{ Projection.root = tagged detail.root
; children = { detail.children with blocks = List.map tagged detail.children.blocks }
})
(Projection.detail_on_page ~page ~time_context ~root children)
;;

let read_child t command page =
requests
[ read
Expand Down Expand Up @@ -2709,7 +2724,7 @@ let receive_response t (protocol_response : Protocol.response) =
| Error _ -> ()
| Ok time_context ->
(match
Projection.detail_on_page
detail_projection t
~page
~time_context
~root:interest.root
Expand Down Expand Up @@ -3224,7 +3239,7 @@ let receive_response t (protocol_response : Protocol.response) =
})
]
| Ok time_context ->
(match Projection.detail_on_page ~page ~time_context ~root children with
(match detail_projection t ~page ~time_context ~root children with
| Ok detail ->
Hashtbl.replace
t.projected_blocks
Expand Down Expand Up @@ -3330,7 +3345,7 @@ let receive_response t (protocol_response : Protocol.response) =
(match projection_time_context t with
| Error message -> reject message
| Ok time_context ->
(match Projection.detail_on_page ~page ~time_context ~root children with
(match detail_projection t ~page ~time_context ~root children with
| Ok detail -> responses [ response (Children_reconciled detail) ]
| Error message -> reject message))
| Capture_children { command; page; conflict_retries } ->
Expand Down
Loading
Loading