From c86163535b959d4f5685652138bf38346897338a Mon Sep 17 00:00:00 2001
From: Miles Murgaw <milesmurgaw@gmail.com>
Date: Mon, 3 Jun 2024 23:50:23 -0400
Subject: [PATCH] fix: window_size

---
 examples/window_size/src/main.rs |  8 +++++---
 sdk/Cargo.toml                   |  2 +-
 sdk/src/utils/window.rs          | 26 ++++++++++++--------------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/examples/window_size/src/main.rs b/examples/window_size/src/main.rs
index 1d4a9d9..76602e8 100644
--- a/examples/window_size/src/main.rs
+++ b/examples/window_size/src/main.rs
@@ -2,15 +2,17 @@ use dioxus::prelude::*;
 use dioxus_sdk::utils::window::{get_window_size, use_window_size};
 
 fn main() {
-    launch(app);
+    launch(App);
 }
 
-fn app() -> Element {
+#[component]
+fn App() -> Element {
     let initial_size = use_signal(get_window_size);
     let window_size = use_window_size();
 
     rsx!(
-        div { style: "text-align: center;",
+        div {
+            style: "text-align: center;",
             h1 { "↕️ Window Size Utilities ↔️" }
             h3 { "Initial Size" }
             p { "Width: {initial_size().width}" }
diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml
index d5a6d26..0e2c2e6 100644
--- a/sdk/Cargo.toml
+++ b/sdk/Cargo.toml
@@ -194,7 +194,7 @@ uuid = { version = "1.3.2", features = ["js"] }
 # Used by: timing
 gloo-timers = { version = "0.3.0", optional = true, features = ["futures"] }
 
-[target.'cfg(not(target_family = "wasm32"))'.dependencies]
+[target.'cfg(not(target_family = "wasm"))'.dependencies]
 
 # Used by: storage
 directories = { version = "4.0.1", optional = true }
diff --git a/sdk/src/utils/window.rs b/sdk/src/utils/window.rs
index 3b3bc32..5193c78 100644
--- a/sdk/src/utils/window.rs
+++ b/sdk/src/utils/window.rs
@@ -1,7 +1,6 @@
 //! Utilities for the window.
 
 use dioxus::prelude::*;
-use futures_util::stream::StreamExt;
 use std::sync::Once;
 
 #[allow(dead_code)]
@@ -37,23 +36,22 @@ pub struct WindowSize {
 /// }
 /// ```
 pub fn use_window_size() -> ReadOnlySignal<WindowSize> {
-    let mut window_size = use_signal(get_window_size);
-
-    // Initialize the handler
-    let tx = use_coroutine(|mut rx: UnboundedReceiver<WindowSize>| async move {
-        while let Some(data) = rx.next().await {
-            window_size.set(data);
+    let window_size = match try_use_context::<Signal<WindowSize>>() {
+        Some(w) => w,
+        // This should only run once.
+        None => {
+            let size = provide_root_context(Signal::new(get_window_size()));
+            listen(size);
+            size
         }
-    });
-
-    listen(tx);
+    };
 
     use_hook(|| ReadOnlySignal::new(window_size))
 }
 
 // Listener for the web implementation.
 #[cfg(target_family = "wasm")]
-fn listen(tx: Coroutine<WindowSize>) {
+fn listen(mut window_size: Signal<WindowSize>) {
     use wasm_bindgen::{closure::Closure, JsCast, JsValue};
 
     INIT.call_once(|| {
@@ -74,7 +72,7 @@ fn listen(tx: Coroutine<WindowSize>) {
                 .as_f64()
                 .unwrap_or(0.0) as u32;
 
-            tx.send(WindowSize { width, height });
+            window_size.set(WindowSize { width, height });
         }) as Box<dyn FnMut()>);
 
         let on_resize_cb = on_resize.as_ref().clone();
@@ -85,7 +83,7 @@ fn listen(tx: Coroutine<WindowSize>) {
 
 // Listener for anything but the web implementation.
 #[cfg(not(target_family = "wasm"))]
-fn listen(tx: Coroutine<WindowSize>) {
+fn listen(mut window_size: Signal<WindowSize>) {
     use dioxus_desktop::{tao::event::Event, use_wry_event_handler, WindowEvent};
 
     use_wry_event_handler(move |event, _| {
@@ -94,7 +92,7 @@ fn listen(tx: Coroutine<WindowSize>) {
             ..
         } = event
         {
-            tx.send(WindowSize {
+            window_size.set(WindowSize {
                 width: size.width,
                 height: size.height,
             });