Compare commits
4 Commits
feature/ni
...
feature/ni
| Author | SHA1 | Date | |
|---|---|---|---|
|
379c84f64a | ||
|
|
49c3b14bf0 | ||
|
|
d2cba48f8e | ||
|
|
f752c90058 |
3
.gitignore
vendored
3
.gitignore
vendored
@@ -1,3 +1,2 @@
|
|||||||
target/*
|
target/*
|
||||||
**/node_modules/*
|
.DS_Store
|
||||||
.DS_Store
|
|
||||||
432
Cargo.lock
generated
432
Cargo.lock
generated
@@ -19,18 +19,6 @@ dependencies = [
|
|||||||
"cpufeatures",
|
"cpufeatures",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "ahash"
|
|
||||||
version = "0.8.11"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
|
|
||||||
dependencies = [
|
|
||||||
"cfg-if",
|
|
||||||
"once_cell",
|
|
||||||
"version_check",
|
|
||||||
"zerocopy",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "aho-corasick"
|
name = "aho-corasick"
|
||||||
version = "1.1.3"
|
version = "1.1.3"
|
||||||
@@ -40,12 +28,6 @@ dependencies = [
|
|||||||
"memchr",
|
"memchr",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "allocator-api2"
|
|
||||||
version = "0.2.18"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "android-tzdata"
|
name = "android-tzdata"
|
||||||
version = "0.1.1"
|
version = "0.1.1"
|
||||||
@@ -94,12 +76,6 @@ dependencies = [
|
|||||||
"syn",
|
"syn",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "bitflags"
|
|
||||||
version = "2.5.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "block-buffer"
|
name = "block-buffer"
|
||||||
version = "0.10.4"
|
version = "0.10.4"
|
||||||
@@ -148,21 +124,6 @@ dependencies = [
|
|||||||
"pkg-config",
|
"pkg-config",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "cassowary"
|
|
||||||
version = "0.3.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "castaway"
|
|
||||||
version = "0.2.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "8a17ed5635fc8536268e5d4de1e22e81ac34419e5f052d4d51f4e01dcc263fcc"
|
|
||||||
dependencies = [
|
|
||||||
"rustversion",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cc"
|
name = "cc"
|
||||||
version = "1.0.90"
|
version = "1.0.90"
|
||||||
@@ -190,7 +151,7 @@ dependencies = [
|
|||||||
"js-sys",
|
"js-sys",
|
||||||
"num-traits",
|
"num-traits",
|
||||||
"wasm-bindgen",
|
"wasm-bindgen",
|
||||||
"windows-targets 0.52.4",
|
"windows-targets",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -225,19 +186,6 @@ dependencies = [
|
|||||||
"inout",
|
"inout",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "compact_str"
|
|
||||||
version = "0.7.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "f86b9c4c00838774a6d902ef931eff7470720c51d90c2e32cfe15dc304737b3f"
|
|
||||||
dependencies = [
|
|
||||||
"castaway",
|
|
||||||
"cfg-if",
|
|
||||||
"itoa",
|
|
||||||
"ryu",
|
|
||||||
"static_assertions",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "console_error_panic_hook"
|
name = "console_error_panic_hook"
|
||||||
version = "0.1.7"
|
version = "0.1.7"
|
||||||
@@ -284,31 +232,6 @@ version = "0.8.19"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
|
checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "crossterm"
|
|
||||||
version = "0.27.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"
|
|
||||||
dependencies = [
|
|
||||||
"bitflags",
|
|
||||||
"crossterm_winapi",
|
|
||||||
"libc",
|
|
||||||
"mio",
|
|
||||||
"parking_lot",
|
|
||||||
"signal-hook",
|
|
||||||
"signal-hook-mio",
|
|
||||||
"winapi",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "crossterm_winapi"
|
|
||||||
version = "0.9.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
|
|
||||||
dependencies = [
|
|
||||||
"winapi",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "crypto-common"
|
name = "crypto-common"
|
||||||
version = "0.1.6"
|
version = "0.1.6"
|
||||||
@@ -376,22 +299,6 @@ dependencies = [
|
|||||||
"wasi",
|
"wasi",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "hashbrown"
|
|
||||||
version = "0.14.5"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
|
|
||||||
dependencies = [
|
|
||||||
"ahash",
|
|
||||||
"allocator-api2",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "heck"
|
|
||||||
version = "0.4.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "hmac"
|
name = "hmac"
|
||||||
version = "0.12.1"
|
version = "0.12.1"
|
||||||
@@ -424,12 +331,6 @@ dependencies = [
|
|||||||
"cc",
|
"cc",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "indoc"
|
|
||||||
version = "2.0.5"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "inout"
|
name = "inout"
|
||||||
version = "0.1.3"
|
version = "0.1.3"
|
||||||
@@ -510,31 +411,12 @@ version = "0.2.153"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
|
checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "lock_api"
|
|
||||||
version = "0.4.12"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
|
|
||||||
dependencies = [
|
|
||||||
"autocfg",
|
|
||||||
"scopeguard",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "log"
|
name = "log"
|
||||||
version = "0.4.21"
|
version = "0.4.21"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
|
checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "lru"
|
|
||||||
version = "0.12.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc"
|
|
||||||
dependencies = [
|
|
||||||
"hashbrown",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "memchr"
|
name = "memchr"
|
||||||
version = "2.7.2"
|
version = "2.7.2"
|
||||||
@@ -550,18 +432,6 @@ dependencies = [
|
|||||||
"adler",
|
"adler",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "mio"
|
|
||||||
version = "0.8.11"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
|
|
||||||
dependencies = [
|
|
||||||
"libc",
|
|
||||||
"log",
|
|
||||||
"wasi",
|
|
||||||
"windows-sys",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "num-conv"
|
name = "num-conv"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
@@ -583,29 +453,6 @@ version = "1.19.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
|
checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "parking_lot"
|
|
||||||
version = "0.12.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb"
|
|
||||||
dependencies = [
|
|
||||||
"lock_api",
|
|
||||||
"parking_lot_core",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "parking_lot_core"
|
|
||||||
version = "0.9.10"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
|
|
||||||
dependencies = [
|
|
||||||
"cfg-if",
|
|
||||||
"libc",
|
|
||||||
"redox_syscall",
|
|
||||||
"smallvec",
|
|
||||||
"windows-targets 0.52.4",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "parse-zoneinfo"
|
name = "parse-zoneinfo"
|
||||||
version = "0.3.0"
|
version = "0.3.0"
|
||||||
@@ -626,12 +473,6 @@ dependencies = [
|
|||||||
"subtle",
|
"subtle",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "paste"
|
|
||||||
version = "1.0.14"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pbkdf2"
|
name = "pbkdf2"
|
||||||
version = "0.11.0"
|
version = "0.11.0"
|
||||||
@@ -748,35 +589,6 @@ dependencies = [
|
|||||||
"getrandom",
|
"getrandom",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "ratatui"
|
|
||||||
version = "0.26.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "a564a852040e82671dc50a37d88f3aa83bbc690dfc6844cfe7a2591620206a80"
|
|
||||||
dependencies = [
|
|
||||||
"bitflags",
|
|
||||||
"cassowary",
|
|
||||||
"compact_str",
|
|
||||||
"crossterm",
|
|
||||||
"indoc",
|
|
||||||
"itertools",
|
|
||||||
"lru",
|
|
||||||
"paste",
|
|
||||||
"stability",
|
|
||||||
"strum",
|
|
||||||
"unicode-segmentation",
|
|
||||||
"unicode-width",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "redox_syscall"
|
|
||||||
version = "0.5.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
|
|
||||||
dependencies = [
|
|
||||||
"bitflags",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "regex"
|
name = "regex"
|
||||||
version = "1.10.4"
|
version = "1.10.4"
|
||||||
@@ -812,12 +624,6 @@ version = "0.19.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f"
|
checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "rustversion"
|
|
||||||
version = "1.0.15"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ryu"
|
name = "ryu"
|
||||||
version = "1.0.17"
|
version = "1.0.17"
|
||||||
@@ -830,12 +636,6 @@ version = "1.0.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
|
checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "scopeguard"
|
|
||||||
version = "1.2.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde"
|
name = "serde"
|
||||||
version = "1.0.197"
|
version = "1.0.197"
|
||||||
@@ -900,86 +700,12 @@ dependencies = [
|
|||||||
"digest",
|
"digest",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "signal-hook"
|
|
||||||
version = "0.3.17"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
|
|
||||||
dependencies = [
|
|
||||||
"libc",
|
|
||||||
"signal-hook-registry",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "signal-hook-mio"
|
|
||||||
version = "0.2.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
|
|
||||||
dependencies = [
|
|
||||||
"libc",
|
|
||||||
"mio",
|
|
||||||
"signal-hook",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "signal-hook-registry"
|
|
||||||
version = "1.4.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
|
|
||||||
dependencies = [
|
|
||||||
"libc",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "siphasher"
|
name = "siphasher"
|
||||||
version = "0.3.11"
|
version = "0.3.11"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
|
checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "smallvec"
|
|
||||||
version = "1.13.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "stability"
|
|
||||||
version = "0.2.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "2ff9eaf853dec4c8802325d8b6d3dffa86cc707fd7a1a4cdbf416e13b061787a"
|
|
||||||
dependencies = [
|
|
||||||
"quote",
|
|
||||||
"syn",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "static_assertions"
|
|
||||||
version = "1.1.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "strum"
|
|
||||||
version = "0.26.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29"
|
|
||||||
dependencies = [
|
|
||||||
"strum_macros",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "strum_macros"
|
|
||||||
version = "0.26.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946"
|
|
||||||
dependencies = [
|
|
||||||
"heck",
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"rustversion",
|
|
||||||
"syn",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "subtle"
|
name = "subtle"
|
||||||
version = "2.5.0"
|
version = "2.5.0"
|
||||||
@@ -1036,26 +762,6 @@ version = "0.1.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
|
checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "tiron"
|
|
||||||
version = "0.1.3"
|
|
||||||
dependencies = [
|
|
||||||
"crossterm",
|
|
||||||
"ironcalc",
|
|
||||||
"ratatui",
|
|
||||||
"tui-input",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "tui-input"
|
|
||||||
version = "0.8.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "b3e785f863a3af4c800a2a669d0b64c879b538738e352607e2624d03f868dc01"
|
|
||||||
dependencies = [
|
|
||||||
"crossterm",
|
|
||||||
"unicode-width",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "typenum"
|
name = "typenum"
|
||||||
version = "1.17.0"
|
version = "1.17.0"
|
||||||
@@ -1068,18 +774,6 @@ version = "1.0.12"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
|
checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "unicode-segmentation"
|
|
||||||
version = "1.11.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "unicode-width"
|
|
||||||
version = "0.1.12"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "uuid"
|
name = "uuid"
|
||||||
version = "1.8.0"
|
version = "1.8.0"
|
||||||
@@ -1214,59 +908,13 @@ dependencies = [
|
|||||||
"wasm-bindgen",
|
"wasm-bindgen",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "winapi"
|
|
||||||
version = "0.3.9"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
|
|
||||||
dependencies = [
|
|
||||||
"winapi-i686-pc-windows-gnu",
|
|
||||||
"winapi-x86_64-pc-windows-gnu",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "winapi-i686-pc-windows-gnu"
|
|
||||||
version = "0.4.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "winapi-x86_64-pc-windows-gnu"
|
|
||||||
version = "0.4.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows-core"
|
name = "windows-core"
|
||||||
version = "0.52.0"
|
version = "0.52.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
|
checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"windows-targets 0.52.4",
|
"windows-targets",
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "windows-sys"
|
|
||||||
version = "0.48.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
|
|
||||||
dependencies = [
|
|
||||||
"windows-targets 0.48.5",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "windows-targets"
|
|
||||||
version = "0.48.5"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
|
|
||||||
dependencies = [
|
|
||||||
"windows_aarch64_gnullvm 0.48.5",
|
|
||||||
"windows_aarch64_msvc 0.48.5",
|
|
||||||
"windows_i686_gnu 0.48.5",
|
|
||||||
"windows_i686_msvc 0.48.5",
|
|
||||||
"windows_x86_64_gnu 0.48.5",
|
|
||||||
"windows_x86_64_gnullvm 0.48.5",
|
|
||||||
"windows_x86_64_msvc 0.48.5",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -1275,119 +923,57 @@ version = "0.52.4"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
|
checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"windows_aarch64_gnullvm 0.52.4",
|
"windows_aarch64_gnullvm",
|
||||||
"windows_aarch64_msvc 0.52.4",
|
"windows_aarch64_msvc",
|
||||||
"windows_i686_gnu 0.52.4",
|
"windows_i686_gnu",
|
||||||
"windows_i686_msvc 0.52.4",
|
"windows_i686_msvc",
|
||||||
"windows_x86_64_gnu 0.52.4",
|
"windows_x86_64_gnu",
|
||||||
"windows_x86_64_gnullvm 0.52.4",
|
"windows_x86_64_gnullvm",
|
||||||
"windows_x86_64_msvc 0.52.4",
|
"windows_x86_64_msvc",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "windows_aarch64_gnullvm"
|
|
||||||
version = "0.48.5"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_aarch64_gnullvm"
|
name = "windows_aarch64_gnullvm"
|
||||||
version = "0.52.4"
|
version = "0.52.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
|
checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "windows_aarch64_msvc"
|
|
||||||
version = "0.48.5"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_aarch64_msvc"
|
name = "windows_aarch64_msvc"
|
||||||
version = "0.52.4"
|
version = "0.52.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
|
checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "windows_i686_gnu"
|
|
||||||
version = "0.48.5"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_i686_gnu"
|
name = "windows_i686_gnu"
|
||||||
version = "0.52.4"
|
version = "0.52.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
|
checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "windows_i686_msvc"
|
|
||||||
version = "0.48.5"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_i686_msvc"
|
name = "windows_i686_msvc"
|
||||||
version = "0.52.4"
|
version = "0.52.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
|
checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "windows_x86_64_gnu"
|
|
||||||
version = "0.48.5"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_x86_64_gnu"
|
name = "windows_x86_64_gnu"
|
||||||
version = "0.52.4"
|
version = "0.52.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
|
checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "windows_x86_64_gnullvm"
|
|
||||||
version = "0.48.5"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_x86_64_gnullvm"
|
name = "windows_x86_64_gnullvm"
|
||||||
version = "0.52.4"
|
version = "0.52.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
|
checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "windows_x86_64_msvc"
|
|
||||||
version = "0.48.5"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_x86_64_msvc"
|
name = "windows_x86_64_msvc"
|
||||||
version = "0.52.4"
|
version = "0.52.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
|
checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "zerocopy"
|
|
||||||
version = "0.7.32"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
|
|
||||||
dependencies = [
|
|
||||||
"zerocopy-derive",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "zerocopy-derive"
|
|
||||||
version = "0.7.32"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"syn",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zip"
|
name = "zip"
|
||||||
version = "0.6.6"
|
version = "0.6.6"
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ resolver = "2"
|
|||||||
members = [
|
members = [
|
||||||
"base",
|
"base",
|
||||||
"xlsx",
|
"xlsx",
|
||||||
"tironcalc",
|
|
||||||
"bindings/wasm",
|
"bindings/wasm",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|||||||
@@ -222,7 +222,7 @@ impl Parser {
|
|||||||
|
|
||||||
pub fn parse(&mut self, formula: &str, context: &Option<CellReferenceRC>) -> Node {
|
pub fn parse(&mut self, formula: &str, context: &Option<CellReferenceRC>) -> Node {
|
||||||
self.lexer.set_formula(formula);
|
self.lexer.set_formula(formula);
|
||||||
self.context = context.clone();
|
self.context.clone_from(context);
|
||||||
self.parse_expr()
|
self.parse_expr()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -118,6 +118,8 @@ pub struct Model {
|
|||||||
pub(crate) language: Language,
|
pub(crate) language: Language,
|
||||||
/// The timezone used to evaluate the model
|
/// The timezone used to evaluate the model
|
||||||
pub(crate) tz: Tz,
|
pub(crate) tz: Tz,
|
||||||
|
/// The view id. A view consist of a selected sheet and ranges.
|
||||||
|
pub(crate) view_id: u32,
|
||||||
}
|
}
|
||||||
|
|
||||||
// FIXME: Maybe this should be the same as CellReference
|
// FIXME: Maybe this should be the same as CellReference
|
||||||
@@ -886,6 +888,7 @@ impl Model {
|
|||||||
language,
|
language,
|
||||||
locale,
|
locale,
|
||||||
tz,
|
tz,
|
||||||
|
view_id: 0,
|
||||||
};
|
};
|
||||||
|
|
||||||
model.parse_formulas();
|
model.parse_formulas();
|
||||||
|
|||||||
@@ -6,14 +6,18 @@ use crate::{
|
|||||||
calc_result::Range,
|
calc_result::Range,
|
||||||
expressions::{
|
expressions::{
|
||||||
lexer::LexerMode,
|
lexer::LexerMode,
|
||||||
parser::stringify::{rename_sheet_in_node, to_rc_format},
|
parser::{
|
||||||
parser::Parser,
|
stringify::{rename_sheet_in_node, to_rc_format},
|
||||||
|
Parser,
|
||||||
|
},
|
||||||
types::CellReferenceRC,
|
types::CellReferenceRC,
|
||||||
},
|
},
|
||||||
language::get_language,
|
language::get_language,
|
||||||
locale::get_locale,
|
locale::get_locale,
|
||||||
model::{get_milliseconds_since_epoch, Model, ParsedDefinedName},
|
model::{get_milliseconds_since_epoch, Model, ParsedDefinedName},
|
||||||
types::{Metadata, SheetState, Workbook, WorkbookSettings, Worksheet},
|
types::{
|
||||||
|
Metadata, SheetState, Workbook, WorkbookSettings, WorkbookView, Worksheet, WorksheetView,
|
||||||
|
},
|
||||||
utils::ParsedReference,
|
utils::ParsedReference,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -33,7 +37,20 @@ fn is_valid_sheet_name(name: &str) -> bool {
|
|||||||
|
|
||||||
impl Model {
|
impl Model {
|
||||||
/// Creates a new worksheet. Note that it does not check if the name or the sheet_id exists
|
/// Creates a new worksheet. Note that it does not check if the name or the sheet_id exists
|
||||||
fn new_empty_worksheet(name: &str, sheet_id: u32) -> Worksheet {
|
fn new_empty_worksheet(name: &str, sheet_id: u32, view_ids: &[&u32]) -> Worksheet {
|
||||||
|
let mut views = HashMap::new();
|
||||||
|
for id in view_ids {
|
||||||
|
views.insert(
|
||||||
|
**id,
|
||||||
|
WorksheetView {
|
||||||
|
row: 1,
|
||||||
|
column: 1,
|
||||||
|
range: [1, 1, 1, 1],
|
||||||
|
top_row: 1,
|
||||||
|
left_column: 1,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
Worksheet {
|
Worksheet {
|
||||||
cols: vec![],
|
cols: vec![],
|
||||||
rows: vec![],
|
rows: vec![],
|
||||||
@@ -48,6 +65,7 @@ impl Model {
|
|||||||
color: Default::default(),
|
color: Default::default(),
|
||||||
frozen_columns: 0,
|
frozen_columns: 0,
|
||||||
frozen_rows: 0,
|
frozen_rows: 0,
|
||||||
|
views,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -122,7 +140,7 @@ impl Model {
|
|||||||
self.parsed_defined_names = parsed_defined_names;
|
self.parsed_defined_names = parsed_defined_names;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Reparses all formulas and defined names
|
/// Reparses all formulas and defined names
|
||||||
pub(crate) fn reset_parsed_structures(&mut self) {
|
pub(crate) fn reset_parsed_structures(&mut self) {
|
||||||
self.parser
|
self.parser
|
||||||
.set_worksheets(self.workbook.get_worksheet_names());
|
.set_worksheets(self.workbook.get_worksheet_names());
|
||||||
@@ -153,7 +171,8 @@ impl Model {
|
|||||||
let sheet_name = format!("{}{}", base_name, index);
|
let sheet_name = format!("{}{}", base_name, index);
|
||||||
// Now we need a sheet_id
|
// Now we need a sheet_id
|
||||||
let sheet_id = self.get_new_sheet_id();
|
let sheet_id = self.get_new_sheet_id();
|
||||||
let worksheet = Model::new_empty_worksheet(&sheet_name, sheet_id);
|
let view_ids: Vec<&u32> = self.workbook.views.keys().collect();
|
||||||
|
let worksheet = Model::new_empty_worksheet(&sheet_name, sheet_id, &view_ids);
|
||||||
self.workbook.worksheets.push(worksheet);
|
self.workbook.worksheets.push(worksheet);
|
||||||
self.reset_parsed_structures();
|
self.reset_parsed_structures();
|
||||||
(sheet_name, self.workbook.worksheets.len() as u32 - 1)
|
(sheet_name, self.workbook.worksheets.len() as u32 - 1)
|
||||||
@@ -184,7 +203,8 @@ impl Model {
|
|||||||
Some(id) => id,
|
Some(id) => id,
|
||||||
None => self.get_new_sheet_id(),
|
None => self.get_new_sheet_id(),
|
||||||
};
|
};
|
||||||
let worksheet = Model::new_empty_worksheet(sheet_name, sheet_id);
|
let view_ids: Vec<&u32> = self.workbook.views.keys().collect();
|
||||||
|
let worksheet = Model::new_empty_worksheet(sheet_name, sheet_id, &view_ids);
|
||||||
if sheet_index as usize > self.workbook.worksheets.len() {
|
if sheet_index as usize > self.workbook.worksheets.len() {
|
||||||
return Err("Sheet index out of range".to_string());
|
return Err("Sheet index out of range".to_string());
|
||||||
}
|
}
|
||||||
@@ -331,11 +351,14 @@ impl Model {
|
|||||||
// "2020-08-06T21:20:53Z
|
// "2020-08-06T21:20:53Z
|
||||||
let now = dt.format("%Y-%m-%dT%H:%M:%SZ").to_string();
|
let now = dt.format("%Y-%m-%dT%H:%M:%SZ").to_string();
|
||||||
|
|
||||||
|
let mut views = HashMap::new();
|
||||||
|
views.insert(0, WorkbookView { sheet: 0 });
|
||||||
|
|
||||||
// String versions of the locale are added here to simplify the serialize/deserialize logic
|
// String versions of the locale are added here to simplify the serialize/deserialize logic
|
||||||
let workbook = Workbook {
|
let workbook = Workbook {
|
||||||
shared_strings: vec![],
|
shared_strings: vec![],
|
||||||
defined_names: vec![],
|
defined_names: vec![],
|
||||||
worksheets: vec![Model::new_empty_worksheet("Sheet1", 1)],
|
worksheets: vec![Model::new_empty_worksheet("Sheet1", 1, &[&0])],
|
||||||
styles: Default::default(),
|
styles: Default::default(),
|
||||||
name: name.to_string(),
|
name: name.to_string(),
|
||||||
settings: WorkbookSettings {
|
settings: WorkbookSettings {
|
||||||
@@ -351,6 +374,7 @@ impl Model {
|
|||||||
last_modified: now,
|
last_modified: now,
|
||||||
},
|
},
|
||||||
tables: HashMap::new(),
|
tables: HashMap::new(),
|
||||||
|
views,
|
||||||
};
|
};
|
||||||
let parsed_formulas = Vec::new();
|
let parsed_formulas = Vec::new();
|
||||||
let worksheets = &workbook.worksheets;
|
let worksheets = &workbook.worksheets;
|
||||||
@@ -371,6 +395,7 @@ impl Model {
|
|||||||
locale,
|
locale,
|
||||||
language,
|
language,
|
||||||
tz,
|
tz,
|
||||||
|
view_id: 0,
|
||||||
};
|
};
|
||||||
model.parse_formulas();
|
model.parse_formulas();
|
||||||
Ok(model)
|
Ok(model)
|
||||||
|
|||||||
@@ -76,10 +76,16 @@ fn fn_imconjugate() {
|
|||||||
fn fn_imcos() {
|
fn fn_imcos() {
|
||||||
let mut model = new_empty_model();
|
let mut model = new_empty_model();
|
||||||
model._set("A1", r#"=IMCOS("4+3i")"#);
|
model._set("A1", r#"=IMCOS("4+3i")"#);
|
||||||
|
// In macos non intel this is "-6.58066304055116+7.58155274274655i"
|
||||||
|
model._set("A2", r#"=COMPLEX(-6.58066304055116, 7.58155274274654)"#);
|
||||||
|
model._set("A3", r#"=IMABS(IMSUB(A1, A2)) < G1"#);
|
||||||
|
|
||||||
|
// small number
|
||||||
|
model._set("G1", "0.0000001");
|
||||||
|
|
||||||
model.evaluate();
|
model.evaluate();
|
||||||
|
|
||||||
assert_eq!(model._get_text("A1"), "-6.58066304055116+7.58155274274654i");
|
assert_eq!(model._get_text("A3"), "TRUE");
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
|||||||
@@ -8,3 +8,4 @@ mod test_row_column;
|
|||||||
mod test_styles;
|
mod test_styles;
|
||||||
mod test_to_from_bytes;
|
mod test_to_from_bytes;
|
||||||
mod test_undo_redo;
|
mod test_undo_redo;
|
||||||
|
mod test_view;
|
||||||
|
|||||||
216
base/src/test/user_model/test_view.rs
Normal file
216
base/src/test/user_model/test_view.rs
Normal file
@@ -0,0 +1,216 @@
|
|||||||
|
#![allow(clippy::unwrap_used)]
|
||||||
|
|
||||||
|
use std::collections::HashMap;
|
||||||
|
|
||||||
|
use crate::{
|
||||||
|
constants::{LAST_COLUMN, LAST_ROW},
|
||||||
|
test::util::new_empty_model,
|
||||||
|
user_model::SelectedView,
|
||||||
|
UserModel,
|
||||||
|
};
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn initial_view() {
|
||||||
|
let model = new_empty_model();
|
||||||
|
let model = UserModel::from_model(model);
|
||||||
|
assert_eq!(model.get_selected_sheet(), 0);
|
||||||
|
assert_eq!(model.get_selected_cell(), (0, 1, 1));
|
||||||
|
assert_eq!(
|
||||||
|
model.get_selected_view(),
|
||||||
|
SelectedView {
|
||||||
|
sheet: 0,
|
||||||
|
row: 1,
|
||||||
|
column: 1,
|
||||||
|
range: [1, 1, 1, 1],
|
||||||
|
top_row: 1,
|
||||||
|
left_column: 1
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn set_the_cell_sets_the_range() {
|
||||||
|
let model = new_empty_model();
|
||||||
|
let mut model = UserModel::from_model(model);
|
||||||
|
model.set_selected_cell(5, 4).unwrap();
|
||||||
|
assert_eq!(model.get_selected_sheet(), 0);
|
||||||
|
assert_eq!(model.get_selected_cell(), (0, 5, 4));
|
||||||
|
assert_eq!(
|
||||||
|
model.get_selected_view(),
|
||||||
|
SelectedView {
|
||||||
|
sheet: 0,
|
||||||
|
row: 5,
|
||||||
|
column: 4,
|
||||||
|
range: [5, 4, 5, 4],
|
||||||
|
top_row: 1,
|
||||||
|
left_column: 1
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn set_the_range_does_not_set_the_cell() {
|
||||||
|
let model = new_empty_model();
|
||||||
|
let mut model = UserModel::from_model(model);
|
||||||
|
model.set_selected_range(5, 4, 10, 6).unwrap();
|
||||||
|
assert_eq!(model.get_selected_sheet(), 0);
|
||||||
|
assert_eq!(model.get_selected_cell(), (0, 1, 1));
|
||||||
|
assert_eq!(
|
||||||
|
model.get_selected_view(),
|
||||||
|
SelectedView {
|
||||||
|
sheet: 0,
|
||||||
|
row: 1,
|
||||||
|
column: 1,
|
||||||
|
range: [5, 4, 10, 6],
|
||||||
|
top_row: 1,
|
||||||
|
left_column: 1
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn add_new_sheet_and_back() {
|
||||||
|
let model = new_empty_model();
|
||||||
|
let mut model = UserModel::from_model(model);
|
||||||
|
model.new_sheet();
|
||||||
|
assert_eq!(model.get_selected_sheet(), 0);
|
||||||
|
model.set_selected_cell(5, 4).unwrap();
|
||||||
|
model.set_selected_sheet(1).unwrap();
|
||||||
|
assert_eq!(model.get_selected_cell(), (1, 1, 1));
|
||||||
|
model.set_selected_sheet(0).unwrap();
|
||||||
|
assert_eq!(model.get_selected_cell(), (0, 5, 4));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn set_selected_cell_errors() {
|
||||||
|
let model = new_empty_model();
|
||||||
|
let mut model = UserModel::from_model(model);
|
||||||
|
assert_eq!(
|
||||||
|
model.set_selected_cell(-5, 4),
|
||||||
|
Err("Invalid row: '-5'".to_string())
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
model.set_selected_cell(5, -4),
|
||||||
|
Err("Invalid column: '-4'".to_string())
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
model.set_selected_range(-1, 1, 1, 1),
|
||||||
|
Err("Invalid row: '-1'".to_string())
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
model.set_selected_range(1, 0, 1, 1),
|
||||||
|
Err("Invalid column: '0'".to_string())
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
model.set_selected_range(1, 1, LAST_ROW + 1, 1),
|
||||||
|
Err("Invalid row: '1048577'".to_string())
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
model.set_selected_range(1, 1, 1, LAST_COLUMN + 1),
|
||||||
|
Err("Invalid column: '16385'".to_string())
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn set_selected_cell_errors_wrong_sheet() {
|
||||||
|
let mut model = new_empty_model();
|
||||||
|
// forcefully set a wrong index
|
||||||
|
model.workbook.views.get_mut(&0).unwrap().sheet = 2;
|
||||||
|
let mut model = UserModel::from_model(model);
|
||||||
|
// It's returning the wrong number
|
||||||
|
assert_eq!(model.get_selected_sheet(), 2);
|
||||||
|
|
||||||
|
// But we can't set the selected cell anymore
|
||||||
|
assert_eq!(
|
||||||
|
model.set_selected_cell(3, 4),
|
||||||
|
Err("Invalid worksheet index 2".to_string())
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
model.set_selected_range(3, 4, 5, 6),
|
||||||
|
Err("Invalid worksheet index 2".to_string())
|
||||||
|
);
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
model.set_top_left_visible_cell(3, 4),
|
||||||
|
Err("Invalid worksheet index 2".to_string())
|
||||||
|
);
|
||||||
|
|
||||||
|
// we can fix it by setting the right cell
|
||||||
|
model.set_selected_sheet(0).unwrap();
|
||||||
|
model.set_selected_cell(3, 4).unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn set_visible_cell() {
|
||||||
|
let model = new_empty_model();
|
||||||
|
let mut model = UserModel::from_model(model);
|
||||||
|
model.set_top_left_visible_cell(100, 12).unwrap();
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
model.get_selected_view(),
|
||||||
|
SelectedView {
|
||||||
|
sheet: 0,
|
||||||
|
row: 1,
|
||||||
|
column: 1,
|
||||||
|
range: [1, 1, 1, 1],
|
||||||
|
top_row: 100,
|
||||||
|
left_column: 12
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
let s = serde_json::to_string(&model.get_selected_view()).unwrap();
|
||||||
|
assert_eq!(
|
||||||
|
serde_json::from_str::<SelectedView>(&s).unwrap(),
|
||||||
|
SelectedView {
|
||||||
|
sheet: 0,
|
||||||
|
row: 1,
|
||||||
|
column: 1,
|
||||||
|
range: [1, 1, 1, 1],
|
||||||
|
top_row: 100,
|
||||||
|
left_column: 12
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn set_visible_cell_errors() {
|
||||||
|
let model = new_empty_model();
|
||||||
|
let mut model = UserModel::from_model(model);
|
||||||
|
assert_eq!(
|
||||||
|
model.set_top_left_visible_cell(-100, 12),
|
||||||
|
Err("Invalid row: '-100'".to_string())
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
model.set_top_left_visible_cell(100, -12),
|
||||||
|
Err("Invalid column: '-12'".to_string())
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn errors_no_views() {
|
||||||
|
let mut model = new_empty_model();
|
||||||
|
// forcefully remove the view
|
||||||
|
model.workbook.views = HashMap::new();
|
||||||
|
// also in the sheet
|
||||||
|
model.workbook.worksheets[0].views = HashMap::new();
|
||||||
|
let mut model = UserModel::from_model(model);
|
||||||
|
// get methods will return defaults
|
||||||
|
assert_eq!(model.get_selected_sheet(), 0);
|
||||||
|
assert_eq!(model.get_selected_cell(), (0, 1, 1));
|
||||||
|
assert_eq!(
|
||||||
|
model.get_selected_view(),
|
||||||
|
SelectedView {
|
||||||
|
sheet: 0,
|
||||||
|
row: 1,
|
||||||
|
column: 1,
|
||||||
|
range: [1, 1, 1, 1],
|
||||||
|
top_row: 1,
|
||||||
|
left_column: 1
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
// set methods won't complain. but won't work either
|
||||||
|
model.set_selected_sheet(0).unwrap();
|
||||||
|
model.set_selected_cell(5, 6).unwrap();
|
||||||
|
assert_eq!(model.get_selected_cell(), (0, 1, 1));
|
||||||
|
}
|
||||||
@@ -27,6 +27,14 @@ pub struct WorkbookSettings {
|
|||||||
pub tz: String,
|
pub tz: String,
|
||||||
pub locale: String,
|
pub locale: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// A Workbook View tracks of the selected sheet for each view
|
||||||
|
#[derive(Encode, Decode, Debug, PartialEq, Clone)]
|
||||||
|
pub struct WorkbookView {
|
||||||
|
/// The index of the currently selected sheet.
|
||||||
|
pub sheet: u32,
|
||||||
|
}
|
||||||
|
|
||||||
/// An internal representation of an IronCalc Workbook
|
/// An internal representation of an IronCalc Workbook
|
||||||
#[derive(Encode, Decode, Debug, PartialEq, Clone)]
|
#[derive(Encode, Decode, Debug, PartialEq, Clone)]
|
||||||
pub struct Workbook {
|
pub struct Workbook {
|
||||||
@@ -38,6 +46,7 @@ pub struct Workbook {
|
|||||||
pub settings: WorkbookSettings,
|
pub settings: WorkbookSettings,
|
||||||
pub metadata: Metadata,
|
pub metadata: Metadata,
|
||||||
pub tables: HashMap<String, Table>,
|
pub tables: HashMap<String, Table>,
|
||||||
|
pub views: HashMap<u32, WorkbookView>,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// A defined name. The `sheet_id` is the sheet index in case the name is local
|
/// A defined name. The `sheet_id` is the sheet index in case the name is local
|
||||||
@@ -48,9 +57,6 @@ pub struct DefinedName {
|
|||||||
pub sheet_id: Option<u32>,
|
pub sheet_id: Option<u32>,
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Move to worksheet.rs make frozen_rows/columns private and u32
|
|
||||||
/// Internal representation of a worksheet Excel object
|
|
||||||
|
|
||||||
/// * state:
|
/// * state:
|
||||||
/// 18.18.68 ST_SheetState (Sheet Visibility Types)
|
/// 18.18.68 ST_SheetState (Sheet Visibility Types)
|
||||||
/// hidden, veryHidden, visible
|
/// hidden, veryHidden, visible
|
||||||
@@ -71,6 +77,23 @@ impl Display for SheetState {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Represents the state of the worksheet as seen by the user. This includes
|
||||||
|
/// details such as the currently selected cell, the visible range, and the
|
||||||
|
/// position of the viewport.
|
||||||
|
#[derive(Encode, Decode, Debug, PartialEq, Clone)]
|
||||||
|
pub struct WorksheetView {
|
||||||
|
/// The row index of the currently selected cell.
|
||||||
|
pub row: i32,
|
||||||
|
/// The column index of the currently selected cell.
|
||||||
|
pub column: i32,
|
||||||
|
/// The selected range in the worksheet, specified as [start_row, start_column, end_row, end_column].
|
||||||
|
pub range: [i32; 4],
|
||||||
|
/// The row index of the topmost visible cell in the worksheet view.
|
||||||
|
pub top_row: i32,
|
||||||
|
/// The column index of the leftmost visible cell in the worksheet view.
|
||||||
|
pub left_column: i32,
|
||||||
|
}
|
||||||
|
|
||||||
/// Internal representation of a worksheet Excel object
|
/// Internal representation of a worksheet Excel object
|
||||||
#[derive(Encode, Decode, Debug, PartialEq, Clone)]
|
#[derive(Encode, Decode, Debug, PartialEq, Clone)]
|
||||||
pub struct Worksheet {
|
pub struct Worksheet {
|
||||||
@@ -87,6 +110,7 @@ pub struct Worksheet {
|
|||||||
pub comments: Vec<Comment>,
|
pub comments: Vec<Comment>,
|
||||||
pub frozen_rows: i32,
|
pub frozen_rows: i32,
|
||||||
pub frozen_columns: i32,
|
pub frozen_columns: i32,
|
||||||
|
pub views: HashMap<u32, WorksheetView>,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Internal representation of Excel's sheet_data
|
/// Internal representation of Excel's sheet_data
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
use std::{collections::HashMap, fmt::Debug};
|
use std::{collections::HashMap, fmt::Debug};
|
||||||
|
|
||||||
use bitcode::{Decode, Encode};
|
use bitcode::{Decode, Encode};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
constants,
|
constants,
|
||||||
@@ -18,6 +19,17 @@ use crate::{
|
|||||||
utils::is_valid_hex_color,
|
utils::is_valid_hex_color,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize)]
|
||||||
|
#[cfg_attr(test, derive(PartialEq, Debug))]
|
||||||
|
pub struct SelectedView {
|
||||||
|
pub sheet: u32,
|
||||||
|
pub row: i32,
|
||||||
|
pub column: i32,
|
||||||
|
pub range: [i32; 4],
|
||||||
|
pub top_row: i32,
|
||||||
|
pub left_column: i32,
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Clone, Encode, Decode)]
|
#[derive(Clone, Encode, Decode)]
|
||||||
struct RowData {
|
struct RowData {
|
||||||
row: Option<Row>,
|
row: Option<Row>,
|
||||||
@@ -118,6 +130,7 @@ enum Diff {
|
|||||||
old_value: String,
|
old_value: String,
|
||||||
new_value: String,
|
new_value: String,
|
||||||
},
|
},
|
||||||
|
// FIXME: we are missing SetViewDiffs
|
||||||
}
|
}
|
||||||
|
|
||||||
type DiffList = Vec<Diff>;
|
type DiffList = Vec<Diff>;
|
||||||
@@ -249,7 +262,7 @@ fn vertical(value: &str) -> Result<VerticalAlignment, String> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// # A wrapper around [`Model`] for a spreadsheet end user.
|
/// # A wrapper around [`Model`] for a spreadsheet end user.
|
||||||
/// UserModel is a wrapper around Model with undo/redo history, _diffs_ and automatic evaluation.
|
/// UserModel is a wrapper around Model with undo/redo history, _diffs_, automatic evaluation and view management.
|
||||||
///
|
///
|
||||||
/// A diff in this context (or more correctly a _user diff_) is a change created by a user.
|
/// A diff in this context (or more correctly a _user diff_) is a change created by a user.
|
||||||
///
|
///
|
||||||
@@ -275,10 +288,7 @@ fn vertical(value: &str) -> Result<VerticalAlignment, String> {
|
|||||||
/// # }
|
/// # }
|
||||||
/// ```
|
/// ```
|
||||||
pub struct UserModel {
|
pub struct UserModel {
|
||||||
/// The underlying model
|
model: Model,
|
||||||
/// See also:
|
|
||||||
/// * [Model]
|
|
||||||
pub model: Model,
|
|
||||||
history: History,
|
history: History,
|
||||||
send_queue: Vec<QueueDiffs>,
|
send_queue: Vec<QueueDiffs>,
|
||||||
pause_evaluation: bool,
|
pause_evaluation: bool,
|
||||||
@@ -631,9 +641,7 @@ impl UserModel {
|
|||||||
pub fn insert_row(&mut self, sheet: u32, row: i32) -> Result<(), String> {
|
pub fn insert_row(&mut self, sheet: u32, row: i32) -> Result<(), String> {
|
||||||
let diff_list = vec![Diff::InsertRow { sheet, row }];
|
let diff_list = vec![Diff::InsertRow { sheet, row }];
|
||||||
self.push_diff_list(diff_list);
|
self.push_diff_list(diff_list);
|
||||||
self.model.insert_rows(sheet, row, 1)?;
|
self.model.insert_rows(sheet, row, 1)
|
||||||
self.model.evaluate();
|
|
||||||
Ok(())
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Deletes a row
|
/// Deletes a row
|
||||||
@@ -660,9 +668,7 @@ impl UserModel {
|
|||||||
old_data,
|
old_data,
|
||||||
}];
|
}];
|
||||||
self.push_diff_list(diff_list);
|
self.push_diff_list(diff_list);
|
||||||
self.model.delete_rows(sheet, row, 1)?;
|
self.model.delete_rows(sheet, row, 1)
|
||||||
self.model.evaluate();
|
|
||||||
Ok(())
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Inserts a column
|
/// Inserts a column
|
||||||
@@ -672,9 +678,7 @@ impl UserModel {
|
|||||||
pub fn insert_column(&mut self, sheet: u32, column: i32) -> Result<(), String> {
|
pub fn insert_column(&mut self, sheet: u32, column: i32) -> Result<(), String> {
|
||||||
let diff_list = vec![Diff::InsertColumn { sheet, column }];
|
let diff_list = vec![Diff::InsertColumn { sheet, column }];
|
||||||
self.push_diff_list(diff_list);
|
self.push_diff_list(diff_list);
|
||||||
self.model.insert_columns(sheet, column, 1)?;
|
self.model.insert_columns(sheet, column, 1)
|
||||||
self.model.evaluate();
|
|
||||||
Ok(())
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Deletes a column
|
/// Deletes a column
|
||||||
@@ -719,9 +723,7 @@ impl UserModel {
|
|||||||
}),
|
}),
|
||||||
}];
|
}];
|
||||||
self.push_diff_list(diff_list);
|
self.push_diff_list(diff_list);
|
||||||
self.model.delete_columns(sheet, column, 1)?;
|
self.model.delete_columns(sheet, column, 1)
|
||||||
self.model.evaluate();
|
|
||||||
Ok(())
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Sets the width of a column
|
/// Sets the width of a column
|
||||||
@@ -860,7 +862,7 @@ impl UserModel {
|
|||||||
style.fill.fg_color = color(value)?;
|
style.fill.fg_color = color(value)?;
|
||||||
}
|
}
|
||||||
"num_fmt" => {
|
"num_fmt" => {
|
||||||
style.num_fmt = value.to_owned();
|
value.clone_into(&mut style.num_fmt);
|
||||||
}
|
}
|
||||||
"border.left" => {
|
"border.left" => {
|
||||||
style.border.left = border(value)?;
|
style.border.left = border(value)?;
|
||||||
@@ -946,6 +948,165 @@ impl UserModel {
|
|||||||
self.model.get_worksheets_properties()
|
self.model.get_worksheets_properties()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Returns the selected sheet index
|
||||||
|
pub fn get_selected_sheet(&self) -> u32 {
|
||||||
|
if let Some(view) = self.model.workbook.views.get(&self.model.view_id) {
|
||||||
|
view.sheet
|
||||||
|
} else {
|
||||||
|
0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Returns the selected cell
|
||||||
|
pub fn get_selected_cell(&self) -> (u32, i32, i32) {
|
||||||
|
let sheet = if let Some(view) = self.model.workbook.views.get(&self.model.view_id) {
|
||||||
|
view.sheet
|
||||||
|
} else {
|
||||||
|
0
|
||||||
|
};
|
||||||
|
if let Ok(worksheet) = self.model.workbook.worksheet(sheet) {
|
||||||
|
if let Some(view) = worksheet.views.get(&self.model.view_id) {
|
||||||
|
return (sheet, view.row, view.column);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// return a safe default
|
||||||
|
(0, 1, 1)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Returns selected view
|
||||||
|
pub fn get_selected_view(&self) -> SelectedView {
|
||||||
|
let sheet = if let Some(view) = self.model.workbook.views.get(&self.model.view_id) {
|
||||||
|
view.sheet
|
||||||
|
} else {
|
||||||
|
0
|
||||||
|
};
|
||||||
|
if let Ok(worksheet) = self.model.workbook.worksheet(sheet) {
|
||||||
|
if let Some(view) = worksheet.views.get(&self.model.view_id) {
|
||||||
|
return SelectedView {
|
||||||
|
sheet,
|
||||||
|
row: view.row,
|
||||||
|
column: view.column,
|
||||||
|
range: view.range,
|
||||||
|
top_row: view.top_row,
|
||||||
|
left_column: view.left_column,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// return a safe default
|
||||||
|
SelectedView {
|
||||||
|
sheet: 0,
|
||||||
|
row: 1,
|
||||||
|
column: 1,
|
||||||
|
range: [1, 1, 1, 1],
|
||||||
|
top_row: 1,
|
||||||
|
left_column: 1,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Sets the the selected sheet
|
||||||
|
pub fn set_selected_sheet(&mut self, sheet: u32) -> Result<(), String> {
|
||||||
|
if self.model.workbook.worksheet(sheet).is_err() {
|
||||||
|
return Err(format!("Invalid worksheet index {}", sheet));
|
||||||
|
}
|
||||||
|
if let Some(view) = self.model.workbook.views.get_mut(&0) {
|
||||||
|
view.sheet = sheet;
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Sets the selected cell
|
||||||
|
pub fn set_selected_cell(&mut self, row: i32, column: i32) -> Result<(), String> {
|
||||||
|
let sheet = if let Some(view) = self.model.workbook.views.get(&self.model.view_id) {
|
||||||
|
view.sheet
|
||||||
|
} else {
|
||||||
|
0
|
||||||
|
};
|
||||||
|
if !is_valid_column_number(column) {
|
||||||
|
return Err(format!("Invalid column: '{column}'"));
|
||||||
|
}
|
||||||
|
if !is_valid_column_number(row) {
|
||||||
|
return Err(format!("Invalid row: '{row}'"));
|
||||||
|
}
|
||||||
|
if self.model.workbook.worksheet(sheet).is_err() {
|
||||||
|
return Err(format!("Invalid worksheet index {}", sheet));
|
||||||
|
}
|
||||||
|
if let Ok(worksheet) = self.model.workbook.worksheet_mut(sheet) {
|
||||||
|
if let Some(view) = worksheet.views.get_mut(&0) {
|
||||||
|
view.row = row;
|
||||||
|
view.column = column;
|
||||||
|
view.range = [row, column, row, column];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Sets the selected range
|
||||||
|
pub fn set_selected_range(
|
||||||
|
&mut self,
|
||||||
|
start_row: i32,
|
||||||
|
start_column: i32,
|
||||||
|
end_row: i32,
|
||||||
|
end_column: i32,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
let sheet = if let Some(view) = self.model.workbook.views.get(&self.model.view_id) {
|
||||||
|
view.sheet
|
||||||
|
} else {
|
||||||
|
0
|
||||||
|
};
|
||||||
|
|
||||||
|
if !is_valid_column_number(start_column) {
|
||||||
|
return Err(format!("Invalid column: '{start_column}'"));
|
||||||
|
}
|
||||||
|
if !is_valid_column_number(start_row) {
|
||||||
|
return Err(format!("Invalid row: '{start_row}'"));
|
||||||
|
}
|
||||||
|
|
||||||
|
if !is_valid_column_number(end_column) {
|
||||||
|
return Err(format!("Invalid column: '{end_column}'"));
|
||||||
|
}
|
||||||
|
if !is_valid_column_number(end_row) {
|
||||||
|
return Err(format!("Invalid row: '{end_row}'"));
|
||||||
|
}
|
||||||
|
if self.model.workbook.worksheet(sheet).is_err() {
|
||||||
|
return Err(format!("Invalid worksheet index {}", sheet));
|
||||||
|
}
|
||||||
|
if let Ok(worksheet) = self.model.workbook.worksheet_mut(sheet) {
|
||||||
|
if let Some(view) = worksheet.views.get_mut(&0) {
|
||||||
|
view.range = [start_row, start_column, end_row, end_column];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Sets the value of the first visible cell
|
||||||
|
pub fn set_top_left_visible_cell(
|
||||||
|
&mut self,
|
||||||
|
top_row: i32,
|
||||||
|
left_column: i32,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
let sheet = if let Some(view) = self.model.workbook.views.get(&self.model.view_id) {
|
||||||
|
view.sheet
|
||||||
|
} else {
|
||||||
|
0
|
||||||
|
};
|
||||||
|
|
||||||
|
if !is_valid_column_number(left_column) {
|
||||||
|
return Err(format!("Invalid column: '{left_column}'"));
|
||||||
|
}
|
||||||
|
if !is_valid_column_number(top_row) {
|
||||||
|
return Err(format!("Invalid row: '{top_row}'"));
|
||||||
|
}
|
||||||
|
if self.model.workbook.worksheet(sheet).is_err() {
|
||||||
|
return Err(format!("Invalid worksheet index {}", sheet));
|
||||||
|
}
|
||||||
|
if let Ok(worksheet) = self.model.workbook.worksheet_mut(sheet) {
|
||||||
|
if let Some(view) = worksheet.views.get_mut(&0) {
|
||||||
|
view.top_row = top_row;
|
||||||
|
view.left_column = left_column;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
// **** Private methods ****** //
|
// **** Private methods ****** //
|
||||||
|
|
||||||
fn push_diff_list(&mut self, diff_list: DiffList) {
|
fn push_diff_list(&mut self, diff_list: DiffList) {
|
||||||
|
|||||||
@@ -286,4 +286,56 @@ impl Model {
|
|||||||
pub fn get_worksheets_properties(&self) -> JsValue {
|
pub fn get_worksheets_properties(&self) -> JsValue {
|
||||||
serde_wasm_bindgen::to_value(&self.model.get_worksheets_properties()).unwrap()
|
serde_wasm_bindgen::to_value(&self.model.get_worksheets_properties()).unwrap()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[wasm_bindgen(js_name = "getSelectedSheet")]
|
||||||
|
pub fn get_selected_sheet(&self) -> u32 {
|
||||||
|
self.model.get_selected_sheet()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[wasm_bindgen(js_name = "getSelectedCell")]
|
||||||
|
pub fn get_selected_cell(&self) -> Vec<i32> {
|
||||||
|
let (sheet, row, column) = self.model.get_selected_cell();
|
||||||
|
vec![sheet as i32, row, column]
|
||||||
|
}
|
||||||
|
|
||||||
|
#[wasm_bindgen(js_name = "getSelectedView")]
|
||||||
|
pub fn get_selected_view(&self) -> JsValue {
|
||||||
|
serde_wasm_bindgen::to_value(&self.model.get_selected_view()).unwrap()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[wasm_bindgen(js_name = "setSelectedSheet")]
|
||||||
|
pub fn set_selected_sheet(&mut self, sheet: u32) -> Result<(), JsError> {
|
||||||
|
self.model.set_selected_sheet(sheet).map_err(to_js_error)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[wasm_bindgen(js_name = "setSelectedCell")]
|
||||||
|
pub fn set_selected_cell(&mut self, row: i32, column: i32) -> Result<(), JsError> {
|
||||||
|
self.model
|
||||||
|
.set_selected_cell(row, column)
|
||||||
|
.map_err(to_js_error)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[wasm_bindgen(js_name = "setSelectedRange")]
|
||||||
|
pub fn set_selected_range(
|
||||||
|
&mut self,
|
||||||
|
start_row: i32,
|
||||||
|
start_column: i32,
|
||||||
|
end_row: i32,
|
||||||
|
end_column: i32,
|
||||||
|
) -> Result<(), JsError> {
|
||||||
|
self.model
|
||||||
|
.set_selected_range(start_row, start_column, end_row, end_column)
|
||||||
|
.map_err(to_js_error)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[wasm_bindgen(js_name = "setTopLeftVisibleCell")]
|
||||||
|
pub fn set_top_left_visible_cell(
|
||||||
|
&mut self,
|
||||||
|
top_row: i32,
|
||||||
|
top_column: i32,
|
||||||
|
) -> Result<(), JsError> {
|
||||||
|
self.model
|
||||||
|
.set_top_left_visible_cell(top_row, top_column)
|
||||||
|
.map_err(to_js_error)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
2
solidjs_app/.gitignore
vendored
Normal file
2
solidjs_app/.gitignore
vendored
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
node_modules/*
|
||||||
|
dist/*
|
||||||
19
solidjs_app/.storybook/main.ts
Normal file
19
solidjs_app/.storybook/main.ts
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
import type { StorybookConfig } from "storybook-solidjs-vite";
|
||||||
|
|
||||||
|
const config: StorybookConfig = {
|
||||||
|
stories: ["../src/**/*.mdx", "../src/**/*.stories.@(js|jsx|mjs|ts|tsx)"],
|
||||||
|
addons: [
|
||||||
|
"@storybook/addon-links",
|
||||||
|
"@storybook/addon-essentials",
|
||||||
|
"@chromatic-com/storybook",
|
||||||
|
"@storybook/addon-interactions",
|
||||||
|
],
|
||||||
|
framework: {
|
||||||
|
name: "storybook-solidjs-vite",
|
||||||
|
options: {},
|
||||||
|
},
|
||||||
|
docs: {
|
||||||
|
autodocs: "tag",
|
||||||
|
},
|
||||||
|
};
|
||||||
|
export default config;
|
||||||
12
solidjs_app/.storybook/preview.ts
Normal file
12
solidjs_app/.storybook/preview.ts
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
const preview: Preview = {
|
||||||
|
parameters: {
|
||||||
|
controls: {
|
||||||
|
matchers: {
|
||||||
|
color: /(background|color)$/i,
|
||||||
|
date: /Date$/i,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
export default preview;
|
||||||
8
solidjs_app/Makefile
Normal file
8
solidjs_app/Makefile
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
|
||||||
|
lint:
|
||||||
|
pnpm biome lint *
|
||||||
|
|
||||||
|
format:
|
||||||
|
pnpm biome format *
|
||||||
|
build:
|
||||||
|
pnpm run build
|
||||||
70
solidjs_app/README.md
Normal file
70
solidjs_app/README.md
Normal file
@@ -0,0 +1,70 @@
|
|||||||
|
# Web IronCalc
|
||||||
|
|
||||||
|
## Widgets
|
||||||
|
|
||||||
|
Toolbar
|
||||||
|
NavigationBar
|
||||||
|
FormulaBar
|
||||||
|
ColorPicker
|
||||||
|
Number Formatter
|
||||||
|
Border Picker
|
||||||
|
|
||||||
|
|
||||||
|
## Stack
|
||||||
|
|
||||||
|
Vite
|
||||||
|
TypeScript
|
||||||
|
SolidJs
|
||||||
|
Lucide Icons
|
||||||
|
BiomeJs
|
||||||
|
Storybook
|
||||||
|
pnpm
|
||||||
|
|
||||||
|
## Recreate
|
||||||
|
|
||||||
|
Install nodejs
|
||||||
|
Activate pnpm
|
||||||
|
corepack enable pnpm
|
||||||
|
Create app
|
||||||
|
pnpm create vite
|
||||||
|
pnpm install
|
||||||
|
add biomejs
|
||||||
|
pnpm add --save-dev --save-exact @biomejs/biome
|
||||||
|
pnpm biome init
|
||||||
|
add solidjs
|
||||||
|
add storybook
|
||||||
|
pnpm dlx storybook@latest init
|
||||||
|
add i18n
|
||||||
|
pnpm add @solid-primitives/i18n
|
||||||
|
(https://github.com/jfgodoy/vite-plugin-solid-svg)
|
||||||
|
add vite-plugin-solid-svg
|
||||||
|
add script: "restore": "cp node_modules/@ironcalc/wasm/wasm_bg.wasm node_modules/.vite/deps/",
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## Usage
|
||||||
|
|
||||||
|
```bash
|
||||||
|
$ pnpm install # or npm install or yarn install
|
||||||
|
```
|
||||||
|
|
||||||
|
## Available Scripts
|
||||||
|
|
||||||
|
In the project directory, you can run:
|
||||||
|
|
||||||
|
### `pnpm run dev`
|
||||||
|
|
||||||
|
Runs the app in the development mode.<br>
|
||||||
|
Open [http://localhost:5173](http://localhost:5173) to view it in the browser.
|
||||||
|
|
||||||
|
### `pnpm run build`
|
||||||
|
|
||||||
|
Builds the app for production to the `dist` folder.<br>
|
||||||
|
It correctly bundles Solid in production mode and optimizes the build for the best performance.
|
||||||
|
|
||||||
|
The build is minified and the filenames include the hashes.<br>
|
||||||
|
Your app is ready to be deployed!
|
||||||
|
|
||||||
|
## Deployment
|
||||||
|
|
||||||
|
Learn more about deploying your application with the [documentations](https://vitejs.dev/guide/static-deploy.html)
|
||||||
15
solidjs_app/biome.json
Normal file
15
solidjs_app/biome.json
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
{
|
||||||
|
"$schema": "https://biomejs.dev/schemas/1.7.0/schema.json",
|
||||||
|
"organizeImports": {
|
||||||
|
"enabled": true
|
||||||
|
},
|
||||||
|
"linter": {
|
||||||
|
"enabled": true,
|
||||||
|
"rules": {
|
||||||
|
"recommended": true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"formatter": {
|
||||||
|
"indentStyle": "space"
|
||||||
|
}
|
||||||
|
}
|
||||||
13
solidjs_app/index.html
Normal file
13
solidjs_app/index.html
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
<!doctype html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8" />
|
||||||
|
<link rel="icon" type="image/svg+xml" href="/ironcalc_icon.svg" />
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
|
<title>Vite + Solid + TS</title>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<div id="root"></div>
|
||||||
|
<script type="module" src="/src/index.tsx"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
35
solidjs_app/package.json
Normal file
35
solidjs_app/package.json
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
{
|
||||||
|
"name": "app",
|
||||||
|
"private": true,
|
||||||
|
"version": "0.0.0",
|
||||||
|
"type": "module",
|
||||||
|
"scripts": {
|
||||||
|
"restore": "cp node_modules/@ironcalc/wasm/wasm_bg.wasm node_modules/.vite/deps/",
|
||||||
|
"dev": "vite",
|
||||||
|
"build": "tsc && vite build",
|
||||||
|
"preview": "vite preview",
|
||||||
|
"storybook": "storybook dev -p 6006",
|
||||||
|
"build-storybook": "storybook build"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"@ironcalc/wasm": "file:../bindings/wasm/pkg",
|
||||||
|
"@solid-primitives/i18n": "^2.1.1",
|
||||||
|
"lucide-solid": "^0.379.0",
|
||||||
|
"solid-js": "^1.8.15"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@biomejs/biome": "1.7.0",
|
||||||
|
"@chromatic-com/storybook": "^1.3.3",
|
||||||
|
"@storybook/addon-essentials": "^8.0.8",
|
||||||
|
"@storybook/addon-interactions": "^8.0.8",
|
||||||
|
"@storybook/addon-links": "^8.0.8",
|
||||||
|
"@storybook/blocks": "^8.0.8",
|
||||||
|
"storybook": "^8.0.8",
|
||||||
|
"storybook-solidjs": "^1.0.0-beta.2",
|
||||||
|
"storybook-solidjs-vite": "^1.0.0-beta.2",
|
||||||
|
"typescript": "^5.2.2",
|
||||||
|
"vite": "^5.2.0",
|
||||||
|
"vite-plugin-solid": "^2.10.2",
|
||||||
|
"vite-plugin-solid-svg": "^0.8.1"
|
||||||
|
}
|
||||||
|
}
|
||||||
6864
solidjs_app/pnpm-lock.yaml
generated
Normal file
6864
solidjs_app/pnpm-lock.yaml
generated
Normal file
File diff suppressed because it is too large
Load Diff
8
solidjs_app/public/ironcalc_icon.svg
Normal file
8
solidjs_app/public/ironcalc_icon.svg
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
<svg width="600" height="600" viewBox="0 0 600 600" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<rect width="600" height="600" rx="20" fill="#F2994A"/>
|
||||||
|
<path opacity="0.8" fill-rule="evenodd" clip-rule="evenodd" d="M348.98 100C348.98 166.034 322.748 229.362 276.055 276.055C268.163 283.947 259.796 291.255 251.021 297.95L251.021 500L348.98 500H251.021C251.021 433.966 277.252 370.637 323.945 323.945C331.837 316.053 340.204 308.745 348.98 302.05L348.98 100Z" fill="white"/>
|
||||||
|
<path opacity="0.8" fill-rule="evenodd" clip-rule="evenodd" d="M251.021 100.068C251.003 140.096 235.094 178.481 206.788 206.787C178.466 235.109 140.053 251.02 100 251.02V348.979C154.873 348.979 207.877 330.866 251.021 297.95V100.068Z" fill="white"/>
|
||||||
|
<path opacity="0.8" fill-rule="evenodd" clip-rule="evenodd" d="M348.98 499.882C349.011 459.872 364.918 421.507 393.213 393.213C421.534 364.891 459.947 348.98 500 348.98V251.02C445.128 251.02 392.123 269.134 348.98 302.05V499.882Z" fill="white"/>
|
||||||
|
<path fill-rule="evenodd" clip-rule="evenodd" d="M276.055 276.055C322.748 229.362 348.98 166.034 348.98 100H251.021V297.95C259.796 291.255 268.163 283.947 276.055 276.055Z" fill="white"/>
|
||||||
|
<path fill-rule="evenodd" clip-rule="evenodd" d="M348.98 302.05V499.895C348.98 499.93 348.98 499.965 348.98 500L251.021 500C251.021 499.946 251.02 499.891 251.021 499.837C251.064 433.862 277.291 370.599 323.945 323.945C331.837 316.053 340.204 308.745 348.98 302.05Z" fill="white"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 1.4 KiB |
7
solidjs_app/src/App.css
Normal file
7
solidjs_app/src/App.css
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
#root {
|
||||||
|
max-width: 1280px;
|
||||||
|
margin: 0 auto;
|
||||||
|
padding: 2rem;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
29
solidjs_app/src/App.tsx
Normal file
29
solidjs_app/src/App.tsx
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
import { Show, createResource } from "solid-js";
|
||||||
|
// import "./App.css";
|
||||||
|
// import solidLogo from "./assets/solid.svg";
|
||||||
|
|
||||||
|
import init, { Model } from "@ironcalc/wasm";
|
||||||
|
import Workbook from "./components/Workbook";
|
||||||
|
|
||||||
|
const fetchModel = async () => {
|
||||||
|
await init();
|
||||||
|
// const model_bytes = new Uint8Array(
|
||||||
|
// await (await fetch("./example.ic")).arrayBuffer(),
|
||||||
|
// );
|
||||||
|
// const _model = Model.from_bytes(model_bytes);*/
|
||||||
|
const model = new Model("en", "UTC");
|
||||||
|
model.setUserInput(0, 1, 1, "=1+1");
|
||||||
|
return model;
|
||||||
|
};
|
||||||
|
|
||||||
|
function App() {
|
||||||
|
const [model] = createResource(fetchModel);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Show when={model()} fallback={<div>Loading...</div>}>
|
||||||
|
{(model) => <Workbook model={model()} />}
|
||||||
|
</Show>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export default App;
|
||||||
BIN
solidjs_app/src/assets/android-chrome-192x192.png
Normal file
BIN
solidjs_app/src/assets/android-chrome-192x192.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.1 KiB |
BIN
solidjs_app/src/assets/android-chrome-512x512.png
Normal file
BIN
solidjs_app/src/assets/android-chrome-512x512.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 15 KiB |
BIN
solidjs_app/src/assets/apple-touch-icon.png
Normal file
BIN
solidjs_app/src/assets/apple-touch-icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.7 KiB |
BIN
solidjs_app/src/assets/favicon-16x16.png
Normal file
BIN
solidjs_app/src/assets/favicon-16x16.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 441 B |
BIN
solidjs_app/src/assets/favicon-32x32.png
Normal file
BIN
solidjs_app/src/assets/favicon-32x32.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 729 B |
BIN
solidjs_app/src/assets/favicon.ico
Normal file
BIN
solidjs_app/src/assets/favicon.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 15 KiB |
BIN
solidjs_app/src/assets/ironcalc_icon.png
Normal file
BIN
solidjs_app/src/assets/ironcalc_icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 33 KiB |
8
solidjs_app/src/assets/ironcalc_icon.svg
Normal file
8
solidjs_app/src/assets/ironcalc_icon.svg
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
<svg width="600" height="600" viewBox="0 0 600 600" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<rect width="600" height="600" rx="20" fill="#F2994A"/>
|
||||||
|
<path opacity="0.8" fill-rule="evenodd" clip-rule="evenodd" d="M348.98 100C348.98 166.034 322.748 229.362 276.055 276.055C268.163 283.947 259.796 291.255 251.021 297.95L251.021 500L348.98 500H251.021C251.021 433.966 277.252 370.637 323.945 323.945C331.837 316.053 340.204 308.745 348.98 302.05L348.98 100Z" fill="white"/>
|
||||||
|
<path opacity="0.8" fill-rule="evenodd" clip-rule="evenodd" d="M251.021 100.068C251.003 140.096 235.094 178.481 206.788 206.787C178.466 235.109 140.053 251.02 100 251.02V348.979C154.873 348.979 207.877 330.866 251.021 297.95V100.068Z" fill="white"/>
|
||||||
|
<path opacity="0.8" fill-rule="evenodd" clip-rule="evenodd" d="M348.98 499.882C349.011 459.872 364.918 421.507 393.213 393.213C421.534 364.891 459.947 348.98 500 348.98V251.02C445.128 251.02 392.123 269.134 348.98 302.05V499.882Z" fill="white"/>
|
||||||
|
<path fill-rule="evenodd" clip-rule="evenodd" d="M276.055 276.055C322.748 229.362 348.98 166.034 348.98 100H251.021V297.95C259.796 291.255 268.163 283.947 276.055 276.055Z" fill="white"/>
|
||||||
|
<path fill-rule="evenodd" clip-rule="evenodd" d="M348.98 302.05V499.895C348.98 499.93 348.98 499.965 348.98 500L251.021 500C251.021 499.946 251.02 499.891 251.021 499.837C251.064 433.862 277.291 370.599 323.945 323.945C331.837 316.053 340.204 308.745 348.98 302.05Z" fill="white"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 1.4 KiB |
BIN
solidjs_app/src/assets/logo.png
Normal file
BIN
solidjs_app/src/assets/logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 33 KiB |
23
solidjs_app/src/components/Workbook.tsx
Normal file
23
solidjs_app/src/components/Workbook.tsx
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
import type { Model } from "@ironcalc/wasm";
|
||||||
|
import styles from "./workbook.module.css";
|
||||||
|
import Toolbar from "./toolbar/Toolbar";
|
||||||
|
import Navigation from "./navigation/Navigation";
|
||||||
|
import FormulaBar from "./formulabar/FormulaBar";
|
||||||
|
import Worksheet from "./Worksheet/Worksheet";
|
||||||
|
|
||||||
|
function Workbook(props: { model: Model }) {
|
||||||
|
const onkeydown = (event: KeyboardEvent) => {
|
||||||
|
console.log("key pressed: ", event);
|
||||||
|
};
|
||||||
|
return (
|
||||||
|
<div class={styles.workbook} onkeydown={onkeydown} tabIndex={0}>
|
||||||
|
<Toolbar></Toolbar>
|
||||||
|
{/* {props.model.getFormattedCellValue(0, 1, 1)} */}
|
||||||
|
<FormulaBar></FormulaBar>
|
||||||
|
<Worksheet></Worksheet>
|
||||||
|
<Navigation></Navigation>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export default Workbook;
|
||||||
14
solidjs_app/src/components/Worksheet/Worksheet.tsx
Normal file
14
solidjs_app/src/components/Worksheet/Worksheet.tsx
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
import styles from "./worksheet.module.css";
|
||||||
|
|
||||||
|
function Worksheet() {
|
||||||
|
const onkeydown = (event: KeyboardEvent) => {
|
||||||
|
console.log("key pressed: ", event);
|
||||||
|
};
|
||||||
|
return (
|
||||||
|
<div class={styles.worksheet} onkeydown={onkeydown} tabIndex={0}>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export default Worksheet;
|
||||||
14
solidjs_app/src/components/formulabar/FormulaBar.tsx
Normal file
14
solidjs_app/src/components/formulabar/FormulaBar.tsx
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
import styles from "./formulabar.module.css";
|
||||||
|
|
||||||
|
function FormulaBar() {
|
||||||
|
const onkeydown = (event: KeyboardEvent) => {
|
||||||
|
console.log("key pressed: ", event);
|
||||||
|
};
|
||||||
|
return (
|
||||||
|
<div class={styles.toolbar} onkeydown={onkeydown} tabIndex={0}>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export default FormulaBar;
|
||||||
14
solidjs_app/src/components/navigation/Navigation.tsx
Normal file
14
solidjs_app/src/components/navigation/Navigation.tsx
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
import styles from "./navigation.module.css";
|
||||||
|
|
||||||
|
function Navigation() {
|
||||||
|
const onkeydown = (event: KeyboardEvent) => {
|
||||||
|
console.log("key pressed: ", event);
|
||||||
|
};
|
||||||
|
return (
|
||||||
|
<div class={styles.navigation} onkeydown={onkeydown} tabIndex={0}>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export default Navigation;
|
||||||
299
solidjs_app/src/components/toolbar/Toolbar.tsx
Normal file
299
solidjs_app/src/components/toolbar/Toolbar.tsx
Normal file
@@ -0,0 +1,299 @@
|
|||||||
|
import { JSX } from "solid-js/jsx-runtime";
|
||||||
|
import styles from "./toolbar.module.css";
|
||||||
|
import {
|
||||||
|
AlignCenter,
|
||||||
|
AlignLeft,
|
||||||
|
AlignRight,
|
||||||
|
ArrowDownToLine,
|
||||||
|
ArrowUpToLine,
|
||||||
|
Bold,
|
||||||
|
ChevronDown,
|
||||||
|
Euro,
|
||||||
|
Grid2X2,
|
||||||
|
Italic,
|
||||||
|
Paintbrush2,
|
||||||
|
PaintBucket,
|
||||||
|
Percent,
|
||||||
|
Redo2,
|
||||||
|
Strikethrough,
|
||||||
|
Type,
|
||||||
|
Underline,
|
||||||
|
Undo2,
|
||||||
|
} from "lucide-solid";
|
||||||
|
import { DecimalPlacesDecreaseIcon, DecimalPlacesIncreaseIcon, ArrowMiddleFromLine } from "../../icons";
|
||||||
|
|
||||||
|
function Toolbar() {
|
||||||
|
const onkeydown = (event: KeyboardEvent) => {
|
||||||
|
console.log("key pressed: ", event);
|
||||||
|
};
|
||||||
|
|
||||||
|
const t = (s: string): string => s;
|
||||||
|
|
||||||
|
const properties = {
|
||||||
|
onUndo: () => {},
|
||||||
|
canUndo: true,
|
||||||
|
onRedo: () => {},
|
||||||
|
canRedo: true,
|
||||||
|
onCopyStyles: () => {},
|
||||||
|
canEdit: true,
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div class={styles.toolbar} onkeydown={onkeydown} tabIndex={0}>
|
||||||
|
<StyledButton
|
||||||
|
pressed={false}
|
||||||
|
onClick={properties.onUndo}
|
||||||
|
disabled={!properties.canUndo}
|
||||||
|
title={t("toolbar.undo")}
|
||||||
|
>
|
||||||
|
<Undo2 />
|
||||||
|
</StyledButton>
|
||||||
|
<StyledButton
|
||||||
|
pressed={false}
|
||||||
|
onClick={properties.onRedo}
|
||||||
|
disabled={!properties.canRedo}
|
||||||
|
title={t("toolbar.redo")}
|
||||||
|
>
|
||||||
|
<Redo2 />
|
||||||
|
</StyledButton>
|
||||||
|
<div class={styles.divider} />
|
||||||
|
<StyledButton
|
||||||
|
pressed={false}
|
||||||
|
onClick={properties.onCopyStyles}
|
||||||
|
title={t("toolbar.copy_styles")}
|
||||||
|
>
|
||||||
|
<Paintbrush2 />
|
||||||
|
</StyledButton>
|
||||||
|
<div class={styles.divider} />
|
||||||
|
<StyledButton
|
||||||
|
pressed={false}
|
||||||
|
// onClick={(): void => {
|
||||||
|
// properties.onNumberFormatPicked(NumberFormats.CURRENCY_EUR);
|
||||||
|
// }}
|
||||||
|
title={t("toolbar.euro")}
|
||||||
|
>
|
||||||
|
<Euro />
|
||||||
|
</StyledButton>
|
||||||
|
<StyledButton
|
||||||
|
pressed={false}
|
||||||
|
// onClick={(): void => {
|
||||||
|
// properties.onNumberFormatPicked(NumberFormats.PERCENTAGE);
|
||||||
|
// }}
|
||||||
|
title={t("toolbar.percentage")}
|
||||||
|
>
|
||||||
|
<Percent />
|
||||||
|
</StyledButton>
|
||||||
|
<StyledButton
|
||||||
|
pressed={false}
|
||||||
|
// onClick={(): void => {
|
||||||
|
// properties.onNumberFormatPicked(
|
||||||
|
// decreaseDecimalPlaces(properties.numFmt)
|
||||||
|
// );
|
||||||
|
// }}
|
||||||
|
title={t("toolbar.decimal_places_decrease")}
|
||||||
|
>
|
||||||
|
<div><DecimalPlacesDecreaseIcon /></div>
|
||||||
|
</StyledButton>
|
||||||
|
<StyledButton
|
||||||
|
pressed={false}
|
||||||
|
// onClick={(): void => {
|
||||||
|
// properties.onNumberFormatPicked(
|
||||||
|
// increaseDecimalPlaces(properties.numFmt)
|
||||||
|
// );
|
||||||
|
// }}
|
||||||
|
title={t("toolbar.decimal_places_increase")}
|
||||||
|
>
|
||||||
|
<DecimalPlacesIncreaseIcon />
|
||||||
|
</StyledButton>
|
||||||
|
{/* // <FormatMenu
|
||||||
|
// numFmt={properties.numFmt}
|
||||||
|
// onChange={(numberFmt): void => {
|
||||||
|
// properties.onNumberFormatPicked(numberFmt);
|
||||||
|
// }}
|
||||||
|
// onExited={(): void => {}}
|
||||||
|
// anchorOrigin={{
|
||||||
|
// horizontal: 20, // Aligning the menu to the middle of FormatButton
|
||||||
|
// vertical: "bottom",
|
||||||
|
// }}
|
||||||
|
// >*/
|
||||||
|
<StyledButton
|
||||||
|
|
||||||
|
pressed={false}
|
||||||
|
|
||||||
|
title={t("toolbar.format_number")}
|
||||||
|
>
|
||||||
|
<div class={styles.format_menu}>{"123"}<ChevronDown /></div>
|
||||||
|
|
||||||
|
</StyledButton>
|
||||||
|
/* </FormatMenu> */}
|
||||||
|
<div class={styles.divider} />
|
||||||
|
<StyledButton
|
||||||
|
// pressed={properties.bold}
|
||||||
|
// onClick={() => properties.onToggleBold(!properties.bold)}
|
||||||
|
title={t("toolbar.bold")}
|
||||||
|
>
|
||||||
|
<Bold />
|
||||||
|
</StyledButton>
|
||||||
|
<StyledButton
|
||||||
|
// pressed={properties.italic}
|
||||||
|
// onClick={() => properties.onToggleItalic(!properties.italic)}
|
||||||
|
title={t("toolbar.italic")}
|
||||||
|
>
|
||||||
|
<Italic />
|
||||||
|
</StyledButton>
|
||||||
|
<StyledButton
|
||||||
|
// pressed={properties.underline}
|
||||||
|
// onClick={() => properties.onToggleUnderline(!properties.underline)}
|
||||||
|
title={t("toolbar.underline")}
|
||||||
|
>
|
||||||
|
<Underline />
|
||||||
|
</StyledButton>
|
||||||
|
<StyledButton
|
||||||
|
// pressed={properties.strike}
|
||||||
|
// onClick={() => properties.onToggleStrike(!properties.strike)}
|
||||||
|
title={t("toolbar.strike_trough")}
|
||||||
|
>
|
||||||
|
<Strikethrough />
|
||||||
|
</StyledButton>
|
||||||
|
<div class={styles.divider} />
|
||||||
|
<StyledButton
|
||||||
|
pressed={false}
|
||||||
|
title={t("toolbar.font_color")}
|
||||||
|
// ref={fontColorButton}
|
||||||
|
// underlinedColor={properties.fontColor}
|
||||||
|
// onClick={() => setFontColorPickerOpen(true)}
|
||||||
|
>
|
||||||
|
<Type />
|
||||||
|
</StyledButton>
|
||||||
|
<StyledButton
|
||||||
|
pressed={false}
|
||||||
|
title={t("toolbar.fill_color")}
|
||||||
|
// ref={fillColorButton}
|
||||||
|
// underlinedColor={properties.fillColor}
|
||||||
|
// onClick={() => setFillColorPickerOpen(true)}
|
||||||
|
>
|
||||||
|
<PaintBucket />
|
||||||
|
</StyledButton>
|
||||||
|
<div class={styles.divider} />
|
||||||
|
<StyledButton
|
||||||
|
// pressed={properties.horizontalAlign === "left"}
|
||||||
|
// onClick={() =>
|
||||||
|
// properties.onToggleHorizontalAlign(
|
||||||
|
// properties.horizontalAlign === "left" ? "general" : "left"
|
||||||
|
// )
|
||||||
|
// }
|
||||||
|
title={t("toolbar.align_left")}
|
||||||
|
>
|
||||||
|
<AlignLeft />
|
||||||
|
</StyledButton>
|
||||||
|
<StyledButton
|
||||||
|
// pressed={properties.horizontalAlign === "center"}
|
||||||
|
// onClick={() =>
|
||||||
|
// properties.onToggleHorizontalAlign(
|
||||||
|
// properties.horizontalAlign === "center" ? "general" : "center"
|
||||||
|
// )
|
||||||
|
// }
|
||||||
|
title={t("toolbar.align_center")}
|
||||||
|
>
|
||||||
|
<AlignCenter />
|
||||||
|
</StyledButton>
|
||||||
|
<StyledButton
|
||||||
|
// pressed={properties.horizontalAlign === "right"}
|
||||||
|
// onClick={() =>
|
||||||
|
// properties.onToggleHorizontalAlign(
|
||||||
|
// properties.horizontalAlign === "right" ? "general" : "right"
|
||||||
|
// )
|
||||||
|
// }
|
||||||
|
title={t("toolbar.align_right")}
|
||||||
|
>
|
||||||
|
<AlignRight />
|
||||||
|
</StyledButton>
|
||||||
|
<StyledButton
|
||||||
|
// pressed={properties.verticalAlign === "top"}
|
||||||
|
// onClick={() =>
|
||||||
|
// properties.onToggleVerticalAlign(
|
||||||
|
// properties.verticalAlign === "top" ? "bottom" : "top"
|
||||||
|
// )
|
||||||
|
// }
|
||||||
|
title={t("toolbar.vertical_align_top")}
|
||||||
|
>
|
||||||
|
<ArrowUpToLine />
|
||||||
|
</StyledButton>
|
||||||
|
<StyledButton
|
||||||
|
// pressed={properties.verticalAlign === "center"}
|
||||||
|
// onClick={() =>
|
||||||
|
// properties.onToggleVerticalAlign(
|
||||||
|
// properties.verticalAlign === "center" ? "bottom" : "center"
|
||||||
|
// )
|
||||||
|
// }
|
||||||
|
title={t("toolbar.vertical_align_center")}
|
||||||
|
>
|
||||||
|
<ArrowMiddleFromLine />
|
||||||
|
</StyledButton>
|
||||||
|
<StyledButton
|
||||||
|
// pressed={properties.verticalAlign === "bottom"}
|
||||||
|
// onClick={() => properties.onToggleVerticalAlign("bottom")}
|
||||||
|
title={t("toolbar.vertical_align_bottom")}
|
||||||
|
>
|
||||||
|
<ArrowDownToLine />
|
||||||
|
</StyledButton>
|
||||||
|
<div class={styles.divider} />
|
||||||
|
<StyledButton
|
||||||
|
pressed={false}
|
||||||
|
// onClick={() => setBorderPickerOpen(true)}
|
||||||
|
// ref={borderButton}
|
||||||
|
title={t("toolbar.borders")}
|
||||||
|
>
|
||||||
|
<Grid2X2 />
|
||||||
|
</StyledButton>
|
||||||
|
{/* // <ColorPicker
|
||||||
|
// color={properties.fontColor}
|
||||||
|
// onChange={(color): void => {
|
||||||
|
// properties.onTextColorPicked(color);
|
||||||
|
// setFontColorPickerOpen(false);
|
||||||
|
// }}
|
||||||
|
// anchorEl={fontColorButton}
|
||||||
|
// open={fontColorPickerOpen}
|
||||||
|
// />
|
||||||
|
// <ColorPicker
|
||||||
|
// color={properties.fillColor}
|
||||||
|
// onChange={(color): void => {
|
||||||
|
// properties.onFillColorPicked(color);
|
||||||
|
// setFillColorPickerOpen(false);
|
||||||
|
// }}
|
||||||
|
// anchorEl={fillColorButton}
|
||||||
|
// open={fillColorPickerOpen}
|
||||||
|
// />
|
||||||
|
// <BorderPicker
|
||||||
|
// onChange={(border): void => {
|
||||||
|
// properties.onBorderChanged(border);
|
||||||
|
// setBorderPickerOpen(false);
|
||||||
|
// }}
|
||||||
|
// anchorEl={borderButton}
|
||||||
|
// open={borderPickerOpen}
|
||||||
|
// /> */}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function StyledButton(props: {
|
||||||
|
children: JSX.Element;
|
||||||
|
title: string;
|
||||||
|
onClick?: () => void;
|
||||||
|
disabled?: boolean;
|
||||||
|
pressed?: boolean;
|
||||||
|
underlinedColor?: string;
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<button
|
||||||
|
disabled={props.disabled || false}
|
||||||
|
onClick={props.onClick}
|
||||||
|
title={props.title}
|
||||||
|
class={styles.button}
|
||||||
|
>
|
||||||
|
{props.children}
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export default Toolbar;
|
||||||
67
solidjs_app/src/components/toolbar/toolbar.module.css
Normal file
67
solidjs_app/src/components/toolbar/toolbar.module.css
Normal file
@@ -0,0 +1,67 @@
|
|||||||
|
.toolbar {
|
||||||
|
display: flex;
|
||||||
|
flex-shrink: 0;
|
||||||
|
align-items: center;
|
||||||
|
/* ${({ theme }) => theme.palette.background.paper}; */
|
||||||
|
background: #fff;
|
||||||
|
height: 40px;
|
||||||
|
line-height: 40px;
|
||||||
|
/* theme.palette.grey["600"] */
|
||||||
|
border-bottom: 1px solid #757575;
|
||||||
|
font-family: Inter;
|
||||||
|
border-radius: 4px 4px 0px 0px;
|
||||||
|
overflow-x: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.button {
|
||||||
|
width: 24px;
|
||||||
|
height: 24px;
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
font-size: 26px;
|
||||||
|
border: 0px solid #fff;
|
||||||
|
border-radius: 2px;
|
||||||
|
margin-right: 5px;
|
||||||
|
transition: all 0.2s;
|
||||||
|
cursor: pointer;
|
||||||
|
background-color: white;
|
||||||
|
padding: 0px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.button:disabled {
|
||||||
|
color: grey;
|
||||||
|
cursor: default;
|
||||||
|
}
|
||||||
|
|
||||||
|
.button:not(disabled) {
|
||||||
|
border-top: none;
|
||||||
|
border-bottom: none;
|
||||||
|
color: #21243a;
|
||||||
|
background-color: #fff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.button:hover {
|
||||||
|
background-color: #f1f2f8;
|
||||||
|
border-top-color: #f1f2f8;
|
||||||
|
}
|
||||||
|
|
||||||
|
.button svg {
|
||||||
|
width: 16px;
|
||||||
|
height: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.divider {
|
||||||
|
width: 0px;
|
||||||
|
height: 10px;
|
||||||
|
border-left: 1px solid #d3d6e9;
|
||||||
|
margin-left: 5px;
|
||||||
|
margin-right: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.format_menu {
|
||||||
|
width: 40px;
|
||||||
|
font-size: 13px;
|
||||||
|
font-weight: 400;
|
||||||
|
display: flex;
|
||||||
|
}
|
||||||
6
solidjs_app/src/components/workbook.module.css
Normal file
6
solidjs_app/src/components/workbook.module.css
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
/* @import './theme.css'; */
|
||||||
|
|
||||||
|
.workbook {
|
||||||
|
/* background-color: var(--main-bg-color); */
|
||||||
|
/* color: var(--other); */
|
||||||
|
}
|
||||||
14
solidjs_app/src/icons/arrow-middle-from-line.svg
Normal file
14
solidjs_app/src/icons/arrow-middle-from-line.svg
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<g id="arrow-middle-from-line" clip-path="url(#clip0_107_4135)">
|
||||||
|
<path id="Vector" d="M8 14.6667V10.6667" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path id="Vector_2" d="M8 5.33333V1.33333" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path id="Vector_3" d="M14.6667 8H1.33334" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path id="Vector_4" d="M10 12.6667L8 10.6667L6 12.6667" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path id="Vector_5" d="M10 3.33333L8 5.33333L6 3.33333" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
</g>
|
||||||
|
<defs>
|
||||||
|
<clipPath id="clip0_107_4135">
|
||||||
|
<rect width="16" height="16" fill="white"/>
|
||||||
|
</clipPath>
|
||||||
|
</defs>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 869 B |
6
solidjs_app/src/icons/border-bottom.svg
Normal file
6
solidjs_app/src/icons/border-bottom.svg
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<path d="M2 14H14" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M2 8H14" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M8 2V11.3333" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M14 11.3333V3.33333C14 2.59695 13.403 2 12.6667 2H3.33333C2.59695 2 2 2.59695 2 3.33333V11.3333" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 538 B |
4
solidjs_app/src/icons/border-center-h.svg
Normal file
4
solidjs_app/src/icons/border-center-h.svg
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<path d="M14 5.33333V3.33333C14 2.59695 13.403 2 12.6667 2H8M14 10.6667V12.6667C14 13.403 13.403 14 12.6667 14H8M2 10.6667V12.6667C2 13.403 2.59695 14 3.33333 14H8M2 5.33333V3.33333C2 2.59695 2.59695 2 3.33333 2H8M8 14V10.6667M8 2V5.33333" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M2 8H14" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 498 B |
4
solidjs_app/src/icons/border-center-v.svg
Normal file
4
solidjs_app/src/icons/border-center-v.svg
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<path d="M10.6667 2H12.6667C13.403 2 14 2.59695 14 3.33333V8M5.33333 2H3.33333C2.59695 2 2 2.59695 2 3.33333V8M5.33333 14H3.33333C2.59695 14 2 13.403 2 12.6667V8M10.6667 14H12.6667C13.403 14 14 13.403 14 12.6667V8M2 8H5.33333M14 8H10.6667" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M8 2V14" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 498 B |
5
solidjs_app/src/icons/border-inner.svg
Normal file
5
solidjs_app/src/icons/border-inner.svg
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<path d="M14 5.33333V3.33333C14 2.59695 13.403 2 12.6667 2H10.6667M14 10.6667V12.6667C14 13.403 13.403 14 12.6667 14H10.6667M2 10.6667V12.6667C2 13.403 2.59695 14 3.33333 14H5.33333M2 5.33333V3.33333C2 2.59695 2.59695 2 3.33333 2H5.33333" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M2 8H14" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M8 2V14" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 586 B |
6
solidjs_app/src/icons/border-left.svg
Normal file
6
solidjs_app/src/icons/border-left.svg
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<path d="M4.66667 2H12.6667C13.403 2 14 2.59695 14 3.33333V12.6667C14 13.403 13.403 14 12.6667 14H4.66667" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M4.66667 8H14" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M8 2V14" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M2 2V14" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 539 B |
5
solidjs_app/src/icons/border-none.svg
Normal file
5
solidjs_app/src/icons/border-none.svg
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<path d="M12.6667 2H3.33333C2.59695 2 2 2.59695 2 3.33333V12.6667C2 13.403 2.59695 14 3.33333 14H12.6667C13.403 14 14 13.403 14 12.6667V3.33333C14 2.59695 13.403 2 12.6667 2Z" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M2 8H14" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M8 2V14" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 513 B |
5
solidjs_app/src/icons/border-outer.svg
Normal file
5
solidjs_app/src/icons/border-outer.svg
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<path d="M12.6667 2H3.33333C2.59695 2 2 2.59695 2 3.33333V12.6667C2 13.403 2.59695 14 3.33333 14H12.6667C13.403 14 14 13.403 14 12.6667V3.33333C14 2.59695 13.403 2 12.6667 2Z" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M4.66667 8H11.3333" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M8 4.66667L8 11.3333" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 542 B |
6
solidjs_app/src/icons/border-right.svg
Normal file
6
solidjs_app/src/icons/border-right.svg
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<path d="M11.3333 2H3.33333C2.59695 2 2 2.59695 2 3.33333V12.6667C2 13.403 2.59695 14 3.33333 14H11.3333" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M2 8H11.3333" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M8 2V14" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M14 2V14" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 538 B |
15
solidjs_app/src/icons/border-style.svg
Normal file
15
solidjs_app/src/icons/border-style.svg
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<!-- <path d="M14 4H2" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M14 8H2" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="2 2"/>
|
||||||
|
<path d="M14 12H2" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="0.01 2"/> -->
|
||||||
|
<style>
|
||||||
|
line {
|
||||||
|
stroke: black;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
<line x1="0" y1="2" x2="16" y2="2" />
|
||||||
|
<!-- Dashes and gaps of the same size -->
|
||||||
|
<line x1="0" y1="8" x2="16" y2="8" stroke-dasharray="2.28 2.28" />
|
||||||
|
<!-- Dashes and gaps of different sizes -->
|
||||||
|
<line x1="0" y1="14" x2="16" y2="14" stroke-dasharray="1 2" />
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 744 B |
6
solidjs_app/src/icons/border-top.svg
Normal file
6
solidjs_app/src/icons/border-top.svg
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<path d="M14 4.66667V12.6667C14 13.403 13.403 14 12.6667 14H3.33333C2.59695 14 2 13.403 2 12.6667V4.66667" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M2 2H14" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M2 8H14" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M8 4.66667V14" stroke="#B2B2B2" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 539 B |
6
solidjs_app/src/icons/decrease-decimal.svg
Normal file
6
solidjs_app/src/icons/decrease-decimal.svg
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<path d="M12.5 11.3333H5" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M7 9.33333L5 11.3333L7 13.3333" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M7.66667 4.33333C7.66667 3.59695 7.06971 3 6.33333 3C5.59695 3 5 3.59695 5 4.33333V5.66667C5 6.40305 5.59695 7 6.33333 7C7.06971 7 7.66667 6.40305 7.66667 5.66667V4.33333Z" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M3 7H3.00667" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 659 B |
10
solidjs_app/src/icons/delete-column.svg
Normal file
10
solidjs_app/src/icons/delete-column.svg
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<path d="M2 3.33333L2 12.6667C2 13.403 2.59695 14 3.33333 14L3.66667 14C4.40305 14 5 13.403 5 12.6667L5 3.33333C5 2.59695 4.40305 2 3.66667 2L3.33333 2C2.59695 2 2 2.59695 2 3.33333Z" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M5 6L2 6" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M14 6L11 6" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M5 10L2 10" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M14 10L11 10" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M11 3.33333L11 12.6667C11 13.403 11.597 14 12.3333 14L12.6667 14C13.403 14 14 13.403 14 12.6667L14 3.33333C14 2.59695 13.403 2 12.6667 2L12.3333 2C11.597 2 11 2.59695 11 3.33333Z" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M6.58578 9.41422L9.41421 6.58579" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M6.58578 6.58578L9.41421 9.41421" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 1.2 KiB |
8
solidjs_app/src/icons/delete-row.svg
Normal file
8
solidjs_app/src/icons/delete-row.svg
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<path d="M12.6667 2H3.33333C2.59695 2 2 2.59695 2 3.33333V3.66667C2 4.40305 2.59695 5 3.33333 5H12.6667C13.403 5 14 4.40305 14 3.66667V3.33333C14 2.59695 13.403 2 12.6667 2Z" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M12.6667 11H3.33333C2.59695 11 2 11.597 2 12.3333V12.6667C2 13.403 2.59695 14 3.33333 14H12.6667C13.403 14 14 13.403 14 12.6667V12.3333C14 11.597 13.403 11 12.6667 11Z" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M8 2V5" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M8 11V14" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M6.58578 6.58578L9.41421 9.41421" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M9.41422 6.58578L6.58579 9.41421" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 1004 B |
3
solidjs_app/src/icons/fx.svg
Normal file
3
solidjs_app/src/icons/fx.svg
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
<svg width="12" height="14" viewBox="0 0 12 14" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<path fill-rule="evenodd" clip-rule="evenodd" d="M0.182 13.305C0.303333 13.3917 0.468 13.435 0.676 13.435C0.962 13.435 1.24367 13.3483 1.521 13.175C1.79833 13.0103 2.05833 12.7937 2.301 12.525C2.55233 12.2563 2.77333 11.9703 2.964 11.667C3.16333 11.3637 3.32367 11.069 3.445 10.783C3.575 10.5057 3.653 10.276 3.679 10.094L4.459 5.011H5.954V4.439H4.537L4.706 3.36C4.80133 2.75334 4.96167 2.281 5.187 1.943C5.421 1.59634 5.73733 1.423 6.136 1.423C6.422 1.423 6.67767 1.488 6.903 1.618L7.189 1.787H7.293L7.566 1.28C7.592 1.23667 7.61367 1.189 7.631 1.137C7.657 1.085 7.67 1.04167 7.67 1.007C7.67 0.93767 7.64833 0.881336 7.605 0.838003C7.57033 0.786003 7.49233 0.72967 7.371 0.669003C7.30167 0.643003 7.22367 0.621336 7.137 0.604003C7.05033 0.578003 6.95933 0.565002 6.864 0.565002C6.53467 0.565002 6.20967 0.651669 5.889 0.825003C5.56833 0.98967 5.265 1.21067 4.979 1.488C4.693 1.75667 4.43733 2.047 4.212 2.359C3.98667 2.66234 3.80033 2.957 3.653 3.243C3.51433 3.52034 3.432 3.75434 3.406 3.945L3.328 4.439H2.249V5.011H3.25L2.405 10.692C2.31833 11.2813 2.17533 11.745 1.976 12.083C1.77667 12.4297 1.508 12.603 1.17 12.603C0.953333 12.603 0.788667 12.564 0.676 12.486L0.39 12.278H0.312L0.0779999 12.746C0.026 12.85 0 12.9367 0 13.006C0 13.1187 0.0606667 13.2183 0.182 13.305ZM5.90545 9.98999C5.82745 10.1027 5.78845 10.211 5.78845 10.315H6.65945C6.70279 10.211 6.75045 10.1113 6.80245 10.016C6.85445 9.91199 6.93245 9.78199 7.03645 9.62599C7.14045 9.46132 7.30079 9.23166 7.51745 8.93699C7.73412 8.64232 8.03312 8.25232 8.41445 7.76699L9.45445 10.341H9.49345L11.2745 9.92499V9.82099L10.3385 9.44399L9.37645 6.98699C9.80112 6.50166 10.1521 6.11166 10.4295 5.81699C10.7068 5.52232 10.9235 5.29266 11.0795 5.12799C11.2441 4.96332 11.3568 4.83332 11.4175 4.73799C11.4868 4.63399 11.5215 4.53432 11.5215 4.43899H10.7025C10.6678 4.52566 10.6288 4.61666 10.5855 4.71199C10.5421 4.79866 10.4728 4.91566 10.3775 5.06299C10.2908 5.20166 10.1565 5.39666 9.97445 5.64799C9.79245 5.89932 9.54545 6.22866 9.23345 6.63599L8.31045 4.30899H8.27145L6.43845 4.72499V4.82899L7.38745 5.21899L8.27145 7.40299C7.78612 7.95766 7.38312 8.40399 7.06245 8.74199C6.74179 9.07999 6.48612 9.34432 6.29545 9.53499C6.11345 9.72566 5.98345 9.87732 5.90545 9.98999Z" fill="#828282"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 2.3 KiB |
7
solidjs_app/src/icons/increase-decimal.svg
Normal file
7
solidjs_app/src/icons/increase-decimal.svg
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<path d="M12.5 11.3333H5" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M10.5 9.33333L12.5 11.3333L10.5 13.3333" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M7.66667 4.33333C7.66667 3.59695 7.06971 3 6.33333 3C5.59695 3 5 3.59695 5 4.33333V5.66667C5 6.40305 5.59695 7 6.33333 7C7.06971 7 7.66667 6.40305 7.66667 5.66667V4.33333Z" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M12.3333 4.33333C12.3333 3.59695 11.7364 3 11 3C10.2636 3 9.66667 3.59695 9.66667 4.33333V5.66667C9.66667 6.40305 10.2636 7 11 7C11.7364 7 12.3333 6.40305 12.3333 5.66667V4.33333Z" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M3 7H3.00667" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 929 B |
46
solidjs_app/src/icons/index.ts
Normal file
46
solidjs_app/src/icons/index.ts
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
import DecimalPlacesDecreaseIcon from "./decrease-decimal.svg";
|
||||||
|
import DecimalPlacesIncreaseIcon from "./increase-decimal.svg";
|
||||||
|
|
||||||
|
import BorderBottomIcon from "./border-bottom.svg";
|
||||||
|
import BorderCenterHIcon from "./border-center-h.svg";
|
||||||
|
import BorderCenterVIcon from "./border-center-v.svg";
|
||||||
|
import BorderInnerIcon from "./border-inner.svg";
|
||||||
|
import BorderLeftIcon from "./border-left.svg";
|
||||||
|
import BorderOuterIcon from "./border-outer.svg";
|
||||||
|
import BorderRightIcon from "./border-right.svg";
|
||||||
|
import BorderTopIcon from "./border-top.svg";
|
||||||
|
import BorderNoneIcon from "./border-none.svg";
|
||||||
|
import BorderStyleIcon from "./border-style.svg";
|
||||||
|
|
||||||
|
import DeleteColumnIcon from "./delete-column.svg";
|
||||||
|
import DeleteRowIcon from "./delete-row.svg";
|
||||||
|
import InsertColumnLeftIcon from "./insert-column-left.svg";
|
||||||
|
import InsertColumnRightIcon from "./insert-column-right.svg";
|
||||||
|
import InsertRowAboveIcon from "./insert-row-above.svg";
|
||||||
|
import InsertRowBelow from "./insert-row-below.svg";
|
||||||
|
import ArrowMiddleFromLine from "./arrow-middle-from-line.svg";
|
||||||
|
|
||||||
|
import Fx from "./fx.svg";
|
||||||
|
|
||||||
|
export {
|
||||||
|
ArrowMiddleFromLine,
|
||||||
|
DecimalPlacesDecreaseIcon,
|
||||||
|
DecimalPlacesIncreaseIcon,
|
||||||
|
BorderBottomIcon,
|
||||||
|
BorderCenterHIcon,
|
||||||
|
BorderCenterVIcon,
|
||||||
|
BorderInnerIcon,
|
||||||
|
BorderLeftIcon,
|
||||||
|
BorderOuterIcon,
|
||||||
|
BorderRightIcon,
|
||||||
|
BorderTopIcon,
|
||||||
|
BorderNoneIcon,
|
||||||
|
BorderStyleIcon,
|
||||||
|
DeleteColumnIcon,
|
||||||
|
DeleteRowIcon,
|
||||||
|
InsertColumnLeftIcon,
|
||||||
|
InsertColumnRightIcon,
|
||||||
|
InsertRowAboveIcon,
|
||||||
|
InsertRowBelow,
|
||||||
|
Fx,
|
||||||
|
};
|
||||||
7
solidjs_app/src/icons/insert-column-left.svg
Normal file
7
solidjs_app/src/icons/insert-column-left.svg
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<path d="M14 12.6667L14 3.33333C14 2.59695 13.403 2 12.6667 2L9.33333 2C8.59695 2 8 2.59695 8 3.33333L8 12.6667C8 13.403 8.59695 14 9.33333 14L12.6667 14C13.403 14 14 13.403 14 12.6667Z" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M14 6L8 6" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M14 10L8 10" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M4 6L4 10" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M6 8L2 8" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 726 B |
7
solidjs_app/src/icons/insert-column-right.svg
Normal file
7
solidjs_app/src/icons/insert-column-right.svg
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<path d="M2 3.33333L2 12.6667C2 13.403 2.59695 14 3.33333 14L6.66667 14C7.40305 14 8 13.403 8 12.6667L8 3.33333C8 2.59695 7.40305 2 6.66667 2L3.33333 2C2.59695 2 2 2.59695 2 3.33333Z" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M2 10L8 10" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M2 6L8 6" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M12 10L12 6" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M10 8L14 8" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 725 B |
7
solidjs_app/src/icons/insert-row-above.svg
Normal file
7
solidjs_app/src/icons/insert-row-above.svg
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<path d="M12.6667 8H3.33333C2.59695 8 2 8.59695 2 9.33333V12.6667C2 13.403 2.59695 14 3.33333 14H12.6667C13.403 14 14 13.403 14 12.6667V9.33333C14 8.59695 13.403 8 12.6667 8Z" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M2 11H14" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M8 8V14" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M6 4H10" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M8 2V6" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 706 B |
7
solidjs_app/src/icons/insert-row-below.svg
Normal file
7
solidjs_app/src/icons/insert-row-below.svg
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<path d="M12.6667 2H3.33333C2.59695 2 2 2.59695 2 3.33333V6.66667C2 7.40305 2.59695 8 3.33333 8H12.6667C13.403 8 14 7.40305 14 6.66667V3.33333C14 2.59695 13.403 2 12.6667 2Z" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M2 5H14" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M8 2V8" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M6 12H10" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
<path d="M8 10V14" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 706 B |
68
solidjs_app/src/index.css
Normal file
68
solidjs_app/src/index.css
Normal file
@@ -0,0 +1,68 @@
|
|||||||
|
:root {
|
||||||
|
font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
|
||||||
|
line-height: 1.5;
|
||||||
|
font-weight: 400;
|
||||||
|
|
||||||
|
color-scheme: light dark;
|
||||||
|
color: rgba(255, 255, 255, 0.87);
|
||||||
|
background-color: #242424;
|
||||||
|
|
||||||
|
font-synthesis: none;
|
||||||
|
text-rendering: optimizeLegibility;
|
||||||
|
-webkit-font-smoothing: antialiased;
|
||||||
|
-moz-osx-font-smoothing: grayscale;
|
||||||
|
}
|
||||||
|
|
||||||
|
a {
|
||||||
|
font-weight: 500;
|
||||||
|
color: #646cff;
|
||||||
|
text-decoration: inherit;
|
||||||
|
}
|
||||||
|
a:hover {
|
||||||
|
color: #535bf2;
|
||||||
|
}
|
||||||
|
|
||||||
|
body {
|
||||||
|
margin: 0;
|
||||||
|
display: flex;
|
||||||
|
place-items: center;
|
||||||
|
min-width: 320px;
|
||||||
|
min-height: 100vh;
|
||||||
|
}
|
||||||
|
|
||||||
|
h1 {
|
||||||
|
font-size: 3.2em;
|
||||||
|
line-height: 1.1;
|
||||||
|
}
|
||||||
|
|
||||||
|
button {
|
||||||
|
border-radius: 8px;
|
||||||
|
border: 1px solid transparent;
|
||||||
|
padding: 0.6em 1.2em;
|
||||||
|
font-size: 1em;
|
||||||
|
font-weight: 500;
|
||||||
|
font-family: inherit;
|
||||||
|
background-color: #1a1a1a;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: border-color 0.25s;
|
||||||
|
}
|
||||||
|
button:hover {
|
||||||
|
border-color: #646cff;
|
||||||
|
}
|
||||||
|
button:focus,
|
||||||
|
button:focus-visible {
|
||||||
|
outline: 4px auto -webkit-focus-ring-color;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (prefers-color-scheme: light) {
|
||||||
|
:root {
|
||||||
|
color: #213547;
|
||||||
|
background-color: #ffffff;
|
||||||
|
}
|
||||||
|
a:hover {
|
||||||
|
color: #747bff;
|
||||||
|
}
|
||||||
|
button {
|
||||||
|
background-color: #f9f9f9;
|
||||||
|
}
|
||||||
|
}
|
||||||
12
solidjs_app/src/index.tsx
Normal file
12
solidjs_app/src/index.tsx
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
/* @refresh reload */
|
||||||
|
import { render } from "solid-js/web";
|
||||||
|
|
||||||
|
import App from "./App";
|
||||||
|
// import "./index.css";
|
||||||
|
import "./theme.css";
|
||||||
|
|
||||||
|
const root = document.getElementById("root");
|
||||||
|
|
||||||
|
if (root) {
|
||||||
|
render(() => <App />, root);
|
||||||
|
}
|
||||||
4
solidjs_app/src/theme.css
Normal file
4
solidjs_app/src/theme.css
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
:root {
|
||||||
|
--main-bg-color: brown;
|
||||||
|
--other: blue;
|
||||||
|
}
|
||||||
1
solidjs_app/src/typings.d.ts
vendored
Normal file
1
solidjs_app/src/typings.d.ts
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
declare module "*.module.css";
|
||||||
1
solidjs_app/src/vite-env.d.ts
vendored
Normal file
1
solidjs_app/src/vite-env.d.ts
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
/// <reference types="vite/client" />
|
||||||
30
solidjs_app/tsconfig.json
Normal file
30
solidjs_app/tsconfig.json
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
{
|
||||||
|
"compilerOptions": {
|
||||||
|
"target": "ES2020",
|
||||||
|
"useDefineForClassFields": true,
|
||||||
|
"module": "ESNext",
|
||||||
|
"lib": ["ES2020", "DOM", "DOM.Iterable"],
|
||||||
|
"skipLibCheck": true,
|
||||||
|
|
||||||
|
/* Bundler mode */
|
||||||
|
"moduleResolution": "bundler",
|
||||||
|
"allowImportingTsExtensions": true,
|
||||||
|
"resolveJsonModule": true,
|
||||||
|
"isolatedModules": true,
|
||||||
|
"noEmit": true,
|
||||||
|
"jsx": "preserve",
|
||||||
|
"jsxImportSource": "solid-js",
|
||||||
|
|
||||||
|
/* Linting */
|
||||||
|
"strict": true,
|
||||||
|
"noUnusedLocals": true,
|
||||||
|
"noUnusedParameters": true,
|
||||||
|
"noFallthroughCasesInSwitch": true,
|
||||||
|
"types": [
|
||||||
|
"vite-plugin-solid-svg/types-component-solid",
|
||||||
|
"vite/client"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"include": ["src"],
|
||||||
|
"references": [{ "path": "./tsconfig.node.json" }]
|
||||||
|
}
|
||||||
11
solidjs_app/tsconfig.node.json
Normal file
11
solidjs_app/tsconfig.node.json
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
{
|
||||||
|
"compilerOptions": {
|
||||||
|
"composite": true,
|
||||||
|
"skipLibCheck": true,
|
||||||
|
"module": "ESNext",
|
||||||
|
"moduleResolution": "bundler",
|
||||||
|
"allowSyntheticDefaultImports": true,
|
||||||
|
"strict": true
|
||||||
|
},
|
||||||
|
"include": ["vite.config.ts"]
|
||||||
|
}
|
||||||
8
solidjs_app/vite.config.ts
Normal file
8
solidjs_app/vite.config.ts
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
import { defineConfig } from "vite";
|
||||||
|
import solid from "vite-plugin-solid";
|
||||||
|
import solidPlugin from "vite-plugin-solid";
|
||||||
|
import solidSvg from "vite-plugin-solid-svg";
|
||||||
|
|
||||||
|
export default defineConfig({
|
||||||
|
plugins: [solid(), solidPlugin(), solidSvg()],
|
||||||
|
});
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
[package]
|
|
||||||
name = "tiron"
|
|
||||||
version = "0.1.3"
|
|
||||||
edition = "2021"
|
|
||||||
|
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
|
||||||
|
|
||||||
[dependencies]
|
|
||||||
crossterm = "0.27.0"
|
|
||||||
ironcalc = { path = "../xlsx"}
|
|
||||||
ratatui = "0.26.2"
|
|
||||||
tui-input = "0.8.0"
|
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
# TironCalc
|
|
||||||
|
|
||||||
[![Discord chat][discord-badge]][discord-url]
|
|
||||||
|
|
||||||
[discord-badge]: https://img.shields.io/discord/1206947691058171904.svg?logo=discord&style=flat-square
|
|
||||||
[discord-url]: https://discord.gg/zZYWfh3RHJ
|
|
||||||
|
|
||||||
TironCalc, or Tiron for friends, is a TUI (Terminal User Interface) for IronCalc. Based on [ratatui](https://github.com/ratatui-org/ratatui)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## Build
|
|
||||||
|
|
||||||
```
|
|
||||||
cargo build --release
|
|
||||||
```
|
|
||||||
|
|
||||||
You will find the binary at `./target/release/tiron`.
|
|
||||||
|
|
||||||
## Documentation
|
|
||||||
|
|
||||||
Start empty project:
|
|
||||||
|
|
||||||
```
|
|
||||||
$ tiron
|
|
||||||
```
|
|
||||||
|
|
||||||
Load an existing Excel file:
|
|
||||||
|
|
||||||
```
|
|
||||||
$ tiron example.xlsx
|
|
||||||
```
|
|
||||||
|
|
||||||
- `e` to edit a cell and enter the value or formula.
|
|
||||||
- `q` to quit and save
|
|
||||||
- `+` to add a sheet
|
|
||||||
- `s` to go to the next sheet
|
|
||||||
- `PgUp/PgDown` to navigate rows faster
|
|
||||||
- `u` undo changes
|
|
||||||
- `U` redo changes
|
|
||||||
- `r` insert row
|
|
||||||
- `c` insert column
|
|
||||||
- `C` delete column
|
|
||||||
- `R` delete row
|
|
||||||
- `
|
|
||||||
|
|
||||||
|
|
||||||
## Inspiration
|
|
||||||
|
|
||||||
James Gosling of Java fame created [sc](https://en.wikipedia.org/wiki/Sc_(spreadsheet_calculator)) the spreadsheet calculator.
|
|
||||||
|
|
||||||
Andrés Martinelli has been maintaining [sc-im](https://github.com/andmarti1424/sc-im), the spreadsheet calculator improvised.
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 10 KiB |
@@ -1,451 +0,0 @@
|
|||||||
use crossterm::{
|
|
||||||
event::{self, DisableMouseCapture, EnableMouseCapture, Event as CEvent, KeyCode},
|
|
||||||
execute,
|
|
||||||
terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
|
|
||||||
};
|
|
||||||
use ironcalc::{
|
|
||||||
base::{expressions::utils::number_to_column, Model, UserModel},
|
|
||||||
export::save_to_xlsx,
|
|
||||||
import::{load_from_icalc, load_from_xlsx},
|
|
||||||
};
|
|
||||||
use ratatui::{
|
|
||||||
backend::CrosstermBackend,
|
|
||||||
layout::{Constraint, Direction, Layout, Rect},
|
|
||||||
style::{Color, Style, Stylize},
|
|
||||||
text::{Line, Span},
|
|
||||||
widgets::{Block, BorderType, Borders, Cell, Clear, Paragraph, Row, Table},
|
|
||||||
Terminal,
|
|
||||||
};
|
|
||||||
use std::thread;
|
|
||||||
use std::time::{Duration, Instant};
|
|
||||||
use std::{io, sync::mpsc};
|
|
||||||
use tui_input::{backend::crossterm::EventHandler, Input};
|
|
||||||
|
|
||||||
use std::env;
|
|
||||||
|
|
||||||
enum Event<I> {
|
|
||||||
Input(I),
|
|
||||||
Tick,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(PartialEq)]
|
|
||||||
enum CursorMode {
|
|
||||||
Navigate,
|
|
||||||
Input,
|
|
||||||
Popup,
|
|
||||||
}
|
|
||||||
|
|
||||||
fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|
||||||
enable_raw_mode()?;
|
|
||||||
|
|
||||||
let args: Vec<String> = env::args().collect();
|
|
||||||
let mut file_name = "model.xlsx";
|
|
||||||
let model = if args.len() > 1 {
|
|
||||||
file_name = &args[1];
|
|
||||||
if file_name.ends_with(".ic") {
|
|
||||||
load_from_icalc(file_name).unwrap()
|
|
||||||
} else {
|
|
||||||
load_from_xlsx(file_name, "en", "UTC").unwrap()
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
Model::new_empty(file_name, "en", "UTC").unwrap()
|
|
||||||
};
|
|
||||||
let mut user_model = UserModel::from_model(model);
|
|
||||||
let mut selected_sheet = 0;
|
|
||||||
let mut selected_row_index = 1;
|
|
||||||
let mut selected_column_index = 1;
|
|
||||||
let mut minimum_row_index = 1;
|
|
||||||
let mut minimum_column_index = 1;
|
|
||||||
let sheet_list_width = 20;
|
|
||||||
let column_width: u16 = 11;
|
|
||||||
let mut cursor_mode = CursorMode::Navigate;
|
|
||||||
let mut input_formula = Input::default();
|
|
||||||
|
|
||||||
let mut input_file_name: Input = file_name.into();
|
|
||||||
|
|
||||||
let mut popup_open = false;
|
|
||||||
|
|
||||||
let (tx, rx) = mpsc::channel();
|
|
||||||
let tick_rate = Duration::from_millis(200);
|
|
||||||
thread::spawn(move || {
|
|
||||||
let mut last_tick = Instant::now();
|
|
||||||
loop {
|
|
||||||
let timeout = tick_rate
|
|
||||||
.checked_sub(last_tick.elapsed())
|
|
||||||
.unwrap_or_else(|| Duration::from_secs(0));
|
|
||||||
|
|
||||||
if event::poll(timeout).expect("poll works") {
|
|
||||||
if let CEvent::Key(key) = event::read().expect("can read events") {
|
|
||||||
tx.send(Event::Input(key)).expect("can send events");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if last_tick.elapsed() >= tick_rate && tx.send(Event::Tick).is_ok() {
|
|
||||||
last_tick = Instant::now();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
let mut stdout = io::stdout();
|
|
||||||
execute!(stdout, EnterAlternateScreen, EnableMouseCapture)?;
|
|
||||||
|
|
||||||
let backend = CrosstermBackend::new(stdout);
|
|
||||||
let mut terminal = Terminal::new(backend)?;
|
|
||||||
terminal.clear()?;
|
|
||||||
|
|
||||||
let header_style = Style::default().fg(Color::Yellow).bg(Color::White);
|
|
||||||
let selected_header_style = Style::default().bg(Color::Yellow).fg(Color::White);
|
|
||||||
|
|
||||||
let selected_cell_style = Style::default().fg(Color::Yellow).bg(Color::LightCyan);
|
|
||||||
|
|
||||||
let background_style = Style::default().bg(Color::Black);
|
|
||||||
let selected_sheet_style = Style::default().bg(Color::White).fg(Color::LightMagenta);
|
|
||||||
let non_selected_sheet_style = Style::default().fg(Color::White);
|
|
||||||
let mut sheet_properties = user_model.get_worksheets_properties();
|
|
||||||
loop {
|
|
||||||
terminal.draw(|rect| {
|
|
||||||
let size = rect.size();
|
|
||||||
|
|
||||||
let global_chunks = Layout::default()
|
|
||||||
.direction(Direction::Horizontal)
|
|
||||||
.constraints([Constraint::Length(sheet_list_width), Constraint::Min(3)].as_ref())
|
|
||||||
.split(size);
|
|
||||||
|
|
||||||
// Sheet list to the left
|
|
||||||
let sheets = Block::default()
|
|
||||||
.borders(Borders::ALL)
|
|
||||||
.style(Style::default().fg(Color::White))
|
|
||||||
.title("Sheets")
|
|
||||||
.border_type(BorderType::Plain)
|
|
||||||
.style(background_style);
|
|
||||||
let mut rows = vec![];
|
|
||||||
(0..sheet_properties.len()).for_each(|sheet_index| {
|
|
||||||
let sheet_name = &sheet_properties[sheet_index].name;
|
|
||||||
let style = if sheet_index == selected_sheet {
|
|
||||||
selected_sheet_style
|
|
||||||
} else {
|
|
||||||
non_selected_sheet_style
|
|
||||||
};
|
|
||||||
rows.push(Row::new(vec![Cell::from(sheet_name.clone()).style(style)]));
|
|
||||||
});
|
|
||||||
let widths = &[Constraint::Length(100)];
|
|
||||||
let sheet_list = Table::new(rows, widths).block(sheets).column_spacing(0);
|
|
||||||
|
|
||||||
rect.render_widget(sheet_list, global_chunks[0]);
|
|
||||||
|
|
||||||
// The spreadsheet is the formula bar at the top and the sheet data
|
|
||||||
let spreadsheet_chunks = Layout::default()
|
|
||||||
.direction(Direction::Vertical)
|
|
||||||
.margin(0)
|
|
||||||
.constraints([Constraint::Length(1), Constraint::Min(2)].as_ref())
|
|
||||||
.split(global_chunks[1]);
|
|
||||||
|
|
||||||
let spreadsheet_width = size.width - sheet_list_width;
|
|
||||||
let spreadsheet_heigh = size.height - 1;
|
|
||||||
let row_count = spreadsheet_heigh - 1;
|
|
||||||
|
|
||||||
let first_row_width: u16 = 3;
|
|
||||||
let column_count =
|
|
||||||
f64::ceil(((spreadsheet_width - first_row_width) as f64) / (column_width as f64))
|
|
||||||
as i32;
|
|
||||||
let mut rows = vec![];
|
|
||||||
// The first row in the column headers
|
|
||||||
let mut row = Vec::new();
|
|
||||||
// The first cell in that row is the top left square of the spreadsheet
|
|
||||||
row.push(Cell::from(""));
|
|
||||||
let mut maximum_column_index = minimum_column_index + column_count - 1;
|
|
||||||
let mut maximum_row_index = minimum_row_index + row_count - 1;
|
|
||||||
|
|
||||||
// We want to make sure the selected cell is visible.
|
|
||||||
if selected_column_index > maximum_column_index {
|
|
||||||
maximum_column_index = selected_column_index;
|
|
||||||
minimum_column_index = maximum_column_index - column_count + 1;
|
|
||||||
} else if selected_column_index < minimum_column_index {
|
|
||||||
minimum_column_index = selected_column_index;
|
|
||||||
maximum_column_index = minimum_column_index + column_count - 1;
|
|
||||||
}
|
|
||||||
if selected_row_index >= maximum_row_index {
|
|
||||||
maximum_row_index = selected_row_index;
|
|
||||||
minimum_row_index = maximum_row_index - row_count + 1;
|
|
||||||
} else if selected_row_index < minimum_row_index {
|
|
||||||
minimum_row_index = selected_row_index;
|
|
||||||
maximum_row_index = minimum_row_index + row_count - 1;
|
|
||||||
}
|
|
||||||
for column_index in minimum_column_index..=maximum_column_index {
|
|
||||||
let column_str = number_to_column(column_index);
|
|
||||||
let style = if column_index == selected_column_index {
|
|
||||||
selected_header_style
|
|
||||||
} else {
|
|
||||||
header_style
|
|
||||||
};
|
|
||||||
row.push(Cell::from(format!(" {}", column_str.unwrap())).style(style));
|
|
||||||
}
|
|
||||||
rows.push(Row::new(row));
|
|
||||||
for row_index in minimum_row_index..=maximum_row_index {
|
|
||||||
let mut row = Vec::new();
|
|
||||||
let style = if row_index == selected_row_index {
|
|
||||||
selected_header_style
|
|
||||||
} else {
|
|
||||||
header_style
|
|
||||||
};
|
|
||||||
row.push(Cell::from(format!("{}", row_index)).style(style));
|
|
||||||
for column_index in minimum_column_index..=maximum_column_index {
|
|
||||||
let value = user_model
|
|
||||||
.get_formatted_cell_value(
|
|
||||||
selected_sheet as u32,
|
|
||||||
row_index as i32,
|
|
||||||
column_index,
|
|
||||||
)
|
|
||||||
.unwrap();
|
|
||||||
// let cell_style = user_model
|
|
||||||
// .get_cell_style(selected_sheet as u32, row_index as i32, column_index)
|
|
||||||
// .unwrap();
|
|
||||||
let style = if selected_row_index == row_index
|
|
||||||
&& selected_column_index == column_index
|
|
||||||
{
|
|
||||||
selected_cell_style
|
|
||||||
} else {
|
|
||||||
// let bg_color = match cell_style.fill.fg_color {
|
|
||||||
// Some(s) => Color::from_str(&s).unwrap(),
|
|
||||||
// None => Color::White,
|
|
||||||
// };
|
|
||||||
// let fg_color = match cell_style.font.color {
|
|
||||||
// Some(s) => Color::from_str(&s).unwrap(),
|
|
||||||
// None => Color::Black,
|
|
||||||
// };
|
|
||||||
let bg_color = Color::White;
|
|
||||||
let fg_color = Color::Black;
|
|
||||||
Style::default().fg(fg_color).bg(bg_color)
|
|
||||||
};
|
|
||||||
row.push(Cell::from(value.to_string()).style(style));
|
|
||||||
}
|
|
||||||
rows.push(Row::new(row));
|
|
||||||
}
|
|
||||||
let mut widths = Vec::new();
|
|
||||||
widths.push(Constraint::Length(first_row_width));
|
|
||||||
for _ in 0..column_count {
|
|
||||||
widths.push(Constraint::Length(column_width));
|
|
||||||
}
|
|
||||||
let spreadsheet = Table::new(rows, widths)
|
|
||||||
.block(Block::default().style(Style::default().bg(Color::Black)))
|
|
||||||
.column_spacing(0);
|
|
||||||
|
|
||||||
let text = if cursor_mode != CursorMode::Input {
|
|
||||||
user_model
|
|
||||||
.get_cell_content(
|
|
||||||
selected_sheet as u32,
|
|
||||||
selected_row_index as i32,
|
|
||||||
selected_column_index,
|
|
||||||
)
|
|
||||||
.unwrap()
|
|
||||||
} else {
|
|
||||||
input_formula.value().to_string()
|
|
||||||
};
|
|
||||||
let cell_address_text = format!(
|
|
||||||
"{}{}: ",
|
|
||||||
number_to_column(selected_column_index).unwrap(),
|
|
||||||
selected_row_index,
|
|
||||||
);
|
|
||||||
let formula_bar_text = format!("{}{}", cell_address_text, text,);
|
|
||||||
let formula_bar = Paragraph::new(vec![Line::from(vec![Span::raw(formula_bar_text)])]);
|
|
||||||
rect.render_widget(formula_bar.block(Block::default()), spreadsheet_chunks[0]);
|
|
||||||
rect.render_widget(spreadsheet, spreadsheet_chunks[1]);
|
|
||||||
if cursor_mode == CursorMode::Input {
|
|
||||||
let area = spreadsheet_chunks[0];
|
|
||||||
rect.set_cursor(
|
|
||||||
area.x
|
|
||||||
+ (input_formula.visual_cursor() as u16)
|
|
||||||
+ cell_address_text.len() as u16,
|
|
||||||
area.y,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
if popup_open {
|
|
||||||
let area = centered_rect(60, 20, size);
|
|
||||||
rect.render_widget(Clear, area);
|
|
||||||
let input_text = input_file_name.value();
|
|
||||||
let text = vec![
|
|
||||||
Line::from(vec![input_text.fg(Color::Yellow)]),
|
|
||||||
"".into(),
|
|
||||||
Line::from(vec![
|
|
||||||
"ESC".green(),
|
|
||||||
" to abort. ".into(),
|
|
||||||
"END".green(),
|
|
||||||
" to quit without saving. ".into(),
|
|
||||||
"Enter".green(),
|
|
||||||
" to save and quit".into(),
|
|
||||||
]),
|
|
||||||
];
|
|
||||||
rect.render_widget(
|
|
||||||
Paragraph::new(text).block(Block::bordered().title("Save as")),
|
|
||||||
area,
|
|
||||||
);
|
|
||||||
rect.set_cursor(
|
|
||||||
// Put cursor past the end of the input text
|
|
||||||
area.x + (input_file_name.visual_cursor() as u16) + 1,
|
|
||||||
// Move one line own, from the border to the input line
|
|
||||||
area.y + 1,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
})?;
|
|
||||||
|
|
||||||
match cursor_mode {
|
|
||||||
CursorMode::Popup => {
|
|
||||||
match rx.recv()? {
|
|
||||||
Event::Input(event) => match event.code {
|
|
||||||
KeyCode::End => {
|
|
||||||
terminal.clear()?;
|
|
||||||
// restore terminal
|
|
||||||
disable_raw_mode()?;
|
|
||||||
execute!(
|
|
||||||
terminal.backend_mut(),
|
|
||||||
LeaveAlternateScreen,
|
|
||||||
DisableMouseCapture
|
|
||||||
)?;
|
|
||||||
terminal.show_cursor()?;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
KeyCode::Enter => {
|
|
||||||
terminal.clear()?;
|
|
||||||
// restore terminal
|
|
||||||
disable_raw_mode()?;
|
|
||||||
execute!(
|
|
||||||
terminal.backend_mut(),
|
|
||||||
LeaveAlternateScreen,
|
|
||||||
DisableMouseCapture
|
|
||||||
)?;
|
|
||||||
terminal.show_cursor()?;
|
|
||||||
let _ = save_to_xlsx(&user_model.model, input_file_name.value());
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
KeyCode::Esc => {
|
|
||||||
popup_open = false;
|
|
||||||
cursor_mode = CursorMode::Navigate;
|
|
||||||
}
|
|
||||||
_ => {
|
|
||||||
input_file_name.handle_event(&CEvent::Key(event));
|
|
||||||
}
|
|
||||||
},
|
|
||||||
Event::Tick => {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
CursorMode::Navigate => {
|
|
||||||
match rx.recv()? {
|
|
||||||
Event::Input(event) => match event.code {
|
|
||||||
KeyCode::Char('q') => {
|
|
||||||
popup_open = true;
|
|
||||||
cursor_mode = CursorMode::Popup;
|
|
||||||
}
|
|
||||||
KeyCode::Down => {
|
|
||||||
selected_row_index += 1;
|
|
||||||
}
|
|
||||||
KeyCode::Up => {
|
|
||||||
if selected_row_index > 1 {
|
|
||||||
selected_row_index -= 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
KeyCode::Right => {
|
|
||||||
selected_column_index += 1;
|
|
||||||
}
|
|
||||||
KeyCode::Left => {
|
|
||||||
if selected_column_index > 1 {
|
|
||||||
selected_column_index -= 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
KeyCode::PageDown => {
|
|
||||||
selected_row_index += 10;
|
|
||||||
}
|
|
||||||
KeyCode::PageUp => {
|
|
||||||
if selected_row_index > 10 {
|
|
||||||
selected_row_index -= 10;
|
|
||||||
} else {
|
|
||||||
selected_row_index = 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
KeyCode::Char('s') => {
|
|
||||||
selected_sheet += 1;
|
|
||||||
if selected_sheet >= sheet_properties.len() {
|
|
||||||
selected_sheet = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
KeyCode::Char('a') => {
|
|
||||||
selected_sheet = selected_sheet.saturating_sub(1);
|
|
||||||
}
|
|
||||||
KeyCode::Char('u') => user_model.undo().unwrap(),
|
|
||||||
KeyCode::Char('U') => user_model.redo().unwrap(),
|
|
||||||
KeyCode::Char('c') => user_model
|
|
||||||
.insert_column(selected_sheet as u32, selected_column_index as i32)
|
|
||||||
.unwrap(),
|
|
||||||
KeyCode::Char('C') => user_model
|
|
||||||
.delete_column(selected_sheet as u32, selected_column_index as i32)
|
|
||||||
.unwrap(),
|
|
||||||
KeyCode::Char('r') => user_model
|
|
||||||
.insert_row(selected_sheet as u32, selected_row_index as i32)
|
|
||||||
.unwrap(),
|
|
||||||
KeyCode::Char('R') => user_model
|
|
||||||
.delete_row(selected_sheet as u32, selected_row_index as i32)
|
|
||||||
.unwrap(),
|
|
||||||
KeyCode::Char('e') => {
|
|
||||||
cursor_mode = CursorMode::Input;
|
|
||||||
let input_str = user_model
|
|
||||||
.get_cell_content(
|
|
||||||
selected_sheet as u32,
|
|
||||||
selected_row_index as i32,
|
|
||||||
selected_column_index,
|
|
||||||
)
|
|
||||||
.unwrap();
|
|
||||||
// .unwrap_or_default();
|
|
||||||
input_formula = input_formula.with_value(input_str);
|
|
||||||
}
|
|
||||||
KeyCode::Char('+') => {
|
|
||||||
user_model.new_sheet();
|
|
||||||
sheet_properties = user_model.get_worksheets_properties();
|
|
||||||
}
|
|
||||||
_ => {
|
|
||||||
// println!("{:?}", event);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
Event::Tick => {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
CursorMode::Input => match rx.recv()? {
|
|
||||||
Event::Input(event) => match event.code {
|
|
||||||
KeyCode::Enter => {
|
|
||||||
cursor_mode = CursorMode::Navigate;
|
|
||||||
let value = input_formula.value().to_string();
|
|
||||||
let sheet = selected_sheet as i32;
|
|
||||||
let row = selected_row_index as i32;
|
|
||||||
let column = selected_column_index;
|
|
||||||
user_model
|
|
||||||
.set_user_input(sheet as u32, row, column, &value)
|
|
||||||
.unwrap();
|
|
||||||
user_model.evaluate();
|
|
||||||
}
|
|
||||||
_ => {
|
|
||||||
input_formula.handle_event(&CEvent::Key(event));
|
|
||||||
}
|
|
||||||
},
|
|
||||||
Event::Tick => {}
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
// helper function to create a centered rect using up certain percentage of the available rect `r`
|
|
||||||
fn centered_rect(percent_x: u16, percent_y: u16, r: Rect) -> Rect {
|
|
||||||
let popup_layout = Layout::vertical([
|
|
||||||
Constraint::Percentage((100 - percent_y) / 2),
|
|
||||||
Constraint::Percentage(percent_y),
|
|
||||||
Constraint::Percentage((100 - percent_y) / 2),
|
|
||||||
])
|
|
||||||
.split(r);
|
|
||||||
|
|
||||||
Layout::horizontal([
|
|
||||||
Constraint::Percentage((100 - percent_x) / 2),
|
|
||||||
Constraint::Percentage(percent_x),
|
|
||||||
Constraint::Percentage((100 - percent_x) / 2),
|
|
||||||
])
|
|
||||||
.split(popup_layout[1])[1]
|
|
||||||
}
|
|
||||||
@@ -16,7 +16,7 @@ use std::{
|
|||||||
use roxmltree::Node;
|
use roxmltree::Node;
|
||||||
|
|
||||||
use ironcalc_base::{
|
use ironcalc_base::{
|
||||||
types::{Metadata, Workbook, WorkbookSettings},
|
types::{Metadata, Workbook, WorkbookSettings, WorkbookView},
|
||||||
Model,
|
Model,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -66,7 +66,7 @@ fn load_xlsx_from_reader<R: Read + std::io::Seek>(
|
|||||||
let workbook = load_workbook(&mut archive)?;
|
let workbook = load_workbook(&mut archive)?;
|
||||||
let rels = load_relationships(&mut archive)?;
|
let rels = load_relationships(&mut archive)?;
|
||||||
let mut tables = HashMap::new();
|
let mut tables = HashMap::new();
|
||||||
let worksheets = load_sheets(
|
let (worksheets, selected_sheet) = load_sheets(
|
||||||
&mut archive,
|
&mut archive,
|
||||||
&rels,
|
&rels,
|
||||||
&workbook,
|
&workbook,
|
||||||
@@ -88,6 +88,13 @@ fn load_xlsx_from_reader<R: Read + std::io::Seek>(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
let mut views = HashMap::new();
|
||||||
|
views.insert(
|
||||||
|
0,
|
||||||
|
WorkbookView {
|
||||||
|
sheet: selected_sheet,
|
||||||
|
},
|
||||||
|
);
|
||||||
Ok(Workbook {
|
Ok(Workbook {
|
||||||
shared_strings,
|
shared_strings,
|
||||||
defined_names: workbook.defined_names,
|
defined_names: workbook.defined_names,
|
||||||
@@ -100,6 +107,7 @@ fn load_xlsx_from_reader<R: Read + std::io::Seek>(
|
|||||||
},
|
},
|
||||||
metadata,
|
metadata,
|
||||||
tables,
|
tables,
|
||||||
|
views,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,9 +5,12 @@ use ironcalc_base::{
|
|||||||
parser::{stringify::to_rc_format, Parser},
|
parser::{stringify::to_rc_format, Parser},
|
||||||
token::{get_error_by_english_name, Error},
|
token::{get_error_by_english_name, Error},
|
||||||
types::CellReferenceRC,
|
types::CellReferenceRC,
|
||||||
utils::column_to_number,
|
utils::{column_to_number, parse_reference_a1},
|
||||||
|
},
|
||||||
|
types::{
|
||||||
|
Cell, Col, Comment, DefinedName, Row, SheetData, SheetState, Table, Worksheet,
|
||||||
|
WorksheetView,
|
||||||
},
|
},
|
||||||
types::{Cell, Col, Comment, DefinedName, Row, SheetData, SheetState, Table, Worksheet},
|
|
||||||
};
|
};
|
||||||
use roxmltree::Node;
|
use roxmltree::Node;
|
||||||
use thiserror::Error;
|
use thiserror::Error;
|
||||||
@@ -47,6 +50,50 @@ fn get_column_from_ref(s: &str) -> String {
|
|||||||
column.into_iter().collect()
|
column.into_iter().collect()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn parse_cell_reference(cell: &str) -> Result<(i32, i32), String> {
|
||||||
|
if let Some(r) = parse_reference_a1(cell) {
|
||||||
|
Ok((r.row, r.column))
|
||||||
|
} else {
|
||||||
|
Err(format!("Invalid cell reference: '{}'", cell))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn parse_range(range: &str) -> Result<(i32, i32, i32, i32), String> {
|
||||||
|
let parts: Vec<&str> = range.split(':').collect();
|
||||||
|
if parts.len() == 1 {
|
||||||
|
if let Some(r) = parse_reference_a1(parts[0]) {
|
||||||
|
Ok((r.row, r.column, r.row, r.column))
|
||||||
|
} else {
|
||||||
|
Err(format!("Invalid range: '{}'", range))
|
||||||
|
}
|
||||||
|
} else if parts.len() == 2 {
|
||||||
|
match (parse_reference_a1(parts[0]), parse_reference_a1(parts[1])) {
|
||||||
|
(Some(left), Some(right)) => {
|
||||||
|
return Ok((left.row, left.column, right.row, right.column));
|
||||||
|
}
|
||||||
|
_ => return Err(format!("Invalid range: '{}'", range)),
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
return Err(format!("Invalid range: '{}'", range));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod test {
|
||||||
|
use crate::import::worksheets::parse_range;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_parse_range() {
|
||||||
|
assert!(parse_range("3Aw").is_err());
|
||||||
|
assert_eq!(parse_range("A1"), Ok((1, 1, 1, 1)));
|
||||||
|
assert_eq!(parse_range("B5:C6"), Ok((5, 2, 6, 3)));
|
||||||
|
assert!(parse_range("A1:A2:A3").is_err());
|
||||||
|
assert!(parse_range("A1:34").is_err());
|
||||||
|
assert!(parse_range("A").is_err());
|
||||||
|
assert!(parse_range("12").is_err());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fn load_dimension(ws: Node) -> String {
|
fn load_dimension(ws: Node) -> String {
|
||||||
// <dimension ref="A1:O18"/>
|
// <dimension ref="A1:O18"/>
|
||||||
let application_nodes = ws
|
let application_nodes = ws
|
||||||
@@ -490,7 +537,29 @@ fn load_sheet_rels<R: Read + std::io::Seek>(
|
|||||||
Ok(comments)
|
Ok(comments)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_frozen_rows_and_columns(ws: Node) -> (i32, i32) {
|
struct SheetView {
|
||||||
|
is_selected: bool,
|
||||||
|
selected_row: i32,
|
||||||
|
selected_column: i32,
|
||||||
|
frozen_columns: i32,
|
||||||
|
frozen_rows: i32,
|
||||||
|
range: [i32; 4],
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for SheetView {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
is_selected: false,
|
||||||
|
selected_row: 1,
|
||||||
|
selected_column: 1,
|
||||||
|
frozen_rows: 0,
|
||||||
|
frozen_columns: 0,
|
||||||
|
range: [1, 1, 1, 1],
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn get_sheet_view(ws: Node) -> SheetView {
|
||||||
// <sheetViews>
|
// <sheetViews>
|
||||||
// <sheetView workbookViewId="0">
|
// <sheetView workbookViewId="0">
|
||||||
// <selection activeCell="E10" sqref="E10"/>
|
// <selection activeCell="E10" sqref="E10"/>
|
||||||
@@ -511,19 +580,20 @@ fn get_frozen_rows_and_columns(ws: Node) -> (i32, i32) {
|
|||||||
// bottomLeft, bottomRight, topLeft, topRight
|
// bottomLeft, bottomRight, topLeft, topRight
|
||||||
|
|
||||||
// NB: bottomLeft is used when only rows are frozen, etc
|
// NB: bottomLeft is used when only rows are frozen, etc
|
||||||
// Calc ignores all those.
|
// IronCalc ignores all those.
|
||||||
|
|
||||||
let mut frozen_rows = 0;
|
let mut frozen_rows = 0;
|
||||||
let mut frozen_columns = 0;
|
let mut frozen_columns = 0;
|
||||||
|
|
||||||
// In Calc there can only be one sheetView
|
// In IronCalc there can only be one sheetView
|
||||||
let sheet_views = ws
|
let sheet_views = ws
|
||||||
.children()
|
.children()
|
||||||
.filter(|n| n.has_tag_name("sheetViews"))
|
.filter(|n| n.has_tag_name("sheetViews"))
|
||||||
.collect::<Vec<Node>>();
|
.collect::<Vec<Node>>();
|
||||||
|
|
||||||
|
// We are only expecting one `sheetViews` element. Otherwise return a default
|
||||||
if sheet_views.len() != 1 {
|
if sheet_views.len() != 1 {
|
||||||
return (0, 0);
|
return SheetView::default();
|
||||||
}
|
}
|
||||||
|
|
||||||
let sheet_view = sheet_views[0]
|
let sheet_view = sheet_views[0]
|
||||||
@@ -531,25 +601,64 @@ fn get_frozen_rows_and_columns(ws: Node) -> (i32, i32) {
|
|||||||
.filter(|n| n.has_tag_name("sheetView"))
|
.filter(|n| n.has_tag_name("sheetView"))
|
||||||
.collect::<Vec<Node>>();
|
.collect::<Vec<Node>>();
|
||||||
|
|
||||||
|
// We are only expecting one `sheetView` element. Otherwise return a default
|
||||||
if sheet_view.len() != 1 {
|
if sheet_view.len() != 1 {
|
||||||
return (0, 0);
|
return SheetView::default();
|
||||||
}
|
}
|
||||||
|
|
||||||
let pane = sheet_view[0]
|
let sheet_view = sheet_view[0];
|
||||||
|
let is_selected = sheet_view.attribute("tabSelected").unwrap_or("0") == "1";
|
||||||
|
|
||||||
|
let pane = sheet_view
|
||||||
.children()
|
.children()
|
||||||
.filter(|n| n.has_tag_name("pane"))
|
.filter(|n| n.has_tag_name("pane"))
|
||||||
.collect::<Vec<Node>>();
|
.collect::<Vec<Node>>();
|
||||||
|
|
||||||
// 18.18.53 ST_PaneState (Pane State)
|
// 18.18.53 ST_PaneState (Pane State)
|
||||||
// frozen, frozenSplit, split
|
// frozen, frozenSplit, split
|
||||||
if pane.len() == 1 && pane[0].attribute("state").unwrap_or("split") == "frozen" {
|
if pane.len() == 1 {
|
||||||
// TODO: Should we assert that topLeft is consistent?
|
if let Some("frozen") = pane[0].attribute("state") {
|
||||||
// let top_left_cell = pane[0].attribute("topLeftCell").unwrap_or("A1").to_string();
|
// TODO: Should we assert that topLeft is consistent?
|
||||||
|
// let top_left_cell = pane[0].attribute("topLeftCell").unwrap_or("A1").to_string();
|
||||||
|
|
||||||
frozen_columns = get_number(pane[0], "xSplit");
|
frozen_columns = get_number(pane[0], "xSplit");
|
||||||
frozen_rows = get_number(pane[0], "ySplit");
|
frozen_rows = get_number(pane[0], "ySplit");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let selections = sheet_view
|
||||||
|
.children()
|
||||||
|
.filter(|n| n.has_tag_name("selection"))
|
||||||
|
.collect::<Vec<Node>>();
|
||||||
|
|
||||||
|
if let Some(selection) = selections.last() {
|
||||||
|
let active_cell = match selection.attribute("activeCell").map(parse_cell_reference) {
|
||||||
|
Some(Ok(s)) => Some(s),
|
||||||
|
_ => None,
|
||||||
|
};
|
||||||
|
let sqref = match selection.attribute("sqref").map(parse_range) {
|
||||||
|
Some(Ok(s)) => Some(s),
|
||||||
|
_ => None,
|
||||||
|
};
|
||||||
|
|
||||||
|
let (selected_row, selected_column, row1, column1, row2, column2) =
|
||||||
|
match (active_cell, sqref) {
|
||||||
|
(Some(cell), Some(range)) => (cell.0, cell.1, range.0, range.1, range.2, range.3),
|
||||||
|
(Some(cell), None) => (cell.0, cell.1, cell.0, cell.1, cell.0, cell.1),
|
||||||
|
(None, Some(range)) => (range.0, range.1, range.0, range.1, range.2, range.3),
|
||||||
|
_ => (1, 1, 1, 1, 1, 1),
|
||||||
|
};
|
||||||
|
|
||||||
|
SheetView {
|
||||||
|
frozen_rows,
|
||||||
|
frozen_columns,
|
||||||
|
selected_row,
|
||||||
|
selected_column,
|
||||||
|
is_selected,
|
||||||
|
range: [row1, column1, row2, column2],
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
SheetView::default()
|
||||||
}
|
}
|
||||||
(frozen_rows, frozen_columns)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(super) struct SheetSettings {
|
pub(super) struct SheetSettings {
|
||||||
@@ -566,7 +675,7 @@ pub(super) fn load_sheet<R: Read + std::io::Seek>(
|
|||||||
worksheets: &[String],
|
worksheets: &[String],
|
||||||
tables: &HashMap<String, Table>,
|
tables: &HashMap<String, Table>,
|
||||||
shared_strings: &mut Vec<String>,
|
shared_strings: &mut Vec<String>,
|
||||||
) -> Result<Worksheet, XlsxError> {
|
) -> Result<(Worksheet, bool), XlsxError> {
|
||||||
let sheet_name = &settings.name;
|
let sheet_name = &settings.name;
|
||||||
let sheet_id = settings.id;
|
let sheet_id = settings.id;
|
||||||
let state = &settings.state;
|
let state = &settings.state;
|
||||||
@@ -583,7 +692,7 @@ pub(super) fn load_sheet<R: Read + std::io::Seek>(
|
|||||||
|
|
||||||
let dimension = load_dimension(ws);
|
let dimension = load_dimension(ws);
|
||||||
|
|
||||||
let (frozen_rows, frozen_columns) = get_frozen_rows_and_columns(ws);
|
let sheet_view = get_sheet_view(ws);
|
||||||
|
|
||||||
let cols = load_columns(ws)?;
|
let cols = load_columns(ws)?;
|
||||||
let color = load_sheet_color(ws)?;
|
let color = load_sheet_color(ws)?;
|
||||||
@@ -844,21 +953,37 @@ pub(super) fn load_sheet<R: Read + std::io::Seek>(
|
|||||||
// pageSetup
|
// pageSetup
|
||||||
// <pageSetup orientation="portrait" r:id="rId1"/>
|
// <pageSetup orientation="portrait" r:id="rId1"/>
|
||||||
|
|
||||||
Ok(Worksheet {
|
let mut views = HashMap::new();
|
||||||
dimension,
|
views.insert(
|
||||||
cols,
|
0,
|
||||||
rows,
|
WorksheetView {
|
||||||
shared_formulas,
|
row: sheet_view.selected_row,
|
||||||
sheet_data,
|
column: sheet_view.selected_column,
|
||||||
name: sheet_name.to_string(),
|
range: sheet_view.range,
|
||||||
sheet_id,
|
top_row: 1,
|
||||||
state: state.to_owned(),
|
left_column: 1,
|
||||||
color,
|
},
|
||||||
merge_cells,
|
);
|
||||||
comments: settings.comments,
|
|
||||||
frozen_rows,
|
Ok((
|
||||||
frozen_columns,
|
Worksheet {
|
||||||
})
|
dimension,
|
||||||
|
cols,
|
||||||
|
rows,
|
||||||
|
shared_formulas,
|
||||||
|
sheet_data,
|
||||||
|
name: sheet_name.to_string(),
|
||||||
|
sheet_id,
|
||||||
|
state: state.to_owned(),
|
||||||
|
color,
|
||||||
|
merge_cells,
|
||||||
|
comments: settings.comments,
|
||||||
|
frozen_rows: sheet_view.frozen_rows,
|
||||||
|
frozen_columns: sheet_view.frozen_columns,
|
||||||
|
views,
|
||||||
|
},
|
||||||
|
sheet_view.is_selected,
|
||||||
|
))
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(super) fn load_sheets<R: Read + std::io::Seek>(
|
pub(super) fn load_sheets<R: Read + std::io::Seek>(
|
||||||
@@ -867,7 +992,7 @@ pub(super) fn load_sheets<R: Read + std::io::Seek>(
|
|||||||
workbook: &WorkbookXML,
|
workbook: &WorkbookXML,
|
||||||
tables: &mut HashMap<String, Table>,
|
tables: &mut HashMap<String, Table>,
|
||||||
shared_strings: &mut Vec<String>,
|
shared_strings: &mut Vec<String>,
|
||||||
) -> Result<Vec<Worksheet>, XlsxError> {
|
) -> Result<(Vec<Worksheet>, u32), XlsxError> {
|
||||||
// load comments and tables
|
// load comments and tables
|
||||||
let mut comments = HashMap::new();
|
let mut comments = HashMap::new();
|
||||||
for sheet in &workbook.worksheets {
|
for sheet in &workbook.worksheets {
|
||||||
@@ -889,6 +1014,8 @@ pub(super) fn load_sheets<R: Read + std::io::Seek>(
|
|||||||
// load all sheets
|
// load all sheets
|
||||||
let worksheets: &Vec<String> = &workbook.worksheets.iter().map(|s| s.name.clone()).collect();
|
let worksheets: &Vec<String> = &workbook.worksheets.iter().map(|s| s.name.clone()).collect();
|
||||||
let mut sheets = Vec::new();
|
let mut sheets = Vec::new();
|
||||||
|
let mut selected_sheet = 0;
|
||||||
|
let mut sheet_index = 0;
|
||||||
for sheet in &workbook.worksheets {
|
for sheet in &workbook.worksheets {
|
||||||
let sheet_name = &sheet.name;
|
let sheet_name = &sheet.name;
|
||||||
let rel_id = &sheet.id;
|
let rel_id = &sheet.id;
|
||||||
@@ -907,15 +1034,14 @@ pub(super) fn load_sheets<R: Read + std::io::Seek>(
|
|||||||
state: state.clone(),
|
state: state.clone(),
|
||||||
comments: comments.get(rel_id).expect("").to_vec(),
|
comments: comments.get(rel_id).expect("").to_vec(),
|
||||||
};
|
};
|
||||||
sheets.push(load_sheet(
|
let (s, is_selected) =
|
||||||
archive,
|
load_sheet(archive, &path, settings, worksheets, tables, shared_strings)?;
|
||||||
&path,
|
if is_selected {
|
||||||
settings,
|
selected_sheet = sheet_index;
|
||||||
worksheets,
|
}
|
||||||
tables,
|
sheets.push(s);
|
||||||
shared_strings,
|
sheet_index += 1;
|
||||||
)?);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Ok(sheets)
|
Ok((sheets, selected_sheet))
|
||||||
}
|
}
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
@@ -12,9 +12,37 @@ use ironcalc_base::Model;
|
|||||||
#[test]
|
#[test]
|
||||||
fn test_example() {
|
fn test_example() {
|
||||||
let model = load_from_xlsx("tests/example.xlsx", "en", "UTC").unwrap();
|
let model = load_from_xlsx("tests/example.xlsx", "en", "UTC").unwrap();
|
||||||
|
// We should use the API once it is in place
|
||||||
let workbook = model.workbook;
|
let workbook = model.workbook;
|
||||||
assert_eq!(workbook.worksheets[0].frozen_rows, 0);
|
let ws = &workbook.worksheets;
|
||||||
assert_eq!(workbook.worksheets[0].frozen_columns, 0);
|
let expected_names = vec![
|
||||||
|
"Sheet1".to_string(),
|
||||||
|
"Second".to_string(),
|
||||||
|
"Sheet4".to_string(),
|
||||||
|
"shared".to_string(),
|
||||||
|
"Table".to_string(),
|
||||||
|
"Sheet2".to_string(),
|
||||||
|
"Created fourth".to_string(),
|
||||||
|
"Frozen".to_string(),
|
||||||
|
"Split".to_string(),
|
||||||
|
"Hidden".to_string(),
|
||||||
|
];
|
||||||
|
let names: Vec<String> = ws.iter().map(|s| s.name.clone()).collect();
|
||||||
|
|
||||||
|
// One is not not imported and one is hidden
|
||||||
|
assert_eq!(expected_names, names);
|
||||||
|
|
||||||
|
assert_eq!(workbook.views[&0].sheet, 7);
|
||||||
|
|
||||||
|
// Test selection:
|
||||||
|
// First sheet (Sheet1)
|
||||||
|
// E13 and E13:N20
|
||||||
|
assert_eq!(ws[0].frozen_rows, 0);
|
||||||
|
assert_eq!(ws[0].frozen_columns, 0);
|
||||||
|
assert_eq!(ws[0].views[&0].row, 13);
|
||||||
|
assert_eq!(ws[0].views[&0].column, 5);
|
||||||
|
assert_eq!(ws[0].views[&0].range, [13, 5, 20, 14]);
|
||||||
|
|
||||||
let model2 = load_from_icalc("tests/example.ic").unwrap();
|
let model2 = load_from_icalc("tests/example.ic").unwrap();
|
||||||
let s = bitcode::encode(&model2.workbook);
|
let s = bitcode::encode(&model2.workbook);
|
||||||
assert_eq!(workbook, model2.workbook, "{:?}", s);
|
assert_eq!(workbook, model2.workbook, "{:?}", s);
|
||||||
|
|||||||
Reference in New Issue
Block a user