This commit is contained in:
filipriec
2025-08-19 22:02:00 +02:00
parent db9bb7e168
commit 3eea6b9e88
12 changed files with 11 additions and 984 deletions

View File

@@ -3,7 +3,7 @@ use crate::config::colors::themes::Theme;
use crate::state::app::highlight::HighlightState;
use crate::state::app::state::AppState;
use crate::state::pages::add_logic::{AddLogicFocus, AddLogicState};
use canvas::render_canvas_default;
use canvas::{render_canvas_default, render_canvas};
use canvas::canvas::HighlightState as CanvasHighlightState;
use ratatui::{
layout::{Alignment, Constraint, Direction, Layout, Rect},
@@ -170,7 +170,7 @@ pub fn render_add_logic(
);
let canvas_highlight_state = convert_highlight_state(highlight_state);
let active_field_rect = render_canvas_default(
let active_field_rect = render_canvas(
f,
canvas_area,
add_logic_state, // will later be wrapped in FormEditor

View File

@@ -3,7 +3,7 @@ use crate::config::colors::themes::Theme;
use crate::state::app::highlight::HighlightState;
use crate::state::app::state::AppState;
use crate::state::pages::add_table::{AddTableFocus, AddTableState};
use canvas::render_canvas_default;
use canvas::{render_canvas_default, render_canvas};
use canvas::canvas::HighlightState as CanvasHighlightState;
use ratatui::{
layout::{Alignment, Constraint, Direction, Layout, Rect},
@@ -359,7 +359,7 @@ pub fn render_add_table(
// --- Canvas Rendering (Column Definition Input) - USING CANVAS LIBRARY ---
let canvas_highlight_state = convert_highlight_state(highlight_state);
let _active_field_rect = render_canvas_default(
let _active_field_rect = render_canvas(
f,
canvas_area,
add_table_state, // will later be wrapped in FormEditor

View File

@@ -13,7 +13,7 @@ use ratatui::{
Frame,
};
use crate::state::app::highlight::HighlightState;
use canvas::{FormEditor, render_canvas_default, render_suggestions_dropdown, DefaultCanvasTheme};
use canvas::{FormEditor, render_canvas_default, render_canvas, render_suggestions_dropdown, DefaultCanvasTheme};
use canvas::canvas::HighlightState as CanvasHighlightState;
// Helper function to convert between HighlightState types
@@ -65,7 +65,7 @@ pub fn render_login(
// Wrap LoginState in FormEditor
let editor = FormEditor::new(login_state.clone());
let input_rect = render_canvas_default(
let input_rect = render_canvas(
f,
chunks[0],
&editor,

View File

@@ -14,7 +14,7 @@ use ratatui::{
Frame,
};
use crate::state::app::highlight::HighlightState;
use canvas::{FormEditor, render_canvas_default, render_suggestions_dropdown, DefaultCanvasTheme};
use canvas::{FormEditor, render_canvas_default, render_canvas, render_suggestions_dropdown, DefaultCanvasTheme};
use canvas::canvas::HighlightState as CanvasHighlightState;
// Helper function to convert between HighlightState types
@@ -65,7 +65,7 @@ pub fn render_register(
// Wrap RegisterState in FormEditor
let editor = FormEditor::new(state.clone());
let input_rect = render_canvas_default(
let input_rect = render_canvas(
f,
chunks[0],
&editor,

View File

@@ -1,7 +1,5 @@
// src/components/form/form.rs
use crate::config::colors::themes::Theme;
use canvas::{FormEditor, render_canvas_default, render_suggestions_dropdown, DefaultCanvasTheme};
use canvas::canvas::HighlightState;
use crate::state::pages::form::FormState;
use ratatui::{
layout::{Alignment, Constraint, Direction, Layout, Margin, Rect},
@@ -9,6 +7,8 @@ use ratatui::{
widgets::{Block, Borders, Paragraph},
Frame,
};
use canvas::canvas::HighlightState;
use canvas::{FormEditor, render_canvas_default, render_canvas, render_suggestions_dropdown, DefaultCanvasTheme};
pub fn render_form(
f: &mut Frame,
@@ -65,7 +65,7 @@ pub fn render_form(
// --- FORM RENDERING (Using new canvas API) ---
let editor = FormEditor::new(form_state.clone());
let active_field_rect = render_canvas_default(
let active_field_rect = render_canvas(
f,
main_layout[1],
&editor,