BOB

base/src/model.rs

@@ -431,6 +431,7 @@ impl Model {
                 if let Some(parsed_defined_name) = parsed_defined_name {
                     match parsed_defined_name {
                         ParsedDefinedName::CellReference(reference) => {
+                            println!("Here: {}", reference);
                             self.evaluate_cell(*reference)
                         }
                         ParsedDefinedName::RangeReference(range) => CalcResult::Range {

base/src/test/user_model/test_paste_csv.rs

@@ -99,7 +99,7 @@ fn cut_paste() {
 
     // paste in cell D4 (4, 4)
     model
-        .paste_from_clipboard(0, (1, 1, 2, 2), &copy.data, true)
+        .paste_from_clipboard((1, 1, 2, 2), &copy.data, true)
         .unwrap();
 
     assert_eq!(model.get_cell_content(0, 4, 4), Ok("42".to_string()));
@@ -119,26 +119,6 @@ fn cut_paste() {
     assert_eq!(model.get_cell_content(0, 2, 2), Ok("".to_string()));
 }
 
-#[test]
-fn cut_paste_different_sheet() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model.set_user_input(0, 1, 1, "42").unwrap();
-
-    model.set_selected_range(1, 1, 1, 1).unwrap();
-    let copy = model.copy_to_clipboard().unwrap();
-    model.new_sheet().unwrap();
-    model.set_selected_sheet(1).unwrap();
-    model.set_selected_cell(4, 4).unwrap();
-
-    // paste in cell D4 (4, 4) of Sheet2
-    model
-        .paste_from_clipboard(0, (1, 1, 1, 1), &copy.data, true)
-        .unwrap();
-
-    assert_eq!(model.get_cell_content(1, 4, 4), Ok("42".to_string()));
-    assert_eq!(model.get_cell_content(0, 1, 1), Ok("".to_string()));
-}
-
 #[test]
 fn copy_paste_internal() {
     let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
@@ -172,7 +152,7 @@ fn copy_paste_internal() {
 
     // paste in cell D4 (4, 4)
     model
-        .paste_from_clipboard(0, (1, 1, 2, 2), &copy.data, false)
+        .paste_from_clipboard((1, 1, 2, 2), &copy.data, false)
         .unwrap();
 
     assert_eq!(model.get_cell_content(0, 4, 4), Ok("42".to_string()));

base/src/user_model/common.rs

@@ -39,7 +39,6 @@ pub struct ClipboardCell {
 pub struct Clipboard {
     pub(crate) csv: String,
     pub(crate) data: ClipboardData,
-    pub(crate) sheet: u32,
     pub(crate) range: (i32, i32, i32, i32),
 }
 
@@ -1521,7 +1520,6 @@ impl UserModel {
         Ok(Clipboard {
             csv,
             data,
-            sheet,
             range: (row_start, column_start, row_end, column_end),
         })
     }
@@ -1529,7 +1527,6 @@ impl UserModel {
     /// Paste text that we copied
     pub fn paste_from_clipboard(
         &mut self,
-        source_sheet: u32,
         source_range: ClipboardTuple,
         clipboard: &ClipboardData,
         is_cut: bool,
@@ -1620,17 +1617,17 @@ impl UserModel {
                     let old_value = self
                         .model
                         .workbook
-                        .worksheet(source_sheet)?
+                        .worksheet(sheet)?
                         .cell(row, column)
                         .cloned();
 
                     diff_list.push(Diff::CellClearContents {
-                        sheet: source_sheet,
+                        sheet,
                         row,
                         column,
                         old_value: Box::new(old_value),
                     });
-                    self.model.cell_clear_contents(source_sheet, row, column)?;
+                    self.model.cell_clear_contents(sheet, row, column)?;
                 }
             }
         }

bindings/wasm/fix_types.py

@@ -169,36 +169,20 @@ clipboard_types = r"""
 
 paste_from_clipboard = r"""
 /**
-* @param {number} source_sheet
 * @param {any} source_range
 * @param {any} clipboard
 * @param {boolean} is_cut
 */
-  pasteFromClipboard(source_sheet: number, source_range: any, clipboard: any, is_cut: boolean): void;
+  pasteFromClipboard(source_range: any, clipboard: any, is_cut: boolean): void;
 """
 
 paste_from_clipboard_types = r"""
 /**
-* @param {number} source_sheet
 * @param {[number, number, number, number]} source_range
 * @param {ClipboardData} clipboard
 * @param {boolean} is_cut
 */
-  pasteFromClipboard(source_sheet: number, source_range: [number, number, number, number], clipboard: ClipboardData, is_cut: boolean): void;
+  pasteFromClipboard(source_range: [number, number, number, number], clipboard: ClipboardData, is_cut: boolean): void;
-"""
-
-defined_name_list = r"""
-/**
-* @returns {any}
-*/
-  getDefinedNameList(): any;
-"""
-
-defined_name_list_types = r"""
-/**
-* @returns {DefinedName[]}
-*/
-  getDefinedNameList(): DefinedName[];
 """
 
 def fix_types(text):
@@ -214,7 +198,6 @@ def fix_types(text):
     text = text.replace(paste_csv_string, paste_csv_string_types)
     text = text.replace(clipboard, clipboard_types)
     text = text.replace(paste_from_clipboard, paste_from_clipboard_types)
-    text = text.replace(defined_name_list, defined_name_list_types)
     with open("types.ts") as f:
         types_str = f.read()
         header_types = "{}\n\n{}".format(header, types_str)

bindings/wasm/src/lib.rs

@@ -528,7 +528,6 @@ impl Model {
     #[wasm_bindgen(js_name = "pasteFromClipboard")]
     pub fn paste_from_clipboard(
         &mut self,
-        source_sheet: u32,
         source_range: JsValue,
         clipboard: JsValue,
         is_cut: bool,
@@ -538,7 +537,7 @@ impl Model {
         let clipboard: ClipboardData =
             serde_wasm_bindgen::from_value(clipboard).map_err(|e| to_js_error(e.to_string()))?;
         self.model
-            .paste_from_clipboard(source_sheet, source_range, &clipboard, is_cut)
+            .paste_from_clipboard(source_range, &clipboard, is_cut)
             .map_err(|e| to_js_error(e.to_string()))
     }
 
@@ -553,7 +552,7 @@ impl Model {
 
     #[wasm_bindgen(js_name = "getDefinedNameList")]
     pub fn get_defined_name_list(&self) -> Result<JsValue, JsError> {
-        let data: Vec<DefinedName> =
+        let data: DefinedNameList =
             self.model
                 .get_defined_name_list()
                 .iter()
@@ -561,7 +560,7 @@ impl Model {
                     name: s.name.to_string(),
                     scope: s.sheet_id,
                     formula: s.formula.to_string(),
-                }).collect();
+                });
         // Ok(data)
         serde_wasm_bindgen::to_value(&data).map_err(|e| to_js_error(e.to_string()))
     }
@@ -587,15 +586,6 @@ impl Model {
         new_scope: Option<u32>,
         new_formula: &str,
     ) -> Result<(), JsError> {
-        self.model
+        todo!()
-            .update_defined_name(name, scope, new_name, new_scope, new_formula)
-            .map_err(|e| to_js_error(e.to_string()))
-    }
-
-    #[wasm_bindgen(js_name = "deleteDefinedName")]
-    pub fn delete_definedname(&mut self, name: &str, scope: Option<u32>) -> Result<(), JsError> {
-        self.model
-            .delete_defined_name(name, scope)
-            .map_err(|e| to_js_error(e.to_string()))
     }
 }

bindings/wasm/types.ts

@@ -226,10 +226,4 @@ export interface Clipboard {
   csv: string;
   data: ClipboardData;
   range: [number, number, number, number];
-}
-
-export interface DefinedName {
-  name: string;
-  scope?: number;
-  formula: string;
 }

webapp/src/components/NameManagerDialog.tsx

@@ -1,127 +0,0 @@
-import type { Model } from "@ironcalc/wasm";
-import {
-  Box,
-  Button,
-  Dialog,
-  DialogActions,
-  DialogContent,
-  DialogTitle,
-  IconButton,
-  styled,
-} from "@mui/material";
-import { t } from "i18next";
-import { BookOpen, X } from "lucide-react";
-import { useState } from "react";
-import NamedRange from "./NamedRange";
-import type { NamedRangeObject } from "./NamedRange";
-
-type NameManagerDialogProperties = {
-  onClose: () => void;
-  onSave: () => void;
-  open: boolean;
-  model: Model;
-};
-
-function NameManagerDialog(props: NameManagerDialogProperties) {
-
-  const handleClose = () => {
-    props.onClose();
-  };
-
-  // update child component values in model
-  const handleSave = () => {
-    props.onSave(); // => onNamedRangesUpdate from toolbar
-    props.onClose();
-  };
-
-  //! Why are fields editable only while clicking them?
-  // update child component values in UI
-  const handleChange = (id: string, field: string, value: string) => {
-    console.log("change:", id, field, value);
-
-    // previous array elements, plus updated value
-    // setNamedRangesLocal((prev) =>
-    //   prev.map((namedRange) =>
-    //     namedRange.id === id ? { ...namedRange, [field]: value } : namedRange,
-    //   ),
-    // );
-  };
-
-  const nameList = props.model.getDefinedNameList();
-
-  return (
-    <StyledDialog
-      open={props.open}
-      onClose={props.onClose}
-      maxWidth="md"
-      fullWidth
-      scroll="paper"
-    >
-      <StyledDialogTitle>
-        Named Ranges
-        <IconButton onClick={handleClose}>
-          <X size={16} />
-        </IconButton>
-      </StyledDialogTitle>
-      <DialogContent dividers>
-        {nameList.map((e) => (
-          <NamedRange
-            worksheets={props.model.getWorksheetsProperties()}
-            name={e.name}
-            scope={e.scope}
-            range={e.formula}
-            key={`${e.name}-${e.scope}`}
-            onChange={handleChange}
-            model={props.model}
-          />
-        ))}
-      </DialogContent>
-      <StyledDialogActions>
-        <Box display="flex" alignItems="center">
-          <BookOpen
-            color="grey"
-            style={{ width: 16, height: 16, marginLeft: 12, marginRight: 8 }}
-          />
-          <span style={{ fontSize: "12px", fontFamily: "Inter" }}>
-            {t("name_manager_dialog.help")}
-          </span>
-        </Box>
-        <Box display="flex" gap="10px">
-          <Button onClick={handleClose} variant="contained" color="info">
-            Cancel
-          </Button>
-          <Button onClick={handleSave} variant="contained">
-            Save changes
-          </Button>
-        </Box>
-      </StyledDialogActions>
-    </StyledDialog>
-  );
-}
-
-const StyledDialog = styled(Dialog)(() => ({
-  "& .MuiPaper-root": {
-    maxHeight: "60%",
-    minHeight: "40%",
-  },
-}));
-
-// font-weight: 600 is too bold compared to design, should be between 500 & 600
-const StyledDialogTitle = styled(DialogTitle)`
-font-size: 14px;
-font-weight: 600;
-display: flex;
-align-items: center;
-justify-content: space-between;
-`;
-
-const StyledDialogActions = styled(DialogActions)`
-height: 40px;
-display: flex;
-align-items: center;
-justify-content: space-between;
-font-size: 12px;
-color: #757575;
-`;
-
-export default NameManagerDialog;

webapp/src/components/NamedRange.tsx

@@ -1,91 +0,0 @@
-import type { Model, WorksheetProperties } from "@ironcalc/wasm";
-import { Box, IconButton, MenuItem, TextField, styled } from "@mui/material";
-import { Trash2 } from "lucide-react";
-
-export type NamedRangeObject = {
-  id: string;
-  name: string;
-  scope: string;
-  range: string;
-};
-
-type NamedRangeProperties = {
-  name: string;
-  scope: string;
-  range: string;
-  model: Model;
-  worksheets: WorksheetProperties[];
-  // update namedRange in model
-  onChange: (field: string, value: string) => void;
-};
-
-function NamedRange(props: NamedRangeProperties) {
-  // define onChange in parent for updating the model and values
-
-  const handleDelete = () => {
-    // update model
-    console.log("deleted named range");
-  };
-
-  return (
-    <StyledBox>
-      <TextField
-        variant="outlined"
-        size="small"
-        margin="normal"
-        fullWidth
-        value={props.name}
-        onChange={(event) =>
-          props.onChange("name", event.target.value)
-        }
-        onKeyDown={(event) => {
-          event.stopPropagation();
-        }}
-        onClick={(event) => event.stopPropagation()}
-      />
-      <TextField
-        variant="outlined"
-        select
-        defaultValue="Workbook"
-        size="small"
-        margin="normal"
-        fullWidth
-        value={props.scope}
-        onChange={(event) =>
-          props.onChange("scope", event.target.value)
-        }
-      >
-        {props.worksheets.map((option) => (
-          <MenuItem key={option.sheet_id} value={option.name}>
-            {option.name}
-          </MenuItem>
-        ))}
-      </TextField>
-      <TextField
-        variant="outlined"
-        size="small"
-        margin="normal"
-        fullWidth
-        value={props.range}
-        onChange={(event) =>
-          props.onChange("range", event.target.value)
-        }
-        onKeyDown={(event) => {
-          event.stopPropagation();
-        }}
-        onClick={(event) => event.stopPropagation()}
-      />
-      {/* remove round hover animation  */}
-      <IconButton onClick={handleDelete}>
-        <Trash2 size={16} absoluteStrokeWidth />
-      </IconButton>
-    </StyledBox>
-  );
-}
-
-const StyledBox = styled(Box)`
-display: flex;
-gap: 15px;
-`;
-
-export default NamedRange;

webapp/src/components/SheetTabBar/SheetListMenu.tsx

@@ -1,99 +0,0 @@
-import { styled } from "@mui/material";
-import Menu from "@mui/material/Menu";
-import MenuItem from "@mui/material/MenuItem";
-import { Check } from "lucide-react";
-import type { SheetOptions } from "./types";
-
-function isWhiteColor(color: string): boolean {
-  return ["#FFF", "#FFFFFF"].includes(color);
-}
-
-interface SheetListMenuProps {
-  open: boolean;
-  onClose: () => void;
-  anchorEl: HTMLButtonElement | null;
-  onSheetSelected: (index: number) => void;
-  sheetOptionsList: SheetOptions[];
-  selectedIndex: number;
-}
-
-const SheetListMenu = (properties: SheetListMenuProps) => {
-  const {
-    open,
-    onClose,
-    anchorEl,
-    onSheetSelected,
-    sheetOptionsList,
-    selectedIndex,
-  } = properties;
-
-  const hasColors = sheetOptionsList.some((tab) => !isWhiteColor(tab.color));
-
-  return (
-    <StyledMenu
-      open={open}
-      onClose={onClose}
-      anchorEl={anchorEl}
-      anchorOrigin={{
-        vertical: "top",
-        horizontal: "left",
-      }}
-      transformOrigin={{
-        vertical: "bottom",
-        horizontal: 6,
-      }}
-    >
-      {sheetOptionsList.map((tab, index) => (
-        <StyledMenuItem
-          key={tab.sheetId}
-          onClick={() => onSheetSelected(index)}
-        >
-          {index === selectedIndex ? (
-            <Check
-              style={{ width: "16px", height: "16px", marginRight: "8px" }}
-            />
-          ) : (
-            <div
-              style={{ width: "16px", height: "16px", marginRight: "8px" }}
-            />
-          )}
-          {hasColors && <ItemColor style={{ backgroundColor: tab.color }} />}
-          <ItemName
-            style={{ fontWeight: index === selectedIndex ? "bold" : "normal" }}
-          >
-            {tab.name}
-          </ItemName>
-        </StyledMenuItem>
-      ))}
-    </StyledMenu>
-  );
-};
-
-const StyledMenu = styled(Menu)({
-  "& .MuiPaper-root": {
-    borderRadius: 8,
-    padding: 4,
-  },
-  "& .MuiList-padding": {
-    padding: 0,
-  },
-});
-
-const StyledMenuItem = styled(MenuItem)({
-  padding: 8,
-  borderRadius: 4,
-});
-
-const ItemColor = styled("div")`
-  width: 12px;
-  height: 12px;
-  border-radius: 4px;
-  margin-right: 8px;
-`;
-
-const ItemName = styled("div")`
-  font-size: 12px;
-  color: #333;
-`;
-
-export default SheetListMenu;

webapp/src/components/SheetTabBar/index.ts

@@ -1 +0,0 @@
-export { default } from "./SheetTabBar";

webapp/src/components/borderPicker.tsx

@@ -38,7 +38,7 @@ const BorderPicker = (properties: BorderPickerProps) => {
   const { t } = useTranslation();
 
   const [borderSelected, setBorderSelected] = useState<BorderType | null>(null);
-  const [borderColor, setBorderColor] = useState(theme.palette.common.white);
+  const [borderColor, setBorderColor] = useState("#000000");
   const [borderStyle, setBorderStyle] = useState(BorderStyle.Thin);
   const [colorPickerOpen, setColorPickerOpen] = useState(false);
   const [stylePickerOpen, setStylePickerOpen] = useState(false);
@@ -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.white);
+    setBorderColor("#000000");
     setBorderStyle(BorderStyle.Thin);
   }, [properties.open]);
 
@@ -240,21 +240,31 @@ const BorderPicker = (properties: BorderPickerProps) => {
           </Borders>
           <Divider />
           <Styles>
-            <ButtonWrapper
+            <ButtonWrapper onClick={() => setColorPickerOpen(true)}>
-              onClick={() => setColorPickerOpen(true)}
+              <Button
-              ref={borderColorButton}
+                type="button"
-            >
+                $pressed={false}
-              <PencilLine />
+                disabled={false}
-
+                ref={borderColorButton}
+                title={t("toolbar.borders.color")}
+              >
+                <PencilLine />
+              </Button>
               <div style={{ flexGrow: 2 }}>Border color</div>
               <ChevronRightStyled />
             </ButtonWrapper>
-
             <ButtonWrapper
               onClick={() => setStylePickerOpen(true)}
               ref={borderStyleButton}
             >
-              <BorderStyleIcon />
+              <Button
+                type="button"
+                $pressed={false}
+                disabled={false}
+                title={t("toolbar.borders.style")}
+              >
+                <BorderStyleIcon />
+              </Button>
               <div style={{ flexGrow: 2 }}>Border style</div>
               <ChevronRightStyled />
             </ButtonWrapper>
@@ -271,14 +281,6 @@ const BorderPicker = (properties: BorderPickerProps) => {
           }}
           anchorEl={borderColorButton}
           open={colorPickerOpen}
-          anchorOrigin={{
-            vertical: "top", // Keep vertical alignment at the top
-            horizontal: "right", // Set horizontal alignment to right
-          }}
-          transformOrigin={{
-            vertical: "top", // Keep vertical alignment at the top
-            horizontal: "left", // Set horizontal alignment to left
-          }}
         />
         <StyledPopover
           open={stylePickerOpen}
@@ -286,10 +288,8 @@ const BorderPicker = (properties: BorderPickerProps) => {
             setStylePickerOpen(false);
           }}
           anchorEl={borderStyleButton.current}
-          anchorOrigin={{
+          anchorOrigin={{ vertical: "bottom", horizontal: "right" }}
-            vertical: "top",
+          transformOrigin={{ vertical: 38, horizontal: -6 }}
-            horizontal: "right",
-          }}
         >
           <BorderStyleDialog>
             <LineWrapper
@@ -336,12 +336,12 @@ const LineWrapper = styled("div")<LineWrapperProperties>`
   align-items: center;
   background-color: ${({ $checked }): string => {
     if ($checked) {
-      return theme.palette.grey["200"];
+      return "#EEEEEE;";
     }
     return "inherit;";
   }};
   &:hover {
-    border: 1px solid ${theme.palette.grey["200"]};
+    border: 1px solid #eeeeee;
   }
   padding: 8px;
   cursor: pointer;
@@ -351,59 +351,52 @@ const LineWrapper = styled("div")<LineWrapperProperties>`
 
 const SolidLine = styled("div")`
   width: 68px;
-  border-top: 1px solid ${theme.palette.grey["900"]};
+  border-top: 1px solid #333333;
 `;
 const MediumLine = styled("div")`
   width: 68px;
-  border-top: 2px solid ${theme.palette.grey["900"]};
+  border-top: 2px solid #333333;
 `;
 const ThickLine = styled("div")`
   width: 68px;
-  border-top: 1px solid ${theme.palette.grey["900"]};
+  border-top: 3px solid #333333;
 `;
 
 const Divider = styled("div")`
-  width: 100%;
+  display: inline-flex;
-  margin: auto;
+  heigh: 1px;
-  border-top: 1px solid ${theme.palette.grey["200"]};
+  border-bottom: 1px solid #eee;
+  margin-left: 0px;
+  margin-right: 0px;
 `;
 
 const Borders = styled("div")`
   display: flex;
   flex-direction: column;
-  gap: 4px;
+  padding-bottom: 4px;
-  padding: 4px;
 `;
 
 const Styles = styled("div")`
   display: flex;
   flex-direction: column;
-  padding: 4px;
 `;
 
 const Line = styled("div")`
   display: flex;
   flex-direction: row;
   align-items: center;
-  gap: 4px;
 `;
 
 const ButtonWrapper = styled("div")`
   display: flex;
   flex-direction: row;
   align-items: center;
-  border-radius: 4px;
-  gap: 8px;
   &:hover {
-    background-color: ${theme.palette.grey["200"]};
+    background-color: #eee;
-    border-top-color: ${(): string => theme.palette.grey["200"]};
+    border-top-color: ${(): string => theme.palette.grey["400"]};
   }
   cursor: pointer;
   padding: 8px;
-  svg {
-    width: 16px;
-    height: 16px;
-  }
 `;
 
 const BorderStyleDialog = styled("div")`
@@ -416,7 +409,7 @@ const BorderStyleDialog = styled("div")`
 
 const StyledPopover = styled(Popover)`
   .MuiPopover-paper {
-    border-radius: 8px;
+    border-radius: 10px;
     border: 0px solid ${({ theme }): string => theme.palette.background.default};
     box-shadow: 1px 2px 8px rgba(139, 143, 173, 0.5);
   }
@@ -432,6 +425,7 @@ const StyledPopover = styled(Popover)`
 
 const BorderPickerDialog = styled("div")`
   background: ${({ theme }): string => theme.palette.background.default};
+  padding: 4px;
   display: flex;
   flex-direction: column;
 `;
@@ -450,8 +444,10 @@ const Button = styled("button")<TypeButtonProperties>(
       alignItems: "center",
       justifyContent: "center",
       // fontSize: "26px",
-      border: `0px solid ${theme.palette.common.white}`,
+      border: "0px solid #fff",
       borderRadius: "4px",
+      marginRight: "5px",
+      transition: "all 0.2s",
       cursor: "pointer",
       padding: "0px",
     };
@@ -464,15 +460,13 @@ const Button = styled("button")<TypeButtonProperties>(
     }
     return {
       ...result,
-      borderTop: $underlinedColor
+      borderTop: $underlinedColor ? "3px solid #FFF" : "none",
-        ? `3px solid ${theme.palette.common.white}`
-        : "none",
       borderBottom: $underlinedColor ? `3px solid ${$underlinedColor}` : "none",
-      color: `${theme.palette.grey["900"]}`,
+      color: "#21243A",
       backgroundColor: $pressed ? theme.palette.grey["200"] : "inherit",
       "&:hover": {
-        outline: `1px solid ${theme.palette.grey["200"]}`,
+        backgroundColor: "#F1F2F8",
-        borderTopColor: theme.palette.grey["200"],
+        borderTopColor: "#F1F2F8",
       },
       svg: {
         width: "16px",

webapp/src/components/navigation/index.ts

@@ -0,0 +1,2 @@
+export { default } from "./navigation";
+export type { NavigationProps } from "./navigation";

webapp/src/components/navigation/menus.tsx

@@ -1,23 +1,31 @@
 import { Dialog, TextField, styled } from "@mui/material";
+import Menu from "@mui/material/Menu";
+import MenuItem from "@mui/material/MenuItem";
+import { Check } from "lucide-react";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { theme } from "../../theme";
+import type { SheetOptions } from "./types";
+
+function isWhiteColor(color: string): boolean {
+  return ["#FFF", "#FFFFFF"].includes(color);
+}
 
 interface SheetRenameDialogProps {
-  open: boolean;
+  isOpen: boolean;
-  onClose: () => void;
+  close: () => void;
   onNameChanged: (name: string) => void;
   defaultName: string;
 }
 
-const SheetRenameDialog = (properties: SheetRenameDialogProps) => {
+export const SheetRenameDialog = (properties: SheetRenameDialogProps) => {
   const { t } = useTranslation();
   const [name, setName] = useState(properties.defaultName);
   const handleClose = () => {
-    properties.onClose();
+    properties.close();
   };
   return (
-    <Dialog open={properties.open} onClose={properties.onClose}>
+    <Dialog open={properties.isOpen} onClose={properties.close}>
       <StyledDialogTitle>
         {t("sheet_rename.title")}
         <Cross onClick={handleClose} onKeyDown={() => {}}>
@@ -53,7 +61,7 @@ const SheetRenameDialog = (properties: SheetRenameDialogProps) => {
             event.stopPropagation();
             if (event.key === "Enter") {
               properties.onNameChanged(name);
-              properties.onClose();
+              properties.close();
             }
           }}
           onChange={(event) => {
@@ -76,6 +84,94 @@ const SheetRenameDialog = (properties: SheetRenameDialogProps) => {
   );
 };
 
+interface SheetListMenuProps {
+  isOpen: boolean;
+  close: () => void;
+  anchorEl: HTMLButtonElement | null;
+  onSheetSelected: (index: number) => void;
+  sheetOptionsList: SheetOptions[];
+  selectedIndex: number;
+}
+
+const SheetListMenu = (properties: SheetListMenuProps) => {
+  const {
+    isOpen,
+    close,
+    anchorEl,
+    onSheetSelected,
+    sheetOptionsList,
+    selectedIndex,
+  } = properties;
+
+  const hasColors = sheetOptionsList.some((tab) => !isWhiteColor(tab.color));
+
+  return (
+    <StyledMenu
+      open={isOpen}
+      onClose={close}
+      anchorEl={anchorEl}
+      anchorOrigin={{
+        vertical: "top",
+        horizontal: "left",
+      }}
+      transformOrigin={{
+        vertical: "bottom",
+        horizontal: 6,
+      }}
+    >
+      {sheetOptionsList.map((tab, index) => (
+        <StyledMenuItem
+          key={tab.sheetId}
+          onClick={() => onSheetSelected(index)}
+        >
+          {index === selectedIndex ? (
+            <Check
+              style={{ width: "16px", height: "16px", marginRight: "8px" }}
+            />
+          ) : (
+            <div
+              style={{ width: "16px", height: "16px", marginRight: "8px" }}
+            />
+          )}
+          {hasColors && <ItemColor style={{ backgroundColor: tab.color }} />}
+          <ItemName
+            style={{ fontWeight: index === selectedIndex ? "bold" : "normal" }}
+          >
+            {tab.name}
+          </ItemName>
+        </StyledMenuItem>
+      ))}
+    </StyledMenu>
+  );
+};
+
+const StyledMenu = styled(Menu)({
+  "& .MuiPaper-root": {
+    borderRadius: 8,
+    padding: 4,
+  },
+  "& .MuiList-padding": {
+    padding: 0,
+  },
+});
+
+const StyledMenuItem = styled(MenuItem)({
+  padding: 8,
+  borderRadius: 4,
+});
+
+const ItemColor = styled("div")`
+  width: 12px;
+  height: 12px;
+  border-radius: 4px;
+  margin-right: 8px;
+`;
+
+const ItemName = styled("div")`
+  font-size: 12px;
+  color: #333;
+`;
+
 const StyledDialogTitle = styled("div")`
   display: flex;
   align-items: center;
@@ -150,4 +246,4 @@ const StyledButton = styled("div")`
   }
 `;
 
-export default SheetRenameDialog;
+export default SheetListMenu;

webapp/src/components/navigation/navigation.tsx

@@ -6,11 +6,11 @@ import { theme } from "../../theme";
 import { NAVIGATION_HEIGHT } from "../constants";
 import { StyledButton } from "../toolbar";
 import type { WorkbookState } from "../workbookState";
-import SheetListMenu from "./SheetListMenu";
+import SheetListMenu from "./menus";
-import SheetTab from "./SheetTab";
+import Sheet from "./sheet";
 import type { SheetOptions } from "./types";
 
-export interface SheetTabBarProps {
+export interface NavigationProps {
   sheets: SheetOptions[];
   selectedIndex: number;
   workbookState: WorkbookState;
@@ -21,7 +21,7 @@ export interface SheetTabBarProps {
   onSheetDeleted: () => void;
 }
 
-function SheetTabBar(props: SheetTabBarProps) {
+function Navigation(props: NavigationProps) {
   const { t } = useTranslation();
   const { workbookState, onSheetSelected, sheets, selectedIndex } = props;
   const [anchorEl, setAnchorEl] = useState<null | HTMLButtonElement>(null);
@@ -35,27 +35,24 @@ function SheetTabBar(props: SheetTabBarProps) {
 
   return (
     <Container>
-      <LeftButtonsContainer>
+      <StyledButton
-        <StyledButton
+        title={t("navigation.add_sheet")}
-          title={t("navigation.add_sheet")}
+        $pressed={false}
-          $pressed={false}
+        onClick={props.onAddBlankSheet}
-          onClick={props.onAddBlankSheet}
+      >
-        >
+        <Plus />
-          <Plus />
+      </StyledButton>
-        </StyledButton>
+      <StyledButton
-        <StyledButton
+        onClick={handleClick}
-          onClick={handleClick}
+        title={t("navigation.sheet_list")}
-          title={t("navigation.sheet_list")}
+        $pressed={false}
-          $pressed={false}
+      >
-        >
+        <Menu />
-          <Menu />
+      </StyledButton>
-        </StyledButton>
-      </LeftButtonsContainer>
-      <VerticalDivider />
       <Sheets>
         <SheetInner>
           {sheets.map((tab, index) => (
-            <SheetTab
+            <Sheet
               key={tab.sheetId}
               name={tab.name}
               color={tab.color}
@@ -80,8 +77,8 @@ function SheetTabBar(props: SheetTabBarProps) {
       </Advert>
       <SheetListMenu
         anchorEl={anchorEl}
-        open={open}
+        isOpen={open}
-        onClose={handleClose}
+        close={handleClose}
         sheetOptionsList={sheets}
         onSheetSelected={(index) => {
           onSheetSelected(index);
@@ -95,8 +92,6 @@ function SheetTabBar(props: SheetTabBarProps) {
 
 // Note I have to specify the font-family in every component that can be considered stand-alone
 const Container = styled("div")`
-  display: flex;
-  flex-direction: row;
   position: absolute;
   bottom: 0px;
   left: 0px;
@@ -104,10 +99,10 @@ const Container = styled("div")`
   display: flex;
   height: ${NAVIGATION_HEIGHT}px;
   align-items: center;
-  padding: 0px 12px;
+  padding-left: 12px;
   font-family: Inter;
-  background-color: ${theme.palette.common.white};
+  background-color: #fff;
-  border-top: 1px solid ${theme.palette.grey["300"]};
+  border-top: 1px solid #e0e0e0;
 `;
 
 const Sheets = styled("div")`
@@ -115,9 +110,6 @@ const Sheets = styled("div")`
   overflow: hidden;
   overflow-x: auto;
   scrollbar-width: none;
-  padding-left: 12px;
-  display: flex;
-  flex-direction: row;
 `;
 
 const SheetInner = styled("div")`
@@ -127,8 +119,8 @@ const SheetInner = styled("div")`
 const Advert = styled("a")`
   display: flex;
   align-items: center;
-  color: ${theme.palette.primary.main};
+  color: #f2994a;
-  padding: 0px 0px 0px 12px;
+  padding: 0px 12px;
   font-size: 12px;
   text-decoration: none;
   border-left: 1px solid ${theme.palette.grey["300"]};
@@ -141,19 +133,4 @@ const Advert = styled("a")`
   }
 `;
 
-const LeftButtonsContainer = styled("div")`
+export default Navigation;
-  display: flex;
-  flex-direction: row;
-  gap: 4px;
-  padding-right: 12px;
-`;
-
-const VerticalDivider = styled("div")`
-  height: 100%;
-  width: 0px;
-  @media (max-width: 769px) {
-    border-right: 1px solid ${theme.palette.grey["200"]};
-  }
-`;
-
-export default SheetTabBar;

webapp/src/components/navigation/sheet.tsx

@@ -1,13 +1,12 @@
 import { Button, Menu, MenuItem, styled } from "@mui/material";
 import { ChevronDown } from "lucide-react";
 import { useRef, useState } from "react";
-import { theme } from "../../theme";
 import ColorPicker from "../colorPicker";
 import { isInReferenceMode } from "../editor/util";
 import type { WorkbookState } from "../workbookState";
-import SheetRenameDialog from "./SheetRenameDialog";
+import { SheetRenameDialog } from "./menus";
 
-interface SheetTabProps {
+interface SheetProps {
   name: string;
   color: string;
   selected: boolean;
@@ -18,7 +17,7 @@ interface SheetTabProps {
   workbookState: WorkbookState;
 }
 
-function SheetTab(props: SheetTabProps) {
+function Sheet(props: SheetProps) {
   const { name, color, selected, workbookState, onSelected } = props;
   const [anchorEl, setAnchorEl] = useState<null | HTMLButtonElement>(null);
   const [colorPickerOpen, setColorPickerOpen] = useState(false);
@@ -39,9 +38,8 @@ function SheetTab(props: SheetTabProps) {
   };
   return (
     <>
-      <TabWrapper
+      <Wrapper
-        $color={color}
+        style={{ borderBottomColor: color, fontWeight: selected ? 600 : 400 }}
-        $selected={selected}
         onClick={(event) => {
           onSelected();
           event.stopPropagation();
@@ -57,11 +55,11 @@ function SheetTab(props: SheetTabProps) {
         }}
         ref={colorButton}
       >
-        <Name onDoubleClick={handleOpenRenameDialog}>{name}</Name>
+        <Name>{name}</Name>
         <StyledButton onClick={handleOpen}>
           <ChevronDown />
         </StyledButton>
-      </TabWrapper>
+      </Wrapper>
       <StyledMenu
         anchorEl={anchorEl}
         open={open}
@@ -102,8 +100,8 @@ function SheetTab(props: SheetTabProps) {
         </StyledMenuItem>
       </StyledMenu>
       <SheetRenameDialog
-        open={renameDialogOpen}
+        isOpen={renameDialogOpen}
-        onClose={handleCloseRenameDialog}
+        close={handleCloseRenameDialog}
         defaultName={name}
         onNameChanged={(newName) => {
           props.onRenamed(newName);
@@ -126,39 +124,10 @@ function SheetTab(props: SheetTabProps) {
   );
 }
 
-const StyledMenu = styled(Menu)`
+const StyledMenu = styled(Menu)``;
-  & .MuiPaper-root {
-    border-radius: 8px;
-    padding: 4px 0px;
-    margin-left: -4px;
-  }
-  & .MuiList-root {
-    padding: 0;
-  }
-`;
 
 const StyledMenuItem = styled(MenuItem)`
-  display: flex;
-  justify-content: space-between;
   font-size: 12px;
-  width: calc(100% - 8px);
-  margin: 0px 4px;
-  border-radius: 4px;
-  padding: 8px;
-  height: 32px;
-`;
-
-const TabWrapper = styled("div")<{ $color: string; $selected: boolean }>`
-  display: flex;
-  margin-right: 12px;
-  border-bottom: 3px solid ${(props) => props.$color};
-  line-height: 37px;
-  padding: 0px 4px;
-  align-items: center;
-  cursor: pointer;
-  font-weight: ${(props) => (props.$selected ? 600 : 400)};
-  background-color: ${(props) =>
-    props.$selected ? `${theme.palette.grey[50]}80` : "transparent"};
 `;
 
 const StyledButton = styled(Button)`
@@ -168,27 +137,26 @@ const StyledButton = styled(Button)`
   padding: 0px;
   color: inherit;
   font-weight: inherit;
-  &:hover {
-    background-color: transparent;
-  }
-  &:active {
-    background-color: transparent;
-  }
   svg {
     width: 15px;
     height: 15px;
-    transition: transform 0.2s;
-  }
-  &:hover svg {
-    transform: translateY(2px);
   }
 `;
 
+const Wrapper = styled("div")`
+  display: flex;
+  margin-left: 20px;
+  border-bottom: 3px solid;
+  border-top: 3px solid white;
+  line-height: 34px;
+  align-items: center;
+  cursor: pointer;
+`;
+
 const Name = styled("div")`
   font-size: 12px;
   margin-right: 5px;
   text-wrap: nowrap;
-  user-select: none;
 `;
 
-export default SheetTab;
+export default Sheet;

webapp/src/components/toolbar.tsx

@@ -1,7 +1,6 @@
 import type {
   BorderOptions,
   HorizontalAlignment,
-  Model,
   VerticalAlignment,
 } from "@ironcalc/wasm";
 import { styled } from "@mui/material/styles";
@@ -19,11 +18,10 @@ import {
   Grid2x2X,
   Italic,
   PaintBucket,
-  PaintRoller,
+  Paintbrush2,
   Percent,
   Redo2,
   Strikethrough,
-  Tags,
   Type,
   Underline,
   Undo2,
@@ -36,7 +34,6 @@ import {
   DecimalPlacesIncreaseIcon,
 } from "../icons";
 import { theme } from "../theme";
-import NameManagerDialog from "./NameManagerDialog";
 import BorderPicker from "./borderPicker";
 import ColorPicker from "./colorPicker";
 import { TOOLBAR_HEIGHT } from "./constants";
@@ -63,7 +60,6 @@ type ToolbarProperties = {
   onFillColorPicked: (hex: string) => void;
   onNumberFormatPicked: (numberFmt: string) => void;
   onBorderChanged: (border: BorderOptions) => void;
-  onNamedRangesUpdate: () => void;
   fillColor: string;
   fontColor: string;
   bold: boolean;
@@ -76,14 +72,12 @@ type ToolbarProperties = {
   numFmt: string;
   showGridLines: boolean;
   onToggleShowGridLines: (show: boolean) => void;
-  model: Model;
 };
 
 function Toolbar(properties: ToolbarProperties) {
   const [fontColorPickerOpen, setFontColorPickerOpen] = useState(false);
   const [fillColorPickerOpen, setFillColorPickerOpen] = useState(false);
   const [borderPickerOpen, setBorderPickerOpen] = useState(false);
-  const [nameManagerDialogOpen, setNameManagerDialogOpen] = useState(false);
 
   const fontColorButton = useRef(null);
   const fillColorButton = useRef(null);
@@ -120,7 +114,7 @@ function Toolbar(properties: ToolbarProperties) {
         onClick={properties.onCopyStyles}
         title={t("toolbar.copy_styles")}
       >
-        <PaintRoller />
+        <Paintbrush2 />
       </StyledButton>
       <Divider />
       <StyledButton
@@ -189,7 +183,8 @@ function Toolbar(properties: ToolbarProperties) {
           title={t("toolbar.format_number")}
           sx={{
             width: "40px", // Keep in sync with anchorOrigin in FormatMenu above
-            padding: "0px 4px",
+            fontSize: "13px",
+            fontWeight: 400,
           }}
         >
           {"123"}
@@ -346,18 +341,6 @@ function Toolbar(properties: ToolbarProperties) {
       >
         {properties.showGridLines ? <Grid2x2Check /> : <Grid2x2X />}
       </StyledButton>
-      <Divider />
-      <StyledButton
-        type="button"
-        $pressed={false}
-        onClick={() => {
-          setNameManagerDialogOpen(true);
-        }}
-        disabled={!canEdit}
-        title={t("toolbar.name_manager")}
-      >
-        <Tags />
-      </StyledButton>
 
       <ColorPicker
         color={properties.fontColor}
@@ -393,18 +376,6 @@ function Toolbar(properties: ToolbarProperties) {
         anchorEl={borderButton}
         open={borderPickerOpen}
       />
-      <NameManagerDialog
-        open={nameManagerDialogOpen}
-        onClose={() => {
-          setNameManagerDialogOpen(false);
-        }}
-        onSave={() => {
-          console.log(
-            "update NamedRanges in model => properties.onNamedRangesUpdate",
-          );
-        }}
-        model={properties.model}
-      />
     </ToolbarContainer>
   );
 }
@@ -420,9 +391,7 @@ const ToolbarContainer = styled("div")`
   font-family: Inter;
   border-radius: 4px 4px 0px 0px;
   overflow-x: auto;
-  padding: 0px 12px;
+  padding-left: 11px;
-  gap: 4px;
-  scrollbar-width: none;
 `;
 
 type TypeButtonProperties = { $pressed: boolean; $underlinedColor?: string };
@@ -430,16 +399,15 @@ export const StyledButton = styled("button")<TypeButtonProperties>(
   ({ disabled, $pressed, $underlinedColor }) => {
     const result = {
       width: "24px",
-      minWidth: "24px",
       height: "24px",
       display: "inline-flex",
       alignItems: "center",
       justifyContent: "center",
-      fontSize: "12px",
+      fontSize: "26px",
-      border: `0px solid ${theme.palette.common.white}`,
+      border: "0px solid #fff",
-      borderRadius: "4px",
+      borderRadius: "2px",
+      marginRight: "5px",
       transition: "all 0.2s",
-      outline: `1px solid ${theme.palette.common.white}`,
       cursor: "pointer",
       backgroundColor: "white",
       padding: "0px",
@@ -451,28 +419,19 @@ export const StyledButton = styled("button")<TypeButtonProperties>(
     if (disabled) {
       return {
         ...result,
-        color: theme.palette.grey["400"],
+        color: theme.palette.grey["600"],
         cursor: "default",
       };
     }
     return {
       ...result,
-      borderTop: $underlinedColor
+      borderTop: $underlinedColor ? "3px solid #FFF" : "none",
-        ? `3px solid ${theme.palette.common.white}`
-        : "none",
       borderBottom: $underlinedColor ? `3px solid ${$underlinedColor}` : "none",
-      color: theme.palette.grey["900"],
+      color: "#21243A",
-      backgroundColor: $pressed
+      backgroundColor: $pressed ? "#EEE" : "#FFF",
-        ? theme.palette.grey["300"]
-        : theme.palette.common.white,
       "&:hover": {
-        transition: "all 0.2s",
+        backgroundColor: "#F1F2F8",
-        outline: `1px solid ${theme.palette.grey["200"]}`,
+        borderTopColor: "#F1F2F8",
-        borderTopColor: theme.palette.common.white,
-      },
-      "&:active": {
-        backgroundColor: theme.palette.grey["300"],
-        outline: `1px solid ${theme.palette.grey["300"]}`,
       },
     };
   },
@@ -480,9 +439,10 @@ export const StyledButton = styled("button")<TypeButtonProperties>(
 
 const Divider = styled("div")({
   width: "0px",
-  height: "12px",
+  height: "10px",
-  borderLeft: `1px solid ${theme.palette.grey["300"]}`,
+  borderLeft: "1px solid #E0E0E0",
-  margin: "0px 12px",
+  marginLeft: "5px",
+  marginRight: "10px",
 });
 
 export default Toolbar;

webapp/src/components/workbook.tsx

@@ -6,7 +6,6 @@ import type {
 } from "@ironcalc/wasm";
 import { styled } from "@mui/material/styles";
 import { useCallback, useEffect, useRef, useState } from "react";
-import SheetTabBar from "./SheetTabBar/SheetTabBar";
 import {
   COLUMN_WIDTH_SCALE,
   LAST_COLUMN,
@@ -17,6 +16,7 @@ import {
   getNewClipboardId,
 } from "./clipboard";
 import FormulaBar from "./formulabar";
+import Navigation from "./navigation/navigation";
 import Toolbar from "./toolbar";
 import useKeyboardNavigation from "./useKeyboardNavigation";
 import { type NavigationKey, getCellAddress } from "./util";
@@ -113,10 +113,6 @@ const Workbook = (props: { model: Model; workbookState: WorkbookState }) => {
     updateRangeStyle("num_fmt", numberFmt);
   };
 
-  const onNamedRangesUpdate = () => {
-    // update named ranges in model
-  }
-
   const onCopyStyles = () => {
     const {
       sheet,
@@ -394,12 +390,7 @@ const Workbook = (props: { model: Model; workbookState: WorkbookState }) => {
             }
             data.set(Number.parseInt(row, 10), rowMap);
           }
-          model.pasteFromClipboard(
+          model.pasteFromClipboard(source.area, data, source.type === "cut");
-            source.sheet,
-            source.area,
-            data,
-            source.type === "cut",
-          );
           setRedrawId((id) => id + 1);
         } else if (mimeType === "text/plain") {
           const {
@@ -425,7 +416,6 @@ const Workbook = (props: { model: Model; workbookState: WorkbookState }) => {
       }}
       onCopy={(event: React.ClipboardEvent) => {
         const data = model.copyToClipboard();
-        const sheet = model.getSelectedSheet();
         // '2024-10-18T14:07:37.599Z'
 
         let clipboardId = sessionStorage.getItem(
@@ -453,7 +443,6 @@ const Workbook = (props: { model: Model; workbookState: WorkbookState }) => {
           type: "copy",
           area: data.range,
           sheetData,
-          sheet,
           clipboardId,
         });
         event.clipboardData.setData("text/plain", data.csv);
@@ -463,7 +452,6 @@ const Workbook = (props: { model: Model; workbookState: WorkbookState }) => {
       }}
       onCut={(event: React.ClipboardEvent) => {
         const data = model.copyToClipboard();
-        const sheet = model.getSelectedSheet();
         // '2024-10-18T14:07:37.599Z'
 
         let clipboardId = sessionStorage.getItem(
@@ -491,7 +479,6 @@ const Workbook = (props: { model: Model; workbookState: WorkbookState }) => {
           type: "cut",
           area: data.range,
           sheetData,
-          sheet,
           clipboardId,
         });
         event.clipboardData.setData("text/plain", data.csv);
@@ -563,8 +550,6 @@ const Workbook = (props: { model: Model; workbookState: WorkbookState }) => {
           model.setShowGridLines(sheet, show);
           setRedrawId((id) => id + 1);
         }}
-        onNamedRangesUpdate={onNamedRangesUpdate}
-        model={model}
       />
       <FormulaBar
         cellAddress={cellAddress()}
@@ -587,7 +572,7 @@ const Workbook = (props: { model: Model; workbookState: WorkbookState }) => {
         }}
       />
 
-      <SheetTabBar
+      <Navigation
         sheets={info}
         selectedIndex={model.getSelectedSheet()}
         workbookState={workbookState}

webapp/src/icons/border-style.svg

@@ -1,3 +1,7 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3 8H2M14 8H13M7 8H5M11 8H9M14 4H2M2.01 12H2M4.01 12H4M6.01 12H6M8.01 12H8M10.01 12H10M12.01 12H12M14.01 12H14" stroke="#333333" stroke-linecap="round" stroke-linejoin="round"/>
+<line x1="0" y1="2" x2="16" y2="2" stroke="#000"/>
+  <!-- Dashes and gaps of the same size -->
+<line x1="0" y1="8" x2="16" y2="8" stroke-dasharray="2.28 2.28" stroke="#000"/>
+  <!-- Dashes and gaps of different sizes -->
+<line x1="0" y1="14" x2="16" y2="14" stroke-dasharray="1 2" stroke="#000"/>
 </svg>

webapp/src/locale/en_us.json

@@ -1,81 +1,77 @@
 {
-	"toolbar": {
+  "toolbar": {
-		"redo": "Redo",
+    "redo": "Redo",
-		"undo": "Undo",
+    "undo": "Undo",
-		"copy_styles": "Copy styles",
+    "copy_styles": "Copy styles",
-		"euro": "Format as Euro",
+    "euro": "Format as Euro",
-		"percentage": "Format as Percentage",
+    "percentage": "Format as Percentage",
-		"bold": "Bold",
+    "bold": "Bold",
-		"italic": "Italic",
+    "italic": "Italic",
-		"underline": "Underline",
+    "underline": "Underline",
-		"strike_through": "Strikethrough",
+    "strike_through": "Strikethrough",
-		"align_left": "Align left",
+    "align_left": "Align left",
-		"align_right": "Align right",
+    "align_right": "Align right",
-		"align_center": "Align center",
+    "align_center": "Align center",
-		"format_number": "Format number",
+    "format_number": "Format number",
-		"font_color": "Font color",
+    "font_color": "Font color",
-		"fill_color": "Fill color",
+    "fill_color": "Fill color",
-		"decimal_places_increase": "Increase decimal places",
+    "decimal_places_increase": "Increase decimal places",
-		"decimal_places_decrease": "Decrease decimal places",
+    "decimal_places_decrease": "Decrease decimal places",
-		"show_hide_grid_lines": "Show/hide grid lines",
+    "show_hide_grid_lines": "Show/hide grid lines",
-		"name_manager": "Name manager",
+    "vertical_align_bottom": "Align bottom",
-		"vertical_align_bottom": "Align bottom",
+    "vertical_align_middle": " Align middle",
-		"vertical_align_middle": " Align middle",
+    "vertical_align_top": "Align top",
-		"vertical_align_top": "Align top",
+    "format_menu": {
-		"format_menu": {
+      "auto": "Auto",
-			"auto": "Auto",
+      "number": "Number",
-			"number": "Number",
+      "percentage": "Percentage",
-			"percentage": "Percentage",
+      "currency_eur": "Euro (EUR)",
-			"currency_eur": "Euro (EUR)",
+      "currency_usd": "Dollar (USD)",
-			"currency_usd": "Dollar (USD)",
+      "currency_gbp": "British Pound (GBD)",
-			"currency_gbp": "British Pound (GBD)",
+      "date_short": "Short date",
-			"date_short": "Short date",
+      "date_long": "Long date",
-			"date_long": "Long date",
+      "custom": "Custom",
-			"custom": "Custom",
+      "number_example": "1,000.00",
-			"number_example": "1,000.00",
+      "percentage_example": "10%",
-			"percentage_example": "10%",
+      "currency_eur_example": "€",
-			"currency_eur_example": "€",
+      "currency_usd_example": "$",
-			"currency_usd_example": "$",
+      "currency_gbp_example": "£",
-			"currency_gbp_example": "£",
+      "date_short_example": "09/24/2024",
-			"date_short_example": "09/24/2024",
+      "date_long_example": "Tuesday, September 24, 2024"
-			"date_long_example": "Tuesday, September 24, 2024"
+    },
-		},
+    "borders": {
-		"borders": {
+      "title": "Borders",
-			"title": "Borders",
+      "all": "All borders",
-			"all": "All borders",
+      "inner": "Inner borders",
-			"inner": "Inner borders",
+      "outer": "Outer borders",
-			"outer": "Outer borders",
+      "top": "Top borders",
-			"top": "Top borders",
+      "bottom": "Bottom borders",
-			"bottom": "Bottom borders",
+      "clear": "Clear borders",
-			"clear": "Clear borders",
+      "left": "Left borders",
-			"left": "Left borders",
+      "right": "Right borders",
-			"right": "Right borders",
+      "horizontal": "Horizontal borders",
-			"horizontal": "Horizontal borders",
+      "vertical": "Vertical borders",
-			"vertical": "Vertical borders",
+      "color": "Border color",
-			"color": "Border color",
+      "style": "Border style"
-			"style": "Border style"
+    }
-		}
+  },
-	},
+  "num_fmt": {
-	"num_fmt": {
+    "title": "Custom number format",
-		"title": "Custom number format",
+    "label": "Number format",
-		"label": "Number format",
+    "save": "Save"
-		"save": "Save"
+  },
-	},
+  "sheet_rename": {
-	"sheet_rename": {
+    "rename": "Save",
-		"rename": "Save",
+    "label": "New name",
-		"label": "New name",
+    "title": "Rename Sheet"
-		"title": "Rename Sheet"
+  },
-	},
+  "formula_input": {
-	"formula_input": {
+    "update": "Update",
-		"update": "Update",
+    "label": "Formula",
-		"label": "Formula",
+    "title": "Update formula"
-		"title": "Update formula"
+  },
-	},
+  "navigation": {
-	"navigation": {
+    "add_sheet": "Add sheet",
-		"add_sheet": "Add sheet",
+    "sheet_list": "Sheet list"
-		"sheet_list": "Sheet list"
+  }
-	},
-	"name_manager_dialog": {
-		"help": "Learn more about Named Ranges"
-	}
 }