Skip to content

refactor(fleet-ui): consolidate Spotlight onto fuzzy implementation #167

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
NagyVikt merged 1 commit into from
May 16, 2026
Merged

refactor(fleet-ui): consolidate Spotlight onto fuzzy implementation #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
94 changes: 7 additions & 87 deletions rust/fleet-plan-tree/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ use fleet_ui::{
card::card,
chip::{status_chip, ChipKind},
palette::*,
spotlight_overlay::{Spotlight, SpotlightItem, SpotlightState},
spotlight_overlay::{
shared_spotlight_filter, Spotlight, SpotlightState, SHARED_SPOTLIGHT_ITEMS,
},
};
use tuirealm::application::{Application, PollStrategy};
use tuirealm::command::{Cmd, CmdResult};
Expand Down Expand Up @@ -74,88 +76,6 @@ enum Overlay {
Spotlight,
}

const SPOTLIGHT_ITEMS: &[SpotlightItem<'static>] = &[
SpotlightItem {
group: "PANE",
icon: "⊟",
title: "Horizontal split",
sub: "Split active pane top/bottom",
kbd: "h",
},
SpotlightItem {
group: "PANE",
icon: "⊞",
title: "Vertical split",
sub: "Split active pane left/right",
kbd: "v",
},
SpotlightItem {
group: "PANE",
icon: "⤢",
title: "Zoom pane",
sub: "Toggle full-screen for this pane",
kbd: "z",
},
SpotlightItem {
group: "PANE",
icon: "⇄",
title: "Swap with marked pane",
sub: "Swap active and marked panes",
kbd: "s",
},
SpotlightItem {
group: "SESSION",
icon: "⧉",
title: "Copy whole session",
sub: "Copy the current transcript",
kbd: "⇧C",
},
SpotlightItem {
group: "SESSION",
icon: "☰",
title: "Queue message",
sub: "Send a message on next idle",
kbd: "↹",
},
SpotlightItem {
group: "SESSION",
icon: "⌚",
title: "Search history…",
sub: "Search the current session",
kbd: "/",
},
SpotlightItem {
group: "FLEET",
icon: "+",
title: "Spawn new codex worker",
sub: "Open another worker pane",
kbd: "Ctrl N",
},
SpotlightItem {
group: "FLEET",
icon: "⎇",
title: "Switch worktree…",
sub: "Choose another branch/worktree",
kbd: "Ctrl B",
},
];

fn spotlight_filter(query: &str) -> Vec<&'static SpotlightItem<'static>> {
if query.is_empty() {
return SPOTLIGHT_ITEMS.iter().collect();
}

let q = query.to_lowercase();
SPOTLIGHT_ITEMS
.iter()
.filter(|it| {
it.title.to_lowercase().contains(&q)
|| it.sub.to_lowercase().contains(&q)
|| it.group.to_lowercase().contains(&q)
})
.collect()
}

// ---------- The PlanView component ----------

