WIP: Failed attempt to do a solid-js app.

For now...

base/src/actions.rs

@@ -69,26 +69,21 @@ impl Model {
         target_row: i32,
         target_column: i32,
     ) -> Result<(), String> {
-        if let Some(source_cell) = self
+        let source_cell = self
             .workbook
             .worksheet(sheet)?
             .cell(source_row, source_column)
-        {
-            let style = source_cell.get_style();
-            // FIXME: we need some user_input getter instead of get_text
-            let formula_or_value = self
-                .get_cell_formula(sheet, source_row, source_column)?
-                .unwrap_or_else(|| {
-                    source_cell.get_text(&self.workbook.shared_strings, &self.language)
-                });
-            self.set_user_input(sheet, target_row, target_column, formula_or_value);
-            self.workbook
-                .worksheet_mut(sheet)?
-                .set_cell_style(target_row, target_column, style);
-            self.cell_clear_all(sheet, source_row, source_column)?;
-        } else {
-            self.cell_clear_all(sheet, target_row, target_column)?;
-        }
+            .ok_or("Expected Cell to exist")?;
+        let style = source_cell.get_style();
+        // FIXME: we need some user_input getter instead of get_text
+        let formula_or_value = self
+            .get_cell_formula(sheet, source_row, source_column)?
+            .unwrap_or_else(|| source_cell.get_text(&self.workbook.shared_strings, &self.language));
+        self.set_user_input(sheet, target_row, target_column, formula_or_value);
+        self.workbook
+            .worksheet_mut(sheet)?
+            .set_cell_style(target_row, target_column, style);
+        self.cell_clear_all(sheet, source_row, source_column)?;
         Ok(())
     }
 
@@ -111,7 +106,7 @@ impl Model {
             return Err("Cannot add a negative number of cells :)".to_string());
         }
         // check if it is possible:
-        let dimensions = self.workbook.worksheet(sheet)?.get_dimension();
+        let dimensions = self.workbook.worksheet(sheet)?.dimension();
         let last_column = dimensions.max_column + column_count;
         if last_column > LAST_COLUMN {
             return Err(
@@ -268,7 +263,7 @@ impl Model {
             return Err("Cannot add a negative number of cells :)".to_string());
         }
         // Check if it is possible:
-        let dimensions = self.workbook.worksheet(sheet)?.get_dimension();
+        let dimensions = self.workbook.worksheet(sheet)?.dimension();
         let last_row = dimensions.max_row + row_count;
         if last_row > LAST_ROW {
             return Err(
@@ -372,162 +367,13 @@ impl Model {
             }
         }
         self.workbook.worksheets[sheet as usize].rows = new_rows;
-        self.displace_cells(&DisplaceData::Row {
-            sheet,
-            row,
-            delta: -row_count,
-        });
-        Ok(())
-    }
-
-    pub fn delete_cells_and_shift_left(
-        &mut self,
-        sheet: u32,
-        row: i32,
-        column: i32,
-        row_delta: i32,
-        column_delta: i32,
-    ) -> Result<(), String> {
-        let worksheet = &mut self.workbook.worksheet_mut(sheet)?;
-        let max_column = worksheet.get_dimension().max_column;
-
-        // Delete all cells in the range
-        for r in row..row + row_delta {
-            for c in column..column + column_delta {
-                self.cell_clear_all(sheet, r, c)?;
-            }
-        }
-
-        // Move all cells in the range
-        for r in row..row + row_delta {
-            for c in column + 1..max_column + 1 {
-                println!("{r}-{c}");
-                self.move_cell(sheet, r, c, r, c - column_delta)?;
-            }
-        }
-
-        // Update all formulas in the workbook
-        self.displace_cells(&DisplaceData::ShiftCellsRight {
-            sheet,
-            row,
-            column,
-            column_delta: -column_delta,
-            row_delta,
-        });
-
-        Ok(())
-    }
-
-    /// Insert cells and shift right
-    pub fn insert_cells_and_shift_right(
-        &mut self,
-        sheet: u32,
-        row: i32,
-        column: i32,
-        row_delta: i32,
-        column_delta: i32,
-    ) -> Result<(), String> {
-        let worksheet = &mut self.workbook.worksheet_mut(sheet)?;
-        let max_column = worksheet.get_dimension().max_column;
-
-        // Move all cells in the range
-        for r in row..row + row_delta {
-            for c in (column..max_column + 1).rev() {
-                self.move_cell(sheet, r, c, r, c + column_delta)?;
-            }
-        }
-
-        // Delete all cells in the range
-        for r in row..row + row_delta {
-            for c in column..column + column_delta {
-                self.cell_clear_all(sheet, r, c)?;
-            }
-        }
-
-        // Update all formulas in the workbook
-        self.displace_cells(&DisplaceData::ShiftCellsRight {
-            sheet,
-            row,
-            column,
-            column_delta,
-            row_delta,
-        });
-
-        Ok(())
-    }
-
-    /// Insert cells and shift down
-    pub fn insert_cells_and_shift_down(
-        &mut self,
-        sheet: u32,
-        row: i32,
-        column: i32,
-        row_delta: i32,
-        column_delta: i32,
-    ) -> Result<(), String> {
-        let worksheet = &mut self.workbook.worksheet_mut(sheet)?;
-        let max_row = worksheet.get_dimension().max_row;
-
-        // Move all cells in the range
-        for r in (row..row + max_row + 1).rev() {
-            for c in column..column + column_delta {
-                self.move_cell(sheet, r, c, r, c + column_delta)?;
-            }
-        }
-
-        // Delete all cells in the range
-        for r in row..row + row_delta {
-            for c in column..column + column_delta {
-                self.cell_clear_all(sheet, r, c)?;
-            }
-        }
-
-        // Update all formulas in the workbook
-        self.displace_cells(&DisplaceData::ShiftCellsDown {
-            sheet,
-            row,
-            column,
-            column_delta,
-            row_delta,
-        });
-
-        Ok(())
-    }
-
-    pub fn delete_cells_and_shift_up(
-        &mut self,
-        sheet: u32,
-        row: i32,
-        column: i32,
-        row_delta: i32,
-        column_delta: i32,
-    ) -> Result<(), String> {
-        let worksheet = &mut self.workbook.worksheet_mut(sheet)?;
-        let max_row = worksheet.get_dimension().max_row;
-
-        // Delete all cells in the range
-        for r in row..row + row_delta {
-            for c in column..column + column_delta {
-                self.cell_clear_all(sheet, r, c)?;
-            }
-        }
-
-        // Move all cells in the range
-        for r in row..max_row + 1 {
-            for c in column + 1..column + column_delta {
-                self.move_cell(sheet, r, c, r - row_delta, c)?;
-            }
-        }
-
-        // Update all formulas in the workbook
-        self.displace_cells(&DisplaceData::ShiftCellsDown {
-            sheet,
-            row,
-            column,
-            column_delta,
-            row_delta: -row_delta,
-        });
-
+        self.displace_cells(
+            &(DisplaceData::Row {
+                sheet,
+                row,
+                delta: -row_count,
+            }),
+        );
         Ok(())
     }
 

base/src/expressions/lexer/mod.rs

@@ -1,5 +1,3 @@
-#![deny(missing_docs)]
-
 //! A tokenizer for spreadsheet formulas.
 //!
 //! This is meant to feed a formula parser.
@@ -9,10 +7,8 @@
 //! It supports two working modes:
 //!
 //! 1. A1 or display mode
-//!
 //!    This is for user formulas. References are like `D4`, `D$4` or `F5:T10`
 //! 2. R1C1, internal or runtime mode
-//!
 //!    A reference like R1C1 refers to $A$1 and R3C4 to $D$4
 //!    R[2]C[5] refers to a cell two rows below and five columns to the right
 //!    It uses the 'en' locale and language.
@@ -59,8 +55,7 @@ use super::token::{Error, TokenType};
 use super::types::*;
 use super::utils;
 
-/// Returns an iterator over tokens together with their position in the byte string.
-pub mod marked_token;
+pub mod util;
 
 #[cfg(test)]
 mod test;
@@ -68,28 +63,17 @@ mod test;
 mod ranges;
 mod structured_references;
 
-/// This is the TokenType we return if we cannot recognize a token
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub struct LexerError {
-    /// Position of the beginning of the token in the byte string.
     pub position: usize,
-    /// Message describing what we think the error is.
     pub message: String,
 }
 
 pub(super) type Result<T> = std::result::Result<T, LexerError>;
 
-/// Whether we try to parse formulas in A1 mode or in the internal R1C1 mode
 #[derive(Clone, PartialEq, Eq)]
 pub enum LexerMode {
-    /// Cell references are written `=S34`. This is the display mode
     A1,
-    ///    R1C1, internal or runtime mode
-    ///
-    ///    A reference like R1C1 refers to $A$1 and R3C4 to $D$4
-    ///    R[2]C[5] refers to a cell two rows below and five columns to the right
-    ///    It uses the 'en' locale and language.
-    ///    This is used internally at runtime.
     R1C1,
 }
 

base/src/expressions/lexer/test/mod.rs

@@ -1,6 +1,6 @@
 mod test_common;
 mod test_language;
 mod test_locale;
-mod test_marked_token;
 mod test_ranges;
 mod test_tables;
+mod test_util;

base/src/expressions/lexer/test/test_util.rs

@@ -1,5 +1,5 @@
 use crate::expressions::{
-    lexer::marked_token::{get_tokens, MarkedToken},
+    lexer::util::get_tokens,
     token::{OpCompare, OpSum, TokenType},
 };
 
@@ -22,29 +22,6 @@ fn test_get_tokens() {
     assert_eq!(l.end, 10);
 }
 
-#[test]
-fn chinese_characters() {
-    let formula = "\"你好\" & \"世界！\"";
-    let marked_tokens = get_tokens(formula);
-    assert_eq!(marked_tokens.len(), 3);
-    let first_t = MarkedToken {
-        token: TokenType::String("你好".to_string()),
-        start: 0,
-        end: 4,
-    };
-    let second_t = MarkedToken {
-        token: TokenType::And,
-        start: 4,
-        end: 6,
-    };
-    let third_t = MarkedToken {
-        token: TokenType::String("世界！".to_string()),
-        start: 6,
-        end: 12,
-    };
-    assert_eq!(marked_tokens, vec![first_t, second_t, third_t]);
-}
-
 #[test]
 fn test_simple_tokens() {
     assert_eq!(

base/src/expressions/lexer/util.rs

@@ -1,5 +1,3 @@
-#![deny(missing_docs)]
-
 use serde::{Deserialize, Serialize};
 
 use crate::expressions::token;
@@ -11,11 +9,8 @@ use super::{Lexer, LexerMode};
 /// A MarkedToken is a token together with its position on a formula
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
 pub struct MarkedToken {
-    /// Token type (see [token::TokenType])
     pub token: token::TokenType,
-    /// Position of the start of the token (in bytes)
     pub start: i32,
-    /// Position of the end of the token (in bytes)
     pub end: i32,
 }
 
@@ -24,7 +19,7 @@ pub struct MarkedToken {
 /// # Examples
 /// ```
 /// use ironcalc_base::expressions::{
-///      lexer::marked_token::{get_tokens, MarkedToken},
+///      lexer::util::{get_tokens, MarkedToken},
 ///      token::{OpSum, TokenType},
 /// };
 ///

base/src/expressions/mod.rs

@@ -1,3 +1,4 @@
+// public modules
 pub mod lexer;
 pub mod parser;
 pub mod token;

base/src/expressions/parser/mod.rs

@@ -1,29 +1,31 @@
-//! # GRAMMAR
-//!
-//! <pre class="rust">
-//! opComp   => '=' | '<' | '>' | '<=' } '>=' | '<>'
-//! opFactor => '*' | '/'
-//! unaryOp  => '-' | '+'
-//!
-//! expr    => concat (opComp concat)*
-//! concat  => term ('&' term)*
-//! term    => factor (opFactor factor)*
-//! factor  => prod (opProd prod)*
-//! prod    => power ('^' power)*
-//! power   => (unaryOp)* range '%'*
-//! range   => primary (':' primary)?
-//! primary => '(' expr ')'
-//!         => number
-//!         => function '(' f_args ')'
-//!         => name
-//!         => string
-//!         => '{' a_args '}'
-//!         => bool
-//!         => bool()
-//!         => error
-//!
-//! f_args  => e (',' e)*
-//! </pre>
+/*!
+# GRAMAR
+
+<pre class="rust">
+opComp   => '=' | '<' | '>' | '<=' } '>=' | '<>'
+opFactor => '*' | '/'
+unaryOp  => '-' | '+'
+
+expr    => concat (opComp concat)*
+concat  => term ('&' term)*
+term    => factor (opFactor factor)*
+factor  => prod (opProd prod)*
+prod    => power ('^' power)*
+power   => (unaryOp)* range '%'*
+range   => primary (':' primary)?
+primary => '(' expr ')'
+        => number
+        => function '(' f_args ')'
+        => name
+        => string
+        => '{' a_args '}'
+        => bool
+        => bool()
+        => error
+
+f_args  => e (',' e)*
+</pre>
+*/
 
 use std::collections::HashMap;
 
@@ -42,15 +44,21 @@ use super::utils::number_to_column;
 
 use token::OpCompare;
 
-pub(crate) mod move_formula;
-pub(crate) mod walk;
-
-/// Produces a string representation of a formula from the AST.
+pub mod move_formula;
 pub mod stringify;
+pub mod walk;
 
 #[cfg(test)]
 mod test;
 
+#[cfg(test)]
+mod test_ranges;
+
+#[cfg(test)]
+mod test_move_formula;
+#[cfg(test)]
+mod test_tables;
+
 pub(crate) fn parse_range(formula: &str) -> Result<(i32, i32, i32, i32), String> {
     let mut lexer = lexer::Lexer::new(
         formula,

base/src/expressions/parser/stringify.rs

@@ -1,75 +1,43 @@
-#![deny(missing_docs)]
-
 use super::{super::utils::quote_name, Node, Reference};
 use crate::constants::{LAST_COLUMN, LAST_ROW};
 use crate::expressions::token::OpUnary;
 use crate::{expressions::types::CellReferenceRC, number_format::to_excel_precision_str};
 
-/// Displaced data
 pub enum DisplaceData {
-    /// Displaces columns (inserting or deleting columns)
     Column {
-        /// Sheet in which the displace data applies
         sheet: u32,
-        /// Column from which the data is displaced
         column: i32,
-        /// Number of columns displaced (might be negative, e.g. when deleting columns)
         delta: i32,
     },
-    /// Displaces rows (Inserting or deleting rows)
     Row {
-        /// Sheet in which the displace data applies
         sheet: u32,
-        /// Row from which the data is displaced
         row: i32,
-        /// Number of rows displaced (might be negative, e.g. when deleting rows)
         delta: i32,
     },
-    /// Displaces cells horizontally
-    ShiftCellsRight {
-        /// Sheet in which the displace data applies
+    CellHorizontal {
         sheet: u32,
-        /// Row of the to left corner
         row: i32,
-        /// Column of the top left corner
         column: i32,
-        /// Number of rows to be displaced
-        row_delta: i32,
-        /// Number of columns to be displaced (might be negative)
-        column_delta: i32,
+        delta: i32,
     },
-    /// Displaces cells vertically
-    ShiftCellsDown {
-        /// Sheet in which the displace data applies
+    CellVertical {
         sheet: u32,
-        /// Row of the to left corner
         row: i32,
-        /// Column of the top left corner
         column: i32,
-        /// Number of rows displaced (might be negative)
-        row_delta: i32,
-        /// Number of columns to be displaced
-        column_delta: i32,
+        delta: i32,
     },
-    /// Displaces data due to a column move from column to column + delta
     ColumnMove {
-        /// Sheet in which the displace data applies
         sheet: u32,
-        /// Column that is moved
         column: i32,
-        /// The position of the new column is column + delta (might be negative)
         delta: i32,
     },
-    /// Doesn't do any cell displacement
     None,
 }
 
-/// Stringifies the AST formula in its internal R1C1 format
 pub fn to_rc_format(node: &Node) -> String {
     stringify(node, None, &DisplaceData::None, false)
 }
 
-/// Stringifies the formula applying the _displace_data_.
 pub fn to_string_displaced(
     node: &Node,
     context: &CellReferenceRC,
@@ -78,12 +46,10 @@ pub fn to_string_displaced(
     stringify(node, Some(context), displace_data, false)
 }
 
-/// Stringifies a formula from the AST
 pub fn to_string(node: &Node, context: &CellReferenceRC) -> String {
     stringify(node, Some(context), &DisplaceData::None, false)
 }
 
-/// Stringifies the formula for Excel compatibility
 pub fn to_excel_string(node: &Node, context: &CellReferenceRC) -> String {
     stringify(node, Some(context), &DisplaceData::None, true)
 }
@@ -150,49 +116,41 @@ pub(crate) fn stringify_reference(
                         }
                     }
                 }
-                DisplaceData::ShiftCellsRight {
+                DisplaceData::CellHorizontal {
                     sheet,
                     row: displace_row,
                     column: displace_column,
-                    column_delta,
-                    row_delta,
+                    delta,
                 } => {
-                    if sheet_index == *sheet
-                        && displace_row >= &row
-                        && *displace_row < row + *row_delta
-                    {
-                        if *column_delta < 0 {
+                    if sheet_index == *sheet && displace_row == &row {
+                        if *delta < 0 {
                             if &column >= displace_column {
-                                if column < displace_column - *column_delta {
+                                if column < displace_column - *delta {
                                     return "#REF!".to_string();
                                 }
-                                column += *column_delta;
+                                column += *delta;
                             }
                         } else if &column >= displace_column {
-                            column += *column_delta;
+                            column += *delta;
                         }
                     }
                 }
-                DisplaceData::ShiftCellsDown {
+                DisplaceData::CellVertical {
                     sheet,
                     row: displace_row,
                     column: displace_column,
-                    row_delta,
-                    column_delta,
+                    delta,
                 } => {
-                    if sheet_index == *sheet
-                        && displace_column >= &column
-                        && *displace_column < column + *column_delta
-                    {
-                        if *row_delta < 0 {
+                    if sheet_index == *sheet && displace_column == &column {
+                        if *delta < 0 {
                             if &row >= displace_row {
-                                if row < displace_row - *row_delta {
+                                if row < displace_row - *delta {
                                     return "#REF!".to_string();
                                 }
-                                row += *row_delta;
+                                row += *delta;
                             }
                         } else if &row >= displace_row {
-                            row += *row_delta;
+                            row += *delta;
                         }
                     }
                 }

base/src/expressions/parser/test.rs

@@ -1,12 +1,17 @@
 use std::collections::HashMap;
 
 use crate::expressions::lexer::LexerMode;
-use crate::expressions::parser::stringify::{to_string_displaced, DisplaceData};
-use crate::expressions::parser::{
-    stringify::{to_rc_format, to_string},
-    Node, Parser,
+use crate::expressions::parser::stringify::DisplaceData;
+
+use super::super::types::CellReferenceRC;
+use super::Parser;
+use super::{
+    super::parser::{
+        stringify::{to_rc_format, to_string},
+        Node,
+    },
+    stringify::to_string_displaced,
 };
-use crate::expressions::types::CellReferenceRC;
 
 struct Formula<'a> {
     initial: &'a str,

base/src/expressions/parser/test/mod.rs

@@ -1,4 +0,0 @@
-mod test_genertal;
-mod test_move_formula;
-mod test_ranges;
-mod test_tables;

base/src/expressions/parser/test_move_formula.rs

@@ -1,8 +1,10 @@
 use std::collections::HashMap;
 
 use crate::expressions::parser::move_formula::{move_formula, MoveContext};
-use crate::expressions::parser::Parser;
-use crate::expressions::types::{Area, CellReferenceRC};
+use crate::expressions::types::Area;
+
+use super::super::types::CellReferenceRC;
+use super::Parser;
 
 #[test]
 fn test_move_formula() {

base/src/expressions/parser/test_ranges.rs

@@ -2,9 +2,9 @@ use std::collections::HashMap;
 
 use crate::expressions::lexer::LexerMode;
 
-use crate::expressions::parser::stringify::{to_rc_format, to_string};
-use crate::expressions::parser::Parser;
-use crate::expressions::types::CellReferenceRC;
+use super::super::parser::stringify::{to_rc_format, to_string};
+use super::super::types::CellReferenceRC;
+use super::Parser;
 
 struct Formula<'a> {
     formula_a1: &'a str,

base/src/expressions/parser/test_tables.rs

@@ -6,8 +6,8 @@ use crate::expressions::parser::stringify::to_string;
 use crate::expressions::utils::{number_to_column, parse_reference_a1};
 use crate::types::{Table, TableColumn, TableStyleInfo};
 
-use crate::expressions::parser::Parser;
-use crate::expressions::types::CellReferenceRC;
+use super::super::types::CellReferenceRC;
+use super::Parser;
 
 fn create_test_table(
     table_name: &str,

base/src/functions/engineering/complex.rs

@@ -3,7 +3,7 @@ use std::fmt;
 use crate::{
     calc_result::CalcResult,
     expressions::{
-        lexer::marked_token::get_tokens,
+        lexer::util::get_tokens,
         parser::Node,
         token::{Error, OpSum, TokenType},
         types::CellReferenceIndex,

base/src/functions/financial.rs

@@ -221,7 +221,7 @@ impl Model {
                         .workbook
                         .worksheet(left.sheet)
                         .expect("Sheet expected during evaluation.")
-                        .get_dimension()
+                        .dimension()
                         .max_row;
                 }
                 if column1 == 1 && column2 == LAST_COLUMN {
@@ -229,7 +229,7 @@ impl Model {
                         .workbook
                         .worksheet(left.sheet)
                         .expect("Sheet expected during evaluation.")
-                        .get_dimension()
+                        .dimension()
                         .max_column;
                 }
                 for row in row1..row2 + 1 {
@@ -284,7 +284,7 @@ impl Model {
                         .workbook
                         .worksheet(left.sheet)
                         .expect("Sheet expected during evaluation.")
-                        .get_dimension()
+                        .dimension()
                         .max_row;
                 }
                 if column1 == 1 && column2 == LAST_COLUMN {
@@ -292,7 +292,7 @@ impl Model {
                         .workbook
                         .worksheet(left.sheet)
                         .expect("Sheet expected during evaluation.")
-                        .get_dimension()
+                        .dimension()
                         .max_column;
                 }
                 for row in row1..row2 + 1 {
@@ -360,7 +360,7 @@ impl Model {
                         .workbook
                         .worksheet(left.sheet)
                         .expect("Sheet expected during evaluation.")
-                        .get_dimension()
+                        .dimension()
                         .max_row;
                 }
                 if column1 == 1 && column2 == LAST_COLUMN {
@@ -368,7 +368,7 @@ impl Model {
                         .workbook
                         .worksheet(left.sheet)
                         .expect("Sheet expected during evaluation.")
-                        .get_dimension()
+                        .dimension()
                         .max_column;
                 }
                 for row in row1..row2 + 1 {
@@ -866,7 +866,7 @@ impl Model {
                             .workbook
                             .worksheet(left.sheet)
                             .expect("Sheet expected during evaluation.")
-                            .get_dimension()
+                            .dimension()
                             .max_row;
                     }
                     if column1 == 1 && column2 == LAST_COLUMN {
@@ -874,7 +874,7 @@ impl Model {
                             .workbook
                             .worksheet(left.sheet)
                             .expect("Sheet expected during evaluation.")
-                            .get_dimension()
+                            .dimension()
                             .max_column;
                     }
                     for row in row1..row2 + 1 {

base/src/functions/mathematical.rs

@@ -132,7 +132,7 @@ impl Model {
                             .workbook
                             .worksheet(left.sheet)
                             .expect("Sheet expected during evaluation.")
-                            .get_dimension()
+                            .dimension()
                             .max_row;
                     }
                     if column1 == 1 && column2 == LAST_COLUMN {
@@ -140,7 +140,7 @@ impl Model {
                             .workbook
                             .worksheet(left.sheet)
                             .expect("Sheet expected during evaluation.")
-                            .get_dimension()
+                            .dimension()
                             .max_column;
                     }
                     for row in row1..row2 + 1 {
@@ -199,7 +199,7 @@ impl Model {
                             .workbook
                             .worksheet(left.sheet)
                             .expect("Sheet expected during evaluation.")
-                            .get_dimension()
+                            .dimension()
                             .max_row;
                     }
                     if column1 == 1 && column2 == LAST_COLUMN {
@@ -207,7 +207,7 @@ impl Model {
                             .workbook
                             .worksheet(left.sheet)
                             .expect("Sheet expected during evaluation.")
-                            .get_dimension()
+                            .dimension()
                             .max_column;
                     }
                     for row in row1..row2 + 1 {

base/src/functions/statistical.rs

@@ -385,7 +385,7 @@ impl Model {
             .workbook
             .worksheet(first_range.left.sheet)
             .expect("Sheet expected during evaluation.")
-            .get_dimension();
+            .dimension();
         let max_row = dimension.max_row;
         let max_column = dimension.max_column;
 
@@ -530,7 +530,7 @@ impl Model {
                 .workbook
                 .worksheet(sum_range.left.sheet)
                 .expect("Sheet expected during evaluation.")
-                .get_dimension()
+                .dimension()
                 .max_row;
         }
         if left_column == 1 && right_column == LAST_COLUMN {
@@ -538,7 +538,7 @@ impl Model {
                 .workbook
                 .worksheet(sum_range.left.sheet)
                 .expect("Sheet expected during evaluation.")
-                .get_dimension()
+                .dimension()
                 .max_column;
         }
 

base/src/functions/text.rs

@@ -892,7 +892,7 @@ impl Model {
                             .workbook
                             .worksheet(left.sheet)
                             .expect("Sheet expected during evaluation.")
-                            .get_dimension()
+                            .dimension()
                             .max_row;
                     }
                     if column1 == 1 && column2 == LAST_COLUMN {
@@ -900,7 +900,7 @@ impl Model {
                             .workbook
                             .worksheet(left.sheet)
                             .expect("Sheet expected during evaluation.")
-                            .get_dimension()
+                            .dimension()
                             .max_column;
                     }
                     for row in row1..row2 + 1 {

base/src/functions/xlookup.rs

@@ -255,7 +255,7 @@ impl Model {
                                 .workbook
                                 .worksheet(left.sheet)
                                 .expect("Sheet expected during evaluation.")
-                                .get_dimension()
+                                .dimension()
                                 .max_row;
                         }
                         if column1 == 1 && column2 == LAST_COLUMN {
@@ -263,7 +263,7 @@ impl Model {
                                 .workbook
                                 .worksheet(left.sheet)
                                 .expect("Sheet expected during evaluation.")
-                                .get_dimension()
+                                .dimension()
                                 .max_column;
                         }
                         let left = CellReferenceIndex {

base/src/model.rs

@@ -118,6 +118,8 @@ pub struct Model {
     pub(crate) language: Language,
     /// The timezone used to evaluate the model
     pub(crate) tz: Tz,
+    /// The view id. A view consist of a selected sheet and ranges.
+    pub(crate) view_id: u32,
 }
 
 // FIXME: Maybe this should be the same as CellReference
@@ -886,6 +888,7 @@ impl Model {
             language,
             locale,
             tz,
+            view_id: 0,
         };
 
         model.parse_formulas();
@@ -1788,7 +1791,7 @@ impl Model {
     /// Returns markup representation of the given `sheet`.
     pub fn get_sheet_markup(&self, sheet: u32) -> Result<String, String> {
         let worksheet = self.workbook.worksheet(sheet)?;
-        let dimension = worksheet.get_dimension();
+        let dimension = worksheet.dimension();
 
         let mut rows = Vec::new();
 

base/src/new_empty.rs

@@ -15,7 +15,9 @@ use crate::{
     language::get_language,
     locale::get_locale,
     model::{get_milliseconds_since_epoch, Model, ParsedDefinedName},
-    types::{Metadata, Selection, SheetState, Workbook, WorkbookSettings, Worksheet},
+    types::{
+        Metadata, SheetState, Workbook, WorkbookSettings, WorkbookView, Worksheet, WorksheetView,
+    },
     utils::ParsedReference,
 };
 
@@ -35,7 +37,20 @@ fn is_valid_sheet_name(name: &str) -> bool {
 
 impl Model {
     /// Creates a new worksheet. Note that it does not check if the name or the sheet_id exists
-    fn new_empty_worksheet(name: &str, sheet_id: u32) -> Worksheet {
+    fn new_empty_worksheet(name: &str, sheet_id: u32, view_ids: &[&u32]) -> Worksheet {
+        let mut views = HashMap::new();
+        for id in view_ids {
+            views.insert(
+                **id,
+                WorksheetView {
+                    row: 1,
+                    column: 1,
+                    range: [1, 1, 1, 1],
+                    top_row: 1,
+                    left_column: 1,
+                },
+            );
+        }
         Worksheet {
             cols: vec![],
             rows: vec![],
@@ -50,12 +65,7 @@ impl Model {
             color: Default::default(),
             frozen_columns: 0,
             frozen_rows: 0,
-            selection: Selection {
-                is_selected: false,
-                row: 1,
-                column: 1,
-                range: [1, 1, 1, 1],
-            },
+            views,
         }
     }
 
@@ -130,7 +140,7 @@ impl Model {
         self.parsed_defined_names = parsed_defined_names;
     }
 
-    // Reparses all formulas and defined names
+    /// Reparses all formulas and defined names
     pub(crate) fn reset_parsed_structures(&mut self) {
         self.parser
             .set_worksheets(self.workbook.get_worksheet_names());
@@ -161,7 +171,8 @@ impl Model {
         let sheet_name = format!("{}{}", base_name, index);
         // Now we need a sheet_id
         let sheet_id = self.get_new_sheet_id();
-        let worksheet = Model::new_empty_worksheet(&sheet_name, sheet_id);
+        let view_ids: Vec<&u32> = self.workbook.views.keys().collect();
+        let worksheet = Model::new_empty_worksheet(&sheet_name, sheet_id, &view_ids);
         self.workbook.worksheets.push(worksheet);
         self.reset_parsed_structures();
         (sheet_name, self.workbook.worksheets.len() as u32 - 1)
@@ -192,7 +203,8 @@ impl Model {
             Some(id) => id,
             None => self.get_new_sheet_id(),
         };
-        let worksheet = Model::new_empty_worksheet(sheet_name, sheet_id);
+        let view_ids: Vec<&u32> = self.workbook.views.keys().collect();
+        let worksheet = Model::new_empty_worksheet(sheet_name, sheet_id, &view_ids);
         if sheet_index as usize > self.workbook.worksheets.len() {
             return Err("Sheet index out of range".to_string());
         }
@@ -339,11 +351,14 @@ impl Model {
         // "2020-08-06T21:20:53Z
         let now = dt.format("%Y-%m-%dT%H:%M:%SZ").to_string();
 
+        let mut views = HashMap::new();
+        views.insert(0, WorkbookView { sheet: 0 });
+
         // String versions of the locale are added here to simplify the serialize/deserialize logic
         let workbook = Workbook {
             shared_strings: vec![],
             defined_names: vec![],
-            worksheets: vec![Model::new_empty_worksheet("Sheet1", 1)],
+            worksheets: vec![Model::new_empty_worksheet("Sheet1", 1, &[&0])],
             styles: Default::default(),
             name: name.to_string(),
             settings: WorkbookSettings {
@@ -359,6 +374,7 @@ impl Model {
                 last_modified: now,
             },
             tables: HashMap::new(),
+            views,
         };
         let parsed_formulas = Vec::new();
         let worksheets = &workbook.worksheets;
@@ -379,6 +395,7 @@ impl Model {
             locale,
             language,
             tz,
+            view_id: 0,
         };
         model.parse_formulas();
         Ok(model)

base/src/test/engineering/test_complex.rs

@@ -76,10 +76,16 @@ fn fn_imconjugate() {
 fn fn_imcos() {
     let mut model = new_empty_model();
     model._set("A1", r#"=IMCOS("4+3i")"#);
+    // In macos non intel this is "-6.58066304055116+7.58155274274655i"
+    model._set("A2", r#"=COMPLEX(-6.58066304055116, 7.58155274274654)"#);
+    model._set("A3", r#"=IMABS(IMSUB(A1, A2)) < G1"#);
+
+    // small number
+    model._set("G1", "0.0000001");
 
     model.evaluate();
 
-    assert_eq!(model._get_text("A1"), "-6.58066304055116+7.58155274274654i");
+    assert_eq!(model._get_text("A3"), "TRUE");
 }
 
 #[test]

base/src/test/functions/mod.rs

@@ -1,18 +0,0 @@
-mod test_fn_average;
-mod test_fn_averageifs;
-mod test_fn_choose;
-mod test_fn_concatenate;
-mod test_fn_count;
-mod test_fn_exact;
-mod test_fn_financial;
-mod test_fn_if;
-mod test_fn_maxifs;
-mod test_fn_minifs;
-mod test_fn_offset;
-mod test_fn_product;
-mod test_fn_rept;
-mod test_fn_sum;
-mod test_fn_sumifs;
-mod test_fn_textbefore;
-mod test_fn_textjoin;
-mod test_fn_type;

base/src/test/mod.rs

@@ -1,5 +1,3 @@
-mod engineering;
-mod functions;
 mod test_actions;
 mod test_binary_search;
 mod test_cell;
@@ -10,30 +8,50 @@ mod test_criteria;
 mod test_currency;
 mod test_date_and_time;
 mod test_error_propagation;
-mod test_escape_quotes;
-mod test_extend;
+mod test_fn_average;
+mod test_fn_averageifs;
+mod test_fn_choose;
+mod test_fn_concatenate;
+mod test_fn_count;
+mod test_fn_exact;
+mod test_fn_financial;
+mod test_fn_if;
+mod test_fn_maxifs;
+mod test_fn_minifs;
+mod test_fn_product;
+mod test_fn_rept;
+mod test_fn_sum;
+mod test_fn_sumifs;
+mod test_fn_textbefore;
+mod test_fn_textjoin;
 mod test_forward_references;
-mod test_frozen_rows_and_columns;
 mod test_frozen_rows_columns;
 mod test_general;
-mod test_get_cell_content;
 mod test_math;
 mod test_metadata;
 mod test_model_cell_clear_all;
 mod test_model_is_empty_cell;
 mod test_move_formula;
-mod test_number_format;
-mod test_percentage;
 mod test_quote_prefix;
 mod test_set_user_input;
 mod test_sheet_markup;
 mod test_sheets;
-mod test_shift_cells;
 mod test_styles;
-mod test_today;
 mod test_trigonometric;
-mod test_types;
 mod test_workbook;
 mod test_worksheet;
-mod user_model;
 pub(crate) mod util;
+
+mod engineering;
+mod test_fn_offset;
+mod test_number_format;
+
+mod test_escape_quotes;
+mod test_extend;
+mod test_fn_type;
+mod test_frozen_rows_and_columns;
+mod test_get_cell_content;
+mod test_percentage;
+mod test_today;
+mod test_types;
+mod user_model;

base/src/test/test_shift_cells.rs

@@ -1,110 +0,0 @@
-#![allow(clippy::unwrap_used)]
-
-use crate::test::util::new_empty_model;
-
-#[test]
-fn shift_cells_right() {
-    let mut model = new_empty_model();
-    let (sheet, row, column) = (0, 5, 3); // C5
-    model.set_user_input(sheet, row, column, "Hi".to_string());
-    model.set_user_input(sheet, row, column + 1, "world".to_string());
-    model.set_user_input(sheet, row, column + 2, "!".to_string());
-
-    model
-        .insert_cells_and_shift_right(sheet, row, column, 1, 1)
-        .unwrap();
-    model.evaluate();
-
-    assert_eq!(model.get_cell_content(0, 5, 3), Ok("".to_string()));
-    assert_eq!(model.get_cell_content(0, 5, 4), Ok("Hi".to_string()));
-}
-
-#[test]
-fn shift_cells_right_with_formulas() {
-    let mut model = new_empty_model();
-    let (sheet, row, column) = (0, 5, 3); // C5
-    model.set_user_input(sheet, row, column - 1, "23".to_string());
-    model.set_user_input(sheet, row, column, "42".to_string());
-    model.set_user_input(sheet, row, column + 1, "=C5*2".to_string());
-    model.set_user_input(sheet, row, column + 2, "=A5+2".to_string());
-    model.set_user_input(sheet, 20, 3, "=C5*A2".to_string());
-    model.evaluate();
-
-    model
-        .insert_cells_and_shift_right(sheet, row, column, 1, 1)
-        .unwrap();
-
-    model.evaluate();
-    assert_eq!(
-        model.get_cell_content(0, row, column - 1),
-        Ok("23".to_string())
-    );
-    assert_eq!(model.get_cell_content(0, row, column), Ok("".to_string()));
-    assert_eq!(
-        model.get_cell_content(0, row, column + 1),
-        Ok("42".to_string())
-    );
-    assert_eq!(
-        model.get_cell_content(0, row, column + 2),
-        Ok("=D5*2".to_string())
-    );
-    assert_eq!(
-        model.get_cell_content(0, row, column + 3),
-        Ok("=A5+2".to_string())
-    );
-    assert_eq!(model.get_cell_content(0, 20, 3), Ok("=D5*A2".to_string()));
-}
-
-#[test]
-fn shift_cells_left() {
-    let mut model = new_empty_model();
-    let (sheet, row, column) = (0, 5, 10); // J5
-    model.set_user_input(sheet, row, column - 1, "23".to_string());
-    model.set_user_input(sheet, row, column, "42".to_string());
-    model.set_user_input(sheet, row, column + 1, "Hi".to_string());
-    model.set_user_input(sheet, row, column + 2, "honey!".to_string());
-    model.evaluate();
-
-    model
-        .delete_cells_and_shift_left(sheet, row, column, 1, 1)
-        .unwrap();
-
-    model.evaluate();
-    assert_eq!(
-        model.get_cell_content(0, row, column - 1),
-        Ok("23".to_string())
-    );
-
-    assert_eq!(model.get_cell_content(0, row, column), Ok("Hi".to_string()));
-    assert_eq!(
-        model.get_cell_content(0, row, column + 1),
-        Ok("honey!".to_string())
-    );
-}
-
-#[test]
-fn shift_cells_left_with_formulas() {
-    let mut model = new_empty_model();
-    let (sheet, row, column) = (0, 5, 10); // J5
-    model.set_user_input(sheet, row, column - 1, "23".to_string());
-    model.set_user_input(sheet, row, column, "42".to_string());
-    model.set_user_input(sheet, row, column + 1, "33".to_string());
-    model.set_user_input(sheet, row, column + 2, "=K5*A5".to_string());
-
-    model.set_user_input(sheet, row, column + 20, "=K5*A5".to_string());
-    model.evaluate();
-
-    model
-        .delete_cells_and_shift_left(sheet, row, column, 1, 1)
-        .unwrap();
-
-    model.evaluate();
-    assert_eq!(
-        model.get_cell_content(0, row, column + 1),
-        Ok("=J5*A5".to_string())
-    );
-    assert_eq!(
-        model.get_cell_content(0, row, column + 19),
-        Ok("=J5*A5".to_string())
-    );
-}

base/src/test/test_worksheet.rs

@@ -10,7 +10,7 @@ use crate::{
 fn test_worksheet_dimension_empty_sheet() {
     let model = new_empty_model();
     assert_eq!(
-        model.workbook.worksheet(0).unwrap().get_dimension(),
+        model.workbook.worksheet(0).unwrap().dimension(),
         WorksheetDimension {
             min_row: 1,
             min_column: 1,
@@ -25,7 +25,7 @@ fn test_worksheet_dimension_single_cell() {
     let mut model = new_empty_model();
     model._set("W11", "1");
     assert_eq!(
-        model.workbook.worksheet(0).unwrap().get_dimension(),
+        model.workbook.worksheet(0).unwrap().dimension(),
         WorksheetDimension {
             min_row: 11,
             min_column: 23,
@@ -41,7 +41,7 @@ fn test_worksheet_dimension_single_cell_set_empty() {
     model._set("W11", "1");
     model.cell_clear_contents(0, 11, 23).unwrap();
     assert_eq!(
-        model.workbook.worksheet(0).unwrap().get_dimension(),
+        model.workbook.worksheet(0).unwrap().dimension(),
         WorksheetDimension {
             min_row: 11,
             min_column: 23,
@@ -57,7 +57,7 @@ fn test_worksheet_dimension_single_cell_deleted() {
     model._set("W11", "1");
     model.cell_clear_all(0, 11, 23).unwrap();
     assert_eq!(
-        model.workbook.worksheet(0).unwrap().get_dimension(),
+        model.workbook.worksheet(0).unwrap().dimension(),
         WorksheetDimension {
             min_row: 1,
             min_column: 1,
@@ -77,7 +77,7 @@ fn test_worksheet_dimension_multiple_cells() {
     model._set("B19", "1");
     model.cell_clear_all(0, 11, 23).unwrap();
     assert_eq!(
-        model.workbook.worksheet(0).unwrap().get_dimension(),
+        model.workbook.worksheet(0).unwrap().dimension(),
         WorksheetDimension {
             min_row: 11,
             min_column: 2,
@@ -91,7 +91,7 @@ fn test_worksheet_dimension_multiple_cells() {
 fn test_worksheet_dimension_progressive() {
     let mut model = new_empty_model();
     assert_eq!(
-        model.workbook.worksheet(0).unwrap().get_dimension(),
+        model.workbook.worksheet(0).unwrap().dimension(),
         WorksheetDimension {
             min_row: 1,
             min_column: 1,
@@ -102,7 +102,7 @@ fn test_worksheet_dimension_progressive() {
 
     model.set_user_input(0, 30, 50, "Hello World".to_string());
     assert_eq!(
-        model.workbook.worksheet(0).unwrap().get_dimension(),
+        model.workbook.worksheet(0).unwrap().dimension(),
         WorksheetDimension {
             min_row: 30,
             min_column: 50,
@@ -113,7 +113,7 @@ fn test_worksheet_dimension_progressive() {
 
     model.set_user_input(0, 10, 15, "Hello World".to_string());
     assert_eq!(
-        model.workbook.worksheet(0).unwrap().get_dimension(),
+        model.workbook.worksheet(0).unwrap().dimension(),
         WorksheetDimension {
             min_row: 10,
             min_column: 15,
@@ -124,7 +124,7 @@ fn test_worksheet_dimension_progressive() {
 
     model.set_user_input(0, 5, 25, "Hello World".to_string());
     assert_eq!(
-        model.workbook.worksheet(0).unwrap().get_dimension(),
+        model.workbook.worksheet(0).unwrap().dimension(),
         WorksheetDimension {
             min_row: 5,
             min_column: 15,
@@ -135,7 +135,7 @@ fn test_worksheet_dimension_progressive() {
 
     model.set_user_input(0, 10, 250, "Hello World".to_string());
     assert_eq!(
-        model.workbook.worksheet(0).unwrap().get_dimension(),
+        model.workbook.worksheet(0).unwrap().dimension(),
         WorksheetDimension {
             min_row: 5,
             min_column: 15,

base/src/test/user_model/mod.rs

@@ -5,7 +5,7 @@ mod test_evaluation;
 mod test_general;
 mod test_rename_sheet;
 mod test_row_column;
-mod test_shift_cells;
 mod test_styles;
 mod test_to_from_bytes;
 mod test_undo_redo;
+mod test_view;

base/src/test/user_model/test_shift_cells.rs

@@ -1,23 +0,0 @@
-#![allow(clippy::unwrap_used)]
-
-use crate::UserModel;
-
-#[test]
-fn shift_cells_general() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    // some reference value in A1
-    model.set_user_input(0, 1, 1, "42").unwrap();
-
-    // We put some values in row 5
-    model.set_user_input(0, 5, 3, "=1 + 1").unwrap(); // C5
-    model.set_user_input(0, 5, 7, "=C5*A1").unwrap();
-
-    // Insert one cell in C5 and push right
-    model.insert_cells_and_shift_right(0, 5, 3, 1, 1).unwrap();
-
-    // C5 should now be empty
-    assert_eq!(model.get_cell_content(0, 5, 3), Ok("".to_string()));
-
-    // D5 should have 2
-    assert_eq!(model.get_cell_content(0, 5, 4), Ok("=1+1".to_string()));
-}

base/src/test/user_model/test_view.rs

@@ -0,0 +1,216 @@
+#![allow(clippy::unwrap_used)]
+
+use std::collections::HashMap;
+
+use crate::{
+    constants::{LAST_COLUMN, LAST_ROW},
+    test::util::new_empty_model,
+    user_model::SelectedView,
+    UserModel,
+};
+
+#[test]
+fn initial_view() {
+    let model = new_empty_model();
+    let model = UserModel::from_model(model);
+    assert_eq!(model.get_selected_sheet(), 0);
+    assert_eq!(model.get_selected_cell(), (0, 1, 1));
+    assert_eq!(
+        model.get_selected_view(),
+        SelectedView {
+            sheet: 0,
+            row: 1,
+            column: 1,
+            range: [1, 1, 1, 1],
+            top_row: 1,
+            left_column: 1
+        }
+    );
+}
+
+#[test]
+fn set_the_cell_sets_the_range() {
+    let model = new_empty_model();
+    let mut model = UserModel::from_model(model);
+    model.set_selected_cell(5, 4).unwrap();
+    assert_eq!(model.get_selected_sheet(), 0);
+    assert_eq!(model.get_selected_cell(), (0, 5, 4));
+    assert_eq!(
+        model.get_selected_view(),
+        SelectedView {
+            sheet: 0,
+            row: 5,
+            column: 4,
+            range: [5, 4, 5, 4],
+            top_row: 1,
+            left_column: 1
+        }
+    );
+}
+
+#[test]
+fn set_the_range_does_not_set_the_cell() {
+    let model = new_empty_model();
+    let mut model = UserModel::from_model(model);
+    model.set_selected_range(5, 4, 10, 6).unwrap();
+    assert_eq!(model.get_selected_sheet(), 0);
+    assert_eq!(model.get_selected_cell(), (0, 1, 1));
+    assert_eq!(
+        model.get_selected_view(),
+        SelectedView {
+            sheet: 0,
+            row: 1,
+            column: 1,
+            range: [5, 4, 10, 6],
+            top_row: 1,
+            left_column: 1
+        }
+    );
+}
+
+#[test]
+fn add_new_sheet_and_back() {
+    let model = new_empty_model();
+    let mut model = UserModel::from_model(model);
+    model.new_sheet();
+    assert_eq!(model.get_selected_sheet(), 0);
+    model.set_selected_cell(5, 4).unwrap();
+    model.set_selected_sheet(1).unwrap();
+    assert_eq!(model.get_selected_cell(), (1, 1, 1));
+    model.set_selected_sheet(0).unwrap();
+    assert_eq!(model.get_selected_cell(), (0, 5, 4));
+}
+
+#[test]
+fn set_selected_cell_errors() {
+    let model = new_empty_model();
+    let mut model = UserModel::from_model(model);
+    assert_eq!(
+        model.set_selected_cell(-5, 4),
+        Err("Invalid row: '-5'".to_string())
+    );
+    assert_eq!(
+        model.set_selected_cell(5, -4),
+        Err("Invalid column: '-4'".to_string())
+    );
+    assert_eq!(
+        model.set_selected_range(-1, 1, 1, 1),
+        Err("Invalid row: '-1'".to_string())
+    );
+    assert_eq!(
+        model.set_selected_range(1, 0, 1, 1),
+        Err("Invalid column: '0'".to_string())
+    );
+    assert_eq!(
+        model.set_selected_range(1, 1, LAST_ROW + 1, 1),
+        Err("Invalid row: '1048577'".to_string())
+    );
+    assert_eq!(
+        model.set_selected_range(1, 1, 1, LAST_COLUMN + 1),
+        Err("Invalid column: '16385'".to_string())
+    );
+}
+
+#[test]
+fn set_selected_cell_errors_wrong_sheet() {
+    let mut model = new_empty_model();
+    // forcefully set a wrong index
+    model.workbook.views.get_mut(&0).unwrap().sheet = 2;
+    let mut model = UserModel::from_model(model);
+    // It's returning the wrong number
+    assert_eq!(model.get_selected_sheet(), 2);
+
+    // But we can't set the selected cell anymore
+    assert_eq!(
+        model.set_selected_cell(3, 4),
+        Err("Invalid worksheet index 2".to_string())
+    );
+    assert_eq!(
+        model.set_selected_range(3, 4, 5, 6),
+        Err("Invalid worksheet index 2".to_string())
+    );
+
+    assert_eq!(
+        model.set_top_left_visible_cell(3, 4),
+        Err("Invalid worksheet index 2".to_string())
+    );
+
+    // we can fix it by setting the right cell
+    model.set_selected_sheet(0).unwrap();
+    model.set_selected_cell(3, 4).unwrap();
+}
+
+#[test]
+fn set_visible_cell() {
+    let model = new_empty_model();
+    let mut model = UserModel::from_model(model);
+    model.set_top_left_visible_cell(100, 12).unwrap();
+
+    assert_eq!(
+        model.get_selected_view(),
+        SelectedView {
+            sheet: 0,
+            row: 1,
+            column: 1,
+            range: [1, 1, 1, 1],
+            top_row: 100,
+            left_column: 12
+        }
+    );
+
+    let s = serde_json::to_string(&model.get_selected_view()).unwrap();
+    assert_eq!(
+        serde_json::from_str::<SelectedView>(&s).unwrap(),
+        SelectedView {
+            sheet: 0,
+            row: 1,
+            column: 1,
+            range: [1, 1, 1, 1],
+            top_row: 100,
+            left_column: 12
+        }
+    );
+}
+
+#[test]
+fn set_visible_cell_errors() {
+    let model = new_empty_model();
+    let mut model = UserModel::from_model(model);
+    assert_eq!(
+        model.set_top_left_visible_cell(-100, 12),
+        Err("Invalid row: '-100'".to_string())
+    );
+    assert_eq!(
+        model.set_top_left_visible_cell(100, -12),
+        Err("Invalid column: '-12'".to_string())
+    );
+}
+
+#[test]
+fn errors_no_views() {
+    let mut model = new_empty_model();
+    // forcefully remove the view
+    model.workbook.views = HashMap::new();
+    // also in the sheet
+    model.workbook.worksheets[0].views = HashMap::new();
+    let mut model = UserModel::from_model(model);
+    // get methods will return defaults
+    assert_eq!(model.get_selected_sheet(), 0);
+    assert_eq!(model.get_selected_cell(), (0, 1, 1));
+    assert_eq!(
+        model.get_selected_view(),
+        SelectedView {
+            sheet: 0,
+            row: 1,
+            column: 1,
+            range: [1, 1, 1, 1],
+            top_row: 1,
+            left_column: 1
+        }
+    );
+
+    // set methods won't complain. but won't work either
+    model.set_selected_sheet(0).unwrap();
+    model.set_selected_cell(5, 6).unwrap();
+    assert_eq!(model.get_selected_cell(), (0, 1, 1));
+}

base/src/types.rs

@@ -27,6 +27,14 @@ pub struct WorkbookSettings {
     pub tz: String,
     pub locale: String,
 }
+
+/// A Workbook View tracks of the selected sheet for each view
+#[derive(Encode, Decode, Debug, PartialEq, Clone)]
+pub struct WorkbookView {
+    /// The index of the currently selected sheet.
+    pub sheet: u32,
+}
+
 /// An internal representation of an IronCalc Workbook
 #[derive(Encode, Decode, Debug, PartialEq, Clone)]
 pub struct Workbook {
@@ -38,6 +46,7 @@ pub struct Workbook {
     pub settings: WorkbookSettings,
     pub metadata: Metadata,
     pub tables: HashMap<String, Table>,
+    pub views: HashMap<u32, WorkbookView>,
 }
 
 /// A defined name. The `sheet_id` is the sheet index in case the name is local
@@ -48,9 +57,6 @@ pub struct DefinedName {
     pub sheet_id: Option<u32>,
 }
 
-// TODO: Move to worksheet.rs make frozen_rows/columns private and u32
-/// Internal representation of a worksheet Excel object
-
 /// * state:
 ///    18.18.68 ST_SheetState (Sheet Visibility Types)
 ///    hidden, veryHidden, visible
@@ -71,12 +77,21 @@ impl Display for SheetState {
     }
 }
 
+/// Represents the state of the worksheet as seen by the user. This includes
+/// details such as the currently selected cell, the visible range, and the
+/// position of the viewport.
 #[derive(Encode, Decode, Debug, PartialEq, Clone)]
-pub struct Selection {
-    pub is_selected: bool,
+pub struct WorksheetView {
+    /// The row index of the currently selected cell.
     pub row: i32,
+    /// The column index of the currently selected cell.
     pub column: i32,
+    /// The selected range in the worksheet, specified as [start_row, start_column, end_row, end_column].
     pub range: [i32; 4],
+    /// The row index of the topmost visible cell in the worksheet view.
+    pub top_row: i32,
+    /// The column index of the leftmost visible cell in the worksheet view.
+    pub left_column: i32,
 }
 
 /// Internal representation of a worksheet Excel object
@@ -95,7 +110,7 @@ pub struct Worksheet {
     pub comments: Vec<Comment>,
     pub frozen_rows: i32,
     pub frozen_columns: i32,
-    pub selection: Selection,
+    pub views: HashMap<u32, WorksheetView>,
 }
 
 /// Internal representation of Excel's sheet_data

base/src/user_model.rs

@@ -3,6 +3,7 @@
 use std::{collections::HashMap, fmt::Debug};
 
 use bitcode::{Decode, Encode};
+use serde::{Deserialize, Serialize};
 
 use crate::{
     constants,
@@ -18,6 +19,17 @@ use crate::{
     utils::is_valid_hex_color,
 };
 
+#[derive(Serialize, Deserialize)]
+#[cfg_attr(test, derive(PartialEq, Debug))]
+pub struct SelectedView {
+    pub sheet: u32,
+    pub row: i32,
+    pub column: i32,
+    pub range: [i32; 4],
+    pub top_row: i32,
+    pub left_column: i32,
+}
+
 #[derive(Clone, Encode, Decode)]
 struct RowData {
     row: Option<Row>,
@@ -91,36 +103,6 @@ enum Diff {
         column: i32,
         old_data: Box<ColumnData>,
     },
-    InsertCellsShiftRight {
-        sheet: u32,
-        row: i32,
-        column: i32,
-        row_delta: i32,
-        column_delta: i32,
-    },
-    InsertCellsShiftDown {
-        sheet: u32,
-        row: i32,
-        column: i32,
-        row_delta: i32,
-        column_delta: i32,
-    },
-    DeleteCellsShiftLeft {
-        sheet: u32,
-        row: i32,
-        column: i32,
-        row_delta: i32,
-        column_delta: i32,
-        old_data: Vec<Vec<Option<Cell>>>,
-    },
-    DeleteCellsShiftUp {
-        sheet: u32,
-        row: i32,
-        column: i32,
-        row_delta: i32,
-        column_delta: i32,
-        old_data: Vec<Vec<Option<Cell>>>,
-    },
     SetFrozenRowsCount {
         sheet: u32,
         new_value: i32,
@@ -148,6 +130,7 @@ enum Diff {
         old_value: String,
         new_value: String,
     },
+    // FIXME: we are missing SetViewDiffs
 }
 
 type DiffList = Vec<Diff>;
@@ -279,7 +262,7 @@ fn vertical(value: &str) -> Result<VerticalAlignment, String> {
 }
 
 /// # A wrapper around [`Model`] for a spreadsheet end user.
-/// UserModel is a wrapper around Model with undo/redo history, _diffs_ and automatic evaluation.
+/// UserModel is a wrapper around Model with undo/redo history, _diffs_, automatic evaluation and view management.
 ///
 /// A diff in this context (or more correctly a _user diff_) is a change created by a user.
 ///
@@ -743,123 +726,6 @@ impl UserModel {
         self.model.delete_columns(sheet, column, 1)
     }
 
-    /// Insert cells in the area pushing the existing ones to the right
-    ///
-    /// See also:
-    /// * [Model::insert_cells_and_shift_right]
-    pub fn insert_cells_and_shift_right(
-        &mut self,
-        sheet: u32,
-        row: i32,
-        column: i32,
-        row_delta: i32,
-        column_delta: i32,
-    ) -> Result<(), String> {
-        let diff_list = vec![Diff::InsertCellsShiftRight {
-            sheet,
-            row,
-            column,
-            row_delta,
-            column_delta,
-        }];
-        self.push_diff_list(diff_list);
-        self.model
-            .insert_cells_and_shift_right(sheet, row, column, row_delta, column_delta)?;
-        self.model.evaluate();
-        Ok(())
-    }
-
-    /// Insert cells in the area pushing the existing ones down
-    pub fn insert_cells_and_shift_down(
-        &mut self,
-        sheet: u32,
-        row: i32,
-        column: i32,
-        row_delta: i32,
-        column_delta: i32,
-    ) -> Result<(), String> {
-        let diff_list = vec![Diff::InsertCellsShiftDown {
-            sheet,
-            row,
-            column,
-            row_delta,
-            column_delta,
-        }];
-        self.push_diff_list(diff_list);
-        self.model
-            .insert_cells_and_shift_down(sheet, row, column, row_delta, column_delta)?;
-        self.model.evaluate();
-        Ok(())
-    }
-
-    /// Delete cells in the specified area and then shift cells left to fill the gap.
-    pub fn delete_cells_and_shift_left(
-        &mut self,
-        sheet: u32,
-        row: i32,
-        column: i32,
-        row_delta: i32,
-        column_delta: i32,
-    ) -> Result<(), String> {
-        let mut old_data = Vec::new();
-        let worksheet = self.model.workbook.worksheet(sheet)?;
-        for r in row..row + row_delta {
-            let mut row_data = Vec::new();
-            for c in column..column + column_delta {
-                let cell = worksheet.cell(r, c);
-                row_data.push(cell.cloned());
-            }
-            old_data.push(row_data);
-        }
-        let diff_list = vec![Diff::DeleteCellsShiftLeft {
-            sheet,
-            row,
-            column,
-            row_delta,
-            column_delta,
-            old_data,
-        }];
-        self.push_diff_list(diff_list);
-        self.model
-            .delete_cells_and_shift_left(sheet, row, column, row_delta, column_delta)?;
-        self.model.evaluate();
-        Ok(())
-    }
-
-    /// Delete cells in the specified area and then shift cells upward to fill the gap.
-    pub fn delete_cells_and_shift_up(
-        &mut self,
-        sheet: u32,
-        row: i32,
-        column: i32,
-        row_delta: i32,
-        column_delta: i32,
-    ) -> Result<(), String> {
-        let mut old_data = Vec::new();
-        let worksheet = self.model.workbook.worksheet(sheet)?;
-        for r in row..row + row_delta {
-            let mut row_data = Vec::new();
-            for c in column..column + column_delta {
-                let cell = worksheet.cell(r, c);
-                row_data.push(cell.cloned());
-            }
-            old_data.push(row_data);
-        }
-        let diff_list = vec![Diff::DeleteCellsShiftUp {
-            sheet,
-            row,
-            column,
-            row_delta,
-            column_delta,
-            old_data,
-        }];
-        self.push_diff_list(diff_list);
-        self.model
-            .delete_cells_and_shift_up(sheet, row, column, row_delta, column_delta)?;
-        self.model.evaluate();
-        Ok(())
-    }
-
     /// Sets the width of a column
     ///
     /// See also:
@@ -1082,6 +948,165 @@ impl UserModel {
         self.model.get_worksheets_properties()
     }
 
+    /// Returns the selected sheet index
+    pub fn get_selected_sheet(&self) -> u32 {
+        if let Some(view) = self.model.workbook.views.get(&self.model.view_id) {
+            view.sheet
+        } else {
+            0
+        }
+    }
+
+    /// Returns the selected cell
+    pub fn get_selected_cell(&self) -> (u32, i32, i32) {
+        let sheet = if let Some(view) = self.model.workbook.views.get(&self.model.view_id) {
+            view.sheet
+        } else {
+            0
+        };
+        if let Ok(worksheet) = self.model.workbook.worksheet(sheet) {
+            if let Some(view) = worksheet.views.get(&self.model.view_id) {
+                return (sheet, view.row, view.column);
+            }
+        }
+        // return a safe default
+        (0, 1, 1)
+    }
+
+    /// Returns selected view
+    pub fn get_selected_view(&self) -> SelectedView {
+        let sheet = if let Some(view) = self.model.workbook.views.get(&self.model.view_id) {
+            view.sheet
+        } else {
+            0
+        };
+        if let Ok(worksheet) = self.model.workbook.worksheet(sheet) {
+            if let Some(view) = worksheet.views.get(&self.model.view_id) {
+                return SelectedView {
+                    sheet,
+                    row: view.row,
+                    column: view.column,
+                    range: view.range,
+                    top_row: view.top_row,
+                    left_column: view.left_column,
+                };
+            }
+        }
+        // return a safe default
+        SelectedView {
+            sheet: 0,
+            row: 1,
+            column: 1,
+            range: [1, 1, 1, 1],
+            top_row: 1,
+            left_column: 1,
+        }
+    }
+
+    /// Sets the the selected sheet
+    pub fn set_selected_sheet(&mut self, sheet: u32) -> Result<(), String> {
+        if self.model.workbook.worksheet(sheet).is_err() {
+            return Err(format!("Invalid worksheet index {}", sheet));
+        }
+        if let Some(view) = self.model.workbook.views.get_mut(&0) {
+            view.sheet = sheet;
+        }
+        Ok(())
+    }
+
+    /// Sets the selected cell
+    pub fn set_selected_cell(&mut self, row: i32, column: i32) -> Result<(), String> {
+        let sheet = if let Some(view) = self.model.workbook.views.get(&self.model.view_id) {
+            view.sheet
+        } else {
+            0
+        };
+        if !is_valid_column_number(column) {
+            return Err(format!("Invalid column: '{column}'"));
+        }
+        if !is_valid_column_number(row) {
+            return Err(format!("Invalid row: '{row}'"));
+        }
+        if self.model.workbook.worksheet(sheet).is_err() {
+            return Err(format!("Invalid worksheet index {}", sheet));
+        }
+        if let Ok(worksheet) = self.model.workbook.worksheet_mut(sheet) {
+            if let Some(view) = worksheet.views.get_mut(&0) {
+                view.row = row;
+                view.column = column;
+                view.range = [row, column, row, column];
+            }
+        }
+        Ok(())
+    }
+
+    /// Sets the selected range
+    pub fn set_selected_range(
+        &mut self,
+        start_row: i32,
+        start_column: i32,
+        end_row: i32,
+        end_column: i32,
+    ) -> Result<(), String> {
+        let sheet = if let Some(view) = self.model.workbook.views.get(&self.model.view_id) {
+            view.sheet
+        } else {
+            0
+        };
+
+        if !is_valid_column_number(start_column) {
+            return Err(format!("Invalid column: '{start_column}'"));
+        }
+        if !is_valid_column_number(start_row) {
+            return Err(format!("Invalid row: '{start_row}'"));
+        }
+
+        if !is_valid_column_number(end_column) {
+            return Err(format!("Invalid column: '{end_column}'"));
+        }
+        if !is_valid_column_number(end_row) {
+            return Err(format!("Invalid row: '{end_row}'"));
+        }
+        if self.model.workbook.worksheet(sheet).is_err() {
+            return Err(format!("Invalid worksheet index {}", sheet));
+        }
+        if let Ok(worksheet) = self.model.workbook.worksheet_mut(sheet) {
+            if let Some(view) = worksheet.views.get_mut(&0) {
+                view.range = [start_row, start_column, end_row, end_column];
+            }
+        }
+        Ok(())
+    }
+
+    /// Sets the value of the first visible cell
+    pub fn set_top_left_visible_cell(
+        &mut self,
+        top_row: i32,
+        left_column: i32,
+    ) -> Result<(), String> {
+        let sheet = if let Some(view) = self.model.workbook.views.get(&self.model.view_id) {
+            view.sheet
+        } else {
+            0
+        };
+
+        if !is_valid_column_number(left_column) {
+            return Err(format!("Invalid column: '{left_column}'"));
+        }
+        if !is_valid_column_number(top_row) {
+            return Err(format!("Invalid row: '{top_row}'"));
+        }
+        if self.model.workbook.worksheet(sheet).is_err() {
+            return Err(format!("Invalid worksheet index {}", sheet));
+        }
+        if let Ok(worksheet) = self.model.workbook.worksheet_mut(sheet) {
+            if let Some(view) = worksheet.views.get_mut(&0) {
+                view.top_row = top_row;
+                view.left_column = left_column;
+            }
+        }
+        Ok(())
+    }
     // **** Private methods ****** //
 
     fn push_diff_list(&mut self, diff_list: DiffList) {
@@ -1245,94 +1270,6 @@ impl UserModel {
                 } => {
                     self.model.set_sheet_color(*index, old_value)?;
                 }
-                Diff::InsertCellsShiftRight {
-                    sheet,
-                    row,
-                    column,
-                    row_delta,
-                    column_delta,
-                } => {
-                    needs_evaluation = true;
-                    self.model.delete_cells_and_shift_left(
-                        *sheet,
-                        *row,
-                        *column,
-                        *row_delta,
-                        *column_delta,
-                    )?;
-                }
-                Diff::InsertCellsShiftDown {
-                    sheet,
-                    row,
-                    column,
-                    row_delta,
-                    column_delta,
-                } => {
-                    needs_evaluation = true;
-                    self.model.delete_cells_and_shift_up(
-                        *sheet,
-                        *row,
-                        *column,
-                        *row_delta,
-                        *column_delta,
-                    )?;
-                }
-                Diff::DeleteCellsShiftLeft {
-                    sheet,
-                    row,
-                    column,
-                    row_delta,
-                    column_delta,
-                    old_data,
-                } => {
-                    needs_evaluation = true;
-                    // Sets old data
-                    let worksheet = self.model.workbook.worksheet_mut(*sheet)?;
-                    for r in *row..*row + *row_delta {
-                        for c in *column..*column + *column_delta {
-                            if let Some(cell) = &old_data[r as usize][c as usize] {
-                                worksheet.update_cell(r, c, cell.clone());
-                            } else {
-                                worksheet.cell_clear_contents(r, c);
-                            }
-                        }
-                    }
-                    self.model.insert_cells_and_shift_right(
-                        *sheet,
-                        *row,
-                        *column,
-                        *row_delta,
-                        *column_delta,
-                    )?;
-                }
-                Diff::DeleteCellsShiftUp {
-                    sheet,
-                    row,
-                    column,
-                    row_delta,
-                    column_delta,
-                    old_data,
-                } => {
-                    needs_evaluation = true;
-                    // Sets old data
-                    let worksheet = self.model.workbook.worksheet_mut(*sheet)?;
-                    for r in *row..*row + *row_delta {
-                        for c in *column..*column + *column_delta {
-                            if let Some(cell) = &old_data[r as usize][c as usize] {
-                                worksheet.update_cell(r, c, cell.clone());
-                            } else {
-                                worksheet.cell_clear_contents(r, c);
-                            }
-                        }
-                    }
-                    self.model.insert_cells_and_shift_down(
-                        *sheet,
-                        *row,
-                        *column,
-                        *row_delta,
-                        *column_delta,
-                    )?;
-                }
             }
         }
         if needs_evaluation {
@@ -1453,72 +1390,6 @@ impl UserModel {
                 } => {
                     self.model.set_sheet_color(*index, new_value)?;
                 }
-                Diff::InsertCellsShiftRight {
-                    sheet,
-                    row,
-                    column,
-                    row_delta,
-                    column_delta,
-                } => {
-                    self.model.insert_cells_and_shift_right(
-                        *sheet,
-                        *row,
-                        *column,
-                        *row_delta,
-                        *column_delta,
-                    )?;
-                    needs_evaluation = true;
-                }
-                Diff::InsertCellsShiftDown {
-                    sheet,
-                    row,
-                    column,
-                    row_delta,
-                    column_delta,
-                } => {
-                    self.model.insert_cells_and_shift_down(
-                        *sheet,
-                        *row,
-                        *column,
-                        *row_delta,
-                        *column_delta,
-                    )?;
-                    needs_evaluation = true;
-                }
-                Diff::DeleteCellsShiftLeft {
-                    sheet,
-                    row,
-                    column,
-                    row_delta,
-                    column_delta,
-                    old_data: _,
-                } => {
-                    self.model.delete_cells_and_shift_left(
-                        *sheet,
-                        *row,
-                        *column,
-                        *row_delta,
-                        *column_delta,
-                    )?;
-                    needs_evaluation = true;
-                }
-                Diff::DeleteCellsShiftUp {
-                    sheet,
-                    row,
-                    column,
-                    row_delta,
-                    column_delta,
-                    old_data: _,
-                } => {
-                    self.model.delete_cells_and_shift_up(
-                        *sheet,
-                        *row,
-                        *column,
-                        *row_delta,
-                        *column_delta,
-                    )?;
-                    needs_evaluation = true;
-                }
             }
         }
 

base/src/worksheet.rs

@@ -394,7 +394,7 @@ impl Worksheet {
     }
 
     /// Calculates dimension of the sheet. This function isn't cheap to calculate.
-    pub fn get_dimension(&self) -> WorksheetDimension {
+    pub fn dimension(&self) -> WorksheetDimension {
         // FIXME: It's probably better to just track the size as operations happen.
         if self.sheet_data.is_empty() {
             return WorksheetDimension {

bindings/wasm/src/lib.rs

@@ -4,7 +4,7 @@ use wasm_bindgen::{
 };
 
 use ironcalc_base::{
-    expressions::{lexer::marked_token::get_tokens as tokenizer, types::Area},
+    expressions::{lexer::util::get_tokens as tokenizer, types::Area},
     types::CellType,
     UserModel as BaseModel,
 };
@@ -286,4 +286,56 @@ impl Model {
     pub fn get_worksheets_properties(&self) -> JsValue {
         serde_wasm_bindgen::to_value(&self.model.get_worksheets_properties()).unwrap()
     }
+
+    #[wasm_bindgen(js_name = "getSelectedSheet")]
+    pub fn get_selected_sheet(&self) -> u32 {
+        self.model.get_selected_sheet()
+    }
+
+    #[wasm_bindgen(js_name = "getSelectedCell")]
+    pub fn get_selected_cell(&self) -> Vec<i32> {
+        let (sheet, row, column) = self.model.get_selected_cell();
+        vec![sheet as i32, row, column]
+    }
+
+    #[wasm_bindgen(js_name = "getSelectedView")]
+    pub fn get_selected_view(&self) -> JsValue {
+        serde_wasm_bindgen::to_value(&self.model.get_selected_view()).unwrap()
+    }
+
+    #[wasm_bindgen(js_name = "setSelectedSheet")]
+    pub fn set_selected_sheet(&mut self, sheet: u32) -> Result<(), JsError> {
+        self.model.set_selected_sheet(sheet).map_err(to_js_error)
+    }
+
+    #[wasm_bindgen(js_name = "setSelectedCell")]
+    pub fn set_selected_cell(&mut self, row: i32, column: i32) -> Result<(), JsError> {
+        self.model
+            .set_selected_cell(row, column)
+            .map_err(to_js_error)
+    }
+
+    #[wasm_bindgen(js_name = "setSelectedRange")]
+    pub fn set_selected_range(
+        &mut self,
+        start_row: i32,
+        start_column: i32,
+        end_row: i32,
+        end_column: i32,
+    ) -> Result<(), JsError> {
+        self.model
+            .set_selected_range(start_row, start_column, end_row, end_column)
+            .map_err(to_js_error)
+    }
+
+    #[wasm_bindgen(js_name = "setTopLeftVisibleCell")]
+    pub fn set_top_left_visible_cell(
+        &mut self,
+        top_row: i32,
+        top_column: i32,
+    ) -> Result<(), JsError> {
+        self.model
+            .set_top_left_visible_cell(top_row, top_column)
+            .map_err(to_js_error)
+    }
 }

solidjs_app/.gitignore

@@ -0,0 +1,2 @@
+node_modules/*
+dist/*

solidjs_app/.storybook/main.ts

@@ -0,0 +1,19 @@
+import type { StorybookConfig } from "storybook-solidjs-vite";
+
+const config: StorybookConfig = {
+  stories: ["../src/**/*.mdx", "../src/**/*.stories.@(js|jsx|mjs|ts|tsx)"],
+  addons: [
+    "@storybook/addon-links",
+    "@storybook/addon-essentials",
+    "@chromatic-com/storybook",
+    "@storybook/addon-interactions",
+  ],
+  framework: {
+    name: "storybook-solidjs-vite",
+    options: {},
+  },
+  docs: {
+    autodocs: "tag",
+  },
+};
+export default config;

solidjs_app/.storybook/preview.ts

@@ -0,0 +1,12 @@
+const preview: Preview = {
+  parameters: {
+    controls: {
+      matchers: {
+        color: /(background|color)$/i,
+        date: /Date$/i,
+      },
+    },
+  },
+};
+
+export default preview;

solidjs_app/Makefile

@@ -0,0 +1,8 @@
+
+lint:
+	pnpm biome lint *   
+
+format:
+	pnpm biome format * 
+build:
+	pnpm run build

solidjs_app/README.md

@@ -0,0 +1,70 @@
+# Web IronCalc
+
+## Widgets
+
+Toolbar
+NavigationBar
+FormulaBar
+ColorPicker
+Number Formatter
+Border Picker
+
+
+## Stack
+
+Vite
+TypeScript
+SolidJs
+Lucide Icons
+BiomeJs
+Storybook
+pnpm
+
+## Recreate
+
+Install nodejs
+Activate pnpm
+    corepack enable pnpm
+Create app    
+    pnpm create vite
+    pnpm install
+add biomejs
+    pnpm add --save-dev --save-exact @biomejs/biome
+    pnpm biome init
+add solidjs
+add storybook
+    pnpm dlx storybook@latest init
+add i18n
+    pnpm add @solid-primitives/i18n
+(https://github.com/jfgodoy/vite-plugin-solid-svg)
+add vite-plugin-solid-svg
+add script: "restore": "cp node_modules/@ironcalc/wasm/wasm_bg.wasm node_modules/.vite/deps/",
+
+
+
+## Usage
+
+```bash
+$ pnpm install # or npm install or yarn install
+```
+
+## Available Scripts
+
+In the project directory, you can run:
+
+### `pnpm run dev`
+
+Runs the app in the development mode.<br>
+Open [http://localhost:5173](http://localhost:5173) to view it in the browser.
+
+### `pnpm run build`
+
+Builds the app for production to the `dist` folder.<br>
+It correctly bundles Solid in production mode and optimizes the build for the best performance.
+
+The build is minified and the filenames include the hashes.<br>
+Your app is ready to be deployed!
+
+## Deployment
+
+Learn more about deploying your application with the [documentations](https://vitejs.dev/guide/static-deploy.html)

solidjs_app/biome.json

@@ -0,0 +1,15 @@
+{
+  "$schema": "https://biomejs.dev/schemas/1.7.0/schema.json",
+  "organizeImports": {
+    "enabled": true
+  },
+  "linter": {
+    "enabled": true,
+    "rules": {
+      "recommended": true
+    }
+  },
+  "formatter": {
+    "indentStyle": "space"
+  }
+}

solidjs_app/index.html

@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/ironcalc_icon.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Vite + Solid + TS</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/src/index.tsx"></script>
+  </body>
+</html>

solidjs_app/package.json

@@ -0,0 +1,35 @@
+{
+  "name": "app",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "restore": "cp node_modules/@ironcalc/wasm/wasm_bg.wasm node_modules/.vite/deps/",
+    "dev": "vite",
+    "build": "tsc && vite build",
+    "preview": "vite preview",
+    "storybook": "storybook dev -p 6006",
+    "build-storybook": "storybook build"
+  },
+  "dependencies": {
+    "@ironcalc/wasm": "file:../bindings/wasm/pkg",
+    "@solid-primitives/i18n": "^2.1.1",
+    "lucide-solid": "^0.379.0",
+    "solid-js": "^1.8.15"
+  },
+  "devDependencies": {
+    "@biomejs/biome": "1.7.0",
+    "@chromatic-com/storybook": "^1.3.3",
+    "@storybook/addon-essentials": "^8.0.8",
+    "@storybook/addon-interactions": "^8.0.8",
+    "@storybook/addon-links": "^8.0.8",
+    "@storybook/blocks": "^8.0.8",
+    "storybook": "^8.0.8",
+    "storybook-solidjs": "^1.0.0-beta.2",
+    "storybook-solidjs-vite": "^1.0.0-beta.2",
+    "typescript": "^5.2.2",
+    "vite": "^5.2.0",
+    "vite-plugin-solid": "^2.10.2",
+    "vite-plugin-solid-svg": "^0.8.1"
+  }
+}

solidjs_app/public/ironcalc_icon.svg

@@ -0,0 +1,8 @@
+<svg width="600" height="600" viewBox="0 0 600 600" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="600" height="600" rx="20" fill="#F2994A"/>
+<path opacity="0.8" fill-rule="evenodd" clip-rule="evenodd" d="M348.98 100C348.98 166.034 322.748 229.362 276.055 276.055C268.163 283.947 259.796 291.255 251.021 297.95L251.021 500L348.98 500H251.021C251.021 433.966 277.252 370.637 323.945 323.945C331.837 316.053 340.204 308.745 348.98 302.05L348.98 100Z" fill="white"/>
+<path opacity="0.8" fill-rule="evenodd" clip-rule="evenodd" d="M251.021 100.068C251.003 140.096 235.094 178.481 206.788 206.787C178.466 235.109 140.053 251.02 100 251.02V348.979C154.873 348.979 207.877 330.866 251.021 297.95V100.068Z" fill="white"/>
+<path opacity="0.8" fill-rule="evenodd" clip-rule="evenodd" d="M348.98 499.882C349.011 459.872 364.918 421.507 393.213 393.213C421.534 364.891 459.947 348.98 500 348.98V251.02C445.128 251.02 392.123 269.134 348.98 302.05V499.882Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M276.055 276.055C322.748 229.362 348.98 166.034 348.98 100H251.021V297.95C259.796 291.255 268.163 283.947 276.055 276.055Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M348.98 302.05V499.895C348.98 499.93 348.98 499.965 348.98 500L251.021 500C251.021 499.946 251.02 499.891 251.021 499.837C251.064 433.862 277.291 370.599 323.945 323.945C331.837 316.053 340.204 308.745 348.98 302.05Z" fill="white"/>
+</svg>

solidjs_app/src/App.css

@@ -0,0 +1,7 @@
+#root {
+  max-width: 1280px;
+  margin: 0 auto;
+  padding: 2rem;
+  text-align: center;
+}
+

solidjs_app/src/App.tsx

@@ -0,0 +1,29 @@
+import { Show, createResource } from "solid-js";
+// import "./App.css";
+// import solidLogo from "./assets/solid.svg";
+
+import init, { Model } from "@ironcalc/wasm";
+import Workbook from "./components/Workbook";
+
+const fetchModel = async () => {
+  await init();
+  // const model_bytes = new Uint8Array(
+  //     await (await fetch("./example.ic")).arrayBuffer(),
+  //   );
+  //   const _model = Model.from_bytes(model_bytes);*/
+  const model = new Model("en", "UTC");
+  model.setUserInput(0, 1, 1, "=1+1");
+  return model;
+};
+
+function App() {
+  const [model] = createResource(fetchModel);
+
+  return (
+    <Show when={model()} fallback={<div>Loading...</div>}>
+      {(model) => <Workbook model={model()} />}
+    </Show>
+  );
+}
+
+export default App;

solidjs_app/src/assets/ironcalc_icon.svg

@@ -0,0 +1,8 @@
+<svg width="600" height="600" viewBox="0 0 600 600" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="600" height="600" rx="20" fill="#F2994A"/>
+<path opacity="0.8" fill-rule="evenodd" clip-rule="evenodd" d="M348.98 100C348.98 166.034 322.748 229.362 276.055 276.055C268.163 283.947 259.796 291.255 251.021 297.95L251.021 500L348.98 500H251.021C251.021 433.966 277.252 370.637 323.945 323.945C331.837 316.053 340.204 308.745 348.98 302.05L348.98 100Z" fill="white"/>
+<path opacity="0.8" fill-rule="evenodd" clip-rule="evenodd" d="M251.021 100.068C251.003 140.096 235.094 178.481 206.788 206.787C178.466 235.109 140.053 251.02 100 251.02V348.979C154.873 348.979 207.877 330.866 251.021 297.95V100.068Z" fill="white"/>
+<path opacity="0.8" fill-rule="evenodd" clip-rule="evenodd" d="M348.98 499.882C349.011 459.872 364.918 421.507 393.213 393.213C421.534 364.891 459.947 348.98 500 348.98V251.02C445.128 251.02 392.123 269.134 348.98 302.05V499.882Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M276.055 276.055C322.748 229.362 348.98 166.034 348.98 100H251.021V297.95C259.796 291.255 268.163 283.947 276.055 276.055Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M348.98 302.05V499.895C348.98 499.93 348.98 499.965 348.98 500L251.021 500C251.021 499.946 251.02 499.891 251.021 499.837C251.064 433.862 277.291 370.599 323.945 323.945C331.837 316.053 340.204 308.745 348.98 302.05Z" fill="white"/>
+</svg>

solidjs_app/src/components/Workbook.tsx

@@ -0,0 +1,23 @@
+import type { Model } from "@ironcalc/wasm";
+import styles from "./workbook.module.css";
+import Toolbar from "./toolbar/Toolbar";
+import Navigation from "./navigation/Navigation";
+import FormulaBar from "./formulabar/FormulaBar";
+import Worksheet from "./Worksheet/Worksheet";
+
+function Workbook(props: { model: Model }) {
+  const onkeydown = (event: KeyboardEvent) => {
+    console.log("key pressed: ", event);
+  };
+  return (
+    <div class={styles.workbook} onkeydown={onkeydown} tabIndex={0}>
+      <Toolbar></Toolbar>
+      {/* {props.model.getFormattedCellValue(0, 1, 1)} */}
+      <FormulaBar></FormulaBar>
+      <Worksheet></Worksheet>
+      <Navigation></Navigation>
+    </div>
+  );
+}
+
+export default Workbook;

solidjs_app/src/components/Worksheet/Worksheet.tsx

@@ -0,0 +1,14 @@
+import styles from "./worksheet.module.css";
+
+function Worksheet() {
+  const onkeydown = (event: KeyboardEvent) => {
+    console.log("key pressed: ", event);
+  };
+  return (
+    <div class={styles.worksheet} onkeydown={onkeydown} tabIndex={0}>
+
+    </div>
+  );
+}
+
+export default Worksheet;

solidjs_app/src/components/formulabar/FormulaBar.tsx

@@ -0,0 +1,14 @@
+import styles from "./formulabar.module.css";
+
+function FormulaBar() {
+  const onkeydown = (event: KeyboardEvent) => {
+    console.log("key pressed: ", event);
+  };
+  return (
+    <div class={styles.toolbar} onkeydown={onkeydown} tabIndex={0}>
+
+    </div>
+  );
+}
+
+export default FormulaBar;

solidjs_app/src/components/navigation/Navigation.tsx

@@ -0,0 +1,14 @@
+import styles from "./navigation.module.css";
+
+function Navigation() {
+  const onkeydown = (event: KeyboardEvent) => {
+    console.log("key pressed: ", event);
+  };
+  return (
+    <div class={styles.navigation} onkeydown={onkeydown} tabIndex={0}>
+
+    </div>
+  );
+}
+
+export default Navigation;

solidjs_app/src/components/toolbar/Toolbar.tsx

@@ -0,0 +1,299 @@
+import { JSX } from "solid-js/jsx-runtime";
+import styles from "./toolbar.module.css";
+import {
+  AlignCenter,
+  AlignLeft,
+  AlignRight,
+  ArrowDownToLine,
+  ArrowUpToLine,
+  Bold,
+  ChevronDown,
+  Euro,
+  Grid2X2,
+  Italic,
+  Paintbrush2,
+  PaintBucket,
+  Percent,
+  Redo2,
+  Strikethrough,
+  Type,
+  Underline,
+  Undo2,
+} from "lucide-solid";
+import { DecimalPlacesDecreaseIcon, DecimalPlacesIncreaseIcon, ArrowMiddleFromLine } from "../../icons";
+
+function Toolbar() {
+  const onkeydown = (event: KeyboardEvent) => {
+    console.log("key pressed: ", event);
+  };
+
+  const t = (s: string): string => s;
+
+  const properties = {
+    onUndo: () => {},
+    canUndo: true,
+    onRedo: () => {},
+    canRedo: true,
+    onCopyStyles: () => {},
+    canEdit: true,
+  };
+
+  return (
+    <div class={styles.toolbar} onkeydown={onkeydown} tabIndex={0}>
+      <StyledButton
+        pressed={false}
+        onClick={properties.onUndo}
+        disabled={!properties.canUndo}
+        title={t("toolbar.undo")}
+      >
+        <Undo2 />
+      </StyledButton>
+      <StyledButton
+        pressed={false}
+        onClick={properties.onRedo}
+        disabled={!properties.canRedo}
+        title={t("toolbar.redo")}
+      >
+        <Redo2 />
+      </StyledButton>
+      <div class={styles.divider} />
+      <StyledButton
+        pressed={false}
+        onClick={properties.onCopyStyles}
+        title={t("toolbar.copy_styles")}
+      >
+        <Paintbrush2 />
+      </StyledButton>
+      <div class={styles.divider} />
+      <StyledButton
+        pressed={false}
+        // onClick={(): void => {
+        //   properties.onNumberFormatPicked(NumberFormats.CURRENCY_EUR);
+        // }}
+        title={t("toolbar.euro")}
+      >
+        <Euro />
+      </StyledButton>
+      <StyledButton
+        pressed={false}
+        // onClick={(): void => {
+        //   properties.onNumberFormatPicked(NumberFormats.PERCENTAGE);
+        // }}
+        title={t("toolbar.percentage")}
+      >
+        <Percent />
+      </StyledButton>
+      <StyledButton
+        pressed={false}
+        // onClick={(): void => {
+        //   properties.onNumberFormatPicked(
+        //     decreaseDecimalPlaces(properties.numFmt)
+        //   );
+        // }}
+        title={t("toolbar.decimal_places_decrease")}
+      >
+        <div><DecimalPlacesDecreaseIcon /></div>
+      </StyledButton>
+      <StyledButton
+        pressed={false}
+        // onClick={(): void => {
+        //   properties.onNumberFormatPicked(
+        //     increaseDecimalPlaces(properties.numFmt)
+        //   );
+        // }}
+        title={t("toolbar.decimal_places_increase")}
+      >
+        <DecimalPlacesIncreaseIcon />
+      </StyledButton>
+      {/* //   <FormatMenu
+    //     numFmt={properties.numFmt}
+    //     onChange={(numberFmt): void => {
+    //       properties.onNumberFormatPicked(numberFmt);
+    //     }}
+    //     onExited={(): void => {}}
+    //     anchorOrigin={{
+    //       horizontal: 20, // Aligning the menu to the middle of FormatButton
+    //       vertical: "bottom",
+    //     }}
+    //   >*/
+        <StyledButton
+
+          pressed={false}
+          
+          title={t("toolbar.format_number")}
+        >
+          <div class={styles.format_menu}>{"123"}<ChevronDown /></div>
+          
+        </StyledButton>
+    /*   </FormatMenu> */}
+      <div class={styles.divider} />
+      <StyledButton
+        // pressed={properties.bold}
+        // onClick={() => properties.onToggleBold(!properties.bold)}
+        title={t("toolbar.bold")}
+      >
+        <Bold />
+      </StyledButton>
+      <StyledButton
+        // pressed={properties.italic}
+        // onClick={() => properties.onToggleItalic(!properties.italic)}
+        title={t("toolbar.italic")}
+      >
+        <Italic />
+      </StyledButton>
+      <StyledButton
+        // pressed={properties.underline}
+        // onClick={() => properties.onToggleUnderline(!properties.underline)}
+        title={t("toolbar.underline")}
+      >
+        <Underline />
+      </StyledButton>
+      <StyledButton
+        // pressed={properties.strike}
+        // onClick={() => properties.onToggleStrike(!properties.strike)}
+        title={t("toolbar.strike_trough")}
+      >
+        <Strikethrough />
+      </StyledButton>
+      <div class={styles.divider} />
+      <StyledButton
+        pressed={false}
+        title={t("toolbar.font_color")}
+        // ref={fontColorButton}
+        // underlinedColor={properties.fontColor}
+        // onClick={() => setFontColorPickerOpen(true)}
+      >
+        <Type />
+      </StyledButton>
+      <StyledButton
+        pressed={false}
+        title={t("toolbar.fill_color")}
+        // ref={fillColorButton}
+        // underlinedColor={properties.fillColor}
+        // onClick={() => setFillColorPickerOpen(true)}
+      >
+        <PaintBucket />
+      </StyledButton>
+      <div class={styles.divider} />
+      <StyledButton
+        // pressed={properties.horizontalAlign === "left"}
+        // onClick={() =>
+        //   properties.onToggleHorizontalAlign(
+        //     properties.horizontalAlign === "left" ? "general" : "left"
+        //   )
+        // }
+        title={t("toolbar.align_left")}
+      >
+        <AlignLeft />
+      </StyledButton>
+      <StyledButton
+        // pressed={properties.horizontalAlign === "center"}
+        // onClick={() =>
+        //   properties.onToggleHorizontalAlign(
+        //     properties.horizontalAlign === "center" ? "general" : "center"
+        //   )
+        // }
+        title={t("toolbar.align_center")}
+      >
+        <AlignCenter />
+      </StyledButton>
+      <StyledButton
+        // pressed={properties.horizontalAlign === "right"}
+        // onClick={() =>
+        //   properties.onToggleHorizontalAlign(
+        //     properties.horizontalAlign === "right" ? "general" : "right"
+        //   )
+        // }
+        title={t("toolbar.align_right")}
+      >
+        <AlignRight />
+      </StyledButton>
+      <StyledButton
+        // pressed={properties.verticalAlign === "top"}
+        // onClick={() =>
+        //   properties.onToggleVerticalAlign(
+        //     properties.verticalAlign === "top" ? "bottom" : "top"
+        //   )
+        // }
+        title={t("toolbar.vertical_align_top")}
+      >
+        <ArrowUpToLine />
+      </StyledButton>
+      <StyledButton
+        // pressed={properties.verticalAlign === "center"}
+        // onClick={() =>
+        //   properties.onToggleVerticalAlign(
+        //     properties.verticalAlign === "center" ? "bottom" : "center"
+        //   )
+        // }
+        title={t("toolbar.vertical_align_center")}
+      >
+        <ArrowMiddleFromLine />
+      </StyledButton>
+      <StyledButton
+        // pressed={properties.verticalAlign === "bottom"}
+        // onClick={() => properties.onToggleVerticalAlign("bottom")}
+        title={t("toolbar.vertical_align_bottom")}
+      >
+        <ArrowDownToLine />
+      </StyledButton>
+      <div class={styles.divider} />
+      <StyledButton
+        pressed={false}
+        // onClick={() => setBorderPickerOpen(true)}
+        // ref={borderButton}
+        title={t("toolbar.borders")}
+      >
+        <Grid2X2 />
+      </StyledButton>
+      {/* //   <ColorPicker
+    //     color={properties.fontColor}
+    //     onChange={(color): void => {
+    //       properties.onTextColorPicked(color);
+    //       setFontColorPickerOpen(false);
+    //     }}
+    //     anchorEl={fontColorButton}
+    //     open={fontColorPickerOpen}
+    //   />
+    //   <ColorPicker
+    //     color={properties.fillColor}
+    //     onChange={(color): void => {
+    //       properties.onFillColorPicked(color);
+    //       setFillColorPickerOpen(false);
+    //     }}
+    //     anchorEl={fillColorButton}
+    //     open={fillColorPickerOpen}
+    //   />
+    //   <BorderPicker
+    //     onChange={(border): void => {
+    //       properties.onBorderChanged(border);
+    //       setBorderPickerOpen(false);
+    //     }}
+    //     anchorEl={borderButton}
+    //     open={borderPickerOpen}
+    //   /> */}
+    </div>
+  );
+}
+
+function StyledButton(props: {
+  children: JSX.Element;
+  title: string;
+  onClick?: () => void;
+  disabled?: boolean;
+  pressed?: boolean;
+  underlinedColor?: string;
+}) {
+  return (
+    <button
+      disabled={props.disabled || false}
+      onClick={props.onClick}
+      title={props.title}
+      class={styles.button}
+    >
+      {props.children}
+    </button>
+  );
+}
+
+export default Toolbar;

solidjs_app/src/components/toolbar/toolbar.module.css

@@ -0,0 +1,67 @@
+.toolbar {
+  display: flex;
+  flex-shrink: 0;
+  align-items: center;
+  /* ${({ theme }) => theme.palette.background.paper}; */
+  background: #fff;
+  height: 40px;
+  line-height: 40px;
+  /* theme.palette.grey["600"] */
+  border-bottom: 1px solid #757575;
+  font-family: Inter;
+  border-radius: 4px 4px 0px 0px;
+  overflow-x: auto;
+}
+
+.button {
+  width: 24px;
+  height: 24px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 26px;
+  border: 0px solid #fff;
+  border-radius: 2px;
+  margin-right: 5px;
+  transition: all 0.2s;
+  cursor: pointer;
+  background-color: white;
+  padding: 0px;
+}
+
+.button:disabled {
+  color: grey;
+  cursor: default;
+}
+
+.button:not(disabled) {
+  border-top: none;
+  border-bottom: none;
+  color: #21243a;
+  background-color: #fff;
+}
+
+.button:hover {
+  background-color: #f1f2f8;
+  border-top-color: #f1f2f8;
+}
+
+.button svg {
+  width: 16px;
+  height: 16px;
+}
+
+.divider {
+  width: 0px;
+  height: 10px;
+  border-left: 1px solid #d3d6e9;
+  margin-left: 5px;
+  margin-right: 10px;
+}
+
+.format_menu {
+    width: 40px; 
+    font-size: 13px;
+    font-weight: 400;
+    display: flex;
+}

solidjs_app/src/components/workbook.module.css

@@ -0,0 +1,6 @@
+/* @import './theme.css'; */
+
+.workbook {
+    /* background-color:  var(--main-bg-color); */
+    /* color: var(--other); */
+}

solidjs_app/src/icons/arrow-middle-from-line.svg

@@ -0,0 +1,14 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="arrow-middle-from-line" clip-path="url(#clip0_107_4135)">
+<path id="Vector" d="M8 14.6667V10.6667" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+<path id="Vector_2" d="M8 5.33333V1.33333" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+<path id="Vector_3" d="M14.6667 8H1.33334" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+<path id="Vector_4" d="M10 12.6667L8 10.6667L6 12.6667" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+<path id="Vector_5" d="M10 3.33333L8 5.33333L6 3.33333" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+<defs>
+<clipPath id="clip0_107_4135">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+</defs>
+</svg>

solidjs_app/src/icons/border-bottom.svg

@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2 14H14" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2 8H14" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 2V11.3333" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14 11.3333V3.33333C14 2.59695 13.403 2 12.6667 2H3.33333C2.59695 2 2 2.59695 2 3.33333V11.3333" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

solidjs_app/src/icons/border-center-h.svg

@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14 5.33333V3.33333C14 2.59695 13.403 2 12.6667 2H8M14 10.6667V12.6667C14 13.403 13.403 14 12.6667 14H8M2 10.6667V12.6667C2 13.403 2.59695 14 3.33333 14H8M2 5.33333V3.33333C2 2.59695 2.59695 2 3.33333 2H8M8 14V10.6667M8 2V5.33333" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2 8H14" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

solidjs_app/src/icons/border-center-v.svg

@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.6667 2H12.6667C13.403 2 14 2.59695 14 3.33333V8M5.33333 2H3.33333C2.59695 2 2 2.59695 2 3.33333V8M5.33333 14H3.33333C2.59695 14 2 13.403 2 12.6667V8M10.6667 14H12.6667C13.403 14 14 13.403 14 12.6667V8M2 8H5.33333M14 8H10.6667" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 2V14" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

solidjs_app/src/icons/border-inner.svg

@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14 5.33333V3.33333C14 2.59695 13.403 2 12.6667 2H10.6667M14 10.6667V12.6667C14 13.403 13.403 14 12.6667 14H10.6667M2 10.6667V12.6667C2 13.403 2.59695 14 3.33333 14H5.33333M2 5.33333V3.33333C2 2.59695 2.59695 2 3.33333 2H5.33333" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2 8H14" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 2V14" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

solidjs_app/src/icons/border-left.svg

@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.66667 2H12.6667C13.403 2 14 2.59695 14 3.33333V12.6667C14 13.403 13.403 14 12.6667 14H4.66667" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.66667 8H14" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 2V14" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2 2V14" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

solidjs_app/src/icons/border-none.svg

@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.6667 2H3.33333C2.59695 2 2 2.59695 2 3.33333V12.6667C2 13.403 2.59695 14 3.33333 14H12.6667C13.403 14 14 13.403 14 12.6667V3.33333C14 2.59695 13.403 2 12.6667 2Z" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2 8H14" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 2V14" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

solidjs_app/src/icons/border-outer.svg

@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.6667 2H3.33333C2.59695 2 2 2.59695 2 3.33333V12.6667C2 13.403 2.59695 14 3.33333 14H12.6667C13.403 14 14 13.403 14 12.6667V3.33333C14 2.59695 13.403 2 12.6667 2Z" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.66667 8H11.3333" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 4.66667L8 11.3333" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

solidjs_app/src/icons/border-right.svg

@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.3333 2H3.33333C2.59695 2 2 2.59695 2 3.33333V12.6667C2 13.403 2.59695 14 3.33333 14H11.3333" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2 8H11.3333" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 2V14" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14 2V14" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

solidjs_app/src/icons/border-style.svg

@@ -0,0 +1,15 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<!-- <path d="M14 4H2" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14 8H2" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="2 2"/>
+<path d="M14 12H2" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="0.01 2"/> -->
+<style>
+    line {
+      stroke: black;
+    }
+  </style>
+<line x1="0" y1="2" x2="16" y2="2" />
+  <!-- Dashes and gaps of the same size -->
+<line x1="0" y1="8" x2="16" y2="8" stroke-dasharray="2.28 2.28" />
+  <!-- Dashes and gaps of different sizes -->
+<line x1="0" y1="14" x2="16" y2="14" stroke-dasharray="1 2" />
+</svg>

solidjs_app/src/icons/border-top.svg

@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14 4.66667V12.6667C14 13.403 13.403 14 12.6667 14H3.33333C2.59695 14 2 13.403 2 12.6667V4.66667" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2 2H14" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2 8H14" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 4.66667V14" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

solidjs_app/src/icons/decrease-decimal.svg

@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.5 11.3333H5" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7 9.33333L5 11.3333L7 13.3333" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.66667 4.33333C7.66667 3.59695 7.06971 3 6.33333 3C5.59695 3 5 3.59695 5 4.33333V5.66667C5 6.40305 5.59695 7 6.33333 7C7.06971 7 7.66667 6.40305 7.66667 5.66667V4.33333Z" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3 7H3.00667" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

solidjs_app/src/icons/delete-column.svg

@@ -0,0 +1,10 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2 3.33333L2 12.6667C2 13.403 2.59695 14 3.33333 14L3.66667 14C4.40305 14 5 13.403 5 12.6667L5 3.33333C5 2.59695 4.40305 2 3.66667 2L3.33333 2C2.59695 2 2 2.59695 2 3.33333Z" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5 6L2 6" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14 6L11 6" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5 10L2 10" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14 10L11 10" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11 3.33333L11 12.6667C11 13.403 11.597 14 12.3333 14L12.6667 14C13.403 14 14 13.403 14 12.6667L14 3.33333C14 2.59695 13.403 2 12.6667 2L12.3333 2C11.597 2 11 2.59695 11 3.33333Z" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.58578 9.41422L9.41421 6.58579" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.58578 6.58578L9.41421 9.41421" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

solidjs_app/src/icons/delete-row.svg

@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.6667 2H3.33333C2.59695 2 2 2.59695 2 3.33333V3.66667C2 4.40305 2.59695 5 3.33333 5H12.6667C13.403 5 14 4.40305 14 3.66667V3.33333C14 2.59695 13.403 2 12.6667 2Z" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.6667 11H3.33333C2.59695 11 2 11.597 2 12.3333V12.6667C2 13.403 2.59695 14 3.33333 14H12.6667C13.403 14 14 13.403 14 12.6667V12.3333C14 11.597 13.403 11 12.6667 11Z" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 2V5" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 11V14" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.58578 6.58578L9.41421 9.41421" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.41422 6.58578L6.58579 9.41421" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

solidjs_app/src/icons/fx.svg

@@ -0,0 +1,3 @@
+<svg width="12" height="14" viewBox="0 0 12 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0.182 13.305C0.303333 13.3917 0.468 13.435 0.676 13.435C0.962 13.435 1.24367 13.3483 1.521 13.175C1.79833 13.0103 2.05833 12.7937 2.301 12.525C2.55233 12.2563 2.77333 11.9703 2.964 11.667C3.16333 11.3637 3.32367 11.069 3.445 10.783C3.575 10.5057 3.653 10.276 3.679 10.094L4.459 5.011H5.954V4.439H4.537L4.706 3.36C4.80133 2.75334 4.96167 2.281 5.187 1.943C5.421 1.59634 5.73733 1.423 6.136 1.423C6.422 1.423 6.67767 1.488 6.903 1.618L7.189 1.787H7.293L7.566 1.28C7.592 1.23667 7.61367 1.189 7.631 1.137C7.657 1.085 7.67 1.04167 7.67 1.007C7.67 0.93767 7.64833 0.881336 7.605 0.838003C7.57033 0.786003 7.49233 0.72967 7.371 0.669003C7.30167 0.643003 7.22367 0.621336 7.137 0.604003C7.05033 0.578003 6.95933 0.565002 6.864 0.565002C6.53467 0.565002 6.20967 0.651669 5.889 0.825003C5.56833 0.98967 5.265 1.21067 4.979 1.488C4.693 1.75667 4.43733 2.047 4.212 2.359C3.98667 2.66234 3.80033 2.957 3.653 3.243C3.51433 3.52034 3.432 3.75434 3.406 3.945L3.328 4.439H2.249V5.011H3.25L2.405 10.692C2.31833 11.2813 2.17533 11.745 1.976 12.083C1.77667 12.4297 1.508 12.603 1.17 12.603C0.953333 12.603 0.788667 12.564 0.676 12.486L0.39 12.278H0.312L0.0779999 12.746C0.026 12.85 0 12.9367 0 13.006C0 13.1187 0.0606667 13.2183 0.182 13.305ZM5.90545 9.98999C5.82745 10.1027 5.78845 10.211 5.78845 10.315H6.65945C6.70279 10.211 6.75045 10.1113 6.80245 10.016C6.85445 9.91199 6.93245 9.78199 7.03645 9.62599C7.14045 9.46132 7.30079 9.23166 7.51745 8.93699C7.73412 8.64232 8.03312 8.25232 8.41445 7.76699L9.45445 10.341H9.49345L11.2745 9.92499V9.82099L10.3385 9.44399L9.37645 6.98699C9.80112 6.50166 10.1521 6.11166 10.4295 5.81699C10.7068 5.52232 10.9235 5.29266 11.0795 5.12799C11.2441 4.96332 11.3568 4.83332 11.4175 4.73799C11.4868 4.63399 11.5215 4.53432 11.5215 4.43899H10.7025C10.6678 4.52566 10.6288 4.61666 10.5855 4.71199C10.5421 4.79866 10.4728 4.91566 10.3775 5.06299C10.2908 5.20166 10.1565 5.39666 9.97445 5.64799C9.79245 5.89932 9.54545 6.22866 9.23345 6.63599L8.31045 4.30899H8.27145L6.43845 4.72499V4.82899L7.38745 5.21899L8.27145 7.40299C7.78612 7.95766 7.38312 8.40399 7.06245 8.74199C6.74179 9.07999 6.48612 9.34432 6.29545 9.53499C6.11345 9.72566 5.98345 9.87732 5.90545 9.98999Z" fill="#828282"/>
+</svg>

solidjs_app/src/icons/increase-decimal.svg

@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.5 11.3333H5" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.5 9.33333L12.5 11.3333L10.5 13.3333" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.66667 4.33333C7.66667 3.59695 7.06971 3 6.33333 3C5.59695 3 5 3.59695 5 4.33333V5.66667C5 6.40305 5.59695 7 6.33333 7C7.06971 7 7.66667 6.40305 7.66667 5.66667V4.33333Z" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.3333 4.33333C12.3333 3.59695 11.7364 3 11 3C10.2636 3 9.66667 3.59695 9.66667 4.33333V5.66667C9.66667 6.40305 10.2636 7 11 7C11.7364 7 12.3333 6.40305 12.3333 5.66667V4.33333Z" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3 7H3.00667" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

solidjs_app/src/icons/index.ts

@@ -0,0 +1,46 @@
+import DecimalPlacesDecreaseIcon from "./decrease-decimal.svg";
+import DecimalPlacesIncreaseIcon from "./increase-decimal.svg";
+
+import BorderBottomIcon from "./border-bottom.svg";
+import BorderCenterHIcon from "./border-center-h.svg";
+import BorderCenterVIcon from "./border-center-v.svg";
+import BorderInnerIcon from "./border-inner.svg";
+import BorderLeftIcon from "./border-left.svg";
+import BorderOuterIcon from "./border-outer.svg";
+import BorderRightIcon from "./border-right.svg";
+import BorderTopIcon from "./border-top.svg";
+import BorderNoneIcon from "./border-none.svg";
+import BorderStyleIcon from "./border-style.svg";
+
+import DeleteColumnIcon from "./delete-column.svg";
+import DeleteRowIcon from "./delete-row.svg";
+import InsertColumnLeftIcon from "./insert-column-left.svg";
+import InsertColumnRightIcon from "./insert-column-right.svg";
+import InsertRowAboveIcon from "./insert-row-above.svg";
+import InsertRowBelow from "./insert-row-below.svg";
+import ArrowMiddleFromLine from "./arrow-middle-from-line.svg";
+
+import Fx from "./fx.svg";
+
+export {
+  ArrowMiddleFromLine,
+  DecimalPlacesDecreaseIcon,
+  DecimalPlacesIncreaseIcon,
+  BorderBottomIcon,
+  BorderCenterHIcon,
+  BorderCenterVIcon,
+  BorderInnerIcon,
+  BorderLeftIcon,
+  BorderOuterIcon,
+  BorderRightIcon,
+  BorderTopIcon,
+  BorderNoneIcon,
+  BorderStyleIcon,
+  DeleteColumnIcon,
+  DeleteRowIcon,
+  InsertColumnLeftIcon,
+  InsertColumnRightIcon,
+  InsertRowAboveIcon,
+  InsertRowBelow,
+  Fx,
+};

solidjs_app/src/icons/insert-column-left.svg

@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14 12.6667L14 3.33333C14 2.59695 13.403 2 12.6667 2L9.33333 2C8.59695 2 8 2.59695 8 3.33333L8 12.6667C8 13.403 8.59695 14 9.33333 14L12.6667 14C13.403 14 14 13.403 14 12.6667Z" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14 6L8 6" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14 10L8 10" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4 6L4 10" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6 8L2 8" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>