Update ComposeRef to Leptos 0.7

RustForWeb · Jan 19, 2025 · dcfd37a · dcfd37a
1 parent 5393a88
commit dcfd37a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,6 +16,7 @@ members = [
     "packages/primitives/leptos/accessible-icon",
     "packages/primitives/leptos/arrow",
     "packages/primitives/leptos/aspect-ratio",
+    "packages/primitives/leptos/compose-refs",
     "packages/primitives/leptos/direction",
     "packages/primitives/leptos/id",
     "packages/primitives/leptos/label",

diff --git a/packages/primitives/leptos/compose-refs/src/compose_refs.rs b/packages/primitives/leptos/compose-refs/src/compose_refs.rs
@@ -1,6 +1,9 @@
-use leptos::{html::ElementDescriptor, Effect, NodeRef};
+use leptos::web_sys::Element;
+use leptos::{html::ElementType, prelude::*, tachys::html::node_ref::NodeRefContainer};
 
-fn compose_refs<T: ElementDescriptor + Clone + 'static>(refs: Vec<NodeRef<T>>) -> NodeRef<T> {
+fn compose_refs<T: ElementType<Output = Element> + Clone + 'static>(
+    refs: Vec<NodeRef<T>>,
+) -> NodeRef<T> {
     let composed_ref = NodeRef::new();
 
     Effect::new(move |_| {
@@ -14,8 +17,11 @@ fn compose_refs<T: ElementDescriptor + Clone + 'static>(refs: Vec<NodeRef<T>>) -
     composed_ref
 }
 
-pub fn use_composed_refs<T: ElementDescriptor + Clone + 'static>(
+pub fn use_composed_refs<T: ElementType<Output = Element> + Clone + 'static>(
     refs: Vec<NodeRef<T>>,
-) -> NodeRef<T> {
+) -> NodeRef<T>
+where
+    T: Clone,
+{
     compose_refs(refs)
 }