Users always have to manually construct dependency into Rc.

yewstack · Jul 19, 2022 · 9eee1da · 9eee1da
1 parent f2d2332
commit 9eee1da
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 25 deletions.
diff --git a/packages/yew/src/functional/hooks/use_prepared_state/feat_hydration.rs b/packages/yew/src/functional/hooks/use_prepared_state/feat_hydration.rs
@@ -40,7 +40,7 @@ async fn decode_base64(_s: &str) -> Result<Vec<u8>, JsValue> {
 }
 
 #[doc(hidden)]
-pub fn use_prepared_state<T, D>(deps: D) -> impl Hook<Output = SuspensionResult<Option<Rc<T>>>>
+pub fn use_prepared_state<T, D>(deps: Rc<D>) -> impl Hook<Output = SuspensionResult<Option<Rc<T>>>>
 where
     D: Serialize + DeserializeOwned + PartialEq + 'static,
     T: Serialize + DeserializeOwned + 'static,
@@ -51,7 +51,7 @@ where
         T: Serialize + DeserializeOwned + 'static,
     {
         _marker: PhantomData<T>,
-        deps: D,
+        deps: Rc<D>,
     }
 
     impl<T, D> Hook for HookProvider<T, D>

diff --git a/packages/yew/src/functional/hooks/use_prepared_state/feat_hydration_ssr.rs b/packages/yew/src/functional/hooks/use_prepared_state/feat_hydration_ssr.rs
@@ -14,7 +14,7 @@ use crate::suspense::SuspensionResult;
 #[doc(hidden)]
 pub fn use_prepared_state<T, D, F>(
     f: F,
-    deps: D,
+    deps: Rc<D>,
 ) -> impl Hook<Output = SuspensionResult<Option<Rc<T>>>>
 where
     D: Serialize + DeserializeOwned + PartialEq + 'static,
@@ -27,7 +27,7 @@ where
         T: Serialize + DeserializeOwned + 'static,
         F: FnOnce(Rc<D>) -> T,
     {
-        deps: D,
+        deps: Rc<D>,
         f: F,
     }
 
@@ -53,7 +53,7 @@ where
 #[doc(hidden)]
 pub fn use_prepared_state_with_suspension<T, D, F, U>(
     f: F,
-    deps: D,
+    deps: Rc<D>,
 ) -> impl Hook<Output = SuspensionResult<Option<Rc<T>>>>
 where
     D: Serialize + DeserializeOwned + PartialEq + 'static,
@@ -68,7 +68,7 @@ where
         F: FnOnce(Rc<D>) -> U,
         U: 'static + Future<Output = T>,
     {
-        deps: D,
+        deps: Rc<D>,
         f: F,
     }
 

diff --git a/packages/yew/src/functional/hooks/use_prepared_state/feat_none.rs b/packages/yew/src/functional/hooks/use_prepared_state/feat_none.rs
@@ -10,7 +10,7 @@ use crate::suspense::SuspensionResult;
 
 #[doc(hidden)]
 #[hook]
-pub fn use_prepared_state<T, D>(_deps: D) -> SuspensionResult<Option<Rc<T>>>
+pub fn use_prepared_state<T, D>(_deps: Rc<D>) -> SuspensionResult<Option<Rc<T>>>
 where
     D: Serialize + DeserializeOwned + PartialEq + 'static,
     T: Serialize + DeserializeOwned + 'static,
@@ -20,7 +20,7 @@ where
 
 #[doc(hidden)]
 #[hook]
-pub fn use_prepared_state_with_suspension<T, D>(_deps: D) -> SuspensionResult<Option<Rc<T>>>
+pub fn use_prepared_state_with_suspension<T, D>(_deps: Rc<D>) -> SuspensionResult<Option<Rc<T>>>
 where
     D: Serialize + DeserializeOwned + PartialEq + 'static,
     T: Serialize + DeserializeOwned + 'static,

diff --git a/packages/yew/src/functional/hooks/use_prepared_state/feat_ssr.rs b/packages/yew/src/functional/hooks/use_prepared_state/feat_ssr.rs
@@ -15,7 +15,7 @@ use crate::suspense::{Suspension, SuspensionResult};
 #[doc(hidden)]
 pub fn use_prepared_state<T, D, F>(
     f: F,
-    deps: D,
+    deps: Rc<D>,
 ) -> impl Hook<Output = SuspensionResult<Option<Rc<T>>>>
 where
     D: Serialize + DeserializeOwned + PartialEq + 'static,
@@ -28,7 +28,7 @@ where
         T: Serialize + DeserializeOwned + 'static,
         F: FnOnce(Rc<D>) -> T,
     {
-        deps: D,
+        deps: Rc<D>,
         f: F,
     }
 
