Skip to content

Commit 74a2c02

Browse files
UUGTechUUGTech
committed
change sort key with navigation keys
1 parent 325cdae commit 74a2c02

File tree

5 files changed

+101
-99
lines changed

5 files changed

+101
-99
lines changed

‎Cargo.lock

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ serde = "1.0"
4848
shellexpand = "3.1"
4949
simplelog = { version = "0.12", default-features = false }
5050
struct-patch = "0.4"
51+
strum = "0.25"
52+
strum_macros = "0.25"
5153
syntect = { version = "5.2", default-features = false, features = [
5254
"parsing",
5355
"default-syntaxes",

‎src/components/mod.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ pub use commitlist::CommitList;
1818
pub use cred::CredComponent;
1919
pub use diff::DiffComponent;
2020
pub use revision_files::RevisionFilesComponent;
21+
use strum::EnumIter;
22+
use strum_macros::{EnumCount, EnumIs};
2123
pub use syntax_text::SyntaxTextComponent;
2224
pub use textinput::{InputType, TextInputComponent};
2325
pub use utils::{
@@ -191,12 +193,12 @@ pub enum FuzzyFinderTarget {
191193
Files,
192194
}
193195

194-
#[derive(Copy, Clone)]
196+
#[derive(Copy, Clone, EnumCount, EnumIs, EnumIter)]
195197
pub enum BranchListSortBy {
196-
LastCommitTimeAsc,
197-
LastCommitTimeDesc,
198198
BranchNameAsc,
199199
BranchNameDesc,
200+
LastCommitTimeDesc,
201+
LastCommitTimeAsc,
200202
LastCommitAuthorAsc,
201203
LastCommitAuthorDesc,
202204
}

‎src/popups/branch_sort.rs

Lines changed: 57 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ use ratatui::{
66
widgets::{Block, Borders, Clear, Paragraph},
77
Frame,
88
};
9+
use strum::{EnumCount, IntoEnumIterator};
910

1011
use crate::{
1112
app::Environment,
@@ -22,6 +23,7 @@ use crate::{
2223
pub struct BranchSortPopup {
2324
queue: Queue,
2425
visible: bool,
26+
selection: BranchListSortBy,
2527
key_config: SharedKeyConfig,
2628
theme: SharedTheme,
2729
}
@@ -32,6 +34,7 @@ impl BranchSortPopup {
3234
Self {
3335
queue: env.queue.clone(),
3436
visible: false,
37+
selection: BranchListSortBy::BranchNameAsc,
3538
key_config: env.key_config.clone(),
3639
theme: env.theme.clone(),
3740
}
@@ -47,21 +50,46 @@ impl BranchSortPopup {
4750
self.queue.push(InternalEvent::BranchListSort(sort_by));
4851
}
4952

53+
fn move_selection(&mut self, up: bool) {
54+
let diff = if up {
55+
BranchListSortBy::COUNT.saturating_sub(1)
56+
} else {
57+
1
58+
};
59+
let new_selection = (self.selection as usize)
60+
.saturating_add(diff)
61+
.rem_euclid(BranchListSortBy::COUNT);
62+
self.selection = BranchListSortBy::iter()
63+
.collect::<Vec<BranchListSortBy>>()[new_selection];
64+
}
65+
5066
fn get_sort_key_lines(&self) -> Vec<Line> {
5167
let texts = [
52-
strings::sort_branch_by_name_msg(&self.key_config),
53-
strings::sort_branch_by_name_rev_msg(&self.key_config),
54-
strings::sort_branch_by_time_msg(&self.key_config),
55-
strings::sort_branch_by_time_rev_msg(&self.key_config),
56-
strings::sort_branch_by_author_msg(&self.key_config),
57-
strings::sort_branch_by_author_rev_msg(&self.key_config),
68+
strings::sort_branch_by_name_msg(
69+
self.selection.is_branch_name_asc(),
70+
),
71+
strings::sort_branch_by_name_rev_msg(
72+
self.selection.is_branch_name_desc(),
73+
),
74+
strings::sort_branch_by_time_msg(
75+
self.selection.is_last_commit_time_desc(),
76+
),
77+
strings::sort_branch_by_time_rev_msg(
78+
self.selection.is_last_commit_time_asc(),
79+
),
80+
strings::sort_branch_by_author_msg(
81+
self.selection.is_last_commit_author_asc(),
82+
),
83+
strings::sort_branch_by_author_rev_msg(
84+
self.selection.is_last_commit_author_desc(),
85+
),
5886
];
5987
texts
6088
.iter()
6189
.map(|t| {
6290
Line::from(vec![Span::styled(
6391
t.clone(),
64-
self.theme.text(true, false),
92+
self.theme.text(true, t.starts_with("[x]")),
6593
)])
6694
})
6795
.collect()
@@ -71,10 +99,12 @@ impl BranchSortPopup {
7199
impl DrawableComponent for BranchSortPopup {
72100
fn draw(&self, f: &mut Frame, area: Rect) -> Result<()> {
73101
if self.is_visible() {
74-
const MAX_SIZE: (u16, u16) = (50, 8);
102+
let height = u16::try_from(BranchListSortBy::COUNT)?
103+
.saturating_add(2);
104+
let max_size: (u16, u16) = (50, height);
75105

76106
let mut area = ui::centered_rect_absolute(
77-
MAX_SIZE.0, MAX_SIZE.1, area,
107+
max_size.0, max_size.1, area,
78108
);
79109

80110
f.render_widget(Clear, area);
@@ -116,7 +146,14 @@ impl Component for BranchSortPopup {
116146
) -> CommandBlocking {
117147
if self.is_visible() || force_all {
118148
out.push(CommandInfo::new(
119-
strings::commands::close_popup(&self.key_config),
149+
strings::commands::close_branch_sort_popup(
150+
&self.key_config,
151+
),
152+
true,
153+
true,
154+
));
155+
out.push(CommandInfo::new(
156+
strings::commands::scroll(&self.key_config),
120157
true,
121158
true,
122159
));
@@ -131,56 +168,20 @@ impl Component for BranchSortPopup {
131168
) -> Result<EventState> {
132169
if self.is_visible() {
133170
if let Event::Key(key) = event {
134-
if key_match(key, self.key_config.keys.exit_popup) {
135-
self.hide();
136-
} else if key_match(
137-
key,
138-
self.key_config.keys.branch_sort_by_name,
139-
) {
140-
self.update_sort_key(
141-
BranchListSortBy::BranchNameAsc,
142-
);
143-
self.hide();
144-
} else if key_match(
145-
key,
146-
self.key_config.keys.branch_sort_by_name_rev,
147-
) {
148-
self.update_sort_key(
149-
BranchListSortBy::BranchNameDesc,
150-
);
171+
if key_match(key, self.key_config.keys.exit_popup)
172+
|| key_match(key, self.key_config.keys.enter)
173+
{
151174
self.hide();
175+
} else if key_match(key, self.key_config.keys.move_up)
176+
{
177+
self.move_selection(true);
178+
self.update_sort_key(self.selection);
152179
} else if key_match(
153180
key,
154-
self.key_config.keys.branch_sort_by_time,
181+
self.key_config.keys.move_down,
155182
) {
156-
self.update_sort_key(
157-
BranchListSortBy::LastCommitTimeDesc,
158-
);
159-
self.hide();
160-
} else if key_match(
161-
key,
162-
self.key_config.keys.branch_sort_by_time_rev,
163-
) {
164-
self.update_sort_key(
165-
BranchListSortBy::LastCommitTimeAsc,
166-
);
167-
self.hide();
168-
} else if key_match(
169-
key,
170-
self.key_config.keys.branch_sort_by_author,
171-
) {
172-
self.update_sort_key(
173-
BranchListSortBy::LastCommitAuthorAsc,
174-
);
175-
self.hide();
176-
} else if key_match(
177-
key,
178-
self.key_config.keys.branch_sort_by_author_rev,
179-
) {
180-
self.update_sort_key(
181-
BranchListSortBy::LastCommitAuthorDesc,
182-
);
183-
self.hide();
183+
self.move_selection(false);
184+
self.update_sort_key(self.selection);
184185
}
185186
}
186187
return Ok(EventState::Consumed);

‎src/strings.rs

Lines changed: 35 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -364,58 +364,40 @@ pub fn rename_branch_popup_msg(
364364
"new branch name".to_string()
365365
}
366366

367-
pub fn sort_branch_by_name_msg(
368-
key_config: &SharedKeyConfig,
369-
) -> String {
370-
let hint =
371-
key_config.get_hint(key_config.keys.branch_sort_by_name);
372-
format!("{: <5}branch name (a -> z)", format!("[{}]", hint))
367+
pub fn sort_branch_by_name_msg(selected: bool) -> String {
368+
format!(
369+
"[{}] branch name (a -> z)",
370+
if selected { "x" } else { " " }
371+
)
373372
}
374-
pub fn sort_branch_by_name_rev_msg(
375-
key_config: &SharedKeyConfig,
376-
) -> String {
377-
let hint =
378-
key_config.get_hint(key_config.keys.branch_sort_by_name_rev);
379-
format!("{: <5}branch name (z -> a)", format!("[{}]", hint))
373+
pub fn sort_branch_by_name_rev_msg(selected: bool) -> String {
374+
format!(
375+
"[{}] branch name (z -> a)",
376+
if selected { "x" } else { " " }
377+
)
380378
}
381-
pub fn sort_branch_by_time_msg(
382-
key_config: &SharedKeyConfig,
383-
) -> String {
384-
let hint =
385-
key_config.get_hint(key_config.keys.branch_sort_by_time);
379+
pub fn sort_branch_by_time_msg(selected: bool) -> String {
386380
format!(
387-
"{: <5}last commit time (new -> old)",
388-
format!("[{}]", hint)
381+
"[{}] last commit time (new -> old)",
382+
if selected { "x" } else { " " }
389383
)
390384
}
391-
pub fn sort_branch_by_time_rev_msg(
392-
key_config: &SharedKeyConfig,
393-
) -> String {
394-
let hint =
395-
key_config.get_hint(key_config.keys.branch_sort_by_time_rev);
385+
pub fn sort_branch_by_time_rev_msg(selected: bool) -> String {
396386
format!(
397-
"{: <5}last commit time (old -> new)",
398-
format!("[{}]", hint)
387+
"[{}] last commit time (old -> new)",
388+
if selected { "x" } else { " " }
399389
)
400390
}
401-
pub fn sort_branch_by_author_msg(
402-
key_config: &SharedKeyConfig,
403-
) -> String {
404-
let hint =
405-
key_config.get_hint(key_config.keys.branch_sort_by_author);
391+
pub fn sort_branch_by_author_msg(selected: bool) -> String {
406392
format!(
407-
"{: <5}last commit author (a -> z)",
408-
format!("[{}]", hint)
393+
"[{}] last commit author (a -> z)",
394+
if selected { "x" } else { " " }
409395
)
410396
}
411-
pub fn sort_branch_by_author_rev_msg(
412-
key_config: &SharedKeyConfig,
413-
) -> String {
414-
let hint = key_config
415-
.get_hint(key_config.keys.branch_sort_by_author_rev);
397+
pub fn sort_branch_by_author_rev_msg(selected: bool) -> String {
416398
format!(
417-
"{: <5}last commit author (z -> a)",
418-
format!("[{}]", hint)
399+
"[{}] last commit author (z -> a)",
400+
if selected { "x" } else { " " }
419401
)
420402
}
421403

@@ -817,6 +799,19 @@ pub mod commands {
817799
CMD_GROUP_GENERAL,
818800
)
819801
}
802+
pub fn close_branch_sort_popup(
803+
key_config: &SharedKeyConfig,
804+
) -> CommandText {
805+
CommandText::new(
806+
format!(
807+
"Close [{}{}]",
808+
key_config.get_hint(key_config.keys.exit_popup),
809+
key_config.get_hint(key_config.keys.enter),
810+
),
811+
"close branch sort popup",
812+
CMD_GROUP_GENERAL,
813+
)
814+
}
820815
pub fn close_popup(key_config: &SharedKeyConfig) -> CommandText {
821816
CommandText::new(
822817
format!(

0 commit comments

Comments
 (0)