add validation

base/src/actions.rs

@@ -212,6 +212,12 @@ impl Model {
         if column_count <= 0 {
             return Err("Please use insert columns instead".to_string());
         }
+        if column < 1 || column > LAST_COLUMN {
+            return Err(format!("Column number '{}' is not valid.", column));
+        }
+        if column + column_count - 1 > LAST_COLUMN {
+            return Err("Cannot delete columns beyond the last column of the sheet".to_string());
+        }
 
         // first column being deleted
         let column_start = column;
@@ -384,6 +390,13 @@ impl Model {
         if row_count <= 0 {
             return Err("Please use insert rows instead".to_string());
         }
+        if row < 1 || row > LAST_ROW {
+            return Err(format!("Row number '{}' is not valid.", row));
+        }
+        if row + row_count - 1 > LAST_ROW {
+            return Err("Cannot delete rows beyond the last row of the sheet".to_string());
+        }
+
         // Move cells
         let worksheet = &self.workbook.worksheet(sheet)?;
         let mut all_rows: Vec<i32> = worksheet.sheet_data.keys().copied().collect();

base/src/user_model/common.rs

@@ -872,12 +872,13 @@ impl UserModel {
     ///
     /// See also [`Model::insert_rows`].
     pub fn insert_rows(&mut self, sheet: u32, row: i32, row_count: i32) -> Result<(), String> {
+        self.model.insert_rows(sheet, row, row_count)?;
+
         let mut diff_list = Vec::new();
         for _ in 0..row_count {
             diff_list.push(Diff::InsertRow { sheet, row });
         }
         self.push_diff_list(diff_list);
-        self.model.insert_rows(sheet, row, row_count)?;
         self.evaluate_if_not_paused();
         Ok(())
     }
@@ -900,12 +901,13 @@ impl UserModel {
         column: i32,
         column_count: i32,
     ) -> Result<(), String> {
+        self.model.insert_columns(sheet, column, column_count)?;
+
         let mut diff_list = Vec::new();
         for _ in 0..column_count {
             diff_list.push(Diff::InsertColumn { sheet, column });
         }
         self.push_diff_list(diff_list);
-        self.model.insert_columns(sheet, column, column_count)?;
         self.evaluate_if_not_paused();
         Ok(())
     }
@@ -918,16 +920,10 @@ impl UserModel {
     ///
     /// See also [`Model::delete_rows`].
     pub fn delete_rows(&mut self, sheet: u32, row: i32, row_count: i32) -> Result<(), String> {
-        let diff_list = {
         let worksheet = self.model.workbook.worksheet(sheet)?;
         let mut diff_list = Vec::new();
-            // Collect diffs from bottom to top so that `undo` re-inserts rows
+        // Bottom to top order prevents index drift during undo
-            // in the correct order (top to bottom).
         for r in (row..row + row_count).rev() {
-                if !is_valid_row(r) {
-                    return Err(format!("Row number '{r}' is not valid."));
-                }
-
             let mut row_data = None;
             for rd in &worksheet.rows {
                 if rd.r == r {
@@ -948,10 +944,10 @@ impl UserModel {
                 }),
             });
         }
-            diff_list
+
-        };
-        self.push_diff_list(diff_list);
         self.model.delete_rows(sheet, row, row_count)?;
+
+        self.push_diff_list(diff_list);
         self.evaluate_if_not_paused();
         Ok(())
     }
@@ -969,15 +965,10 @@ impl UserModel {
         column: i32,
         column_count: i32,
     ) -> Result<(), String> {
-        let diff_list = {
         let worksheet = self.model.workbook.worksheet(sheet)?;
         let mut diff_list = Vec::new();
-            // Iterate from right-to-left so `undo` restores from left-to-right.
+        // Right to left order prevents index drift during undo
         for c in (column..column + column_count).rev() {
-                if !is_valid_column_number(c) {
-                    return Err(format!("Column number '{c}' is not valid."));
-                }
-
             let mut column_data = None;
             for col in &worksheet.cols {
                 if c >= col.min && c <= col.max {
@@ -1008,10 +999,10 @@ impl UserModel {
                 }),
             });
         }
-            diff_list
+
-        };
-        self.push_diff_list(diff_list);
         self.model.delete_columns(sheet, column, column_count)?;
+
+        self.push_diff_list(diff_list);
         self.evaluate_if_not_paused();
         Ok(())
     }