optimize and cleanup

miralandlabs · Jun 21, 2024 · 3715408 · 3715408
1 parent 1801016
commit 3715408
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 13 deletions.
diff --git a/src/components/code_block.rs b/src/components/code_block.rs
@@ -1,11 +1,13 @@
 use dioxus::prelude::*;
+#[cfg(feature = "desktop")]
 use dioxus_std::clipboard::use_clipboard;
-
 use crate::components::CopyIcon;
+#[cfg(feature = "web")]
+use crate::hooks::use_clipboard;
 
 #[component]
 pub fn CodeBlock(text: String) -> Element {
-    let mut clipboard = use_clipboard();
+    let clipboard = use_clipboard();
     let mut solid = use_signal(|| false);
     use_future(move || async move {
         if *solid.read() {
@@ -28,7 +30,16 @@ pub fn CodeBlock(text: String) -> Element {
             button {
                 class: "flex shrink-0 px-2 py-1 mb-auto rounded hover-100 active-200 transition-colors",
                 onclick: move |_e| {
+                    // clipboard.set(text.clone()).ok();
+
+                    #[cfg(feature = "web")]
+                    if let Some(cb) = clipboard.clone() {
+                        let _ = cb.write_text(&text);
+                    }
+
+                    #[cfg(feature = "desktop")]
                     clipboard.set(text.clone()).ok();
+
                     solid.set(true);
                 },
                 CopyIcon {

diff --git a/src/components/copyable.rs b/src/components/copyable.rs
@@ -1,7 +1,9 @@
 use dioxus::prelude::*;
+#[cfg(feature = "desktop")]
 use dioxus_std::clipboard::use_clipboard;
-
 use crate::components::CopyIcon;
+#[cfg(feature = "web")]
+use crate::hooks::use_clipboard;
 
 #[component]
 pub fn Copyable(
@@ -26,7 +28,15 @@ pub fn Copyable(
                 button {
                     class: "flex flex-row gap-2 shrink-0 p-2 mx-auto rounded transition-colors hover-100 active-200 font-semibold",
                     onclick: move |_e| {
+                        // clipboard.set(value.clone()).ok();
+                        #[cfg(feature = "web")]
+                        if let Some(cb) = clipboard.clone() {
+                            let _ = cb.write_text(&value);
+                        }
+
+                        #[cfg(feature = "desktop")]
                         clipboard.set(value.clone()).ok();
+
                         solid.set(true);
                     },
                     CopyIcon {
@@ -45,7 +55,15 @@ pub fn Copyable(
                 button {
                     class: "flex shrink-0 p-2 rounded transition-colors hover-100 active-200",
                     onclick: move |_e| {
+                        // clipboard.set(value.clone()).ok();
+                        #[cfg(feature = "web")]
+                        if let Some(cb) = clipboard.clone() {
+                            let _ = cb.write_text(&value);
+                        }
+
+                        #[cfg(feature = "desktop")]
                         clipboard.set(value.clone()).ok();
+
                         solid.set(true);
                     },
                     CopyIcon {

diff --git a/src/components/import_key.rs b/src/components/import_key.rs
@@ -16,6 +16,8 @@ pub enum ImportKeyStep {
     Import,
 }
 
+// MI
+#[component]
 pub fn ImportKey() -> Element {
     let mut step = use_signal(|| ImportKeyStep::Loading);
     let sol_balance = use_sol_balance();
@@ -59,6 +61,8 @@ pub fn ImportKey() -> Element {
     e
 }
 
+// MI
+#[component]
 fn ImportKeyLoading() -> Element {
     rsx! {
         div {
@@ -88,6 +92,8 @@ fn ImportKeyWarning(step: Signal<ImportKeyStep>, balance: u64) -> Element {
     }
 }
 
+// MI
+#[component]
 fn ImportKeyHeader() -> Element {
     rsx! {
         div {
@@ -109,6 +115,8 @@ fn ImportKeyHeader() -> Element {
 
 const KEY_LENGTH: usize = 64;
 
+// MI
+#[component]
 fn ImportKeyImport() -> Element {
     let mut sol_balance = use_signal::<Option<u64>>(|| None);
     let mut keypair_persistent = use_keypair_persistent();

diff --git a/src/components/mod.rs b/src/components/mod.rs
@@ -6,7 +6,7 @@ mod backup_keypair_warning;
 mod balance;
 // mod banner;
 mod claim;
-// mod code_block;
+mod code_block;
 mod copyable;
 // mod download;
 mod export_key;
@@ -37,7 +37,7 @@ pub use backup_keypair_warning::*;
 pub use balance::*;
 // pub use banner::*;
 pub use claim::*;
-// pub use code_block::*;
+pub use code_block::*;
 pub use copyable::*;
 // pub use download::*;
 pub use export_key::*;

diff --git a/src/hooks/mod.rs b/src/hooks/mod.rs
@@ -1,4 +1,6 @@
 mod use_appearance;
+#[cfg(feature = "web")]
+mod use_clipboard;
 mod use_date;
 mod use_explorer;
 mod use_gateway;
@@ -19,6 +21,8 @@ mod use_transfers;
 mod use_treasury;
 
 pub use use_appearance::*;
+#[cfg(feature = "web")]
+pub use use_clipboard::*;
 pub use use_date::*;
 pub use use_explorer::*;
 pub use use_gateway::*;

diff --git a/src/hooks/use_clipboard.rs b/src/hooks/use_clipboard.rs
@@ -0,0 +1,9 @@
+// use dioxus::prelude::*;
+use web_sys::{window, Clipboard};
+
+pub fn use_clipboard() -> Option<Clipboard> {
+    window()
+        .expect("Failed to get window")
+        .navigator()
+        .clipboard()
+}
diff --git a/src/miner/web_worker.rs b/src/miner/web_worker.rs
@@ -18,7 +18,7 @@ pub struct WebWorkerRequest {
 }
 
 /// Mining response for web workers
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Default, Clone, Serialize, Deserialize)]
 pub struct WebWorkerResponse {
     pub hash: KeccakHash,
     pub nonce: u64,
@@ -35,6 +35,7 @@ pub fn start_worker() {
 
     scope.set_onmessage(Some(&js_sys::Function::unchecked_from_js(
         Closure::<dyn Fn(MessageEvent)>::new(move |e: MessageEvent| {
+            // if let Err(_) = from_value::<WebWorkerRequest>(e.data()) { return; }; // MI
             let req: WebWorkerRequest = from_value(e.data()).unwrap();
             let res = find_next_hash(req.hash, req.difficulty, req.nonce, req.pubkey);
             scope_.post_message(&to_value(&res).unwrap()).unwrap();
@@ -56,6 +57,7 @@ pub fn create_web_worker(cx: UseChannel<WebWorkerResponse>) -> Worker {
     // On message
     worker.set_onmessage(Some(&js_sys::Function::unchecked_from_js(
         Closure::<dyn Fn(MessageEvent)>::new(move |e: MessageEvent| {
+            // if let Err(_) = from_value::<WebWorkerResponse>(e.data()) { return; }; // MI
             let res: WebWorkerResponse = from_value(e.data()).unwrap();
             async_std::task::block_on({
                 let cx = cx.clone();
@@ -67,13 +69,13 @@ pub fn create_web_worker(cx: UseChannel<WebWorkerResponse>) -> Worker {
         .into_js_value(),
     )));
 
-    // On error
-    worker.set_onerror(Some(&js_sys::Function::unchecked_from_js(
-        Closure::<dyn Fn(MessageEvent)>::new(move |e: MessageEvent| {
-            log::info!("Error from worker: {:?}", e.data());
-        })
-        .into_js_value(),
-    )));
+    // // On error
+    // worker.set_onerror(Some(&js_sys::Function::unchecked_from_js(
+    //     Closure::<dyn Fn(MessageEvent)>::new(move |e: MessageEvent| {
+    //         log::info!("Error from worker: {:?}", e.data());
+    //     })
+    //     .into_js_value(),
+    // )));
 
     worker
 }