From 8d9182e45cba5bfaeba1bb9244e01f1904bcf2dd Mon Sep 17 00:00:00 2001 From: luoxiao Date: Thu, 2 Nov 2023 16:52:34 +0800 Subject: [PATCH] feat: remove wasm-bindgen --- Cargo.toml | 1 - README.md | 8 +++++--- logo.svg | 11 +++++++++++ src/color_picker/mod.rs | 3 +-- src/select/mod.rs | 2 +- src/theme/common.rs | 12 ++++++------ 6 files changed, 24 insertions(+), 13 deletions(-) create mode 100644 logo.svg diff --git a/Cargo.toml b/Cargo.toml index 018d167..a5c9567 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,6 @@ license = "MIT" [dependencies] leptos = { version = "0.5.1", features = ["csr"] } web-sys = { version = "0.3.62", features = ["DomRect", "File", "FileList"] } -wasm-bindgen = "0.2.85" icondata = { version = "0.1.0", features = [ "AiCloseOutlined", "AiCheckOutlined", diff --git a/README.md b/README.md index cb87bd8..4b8f7db 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ -# Melt UI - -An easy to use leptos component library +

+ Melt Logo +

+

Melt UI

+

An easy to use leptos component library

**The 0.0.x release does not consider API compatibility at this time** diff --git a/logo.svg b/logo.svg new file mode 100644 index 0000000..2f77189 --- /dev/null +++ b/logo.svg @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/src/color_picker/mod.rs b/src/color_picker/mod.rs index f18de61..da95849 100644 --- a/src/color_picker/mod.rs +++ b/src/color_picker/mod.rs @@ -5,10 +5,9 @@ use crate::{ mount_style, teleport::Teleport, use_theme, utils::maybe_rw_signal::MaybeRwSignal, Theme, }; pub use color::*; -use leptos::leptos_dom::helpers::WindowListenerHandle; use leptos::*; +use leptos::{leptos_dom::helpers::WindowListenerHandle, wasm_bindgen::__rt::IntoJsResult}; pub use theme::ColorPickerTheme; -use wasm_bindgen::__rt::IntoJsResult; #[component] pub fn ColorPicker(#[prop(optional, into)] value: MaybeRwSignal) -> impl IntoView { diff --git a/src/select/mod.rs b/src/select/mod.rs index 935d384..d03f089 100644 --- a/src/select/mod.rs +++ b/src/select/mod.rs @@ -6,10 +6,10 @@ use crate::{ utils::{maybe_rw_signal::MaybeRwSignal, mount_style::mount_style}, Theme, }; +use leptos::wasm_bindgen::__rt::IntoJsResult; use leptos::*; use std::hash::Hash; pub use theme::SelectTheme; -use wasm_bindgen::__rt::IntoJsResult; #[derive(Clone, PartialEq, Eq, Hash)] pub struct SelectOption { diff --git a/src/theme/common.rs b/src/theme/common.rs index b9df919..e288414 100644 --- a/src/theme/common.rs +++ b/src/theme/common.rs @@ -83,9 +83,9 @@ impl ThemeMethod for CommonTheme { font_color: "#11181c".into(), background_color: "#fff".into(), color_scheme: "light".into(), - color_primary: "#f5222d".into(), - color_primary_hover: "#ff4d4f".into(), - color_primary_active: "#cf1322".into(), + color_primary: "#0078ff".into(), + color_primary_hover: "#2994ff".into(), + color_primary_active: "#005ed9".into(), color_success: "#18a058".into(), color_success_hover: "#36ad6a".into(), color_success_active: "#0c7a43".into(), @@ -104,9 +104,9 @@ impl ThemeMethod for CommonTheme { font_color: "#ecedee".into(), background_color: "#1a1d1e".into(), color_scheme: "dark".into(), - color_primary: "#d32029".into(), - color_primary_hover: "#e04648".into(), - color_primary_active: "#ad111e".into(), + color_primary: "#0078ff".into(), + color_primary_hover: "#2994ff".into(), + color_primary_active: "#005ed9".into(), // color_success: "#63e2b7".into(), // color_success_hover: "#7fe7c4".into(), color_success: "#18a058".into(),