From 439361eb9827e7c3b17c28f28cc6c1b9341b1823 Mon Sep 17 00:00:00 2001
From: luoxiao <luoxiaozero@163.com>
Date: Thu, 1 Feb 2024 21:38:01 +0800
Subject: [PATCH] feat: change icondata to icondata_core

---
 demo/Cargo.toml                           |  1 +
 demo/src/pages/nav_bar/mod.rs             |  3 ++-
 demo/src/pages/tabbar/mod.rs              |  5 +----
 thaw/Cargo.toml                           |  3 ++-
 thaw/src/alert/mod.rs                     |  6 +++---
 thaw/src/button/mod.rs                    |  4 ++--
 thaw/src/calendar/mod.rs                  |  4 ++--
 thaw/src/checkbox/mod.rs                  |  2 +-
 thaw/src/collapse/collapse_item.rs        |  2 +-
 thaw/src/date_picker/mod.rs               |  2 +-
 thaw/src/date_picker/panel/date_panel.rs  |  8 ++++----
 thaw/src/date_picker/panel/month_panel.rs |  4 ++--
 thaw/src/date_picker/panel/year_panel.rs  |  4 ++--
 thaw/src/icon/mod.rs                      |  2 +-
 thaw/src/input_number/mod.rs              |  4 ++--
 thaw/src/lib.rs                           |  1 -
 thaw/src/message/mod.rs                   | 10 +++++-----
 thaw/src/mobile/nav_bar/mod.rs            |  4 ++--
 thaw/src/mobile/tabbar/tabbar_item.rs     |  2 +-
 thaw/src/modal/mod.rs                     |  2 +-
 thaw/src/time_picker/mod.rs               |  2 +-
 21 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/demo/Cargo.toml b/demo/Cargo.toml
index 775a588..b614128 100644
--- a/demo/Cargo.toml
+++ b/demo/Cargo.toml
@@ -13,6 +13,7 @@ leptos_router = { version = "0.6.5" }
 leptos_devtools = { version = "0.0.1", optional = true}
 thaw = { path = "../thaw" }
 demo_markdown = { path = "../demo_markdown" }
+icondata = "0.3.0"
 
 [features]
 default = ["csr"]
diff --git a/demo/src/pages/nav_bar/mod.rs b/demo/src/pages/nav_bar/mod.rs
index 222fef5..9d15988 100644
--- a/demo/src/pages/nav_bar/mod.rs
+++ b/demo/src/pages/nav_bar/mod.rs
@@ -2,7 +2,8 @@ use super::NavBarMdPage;
 use crate::pages::MobilePage;
 use leptos::*;
 use thaw::mobile::{NavBar, NavBarRight};
