From bd59ef5d47ed6fa5de1dd8731084618746704007 Mon Sep 17 00:00:00 2001 From: luoxiao Date: Mon, 13 Nov 2023 16:17:41 +0800 Subject: [PATCH] feat: remove wave and teleport component --- src/button/mod.rs | 3 +-- src/components/binder/mod.rs | 2 +- src/components/mod.rs | 10 +++++++--- src/{ => components}/teleport/mod.rs | 0 src/{ => components}/wave/mod.rs | 0 src/{ => components}/wave/wave.css | 0 src/lib.rs | 2 -- src/loading_bar/loading_bar_provider.rs | 2 +- src/message/message_provider.rs | 2 +- src/modal/mod.rs | 10 +++++----- 10 files changed, 16 insertions(+), 15 deletions(-) rename src/{ => components}/teleport/mod.rs (100%) rename src/{ => components}/wave/mod.rs (100%) rename src/{ => components}/wave/wave.css (100%) diff --git a/src/button/mod.rs b/src/button/mod.rs index 1d8eba7..4c6a714 100644 --- a/src/button/mod.rs +++ b/src/button/mod.rs @@ -1,11 +1,10 @@ mod theme; use crate::{ - components::*, + components::{OptionComp, Wave, WaveRef}, icon::*, theme::*, utils::{mount_style::mount_style, ComponentRef}, - wave::{Wave, WaveRef}, }; use leptos::*; pub use theme::ButtonTheme; diff --git a/src/components/binder/mod.rs b/src/components/binder/mod.rs index 56ba572..250626f 100644 --- a/src/components/binder/mod.rs +++ b/src/components/binder/mod.rs @@ -1,8 +1,8 @@ mod get_placement_style; use crate::{ + components::Teleport, mount_style, - teleport::Teleport, utils::{add_event_listener, EventListenerHandle}, }; use get_placement_style::get_follower_placement_style; diff --git a/src/components/mod.rs b/src/components/mod.rs index db9eeca..a81efda 100644 --- a/src/components/mod.rs +++ b/src/components/mod.rs @@ -1,11 +1,15 @@ mod binder; mod if_comp; mod option_comp; +mod teleport; +mod wave; -pub use binder::*; -pub use if_comp::*; +pub(crate) use binder::*; +pub(crate) use if_comp::*; use leptos::*; -pub use option_comp::*; +pub(crate) use option_comp::*; +pub(crate) use teleport::*; +pub(crate) use wave::*; #[slot] pub struct Fallback { diff --git a/src/teleport/mod.rs b/src/components/teleport/mod.rs similarity index 100% rename from src/teleport/mod.rs rename to src/components/teleport/mod.rs diff --git a/src/wave/mod.rs b/src/components/wave/mod.rs similarity index 100% rename from src/wave/mod.rs rename to src/components/wave/mod.rs diff --git a/src/wave/wave.css b/src/components/wave/wave.css similarity index 100% rename from src/wave/wave.css rename to src/components/wave/wave.css diff --git a/src/lib.rs b/src/lib.rs index 094e70f..2868455 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -32,11 +32,9 @@ mod switch; mod table; mod tabs; mod tag; -mod teleport; mod theme; mod upload; mod utils; -mod wave; pub use alert::*; pub use auto_complete::*; diff --git a/src/loading_bar/loading_bar_provider.rs b/src/loading_bar/loading_bar_provider.rs index e4640ec..7d01522 100644 --- a/src/loading_bar/loading_bar_provider.rs +++ b/src/loading_bar/loading_bar_provider.rs @@ -1,5 +1,5 @@ use super::{LoadingBar, LoadingBarRef}; -use crate::{teleport::Teleport, utils::ComponentRef}; +use crate::{components::Teleport, utils::ComponentRef}; use leptos::*; #[component] diff --git a/src/message/message_provider.rs b/src/message/message_provider.rs index f7268e3..8749232 100644 --- a/src/message/message_provider.rs +++ b/src/message/message_provider.rs @@ -1,7 +1,7 @@ use std::time::Duration; use super::{message_environment::MessageEnvironment, MessageVariant}; -use crate::{mount_style, teleport::Teleport}; +use crate::{components::Teleport, mount_style}; use leptos::*; use uuid::Uuid; diff --git a/src/modal/mod.rs b/src/modal/mod.rs index 9b42ebc..7f74ce1 100644 --- a/src/modal/mod.rs +++ b/src/modal/mod.rs @@ -1,9 +1,9 @@ -use crate::card::*; -use crate::components::OptionComp; use crate::icon::*; -use crate::teleport::*; -use crate::utils::mount_style::mount_style; -use crate::utils::StoredMaybeSignal; +use crate::{ + components::{OptionComp, Teleport}, + utils::{mount_style::mount_style, StoredMaybeSignal}, + Card, CardFooter, CardHeader, CardHeaderExtra, +}; use leptos::*; #[slot]