Merge branch 'master' into begone-comp-node-ref

.github/workflows/benchmark.yml

@@ -251,5 +251,3 @@ jobs:
         with:
           run: cat js-framework-benchmark/webdriver-ts/results/results.json | ./yew/tools/target/release/process-benchmark-results
 
-      - name: Show output JSON
-        run: echo ${{ steps.results.outputs.stdout }}

.github/workflows/size-cmp.yml

@@ -56,14 +56,14 @@ jobs:
           version: 'latest'
 
       - name: Build master examples
-        run: find examples/*/index.html | xargs -I '{}' trunk build --release '{}' || exit 0
-        working-directory: yew-master
+        run: find ./*/index.html | xargs -I '{}' trunk build --release '{}' || exit 0
+        working-directory: yew-master/examples
         env:
           RUSTUP_TOOLCHAIN: nightly
 
       - name: Build pull request examples
-        run: find examples/*/index.html | xargs -I '{}' trunk build --release '{}' || exit 0
-        working-directory: current-pr
+        run: find ./*/index.html | xargs -I '{}' trunk build --release '{}' || exit 0
+        working-directory: current-pr/examples
         env:
           RUSTUP_TOOLCHAIN: nightly
 

api-docs/before-content.html

@@ -1,4 +1,4 @@
 <div id="unreleased-version-header">
-    <p>This is unreleased documentation for Yew Next version.</p>
-    <p>For up-to-date documentation, see <a href="https://docs.rs/yew">the latest version on docs.rs</a>.</p>
+    <div>This is unreleased documentation for Yew Next version.</div>
+    <div>For up-to-date documentation, see <a href="https://docs.rs/yew">the latest version on docs.rs</a>.</div>
 </div>

api-docs/styles.css

@@ -1,13 +1,23 @@
 #unreleased-version-header {
-    background-color: rgb(77, 56, 0);
+    background-color: rgb(200, 237, 248);
     z-index: 400;
-    position: fixed;
+    position: absolute;
     left: 0;
     top: 0;
     right: 0;
     height: 70px;
     padding-top: 10px;
+    padding-bottom: 10px;
     text-align: center;
