Archives
/
gobang
mirror of https://github.com/TaKO8Ki/gobang
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use database filter component

Browse Source
pull/114/head
Takayuki Maeda 3 years ago
parent 62ab3275fd
commit c001bf40a5
3 changed files with 29 additions and 119 deletions
Show Stats Download Patch File Download Diff File

36
src/components/database_filter.rs
Unescape Escape View File

@ -1,9 +1,5 @@
use super::{ use super::{compute_character_width, Component, DrawableComponent, EventState};
compute_character_width, CompletionComponent, Component, DrawableComponent, EventState,
MovableComponent,
};
use crate::components::command::CommandInfo; use crate::components::command::CommandInfo;
use crate::config::KeyConfig;
use crate::event::Key; use crate::event::Key;
use anyhow::Result; use anyhow::Result;
use database_tree::Table; use database_tree::Table;
@ -11,7 +7,7 @@ use tui::{
backend::Backend, backend::Backend,
layout::Rect, layout::Rect,
style::{Color, Style}, style::{Color, Style},
text::{Span, Spans}, text::Spans,
widgets::{Block, Borders, Paragraph}, widgets::{Block, Borders, Paragraph},
Frame, Frame,
}; };
@ -48,23 +44,15 @@ impl DatabaseFilterComponent {
impl DrawableComponent for DatabaseFilterComponent { impl DrawableComponent for DatabaseFilterComponent {
fn draw<B: Backend>(&self, f: &mut Frame<B>, area: Rect, focused: bool) -> Result<()> { fn draw<B: Backend>(&self, f: &mut Frame<B>, area: Rect, focused: bool) -> Result<()> {
let query = Paragraph::new(Spans::from(vec![ let query = Paragraph::new(Spans::from(format!(
Span::styled( "{:w$}",
self.table if self.input.is_empty() && !focused {
.as_ref() "Filter tables".to_string()
.map_or("-".to_string(), |table| table.name.to_string()), } else {
Style::default().fg(Color::Blue), self.input_str()
), },
Span::from(format!( w = area.width as usize
"{}{:w$}", )))
if self.input.is_empty() && !focused {
"Filter tables".to_string()
} else {
self.input_str()
},
w = area.width as usize
)),
]))
.style(if focused { .style(if focused {
Style::default() Style::default()
} else { } else {
@ -75,7 +63,7 @@ impl DrawableComponent for DatabaseFilterComponent {
if focused { if focused {
f.set_cursor( f.set_cursor(
(area.x + self.input_cursor_position + 1).min(area.right().saturating_sub(2)), (area.x + self.input_cursor_position).min(area.right().saturating_sub(1)),
area.y, area.y,
) )
} }

110
src/components/databases.rs
Unescape Escape View File

@ -1,6 +1,6 @@
use super::{ use super::{
compute_character_width, utils::scroll_vertical::VerticalScroll, Component, utils::scroll_vertical::VerticalScroll, Component, DatabaseFilterComponent, DrawableComponent,
DatabaseFilterComponent, DrawableComponent, EventState, EventState,
}; };
use crate::components::command::{self, CommandInfo}; use crate::components::command::{self, CommandInfo};
use crate::config::KeyConfig; use crate::config::KeyConfig;
@ -16,10 +16,9 @@ use tui::{
layout::{Constraint, Direction, Layout, Rect}, layout::{Constraint, Direction, Layout, Rect},
style::{Color, Style}, style::{Color, Style},
text::{Span, Spans}, text::{Span, Spans},
widgets::{Block, Borders, Paragraph}, widgets::{Block, Borders},
Frame, Frame,
}; };
use unicode_width::UnicodeWidthStr;
// ▸ // ▸
const FOLDER_ICON_COLLAPSED: &str = "\u{25b8}"; const FOLDER_ICON_COLLAPSED: &str = "\u{25b8}";
@ -38,9 +37,6 @@ pub struct DatabasesComponent {
filter: DatabaseFilterComponent, filter: DatabaseFilterComponent,
filterd_tree: Option<DatabaseTree>, filterd_tree: Option<DatabaseTree>,
scroll: VerticalScroll, scroll: VerticalScroll,
input: Vec<char>,
input_idx: usize,
input_cursor_position: u16,
focus: Focus, focus: Focus,
key_config: KeyConfig, key_config: KeyConfig,
} }
@ -52,24 +48,15 @@ impl DatabasesComponent {
filter: DatabaseFilterComponent::new(), filter: DatabaseFilterComponent::new(),
filterd_tree: None, filterd_tree: None,
scroll: VerticalScroll::new(false, false), scroll: VerticalScroll::new(false, false),
input: Vec::new(),
input_idx: 0,
input_cursor_position: 0,
focus: Focus::Tree, focus: Focus::Tree,
key_config, key_config,
} }
} }
fn input_str(&self) -> String {
self.input.iter().collect()
}
pub fn update(&mut self, list: &[Database]) -> Result<()> { pub fn update(&mut self, list: &[Database]) -> Result<()> {
self.tree = DatabaseTree::new(list, &BTreeSet::new())?; self.tree = DatabaseTree::new(list, &BTreeSet::new())?;
self.filterd_tree = None; self.filterd_tree = None;
self.input = Vec::new(); self.filter.reset();
self.input_idx = 0;
self.input_cursor_position = 0;
Ok(()) Ok(())
} }
@ -169,26 +156,8 @@ impl DatabasesComponent {
.constraints([Constraint::Length(2), Constraint::Min(1)].as_ref()) .constraints([Constraint::Length(2), Constraint::Min(1)].as_ref())
.split(area); .split(area);
// let filter = Paragraph::new(Span::styled( self.filter
// format!( .draw(f, chunks[0], matches!(self.focus, Focus::Filter))?;
// "{}{:w$}",
// if self.input.is_empty() && matches!(self.focus, Focus::Tree) {
// "Filter tables".to_string()
// } else {
// self.input_str()
// },
// w = area.width as usize
// ),
// if let Focus::Filter = self.focus {
// Style::default()
// } else {
// Style::default().fg(Color::DarkGray)
// },
// ))
// .block(Block::default().borders(Borders::BOTTOM));
// f.render_widget(filter, chunks[0]);
// self.filter
// .draw(f, chunks[0], matches!(self.focus, Focus::Filter))?;
let tree_height = chunks[1].height as usize; let tree_height = chunks[1].height as usize;
let tree = if let Some(tree) = self.filterd_tree.as_ref() { let tree = if let Some(tree) = self.filterd_tree.as_ref() {
@ -213,10 +182,10 @@ impl DatabasesComponent {
item.clone(), item.clone(),
selected, selected,
area.width, area.width,
if self.input.is_empty() { if self.filter.input_str().is_empty() {
None None
} else { } else {
Some(self.input_str()) Some(self.filter.input_str())
}, },
) )
}); });
@ -246,67 +215,20 @@ impl Component for DatabasesComponent {
} }
fn event(&mut self, key: Key) -> Result<EventState> { fn event(&mut self, key: Key) -> Result<EventState> {
let input_str: String = self.input.iter().collect();
if key == self.key_config.filter && self.focus == Focus::Tree { if key == self.key_config.filter && self.focus == Focus::Tree {
self.focus = Focus::Filter; self.focus = Focus::Filter;
return Ok(EventState::Consumed); return Ok(EventState::Consumed);
} }
if matches!(self.focus, Focus::Filter) {
self.filterd_tree = if self.filter.input_str().is_empty() {
None
} else {
Some(self.tree.filter(self.filter.input_str()))
};
}
match key { match key {
// Key::Char(c) if self.focus == Focus::Filter => {
// self.input.insert(self.input_idx, c);
// self.input_idx += 1;
// self.input_cursor_position += compute_character_width(c);
// self.filterd_tree = Some(self.tree.filter(self.input_str()));
// return Ok(EventState::Consumed);
// }
// Key::Delete | Key::Backspace if matches!(self.focus, Focus::Filter) => {
// if input_str.width() > 0 {
// if !self.input.is_empty() && self.input_idx > 0 {
// let last_c = self.input.remove(self.input_idx - 1);
// self.input_idx -= 1;
// self.input_cursor_position -= compute_character_width(last_c);
// }
// self.filterd_tree = if self.input.is_empty() {
// None
// } else {
// Some(self.tree.filter(self.input_str()))
// };
// return Ok(EventState::Consumed);
// }
// }
// Key::Left if matches!(self.focus, Focus::Filter) => {
// if !self.input.is_empty() && self.input_idx > 0 {
// self.input_idx -= 1;
// self.input_cursor_position = self
// .input_cursor_position
// .saturating_sub(compute_character_width(self.input[self.input_idx]));
// }
// return Ok(EventState::Consumed);
// }
// Key::Ctrl('a') => {
// if !self.input.is_empty() && self.input_idx > 0 {
// self.input_idx = 0;
// self.input_cursor_position = 0
// }
// return Ok(EventState::Consumed);
// }
// Key::Right if matches!(self.focus, Focus::Filter) => {
// if self.input_idx < self.input.len() {
// let next_c = self.input[self.input_idx];
// self.input_idx += 1;
// self.input_cursor_position += compute_character_width(next_c);
// }
// return Ok(EventState::Consumed);
// }
// Key::Ctrl('e') => {
// if self.input_idx < self.input.len() {
// self.input_idx = self.input.len();
// self.input_cursor_position = self.input_str().width() as u16;
// }
// return Ok(EventState::Consumed);
// }
Key::Enter if matches!(self.focus, Focus::Filter) => { Key::Enter if matches!(self.focus, Focus::Filter) => {
self.focus = Focus::Tree; self.focus = Focus::Tree;
return Ok(EventState::Consumed); return Ok(EventState::Consumed);

2
src/components/record_table.rs
Unescape Escape View File

@ -1,4 +1,4 @@
use super::{Component, DrawableComponent, EventState, StatefulDrawableComponent}; use super::{Component, EventState, StatefulDrawableComponent};
use crate::components::command::CommandInfo; use crate::components::command::CommandInfo;
use crate::components::{TableComponent, TableFilterComponent}; use crate::components::{TableComponent, TableFilterComponent};
use crate::config::KeyConfig; use crate::config::KeyConfig;

Write Preview
Loading…
Cancel
Save