Merge branch 'main' into action-form-error

leptos-rs · Dec 24, 2023 · 109d13d · 109d13d
2 parents be3504e + 9f4c480
commit 109d13d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/leptos/src/transition.rs b/leptos/src/transition.rs
@@ -130,7 +130,8 @@ pub fn Transition(
                 }
                 if is_first_run(first_run, &suspense_context) {
                     let has_local_only = suspense_context.has_local_only()
-                        || cfg!(feature = "csr");
+                        || cfg!(feature = "csr")
+                        || !HydrationCtx::is_hydrating();
                     if (!has_local_only || child_runs.get() > 0)
                         && !cfg!(feature = "csr")
                     {

diff --git a/leptos_macro/src/lib.rs b/leptos_macro/src/lib.rs
@@ -76,7 +76,8 @@ mod slot;
 /// # runtime.dispose();
 /// ```
 ///
-/// 3. Components (functions annotated with `#[component]`) can be inserted as camel-cased tags
+/// 3. Components (functions annotated with `#[component]`) can be inserted as camel-cased tags. (Generics
+///    on components are specified as `<Component<T>/>`, not the turbofish `<Component::<T>/>`.)
 /// ```rust
 /// # use leptos::*;
 /// # let runtime = create_runtime();