From 3ea0afa7af4b82184ec3081ad2c46eef205714c4 Mon Sep 17 00:00:00 2001 From: Yota <91780796+wiyota@users.noreply.github.com> Date: Fri, 26 Jan 2024 23:10:17 +0900 Subject: [PATCH] Update icondata (#82) * Update icondata * merge upstream * feat: update icondata --------- Co-authored-by: luoxiaozero <48741584+luoxiaozero@users.noreply.github.com> Co-authored-by: luoxiao --- demo/Cargo.toml | 11 ++--------- demo/src/components/site_header.rs | 6 +++--- demo/src/pages/nav_bar/mod.rs | 2 +- demo/src/pages/tabbar/mod.rs | 2 +- demo_markdown/docs/_mobile/nav_bar/mod.md | 2 +- demo_markdown/docs/_mobile/tabbar/mod.md | 2 +- demo_markdown/docs/auto_complete/mod.md | 4 ++-- demo_markdown/docs/button/mod.md | 8 ++++---- demo_markdown/docs/icon/mod.md | 4 ++-- demo_markdown/docs/input/mod.md | 6 +++--- thaw/Cargo.toml | 20 ++------------------ thaw/src/alert/mod.rs | 7 +++---- thaw/src/button/mod.rs | 2 +- thaw/src/calendar/mod.rs | 5 ++--- thaw/src/checkbox/mod.rs | 3 +-- thaw/src/collapse/collapse_item.rs | 3 +-- thaw/src/date_picker/mod.rs | 4 ++-- thaw/src/date_picker/panel/date_panel.rs | 10 +++++----- thaw/src/date_picker/panel/month_panel.rs | 6 +++--- thaw/src/date_picker/panel/year_panel.rs | 6 +++--- thaw/src/icon/mod.rs | 6 ++---- thaw/src/input_number/mod.rs | 6 +++--- thaw/src/message/mod.rs | 9 ++++----- thaw/src/mobile/nav_bar/mod.rs | 2 +- thaw/src/modal/mod.rs | 2 +- thaw/src/time_picker/mod.rs | 4 ++-- 26 files changed, 56 insertions(+), 86 deletions(-) diff --git a/demo/Cargo.toml b/demo/Cargo.toml index 9cd1532..2867825 100644 --- a/demo/Cargo.toml +++ b/demo/Cargo.toml @@ -12,14 +12,7 @@ leptos_meta = { version = "0.5.7" } leptos_router = { version = "0.5.7" } leptos_devtools = { version = "0.0.1", optional = true} thaw = { path = "../thaw", default-features = false } -icondata = { version = "0.1.0", features = [ - "AiCloseOutlined", - "AiCheckOutlined", - "AiGithubOutlined", - "AiUserOutlined", - "AiSearchOutlined", - "AiUnorderedListOutlined" -] } +icondata = "0.3.0" demo_markdown = { path = "../demo_markdown" } [features] @@ -41,4 +34,4 @@ nightly = ["leptos/nightly", "leptos_meta/nightly", "leptos_router/nightly"] opt-level = 1 [profile.dev.package."*"] -opt-level = 3 \ No newline at end of file +opt-level = 3 diff --git a/demo/src/components/site_header.rs b/demo/src/components/site_header.rs index dacbb75..730c869 100644 --- a/demo/src/components/site_header.rs +++ b/demo/src/components/site_header.rs @@ -141,14 +141,14 @@ pub fn SiteHeader() -> impl IntoView { comp_ref=auto_complete_ref > - + diff --git a/thaw/src/message/mod.rs b/thaw/src/message/mod.rs index 1ea50ee..02cc741 100644 --- a/thaw/src/message/mod.rs +++ b/thaw/src/message/mod.rs @@ -3,7 +3,6 @@ mod message_provider; mod theme; use crate::{theme::use_theme, Icon, Theme, components::{If, Then}}; -use icondata::*; use leptos::*; use uuid::Uuid; pub use message_provider::*; @@ -20,9 +19,9 @@ pub enum MessageVariant { impl MessageVariant { fn icon(&self) -> Icon { match self { - MessageVariant::Success => icondata::Icon::Ai(AiCloseCircleFilled), - MessageVariant::Warning => icondata::Icon::Ai(AiExclamationCircleFilled), - MessageVariant::Error => icondata::Icon::Ai(AiCheckCircleFilled), + MessageVariant::Success => icondata::AiCloseCircleFilled, + MessageVariant::Warning => icondata::AiExclamationCircleFilled, + MessageVariant::Error => icondata::AiCheckCircleFilled, } } fn theme_color(&self, theme: &Theme) -> String { @@ -64,7 +63,7 @@ pub(crate) fn Message(
- +
diff --git a/thaw/src/mobile/nav_bar/mod.rs b/thaw/src/mobile/nav_bar/mod.rs index f28a431..163eee4 100644 --- a/thaw/src/mobile/nav_bar/mod.rs +++ b/thaw/src/mobile/nav_bar/mod.rs @@ -78,7 +78,7 @@ pub fn NavBar(
- + {move || left_text.get()} diff --git a/thaw/src/modal/mod.rs b/thaw/src/modal/mod.rs index 6daa285..f679931 100644 --- a/thaw/src/modal/mod.rs +++ b/thaw/src/modal/mod.rs @@ -35,7 +35,7 @@ pub fn Modal( - + {children()} diff --git a/thaw/src/time_picker/mod.rs b/thaw/src/time_picker/mod.rs index fb80152..5350d54 100644 --- a/thaw/src/time_picker/mod.rs +++ b/thaw/src/time_picker/mod.rs @@ -5,7 +5,7 @@ use crate::{ components::{Binder, Follower, FollowerPlacement}, use_theme, utils::{mount_style, ComponentRef}, - AiIcon, Button, ButtonSize, ButtonVariant, Icon, Input, InputSuffix, SignalWatch, Theme, + Button, ButtonSize, ButtonVariant, Icon, Input, InputSuffix, SignalWatch, Theme, }; use leptos::*; pub use theme::TimePickerTheme; @@ -77,7 +77,7 @@ pub fn TimePicker(