mroot/yazi
1
0
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2026-07-25 08:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: can't cancel help filter with Esc

Browse source
This commit is contained in:
sxyazi 2024-01-09 16:28:20 +08:00
parent 59f79a2ae5
commit c3a8bdc3b6
No known key found for this signature in database
1 changed files with 29 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
yazi-core/src/help/help.rs
View file

@ -37,10 +37,37 @@ impl Help {
render!(); render!();
} }
pub(super) fn filter_apply(&mut self) -> bool { pub fn type_(&mut self, key: &Key) -> bool {
let Some(input) = &mut self.in_filter else {
return false;
};
match key {
Key { code: KeyCode::Esc, shift: false, ctrl: false, alt: false } => {
self.in_filter = None;
render!();
}
Key { code: KeyCode::Enter, shift: false, ctrl: false, alt: false } => {
self.in_filter = None;
render!();
return true; // Don't do the `filter_apply` below, since we already have the filtered results.
}
Key { code: KeyCode::Backspace, shift: false, ctrl: false, alt: false } => {
input.backspace(false);
}
_ => {
input.type_(key);
}
}
self.filter_apply();
true
}
pub(super) fn filter_apply(&mut self) {
let kw = self.in_filter.as_ref().map(|i| i.value()).filter(|v| !v.is_empty()); let kw = self.in_filter.as_ref().map(|i| i.value()).filter(|v| !v.is_empty());
if self.keyword.as_deref() == kw { if self.keyword.as_deref() == kw {
return false; return;
} }
if let Some(kw) = kw { if let Some(kw) = kw {
@ -51,30 +78,6 @@ impl Help {
self.keyword = kw.map(|s| s.to_owned()); self.keyword = kw.map(|s| s.to_owned());
self.arrow(0); self.arrow(0);
true
}
pub fn type_(&mut self, key: &Key) -> bool {
let Some(input) = &mut self.in_filter else {
return false;
};
if key.is_enter() {
self.in_filter = None;
render!();
return true;
}
match &key {
Key { code: KeyCode::Backspace, shift: false, ctrl: false, alt: false } => {
input.backspace(false);
}
_ => {
input.type_(key);
}
}
self.filter_apply();
true
} }
} }