+    font-family: sans-serif;
+    box-shadow: 0 0 5px 0 rgb(100, 100, 100);
+}
+
+@media (prefers-color-scheme: dark) {
+    #unreleased-version-header {
+        background-color: rgb(32, 43, 57);
+        box-shadow: 0 0 5px 0 black;
+    }
 }
 
 body {

examples/.cargo/config.toml

@@ -1,3 +1,4 @@
+[unstable]
 build-std = ["std", "panic_abort"]
 build-std-features = ["panic_immediate_abort"]
 share-generics = true

packages/yew-macro/src/use_prepared_state.rs

@@ -61,14 +61,19 @@ impl PreparedState {
     // Async closure is not stable, so we rewrite it to closure + async block
     #[cfg(not(feature = "nightly"))]
     pub fn rewrite_to_closure_with_async_block(&self) -> ExprClosure {
+        use proc_macro2::Span;
         use syn::parse_quote;
 
         let async_token = match &self.closure.asyncness {
             Some(m) => m,
             None => return self.closure.clone(),
         };
 
-        let move_token = &self.closure.capture;
+        // The async block always need to be move so input can be moved into it.
+        let move_token = self
+            .closure
+            .capture
+            .unwrap_or_else(|| Token![move](Span::call_site()));
         let body = &self.closure.body;
 
         let inner = parse_quote! {

packages/yew/src/app_handle.rs

@@ -9,7 +9,7 @@ use crate::dom_bundle::BSubtree;
 use crate::html::{BaseComponent, NodeRef, Scope, Scoped};
 
 /// An instance of an application.
-#[cfg_attr(documenting, doc(cfg(feature = "csr")))]
+#[cfg(feature = "csr")]
 #[derive(Debug)]
 pub struct AppHandle<COMP: BaseComponent> {
     /// `Scope` holder
@@ -65,7 +65,6 @@ fn clear_element(host: &Element) {
     }
 }
 
-#[cfg_attr(documenting, doc(cfg(feature = "hydration")))]
 #[cfg(feature = "hydration")]
 mod feat_hydration {
     use super::*;

packages/yew/src/dom_bundle/subtree_root.rs

@@ -232,7 +232,7 @@ static BUBBLE_EVENTS: AtomicBool = AtomicBool::new(true);
 /// handler has no effect.
 ///
 /// This function should be called before any component is mounted.
-#[cfg_attr(documenting, doc(cfg(feature = "csr")))]
+#[cfg(feature = "csr")]
 pub fn set_event_bubbling(bubble: bool) {
     BUBBLE_EVENTS.store(bubble, Ordering::Relaxed);
 }

packages/yew/src/functional/hooks/mod.rs

@@ -3,29 +3,21 @@ mod use_context;
 mod use_effect;
 mod use_force_update;
 mod use_memo;
-#[cfg_attr(documenting, doc(cfg(any(target_arch = "wasm32", feature = "tokio"))))]
-#[cfg(any(target_arch = "wasm32", feature = "tokio"))]
 mod use_prepared_state;
 mod use_reducer;
 mod use_ref;
 mod use_state;
-#[cfg_attr(documenting, doc(cfg(any(target_arch = "wasm32", feature = "tokio"))))]
-#[cfg(any(target_arch = "wasm32", feature = "tokio"))]
 mod use_transitive_state;
 
 pub use use_callback::*;
 pub use use_context::*;
 pub use use_effect::*;
 pub use use_force_update::*;
 pub use use_memo::*;
-#[cfg_attr(documenting, doc(cfg(any(target_arch = "wasm32", feature = "tokio"))))]
-#[cfg(any(target_arch = "wasm32", feature = "tokio"))]
 pub use use_prepared_state::*;
 pub use use_reducer::*;
 pub use use_ref::*;
 pub use use_state::*;
-#[cfg_attr(documenting, doc(cfg(any(target_arch = "wasm32", feature = "tokio"))))]
-#[cfg(any(target_arch = "wasm32", feature = "tokio"))]
 pub use use_transitive_state::*;
 
 use crate::functional::HookContext;

packages/yew/src/functional/hooks/use_prepared_state/feat_hydration_ssr.rs

@@ -19,13 +19,13 @@ pub fn use_prepared_state<T, D, F>(
 where
     D: Serialize + DeserializeOwned + PartialEq + 'static,
     T: Serialize + DeserializeOwned + 'static,
-    F: FnOnce(&D) -> T,
+    F: FnOnce(Rc<D>) -> T,
 {
     struct HookProvider<T, D, F>
     where
         D: Serialize + DeserializeOwned + PartialEq + 'static,
         T: Serialize + DeserializeOwned + 'static,
-        F: FnOnce(&D) -> T,
+        F: FnOnce(Rc<D>) -> T,
     {
         deps: D,
         f: F,
@@ -35,7 +35,7 @@ where
     where
         D: Serialize + DeserializeOwned + PartialEq + 'static,
         T: Serialize + DeserializeOwned + 'static,
-        F: FnOnce(&D) -> T,
+        F: FnOnce(Rc<D>) -> T,
     {
         type Output = SuspensionResult<Option<Rc<T>>>;
 
@@ -58,14 +58,14 @@ pub fn use_prepared_state_with_suspension<T, D, F, U>(
 where
     D: Serialize + DeserializeOwned + PartialEq + 'static,
     T: Serialize + DeserializeOwned + 'static,
-    F: FnOnce(&D) -> U,
+    F: FnOnce(Rc<D>) -> U,
     U: 'static + Future<Output = T>,
 {
     struct HookProvider<T, D, F, U>
     where
         D: Serialize + DeserializeOwned + PartialEq + 'static,
         T: Serialize + DeserializeOwned + 'static,
-        F: FnOnce(&D) -> U,
+        F: FnOnce(Rc<D>) -> U,
         U: 'static + Future<Output = T>,
     {
         deps: D,
@@ -76,7 +76,7 @@ where
     where
         D: Serialize + DeserializeOwned + PartialEq + 'static,
         T: Serialize + DeserializeOwned + 'static,
-        F: FnOnce(&D) -> U,
+        F: FnOnce(Rc<D>) -> U,
         U: 'static + Future<Output = T>,
     {
         type Output = SuspensionResult<Option<Rc<T>>>;

packages/yew/src/functional/hooks/use_prepared_state/feat_ssr.rs

@@ -20,13 +20,13 @@ pub fn use_prepared_state<T, D, F>(
 where
     D: Serialize + DeserializeOwned + PartialEq + 'static,
     T: Serialize + DeserializeOwned + 'static,
-    F: FnOnce(&D) -> T,
+    F: FnOnce(Rc<D>) -> T,
 {
     struct HookProvider<T, D, F>
     where
         D: Serialize + DeserializeOwned + PartialEq + 'static,
         T: Serialize + DeserializeOwned + 'static,
-        F: FnOnce(&D) -> T,
+        F: FnOnce(Rc<D>) -> T,
     {
         deps: D,
         f: F,
@@ -36,7 +36,7 @@ where
     where
         D: Serialize + DeserializeOwned + PartialEq + 'static,
         T: Serialize + DeserializeOwned + 'static,
-        F: FnOnce(&D) -> T,
+        F: FnOnce(Rc<D>) -> T,
     {
         type Output = SuspensionResult<Option<Rc<T>>>;
 
@@ -46,7 +46,7 @@ where
 
             let state = {
                 let deps = deps.clone();
-                use_memo(move |_| f(&deps), ()).run(ctx)
+                use_memo(move |_| f(deps), ()).run(ctx)
             };
 
             let state = PreparedStateBase {
@@ -75,14 +75,14 @@ pub fn use_prepared_state_with_suspension<T, D, F, U>(
 where
     D: Serialize + DeserializeOwned + PartialEq + 'static,
     T: Serialize + DeserializeOwned + 'static,
-    F: FnOnce(&D) -> U,
+    F: FnOnce(Rc<D>) -> U,
     U: 'static + Future<Output = T>,
 {
     struct HookProvider<T, D, F, U>
     where
         D: Serialize + DeserializeOwned + PartialEq + 'static,
         T: Serialize + DeserializeOwned + 'static,
-        F: FnOnce(&D) -> U,
+        F: FnOnce(Rc<D>) -> U,
         U: 'static + Future<Output = T>,
     {
         deps: D,
@@ -93,7 +93,7 @@ where
     where
         D: Serialize + DeserializeOwned + PartialEq + 'static,
         T: Serialize + DeserializeOwned + 'static,
-        F: FnOnce(&D) -> U,
+        F: FnOnce(Rc<D>) -> U,
         U: 'static + Future<Output = T>,
     {
         type Output = SuspensionResult<Option<Rc<T>>>;
@@ -112,7 +112,7 @@ where
                 let deps = deps.clone();
                 let result = result.clone();
                 use_state(move || {
-                    let state_f = f(&deps);
+                    let state_f = f(deps.clone());
 
                     spawn_local(async move {
                         let state = state_f.await;

packages/yew/src/functional/hooks/use_prepared_state/mod.rs

@@ -43,7 +43,7 @@ pub use feat_ssr::*;
 /// where
 ///     D: Serialize + DeserializeOwned + PartialEq + 'static,
 ///     T: Serialize + DeserializeOwned + 'static,
-///     F: FnOnce(&D) -> T,
+///     F: FnOnce(Rc<D>) -> T,
 /// # { todo!() }
 /// ```
 ///
@@ -69,7 +69,7 @@ pub use feat_ssr::*;
 ///     where
 ///         D: Serialize + DeserializeOwned + PartialEq + 'static,
 ///         T: Serialize + DeserializeOwned + 'static,
-///         F: FnOnce(&D) -> U,
+///         F: FnOnce(Rc<D>) -> U,
 ///         U: 'static + Future<Output = T>,
 /// # { todo!() }
 /// ```
@@ -89,7 +89,6 @@ pub use feat_ssr::*;
 /// Whilst async closure is an unstable feature, the procedural macro will rewrite this to a
 /// closure that returns an async block automatically. You can use this hook with async closure
 /// in stable Rust.
-#[cfg_attr(documenting, doc(cfg(any(target_arch = "wasm32", feature = "tokio"))))]
 pub use use_prepared_state_macro as use_prepared_state;
 // With SSR.
 #[doc(hidden)]

packages/yew/src/functional/hooks/use_transitive_state/feat_hydration_ssr.rs

@@ -18,13 +18,13 @@ pub fn use_transitive_state<T, D, F>(
 where
     D: Serialize + DeserializeOwned + PartialEq + 'static,
     T: Serialize + DeserializeOwned + 'static,
-    F: 'static + FnOnce(&D) -> T,
+    F: 'static + FnOnce(Rc<D>) -> T,
 {
     struct HookProvider<T, D, F>
     where
         D: Serialize + DeserializeOwned + PartialEq + 'static,
         T: Serialize + DeserializeOwned + 'static,
-        F: 'static + FnOnce(&D) -> T,
+        F: 'static + FnOnce(Rc<D>) -> T,
     {
         deps: D,
         f: F,
@@ -34,7 +34,7 @@ where
     where
         D: Serialize + DeserializeOwned + PartialEq + 'static,
         T: Serialize + DeserializeOwned + 'static,
-        F: 'static + FnOnce(&D) -> T,
+        F: 'static + FnOnce(Rc<D>) -> T,
     {
         type Output = SuspensionResult<Option<Rc<T>>>;
 

packages/yew/src/functional/hooks/use_transitive_state/feat_ssr.rs

@@ -14,24 +14,24 @@ pub(super) struct TransitiveStateBase<T, D, F>
 where
     D: Serialize + DeserializeOwned + PartialEq + 'static,
     T: Serialize + DeserializeOwned + 'static,
-    F: 'static + FnOnce(&D) -> T,
+    F: 'static + FnOnce(Rc<D>) -> T,
 {
     pub state_fn: RefCell<Option<F>>,
-    pub deps: D,
+    pub deps: Rc<D>,
 }
 
 impl<T, D, F> PreparedState for TransitiveStateBase<T, D, F>
 where
     D: Serialize + DeserializeOwned + PartialEq + 'static,
     T: Serialize + DeserializeOwned + 'static,
-    F: 'static + FnOnce(&D) -> T,
+    F: 'static + FnOnce(Rc<D>) -> T,
 {
     fn prepare(&self) -> String {
         let f = self.state_fn.borrow_mut().take().unwrap();
-        let state = f(&self.deps);
+        let state = f(self.deps.clone());
 
-        let state =
-            bincode::serialize(&(Some(&state), Some(&self.deps))).expect("failed to prepare state");
+        let state = bincode::serialize(&(Some(&state), Some(&*self.deps)))
+            .expect("failed to prepare state");
 
         Base64::encode_string(&state)
     }
@@ -45,13 +45,13 @@ pub fn use_transitive_state<T, D, F>(
 where
     D: Serialize + DeserializeOwned + PartialEq + 'static,
     T: Serialize + DeserializeOwned + 'static,
-    F: 'static + FnOnce(&D) -> T,
+    F: 'static + FnOnce(Rc<D>) -> T,
 {
     struct HookProvider<T, D, F>
     where
         D: Serialize + DeserializeOwned + PartialEq + 'static,
         T: Serialize + DeserializeOwned + 'static,
-        F: 'static + FnOnce(&D) -> T,
+        F: 'static + FnOnce(Rc<D>) -> T,
     {
         deps: D,
         f: F,
@@ -61,7 +61,7 @@ where
     where
         D: Serialize + DeserializeOwned + PartialEq + 'static,
         T: Serialize + DeserializeOwned + 'static,
-        F: 'static + FnOnce(&D) -> T,
+        F: 'static + FnOnce(Rc<D>) -> T,
     {
         type Output = SuspensionResult<Option<Rc<T>>>;
 
@@ -71,7 +71,7 @@ where
             ctx.next_prepared_state(move |_re_render, _| -> TransitiveStateBase<T, D, F> {
                 TransitiveStateBase {
                     state_fn: Some(f).into(),
-                    deps: self.deps,
+                    deps: self.deps.into(),
                 }
             });
 

packages/yew/src/functional/hooks/use_transitive_state/mod.rs

@@ -43,7 +43,7 @@ pub use feat_ssr::*;
 /// where
 ///     D: Serialize + DeserializeOwned + PartialEq + 'static,
 ///     T: Serialize + DeserializeOwned + 'static,
-///     F: 'static + FnOnce(&D) -> T,
+///     F: 'static + FnOnce(Rc<D>) -> T,
 /// # { todo!() }
 /// ```
 ///
@@ -55,7 +55,6 @@ pub use feat_ssr::*;
 /// You MUST denote the return type of the closure with `|deps| -> ReturnType { ... }`. This
 /// type is used during client side rendering to deserialize the state prepared on the server
 /// side.
-#[cfg_attr(documenting, doc(cfg(any(target_arch = "wasm32", feature = "tokio"))))]
 pub use use_transitive_state_macro as use_transitive_state;
 // With SSR.
 #[doc(hidden)]