From 770dc1dbc32db227981b0088226ca0ad06156144 Mon Sep 17 00:00:00 2001
From: Jeremy Wall <Jeremy@marzhillstudios.com>
Date: Mon, 18 Nov 2024 18:22:36 -0500
Subject: [PATCH] wip: ui: edit mode enhancements

---
 examples/test.csv  |   3 ---
 examples/test.xlsx | Bin 0 -> 3891 bytes
 src/book/mod.rs    |   8 ++++++--
 src/ui/mod.rs      |  23 +++++++++++++++--------
 4 files changed, 21 insertions(+), 13 deletions(-)
 delete mode 100644 examples/test.csv
 create mode 100644 examples/test.xlsx

diff --git a/examples/test.csv b/examples/test.csv
deleted file mode 100644
index ca1b615..0000000
--- a/examples/test.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-pi,3^5,"ref(0,0)",-(1/0)
-12%5,"pow(3,5)",0/NaN,"""Apollo"""
-A1+A2,"if(true , sqrt(25),round(if(false,1.1,2.5)))",D2+1969,
diff --git a/examples/test.xlsx b/examples/test.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..714870df7d7ad48210feaa90542dcefbaeaa7275
GIT binary patch
literal 3891
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
TPCtAMd<=ff3=HQ%jaLQ$<OSns

literal 0
HcmV?d00001

diff --git a/src/book/mod.rs b/src/book/mod.rs
index a691930..abf5d75 100644
--- a/src/book/mod.rs
+++ b/src/book/mod.rs
@@ -7,7 +7,7 @@ use ironcalc::{
         worksheet::WorksheetDimension,
         Model,
     },
-    export::save_to_xlsx,
+    export::save_xlsx_to_writer,
     import::load_from_xlsx,
 };
 
@@ -51,7 +51,11 @@ impl Book {
 
     /// Save book to an xlsx file.
     pub fn save_to_xlsx(&self, path: &str) -> Result<()> {
-        save_to_xlsx(&self.model, path)?;
+        // TODO(zaphar): Currently overwrites. Should we prompty in this case?
+        let file_path = std::path::Path::new(path);
+        let file = std::fs::File::create(file_path)?;
+        let writer = std::io::BufWriter::new(file);
+        save_xlsx_to_writer(&self.model, writer)?;
         Ok(())
     }
 
diff --git a/src/ui/mod.rs b/src/ui/mod.rs
index 9044a02..5f01b6c 100644
--- a/src/ui/mod.rs
+++ b/src/ui/mod.rs
@@ -156,14 +156,9 @@ impl<'ws> Workspace<'ws> {
     fn handle_edit_input(&mut self, key: event::KeyEvent) -> Result<Option<ExitCode>> {
         if key.kind == KeyEventKind::Press {
             if let KeyCode::Esc = key.code {
-                self.state.modality = Modality::Navigate;
-                self.text_area.set_cursor_line_style(Style::default());
-                self.text_area.set_cursor_style(Style::default());
-                let contents = self.text_area.lines().join("\n");
-                if self.dirty {
-                    self.book.edit_current_cell(contents)?;
-                }
-                return Ok(None);
+                self.exit_edit_mode()?;
+            } else if let KeyCode::Enter  = key.code {
+                self.exit_edit_mode()?;
             }
         }
         // TODO(zaphar): Some specialized editing keybinds
@@ -176,6 +171,18 @@ impl<'ws> Workspace<'ws> {
         Ok(None)
     }
 
+    fn exit_edit_mode(&mut self) -> Result<(), anyhow::Error> {
+        self.state.modality = Modality::Navigate;
+        self.text_area.set_cursor_line_style(Style::default());
+        self.text_area.set_cursor_style(Style::default());
+        let contents = self.text_area.lines().join("\n");
+        if self.dirty {
+            self.book.edit_current_cell(contents)?;
+            self.book.evaluate();
+        }
+        Ok(())
+    }
+
     fn handle_navigation_input(&mut self, key: event::KeyEvent) -> Result<Option<ExitCode>> {
         if key.kind == KeyEventKind::Press {
             match key.code {