chore(popper): upgrade to Leptos v0.7+ (#532)

Author: DanielleHuisman

Cargo.lock

@@ -21,6 +21,7 @@ members = [
     "packages/primitives/leptos/focus-guards",
     "packages/primitives/leptos/id",
     "packages/primitives/leptos/label",
+    "packages/primitives/leptos/popper",
     "packages/primitives/leptos/portal",
     "packages/primitives/leptos/primitive",
     "packages/primitives/leptos/separator",
@@ -68,7 +69,7 @@ radix-leptos-focus-guards = { path = "./packages/primitives/leptos/focus-guards"
 radix-leptos-icons = { path = "./packages/icons/leptos", version = "0.0.2" }
 radix-leptos-id = { path = "./packages/primitives/leptos/id", version = "0.0.2" }
 radix-leptos-label = { path = "./packages/primitives/leptos/label", version = "0.0.2" }
-# radix-leptos-popper = { path = "./packages/primitives/leptos/popper", version = "0.0.2" }
+radix-leptos-popper = { path = "./packages/primitives/leptos/popper", version = "0.0.2" }
 radix-leptos-portal = { path = "./packages/primitives/leptos/portal", version = "0.0.2" }
 # radix-leptos-presence = { path = "./packages/primitives/leptos/presence", version = "0.0.2" }
 radix-leptos-primitive = { path = "./packages/primitives/leptos/primitive", version = "0.0.2" }

Cargo.toml

@@ -10,3 +10,4 @@ version.workspace = true
 
 [dependencies]
 leptos.workspace = true
+leptos-node-ref.workspace = true

packages/primitives/leptos/compose-refs/Cargo.toml

@@ -1,24 +1,21 @@
-use leptos::web_sys::Element;
-use leptos::{html::ElementType, prelude::*, tachys::html::node_ref::NodeRefContainer};
+use leptos::{html::Div, prelude::*, tachys::html::node_ref::NodeRefContainer};
+use leptos_node_ref::AnyNodeRef;
 
-fn compose_refs<T: ElementType<Output = Element> + Clone + 'static>(
-    refs: Vec<NodeRef<T>>,
-) -> NodeRef<T> {
-    let composed_ref = NodeRef::new();
+fn compose_refs(refs: Vec<AnyNodeRef>) -> AnyNodeRef {
+    let composed_ref = AnyNodeRef::new();
 
     Effect::new(move |_| {
         if let Some(node) = composed_ref.get() {
             for r#ref in &refs {
-                r#ref.load(&node);
+                NodeRefContainer::<Div>::load(*r#ref, &node);
+                // r#ref.load_any(&node);
             }
         }
     });
 
     composed_ref
 }
 
-pub fn use_composed_refs<T: ElementType<Output = Element> + Clone + 'static>(
-    refs: Vec<NodeRef<T>>,
-) -> NodeRef<T> {
+pub fn use_composed_refs(refs: Vec<AnyNodeRef>) -> AnyNodeRef {
     compose_refs(refs)
 }

packages/primitives/leptos/compose-refs/src/compose_refs.rs

@@ -9,11 +9,15 @@ repository.workspace = true
 version.workspace = true
 
 [dependencies]
-floating-ui-leptos = "0.3.0"
+floating-ui-leptos = "0.4.0"
 leptos.workspace = true
+leptos-maybe-callback.workspace = true
+leptos-node-ref.workspace = true
 radix-leptos-arrow.workspace = true
 radix-leptos-compose-refs.workspace = true
+radix-leptos-primitive.workspace = true
 radix-leptos-use-size.workspace = true
+send_wrapper.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 web-sys.workspace = true