tree: add guides, row click toggle, and arrow navigation into branches

This commit is contained in:
2026-11-15 16:54:27 +07:00
parent 4f67f9e1c2
commit d1a79fb9af
+86 -36
View File
@@ -47,7 +47,7 @@ impl TreeItem {
} }
} }
/// Shows an icon leading the label. /// Shows a custom icon leading the label.
pub fn icon<I>(mut self, icon: I) -> Self pub fn icon<I>(mut self, icon: I) -> Self
where where
I: Into<Icon>, I: Into<Icon>,
@@ -189,6 +189,22 @@ impl Tree {
} }
} }
} }
/// The nearest row above `index` with a smaller depth.
fn parent_of(items: &[TreeItem], index: usize) -> Option<usize> {
let depth = items.get(index)?.depth;
items[..index]
.iter()
.rposition(|candidate| candidate.depth < depth)
}
/// The first selectable row deeper than `index`, when its branch is open.
fn first_descendant(items: &[TreeItem], selectable: &[usize], index: usize) -> Option<usize> {
let depth = items.get(index)?.depth;
selectable.iter().copied().find(|candidate| {
*candidate > index && items.get(*candidate).is_some_and(|row| row.depth > depth)
})
}
} }
impl RenderOnce for Tree { impl RenderOnce for Tree {
@@ -248,6 +264,7 @@ impl RenderOnce for Tree {
let selected = self.selected; let selected = self.selected;
let on_change = self.on_change.clone(); let on_change = self.on_change.clone();
let on_disclosure = self.on_disclosure.clone(); let on_disclosure = self.on_disclosure.clone();
move |event: &KeyDownEvent, window, cx| { move |event: &KeyDownEvent, window, cx| {
if nav_key(&selectable, selected, &event.keystroke.key, |next| { if nav_key(&selectable, selected, &event.keystroke.key, |next| {
if let Some(on_change) = &on_change { if let Some(on_change) = &on_change {
@@ -260,14 +277,31 @@ impl RenderOnce for Tree {
match event.keystroke.key.as_str() { match event.keystroke.key.as_str() {
"left" | "right" => { "left" | "right" => {
let expanding = event.keystroke.key == "right"; let expanding = event.keystroke.key == "right";
let mut disclose = None;
let mut target = None;
if let Some(index) = selected if let Some(index) = selected
&& let Some(item) = items.get(index) && let Some(item) = items.get(index)
&& item.expandable
&& !item.disabled && !item.disabled
&& item.expanded != expanding {
if item.expandable && item.expanded != expanding {
disclose = Some(index);
} else if expanding {
target = Self::first_descendant(&items, &selectable, index);
} else {
target = Self::parent_of(&items, index)
.filter(|parent| selectable.contains(parent));
}
}
if let Some(index) = disclose
&& let Some(on_disclosure) = &on_disclosure && let Some(on_disclosure) = &on_disclosure
{ {
on_disclosure(index, window, cx); on_disclosure(index, window, cx);
} else if let Some(next) = target
&& let Some(on_change) = &on_change
{
on_change(Some(next), window, cx);
} }
} }
_ => return, _ => return,
@@ -295,13 +329,13 @@ impl TreeItem {
let theme = cx.theme(); let theme = cx.theme();
let label_color = selectable_label_color(cx, selected, self.disabled); let label_color = selectable_label_color(cx, selected, self.disabled);
let disabled = self.disabled; let disabled = self.disabled;
// usize can exceed f32's exact integer range; bound it via u32 before casting.
let depth = u32::try_from(self.depth).unwrap_or(u32::MAX) as f32; let depth = u32::try_from(self.depth).unwrap_or(u32::MAX) as f32;
// One indent step per depth level, on the theme's horizontal padding. let indent = theme.sizes.medium.padding_x * if self.depth == 0 { 0.5 } else { depth + 1.0 };
let indent = theme.sizes.medium.padding_x * (depth + 1.0);
div() div()
.id((self.key.clone(), "tree-item")) .id((self.key.clone(), "tree-item"))
.relative()
.flex() .flex()
.items_center() .items_center()
.gap_2() .gap_2()
@@ -319,19 +353,39 @@ impl TreeItem {
.when(!disabled, |row| { .when(!disabled, |row| {
row.cursor_pointer().on_click({ row.cursor_pointer().on_click({
let on_change = on_change.clone(); let on_change = on_change.clone();
let on_disclosure = on_disclosure.clone();
let expandable = self.expandable;
let focus = focus.clone(); let focus = focus.clone();
move |_, window, cx| { move |_, window, cx| {
window.focus(&focus, cx); window.focus(&focus, cx);
if let Some(on_change) = &on_change { if let Some(on_change) = &on_change {
on_change(Some(index), window, cx); on_change(Some(index), window, cx);
} }
// A folder row toggles with its own click, not just its chevron.
if expandable && let Some(on_disclosure) = &on_disclosure {
on_disclosure(index, window, cx);
}
} }
}) })
}) })
.child(self.render_disclosure(cx, index, selected, on_disclosure)) .children((0..self.depth).map(|level| {
.when_some(self.icon.clone(), |row, icon| { let step = u32::try_from(level).unwrap_or(u32::MAX) as f32;
row.child(icon.size(theme.sizes.medium.icon_size).color(label_color)) div()
}) .absolute()
.left(theme.sizes.medium.padding_x * (step + 0.5))
.top_0()
.bottom_0()
.border_l_1()
.border_color(theme.colors.border)
}))
.child(self.render_disclosure(cx, selected))
.when_some(
self.icon
.clone()
.or_else(|| (!self.expandable).then(|| icon(IconRole::File))),
|row, icon| row.child(icon.size(theme.sizes.medium.icon_size).color(label_color)),
)
.child( .child(
div() div()
.flex_1() .flex_1()
@@ -341,13 +395,7 @@ impl TreeItem {
.into_any_element() .into_any_element()
} }
fn render_disclosure( fn render_disclosure(&self, cx: &App, selected: bool) -> AnyElement {
&self,
cx: &App,
index: usize,
selected: bool,
on_disclosure: &Option<DisclosureHandler>,
) -> AnyElement {
let theme = cx.theme(); let theme = cx.theme();
let glyph_color = if self.disabled || !selected { let glyph_color = if self.disabled || !selected {
theme.colors.muted_foreground theme.colors.muted_foreground
@@ -355,13 +403,15 @@ impl TreeItem {
theme.colors.primary_foreground theme.colors.primary_foreground
}; };
let cell = div() // Only expandable rows draw a chevron; the empty cell keeps labels aligned with folders.
div()
.flex_none() .flex_none()
.size(theme.sizes.medium.icon_size) .size(theme.sizes.medium.icon_size)
.flex() .flex()
.items_center() .items_center()
.justify_center() .justify_center()
.child( .when(self.expandable, |cell| {
cell.child(
icon(if self.expanded { icon(if self.expanded {
IconRole::ChevronDown IconRole::ChevronDown
} else { } else {
@@ -369,25 +419,9 @@ impl TreeItem {
}) })
.size(theme.sizes.medium.dense_icon_size) .size(theme.sizes.medium.dense_icon_size)
.color(glyph_color), .color(glyph_color),
); )
if self.expandable && !self.disabled {
cell.id((self.key.clone(), "tree-disclosure"))
.cursor_pointer()
.on_click({
let on_disclosure = on_disclosure.clone();
move |_, window, cx| {
if let Some(on_disclosure) = &on_disclosure {
on_disclosure(index, window, cx);
}
// The toggle is not a selection: keep it off the row.
cx.stop_propagation();
}
}) })
.into_any_element() .into_any_element()
} else {
cell.into_any_element()
}
} }
} }
@@ -410,4 +444,20 @@ mod tests {
let sets = Tree::sibling_sets(&[item(0), item(1), item(2), item(1), item(0)]); let sets = Tree::sibling_sets(&[item(0), item(1), item(2), item(1), item(0)]);
assert_eq!(sets, vec![(1, 2), (1, 2), (1, 1), (2, 2), (2, 2)]); assert_eq!(sets, vec![(1, 2), (1, 2), (1, 1), (2, 2), (2, 2)]);
} }
#[test]
fn parent_skips_the_subtree_above() {
let rows = [item(0), item(1), item(2), item(1), item(0)];
assert_eq!(Tree::parent_of(&rows, 3), Some(0));
assert_eq!(Tree::parent_of(&rows, 2), Some(1));
assert_eq!(Tree::parent_of(&rows, 0), None);
}
#[test]
fn first_descendant_skips_disabled_rows() {
let rows = [item(0), item(1), item(1), item(0)];
let selectable = vec![0, 2, 3];
assert_eq!(Tree::first_descendant(&rows, &selectable, 0), Some(2));
assert_eq!(Tree::first_descendant(&rows, &selectable, 2), None);
}
} }