dont use web-sys

Author: bgkillas

Cargo.lock

@@ -50,7 +50,7 @@ softbuffer-wayland=["softbuffer/wayland"]
 rug=["kalc-lib/rug","kalc-lib"]
 fastnum=["kalc-lib/fastnum","kalc-lib"]
 kalc-lib=["dep:kalc-lib"]
-wasm=["dep:wasm-bindgen", "rupl/wasm", "dep:web-sys", "dep:lz4_flex", "dep:base64"]
+wasm=["dep:wasm-bindgen", "rupl/wasm", "dep:lz4_flex", "dep:base64"]
 wasm-draw=["rupl/wasm-draw", "wasm", "rupl/winit", "dep:winit"]
 wee=["dep:wee_alloc"]
 wasm-console = ["dep:console_error_panic_hook"]
@@ -67,7 +67,6 @@ serde = {version = "1.0.228", features = ["derive"], optional = true}
 rupl={version = "0.1.2",path="../rupl",default-features = false}
 kalc-lib={version="1.5.1",default-features=false,path="../kalc-lib",optional = true, features = ["fastrand"]}
 wasm-bindgen = {version="0.2.108",optional = true}
-web-sys = {version= "0.3.85", optional = true, features = ["Window","Location","History"]}
 console_error_panic_hook = { version = "0.1.7", optional = true }
 wee_alloc = {version = "0.4.5", optional = true}
 lz4_flex = {version="0.12.0", default-features = false, optional = true}

Cargo.toml

@@ -313,13 +313,8 @@ impl Data {
         if !plot.is_drag() {
             use base64::{Engine as _, engine::general_purpose::URL_SAFE};
             let data = lz4_flex::compress_prepend_size(func.as_bytes());
-            let url = format!("#{}", URL_SAFE.encode(data));
-            web_sys::window()
-                .unwrap()
-                .history()
-                .unwrap()
-                .replace_state_with_url(&wasm_bindgen::JsValue::NULL, "", Some(&url))
-                .unwrap();
+            let hash = format!("#{}", URL_SAFE.encode(data));
+            crate::set_hash(&hash);
         }
         let new_name;
         let old_len = self.data.len();

src/data.rs

@@ -37,6 +37,12 @@ pub type I = kalc_lib::types::f64::Integer<i128>;
 pub type F = kalc_lib::types::f64::Float<f64>;
 #[cfg(feature = "kalc-lib")]
 pub type C = kalc_lib::types::f64::Complex<f64>;
+#[cfg(feature = "wasm")]
+#[wasm_bindgen::prelude::wasm_bindgen(module = "/url.js")]
+extern "C" {
+    fn set_hash(s: &str);
+    fn get_hash() -> String;
+}
 #[cfg_attr(target_arch = "wasm32", wasm_bindgen(start))]
 pub fn main() {
     #[cfg(feature = "wasm-console")]
@@ -53,13 +59,12 @@ pub fn main() {
     let function = args.last().unwrap_or(&s);
     #[cfg(feature = "wasm")]
     let function: &String = &{
-        let mut hash = web_sys::window().unwrap().location().hash().unwrap();
+        let hash = get_hash();
         if hash.is_empty() {
             String::new()
         } else {
             use base64::{Engine as _, engine::general_purpose::URL_SAFE};
-            hash.remove(0);
-            let comp = URL_SAFE.decode(hash).unwrap_or_default();
+            let comp = URL_SAFE.decode(&hash[1..]).unwrap_or_default();
             let bytes = lz4_flex::decompress_size_prepended(&comp).unwrap_or_default();
             String::try_from(bytes).unwrap_or_default()
         }

src/lib.rs

@@ -0,0 +1,6 @@
+export function set_hash(s) {
+    history.replaceState(null, "", s);
+}
+export function get_hash() {
+    return location.hash;
+}