From 5f74f5914eec07e972d96dcedb6a9d1f9b18cc30 Mon Sep 17 00:00:00 2001
From: luoxiao <luoxiaozero@163.com>
Date: Wed, 3 Jul 2024 23:01:57 +0800
Subject: [PATCH] feat(lepots-v0.7): thaw_components

---
 thaw/Cargo.toml                           |  2 +-
 thaw/src/accordion/accordion_item.rs      |  8 ++++----
 thaw/src/accordion/mod.rs                 |  2 +-
 thaw_components/src/binder/mod.rs         | 15 +++++++++------
 thaw_components/src/css_transition/mod.rs | 19 ++++++++++---------
 thaw_components/src/focus_trap/mod.rs     |  1 +
 thaw_components/src/teleport/mod.rs       |  4 ++--
 7 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/thaw/Cargo.toml b/thaw/Cargo.toml
index 6f96b64..03a522c 100644
--- a/thaw/Cargo.toml
+++ b/thaw/Cargo.toml
@@ -13,7 +13,7 @@ license = "MIT"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-leptos = { version = "0.6.10" }
+leptos = { workspace = true }
 thaw_components = { workspace = true }
 thaw_macro = { workspace = true }
 thaw_utils = { workspace = true }
diff --git a/thaw/src/accordion/accordion_item.rs b/thaw/src/accordion/accordion_item.rs
index 58ac2ce..b490d2a 100644
--- a/thaw/src/accordion/accordion_item.rs
+++ b/thaw/src/accordion/accordion_item.rs
@@ -1,5 +1,5 @@
 use crate::AccordionInjection;
-use leptos::*;
+use leptos::{prelude::*, html};
 use thaw_components::CSSTransition;
 use thaw_utils::{mount_style, StoredMaybeSignal};
 