-use thaw::{icondata, Icon};
+use thaw::Icon;
+
 
 #[component]
 pub fn NavBarPage() -> impl IntoView {
diff --git a/demo/src/pages/tabbar/mod.rs b/demo/src/pages/tabbar/mod.rs
index 657f36d..7330265 100644
--- a/demo/src/pages/tabbar/mod.rs
+++ b/demo/src/pages/tabbar/mod.rs
@@ -1,10 +1,7 @@
 use super::TabbarMdPage;
 use crate::pages::MobilePage;
 use leptos::*;
-use thaw::{
-    icondata,
-    mobile::{Tabbar, TabbarItem},
-};
+use thaw::mobile::{Tabbar, TabbarItem};
 
 #[component]
 pub fn TabbarPage() -> impl IntoView {
diff --git a/thaw/Cargo.toml b/thaw/Cargo.toml
index c2264ec..9170c36 100644
--- a/thaw/Cargo.toml
+++ b/thaw/Cargo.toml
@@ -22,7 +22,8 @@ web-sys = { version = "0.3.67", features = [
     "DataTransfer",
 ] }
 wasm-bindgen = "0.2.90"
-icondata = "0.3.0"
+icondata_core = "0.1.0"
+icondata_ai = "0.0.10"
 uuid = { version = "1.7.0", features = ["v4"] }
 cfg-if = "1.0.0"
 chrono = "0.4.33"
diff --git a/thaw/src/alert/mod.rs b/thaw/src/alert/mod.rs
index d22b34c..d33920e 100644
--- a/thaw/src/alert/mod.rs
+++ b/thaw/src/alert/mod.rs
@@ -76,9 +76,9 @@ pub fn Alert(
         }
     });
     let icon = create_memo(move |_| match variant.get() {
-        AlertVariant::Success => icondata::AiCheckCircleFilled,
-        AlertVariant::Warning => icondata::AiExclamationCircleFilled,
-        AlertVariant::Error => icondata::AiCloseCircleFilled,
+        AlertVariant::Success => icondata_ai::AiCheckCircleFilled,
+        AlertVariant::Warning => icondata_ai::AiExclamationCircleFilled,
+        AlertVariant::Error => icondata_ai::AiCloseCircleFilled,
     });
 
     view! {
diff --git a/thaw/src/button/mod.rs b/thaw/src/button/mod.rs
index 4d08648..9d20214 100644
--- a/thaw/src/button/mod.rs
+++ b/thaw/src/button/mod.rs
@@ -104,7 +104,7 @@ pub fn Button(
     #[prop(optional, into)] size: MaybeSignal<ButtonSize>,
     #[prop(optional, into)] round: MaybeSignal<bool>,
     #[prop(optional, into)] circle: MaybeSignal<bool>,
-    #[prop(optional, into)] icon: Option<icondata::Icon>,
+    #[prop(optional, into)] icon: Option<icondata_core::Icon>,
     #[prop(optional, into)] loading: MaybeSignal<bool>,
     #[prop(optional, into)] disabled: MaybeSignal<bool>,
     #[prop(optional, into)] on_click: Option<Callback<ev::MouseEvent>>,
@@ -242,7 +242,7 @@ pub fn Button(
                 if loading.get() {
                     view! {
                         <Icon
-                            icon=icondata::AiLoadingOutlined
+                            icon=icondata_ai::AiLoadingOutlined
                             style=format!(
                                 "animation: thawLoadingCircle 1s infinite linear;{icon_style}",
                             )
diff --git a/thaw/src/calendar/mod.rs b/thaw/src/calendar/mod.rs
index 08f7b43..cf132cc 100644
--- a/thaw/src/calendar/mod.rs
+++ b/thaw/src/calendar/mod.rs
@@ -139,7 +139,7 @@ pub fn Calendar(
                     <ButtonGroup>
                         <Button
                             variant=ButtonVariant::Outlined
-                            icon=icondata::AiLeftOutlined
+                            icon=icondata_ai::AiLeftOutlined
                             on_click=previous_month
                         />
                         <Button variant=ButtonVariant::Outlined on_click=today>
@@ -147,7 +147,7 @@ pub fn Calendar(
                         </Button>
                         <Button
                             variant=ButtonVariant::Outlined
-                            icon=icondata::AiRightOutlined
+                            icon=icondata_ai::AiRightOutlined
                             on_click=next_month
                         />
                     </ButtonGroup>
diff --git a/thaw/src/checkbox/mod.rs b/thaw/src/checkbox/mod.rs
index 29e263b..204ef9d 100644
--- a/thaw/src/checkbox/mod.rs
+++ b/thaw/src/checkbox/mod.rs
@@ -46,7 +46,7 @@ pub fn Checkbox(
             <div class="thaw-checkbox__dot">
                 <If cond=value.signal()>
                     <Then slot>
-                        <Icon icon=icondata::AiCheckOutlined style="color: white"/>
+                        <Icon icon=icondata_ai::AiCheckOutlined style="color: white"/>
                     </Then>
                 </If>
             </div>
diff --git a/thaw/src/collapse/collapse_item.rs b/thaw/src/collapse/collapse_item.rs
index 71fa83c..1d2f40d 100644
--- a/thaw/src/collapse/collapse_item.rs
+++ b/thaw/src/collapse/collapse_item.rs
@@ -43,7 +43,7 @@ pub fn CollapseItem(
             class.map(| c | move || c.get())
         ]>
             <div class="thaw-collapse-item__header" on:click=on_click>
-                <Icon icon=icondata::AiRightOutlined class="thaw-collapse-item-arrow"/>
+                <Icon icon=icondata_ai::AiRightOutlined class="thaw-collapse-item-arrow"/>
                 {move || title.get()}
             </div>
             <CSSTransition
diff --git a/thaw/src/date_picker/mod.rs b/thaw/src/date_picker/mod.rs
index ea146a9..9fa0df2 100644
--- a/thaw/src/date_picker/mod.rs
+++ b/thaw/src/date_picker/mod.rs
@@ -76,7 +76,7 @@ pub fn DatePicker(
             <div ref=date_picker_ref>
                 <Input attrs class value=show_date_text on_focus=open_panel on_blur=on_input_blur>
                     <InputSuffix slot>
-                        <Icon icon=icondata::AiCalendarOutlined style="font-size: 18px"/>
+                        <Icon icon=icondata_ai::AiCalendarOutlined style="font-size: 18px"/>
                     </InputSuffix>
                 </Input>
             </div>
diff --git a/thaw/src/date_picker/panel/date_panel.rs b/thaw/src/date_picker/panel/date_panel.rs
index f2e041e..82eea9e 100644
--- a/thaw/src/date_picker/panel/date_panel.rs
+++ b/thaw/src/date_picker/panel/date_panel.rs
@@ -92,13 +92,13 @@ pub fn DatePanel(
                     <Button
                         variant=ButtonVariant::Link
                         size=ButtonSize::Small
-                        icon=icondata::AiArrowLeftOutlined
+                        icon=icondata_ai::AiArrowLeftOutlined
                         on_click=previous_year
                     />
                     <Button
                         variant=ButtonVariant::Link
                         size=ButtonSize::Small
-                        icon=icondata::AiLeftOutlined
+                        icon=icondata_ai::AiLeftOutlined
                         on_click=previous_month
                     />
                     <div class="thaw-date-picker-date-panel__header-month-year">
@@ -120,13 +120,13 @@ pub fn DatePanel(
                     <Button
                         variant=ButtonVariant::Link
                         size=ButtonSize::Small
-                        icon=icondata::AiRightOutlined
+                        icon=icondata_ai::AiRightOutlined
                         on_click=next_month
                     />
                     <Button
                         variant=ButtonVariant::Link
                         size=ButtonSize::Small
-                        icon=icondata::AiArrowRightOutlined
+                        icon=icondata_ai::AiArrowRightOutlined
                         on_click=next_year
                     />
                 </div>
diff --git a/thaw/src/date_picker/panel/month_panel.rs b/thaw/src/date_picker/panel/month_panel.rs
index 096aeb8..4dc8842 100644
--- a/thaw/src/date_picker/panel/month_panel.rs
+++ b/thaw/src/date_picker/panel/month_panel.rs
@@ -27,7 +27,7 @@ pub fn MonthPanel(
                 <Button
                     variant=ButtonVariant::Link
                     size=ButtonSize::Small
-                    icon=icondata::AiArrowLeftOutlined
+                    icon=icondata_ai::AiArrowLeftOutlined
                     on_click=previous_year
                 />
                 <div class="thaw-date-picker-date-panel__header-year">
@@ -42,7 +42,7 @@ pub fn MonthPanel(
                 <Button
                     variant=ButtonVariant::Link
                     size=ButtonSize::Small
-                    icon=icondata::AiArrowRightOutlined
+                    icon=icondata_ai::AiArrowRightOutlined
                     on_click=next_year
                 />
             </div>
diff --git a/thaw/src/date_picker/panel/year_panel.rs b/thaw/src/date_picker/panel/year_panel.rs
index fb6de4a..2d36bb9 100644
--- a/thaw/src/date_picker/panel/year_panel.rs
+++ b/thaw/src/date_picker/panel/year_panel.rs
@@ -34,7 +34,7 @@ pub fn YearPanel(
                 <Button
                     variant=ButtonVariant::Link
                     size=ButtonSize::Small
-                    icon=icondata::AiArrowLeftOutlined
+                    icon=icondata_ai::AiArrowLeftOutlined
                     on_click=previous_year_range
                 />
                 <div>
@@ -47,7 +47,7 @@ pub fn YearPanel(
                 <Button
                     variant=ButtonVariant::Link
                     size=ButtonSize::Small
-                    icon=icondata::AiArrowRightOutlined
+                    icon=icondata_ai::AiArrowRightOutlined
                     on_click=next_year_range
                 />
             </div>
diff --git a/thaw/src/icon/mod.rs b/thaw/src/icon/mod.rs
index 4ef5c49..92ad564 100644
--- a/thaw/src/icon/mod.rs
+++ b/thaw/src/icon/mod.rs
@@ -7,7 +7,7 @@ use leptos::*;
 pub fn Icon(
     /// The icon to render.
     #[prop(into)]
-    icon: MaybeSignal<icondata::Icon>,
+    icon: MaybeSignal<icondata_core::Icon>,
     /// The width of the icon (horizontal side length of the square surrounding the icon). Defaults to "1em".
     #[prop(into, optional)]
     width: Option<MaybeSignal<String>>,
diff --git a/thaw/src/input_number/mod.rs b/thaw/src/input_number/mod.rs
index f2f47fd..8055b70 100644
--- a/thaw/src/input_number/mod.rs
+++ b/thaw/src/input_number/mod.rs
@@ -67,10 +67,10 @@ where
         >
             <InputSuffix slot>
                 <Button disabled variant=ButtonVariant::Link on_click=sub>
-                    <Icon icon=icondata::AiMinusOutlined style="font-size: 18px"/>
+                    <Icon icon=icondata_ai::AiMinusOutlined style="font-size: 18px"/>
                 </Button>
                 <Button disabled variant=ButtonVariant::Link on_click=add>
-                    <Icon icon=icondata::AiPlusOutlined style="font-size: 18px"/>
+                    <Icon icon=icondata_ai::AiPlusOutlined style="font-size: 18px"/>
                 </Button>
             </InputSuffix>
         </Input>
diff --git a/thaw/src/lib.rs b/thaw/src/lib.rs
index cce8920..f2023ef 100644
--- a/thaw/src/lib.rs
+++ b/thaw/src/lib.rs
@@ -63,7 +63,6 @@ pub use drawer::*;
 pub use global_style::*;
 pub use grid::*;
 pub use icon::*;
-pub use icondata;
 pub use image::*;
 pub use input::*;
 pub use input_number::*;
diff --git a/thaw/src/message/mod.rs b/thaw/src/message/mod.rs
index 25da5ab..06c5a80 100644
--- a/thaw/src/message/mod.rs
+++ b/thaw/src/message/mod.rs
@@ -21,11 +21,11 @@ pub enum MessageVariant {
 }
 
 impl MessageVariant {
-    fn icon(&self) -> icondata::Icon {
+    fn icon(&self) -> icondata_core::Icon {
         match self {
-            MessageVariant::Success => icondata::AiCloseCircleFilled,
-            MessageVariant::Warning => icondata::AiExclamationCircleFilled,
-            MessageVariant::Error => icondata::AiCheckCircleFilled,
+            MessageVariant::Success => icondata_ai::AiCloseCircleFilled,
+            MessageVariant::Warning => icondata_ai::AiExclamationCircleFilled,
+            MessageVariant::Error => icondata_ai::AiCheckCircleFilled,
         }
     }
     fn theme_color(&self, theme: &Theme) -> String {
@@ -67,7 +67,7 @@ pub(crate) fn Message(
                 <If cond=closable>
                     <Then slot>
                         <div class="thaw-message__close" on:click=move |_| on_close.call(id)>
-                            <Icon icon=icondata::AiCloseOutlined/>
+                            <Icon icon=icondata_ai::AiCloseOutlined/>
                         </div>
                     </Then>
                 </If>
diff --git a/thaw/src/mobile/nav_bar/mod.rs b/thaw/src/mobile/nav_bar/mod.rs
index bab70e0..a09ebdf 100644
--- a/thaw/src/mobile/nav_bar/mod.rs
+++ b/thaw/src/mobile/nav_bar/mod.rs
@@ -80,7 +80,7 @@ pub fn NavBar(
                     <div class="thaw-nav-bar__left" on:click=on_click_left>
                         <If cond=left_arrow>
                             <Then slot>
-                                <Icon icon=icondata::AiLeftOutlined/>
+                                <Icon icon=icondata_ai::AiLeftOutlined/>
                             </Then>
                         </If>
                         {move || left_text.get()}
@@ -92,7 +92,7 @@ pub fn NavBar(
                     if left_arrow.get() {
                         view! {
                             <div class="thaw-nav-bar__left" on:click=on_click_left>
-                                <Icon icon=icondata::AiLeftOutlined/>
+                                <Icon icon=icondata_ai::AiLeftOutlined/>
                             </div>
                         }
                             .into()
diff --git a/thaw/src/mobile/tabbar/tabbar_item.rs b/thaw/src/mobile/tabbar/tabbar_item.rs
index 02f5d46..b9c97a2 100644
--- a/thaw/src/mobile/tabbar/tabbar_item.rs
+++ b/thaw/src/mobile/tabbar/tabbar_item.rs
@@ -7,7 +7,7 @@ use leptos::*;
 #[component]
 pub fn TabbarItem(
     #[prop(into)] key: MaybeSignal<String>,
-    #[prop(optional, into)] icon: Option<icondata::Icon>,
+    #[prop(optional, into)] icon: Option<icondata_core::Icon>,
     children: Children,
 ) -> impl IntoView {
     mount_style("tabbar-item", include_str!("./tabbar-item.css"));
diff --git a/thaw/src/modal/mod.rs b/thaw/src/modal/mod.rs
index e6590e9..d4855c1 100644
--- a/thaw/src/modal/mod.rs
+++ b/thaw/src/modal/mod.rs
@@ -35,7 +35,7 @@ pub fn Modal(
                         </CardHeader>
                         <CardHeaderExtra slot>
                             <span style="cursor: pointer;" on:click=move |_| show.set(false)>
-                                <Icon icon=icondata::AiCloseOutlined/>
+                                <Icon icon=icondata_ai::AiCloseOutlined/>
                             </span>
                         </CardHeaderExtra>
                         {children()}
diff --git a/thaw/src/time_picker/mod.rs b/thaw/src/time_picker/mod.rs
index 25bf43d..5e750bd 100644
--- a/thaw/src/time_picker/mod.rs
+++ b/thaw/src/time_picker/mod.rs
@@ -76,7 +76,7 @@ pub fn TimePicker(
             <div ref=time_picker_ref>
                 <Input attrs class value=show_time_text on_focus=open_panel on_blur=on_input_blur>
                     <InputSuffix slot>
-                        <Icon icon=icondata::AiClockCircleOutlined style="font-size: 18px"/>
+                        <Icon icon=icondata_ai::AiClockCircleOutlined style="font-size: 18px"/>
                     </InputSuffix>
                 </Input>
             </div>