Skip to content
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.

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

inspector: Add a search box and select up and down #510

Merged
merged 2 commits into from
Jul 16, 2024
Merged
Changes from all commits
Commits
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
87 changes: 84 additions & 3 deletions src/inspector.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use crate::view::{IntoView, View};
use crate::view_state::ChangeFlags;
use crate::views::{
button, container, dyn_container, empty, h_stack, img_dynamic, scroll, stack, static_label,
tab, text, v_stack, v_stack_from_iter, Decorators, Label,
tab, text, text_input, v_stack, v_stack_from_iter, Decorators, Label,
};
use crate::window::WindowConfig;
use crate::{new_window, style};
Expand Down Expand Up @@ -822,6 +822,7 @@ fn capture_view(
))
.style(|s| s.max_width_pct(60.0));

let root = capture.root.clone();
let tree = scroll(captured_view(&capture.root, 0, &capture_view).style(|s| s.min_width_full()))
.style(|s| {
s.width_full()
Expand All @@ -836,10 +837,65 @@ fn capture_view(
.on_click_stop(move |_| capture_view.selected.set(None))
.scroll_to_view(move || capture_view.scroll_to.get());

let search_str = create_rw_signal("".to_string());
let inner_search = search_str;
let match_ids = create_rw_signal((0, Vec::<ViewId>::new()));

let search =
text_input(search_str).on_event_stop(EventListener::KeyUp, move |event: &Event| {
if let Event::KeyUp(key) = event {
match key.key.logical_key {
keyboard::Key::Named(NamedKey::ArrowUp) => {
let id = match_ids.try_update(|(match_index, ids)| {
if !ids.is_empty() {
if *match_index == 0 {
*match_index = ids.len() - 1;
} else {
*match_index -= 1;
}
}
ids.get(*match_index).copied()
});
if let Some(Some(id)) = id {
capture_view.selected.set(Some(id));
capture_view.highlighted.set(Some(id));
capture_view.expanding_selection.set(Some(id));
}
}
keyboard::Key::Named(NamedKey::ArrowDown) => {
let id = match_ids.try_update(|(match_index, ids)| {
if !ids.is_empty() {
*match_index = (*match_index + 1) % ids.len();
}
ids.get(*match_index).copied()
});
if let Some(Some(id)) = id {
capture_view.selected.set(Some(id));
capture_view.highlighted.set(Some(id));
capture_view.expanding_selection.set(Some(id));
}
}
_ => {
let content = inner_search.get();
let ids = find_view(&content, &root);
let first = match_ids.try_update(|(index, match_ids)| {
*index = 0;
let _ = std::mem::replace(match_ids, ids);
match_ids.first().copied()
});
if let Some(Some(id)) = first {
capture_view.selected.set(Some(id));
capture_view.highlighted.set(Some(id));
capture_view.expanding_selection.set(Some(id));
}
}
}
}
});
let tree = if capture.root.warnings() {
v_stack((header("Warnings"), header("View Tree"), tree)).into_view()
v_stack((header("Warnings"), header("View Tree"), search, tree)).into_view()
} else {
v_stack((header("View Tree"), tree)).into_view()
v_stack((header("View Tree"), search, tree)).into_view()
};

let tree = tree.style(|s| s.height_full().min_width(0).flex_basis(0).flex_grow(1.0));
Expand Down Expand Up @@ -976,3 +1032,28 @@ pub fn capture(window_id: WindowId) {
capture: capture.write_only(),
})
}

fn find_view(name: &str, views: &Rc<CapturedView>) -> Vec<ViewId> {
let mut ids = Vec::new();
if name.is_empty() {
return ids;
}
if views.name.contains(name) {
ids.push(views.id);
}
views
.children
.iter()
.filter_map(|x| {
let ids = find_view(name, x);
if ids.is_empty() {
None
} else {
Some(ids)
}
})
.fold(ids, |mut init, mut item| {
init.append(&mut item);
init
})
}