Merge pull request #285 from DrFlowerkick/fix_media_stream_hooks

Fix media stream hooks

Author: maccesch

examples/signal_debounced/src/main.rs

@@ -1,7 +1,6 @@
 use leptos::prelude::*;
 use leptos_use::docs::{demo_or_body, Note};
 use leptos_use::signal_debounced;
-use std::cell::RefCell;
 
 #[component]
 fn Demo() -> impl IntoView {

examples/use_active_element/src/main.rs

@@ -23,7 +23,7 @@ fn Demo() -> impl IntoView {
         <Note class="mb-3">"Select the inputs below to see the changes"</Note>
 
         <div class="grid grid-cols-1 md:grid-cols-3 gap-2">
-            <For each=move || (1..7) key=|i| *i let:i>
+            <For each=move || 1..7 key=|i| *i let:i>
                 <input type="text" data-id=i class="!my-0 !min-w-0" placeholder=i/>
             </For>
 

examples/use_intersection_observer/src/main.rs

@@ -1,9 +1,9 @@
 use leptos::html::Div;
 use leptos::prelude::*;
-use leptos_use::docs::{BooleanDisplay, demo_or_body};
+use leptos_use::docs::{demo_or_body, BooleanDisplay};
 use leptos_use::{
-    UseIntersectionObserverOptions, UseIntersectionObserverReturn,
-    use_intersection_observer_with_options,
+    use_intersection_observer_with_options, UseIntersectionObserverOptions,
+    UseIntersectionObserverReturn,
 };
 
 #[component]

examples/use_storage/src/main.rs

@@ -27,8 +27,7 @@ impl Default for BananaState {
 fn Demo() -> impl IntoView {
     let (storage_key, set_storage_key) = signal("banana-state".to_string());
 
-    let (state, set_state, reset) =
-        use_local_storage::<BananaState, JsonSerdeCodec>(storage_key);
+    let (state, set_state, reset) = use_local_storage::<BananaState, JsonSerdeCodec>(storage_key);
     let (state2, _, _) = use_local_storage::<BananaState, JsonSerdeCodec>(storage_key);
 
     view! {
@@ -40,7 +39,7 @@ fn Demo() -> impl IntoView {
             on:input=move |e| set_storage_key.update(|s| *s = event_target_value(&e))
             type="text"
         />
-        
+
         <input
             class="block"
             prop:value=move || state.get().name

src/use_display_media.rs

@@ -1,9 +1,12 @@
-use crate::core::MaybeRwSignal;
-use crate::sendwrap_fn;
+use crate::{
+    core::{MaybeRwSignal, OptionLocalSignal},
+    sendwrap_fn,
+};
 use cfg_if::cfg_if;
 use default_struct_builder::DefaultBuilder;
 use leptos::prelude::*;
 use leptos::reactive::wrappers::read::Signal;
+use send_wrapper::SendWrapper;
 use wasm_bindgen::{JsCast, JsValue};
 
 /// Reactive [`mediaDevices.getDisplayMedia`](https://developer.mozilla.org/en-US/docs/Web/API/MediaDevices/getDisplayMedia) streaming.
@@ -65,7 +68,7 @@ pub fn use_display_media_with_options(
 
     let (enabled, set_enabled) = enabled.into_signal();
 
-    let (stream, set_stream) = signal_local(None::<Result<web_sys::MediaStream, JsValue>>);
+    let (stream, set_stream) = signal(None::<SendWrapper<Result<web_sys::MediaStream, JsValue>>>);
 
     let _start = move || async move {
         cfg_if! { if #[cfg(not(feature = "ssr"))] {
@@ -75,14 +78,16 @@ pub fn use_display_media_with_options(
 
             let stream = create_media(audio).await;
 
-            set_stream.update(|s| *s = Some(stream));
+            set_stream.update(|s| *s = Some(SendWrapper::new(stream)));
         } else {
             let _ = audio;
         }}
     };
 
     let _stop = move || {
-        if let Some(Ok(stream)) = stream.get_untracked() {
+        if let Some(sendwrapped_stream) = stream.get_untracked()
+            && let Ok(stream) = sendwrapped_stream.as_ref()
+        {
             for track in stream.get_tracks() {
                 track.unchecked_ref::<web_sys::MediaStreamTrack>().stop();
             }
@@ -96,7 +101,7 @@ pub fn use_display_media_with_options(
             leptos::task::spawn_local(async move {
                 _start().await;
                 stream.with_untracked(move |stream| {
-                    if let Some(Ok(_)) = stream {
+                    if let Some(sendwrapped_stream) = stream && sendwrapped_stream.as_ref().is_ok() {
                         set_enabled.set(true);
                     }
                 });
@@ -186,7 +191,7 @@ where
     /// Initially this is `None` until `start` resolved successfully.
     /// In case the stream couldn't be started, for example because the user didn't grant permission,
     /// this has the value `Some(Err(...))`.
-    pub stream: Signal<Option<Result<web_sys::MediaStream, JsValue>>, LocalStorage>,
+    pub stream: OptionLocalSignal<Result<web_sys::MediaStream, JsValue>>,
 
     /// Starts the screen streaming. Triggers the ask for permission if not already granted.
     pub start: StartFn,

src/use_user_media.rs

@@ -1,7 +1,8 @@
-use crate::core::MaybeRwSignal;
+use crate::core::{MaybeRwSignal, OptionLocalSignal};
 use default_struct_builder::DefaultBuilder;
 use js_sys::{Object, Reflect};
 use leptos::prelude::*;
+use send_wrapper::SendWrapper;
 use wasm_bindgen::{JsCast, JsValue};
 
 /// Reactive [`mediaDevices.getUserMedia`](https://developer.mozilla.org/en-US/docs/Web/API/MediaDevices/getUserMedia) streaming.
@@ -63,7 +64,7 @@ pub fn use_user_media_with_options(
 
     let (enabled, set_enabled) = enabled.into_signal();
 
-    let (stream, set_stream) = signal_local(None::<Result<web_sys::MediaStream, JsValue>>);
+    let (stream, set_stream) = signal(None::<SendWrapper<Result<web_sys::MediaStream, JsValue>>>);
 
     let _start = {
         let audio = audio.clone();
@@ -78,7 +79,7 @@ pub fn use_user_media_with_options(
 
                 let stream = create_media(Some(video), Some(audio)).await;
 
-                set_stream.update(|s| *s = Some(stream));
+                set_stream.update(|s| *s = Some(SendWrapper::new(stream)));
             }
 
             #[cfg(feature = "ssr")]
@@ -90,7 +91,9 @@ pub fn use_user_media_with_options(
     };
 
     let _stop = move || {
-        if let Some(Ok(stream)) = stream.get_untracked() {
+        if let Some(sendwrapped_stream) = stream.get_untracked()
+            && let Ok(stream) = sendwrapped_stream.as_ref()
+        {
             for track in stream.get_tracks() {
                 track.unchecked_ref::<web_sys::MediaStreamTrack>().stop();
             }
@@ -111,7 +114,9 @@ pub fn use_user_media_with_options(
                     async move {
                         _start().await;
                         stream.with_untracked(move |stream| {
-                            if let Some(Ok(_)) = stream {
+                            if let Some(sendwrapped_stream) = stream
+                                && sendwrapped_stream.as_ref().is_ok()
+                            {
                                 set_enabled.set(true);
                             }
                         });
@@ -311,7 +316,7 @@ where
     /// Initially this is `None` until `start` resolved successfully.
     /// In case the stream couldn't be started, for example because the user didn't grant permission,
     /// this has the value `Some(Err(...))`.
-    pub stream: Signal<Option<Result<web_sys::MediaStream, JsValue>>, LocalStorage>,
+    pub stream: OptionLocalSignal<Result<web_sys::MediaStream, JsValue>>,
 
     /// Starts the screen streaming. Triggers the ask for permission if not already granted.
     pub start: StartFn,