router2, needs bug fixes

This commit is contained in:
Priec
2025-08-22 22:52:20 +02:00
parent 957f5bf9f0
commit 5d97e63f93
7 changed files with 337 additions and 335 deletions

View File

@@ -1,7 +1,7 @@
// src/modes/common/commands.rs
use crate::tui::terminal::core::TerminalCore;
use crate::state::app::state::AppState;
use crate::state::pages::{auth::LoginState, auth::RegisterState};
use crate::pages::routing::{Router, Page};
use anyhow::Result;
pub struct CommandHandler;
@@ -16,11 +16,10 @@ impl CommandHandler {
action: &str,
terminal: &mut TerminalCore,
app_state: &mut AppState,
login_state: &LoginState,
register_state: &RegisterState,
router: &Router,
) -> Result<(bool, String)> {
match action {
"quit" => self.handle_quit(terminal, app_state, login_state, register_state).await,
"quit" => self.handle_quit(terminal, app_state, router).await,
"force_quit" => self.handle_force_quit(terminal).await,
"save_and_quit" => self.handle_save_quit(terminal).await,
_ => Ok((false, format!("Unknown command: {}", action))),
@@ -31,18 +30,14 @@ impl CommandHandler {
&self,
terminal: &mut TerminalCore,
app_state: &mut AppState,
login_state: &LoginState,
register_state: &RegisterState,
router: &Router,
) -> Result<(bool, String)> {
// Use actual unsaved changes state instead of is_saved flag
let has_unsaved = if app_state.ui.show_login {
login_state.has_unsaved_changes()
} else if app_state.ui.show_register {
register_state.has_unsaved_changes()
} else if let Some(fs) = app_state.form_state_mut() {
fs.has_unsaved_changes
} else {
false
// Use router to check unsaved changes
let has_unsaved = match &router.current {
Page::Login(state) => state.has_unsaved_changes(),
Page::Register(state) => state.has_unsaved_changes(),
Page::Form(fs) => fs.has_unsaved_changes,
_ => false,
};
if !has_unsaved {