struct PlanView {
Expand Down Expand Up @@ -187,7 +107,7 @@ impl Default for PlanView {
.checked_sub(RELOAD_GIT_EVERY)
.unwrap_or_else(Instant::now),
overlay: Overlay::None,
spotlight: Spotlight::new(SPOTLIGHT_ITEMS.to_vec()),
spotlight: Spotlight::new(SHARED_SPOTLIGHT_ITEMS.to_vec()),
spotlight_state: SpotlightState::default(),
props: Props::default(),
};
Expand Down Expand Up @@ -398,7 +318,7 @@ impl AppComponent<Msg, NoUserEvent> for PlanView {
Event::Keyboard(KeyEvent {
code: Key::Down, ..
}) if self.overlay == Overlay::Spotlight => {
let max = spotlight_filter(&self.spotlight_state.query)
let max = shared_spotlight_filter(&self.spotlight_state.query)
.len()
.saturating_sub(1);
self.spotlight_state.selected = (self.spotlight_state.selected + 1).min(max);
Expand Down Expand Up @@ -1209,8 +1129,8 @@ mod spotlight_tests {

#[test]
fn spotlight_catalogue_matches_watcher_order() {
let hits = spotlight_filter("");
assert_eq!(hits.len(), SPOTLIGHT_ITEMS.len());
let hits = shared_spotlight_filter("");
assert_eq!(hits.len(), SHARED_SPOTLIGHT_ITEMS.len());
assert_eq!(hits.first().unwrap().title, "Horizontal split");
assert_eq!(hits.last().unwrap().title, "Switch worktree…");
}
Expand Down
90 changes: 5 additions & 85 deletions rust/fleet-state/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ use fleet_ui::{
chip::{status_chip, ChipKind},
palette::*,
rail::{progress_rail, RailAxis},
spotlight_overlay::{Spotlight, SpotlightItem, SpotlightState},
spotlight_overlay::{
shared_spotlight_filter, Spotlight, SpotlightState, SHARED_SPOTLIGHT_ITEMS,
},
};
use tuirealm::application::{Application, PollStrategy};
use tuirealm::command::{Cmd, CmdResult};
Expand Down Expand Up @@ -65,88 +67,6 @@ enum Overlay {
Spotlight,
}

const SPOTLIGHT_ITEMS: &[SpotlightItem<'static>] = &[
SpotlightItem {
group: "PANE",
icon: "⊟",
title: "Horizontal split",
sub: "Split active pane top/bottom",
kbd: "h",
},
SpotlightItem {
group: "PANE",
icon: "⊞",
title: "Vertical split",
sub: "Split active pane left/right",
kbd: "v",
},
SpotlightItem {
group: "PANE",
icon: "⤢",
title: "Zoom pane",
sub: "Toggle full-screen for this pane",
kbd: "z",
},
SpotlightItem {
group: "PANE",
icon: "⇄",
title: "Swap with marked pane",
sub: "Swap active and marked panes",
kbd: "s",
},
SpotlightItem {
group: "SESSION",
icon: "⧉",
title: "Copy whole session",
sub: "Copy the current transcript",
kbd: "⇧C",
},
SpotlightItem {
group: "SESSION",
icon: "☰",
title: "Queue message",
sub: "Send a message on next idle",
kbd: "↹",
},
SpotlightItem {
group: "SESSION",
icon: "⌚",
title: "Search history…",
sub: "Search the current session",
kbd: "/",
},
SpotlightItem {
group: "FLEET",
icon: "+",
title: "Spawn new codex worker",
sub: "Open another worker pane",
kbd: "Ctrl N",
},
SpotlightItem {
group: "FLEET",
icon: "⎇",
title: "Switch worktree…",
sub: "Choose another branch/worktree",
kbd: "Ctrl B",
},
];

fn spotlight_filter(query: &str) -> Vec<&'static SpotlightItem<'static>> {
if query.is_empty() {
return SPOTLIGHT_ITEMS.iter().collect();
}

let q = query.to_lowercase();
SPOTLIGHT_ITEMS
.iter()
.filter(|it| {
it.title.to_lowercase().contains(&q)
|| it.sub.to_lowercase().contains(&q)
|| it.group.to_lowercase().contains(&q)
})
.collect()
}

// ---------- The Fleet component ----------

/// tmux session + window the fleet's worker panes live in. Matches the
Expand Down Expand Up @@ -174,7 +94,7 @@ impl Default for FleetView {
rows: None,
load_error: None,
overlay: Overlay::None,
spotlight: Spotlight::new(SPOTLIGHT_ITEMS.to_vec()),
spotlight: Spotlight::new(SHARED_SPOTLIGHT_ITEMS.to_vec()),
spotlight_state: SpotlightState::default(),
props: Props::default(),
};
Expand Down Expand Up @@ -402,7 +322,7 @@ impl AppComponent<Msg, NoUserEvent> for FleetView {
Event::Keyboard(KeyEvent {
code: Key::Down, ..
}) if self.overlay == Overlay::Spotlight => {
let max = spotlight_filter(&self.spotlight_state.query)
let max = shared_spotlight_filter(&self.spotlight_state.query)
.len()
.saturating_sub(1);
self.spotlight_state.selected = (self.spotlight_state.selected + 1).min(max);
Expand Down
Loading