Skip to content
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
96 changes: 58 additions & 38 deletions src/multiselect.rs
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,23 @@ impl<'a, T> MultiSelect<'a, T> {
Key::ArrowUp => self.handle_up()?,
Key::ArrowLeft => self.handle_left()?,
Key::ArrowRight => self.handle_right()?,
Key::Enter => self.handle_stop_filtering(true)?,
Key::Enter => {
if let Some(selected) = self.try_confirm() {
self.cleanup()?;
self.term.show_cursor()?;
ctrlc_handle.close();
let output = self.render_success(&selected)?;
self.term.write_all(output.as_bytes())?;
let selected = self
.options
.into_iter()
.filter(|o| o.selected)
.map(|o| o.item)
.collect::<Vec<_>>();
self.term.clear_to_end_of_screen()?;
return Ok(selected);
}
}
Key::Escape => self.handle_stop_filtering(false)?,
Key::Backspace => self.handle_filter_backspace()?,
key if key == self.toggle_key => self.handle_toggle(),
Expand Down Expand Up @@ -221,43 +237,21 @@ impl<'a, T> MultiSelect<'a, T> {
self.handle_stop_filtering(false)?
}
Key::Enter => {
let selected = self
.options
.iter()
.filter(|o| o.selected)
.map(|o| o.label.to_string())
.collect::<Vec<_>>();
if selected.len() < self.min {
if self.min == 1 {
self.err = Some("Please select an option".to_string());
} else {
self.err =
Some(format!("Please select at least {} options", self.min));
}
continue;
}
if selected.len() > self.max {
if self.max == 1 {
self.err = Some("Please select only one option".to_string());
} else {
self.err =
Some(format!("Please select at most {} options", self.max));
}
continue;
if let Some(selected) = self.try_confirm() {
self.cleanup()?;
self.term.show_cursor()?;
ctrlc_handle.close();
let output = self.render_success(&selected)?;
self.term.write_all(output.as_bytes())?;
let selected = self
.options
.into_iter()
.filter(|o| o.selected)
.map(|o| o.item)
.collect::<Vec<_>>();
self.term.clear_to_end_of_screen()?;
return Ok(selected);
}
Comment thread
gaojunran marked this conversation as resolved.
self.cleanup()?;
self.term.show_cursor()?;
ctrlc_handle.close();
let output = self.render_success(&selected)?;
self.term.write_all(output.as_bytes())?;
let selected = self
.options
.into_iter()
.filter(|o| o.selected)
.map(|o| o.item)
.collect::<Vec<_>>();
self.term.clear_to_end_of_screen()?;
return Ok(selected);
}
_ => {}
}
Expand Down Expand Up @@ -383,6 +377,32 @@ impl<'a, T> MultiSelect<'a, T> {
self.filtering = true;
}

fn try_confirm(&mut self) -> Option<Vec<String>> {
let selected = self
.options
.iter()
.filter(|o| o.selected)
.map(|o| o.label.to_string())
.collect::<Vec<_>>();
if selected.len() < self.min {
if self.min == 1 {
self.err = Some("Please select an option".to_string());
} else {
self.err = Some(format!("Please select at least {} options", self.min));
}
return None;
}
if selected.len() > self.max {
if self.max == 1 {
self.err = Some("Please select only one option".to_string());
} else {
self.err = Some(format!("Please select at most {} options", self.max));
}
return None;
}
Some(selected)
}
Comment thread
gaojunran marked this conversation as resolved.

fn handle_stop_filtering(&mut self, save: bool) -> Result<(), io::Error> {
self.filtering = false;

Expand Down Expand Up @@ -573,7 +593,7 @@ impl<'a, T> MultiSelect<'a, T> {
("↑/↓".to_string(), "up/down"),
(toggle_label, "toggle"),
("esc".to_string(), "clear filter"),
("enter".to_string(), "save filter"),
("enter".to_string(), "confirm"),
];
} else {
help_keys.push(("/".to_string(), "filter"));
Expand Down
Loading