@@ -43,7 +43,7 @@ pub fn AccordionItem(
             <div class="thaw-accordion-header">
                 <button
                     class="thaw-accordion-header__button"
-                    aria-expanded=move || is_show_panel.get().to_string()
+                    // aria_expanded=move || is_show_panel.get().to_string() #TODO
                     type="button"
                     on:click=on_click
                 >
@@ -58,8 +58,8 @@ pub fn AccordionItem(
             >
                 <div
                     class="thaw-accordion-panel"
-                    ref=panel_ref
-                    style=move || display.get()
+                    node_ref=panel_ref
+                    style=move || display.get().map(|d| d.to_string())
                 >
                     {children()}
                 </div>
diff --git a/thaw/src/accordion/mod.rs b/thaw/src/accordion/mod.rs
index af2aa48..2a3f188 100644
--- a/thaw/src/accordion/mod.rs
+++ b/thaw/src/accordion/mod.rs
@@ -2,7 +2,7 @@ mod accordion_item;
 
 pub use accordion_item::*;
 
-use leptos::*;
+use leptos::{context::Provider, prelude::*};
 use std::collections::HashSet;
 use thaw_utils::Model;
 
diff --git a/thaw_components/src/binder/mod.rs b/thaw_components/src/binder/mod.rs
index 069dbfd..5b84851 100644
--- a/thaw_components/src/binder/mod.rs
+++ b/thaw_components/src/binder/mod.rs
@@ -185,7 +185,7 @@ fn FollowerContainer<E>(
     children: Children,
 ) -> impl IntoView
 where
-    E: ElementType,
+    E: ElementType + 'static,
     E::Output: JsCast + Clone + Deref<Target = web_sys::Element> + 'static,
 {
     let content_ref = NodeRef::<html::Div>::new();
@@ -239,11 +239,14 @@ where
             return;
         }
         if show.get() {
-            request_animation_frame(move || {
-                sync_position.call(());
+            request_animation_frame({
+                let sync_position = sync_position.clone();
+                move || {
+                    sync_position.call(());
+                }
             });
-            add_scroll_listener.call(sync_position);
-            add_resize_listener.call(sync_position);
+            add_scroll_listener.call(sync_position.clone());
+            add_resize_listener.call(sync_position.clone());
         } else {
             remove_scroll_listener.call(());
             remove_resize_listener.call(());
@@ -261,5 +264,5 @@ where
         )
     });
 
-    view! { <Teleport element=children immediate=show/> }
+    view! { <Teleport element=children.into_any() immediate=show/> }
 }
diff --git a/thaw_components/src/css_transition/mod.rs b/thaw_components/src/css_transition/mod.rs
index 003e464..8835234 100644
--- a/thaw_components/src/css_transition/mod.rs
+++ b/thaw_components/src/css_transition/mod.rs
@@ -1,5 +1,6 @@
 use leptos::{ev, html::ElementType, prelude::*};
 use std::{ops::Deref, time::Duration};
+use tachys::view::any_view::AnyView;
 use thaw_utils::{add_event_listener, EventListenerHandle, NextFrame};
 use web_sys::wasm_bindgen::JsCast;
 
@@ -22,9 +23,9 @@ pub fn CSSTransition<E, CF, IV>(
 ) -> impl IntoView
 where
     E: ElementType + 'static,
-    E::Output: JsCast + Clone + Deref<Target = web_sys::Element> + 'static,
-    CF: FnOnce(ReadSignal<Option<&'static str>>) -> IV + 'static,
-    IV: IntoView,
+    E::Output: JsCast + Clone + Deref<Target = web_sys::HtmlElement> + 'static,
+    CF: FnOnce(ReadSignal<Option<&'static str>>) -> IV + Send + 'static,
+    IV: IntoView + 'static,
 {
     let display = RwSignal::new((!show.get_untracked()).then_some("display: none;"));
 
@@ -92,13 +93,13 @@ where
                     }
                 };
                 let handle = match types {
-                    AnimationTypes::Transition => {
-                        add_event_listener(el.deref().clone(), ev::transitionend, move |_| {
-                            event_listener()
-                        })
-                    }
+                    AnimationTypes::Transition => add_event_listener(
+                        el.deref().clone().into(),
+                        ev::transitionend,
+                        move |_| event_listener(),
+                    ),
                     AnimationTypes::Animation => {
-                        add_event_listener(el.deref().clone(), ev::animationend, move |_| {
+                        add_event_listener(el.deref().clone().into(), ev::animationend, move |_| {
                             event_listener()
                         })
                     }
diff --git a/thaw_components/src/focus_trap/mod.rs b/thaw_components/src/focus_trap/mod.rs
index 31c1f8e..b2718d9 100644
--- a/thaw_components/src/focus_trap/mod.rs
+++ b/thaw_components/src/focus_trap/mod.rs
@@ -32,6 +32,7 @@ pub fn FocusTrap(
         Effect::new(move |prev| {
             let is_active = active.get();
             if is_active && !prev.unwrap_or(false) {
+                let on_esc = on_esc.clone();
                 let handle = window_event_listener(ev::keydown, move |e| {
                     if &e.code() == "Escape" {
                         if is_current_active() {
diff --git a/thaw_components/src/teleport/mod.rs b/thaw_components/src/teleport/mod.rs
index f24f096..8d09589 100644
--- a/thaw_components/src/teleport/mod.rs
+++ b/thaw_components/src/teleport/mod.rs
@@ -1,5 +1,5 @@
 use cfg_if::cfg_if;
-use leptos::{html::{AnyElement, HtmlElement}, prelude::*};
+use leptos::prelude::*;
 use tachys::view::any_view::AnyView;
 
 /// https://github.com/solidjs/solid/blob/main/packages/solid/web/src/index.ts#L56
@@ -7,7 +7,7 @@ use tachys::view::any_view::AnyView;
 pub fn Teleport(
     #[prop(default = true.into(), into)] immediate: MaybeSignal<bool>,
     #[prop(into, optional)] mount: Option<web_sys::Element>,
-    #[prop(optional, into)] element: Option<HtmlElement<AnyElement>>,
+    #[prop(optional, into)] element: Option<AnyView<Dom>>,
     #[prop(optional)] children: Option<Children>,
 ) -> impl IntoView {
     cfg_if! { if #[cfg(all(target_arch = "wasm32", any(feature = "csr", feature = "hydrate")))] {