UPDATE: Adds web app

This commit is contained in:
Nicolás Hatcher
2024-04-07 14:19:06 +02:00
parent 0ba80035d2
commit 9d83cc87c9
85 changed files with 25210 additions and 346 deletions

View File

@@ -107,6 +107,36 @@ autofill_columns_types = r"""
autoFillColumns(source_area: Area, to_column: number): void;
"""
set_cell_style = r"""
/**
* @param {any} styles
*/
onPasteStyles(styles: any): void;
"""
set_cell_style_types = r"""
/**
* @param {CellStyle[][]} styles
*/
onPasteStyles(styles: CellStyle[][]): void;
"""
set_area_border = r"""
/**
* @param {any} area
* @param {any} border_area
*/
setAreaWithBorder(area: any, border_area: any): void;
"""
set_area_border_types = r"""
/**
* @param {Area} area
* @param {BorderArea} border_area
*/
setAreaWithBorder(area: Area, border_area: BorderArea): void;
"""
def fix_types(text):
text = text.replace(get_tokens_str, get_tokens_str_types)
text = text.replace(update_style_str, update_style_str_types)
@@ -115,6 +145,8 @@ def fix_types(text):
text = text.replace(view, view_types)
text = text.replace(autofill_rows, autofill_rows_types)
text = text.replace(autofill_columns, autofill_columns_types)
text = text.replace(set_cell_style, set_cell_style_types)
text = text.replace(set_area_border, set_area_border_types)
with open("types.ts") as f:
types_str = f.read()
header_types = "{}\n\n{}".format(header, types_str)

View File

@@ -5,8 +5,8 @@ use wasm_bindgen::{
use ironcalc_base::{
expressions::{lexer::util::get_tokens as tokenizer, types::Area},
types::CellType,
UserModel as BaseModel,
types::{CellType, Style},
BorderArea, UserModel as BaseModel,
};
fn to_js_error(error: String) -> JsError {
@@ -102,6 +102,13 @@ impl Model {
self.model.rename_sheet(sheet, name).map_err(to_js_error)
}
#[wasm_bindgen(js_name = "setSheetColor")]
pub fn set_sheet_color(&mut self, sheet: u32, color: &str) -> Result<(), JsError> {
self.model
.set_sheet_color(sheet, color)
.map_err(to_js_error)
}
#[wasm_bindgen(js_name = "rangeClearAll")]
pub fn range_clear_all(
&mut self,
@@ -264,6 +271,12 @@ impl Model {
.map(|x| serde_wasm_bindgen::to_value(&x).unwrap())
}
#[wasm_bindgen(js_name = "onPasteStyles")]
pub fn on_paste_styles(&mut self, styles: JsValue) -> Result<(), JsError> {
let styles: &Vec<Vec<Style>> = &serde_wasm_bindgen::from_value(styles).unwrap();
self.model.on_paste_styles(styles).map_err(to_js_error)
}
#[wasm_bindgen(js_name = "getCellType")]
pub fn get_cell_type(&self, sheet: u32, row: i32, column: i32) -> Result<i32, JsError> {
Ok(
@@ -376,4 +389,88 @@ impl Model {
.auto_fill_columns(&area, to_column)
.map_err(to_js_error)
}
#[wasm_bindgen(js_name = "onArrowRight")]
pub fn on_arrow_right(&mut self) -> Result<(), JsError> {
self.model.on_arrow_right().map_err(to_js_error)
}
#[wasm_bindgen(js_name = "onArrowLeft")]
pub fn on_arrow_left(&mut self) -> Result<(), JsError> {
self.model.on_arrow_left().map_err(to_js_error)
}
#[wasm_bindgen(js_name = "onArrowUp")]
pub fn on_arrow_up(&mut self) -> Result<(), JsError> {
self.model.on_arrow_up().map_err(to_js_error)
}
#[wasm_bindgen(js_name = "onArrowDown")]
pub fn on_arrow_down(&mut self) -> Result<(), JsError> {
self.model.on_arrow_down().map_err(to_js_error)
}
#[wasm_bindgen(js_name = "onPageDown")]
pub fn on_page_down(&mut self) -> Result<(), JsError> {
self.model.on_page_down().map_err(to_js_error)
}
#[wasm_bindgen(js_name = "onPageUp")]
pub fn on_page_up(&mut self) -> Result<(), JsError> {
self.model.on_page_up().map_err(to_js_error)
}
#[wasm_bindgen(js_name = "setWindowWidth")]
pub fn set_window_width(&mut self, window_width: f64) {
self.model.set_window_width(window_width);
}
#[wasm_bindgen(js_name = "setWindowHeight")]
pub fn set_window_height(&mut self, window_height: f64) {
self.model.set_window_height(window_height);
}
#[wasm_bindgen(js_name = "getScrollX")]
pub fn get_scroll_x(&self) -> Result<f64, JsError> {
self.model.get_scroll_x().map_err(to_js_error)
}
#[wasm_bindgen(js_name = "getScrollY")]
pub fn get_scroll_y(&self) -> Result<f64, JsError> {
self.model.get_scroll_y().map_err(to_js_error)
}
#[wasm_bindgen(js_name = "onExpandSelectedRange")]
pub fn on_expand_selected_range(&mut self, key: &str) -> Result<(), JsError> {
self.model
.on_expand_selected_range(key)
.map_err(to_js_error)
}
#[wasm_bindgen(js_name = "onAreaSelecting")]
pub fn on_area_selecting(
&mut self,
target_row: i32,
target_column: i32,
) -> Result<(), JsError> {
self.model
.on_area_selecting(target_row, target_column)
.map_err(to_js_error)
}
#[wasm_bindgen(js_name = "setAreaWithBorder")]
pub fn set_area_with_border(
&mut self,
area: JsValue,
border_area: JsValue,
) -> Result<(), JsError> {
let range: Area =
serde_wasm_bindgen::from_value(area).map_err(|e| to_js_error(e.to_string()))?;
let border: BorderArea =
serde_wasm_bindgen::from_value(border_area).map_err(|e| to_js_error(e.to_string()))?;
self.model
.set_area_with_border(&range, &border)
.map_err(|e| to_js_error(e.to_string()))?;
Ok(())
}
}

View File

@@ -6,6 +6,24 @@ export interface Area {
height: number;
}
export enum BorderType {
All = "All",
Inner = "Inner",
Outer = "Outer",
Top = "Top",
Right = "Right",
Bottom = "Bottom",
Left = "Left",
CenterH = "CenterH",
CenterV = "CenterV",
None = "None",
}
export interface BorderArea {
item: BorderItem;
type: BorderType;
}
type ErrorType =
| "REF"
| "NAME"
@@ -115,19 +133,19 @@ interface CellStyleFont {
scheme: string;
}
export enum BorderType {
BorderAll,
BorderInner,
BorderCenterH,
BorderCenterV,
BorderOuter,
BorderNone,
BorderTop,
BorderRight,
BorderBottom,
BorderLeft,
None,
}
// export enum BorderType {
// BorderAll,
// BorderInner,
// BorderCenterH,
// BorderCenterV,
// BorderOuter,
// BorderNone,
// BorderTop,
// BorderRight,
// BorderBottom,
// BorderLeft,
// None,
// }
export interface BorderOptions {
color: string;
@@ -192,3 +210,12 @@ export interface CellStyle {
num_fmt: string;
alignment?: Alignment;
}
export interface SelectedView {
sheet: number;
row: number;
column: number;
range: [number, number, number, number];
top_row: number;
left_column: number;
}