WIP

refactored NameManager logic for new design
NamedRanges changes
2024-12-30 11:46:46 +01:00 · 2024-12-29 18:12:00 +01:00 · 2024-12-28 12:32:40 +01:00
52 changed files with 521 additions and 1216 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,6 @@
 - New function UNICODE ([#128](https://github.com/ironcalc/IronCalc/pull/128))
 - New document server (Thanks Dani!)
 - New function FORMULATEXT
- Name Manager ([#212](https://github.com/ironcalc/IronCalc/pull/212) [#220](https://github.com/ironcalc/IronCalc/pull/220))

 ### Fixed

--- a/base/src/constants.rs
+++ b/base/src/constants.rs
@@ -16,10 +16,3 @@ pub(crate) const LAST_ROW: i32 = 1_048_576;
 // NaiveDate::from_ymd(1900, 1, 1).num_days_from_ce() - 2
 // The 2 days offset is because of Excel 1900 bug
 pub(crate) const EXCEL_DATE_BASE: i32 = 693_594;
-
-// We do not support dates before 1899-12-31.
-pub(crate) const MINIMUM_DATE_SERIAL_NUMBER: i32 = 1;
-
-// Excel can handle dates until the year 9999-12-31
-// 2958465 is the number of days from 1900-01-01 to 9999-12-31
-pub(crate) const MAXIMUM_DATE_SERIAL_NUMBER: i32 = 2_958_465;
--- a/base/src/expressions/parser/mod.rs
+++ b/base/src/expressions/parser/mod.rs
@@ -642,38 +642,7 @@ impl Parser {
                position: 0,
                message: "Unexpected end of input.".to_string(),
            },
-            TokenType::Boolean(value) => {
-                // Could be a function call "TRUE()"
-                let next_token = self.lexer.peek_token();
-                if next_token == TokenType::LeftParenthesis {
-                    self.lexer.advance_token();
-                    // We parse all the arguments, although technically this is moot
-                    // But is has the upside of transforming `=TRUE( 4 )` into `=TRUE(4)`
-                    let args = match self.parse_function_args() {
-                        Ok(s) => s,
-                        Err(e) => return e,
-                    };
-                    if let Err(err) = self.lexer.expect(TokenType::RightParenthesis) {
-                        return Node::ParseErrorKind {
-                            formula: self.lexer.get_formula(),
-                            position: err.position,
-                            message: err.message,
-                        };
-                    }
-                    if value {
-                        return Node::FunctionKind {
-                            kind: Function::True,
-                            args,
-                        };
-                    } else {
-                        return Node::FunctionKind {
-                            kind: Function::False,
-                            args,
-                        };
-                    }
-                }
-                Node::BooleanKind(value)
-            }
+            TokenType::Boolean(value) => Node::BooleanKind(value),
            TokenType::Compare(_) => {
                // A primary Node cannot start with an operator
                Node::ParseErrorKind {
--- a/base/src/formatter/dates.rs
+++ b/base/src/formatter/dates.rs
@@ -1,158 +1,18 @@
 use chrono::Datelike;
-use chrono::Days;
 use chrono::Duration;
-use chrono::Months;
 use chrono::NaiveDate;

 use crate::constants::EXCEL_DATE_BASE;
-use crate::constants::MAXIMUM_DATE_SERIAL_NUMBER;
-use crate::constants::MINIMUM_DATE_SERIAL_NUMBER;

-#[inline]
-fn convert_to_serial_number(date: NaiveDate) -> i32 {
-    date.num_days_from_ce() - EXCEL_DATE_BASE
-}
-
-fn is_date_within_range(date: NaiveDate) -> bool {
-    convert_to_serial_number(date) >= MINIMUM_DATE_SERIAL_NUMBER
-        && convert_to_serial_number(date) <= MAXIMUM_DATE_SERIAL_NUMBER
-}
-
-pub fn from_excel_date(days: i64) -> Result<NaiveDate, String> {
-    if days < MINIMUM_DATE_SERIAL_NUMBER as i64 {
-        return Err(format!(
-            "Excel date must be greater than {}",
-            MINIMUM_DATE_SERIAL_NUMBER
-        ));
-    };
-    if days > MAXIMUM_DATE_SERIAL_NUMBER as i64 {
-        return Err(format!(
-            "Excel date must be less than {}",
-            MAXIMUM_DATE_SERIAL_NUMBER
-        ));
-    };
+pub fn from_excel_date(days: i64) -> NaiveDate {
    #[allow(clippy::expect_used)]
    let dt = NaiveDate::from_ymd_opt(1900, 1, 1).expect("problem with chrono::NaiveDate");
-    Ok(dt + Duration::days(days - 2))
+    dt + Duration::days(days - 2)
 }

 pub fn date_to_serial_number(day: u32, month: u32, year: i32) -> Result<i32, String> {
    match NaiveDate::from_ymd_opt(year, month, day) {
-        Some(native_date) => Ok(convert_to_serial_number(native_date)),
+        Some(native_date) => Ok(native_date.num_days_from_ce() - EXCEL_DATE_BASE),
        None => Err("Out of range parameters for date".to_string()),
    }
 }
-
-pub fn permissive_date_to_serial_number(day: i32, month: i32, year: i32) -> Result<i32, String> {
-    // Excel parses `DATE` very permissively. It allows not just for valid date values, but it
-    // allows for invalid dates as well. If you for example enter `DATE(1900, 1, 32)` it will
-    // return the date `1900-02-01`. Despite giving a day that is out of range it will just
-    // wrap the month and year around.
-    //
-    // This function applies that same logic to dates. And does it in the most compatible way as
-    // possible.
-
-    // Special case for the minimum date
-    if year == 1899 && month == 12 && day == 31 {
-        return Ok(MINIMUM_DATE_SERIAL_NUMBER);
-    }
-    let Some(mut date) = NaiveDate::from_ymd_opt(year, 1, 1) else {
-        return Err("Out of range parameters for date".to_string());
-    };
-
-    // One thing to note for example is that even if you started with a year out of range
-    // but tried to increment the months so that it wraps around into within range, excel
-    // would still return an error.
-    //
-    // I.E. DATE(0,13,-1) will return an error, despite it being equivalent to DATE(1,1,0) which
-    // is within range.
-    //
-    // As a result, we have to run range checks as we parse the date from the biggest unit to the
-    // smallest unit.
-    if !is_date_within_range(date) {
-        return Err("Out of range parameters for date".to_string());
-    }
-
-    date = {
-        let month_diff = month - 1;
-        let abs_month = month_diff.unsigned_abs();
-        if month_diff <= 0 {
-            date = date - Months::new(abs_month);
-        } else {
-            date = date + Months::new(abs_month);
-        }
-        if !is_date_within_range(date) {
-            return Err("Out of range parameters for date".to_string());
-        }
-        date
-    };
-
-    date = {
-        let day_diff = day - 1;
-        let abs_day = day_diff.unsigned_abs() as u64;
-        if day_diff <= 0 {
-            date = date - Days::new(abs_day);
-        } else {
-            date = date + Days::new(abs_day);
-        }
-        if !is_date_within_range(date) {
-            return Err("Out of range parameters for date".to_string());
-        }
-        date
-    };
-
-    Ok(convert_to_serial_number(date))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_permissive_date_to_serial_number() {
-        assert_eq!(
-            permissive_date_to_serial_number(42, 42, 2002),
-            date_to_serial_number(12, 7, 2005)
-        );
-        assert_eq!(
-            permissive_date_to_serial_number(1, 42, 2002),
-            date_to_serial_number(1, 6, 2005)
-        );
-        assert_eq!(
-            permissive_date_to_serial_number(1, 15, 2000),
-            date_to_serial_number(1, 3, 2001)
-        );
-        assert_eq!(
-            permissive_date_to_serial_number(1, 49, 2000),
-            date_to_serial_number(1, 1, 2004)
-        );
-        assert_eq!(
-            permissive_date_to_serial_number(1, 49, 2000),
-            date_to_serial_number(1, 1, 2004)
-        );
-        assert_eq!(
-            permissive_date_to_serial_number(31, 49, 2000),
-            date_to_serial_number(31, 1, 2004)
-        );
-        assert_eq!(
-            permissive_date_to_serial_number(256, 49, 2000),
-            date_to_serial_number(12, 9, 2004)
-        );
-        assert_eq!(
-            permissive_date_to_serial_number(256, 1, 2004),
-            date_to_serial_number(12, 9, 2004)
-        );
-    }
-
-    #[test]
-    fn test_max_and_min_dates() {
-        assert_eq!(
-            permissive_date_to_serial_number(31, 12, 9999),
-            Ok(MAXIMUM_DATE_SERIAL_NUMBER),
-        );
-        assert_eq!(
-            permissive_date_to_serial_number(31, 12, 1899),
-            Ok(MINIMUM_DATE_SERIAL_NUMBER),
-        );
-    }
-}
--- a/base/src/formatter/format.rs
+++ b/base/src/formatter/format.rs
@@ -154,16 +154,15 @@ pub fn format_number(value_original: f64, format: &str, locale: &Locale) -> Form
        ParsePart::Date(p) => {
            let tokens = &p.tokens;
            let mut text = "".to_string();
-            let date = match from_excel_date(value as i64) {
-                Ok(d) => d,
-                Err(e) => {
-                    return Formatted {
-                        text: "#VALUE!".to_owned(),
-                        color: None,
-                        error: Some(e),
-                    }
-                }
-            };
+            if !(1.0..=2_958_465.0).contains(&value) {
+                // 2_958_465 is 31 December 9999
+                return Formatted {
+                    text: "#VALUE!".to_owned(),
+                    color: None,
+                    error: Some("Date negative or too long".to_owned()),
+                };
+            }
+            let date = from_excel_date(value as i64);
            for token in tokens {
                match token {
                    TextToken::Literal(c) => {
--- a/base/src/functions/date_and_time.rs
+++ b/base/src/functions/date_and_time.rs
@@ -3,11 +3,8 @@ use chrono::Datelike;
 use chrono::Months;
 use chrono::Timelike;

-use crate::constants::MAXIMUM_DATE_SERIAL_NUMBER;
-use crate::constants::MINIMUM_DATE_SERIAL_NUMBER;
 use crate::expressions::types::CellReferenceIndex;
 use crate::formatter::dates::date_to_serial_number;
-use crate::formatter::dates::permissive_date_to_serial_number;
 use crate::model::get_milliseconds_since_epoch;
 use crate::{
    calc_result::CalcResult, constants::EXCEL_DATE_BASE, expressions::parser::Node,
@@ -21,19 +18,20 @@ impl Model {
            return CalcResult::new_args_number_error(cell);
        }
        let serial_number = match self.get_number(&args[0], cell) {
-            Ok(c) => c.floor() as i64,
+            Ok(c) => {
+                let t = c.floor() as i64;
+                if t < 0 {
+                    return CalcResult::Error {
+                        error: Error::NUM,
+                        origin: cell,
+                        message: "Function DAY parameter 1 value is negative. It should be positive or zero.".to_string(),
+                    };
+                }
+                t
+            }
            Err(s) => return s,
        };
-        let date = match from_excel_date(serial_number) {
-            Ok(date) => date,
-            Err(_) => {
-                return CalcResult::Error {
-                    error: Error::NUM,
-                    origin: cell,
-                    message: "Out of range parameters for date".to_string(),
-                }
-            }
-        };
+        let date = from_excel_date(serial_number);
        let day = date.day() as f64;
        CalcResult::Number(day)
    }
@@ -44,19 +42,20 @@ impl Model {
            return CalcResult::new_args_number_error(cell);
        }
        let serial_number = match self.get_number(&args[0], cell) {
-            Ok(c) => c.floor() as i64,
+            Ok(c) => {
+                let t = c.floor() as i64;
+                if t < 0 {
+                    return CalcResult::Error {
+                        error: Error::NUM,
+                        origin: cell,
+                        message: "Function MONTH parameter 1 value is negative. It should be positive or zero.".to_string(),
+                    };
+                }
+                t
+            }
            Err(s) => return s,
        };
-        let date = match from_excel_date(serial_number) {
-            Ok(date) => date,
-            Err(_) => {
-                return CalcResult::Error {
-                    error: Error::NUM,
-                    origin: cell,
-                    message: "Out of range parameters for date".to_string(),
-                }
-            }
-        };
+        let date = from_excel_date(serial_number);
        let month = date.month() as f64;
        CalcResult::Number(month)
    }
@@ -80,23 +79,6 @@ impl Model {
            }
            Err(s) => return s,
        };
-        let date = match from_excel_date(serial_number) {
-            Ok(date) => date,
-            Err(_) => {
-                return CalcResult::Error {
-                    error: Error::NUM,
-                    origin: cell,
-                    message: "Out of range parameters for date".to_string(),
-                }
-            }
-        };
-        if serial_number > MAXIMUM_DATE_SERIAL_NUMBER as i64 {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "Function DAY parameter 1 value is too large.".to_string(),
-            };
-        }

        let months = match self.get_number_no_bools(&args[1], cell) {
            Ok(c) => {
@@ -109,9 +91,9 @@ impl Model {
        let months_abs = months.unsigned_abs();

        let native_date = if months > 0 {
-            date + Months::new(months_abs)
+            from_excel_date(serial_number) + Months::new(months_abs)
        } else {
-            date - Months::new(months_abs)
+            from_excel_date(serial_number) - Months::new(months_abs)
        };

        // Instead of calculating the end of month we compute the first day of the following month
@@ -155,18 +137,32 @@ impl Model {
        let month = match self.get_number(&args[1], cell) {
            Ok(c) => {
                let t = c.floor();
-                t as i32
+                if t < 0.0 {
+                    return CalcResult::Error {
+                        error: Error::NUM,
+                        origin: cell,
+                        message: "Out of range parameters for date".to_string(),
+                    };
+                }
+                t as u32
            }
            Err(s) => return s,
        };
        let day = match self.get_number(&args[2], cell) {
            Ok(c) => {
                let t = c.floor();
-                t as i32
+                if t < 0.0 {
+                    return CalcResult::Error {
+                        error: Error::NUM,
+                        origin: cell,
+                        message: "Out of range parameters for date".to_string(),
+                    };
+                }
+                t as u32
            }
            Err(s) => return s,
        };
-        match permissive_date_to_serial_number(day, month, year) {
+        match date_to_serial_number(day, month, year) {
            Ok(serial_number) => CalcResult::Number(serial_number as f64),
            Err(message) => CalcResult::Error {
                error: Error::NUM,
@@ -182,19 +178,20 @@ impl Model {
            return CalcResult::new_args_number_error(cell);
        }
        let serial_number = match self.get_number(&args[0], cell) {
-            Ok(c) => c.floor() as i64,
+            Ok(c) => {
+                let t = c.floor() as i64;
+                if t < 0 {
+                    return CalcResult::Error {
+                        error: Error::NUM,
+                        origin: cell,
+                        message: "Function YEAR parameter 1 value is negative. It should be positive or zero.".to_string(),
+                    };
+                }
+                t
+            }
            Err(s) => return s,
        };
-        let date = match from_excel_date(serial_number) {
-            Ok(date) => date,
-            Err(_) => {
-                return CalcResult::Error {
-                    error: Error::NUM,
-                    origin: cell,
-                    message: "Out of range parameters for date".to_string(),
-                }
-            }
-        };
+        let date = from_excel_date(serial_number);
        let year = date.year() as f64;
        CalcResult::Number(year)
    }
@@ -206,18 +203,19 @@ impl Model {
            return CalcResult::new_args_number_error(cell);
        }
        let serial_number = match self.get_number(&args[0], cell) {
-            Ok(c) => c.floor() as i64,
-            Err(s) => return s,
-        };
-        let date = match from_excel_date(serial_number) {
-            Ok(date) => date,
-            Err(_) => {
-                return CalcResult::Error {
-                    error: Error::NUM,
-                    origin: cell,
-                    message: "Out of range parameters for date".to_string(),
+            Ok(c) => {
+                let t = c.floor() as i64;
+                if t < 0 {
+                    return CalcResult::Error {
+                        error: Error::NUM,
+                        origin: cell,
+                        message: "Parameter 1 value is negative. It should be positive or zero."
+                            .to_string(),
+                    };
                }
+                t
            }
+            Err(s) => return s,
        };

        let months = match self.get_number(&args[1], cell) {
@@ -231,13 +229,13 @@ impl Model {
        let months_abs = months.unsigned_abs();

        let native_date = if months > 0 {
-            date + Months::new(months_abs)
+            from_excel_date(serial_number) + Months::new(months_abs)
        } else {
-            date - Months::new(months_abs)
+            from_excel_date(serial_number) - Months::new(months_abs)
        };

        let serial_number = native_date.num_days_from_ce() - EXCEL_DATE_BASE;
-        if serial_number < MINIMUM_DATE_SERIAL_NUMBER {
+        if serial_number < 0 {
            return CalcResult::Error {
                error: Error::NUM,
                origin: cell,
--- a/base/src/functions/financial.rs
+++ b/base/src/functions/financial.rs
@@ -2,7 +2,7 @@ use chrono::Datelike;

 use crate::{
    calc_result::CalcResult,
-    constants::{LAST_COLUMN, LAST_ROW, MAXIMUM_DATE_SERIAL_NUMBER, MINIMUM_DATE_SERIAL_NUMBER},
+    constants::{LAST_COLUMN, LAST_ROW},
    expressions::{parser::Node, token::Error, types::CellReferenceIndex},
    formatter::dates::from_excel_date,
    model::Model,
@@ -13,38 +13,37 @@ use super::financial_util::{compute_irr, compute_npv, compute_rate, compute_xirr
 // See:
 // https://github.com/apache/openoffice/blob/c014b5f2b55cff8d4b0c952d5c16d62ecde09ca1/main/scaddins/source/analysis/financial.cxx

-fn is_less_than_one_year(start_date: i64, end_date: i64) -> Result<bool, String> {
-    let end = match from_excel_date(end_date) {
-        Ok(s) => s,
-        Err(s) => return Err(s),
-    };
-    let start = match from_excel_date(start_date) {
-        Ok(s) => s,
-        Err(s) => return Err(s),
-    };
+// FIXME: Is this enough?
+fn is_valid_date(date: f64) -> bool {
+    date > 0.0
+}
+
+fn is_less_than_one_year(start_date: i64, end_date: i64) -> bool {
    if end_date - start_date < 365 {
-        return Ok(true);
+        return true;
    }
+    let end = from_excel_date(end_date);
+    let start = from_excel_date(start_date);
    let end_year = end.year();
    let start_year = start.year();
    if end_year == start_year {
-        return Ok(true);
+        return true;
    }
    if end_year != start_year + 1 {
-        return Ok(false);
+        return false;
    }
    let start_month = start.month();
    let end_month = end.month();
    if end_month < start_month {
-        return Ok(true);
+        return true;
    }
    if end_month > start_month {
-        return Ok(false);
+        return false;
    }
    // we are one year later same month
    let start_day = start.day();
    let end_day = end.day();
-    Ok(end_day <= start_day)
+    end_day <= start_day
 }

 fn compute_payment(
@@ -437,7 +436,7 @@ impl Model {
        }
        if rate == -1.0 {
            return CalcResult::Error {
-                error: Error::DIV,
+                error: Error::NUM,
                origin: cell,
                message: "Rate must be != -1".to_string(),
            };
@@ -924,9 +923,7 @@ impl Model {
        }
        let first_date = dates[0];
        for date in &dates {
-            if *date < MINIMUM_DATE_SERIAL_NUMBER as f64
-                || *date > MAXIMUM_DATE_SERIAL_NUMBER as f64
-            {
+            if !is_valid_date(*date) {
                // Excel docs claim that if any number in dates is not a valid date,
                // XNPV returns the #VALUE! error value, but it seems to return #VALUE!
                return CalcResult::new_error(
@@ -992,9 +989,7 @@ impl Model {
        }
        let first_date = dates[0];
        for date in &dates {
-            if *date < MINIMUM_DATE_SERIAL_NUMBER as f64
-                || *date > MAXIMUM_DATE_SERIAL_NUMBER as f64
-            {
+            if !is_valid_date(*date) {
                return CalcResult::new_error(
                    Error::NUM,
                    cell,
@@ -1378,10 +1373,9 @@ impl Model {
            Ok(f) => f,
            Err(s) => return s,
        };
-        let less_than_one_year = match is_less_than_one_year(settlement as i64, maturity as i64) {
-            Ok(f) => f,
-            Err(_) => return CalcResult::new_error(Error::NUM, cell, "Invalid date".to_string()),
-        };
+        if !is_valid_date(settlement) || !is_valid_date(maturity) {
+            return CalcResult::new_error(Error::NUM, cell, "Invalid date".to_string());
+        }
        if settlement > maturity {
            return CalcResult::new_error(
                Error::NUM,
@@ -1389,7 +1383,7 @@ impl Model {
                "settlement should be <= maturity".to_string(),
            );
        }
-        if !less_than_one_year {
+        if !is_less_than_one_year(settlement as i64, maturity as i64) {
            return CalcResult::new_error(
                Error::NUM,
                cell,
@@ -1443,10 +1437,9 @@ impl Model {
            Ok(f) => f,
            Err(s) => return s,
        };
-        let less_than_one_year = match is_less_than_one_year(settlement as i64, maturity as i64) {
-            Ok(f) => f,
-            Err(_) => return CalcResult::new_error(Error::NUM, cell, "Invalid date".to_string()),
-        };
+        if !is_valid_date(settlement) || !is_valid_date(maturity) {
+            return CalcResult::new_error(Error::NUM, cell, "Invalid date".to_string());
+        }
        if settlement > maturity {
            return CalcResult::new_error(
                Error::NUM,
@@ -1454,7 +1447,7 @@ impl Model {
                "settlement should be <= maturity".to_string(),
            );
        }
-        if !less_than_one_year {
+        if !is_less_than_one_year(settlement as i64, maturity as i64) {
            return CalcResult::new_error(
                Error::NUM,
                cell,
@@ -1494,10 +1487,9 @@ impl Model {
            Ok(f) => f,
            Err(s) => return s,
        };
-        let less_than_one_year = match is_less_than_one_year(settlement as i64, maturity as i64) {
-            Ok(f) => f,
-            Err(_) => return CalcResult::new_error(Error::NUM, cell, "Invalid date".to_string()),
-        };
+        if !is_valid_date(settlement) || !is_valid_date(maturity) {
+            return CalcResult::new_error(Error::NUM, cell, "Invalid date".to_string());
+        }
        if settlement > maturity {
            return CalcResult::new_error(
                Error::NUM,
@@ -1505,7 +1497,7 @@ impl Model {
                "settlement should be <= maturity".to_string(),
            );
        }
-        if !less_than_one_year {
+        if !is_less_than_one_year(settlement as i64, maturity as i64) {
            return CalcResult::new_error(
                Error::NUM,
                cell,
--- a/base/src/functions/logical.rs
+++ b/base/src/functions/logical.rs
@@ -7,22 +7,6 @@ use crate::{
 use super::util::compare_values;

 impl Model {
-    pub(crate) fn fn_true(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        if args.is_empty() {
-            CalcResult::Boolean(true)
-        } else {
-            CalcResult::new_args_number_error(cell)
-        }
-    }
-
-    pub(crate) fn fn_false(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        if args.is_empty() {
-            CalcResult::Boolean(false)
-        } else {
-            CalcResult::new_args_number_error(cell)
-        }
-    }
-
    pub(crate) fn fn_if(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
        if args.len() == 2 || args.len() == 3 {
            let cond_result = self.get_boolean(&args[0], cell);
--- a/base/src/functions/mod.rs
+++ b/base/src/functions/mod.rs
@@ -949,7 +949,7 @@ impl Model {
        match kind {
            // Logical
            Function::And => self.fn_and(args, cell),
-            Function::False => self.fn_false(args, cell),
+            Function::False => CalcResult::Boolean(false),
            Function::If => self.fn_if(args, cell),
            Function::Iferror => self.fn_iferror(args, cell),
            Function::Ifna => self.fn_ifna(args, cell),
@@ -957,7 +957,7 @@ impl Model {
            Function::Not => self.fn_not(args, cell),
            Function::Or => self.fn_or(args, cell),
            Function::Switch => self.fn_switch(args, cell),
-            Function::True => self.fn_true(args, cell),
+            Function::True => CalcResult::Boolean(true),
            Function::Xor => self.fn_xor(args, cell),
            // Math and trigonometry
            Function::Sin => self.fn_sin(args, cell),
--- a/base/src/test/mod.rs
+++ b/base/src/test/mod.rs
@@ -13,7 +13,6 @@ mod test_fn_averageifs;
 mod test_fn_choose;
 mod test_fn_concatenate;
 mod test_fn_count;
-mod test_fn_day;
 mod test_fn_exact;
 mod test_fn_financial;
 mod test_fn_formulatext;
@@ -42,7 +41,6 @@ mod test_sheet_markup;
 mod test_sheets;
 mod test_styles;
 mod test_trigonometric;
-mod test_true_false;
 mod test_workbook;
 mod test_worksheet;
 pub(crate) mod util;
--- a/base/src/test/test_date_and_time.rs
+++ b/base/src/test/test_date_and_time.rs
@@ -37,12 +37,12 @@ fn test_fn_date_arguments() {
    assert_eq!(model._get_text("A3"), *"#ERROR!");
    assert_eq!(model._get_text("A4"), *"#ERROR!");

-    assert_eq!(model._get_text("A5"), *"10/10/1974");
-    assert_eq!(model._get_text("A6"), *"21/01/1975");
-    assert_eq!(model._get_text("A7"), *"10/02/1976");
-    assert_eq!(model._get_text("A8"), *"02/03/1975");
+    assert_eq!(model._get_text("A5"), *"#NUM!");
+    assert_eq!(model._get_text("A6"), *"#NUM!");
+    assert_eq!(model._get_text("A7"), *"#NUM!");
+    assert_eq!(model._get_text("A8"), *"#NUM!");

-    assert_eq!(model._get_text("A9"), *"01/03/1975");
+    assert_eq!(model._get_text("A9"), *"#NUM!");
    assert_eq!(model._get_text("A10"), *"29/02/1976");
    assert_eq!(
        model.get_cell_value_by_ref("Sheet1!A10"),
@@ -64,18 +64,15 @@ fn test_date_out_of_range() {

    // year (actually years < 1900 don't really make sense)
    model._set("C1", "=DATE(-1, 5, 5)");
-    // excel is not compatible with years past 9999
-    model._set("C2", "=DATE(10000, 5, 5)");

    model.evaluate();

-    assert_eq!(model._get_text("A1"), *"10/12/2021");
-    assert_eq!(model._get_text("A2"), *"10/01/2023");
-    assert_eq!(model._get_text("B1"), *"30/04/2042");
-    assert_eq!(model._get_text("B2"), *"01/06/2025");
+    assert_eq!(model._get_text("A1"), *"#NUM!");
+    assert_eq!(model._get_text("A2"), *"#NUM!");
+    assert_eq!(model._get_text("B1"), *"#NUM!");
+    assert_eq!(model._get_text("B2"), *"#NUM!");

    assert_eq!(model._get_text("C1"), *"#NUM!");
-    assert_eq!(model._get_text("C2"), *"#NUM!");
 }

 #[test]
@@ -132,7 +129,8 @@ fn test_day_small_serial() {
    model.evaluate();

    assert_eq!(model._get_text("A1"), *"#NUM!");
-    assert_eq!(model._get_text("A2"), *"#NUM!");
+    // This agrees with Google Docs and disagrees with Excel
+    assert_eq!(model._get_text("A2"), *"30");
    // Excel thinks is Feb 29, 1900
    assert_eq!(model._get_text("A3"), *"28");

@@ -152,7 +150,8 @@ fn test_month_small_serial() {
    model.evaluate();

    assert_eq!(model._get_text("A1"), *"#NUM!");
-    assert_eq!(model._get_text("A2"), *"#NUM!");
+    // This agrees with Google Docs and disagrees with Excel
+    assert_eq!(model._get_text("A2"), *"12");
    // We agree with Excel here (We are both in Feb)
    assert_eq!(model._get_text("A3"), *"2");

@@ -172,7 +171,8 @@ fn test_year_small_serial() {
    model.evaluate();

    assert_eq!(model._get_text("A1"), *"#NUM!");
-    assert_eq!(model._get_text("A2"), *"#NUM!");
+    // This agrees with Google Docs and disagrees with Excel
+    assert_eq!(model._get_text("A2"), *"1899");

    assert_eq!(model._get_text("A3"), *"1900");

@@ -204,10 +204,7 @@ fn test_date_early_dates() {
        model.get_cell_value_by_ref("Sheet1!A2"),
        Ok(CellValue::Number(60.0))
    );
-
-    // This does not agree with Excel, instead of mistakenly allowing
-    // for Feb 29, it will auto-wrap to the next day after Feb 28.
-    assert_eq!(model._get_text("B2"), *"01/03/1900");
+    assert_eq!(model._get_text("B2"), *"#NUM!");

    // This agrees with Excel from he onward
    assert_eq!(model._get_text("A3"), *"01/03/1900");
--- a/base/src/test/test_fn_day.rs
+++ b/base/src/test/test_fn_day.rs
@@ -1,15 +0,0 @@
-#![allow(clippy::unwrap_used)]
-
-use crate::test::util::new_empty_model;
-
-#[test]
-fn test_fn_date_arguments() {
-    let mut model = new_empty_model();
-
-    model._set("A1", "=DAY(95051806)");
-    model._set("A2", "=DAY(2958465)");
-    model.evaluate();
-
-    assert_eq!(model._get_text("A1"), *"#NUM!");
-    assert_eq!(model._get_text("A2"), *"31");
-}
--- a/base/src/test/test_true_false.rs
+++ b/base/src/test/test_true_false.rs
@@ -1,25 +0,0 @@
-#![allow(clippy::unwrap_used)]
-
-use crate::test::util::new_empty_model;
-
-#[test]
-fn true_false_arguments() {
-    let mut model = new_empty_model();
-    model._set("A1", "=TRUE( )");
-    model._set("A2", "=FALSE( )");
-    model._set("A3", "=TRUE( 4 )");
-    model._set("A4", "=FALSE( 4 )");
-
-    model.evaluate();
-
-    assert_eq!(model._get_text("A1"), *"TRUE");
-    assert_eq!(model._get_text("A2"), *"FALSE");
-
-    assert_eq!(model._get_formula("A1"), *"=TRUE()");
-    assert_eq!(model._get_formula("A2"), *"=FALSE()");
-
-    assert_eq!(model._get_text("A3"), *"#ERROR!");
-    assert_eq!(model._get_text("A4"), *"#ERROR!");
-    assert_eq!(model._get_formula("A3"), *"=TRUE(4)");
-    assert_eq!(model._get_formula("A4"), *"=FALSE(4)");
-}
--- a/bindings/wasm/Makefile
+++ b/bindings/wasm/Makefile
@@ -3,7 +3,6 @@ all:
 	cp README.pkg.md pkg/README.md
 	tsc types.ts --target esnext --module esnext
 	python fix_types.py
-	rm -f types.js

 tests:
 	wasm-pack build --target nodejs && node tests/test.mjs
--- a/docs/src/.vitepress/config.mts
+++ b/docs/src/.vitepress/config.mts
@@ -45,10 +45,6 @@ export default defineConfig({
          { text: "About the web application", link: "/web-application/about" },
          { text: "Importing Files", link: "/web-application/importing-files" },
          { text: "Sharing Files", link: "/web-application/sharing-files" },
-          {
-            text: "Name Manager",
-            link: "/web-application/name-manager",
-          }
        ],
      },
      {
@@ -74,14 +70,6 @@ export default defineConfig({
            text: "Units",
            link: "/features/units",
          },		  
-          {
-            text: "Dates and serial numbers",
-            link: "/features/serial-numbers",
-          },
-          {
-            text: "Numbers in IronCalc",
-            link: "/features/numbers-in-ironcalc",
-          },		  
          {
            text: "Unsupported Features",
            link: "/features/unsupported-features",
@@ -2032,16 +2020,6 @@ export default defineConfig({
          },
        ],
      },
-      {
-        text: "Spreadhsheet Engines",
-        collapsed: true,
-        items: [
-          {
-            text: "Spreadsheet Engines",
-            link: "/other-spreadsheets/index",
-          },
-        ],
-      },
      {
        text: "Contributing",
        collapsed: true,
--- a/docs/src/features/numbers-in-ironcalc.md
+++ b/docs/src/features/numbers-in-ironcalc.md
@@ -1,38 +0,0 @@
---
-layout: doc
-outline: deep
-lang: en-US
---
-
-# Numbers in IronCalc
-::: warning
-**Note:** This draft page is under construction 🚧
-
-::: warning
-**Note:** This page contains technical documentation
-
-Numbers in IronCalc are [IEE 754](https://en.wikipedia.org/wiki/IEEE_754) doubles (64 bit) and are displayed uo to 15 decimal digits.
-
-## Integers
-
-Some Integers are well represented by IEEE 754 doubles. The largest integer that can be stored perfectly as a double is:
-
-$$
-2^53 = 9,007,199,254,740,992
-$$
-
-## Floating points
-
-The reader should be aware that numbers like 0.1 or 0.3 are not stored perfectly by computers, _only an approximation to them_ is stored.
-This results in imperfect operations like the famous `0.1 + 0.2 != 0.3`.
-
-When comparing numbers we also compare up to 15 significant figures. With this 'trick' `=IF(0.2+0.1=0.3,TRUE,FALSE)` is actually `TRUE`.
-
-
-
-## Compatibility issues
-
-Excel [mostly follows IEEE 754](https://learn.microsoft.com/en-us/office/troubleshoot/excel/floating-point-arithmetic-inaccurate-result). Like IronCalc displays numbers with 15 significant digits. Excel does a few other undisclosed 'hacks'.
-If the result of an addition (or subtraction) of two non very small numbers is a number close to EPS and it is the end of the calculation then it is zero.
-
-That's is how it gets `=0.3-0.2-0.1` as `0`. However `=1*(0.3-0.2-0.1)` in Excel is `-2.77556E-17`
--- a/docs/src/features/serial-numbers.md
+++ b/docs/src/features/serial-numbers.md
@@ -1,50 +0,0 @@
---
-layout: doc
-outline: deep
-lang: en-US
---
-
-# Serial Numbers
-::: warning
-**Note:** This draft page is under construction 🚧
-:::
-**Note**:	For convenience, dates presented on this page are formatted in accordance with the ISO 8601 international standard. IronCalc can recognize and display dates in other formats.
-
-IronCalc stores dates and times as positive numbers, referred to as *serial numbers*. Serial numbers can be formatted to display the date and time. 
-
-The integer part of a serial number represents the date, as a count of the days since the fixed starting date of 1899-12-30. Hence dates are represented by a unique, sequential integer value, for example:
-* 1 corresponds to 1899-12-31.
-* 2 corresponds to 1900-01-01.
-* 36,526 corresponds to 2000-01-01.
-* 45,658 corresponds to 2025-01-01.
-* 2,958,465 corresponds to 9999-12-31.
-
-To illustrate the concept, type the value 2 into an empty cell that is initially formatted as a number. When you subsequently change the cell to a date format, it will update to show the date 1900-01-01.
-
-The fractional part of a serial number represents time, as a fraction of the day. For example:
-* 0.0 corresponds to 00:00:00 (midnight)
-* 0.041666667 corresponds to 01:00:00.
-* 0.5 corresponds to 12:00:00 (noon)
-* 0.75 corresponds to 18:00:00.
-* 0.99 corresponds to 23:45:36. 
-
-Since date-times are stored as numbers, they can be used for arithmetic operations in formulas. For example, it is possible to determine the difference between two dates by subtracting one serial number from the other.
-
-**Note**: A #VALUE! error is reported if a date-formatted cell contains a number less than 1 or greater than 2,958,465.
-
-## Compatibility Notes
-
-Excel has an infamous [feature](https://learn.microsoft.com/en-us/office/troubleshoot/excel/wrongly-assumes-1900-is-leap-year) that was ported from a bug in Lotus 1-2-3 that assumes that the year 1900 is a leap year.
-
-That means that serial numbers 1 to 60 in IronCalc are different than Excel.
-
-In IronCalc, Google Sheets, Libre Office and Zoho Date(1900,1,1) returns 2
-
-In Excel Date(1900,1,1) returns 1.
-
-Gnumeric solves the problem in yet another way. It follows Excel from 1 to 59, skips 60, and it follows Excel (and all other engines from there on).
-A formula like `=DAY(60)` produces `#NUM!` in Gnumeric.
-
-Serial number 61 corresponds to 1 March 1900, and from there on most spreadsheet engines agree.
-
-IronCalc, like Excel, doesn't deal with serial numbers outside of the range [1, 2,958,465]. Other engines like Google sheets, do not have an upper limit.
--- a/docs/src/functions/date-and-time.md
+++ b/docs/src/functions/date-and-time.md
@@ -14,7 +14,7 @@ You can track the progress in this [GitHub issue](https://github.com/ironcalc/Ir
 | DATE             | <Badge type="tip" text="Available" />          | –             |
 | DATEDIF          | <Badge type="info" text="Not implemented yet" /> | –             |
 | DATEVALUE        | <Badge type="info" text="Not implemented yet" /> | –             |
-| DAY              | <Badge type="tip" text="Available" />          | [DAY](date_and_time/day) |
+| DAY              | <Badge type="tip" text="Available" />          | –             |
 | DAYS             | <Badge type="info" text="Not implemented yet" /> | –             |
 | DAYS360          | <Badge type="info" text="Not implemented yet" /> | –             |
 | EDATE            | <Badge type="tip" text="Available" />          | –             |
--- a/docs/src/functions/date_and_time/day.md
+++ b/docs/src/functions/date_and_time/day.md
@@ -3,49 +3,9 @@ layout: doc
 outline: deep
 lang: en-US
 ---
-# DAY function
+
+# DAY
+
 ::: warning
-**Note:** This draft page is under construction 🚧
-:::
-
-## Overview
-DAY is a function of the Date and Time category that extracts the day of the month from a valid date [serial number](/features/serial-numbers.md), returning a number in the range [1, 31].
-
-## Usage
-### Syntax
-**DAY(<span title="Number" style="color:#1E88E5">date</span>) => <span title="Number" style="color:#1E88E5">day</span>**
-
-### Argument descriptions
-* *date* ([number](/features/value-types#numbers), required). The date for which the day of the month is to be calculated, expressed as a [serial number](/features/serial-numbers.md) in the range [1, 2958465]. The value  corresponds to the date 1899-12-31, while 2958465 corresponds to 9999-12-31.
-
-### Additional guidance
-If the supplied _date_ argument has a fractional part, DAY uses its [floor value](https://en.wikipedia.org/wiki/Floor_and_ceiling_functions).
-
-### Returned value
-DAY returns an integer [number](/features/value-types#numbers) in the range [1, 31], that is the day of the month according to the [Gregorian calendar](https://en.wikipedia.org/wiki/Gregorian_calendar).
-
-### Error conditions
-* In common with many other IronCalc functions, DAY propagates errors that are found in its argument.
-* If no argument, or more than one argument, is supplied, then DAY returns the [`#ERROR!`](/features/error-types.md#error) error.
-* If the value of the *date* argument is not (or cannot be converted to) a [number](/features/value-types#numbers), then DAY returns the [`#VALUE!`](/features/error-types.md#value) error.
-* For some argument values, DAY may return the [`#DIV/0!`](/features/error-types.md#div-0) error.
-* If date is less than 1, or greater than 2,958,465, then DAY returns the [`#NUM!`](/features/error-types.md#num) error.
-* At present, DAY does not accept a string representation of a date literal as an argument. For example, the formula `=DAY("2024-12-31")` returns the [`#VALUE!`](/features/error-types.md#value) error.
-<!--@include: ../markdown-snippets/error-type-details.txt-->
-
-## Details
-IronCalc utilizes Rust's [chrono](https://docs.rs/chrono/latest/chrono/) crate to implement the DAY function.
-
-## Compatibility Notes
-
-In IronCalc the argument of DAY cannot be text. This is confusing, and error prone, as in "10/12/2026" it is not clear if the day is 10 or 12.
-Most of all other spreadsheet engines like Excel, Google Sheets, Libre Office and Gnumeric accept text as input.
-
-## Examples
-
-[See some examples in IronCalc](https://app.ironcalc.com/?example=day).
-
-## Links
-* See also IronCalc's [MONTH](/functions/date_and_time/month.md) and [YEAR](/functions/date_and_time/year.md) functions.
-* Visit Microsoft Excel's [DAY function](https://support.microsoft.com/en-gb/office/day-function-8a7d1cbb-6c7d-4ba1-8aea-25c134d03101) page.
-* Both [Google Sheets](https://support.google.com/docs/answer/3093040) and [LibreOffice Calc](https://wiki.documentfoundation.org/Documentation/Calc_Functions/DAY) provide versions of the DAY function.
+🚧 This function is implemented but currently lacks detailed documentation. For guidance, you may refer to the equivalent functionality in [Microsoft Excel documentation](https://support.microsoft.com/en-us/office/excel-functions-by-category-5f91f4e9-7b42-46d2-9bd1-63f26a86c0eb).
+:::
--- a/docs/src/functions/financial.md
+++ b/docs/src/functions/financial.md
@@ -51,7 +51,7 @@ You can track the progress in this [GitHub issue](https://github.com/ironcalc/Ir
 | PRICE      | <Badge type="info" text="Not implemented yet" /> | –                  |
 | PRICEDISC  | <Badge type="info" text="Not implemented yet" /> | –                  |
 | PRICEMAT   | <Badge type="info" text="Not implemented yet" /> | –                  |
-| PV         | <Badge type="tip" text="Available" />          | [PV](financial/pv) |
+| PV         | <Badge type="tip" text="Available" />          | –                  |
 | RATE       | <Badge type="tip" text="Available" />          | –                  |
 | RECEIVED   | <Badge type="info" text="Not implemented yet" /> | –                  |
 | RRI        | <Badge type="tip" text="Available" />          | -                  |
--- a/docs/src/functions/financial/fv.md
+++ b/docs/src/functions/financial/fv.md
@@ -21,18 +21,18 @@ If your interest rate varies between periods, use the [FVSCHEDULE](/functions/fi
 * *nper* ([number](/features/value-types#numbers), required). "nper" stands for <u>n</u>umber of <u>per</u>iods, in this case the number of compounding periods to be taken into account. While this will often be an integer, non-integer values are accepted and processed.
 * *pmt* ([number](/features/value-types#numbers), required). "pmt" stands for <u>p</u>ay<u>m</u>en<u>t</u>, in this case the fixed amount paid or deposited each compounding period. 
 * *pv* ([number](/features/value-types#numbers), [optional](/features/optional-arguments.md)). "pv" is the <u>p</u>resent <u>v</u>alue or starting amount of the asset (default 0).
-* *type* ([Boolean](/features/value-types#booleans), [optional](/features/optional-arguments.md)). A logical value indicating whether the payment due dates are at the end (FALSE or 0) of the compounding periods or at the beginning (TRUE or any non-zero value). The default is FALSE when omitted.
+* *type* ([boolean](/features/value-types/#booleans), [optional](/features/optional-arguments.md)). A logical value indicating whether the payment due dates are at the end (FALSE or 0) of the compounding periods or at the beginning (TRUE or any non-zero value). The default is FALSE when omitted.
 ### Additional guidance
 * Make sure that the *rate* argument specifies the interest rate or yield applicable to the compounding period, based on the value chosen for *nper*.
 * The *pmt* and *pv* arguments should be expressed in the same currency unit.
 * To ensure a worthwhile result, one of the *pmt* and *pv* arguments should be non-zero.
 * The setting of the *type* argument only affects the calculation for non-zero values of the *pmt* argument.
 ### Returned value
-FV returns a [number](/features/value-types#numbers) representing the future value expressed in the same [currency unit](/features/units) that was used for the *pmt* and *pv* arguments.
+FV returns a [number](/features/value-types/#numbers) representing the future value expressed in the same [currency unit](/features/units) that was used for the *pmt* and *pv* arguments.
 ### Error conditions
 * In common with many other IronCalc functions, FV propagates errors that are found in any of its arguments.
 * If too few or too many arguments are supplied, FV returns the [`#ERROR!`](/features/error-types.md#error) error.
-* If the value of any of the *rate*, *nper*, *pmt* or *pv* arguments is not (or cannot be converted to) a [number](/features/value-types#numbers), then FV returns the [`#VALUE!`](/features/error-types.md#value) error.
+* If the value of any of the *rate*, *nper*, *pmt* or *pv* arguments is not (or cannot be converted to) a [number](/features/value-types#value), then FV returns the [`#VALUE!`](/features/error-types.md#value) error.
 * If the value of the *type* argument is not (or cannot be converted to) a [Boolean](/features/value-types#booleans), then FV again returns the [`#VALUE!`](/features/error-types.md#value) error.
 * For some combinations of valid argument values, FV may return a [`#NUM!`](/features/error-types.md#num) error or a [`#DIV/0!`](/features/error-types.md#div-0) error.
 <!--@include: ../markdown-snippets/error-type-details.txt-->
--- a/docs/src/functions/financial/pv.md
+++ b/docs/src/functions/financial/pv.md
@@ -3,57 +3,9 @@ layout: doc
 outline: deep
 lang: en-US
 ---
-# PV function
+
+# PV
+
 ::: warning
-**Note:** This draft page is under construction 🚧
-:::
-## Overview
-PV (<u>P</u>resent <u>V</u>alue) is a function of the Financial category that can be used to calculate the present value of a series of future cash flows.
-
-PV can be used to calculate present value over a specified number of compounding periods. A fixed interest rate or yield is assumed over all periods, and a fixed payment or deposit can be applied at the start or end of every period.
-## Usage
-### Syntax
-**PV(<span title="Number" style="color:#1E88E5">rate</span>, <span title="Number" style="color:#1E88E5">nper</span>, <span title="Number" style="color:#1E88E5">pmt</span>, <span title="Number" style="color:#1E88E5">fv</span>=0, <span title="Boolean" style="color:#43A047">type</span>=FALSE) => <span title="Number" style="color:#1E88E5">pv</span>**
-### Argument descriptions
-* *rate* ([number](/features/value-types#numbers), required). The fixed percentage interest rate or yield per period.
-* *nper* ([number](/features/value-types#numbers), required). "nper" stands for <u>n</u>umber of <u>per</u>iods, in this case the number of compounding periods to be taken into account. While this will often be an integer, non-integer values are accepted and processed.
-* *pmt* ([number](/features/value-types#numbers), required). "pmt" stands for <u>p</u>ay<u>m</u>en<u>t</u>, in this case the fixed amount paid or deposited each compounding period. 
-* *fv* ([number](/features/value-types#numbers), [optional](/features/optional-arguments.md)). "fv" is the <u>f</u>uture <u>v</u>alue at the end of the final compounding period (default 0).
-* *type* ([Boolean](/features/value-types#booleans), [optional](/features/optional-arguments.md)). A logical value indicating whether the payment due dates are at the end (FALSE or 0) of the compounding periods or at the beginning (TRUE or any non-zero value). The default is FALSE when omitted.
-### Additional guidance
-* Make sure that the *rate* argument specifies the interest rate or yield applicable to the compounding period, based on the value chosen for *nper*.
-* The *pmt* and *fv* arguments should be expressed in the same currency unit.
-* To ensure a worthwhile result, one of the *pmt* and *fv* arguments should be non-zero.
-* The setting of the *type* argument only affects the calculation for non-zero values of the *pmt* argument.
-### Returned value
-PV returns a [number](/features/value-types#numbers) representing the present value expressed in the same [currency unit](/features/units) that was used for the *pmt* and *fv* arguments.
-### Error conditions
-* In common with many other IronCalc functions, PV propagates errors that are found in any of its arguments.
-* If too few or too many arguments are supplied, PV returns the [`#ERROR!`](/features/error-types.md#error) error.
-* If the value of any of the *rate*, *nper*, *pmt* or *fv* arguments is not (or cannot be converted to) a [number](/features/value-types#numbers), then PV returns the [`#VALUE!`](/features/error-types.md#value) error.
-* If the value of the *type* argument is not (or cannot be converted to) a [Boolean](/features/value-types#booleans), then PV again returns the [`#VALUE!`](/features/error-types.md#value) error.
-* For some combinations of valid argument values, PV may return a [`#NUM!`](/features/error-types.md#num) error or a [`#DIV/0!`](/features/error-types.md#div-0) error.
-In paticular, PV always returns a [`#DIV/0!`](/features/error-types.md#div-0) error if the value of the *rate* argument is set to -1.
-
-<!--@include: ../markdown-snippets/error-type-details.txt-->
-## Details
-* If $\text{type} \neq 0$, $\text{pv}$ is given by the equation:
-$$ \text{pv} = - \Biggl(\dfrac{(\text{fv} \times \text{rate}) + \bigl(\text{pmt} \times (1+\text{rate})\times \bigl({(1+\text{rate})^{\text{nper}}-1\bigr)\bigr)}}{\text{rate} \times (1+\text{rate})^{\text{nper}}}\Biggl)
-$$
-
-* If $\text{type} = 0$, $\text{pv}$ is given by the equation:
-$$ \text{pv} = - \Biggl(\dfrac{(\text{fv} \times \text{rate}) + \bigl(\text{pmt}\times \bigl({(1+\text{rate})^{\text{nper}}-1\bigr)\bigr)}}{\text{rate} \times (1+\text{rate})^\text{{nper}}}\Biggl)
-$$
-
-* For any $\text{type}$, in the special case of $\text{rate} = 0$, $\text{pv}$ is given by the equation:
-$$
-\text{pv} = -\text{fv} - (\text{pmt} \times \text{nper})
-$$
-## Examples
-[See some examples in IronCalc](https://app.ironcalc.com/?example=pv).
-
-## Links
-* For more information about the concept of "present value" in finance, visit Wikipedia's [Present value](https://en.wikipedia.org/wiki/present_value) page.
-* See also IronCalc's [FV](/functions/financial/fv), [NPER](/functions/financial/nper), [PMT](/functions/financial/pmt)  and [RATE](/functions/financial/rate) functions.
-* Visit Microsoft Excel's [PV function](https://support.microsoft.com/en-gb/office/pv-function-23879d31-0e02-4321-be01-da16e8168cbd) page.
-* Both [Google Sheets](https://support.google.com/docs/answer/3093243) and [LibreOffice Calc](https://wiki.documentfoundation.org/Documentation/Calc_Functions/PV) provide versions of the PV function.
+🚧 This function is implemented but currently lacks detailed documentation. For guidance, you may refer to the equivalent functionality in [Microsoft Excel documentation](https://support.microsoft.com/en-us/office/excel-functions-by-category-5f91f4e9-7b42-46d2-9bd1-63f26a86c0eb).
+:::
--- a/docs/src/functions/images/cosine-curve.png
+++ b/docs/src/functions/images/cosine-curve.png
--- a/docs/src/functions/images/sine-curve.png
+++ b/docs/src/functions/images/sine-curve.png
--- a/docs/src/functions/images/tangent-curve.png
+++ b/docs/src/functions/images/tangent-curve.png
--- a/docs/src/functions/math-and-trigonometry.md
+++ b/docs/src/functions/math-and-trigonometry.md
@@ -29,7 +29,7 @@ You can track the progress in this [GitHub issue](https://github.com/ironcalc/Ir
 | CEILING.PRECISE | <Badge type="info" text="Not implemented yet" /> | –             |
 | COMBIN          | <Badge type="info" text="Not implemented yet" /> | –             |
 | COMBINA         | <Badge type="info" text="Not implemented yet" /> | –             |
-| COS             | <Badge type="tip" text="Available" />          | [COS](math_and_trigonometry/cos) |
+| COS             | <Badge type="tip" text="Available" />          | –             |
 | COSH            | <Badge type="tip" text="Available" />          | –             |
 | COT             | <Badge type="info" text="Not implemented yet" /> | –             |
 | COTH            | <Badge type="info" text="Not implemented yet" /> | –             |
@@ -77,7 +77,7 @@ You can track the progress in this [GitHub issue](https://github.com/ironcalc/Ir
 | SERIESSUM       | <Badge type="info" text="Not implemented yet" /> | –             |
 | SEQUENCE        | <Badge type="info" text="Not implemented yet" /> | –             |
 | SIGN            | <Badge type="info" text="Not implemented yet" /> | –             |
-| SIN             | <Badge type="tip" text="Available" />          | [SIN](math_and_trigonometry/sin) |
+| SIN             | <Badge type="tip" text="Available" />          | –             |
 | SINH            | <Badge type="tip" text="Available" />          | –             |
 | SQRT            | <Badge type="tip" text="Available" />          | –             |
 | SQRTPI          | <Badge type="info" text="Not implemented yet" /> | –             |
@@ -90,6 +90,6 @@ You can track the progress in this [GitHub issue](https://github.com/ironcalc/Ir
 | SUMX2MY2        | <Badge type="info" text="Not implemented yet" /> | –             |
 | SUMX2PY2        | <Badge type="info" text="Not implemented yet" /> | –             |
 | SUMXMY2         | <Badge type="info" text="Not implemented yet" /> | –             |
-| TAN             | <Badge type="tip" text="Available" />          | [TAN](math_and_trigonometry/tan) |
+| TAN             | <Badge type="tip" text="Available" />          | –             |
 | TANH            | <Badge type="tip" text="Available" />          | –             |
 | TRUNC           | <Badge type="info" text="Not implemented yet" /> | –             |
--- a/docs/src/functions/math_and_trigonometry/cos.md
+++ b/docs/src/functions/math_and_trigonometry/cos.md
@@ -3,41 +3,9 @@ layout: doc
 outline: deep
 lang: en-US
 ---
-# COS function
+
+# COS
+
 ::: warning
-**Note:** This draft page is under construction 🚧
-:::
-## Overview
-COS is a function of the Math and Trigonometry category that calculates the trigonometric cosine of an angle, returning a value in the range [-1, +1].
-## Usage
-### Syntax
-**COS(<span title="Number" style="color:#1E88E5">angle</span>) => <span title="Number" style="color:#1E88E5">cos</span>**
-### Argument descriptions
-* *angle* ([number](/features/value-types#numbers), required). The angle whose cosine is to be calculated, expressed in radians. To convert between degrees and radians, use the relation below. Alternatively, use the [DEGREES](/functions/math_and_trigonometry/degrees) or [RADIANS](/functions/math_and_trigonometry/radians) functions.
-$$
-1~\:~\text{degree} = \dfrac{\pi}{180} = 0.01745329252~\text{radians}
-$$
-
-### Additional guidance
-None.
-### Returned value
-COS returns a unitless [number](/features/value-types#numbers) that is the trigonometric cosine of the specified angle.
-### Error conditions
-* In common with many other IronCalc functions, COS propagates errors that are found in its argument.
-* If no argument, or more than one argument, is supplied, then COS returns the [`#ERROR!`](/features/error-types.md#error) error.
-* If the value of the *angle* argument is not (or cannot be converted to) a [number](/features/value-types#numbers), then COS returns the [`#VALUE!`](/features/error-types.md#value) error.
-* For some argument values, COS may return a [`#DIV/0!`](/features/error-types.md#div-0) error.
-<!--@include: ../markdown-snippets/error-type-details.txt-->
-## Details
-* The COS function utilizes the *cos()* method provided by the [Rust Standard Library](https://doc.rust-lang.org/std/).
-* The figure below illustrates the output of the COS function for angles $x$ in the range -2$\pi$ to +2$\pi$ radians.
-<center><img src="/functions/images/cosine-curve.png" width="350" alt="Graph showing cos(x) for x between -2π and +2π radians."></center>
-
-## Examples
-[See some examples in IronCalc](https://app.ironcalc.com/?example=cos).
-
-## Links
-* For more information about trigonometric cosine, visit Wikipedia's [Sine and cosine](https://en.wikipedia.org/wiki/Sine_and_cosine) page.
-* See also IronCalc's [ACOS](/functions/math_and_trigonometry/acos), [SIN](/functions/math_and_trigonometry/sin) and [TAN](/functions/math_and_trigonometry/tan) functions.
-* Visit Microsoft Excel's [COS function](https://support.microsoft.com/en-gb/office/cos-function-0fb808a5-95d6-4553-8148-22aebdce5f05) page.
-* Both [Google Sheets](https://support.google.com/docs/answer/3093476) and [LibreOffice Calc](https://wiki.documentfoundation.org/Documentation/Calc_Functions/COS) provide versions of the COS function.
+🚧 This function is implemented but currently lacks detailed documentation. For guidance, you may refer to the equivalent functionality in [Microsoft Excel documentation](https://support.microsoft.com/en-us/office/excel-functions-by-category-5f91f4e9-7b42-46d2-9bd1-63f26a86c0eb).
+:::
--- a/docs/src/functions/math_and_trigonometry/sin.md
+++ b/docs/src/functions/math_and_trigonometry/sin.md
@@ -3,41 +3,9 @@ layout: doc
 outline: deep
 lang: en-US
 ---
-# SIN function
+
+# SIN
+
 ::: warning
-**Note:** This draft page is under construction 🚧
-:::
-## Overview
-SIN is a function of the Math and Trigonometry category that calculates the trigonometric sine of an angle, returning a value in the range [-1, +1].
-## Usage
-### Syntax
-**SIN(<span title="Number" style="color:#1E88E5">angle</span>) => <span title="Number" style="color:#1E88E5">sin</span>**
-### Argument descriptions
-* *angle* ([number](/features/value-types#numbers), required). The angle whose sine is to be calculated, expressed in radians. To convert between degrees and radians, use the relation below. Alternatively, use the [DEGREES](/functions/math_and_trigonometry/degrees) or [RADIANS](/functions/math_and_trigonometry/radians) functions.
-$$
-1~\:~\text{degree} = \dfrac{\pi}{180} = 0.01745329252~\text{radians}
-$$
-
-### Additional guidance
-None.
-### Returned value
-SIN returns a unitless [number](/features/value-types#numbers) that is the trigonometric sine of the specified angle.
-### Error conditions
-* In common with many other IronCalc functions, SIN propagates errors that are found in its argument.
-* If no argument, or more than one argument, is supplied, then SIN returns the [`#ERROR!`](/features/error-types.md#error) error.
-* If the value of the *angle* argument is not (or cannot be converted to) a [number](/features/value-types#numbers), then SIN returns the [`#VALUE!`](/features/error-types.md#value) error.
-* For some argument values, SIN may return a [`#DIV/0!`](/features/error-types.md#div-0) error.
-<!--@include: ../markdown-snippets/error-type-details.txt-->
-## Details
-* The SIN function utilizes the *sin()* method provided by the [Rust Standard Library](https://doc.rust-lang.org/std/).
-* The figure below illustrates the output of the SIN function for angles $x$ in the range -2$\pi$ to +2$\pi$ radians.
-<center><img src="/functions/images/sine-curve.png" width="350" alt="Graph showing sin(x) for x between -2π and +2π."></center>
-
-## Examples
-[See some examples in IronCalc](https://app.ironcalc.com/?example=sin).
-
-## Links
-* For more information about trigonometric sine, visit Wikipedia's [Sine and cosine](https://en.wikipedia.org/wiki/Sine_and_cosine) page.
-* See also IronCalc's [ASIN](/functions/math_and_trigonometry/asin), [COS](/functions/math_and_trigonometry/cos) and [TAN](/functions/math_and_trigonometry/tan) functions.
-* Visit Microsoft Excel's [SIN function](https://support.microsoft.com/en-gb/office/sin-function-cf0e3432-8b9e-483c-bc55-a76651c95602) page.
-* Both [Google Sheets](https://support.google.com/docs/answer/3093447) and [LibreOffice Calc](https://wiki.documentfoundation.org/Documentation/Calc_Functions/SIN) provide versions of the SIN function.
+🚧 This function is implemented but currently lacks detailed documentation. For guidance, you may refer to the equivalent functionality in [Microsoft Excel documentation](https://support.microsoft.com/en-us/office/excel-functions-by-category-5f91f4e9-7b42-46d2-9bd1-63f26a86c0eb).
+:::
--- a/docs/src/functions/math_and_trigonometry/tan.md
+++ b/docs/src/functions/math_and_trigonometry/tan.md
@@ -3,42 +3,9 @@ layout: doc
 outline: deep
 lang: en-US
 ---
-# TAN function
+
+# TAN
+
 ::: warning
-**Note:** This draft page is under construction 🚧
-:::
-## Overview
-TAN is a function of the Math and Trigonometry category that calculates the trigonometric tangent of an angle, returning a value in the range (-$\infty$, +$\infty$).
-## Usage
-### Syntax
-**TAN(<span title="Number" style="color:#1E88E5">angle</span>) => <span title="Number" style="color:#1E88E5">tan</span>**
-### Argument descriptions
-* *angle* ([number](/features/value-types#numbers), required). The angle whose tangent is to be calculated, expressed in radians. To convert between degrees and radians, use the relation below. Alternatively, use the [DEGREES](/functions/math_and_trigonometry/degrees) or [RADIANS](/functions/math_and_trigonometry/radians) functions.
-$$
-1~\:~\text{degree} = \dfrac{\pi}{180} = 0.01745329252~\text{radians}
-$$
-
-### Additional guidance
-None.
-### Returned value
-TAN returns a unitless [number](/features/value-types#numbers) that is the trigonometric tangent of the specified angle.
-### Error conditions
-* In common with many other IronCalc functions, TAN propagates errors that are found in its argument.
-* If no argument, or more than one argument, is supplied, then TAN returns the [`#ERROR!`](/features/error-types.md#error) error.
-* If the value of the *angle* argument is not (or cannot be converted to) a [number](/features/value-types#numbers), then TAN returns the [`#VALUE!`](/features/error-types.md#value) error.
-* For some argument values, TAN may return a [`#DIV/0!`](/features/error-types.md#div-0) error.
-<!--@include: ../markdown-snippets/error-type-details.txt-->
-## Details
-* The TAN function utilizes the *tan()* method provided by the [Rust Standard Library](https://doc.rust-lang.org/std/).
-* The figure below illustrates the output of the TAN function for angles $x$ in the range -2$π$ to +2$π$.
-<center><img src="/functions/images/tangent-curve.png" width="350" alt="Graph showing tan(x) for x between -2π and +2π."></center>
-
-* Theoretically, $\text{tan}(x)$ is undefined for any critical $x$ that satisfies $x = \frac{\pi}{2} + k\pi$ (where $k$ is any integer). However, an exact representation of the mathmatical constant $\pi$ requires infinite precision, which cannot be achieved with the floating-point representation available. Hence, TAN will return very large or very small values close to critical $x$ values.
-## Examples
-[See some examples in IronCalc](https://app.ironcalc.com/?example=tan).
-
-## Links
-* For more information about trigonometric tangent, visit Wikipedia's [Trigonometric functions](https://en.wikipedia.org/wiki/Trigonometric_functions) page.
-* See also IronCalc's [ATAN](/functions/math_and_trigonometry/atan), [COS](/functions/math_and_trigonometry/cos) and [SIN](/functions/math_and_trigonometry/sin) functions.
-* Visit Microsoft Excel's [TAN function](https://support.microsoft.com/en-gb/office/tan-function-08851a40-179f-4052-b789-d7f699447401) page.
-* Both [Google Sheets](https://support.google.com/docs/answer/3093586) and [LibreOffice Calc](https://wiki.documentfoundation.org/Documentation/Calc_Functions/TAN) provide versions of the TAN function.
+🚧 This function is implemented but currently lacks detailed documentation. For guidance, you may refer to the equivalent functionality in [Microsoft Excel documentation](https://support.microsoft.com/en-us/office/excel-functions-by-category-5f91f4e9-7b42-46d2-9bd1-63f26a86c0eb).
+:::
--- a/docs/src/other-spreadsheets/index.md
+++ b/docs/src/other-spreadsheets/index.md
@@ -1,30 +0,0 @@
---
-layout: doc
-outline: deep
-lang: en-US
---
-
-::: warning
-**Note:** This draft page is under construction 🚧
-:::
-
-# Other spreadsheet engines
-
-There are numerous spreadsheet engines out there
-
-## Excel, the Friendly Giant
-
-## Google Sheets
-
-## LibreOffice
-
-## Gnumeric
-
-
-# Links
-
-For a list of spreadsheet software you can consult [wikipedia](https://en.wikipedia.org/wiki/List_of_spreadsheet_software).
-
-
-
-
--- a/docs/src/web-application/name-manager.md
+++ b/docs/src/web-application/name-manager.md
@@ -1,12 +0,0 @@
---
-layout: doc
-outline: deep
-lang: en-US
---
-
-# Name Manager
-
-::: warning
-**Note:** This draft page is under construction 🚧
-:::
-
--- a/webapp/src/components/NameManagerDialog/NameManagerDialog.tsx
+++ b/webapp/src/components/NameManagerDialog/NameManagerDialog.tsx
@@ -1,4 +1,4 @@
-import type { DefinedName, WorksheetProperties } from "@ironcalc/wasm";
+import type { Model } from "@ironcalc/wasm";
 import {
  Box,
  Button,
@@ -12,55 +12,42 @@ import {
 } from "@mui/material";
 import { t } from "i18next";
 import { BookOpen, Plus, X } from "lucide-react";
-import { useEffect, useState } from "react";
-import NamedRangeActive from "./NamedRangeActive";
-import NamedRangeInactive from "./NamedRangeInactive";
-
-export interface NameManagerProperties {
-  newDefinedName: (
-    name: string,
-    scope: number | undefined,
-    formula: string,
-  ) => void;
-  updateDefinedName: (
-    name: string,
-    scope: number | undefined,
-    newName: string,
-    newScope: number | undefined,
-    newFormula: string,
-  ) => void;
-  deleteDefinedName: (name: string, scope: number | undefined) => void;
-  selectedArea: () => string;
-  worksheets: WorksheetProperties[];
-  definedNameList: DefinedName[];
-}
+import { useState } from "react";
+import { getFullRangeToString } from "../util";
+import NamedRangeActive, { NamedRangeInactive } from "./NamedRange";

 interface NameManagerDialogProperties {
-  open: boolean;
  onClose: () => void;
-  model: NameManagerProperties;
+  open: boolean;
+  model: Model;
+  onNamesChanged: () => void;
 }

 function NameManagerDialog(properties: NameManagerDialogProperties) {
-  const { open, model, onClose } = properties;
-  const {
-    newDefinedName,
-    updateDefinedName,
-    deleteDefinedName,
-    selectedArea,
-    worksheets,
-    definedNameList,
-  } = model;
+  const { onClose, open, model, onNamesChanged } = properties;
+
  // If editingNameIndex is -1, then we are adding a new name
  // If editingNameIndex is -2, then we are not editing any name
  // If editingNameIndex is a positive number, then we are editing that index
  const [editingNameIndex, setEditingNameIndex] = useState(-2);

-  useEffect(() => {
-    if (open) {
-      setEditingNameIndex(-2);
-    }
-  }, [open]);
+  const handleNewName = () => {
+    setEditingNameIndex(-1);
+  };
+
+  const handleDelete = () => {
+    onNamesChanged();
+  };
+
+  const formatFormula = (): string => {
+    const worksheets = model.getWorksheetsProperties();
+    const selectedView = model.getSelectedView();
+
+    return getFullRangeToString(selectedView, worksheets);
+  };
+
+  const worksheets = model.getWorksheetsProperties();
+  const definedNameList = model.getDefinedNameList();

  return (
    <StyledDialog open={open} onClose={onClose} maxWidth={false} scroll="paper">
@@ -76,41 +63,18 @@ function NameManagerDialog(properties: NameManagerDialogProperties) {
          <StyledBox>{t("name_manager_dialog.range")}</StyledBox>
          <StyledBox>{t("name_manager_dialog.scope")}</StyledBox>
        </StyledRangesHeader>
-        <NameListWrapper>
+        <NameLisWrapper>
          {definedNameList.map((definedName, index) => {
-            const scopeName = definedName.scope
-              ? worksheets[definedName.scope].name
-              : "[global]";
            if (index === editingNameIndex) {
              return (
                <NamedRangeActive
+                  model={model}
                  worksheets={worksheets}
                  name={definedName.name}
-                  scope={scopeName}
+                  scope={definedName.scope}
                  formula={definedName.formula}
-                  key={definedName.name + definedName.scope}
-                  onSave={(
-                    newName,
-                    newScope,
-                    newFormula,
-                  ): string | undefined => {
-                    const scope_index = worksheets.findIndex(
-                      (s) => s.name === newScope,
-                    );
-                    const scope = scope_index > 0 ? scope_index : undefined;
-                    try {
-                      updateDefinedName(
-                        definedName.name,
-                        definedName.scope,
-                        newName,
-                        scope,
-                        newFormula,
-                      );
-                      setEditingNameIndex(-2);
-                    } catch (e) {
-                      return `${e}`;
-                    }
-                  }}
+                  key={definedName.name}
+                  onSave={onNamesChanged}
                  onCancel={() => setEditingNameIndex(-2)}
                />
              );
@@ -118,51 +82,36 @@ function NameManagerDialog(properties: NameManagerDialogProperties) {
            return (
              <NamedRangeInactive
                name={definedName.name}
-                scope={scopeName}
+                scope={definedName.scope}
                formula={definedName.formula}
-                key={definedName.name + definedName.scope}
-                showOptions={editingNameIndex === -2}
+                key={definedName.name}
                onEdit={() => setEditingNameIndex(index)}
-                onDelete={() => {
-                  deleteDefinedName(definedName.name, definedName.scope);
-                }}
+                onDelete={handleDelete}
              />
            );
          })}
-        </NameListWrapper>
+        </NameLisWrapper>
        {editingNameIndex === -1 && (
          <NamedRangeActive
-            worksheets={worksheets}
-            name={""}
-            formula={selectedArea()}
-            scope={"[global]"}
-            onSave={(name, scope, formula): string | undefined => {
-              const scope_index = worksheets.findIndex((s) => s.name === scope);
-              const scope_value = scope_index > 0 ? scope_index : undefined;
-              try {
-                newDefinedName(name, scope_value, formula);
-                setEditingNameIndex(-2);
-              } catch (e) {
-                return `${e}`;
-              }
-            }}
-            onCancel={() => setEditingNameIndex(-2)}
-          />
-        )}
+          model={model}
+          worksheets={worksheets}
+          name={"Name1"}
+          scope={0}
+          formula={formatFormula()}
+          onSave={onNamesChanged}
+          onCancel={() => setEditingNameIndex(-2)}
+        />)
+      }
      </StyledDialogContent>
      <StyledDialogActions>
        <Box display="flex" alignItems="center" gap={"8px"}>
          <BookOpen color="grey" size={16} />
-          <UploadFooterLink
-            href="https://docs.ironcalc.com/web-application/name-manager.html"
-            target="_blank"
-            rel="noopener noreferrer"
-          >
+          <span style={{ fontSize: "12px", fontFamily: "Inter" }}>
            {t("name_manager_dialog.help")}
-          </UploadFooterLink>
+          </span>
        </Box>
        <Button
-          onClick={() => setEditingNameIndex(-1)}
+          onClick={handleNewName}
          variant="contained"
          disableElevation
          sx={{ textTransform: "none" }}
@@ -176,17 +125,23 @@ function NameManagerDialog(properties: NameManagerDialogProperties) {
  );
 }

+const NameLisWrapper = styled(Stack)`
+  overflow-y: auto;
+`;
+
+const StyledBox = styled("div")`
+  width: 171px;
+`;
+
 const StyledDialog = styled(Dialog)(() => ({
  "& .MuiPaper-root": {
    height: "380px",
-    minHeight: "200px",
    minWidth: "620px",
  },
 }));

 const StyledDialogTitle = styled(DialogTitle)`
  padding: 12px 20px;
-  height: 20px;
  font-size: 14px;
  font-weight: 600;
  display: flex;
@@ -194,15 +149,6 @@ const StyledDialogTitle = styled(DialogTitle)`
  justify-content: space-between;
 `;

-const NameListWrapper = styled(Stack)`
-  overflow-y: auto;
-  gap: 12px;
-`;
-
-const StyledBox = styled(Box)`
-  width: 161.67px;
-`;
-
 const StyledDialogContent = styled(DialogContent)`
  display: flex;
  flex-direction: column;
@@ -210,10 +156,9 @@ const StyledDialogContent = styled(DialogContent)`
  padding: 20px 12px 20px 20px;
 `;

-const StyledRangesHeader = styled(Stack)(({ theme }) => ({
-  flexDirection: "row",
-  padding: "0 8px",
-  gap: "12px",
+const StyledRangesHeader = styled(Box)(({ theme }) => ({
+  display: "flex",
+  paddingLeft: "6px",
  fontFamily: theme.typography.fontFamily,
  fontSize: "12px",
  fontWeight: "700",
@@ -230,15 +175,4 @@ const StyledDialogActions = styled(DialogActions)`
  color: #757575;
 `;

-const UploadFooterLink = styled("a")`
-  font-size: 12px;
-  font-weight: 400;
-  font-family: "Inter";
-  color: #757575;
-  text-decoration: none;
-  &:hover {
-    text-decoration: underline;
-  }
-`;
-
 export default NameManagerDialog;
--- a/webapp/src/components/NameManagerDialog/NamedRange.tsx
+++ b/webapp/src/components/NameManagerDialog/NamedRange.tsx
@@ -0,0 +1,244 @@
+import type { Model, WorksheetProperties } from "@ironcalc/wasm";
+import {
+  Box,
+  Divider,
+  IconButton,
+  MenuItem,
+  TextField,
+  styled,
+} from "@mui/material";
+import { t } from "i18next";
+import { Check, PencilLine, Trash2, X } from "lucide-react";
+import { useEffect, useState } from "react";
+
+interface NamedRangeProperties {
+  model: Model;
+  worksheets: WorksheetProperties[];
+  name: string;
+  scope?: number;
+  formula: string;
+  onSave: () => void;
+  onCancel: () => void;
+}
+
+interface NamedRangeInactiveProperties {
+  name: string;
+  scope?: number;
+  formula: string;
+  onDelete: () => void;
+  onEdit: () => void;
+}
+
+export function NamedRangeInactive(properties: NamedRangeInactiveProperties) {
+  const { name, scope, formula, onDelete, onEdit } = properties;
+  const showOptions = true;
+  return (
+    <WrappedLine>
+      <StyledDiv>{name}</StyledDiv>
+      <StyledDiv>{scope}</StyledDiv>
+      <StyledDiv>{formula}</StyledDiv>
+      <WrappedIcons>
+        <IconButton onClick={onEdit} disabled={!showOptions}>
+          <StyledPencilLine size={12} />
+        </IconButton>
+        <StyledIconButton onClick={onDelete} disabled={!showOptions}>
+          <Trash2 size={12} />
+        </StyledIconButton>
+      </WrappedIcons>
+    </WrappedLine>
+  );
+}
+
+function NamedRangeActive(properties: NamedRangeProperties) {
+  const { model, worksheets, name, scope, formula, onCancel, onSave } =
+    properties;
+  const [newName, setNewName] = useState(name || "");
+  const [newScope, setNewScope] = useState(scope);
+  const [newFormula, setNewFormula] = useState(formula);
+  const [readOnly, setReadOnly] = useState(true);
+  const [showEditDelete, setShowEditDelete] = useState(false);
+
+  // todo: add error messages for validations
+  const [nameError, setNameError] = useState(false);
+  const [formulaError, setFormulaError] = useState(false);
+
+  useEffect(() => {
+    // set state for new name
+    const definedNamesModel = model.getDefinedNameList();
+    if (!definedNamesModel.find((n) => n.name === newName)) {
+      setReadOnly(false);
+      setShowEditDelete(true);
+    }
+  }, [newName, model]);
+
+  const handleSaveUpdate = () => {
+    const definedNamesModel = model.getDefinedNameList();
+
+    if (definedNamesModel.find((n) => n.name === name)) {
+      // update name
+      try {
+        model.updateDefinedName(
+          name || "",
+          scope,
+          newName,
+          newScope,
+          newFormula
+        );
+      } catch (error) {
+        console.log("DefinedName update failed", error);
+      }
+    } else {
+      // create name
+      try {
+        model.newDefinedName(newName, newScope, newFormula);
+      } catch (error) {
+        console.log("DefinedName save failed", error);
+      }
+      setReadOnly(true);
+    }
+    setShowEditDelete(false);
+  };
+
+  const handleCancel = () => {
+    setReadOnly(true);
+    setShowEditDelete(false);
+    setNewName(name || "");
+    setNewScope(scope);
+  };
+
+  const handleEdit = () => {
+    setReadOnly(false);
+    setShowEditDelete(true);
+  };
+
+  const handleDelete = () => {
+    try {
+      model.deleteDefinedName(newName, newScope);
+    } catch (error) {
+      console.log("DefinedName delete failed", error);
+    }
+  };
+
+  return (
+    <>
+      <StyledBox>
+        <StyledTextField
+          id="name"
+          variant="outlined"
+          size="small"
+          margin="none"
+          fullWidth
+          error={nameError}
+          value={newName}
+          onChange={(event) => setNewName(event.target.value)}
+          onKeyDown={(event) => {
+            event.stopPropagation();
+          }}
+          onClick={(event) => event.stopPropagation()}
+        />
+        <StyledTextField
+          id="scope"
+          variant="outlined"
+          select
+          size="small"
+          margin="none"
+          fullWidth
+          value={newScope ?? "global"}
+          onChange={(event) => {
+            event.target.value === "global"
+              ? setNewScope(undefined)
+              : setNewScope(+event.target.value);
+          }}
+        >
+          <MenuItem value={"global"}>
+            {t("name_manager_dialog.workbook")}
+          </MenuItem>
+          {worksheets.map((option, index) => (
+            <MenuItem key={option.name} value={index}>
+              {option.name}
+            </MenuItem>
+          ))}
+        </StyledTextField>
+        <StyledTextField
+          id="formula"
+          variant="outlined"
+          size="small"
+          margin="none"
+          fullWidth
+          error={formulaError}
+          value={newFormula}
+          onChange={(event) => setNewFormula(event.target.value)}
+          onKeyDown={(event) => {
+            event.stopPropagation();
+          }}
+          onClick={(event) => event.stopPropagation()}
+        />
+        <>
+          <IconButton onClick={handleSaveUpdate}>
+            <StyledCheck size={12} />
+          </IconButton>
+          <StyledIconButton onClick={onCancel}>
+            <X size={12} />
+          </StyledIconButton>
+        </>
+      </StyledBox>
+    </>
+  );
+}
+
+const StyledBox = styled(Box)`
+  display: flex;
+  width: 577px;
+`;
+
+const StyledPencilLine = styled(PencilLine)(({ theme }) => ({
+  color: theme.palette.common.black,
+}));
+
+const StyledCheck = styled(Check)(({ theme }) => ({
+  color: theme.palette.success.main,
+}));
+
+const StyledTextField = styled(TextField)(() => ({
+  padding: "0px",
+  width: "163px",
+  marginRight: "8px",
+  "& .MuiInputBase-root": {
+    height: "28px",
+    margin: 0,
+  },
+  "& .MuiInputBase-input": {
+    padding: "6px",
+    fontSize: "12px",
+  },
+}));
+
+const StyledIconButton = styled(IconButton)(({ theme }) => ({
+  color: theme.palette.error.main,
+  "&.Mui-disabled": {
+    opacity: 0.6,
+    color: theme.palette.error.light,
+  },
+}));
+
+
+const WrappedLine = styled(Box)({
+  display: "flex",
+  paddingLeft: "6px",
+  height: "28px",
+});
+
+const StyledDiv = styled("div")(({ theme }) => ({
+  fontFamily: theme.typography.fontFamily,
+  fontSize: "12px",
+  fontWeight: "400",
+  color: theme.palette.common.black,
+  width: "171px",
+}));
+
+const WrappedIcons = styled(Box)({
+  display: "flex",
+  gap: "0px",
+});
+
+export default NamedRangeActive;
--- a/webapp/src/components/NameManagerDialog/NamedRangeActive.tsx
+++ b/webapp/src/components/NameManagerDialog/NamedRangeActive.tsx
@@ -1,154 +0,0 @@
-import type { WorksheetProperties } from "@ironcalc/wasm";
-import {
-  Box,
-  Divider,
-  IconButton,
-  MenuItem,
-  TextField,
-  styled,
-} from "@mui/material";
-import { t } from "i18next";
-import { Check, X } from "lucide-react";
-import { useState } from "react";
-import { theme } from "../../theme";
-
-interface NamedRangeProperties {
-  worksheets: WorksheetProperties[];
-  name: string;
-  scope: string;
-  formula: string;
-  onSave: (name: string, scope: string, formula: string) => string | undefined;
-  onCancel: () => void;
-}
-
-function NamedRangeActive(properties: NamedRangeProperties) {
-  const { worksheets, onSave, onCancel } = properties;
-  const [name, setName] = useState(properties.name);
-  const [scope, setScope] = useState(properties.scope);
-  const [formula, setFormula] = useState(properties.formula);
-
-  const [formulaError, setFormulaError] = useState(false);
-
-  return (
-    <>
-      <StyledBox>
-        <StyledTextField
-          id="name"
-          variant="outlined"
-          size="small"
-          margin="none"
-          fullWidth
-          error={formulaError}
-          value={name}
-          onChange={(event) => setName(event.target.value)}
-          onKeyDown={(event) => {
-            event.stopPropagation();
-          }}
-          onClick={(event) => event.stopPropagation()}
-        />
-        <StyledTextField
-          id="scope"
-          variant="outlined"
-          select
-          size="small"
-          margin="none"
-          fullWidth
-          error={formulaError}
-          value={scope}
-          onChange={(event) => {
-            setScope(event.target.value);
-          }}
-        >
-          <MenuItem value={"[global]"}>
-            <MenuSpan>{t("name_manager_dialog.workbook")}</MenuSpan>
-            <MenuSpanGrey>{` ${t("name_manager_dialog.global")}`}</MenuSpanGrey>
-          </MenuItem>
-          {worksheets.map((option) => (
-            <MenuItem key={option.name} value={option.name}>
-              <MenuSpan>{option.name}</MenuSpan>
-            </MenuItem>
-          ))}
-        </StyledTextField>
-        <StyledTextField
-          id="formula"
-          variant="outlined"
-          size="small"
-          margin="none"
-          fullWidth
-          error={formulaError}
-          value={formula}
-          onChange={(event) => setFormula(event.target.value)}
-          onKeyDown={(event) => {
-            event.stopPropagation();
-          }}
-          onClick={(event) => event.stopPropagation()}
-        />
-        <IconsWrapper>
-          <IconButton
-            onClick={() => {
-              const error = onSave(name, scope, formula);
-              if (error) {
-                setFormulaError(true);
-              }
-            }}
-          >
-            <StyledCheck size={12} />
-          </IconButton>
-          <StyledIconButton onClick={onCancel}>
-            <X size={12} />
-          </StyledIconButton>
-        </IconsWrapper>
-      </StyledBox>
-      <Divider />
-    </>
-  );
-}
-
-const MenuSpan = styled("span")`
-  font-size: 12px;
-  font-family: "Inter";
-`;
-
-const MenuSpanGrey = styled("span")`
-  white-space: pre;
-  font-size: 12px;
-  font-family: "Inter";
-  color: ${theme.palette.grey[400]};
-`;
-
-const StyledBox = styled(Box)`
-  display: flex;
-  gap: 12px;
-  width: 577px;
-`;
-
-const StyledTextField = styled(TextField)(() => ({
-  "& .MuiInputBase-root": {
-    height: "28px",
-    width: "161.67px",
-    margin: 0,
-    fontFamily: "Inter",
-    fontSize: "12px",
-  },
-  "& .MuiInputBase-input": {
-    padding: "8px",
-  },
-}));
-
-const StyledIconButton = styled(IconButton)(({ theme }) => ({
-  color: theme.palette.error.main,
-  "&.Mui-disabled": {
-    opacity: 0.6,
-    color: theme.palette.error.light,
-  },
-}));
-
-const StyledCheck = styled(Check)(({ theme }) => ({
-  color: theme.palette.success.main,
-}));
-
-const IconsWrapper = styled(Box)({
-  display: "flex",
-});
-
-export default NamedRangeActive;
--- a/webapp/src/components/NameManagerDialog/NamedRangeInactive.tsx
+++ b/webapp/src/components/NameManagerDialog/NamedRangeInactive.tsx
@@ -1,76 +0,0 @@
-import { Box, Divider, IconButton, styled } from "@mui/material";
-import { t } from "i18next";
-import { PencilLine, Trash2 } from "lucide-react";
-
-interface NamedRangeInactiveProperties {
-  name: string;
-  scope: string;
-  formula: string;
-  onDelete: () => void;
-  onEdit: () => void;
-  showOptions: boolean;
-}
-
-function NamedRangeInactive(properties: NamedRangeInactiveProperties) {
-  const { name, scope, formula, onDelete, onEdit, showOptions } = properties;
-
-  const scopeName =
-    scope === "[global]"
-      ? `${t("name_manager_dialog.workbook")} ${t(
-          "name_manager_dialog.global",
-        )}`
-      : scope;
-
-  return (
-    <>
-      <WrappedLine>
-        <StyledDiv>{name}</StyledDiv>
-        <StyledDiv>{scopeName}</StyledDiv>
-        <StyledDiv>{formula}</StyledDiv>
-        <IconsWrapper>
-          <StyledIconButtonBlack onClick={onEdit} disabled={!showOptions}>
-            <PencilLine size={12} />
-          </StyledIconButtonBlack>
-          <StyledIconButtonRed onClick={onDelete} disabled={!showOptions}>
-            <Trash2 size={12} />
-          </StyledIconButtonRed>
-        </IconsWrapper>
-      </WrappedLine>
-      <Divider />
-    </>
-  );
-}
-
-const StyledIconButtonBlack = styled(IconButton)(({ theme }) => ({
-  color: theme.palette.common.black,
-}));
-
-const StyledIconButtonRed = styled(IconButton)(({ theme }) => ({
-  color: theme.palette.error.main,
-  "&.Mui-disabled": {
-    opacity: 0.6,
-    color: theme.palette.error.light,
-  },
-}));
-
-const WrappedLine = styled(Box)({
-  display: "flex",
-  height: "28px",
-  alignItems: "center",
-  gap: "12px",
-});
-
-const StyledDiv = styled("div")(({ theme }) => ({
-  fontFamily: theme.typography.fontFamily,
-  fontSize: "12px",
-  fontWeight: "400",
-  color: theme.palette.common.black,
-  width: "153.67px",
-  paddingLeft: "8px",
-}));
-
-const IconsWrapper = styled(Box)({
-  display: "flex",
-});
-
-export default NamedRangeInactive;
--- a/webapp/src/components/NameManagerDialog/index.ts
+++ b/webapp/src/components/NameManagerDialog/index.ts
@@ -1 +0,0 @@
-export { default } from "./NameManagerDialog";
--- a/webapp/src/components/NameManagerDialog/index.tsx
+++ b/webapp/src/components/NameManagerDialog/index.tsx
@@ -0,0 +1 @@
+export { default } from "./NameManagerDialog";
--- a/webapp/src/components/borderPicker.tsx
+++ b/webapp/src/components/borderPicker.tsx
@@ -62,7 +62,7 @@ const BorderPicker = (properties: BorderPickerProps) => {
  // biome-ignore lint/correctness/useExhaustiveDependencies: We reset the styles, every time we open (or close) the widget
  useEffect(() => {
    setBorderSelected(null);
-    setBorderColor(theme.palette.common.black);
+    setBorderColor(theme.palette.common.white);
    setBorderStyle(BorderStyle.Thin);
  }, [properties.open]);

--- a/webapp/src/components/tests/util.test.ts
+++ b/webapp/src/components/tests/util.test.ts
@@ -1,8 +1,6 @@
-import { readFile } from "node:fs/promises";
-import { type SelectedView, initSync } from "@ironcalc/wasm";
 import { expect, test } from "vitest";
 import { decreaseDecimalPlaces, increaseDecimalPlaces } from "../formatUtil";
-import { getFullRangeToString, isNavigationKey } from "../util";
+import { isNavigationKey } from "../util";

 test("checks arrow left is a navigation key", () => {
  expect(isNavigationKey("ArrowLeft")).toBe(true);
@@ -26,22 +24,3 @@ test("decrease decimals", () => {
    'dddd"," mmmm dd"," yyyy',
  );
 });
-
-test("format range to get the full formula", async () => {
-  const buffer = await readFile("node_modules/@ironcalc/wasm/wasm_bg.wasm");
-  initSync(buffer);
-
-  const selectedView: SelectedView = {
-    sheet: 0,
-    row: 1,
-    column: 8,
-    range: [1, 8, 1, 8],
-    top_row: 1,
-    left_column: 8,
-  };
-  const worksheetNames = ["Sheet1", "Notes"];
-
-  expect(getFullRangeToString(selectedView, worksheetNames)).toBe(
-    "Sheet1!$H$1",
-  );
-});
--- a/webapp/src/components/toolbar.tsx
+++ b/webapp/src/components/toolbar.tsx
@@ -1,6 +1,7 @@
 import type {
  BorderOptions,
  HorizontalAlignment,
+  Model,
  VerticalAlignment,
 } from "@ironcalc/wasm";
 import { styled } from "@mui/material/styles";
@@ -36,7 +37,6 @@ import {
 } from "../icons";
 import { theme } from "../theme";
 import NameManagerDialog from "./NameManagerDialog";
-import type { NameManagerProperties } from "./NameManagerDialog/NameManagerDialog";
 import BorderPicker from "./borderPicker";
 import ColorPicker from "./colorPicker";
 import { TOOLBAR_HEIGHT } from "./constants";
@@ -75,7 +75,8 @@ type ToolbarProperties = {
  numFmt: string;
  showGridLines: boolean;
  onToggleShowGridLines: (show: boolean) => void;
-  nameManagerProperties: NameManagerProperties;
+  onNamesChanged: () => void;
+  model: Model;
 };

 function Toolbar(properties: ToolbarProperties) {
@@ -397,7 +398,8 @@ function Toolbar(properties: ToolbarProperties) {
        onClose={() => {
          setNameManagerDialogOpen(false);
        }}
-        model={properties.nameManagerProperties}
+        model={properties.model}
+        onNamesChanged={properties.onNamesChanged}
      />
    </ToolbarContainer>
  );
--- a/webapp/src/components/util.ts
+++ b/webapp/src/components/util.ts
@@ -1,6 +1,10 @@
 import type { Area, Cell } from "./types";

-import { type SelectedView, columnNameFromNumber } from "@ironcalc/wasm";
+import {
+  type SelectedView,
+  type WorksheetProperties,
+  columnNameFromNumber,
+} from "@ironcalc/wasm";

 /**
 *  Returns true if the keypress should start editing
@@ -57,24 +61,24 @@ export function rangeToStr(
  if (rowStart === rowEnd && columnStart === columnEnd) {
    return `${sheetName}${columnNameFromNumber(columnStart)}${rowStart}`;
  }
-  return `${sheetName}${columnNameFromNumber(
-    columnStart,
-  )}${rowStart}:${columnNameFromNumber(columnEnd)}${rowEnd}`;
+  return `${sheetName}${columnNameFromNumber(columnStart)}${rowStart}:${columnNameFromNumber(
+    columnEnd,
+  )}${rowEnd}`;
 }

-// Returns the full range of the selected view as a string in absolute form
-// e.g. 'Sheet1!$A$1:$B$2' or 'Sheet1!$A$1'
 export function getFullRangeToString(
  selectedView: SelectedView,
-  worksheetNames: string[],
+  worksheets: WorksheetProperties[],
 ): string {
+  // order of values is confusing compared to rangeToStr range type, needs refactoring for consistency
  const [rowStart, columnStart, rowEnd, columnEnd] = selectedView.range;
-  const sheetName = `${worksheetNames[selectedView.sheet]}`;
+  const sheetNames = worksheets.map((s) => s.name);
+  const sheetName = `${sheetNames[selectedView.sheet]}!`;

  if (rowStart === rowEnd && columnStart === columnEnd) {
-    return `${sheetName}!$${columnNameFromNumber(columnStart)}$${rowStart}`;
+    return `${sheetName}${columnNameFromNumber(columnStart)}${rowStart}`;
  }
-  return `${sheetName}!$${columnNameFromNumber(
-    columnStart,
-  )}$${rowStart}:$${columnNameFromNumber(columnEnd)}$${rowEnd}`;
+  return `${sheetName}${columnNameFromNumber(columnStart)}${rowStart}:${columnNameFromNumber(
+    columnEnd,
+  )}${rowEnd}`;
 }
--- a/webapp/src/components/workbook.tsx
+++ b/webapp/src/components/workbook.tsx
@@ -21,11 +21,7 @@ import {
 import FormulaBar from "./formulabar";
 import Toolbar from "./toolbar";
 import useKeyboardNavigation from "./useKeyboardNavigation";
-import {
-  type NavigationKey,
-  getCellAddress,
-  getFullRangeToString,
-} from "./util";
+import { type NavigationKey, getCellAddress } from "./util";
 import type { WorkbookState } from "./workbookState";
 import Worksheet from "./worksheet";

@@ -36,13 +32,11 @@ const Workbook = (props: { model: Model; workbookState: WorkbookState }) => {
  // Calling `setRedrawId((id) => id + 1);` forces a redraw
  // This is needed because `model` or `workbookState` can change without React being aware of it
  const setRedrawId = useState(0)[1];
-
-  const worksheets = model.getWorksheetsProperties();
-  const info = worksheets.map(
-    ({ name, color, sheet_id, state }: WorksheetProperties) => {
+  const info = model
+    .getWorksheetsProperties()
+    .map(({ name, color, sheet_id, state }: WorksheetProperties) => {
      return { name, color: color ? color : "#FFF", sheetId: sheet_id, state };
-    },
-  );
+    });
  const focusWorkbook = useCallback(() => {
    if (rootRef.current) {
      rootRef.current.focus();
@@ -143,16 +137,17 @@ const Workbook = (props: { model: Model; workbookState: WorkbookState }) => {
    // FIXME: This is so that the cursor indicates there are styles to be pasted
    const el = rootRef.current?.getElementsByClassName("sheet-container")[0];
    if (el) {
-      (el as HTMLElement).style.cursor =
-        `url('data:image/svg+xml;utf8,${encodeURIComponent(
-          ReactDOMServer.renderToString(
-            <PaintRoller
-              width={24}
-              height={24}
-              style={{ transform: "rotate(-8deg)" }}
-            />,
-          ),
-        )}'), auto`;
+      (
+        el as HTMLElement
+      ).style.cursor = `url('data:image/svg+xml;utf8,${encodeURIComponent(
+        ReactDOMServer.renderToString(
+          <PaintRoller
+            width={24}
+            height={24}
+            style={{ transform: "rotate(-8deg)" }}
+          />
+        )
+      )}'), auto`;
    }
  };

@@ -174,12 +169,12 @@ const Workbook = (props: { model: Model; workbookState: WorkbookState }) => {
        row,
        column,
        row + height,
-        column + width,
+        column + width
      );
      setRedrawId((id) => id + 1);
    },
    onExpandAreaSelectedKeyboard: (
-      key: "ArrowRight" | "ArrowLeft" | "ArrowUp" | "ArrowDown",
+      key: "ArrowRight" | "ArrowLeft" | "ArrowUp" | "ArrowDown"
    ): void => {
      model.onExpandSelectedRange(key);
      setRedrawId((id) => id + 1);
@@ -333,7 +328,7 @@ const Workbook = (props: { model: Model; workbookState: WorkbookState }) => {
    } = model.getSelectedView();
    return getCellAddress(
      { rowStart, rowEnd, columnStart, columnEnd },
-      { row, column },
+      { row, column }
    );
  }, [model]);

@@ -410,7 +405,7 @@ const Workbook = (props: { model: Model; workbookState: WorkbookState }) => {
            source.sheet,
            source.area,
            data,
-            source.type === "cut",
+            source.type === "cut"
          );
          setRedrawId((id) => id + 1);
        } else if (mimeType === "text/plain") {
@@ -441,7 +436,7 @@ const Workbook = (props: { model: Model; workbookState: WorkbookState }) => {
        // '2024-10-18T14:07:37.599Z'

        let clipboardId = sessionStorage.getItem(
-          CLIPBOARD_ID_SESSION_STORAGE_KEY,
+          CLIPBOARD_ID_SESSION_STORAGE_KEY
        );
        if (!clipboardId) {
          clipboardId = getNewClipboardId();
@@ -479,7 +474,7 @@ const Workbook = (props: { model: Model; workbookState: WorkbookState }) => {
        // '2024-10-18T14:07:37.599Z'

        let clipboardId = sessionStorage.getItem(
-          CLIPBOARD_ID_SESSION_STORAGE_KEY,
+          CLIPBOARD_ID_SESSION_STORAGE_KEY
        );
        if (!clipboardId) {
          clipboardId = getNewClipboardId();
@@ -551,7 +546,7 @@ const Workbook = (props: { model: Model; workbookState: WorkbookState }) => {
          };
          model.setAreaWithBorder(
            { sheet, row, column, width, height },
-            borderArea,
+            borderArea
          );
          setRedrawId((id) => id + 1);
        }}
@@ -575,37 +570,9 @@ const Workbook = (props: { model: Model; workbookState: WorkbookState }) => {
          model.setShowGridLines(sheet, show);
          setRedrawId((id) => id + 1);
        }}
-        nameManagerProperties={{
-          newDefinedName: (
-            name: string,
-            scope: number | undefined,
-            formula: string,
-          ) => {
-            model.newDefinedName(name, scope, formula);
-            setRedrawId((id) => id + 1);
-          },
-          updateDefinedName: (
-            name: string,
-            scope: number | undefined,
-            newName: string,
-            newScope: number | undefined,
-            newFormula: string,
-          ) => {
-            model.updateDefinedName(name, scope, newName, newScope, newFormula);
-            setRedrawId((id) => id + 1);
-          },
-          deleteDefinedName: (name: string, scope: number | undefined) => {
-            model.deleteDefinedName(name, scope);
-            setRedrawId((id) => id + 1);
-          },
-          selectedArea: () => {
-            const worksheetNames = worksheets.map((s) => s.name);
-            const selectedView = model.getSelectedView();
-
-            return getFullRangeToString(selectedView, worksheetNames);
-          },
-          worksheets,
-          definedNameList: model.getDefinedNameList(),
+        model={model}
+        onNamesChanged={() => {
+          setRedrawId((id) => id + 1);
        }}
      />
      <FormulaBar
--- a/webapp/src/locale/en_us.json
+++ b/webapp/src/locale/en_us.json
@@ -59,14 +59,12 @@
  "num_fmt": {
    "title": "Custom number format",
    "label": "Number format",
-    "close": "Close dialog",
    "save": "Save"
  },
  "sheet_rename": {
    "rename": "Save",
    "label": "New name",
-    "title": "Rename Sheet",
-    "close": "Close dialog"
+    "title": "Rename Sheet"
  },
  "formula_input": {
    "update": "Update",
@@ -84,7 +82,6 @@
    "scope": "Range",
    "help": "Learn more about Named Ranges",
    "new": "Add new",
-    "workbook": "Workbook",
-    "global": "(Global)"
+    "workbook": "Workbook (Global)"
  }
 }
--- a/xlsx/src/export/worksheets.rs
+++ b/xlsx/src/export/worksheets.rs
@@ -192,10 +192,9 @@ pub(crate) fn get_worksheet_xml(
                        &parsed_formulas[*f as usize],
                    );
                    let style = get_cell_style_attribute(*s);
-                    let escaped_v = escape_xml(v);

                    row_data_str.push(format!(
-                        "<c r=\"{cell_name}\" t=\"str\"{style}><f>{formula}</f><v>{escaped_v}</v></c>"
+                        "<c r=\"{cell_name}\" t=\"str\"{style}><f>{formula}</f><v>{v}</v></c>"
                    ));
                }
                Cell::CellFormulaError {
--- a/xlsx/tests/calc_tests/DATE.xlsx
+++ b/xlsx/tests/calc_tests/DATE.xlsx
--- a/xlsx/tests/calc_tests/escape_strings.xlsx
+++ b/xlsx/tests/calc_tests/escape_strings.xlsx
--- a/xlsx/tests/docs/COS.xlsx
+++ b/xlsx/tests/docs/COS.xlsx
--- a/xlsx/tests/docs/DAY.xlsx
+++ b/xlsx/tests/docs/DAY.xlsx
--- a/xlsx/tests/docs/PV.xlsx
+++ b/xlsx/tests/docs/PV.xlsx
--- a/xlsx/tests/docs/SIN.xlsx
+++ b/xlsx/tests/docs/SIN.xlsx
--- a/xlsx/tests/docs/TAN.xlsx
+++ b/xlsx/tests/docs/TAN.xlsx
--- a/xlsx/tests/test.rs
+++ b/xlsx/tests/test.rs
@@ -465,13 +465,11 @@ fn test_documentation_xlsx() {
        .unwrap();
    entries.sort();
    // We can't test volatiles
-    let mut skip = vec!["DATE.xlsx", "DAY.xlsx", "MONTH.xlsx", "YEAR.xlsx"];
-    // Numerically unstable
-    skip.push("TAN.xlsx");
-    let skip: Vec<String> = skip.iter().map(|s| format!("tests/docs/{s}")).collect();
+    let skip = ["DATE.xlsx", "DAY.xlsx", "MONTH.xlsx", "YEAR.xlsx"];
+    let skip = skip.map(|s| format!("tests/docs/{s}"));
    println!("{:?}", skip);
    // dumb counter to make sure we are actually testing the files
-    assert!(entries.len() > 7);
+    assert_eq!(entries.len(), 7);
    let temp_folder = env::temp_dir();
    let path = format!("{}", Uuid::new_v4());
    let dir = temp_folder.join(path);
Author	SHA1	Message	Date
Nicolás Hatcher	ae661f8e93	WIP	2024-12-30 11:46:46 +01:00
francisco aloi	e5265ce3ad	refactored NameManager logic for new design	2024-12-29 18:12:00 +01:00
francisco aloi	17ba7a5f84	NamedRanges changes	2024-12-28 12:32:40 +01:00
				`@@ -1 +0,0 @@`
				`export { default } from "./NameManagerDialog";`
				`@@ -0,0 +1 @@`
				`export { default } from "./NameManagerDialog";`