moving add_table to add_logic modern architecture2
This commit is contained in:
@@ -4,7 +4,6 @@ use canvas::{DataProvider, AppMode};
|
||||
use canvas::FormEditor;
|
||||
use ratatui::widgets::TableState;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use crate::movement::{move_focus, MovementAction};
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
pub struct ColumnDefinition {
|
||||
@@ -211,178 +210,6 @@ impl DataProvider for AddTableState {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
impl AddTableState {
|
||||
pub fn handle_movement(&mut self, action: MovementAction) -> bool {
|
||||
use AddTableFocus::*;
|
||||
|
||||
// Linear outer focus order
|
||||
const ORDER: [AddTableFocus; 10] = [
|
||||
InputTableName,
|
||||
InputColumnName,
|
||||
InputColumnType,
|
||||
AddColumnButton,
|
||||
ColumnsTable,
|
||||
IndexesTable,
|
||||
LinksTable,
|
||||
SaveButton,
|
||||
DeleteSelectedButton,
|
||||
CancelButton,
|
||||
];
|
||||
|
||||
// Enter "inside" on Select from outer panes
|
||||
match (self.current_focus, action) {
|
||||
(ColumnsTable, MovementAction::Select) => {
|
||||
if !self.columns.is_empty() && self.column_table_state.selected().is_none() {
|
||||
self.column_table_state.select(Some(0));
|
||||
}
|
||||
self.current_focus = InsideColumnsTable;
|
||||
return true;
|
||||
}
|
||||
(IndexesTable, MovementAction::Select) => {
|
||||
if !self.indexes.is_empty() && self.index_table_state.selected().is_none() {
|
||||
self.index_table_state.select(Some(0));
|
||||
}
|
||||
self.current_focus = InsideIndexesTable;
|
||||
return true;
|
||||
}
|
||||
(LinksTable, MovementAction::Select) => {
|
||||
if !self.links.is_empty() && self.link_table_state.selected().is_none() {
|
||||
self.link_table_state.select(Some(0));
|
||||
}
|
||||
self.current_focus = InsideLinksTable;
|
||||
return true;
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
|
||||
// Handle "inside" states: Up/Down/Select/Esc; block outer movement keys
|
||||
match self.current_focus {
|
||||
InsideColumnsTable => {
|
||||
match action {
|
||||
MovementAction::Up => {
|
||||
if let Some(i) = self.column_table_state.selected() {
|
||||
let next = i.saturating_sub(1);
|
||||
self.column_table_state.select(Some(next));
|
||||
} else if !self.columns.is_empty() {
|
||||
self.column_table_state.select(Some(0));
|
||||
}
|
||||
return true;
|
||||
}
|
||||
MovementAction::Down => {
|
||||
if let Some(i) = self.column_table_state.selected() {
|
||||
let last = self.columns.len().saturating_sub(1);
|
||||
let next = if i < last { i + 1 } else { i };
|
||||
self.column_table_state.select(Some(next));
|
||||
} else if !self.columns.is_empty() {
|
||||
self.column_table_state.select(Some(0));
|
||||
}
|
||||
return true;
|
||||
}
|
||||
MovementAction::Select => {
|
||||
if let Some(i) = self.column_table_state.selected() {
|
||||
if let Some(col) = self.columns.get_mut(i) {
|
||||
col.selected = !col.selected;
|
||||
self.has_unsaved_changes = true;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
MovementAction::Esc => {
|
||||
self.column_table_state.select(None);
|
||||
self.current_focus = ColumnsTable;
|
||||
return true;
|
||||
}
|
||||
MovementAction::Next | MovementAction::Previous => return true, // block outer moves
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
InsideIndexesTable => {
|
||||
match action {
|
||||
MovementAction::Up => {
|
||||
if let Some(i) = self.index_table_state.selected() {
|
||||
let next = i.saturating_sub(1);
|
||||
self.index_table_state.select(Some(next));
|
||||
} else if !self.indexes.is_empty() {
|
||||
self.index_table_state.select(Some(0));
|
||||
}
|
||||
return true;
|
||||
}
|
||||
MovementAction::Down => {
|
||||
if let Some(i) = self.index_table_state.selected() {
|
||||
let last = self.indexes.len().saturating_sub(1);
|
||||
let next = if i < last { i + 1 } else { i };
|
||||
self.index_table_state.select(Some(next));
|
||||
} else if !self.indexes.is_empty() {
|
||||
self.index_table_state.select(Some(0));
|
||||
}
|
||||
return true;
|
||||
}
|
||||
MovementAction::Select => {
|
||||
if let Some(i) = self.index_table_state.selected() {
|
||||
if let Some(ix) = self.indexes.get_mut(i) {
|
||||
ix.selected = !ix.selected;
|
||||
self.has_unsaved_changes = true;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
MovementAction::Esc => {
|
||||
self.index_table_state.select(None);
|
||||
self.current_focus = IndexesTable;
|
||||
return true;
|
||||
}
|
||||
MovementAction::Next | MovementAction::Previous => return true, // block outer moves
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
InsideLinksTable => {
|
||||
match action {
|
||||
MovementAction::Up => {
|
||||
if let Some(i) = self.link_table_state.selected() {
|
||||
let next = i.saturating_sub(1);
|
||||
self.link_table_state.select(Some(next));
|
||||
} else if !self.links.is_empty() {
|
||||
self.link_table_state.select(Some(0));
|
||||
}
|
||||
return true;
|
||||
}
|
||||
MovementAction::Down => {
|
||||
if let Some(i) = self.link_table_state.selected() {
|
||||
let last = self.links.len().saturating_sub(1);
|
||||
let next = if i < last { i + 1 } else { i };
|
||||
self.link_table_state.select(Some(next));
|
||||
} else if !self.links.is_empty() {
|
||||
self.link_table_state.select(Some(0));
|
||||
}
|
||||
return true;
|
||||
}
|
||||
MovementAction::Select => {
|
||||
if let Some(i) = self.link_table_state.selected() {
|
||||
if let Some(link) = self.links.get_mut(i) {
|
||||
link.selected = !link.selected;
|
||||
self.has_unsaved_changes = true;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
MovementAction::Esc => {
|
||||
self.link_table_state.select(None);
|
||||
self.current_focus = LinksTable;
|
||||
return true;
|
||||
}
|
||||
MovementAction::Next | MovementAction::Previous => return true, // block outer moves
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
|
||||
// Default: outer navigation via helper
|
||||
move_focus(&ORDER, &mut self.current_focus, action)
|
||||
}
|
||||
}
|
||||
|
||||
pub struct AddTableFormState {
|
||||
pub state: AddTableState,
|
||||
pub editor: FormEditor<AddTableState>,
|
||||
|
||||
Reference in New Issue
Block a user