@@ -41,8 +41,7 @@ where
         type Output = SuspensionResult<Option<Rc<T>>>;
 
         fn run(self, ctx: &mut HookContext) -> Self::Output {
-            let f = self.f;
-            let deps = Rc::new(self.deps);
+            let Self { f, deps } = self;
 
             let state = {
                 let deps = deps.clone();
@@ -70,7 +69,7 @@ where
 #[doc(hidden)]
 pub fn use_prepared_state_with_suspension<T, D, F, U>(
     f: F,
-    deps: D,
+    deps: Rc<D>,
 ) -> impl Hook<Output = SuspensionResult<Option<Rc<T>>>>
 where
     D: Serialize + DeserializeOwned + PartialEq + 'static,
@@ -85,7 +84,7 @@ where
         F: FnOnce(Rc<D>) -> U,
         U: 'static + Future<Output = T>,
     {
-        deps: D,
+        deps: Rc<D>,
         f: F,
     }
 
@@ -99,8 +98,7 @@ where
         type Output = SuspensionResult<Option<Rc<T>>>;
 
         fn run(self, ctx: &mut HookContext) -> Self::Output {
-            let f = self.f;
-            let deps = Rc::new(self.deps);
+            let Self { f, deps } = self;
 
             let result = use_state(|| {
                 let (s, handle) = Suspension::new();

diff --git a/packages/yew/src/functional/hooks/use_transitive_state/feat_hydration_ssr.rs b/packages/yew/src/functional/hooks/use_transitive_state/feat_hydration_ssr.rs
@@ -13,7 +13,7 @@ use crate::suspense::SuspensionResult;
 #[doc(hidden)]
 pub fn use_transitive_state<T, D, F>(
     f: F,
-    deps: D,
+    deps: Rc<D>,
 ) -> impl Hook<Output = SuspensionResult<Option<Rc<T>>>>
 where
     D: Serialize + DeserializeOwned + PartialEq + 'static,
@@ -26,7 +26,7 @@ where
         T: Serialize + DeserializeOwned + 'static,
         F: 'static + FnOnce(Rc<D>) -> T,
     {
-        deps: D,
+        deps: Rc<D>,
         f: F,
     }
 

diff --git a/packages/yew/src/functional/hooks/use_transitive_state/feat_ssr.rs b/packages/yew/src/functional/hooks/use_transitive_state/feat_ssr.rs
@@ -40,7 +40,7 @@ where
 #[doc(hidden)]
 pub fn use_transitive_state<T, D, F>(
     f: F,
-    deps: D,
+    deps: Rc<D>,
 ) -> impl Hook<Output = SuspensionResult<Option<Rc<T>>>>
 where
     D: Serialize + DeserializeOwned + PartialEq + 'static,
@@ -53,7 +53,7 @@ where
         T: Serialize + DeserializeOwned + 'static,
         F: 'static + FnOnce(Rc<D>) -> T,
     {
-        deps: D,
+        deps: Rc<D>,
         f: F,
     }
 
@@ -66,12 +66,12 @@ where
         type Output = SuspensionResult<Option<Rc<T>>>;
 
         fn run(self, ctx: &mut HookContext) -> Self::Output {
-            let f = self.f;
+            let Self { f, deps } = self;
 
             ctx.next_prepared_state(move |_re_render, _| -> TransitiveStateBase<T, D, F> {
                 TransitiveStateBase {
                     state_fn: Some(f).into(),
-                    deps: self.deps.into(),
+                    deps,
                 }
             });
 

diff --git a/packages/yew/tests/use_prepared_state.rs b/packages/yew/tests/use_prepared_state.rs
@@ -18,7 +18,7 @@ wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
 async fn use_prepared_state_works() {
     #[function_component]
     fn Comp() -> HtmlResult {
-        let ctr = use_prepared_state!(|_| -> u32 { 12345 }, ())?.unwrap_or_default();
+        let ctr = use_prepared_state!(|_| -> u32 { 12345 }, Rc::new(()))?.unwrap_or_default();
 
         Ok(html! {
             <div>
@@ -68,7 +68,8 @@ async fn use_prepared_state_works() {
 async fn use_prepared_state_with_suspension_works() {
     #[function_component]
     fn Comp() -> HtmlResult {
-        let ctr = use_prepared_state!(async move |_| -> u32 { 12345 }, ())?.unwrap_or_default();
+        let ctr =
+            use_prepared_state!(async move |_| -> u32 { 12345 }, Rc::new(()))?.unwrap_or_default();
 
         Ok(html! {
             <div>

diff --git a/packages/yew/tests/use_transitive_state.rs b/packages/yew/tests/use_transitive_state.rs
@@ -17,7 +17,7 @@ wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
 async fn use_transitive_state_works() {
     #[function_component]
     fn Comp() -> HtmlResult {
-        let ctr = use_transitive_state!(|_| -> u32 { 12345 }, ())?.unwrap_or_default();
+        let ctr = use_transitive_state!(|_| -> u32 { 12345 }, Rc::new(()))?.unwrap_or_default();
 
         Ok(html! {
             <div>