From 6697225ded4a5e16c474e834ad8b46e3e801dd35 Mon Sep 17 00:00:00 2001 From: luoxiao Date: Wed, 7 Feb 2024 22:38:02 +0800 Subject: [PATCH] feat: remove re-export of chrono --- demo/Cargo.toml | 3 ++- demo_markdown/docs/calendar/mod.md | 2 +- demo_markdown/docs/date_picker/mod.md | 2 +- demo_markdown/docs/time_picker/mod.md | 2 +- thaw/src/calendar/mod.rs | 5 +++-- thaw/src/date_picker/mod.rs | 5 +++-- thaw/src/date_picker/panel/date_panel.rs | 7 ++----- thaw/src/date_picker/panel/mod.rs | 2 +- thaw/src/date_picker/panel/month_panel.rs | 6 ++---- thaw/src/date_picker/panel/year_panel.rs | 6 ++---- thaw/src/lib.rs | 1 - thaw/src/time_picker/mod.rs | 5 +++-- thaw/src/utils/time.rs | 2 +- 13 files changed, 22 insertions(+), 26 deletions(-) diff --git a/demo/Cargo.toml b/demo/Cargo.toml index 2aa85f7..45cd7ef 100644 --- a/demo/Cargo.toml +++ b/demo/Cargo.toml @@ -10,11 +10,12 @@ edition = "2021" leptos = { version = "0.6.5" } leptos_meta = { version = "0.6.5" } leptos_router = { version = "0.6.5" } -leptos_devtools = { version = "0.0.1", optional = true} +leptos_devtools = { version = "0.0.1", optional = true } thaw = { path = "../thaw" } demo_markdown = { path = "../demo_markdown" } icondata = "0.3.0" palette = "0.7.4" +chrono = "0.4.33" [features] default = ["csr"] diff --git a/demo_markdown/docs/calendar/mod.md b/demo_markdown/docs/calendar/mod.md index 55c34db..bc5c995 100644 --- a/demo_markdown/docs/calendar/mod.md +++ b/demo_markdown/docs/calendar/mod.md @@ -1,7 +1,7 @@ # Calendar ```rust demo -use thaw::chrono::prelude::*; +use chrono::prelude::*; let value = create_rw_signal(Some(Local::now().date_naive())); view! { diff --git a/demo_markdown/docs/date_picker/mod.md b/demo_markdown/docs/date_picker/mod.md index 3cf037a..08c4d0c 100644 --- a/demo_markdown/docs/date_picker/mod.md +++ b/demo_markdown/docs/date_picker/mod.md @@ -1,7 +1,7 @@ # Date Picker ```rust demo -use thaw::chrono::prelude::*; +use chrono::prelude::*; let value = create_rw_signal(Some(Local::now().date_naive())); view! { diff --git a/demo_markdown/docs/time_picker/mod.md b/demo_markdown/docs/time_picker/mod.md index 7dc60bd..0aec29b 100644 --- a/demo_markdown/docs/time_picker/mod.md +++ b/demo_markdown/docs/time_picker/mod.md @@ -1,7 +1,7 @@ # Time Picker ```rust demo -use thaw::chrono::prelude::*; +use chrono::prelude::*; let value = create_rw_signal(Some(Local::now().time())); diff --git a/thaw/src/calendar/mod.rs b/thaw/src/calendar/mod.rs index cf132cc..689f498 100644 --- a/thaw/src/calendar/mod.rs +++ b/thaw/src/calendar/mod.rs @@ -1,15 +1,16 @@ mod theme; +pub use theme::CalendarTheme; + use crate::{ - chrono::{Datelike, Days, Local, NaiveDate}, use_theme, utils::{class_list::class_list, mount_style, Model, OptionalProp}, Button, ButtonGroup, ButtonVariant, Theme, }; +use chrono::{Datelike, Days, Local, NaiveDate}; use chrono::{Month, Months}; use leptos::*; use std::ops::Deref; -pub use theme::CalendarTheme; #[component] pub fn Calendar( diff --git a/thaw/src/date_picker/mod.rs b/thaw/src/date_picker/mod.rs index 9fa0df2..b0b2872 100644 --- a/thaw/src/date_picker/mod.rs +++ b/thaw/src/date_picker/mod.rs @@ -1,15 +1,16 @@ mod panel; mod theme; +pub use theme::DatePickerTheme; + use crate::{ - chrono::NaiveDate, components::{Binder, Follower, FollowerPlacement}, utils::{mount_style, now_date, ComponentRef, Model, OptionalProp}, Icon, Input, InputSuffix, SignalWatch, }; +use chrono::NaiveDate; use leptos::*; use panel::{Panel, PanelRef}; -pub use theme::DatePickerTheme; #[component] pub fn DatePicker( diff --git a/thaw/src/date_picker/panel/date_panel.rs b/thaw/src/date_picker/panel/date_panel.rs index 82eea9e..c1ccd3b 100644 --- a/thaw/src/date_picker/panel/date_panel.rs +++ b/thaw/src/date_picker/panel/date_panel.rs @@ -1,9 +1,6 @@ use super::PanelVariant; -use crate::{ - chrono::{Datelike, Days, Month, Months, NaiveDate}, - utils::now_date, - Button, ButtonSize, ButtonVariant, CalendarItemDate, -}; +use crate::{utils::now_date, Button, ButtonSize, ButtonVariant, CalendarItemDate}; +use chrono::{Datelike, Days, Month, Months, NaiveDate}; use leptos::*; use std::ops::Deref; diff --git a/thaw/src/date_picker/panel/mod.rs b/thaw/src/date_picker/panel/mod.rs index 46f62f6..591ece0 100644 --- a/thaw/src/date_picker/panel/mod.rs +++ b/thaw/src/date_picker/panel/mod.rs @@ -3,11 +3,11 @@ mod month_panel; mod year_panel; use crate::{ - chrono::NaiveDate, use_theme, utils::{now_date, ComponentRef}, Theme, }; +use chrono::NaiveDate; use date_panel::DatePanel; use leptos::*; use month_panel::MonthPanel; diff --git a/thaw/src/date_picker/panel/month_panel.rs b/thaw/src/date_picker/panel/month_panel.rs index 4dc8842..d54ca7e 100644 --- a/thaw/src/date_picker/panel/month_panel.rs +++ b/thaw/src/date_picker/panel/month_panel.rs @@ -1,8 +1,6 @@ use super::PanelVariant; -use crate::{ - chrono::{Datelike, Month, Months, NaiveDate}, - Button, ButtonSize, ButtonVariant, -}; +use crate::{Button, ButtonSize, ButtonVariant}; +use chrono::{Datelike, Month, Months, NaiveDate}; use leptos::*; #[component] diff --git a/thaw/src/date_picker/panel/year_panel.rs b/thaw/src/date_picker/panel/year_panel.rs index 2d36bb9..aac4181 100644 --- a/thaw/src/date_picker/panel/year_panel.rs +++ b/thaw/src/date_picker/panel/year_panel.rs @@ -1,8 +1,6 @@ use super::PanelVariant; -use crate::{ - chrono::{Datelike, NaiveDate}, - Button, ButtonSize, ButtonVariant, -}; +use crate::{Button, ButtonSize, ButtonVariant}; +use chrono::{Datelike, NaiveDate}; use leptos::*; const MAX_YEAR: i32 = (i32::MAX >> 13) / 10 - 1; diff --git a/thaw/src/lib.rs b/thaw/src/lib.rs index f2023ef..8b98209 100644 --- a/thaw/src/lib.rs +++ b/thaw/src/lib.rs @@ -53,7 +53,6 @@ pub use button::*; pub use calendar::*; pub use card::*; pub use checkbox::*; -pub use chrono; pub use code::*; pub use collapse::*; pub use color_picker::*; diff --git a/thaw/src/time_picker/mod.rs b/thaw/src/time_picker/mod.rs index 5e750bd..fcb38b3 100644 --- a/thaw/src/time_picker/mod.rs +++ b/thaw/src/time_picker/mod.rs @@ -1,14 +1,15 @@ mod theme; +pub use theme::TimePickerTheme; + use crate::{ - chrono::{Local, NaiveTime, Timelike}, components::{Binder, Follower, FollowerPlacement}, use_theme, utils::{mount_style, ComponentRef, Model, OptionalProp}, Button, ButtonSize, ButtonVariant, Icon, Input, InputSuffix, SignalWatch, Theme, }; +use chrono::{Local, NaiveTime, Timelike}; use leptos::*; -pub use theme::TimePickerTheme; #[component] pub fn TimePicker( diff --git a/thaw/src/utils/time.rs b/thaw/src/utils/time.rs index ec718c5..b089a79 100644 --- a/thaw/src/utils/time.rs +++ b/thaw/src/utils/time.rs @@ -1,4 +1,4 @@ -use crate::chrono::{Local, NaiveDate}; +use chrono::{Local, NaiveDate}; pub fn now_date() -> NaiveDate { Local::now().date_naive()