manuelcillero/pagetop
manuelcillero/pagetop
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

🧑‍💻 Simplify component class access functions

Browse source
This commit is contained in:
Manuel Cillero 2024-03-03 21:14:56 +01:00
parent d69d4cda45
commit 9a5618ef4b
12 changed files with 82 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

63
packages/pagetop-bootsier/src/lib.rs
View file

@ -92,40 +92,55 @@ impl ThemeTrait for Bootsier {
match component.type_id() { match component.type_id() {
t if t == TypeId::of::<Icon>() => { t if t == TypeId::of::<Icon>() => {
if let Some(i) = component_as_mut::<Icon>(component) { if let Some(i) = component_as_mut::<Icon>(component) {
i.replace_classes(i.font_size().to_string(), with_font(i.font_size())); i.alter_classes(
ClassesOp::Replace(i.font_size().to_string()),
with_font(i.font_size()),
);
} }
} }
t if t == TypeId::of::<Button>() => { t if t == TypeId::of::<Button>() => {
if let Some(b) = component_as_mut::<Button>(component) { if let Some(b) = component_as_mut::<Button>(component) {
b.replace_classes("button__tap", "btn"); b.alter_classes(ClassesOp::Replace("button__tap".to_owned()), "btn");
b.replace_classes(b.style().to_string(), match b.style() { b.alter_classes(
StyleBase::Default => "btn-primary", ClassesOp::Replace(b.style().to_string()),
StyleBase::Success => "btn-success", match b.style() {
StyleBase::Danger => "btn-danger", StyleBase::Default => "btn-primary",
StyleBase::Warning => "btn-warning", StyleBase::Success => "btn-success",
StyleBase::Info => "btn-info", StyleBase::Danger => "btn-danger",
StyleBase::Light => "btn-light", StyleBase::Warning => "btn-warning",
StyleBase::Dark => "btn-dark", StyleBase::Info => "btn-info",
StyleBase::Link => "btn-link", StyleBase::Light => "btn-light",
}); StyleBase::Dark => "btn-dark",
b.replace_classes(b.font_size().to_string(), with_font(b.font_size())); StyleBase::Link => "btn-link",
},
);
b.alter_classes(
ClassesOp::Replace(b.font_size().to_string()),
with_font(b.font_size()),
);
} }
}, }
t if t == TypeId::of::<Heading>() => { t if t == TypeId::of::<Heading>() => {
if let Some(h) = component_as_mut::<Heading>(component) { if let Some(h) = component_as_mut::<Heading>(component) {
h.replace_classes(h.size().to_string(), match h.size() { h.alter_classes(
HeadingSize::ExtraLarge => "display-1", ClassesOp::Replace(h.size().to_string()),
HeadingSize::XxLarge => "display-2", match h.size() {
HeadingSize::XLarge => "display-3", HeadingSize::ExtraLarge => "display-1",
HeadingSize::Large => "display-4", HeadingSize::XxLarge => "display-2",
HeadingSize::Medium => "display-5", HeadingSize::XLarge => "display-3",
_ => "", HeadingSize::Large => "display-4",
}); HeadingSize::Medium => "display-5",
_ => "",
},
);
} }
}, }
t if t == TypeId::of::<Paragraph>() => { t if t == TypeId::of::<Paragraph>() => {
if let Some(p) = component_as_mut::<Paragraph>(component) { if let Some(p) = component_as_mut::<Paragraph>(component) {
p.replace_classes(p.font_size().to_string(), with_font(p.font_size())); p.alter_classes(
ClassesOp::Replace(p.font_size().to_string()),
with_font(p.font_size()),
);
} }
} }
_ => {} _ => {}

46
packages/pagetop-bulmix/src/lib.rs
View file

@ -44,39 +44,51 @@ impl ThemeTrait for Bulmix {
match component.type_id() { match component.type_id() {
t if t == TypeId::of::<Icon>() => { t if t == TypeId::of::<Icon>() => {
if let Some(i) = component_as_mut::<Icon>(component) { if let Some(i) = component_as_mut::<Icon>(component) {
i.replace_classes(i.font_size().to_string(), with_font(i.font_size())); i.alter_classes(
ClassesOp::Replace(i.font_size().to_string()),
with_font(i.font_size()),
);
} }
} }
t if t == TypeId::of::<Button>() => { t if t == TypeId::of::<Button>() => {
if let Some(b) = component_as_mut::<Button>(component) { if let Some(b) = component_as_mut::<Button>(component) {
b.replace_classes("button__tap", "button"); b.alter_classes(ClassesOp::Replace("button__tap".to_owned()), "button");
b.replace_classes(b.style().to_string(), match b.style() { b.alter_classes(
StyleBase::Default => "is-primary", ClassesOp::Replace(b.style().to_string()),
StyleBase::Success => "is-success", match b.style() {
StyleBase::Danger => "is-danger", StyleBase::Default => "is-primary",
StyleBase::Warning => "is-warning", StyleBase::Success => "is-success",
StyleBase::Info => "is-info", StyleBase::Danger => "is-danger",
StyleBase::Light => "is-light", StyleBase::Warning => "is-warning",
StyleBase::Dark => "is-dark", StyleBase::Info => "is-info",
StyleBase::Link => "is-text", StyleBase::Light => "is-light",
}); StyleBase::Dark => "is-dark",
b.replace_classes(b.font_size().to_string(), with_font(b.font_size())); StyleBase::Link => "is-text",
},
);
b.alter_classes(
ClassesOp::Replace(b.font_size().to_string()),
with_font(b.font_size()),
);
} }
} }
t if t == TypeId::of::<Heading>() => { t if t == TypeId::of::<Heading>() => {
if let Some(h) = component_as_mut::<Heading>(component) { if let Some(h) = component_as_mut::<Heading>(component) {
match h.size() { match h.size() {
HeadingSize::Subtitle => { HeadingSize::Subtitle => {
h.replace_classes(h.size().to_string(), "subtitle") h.alter_classes(ClassesOp::Replace(h.size().to_string()), "subtitle")
} }
_ => h.add_classes("title"), _ => h.alter_classes(ClassesOp::Add, "title"),
}; };
} }
} }
t if t == TypeId::of::<Paragraph>() => { t if t == TypeId::of::<Paragraph>() => {
if let Some(p) = component_as_mut::<Paragraph>(component) { if let Some(p) = component_as_mut::<Paragraph>(component) {
p.add_classes("block"); p.alter_classes(ClassesOp::Add, "block");
p.replace_classes(p.font_size().to_string(), with_font(p.font_size())); p.alter_classes(
ClassesOp::Replace(p.font_size().to_string()),
with_font(p.font_size()),
);
} }
} }
_ => {} _ => {}

2
src/base/component/block.rs
View file

@ -29,7 +29,7 @@ impl ComponentTrait for Block {
} }
fn setup_before_prepare(&mut self, _cx: &mut Context) { fn setup_before_prepare(&mut self, _cx: &mut Context) {
self.prepend_classes("block__container"); self.alter_classes(ClassesOp::Prepend, "block__container");
} }
fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup { fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup {

3
src/base/component/button.rs
View file

@ -44,7 +44,8 @@ impl ComponentTrait for Button {
} }
fn setup_before_prepare(&mut self, _cx: &mut Context) { fn setup_before_prepare(&mut self, _cx: &mut Context) {
self.prepend_classes( self.alter_classes(
ClassesOp::Prepend,
[ [
"button__tap".to_string(), "button__tap".to_string(),
self.style().to_string(), self.style().to_string(),

3
src/base/component/flex/container.rs
View file

@ -33,7 +33,8 @@ impl ComponentTrait for Container {
} }
fn setup_before_prepare(&mut self, cx: &mut Context) { fn setup_before_prepare(&mut self, cx: &mut Context) {
self.prepend_classes( self.alter_classes(
ClassesOp::Prepend,
[ [
self.direction().to_string(), self.direction().to_string(),
self.wrap_align().to_string(), self.wrap_align().to_string(),

3
src/base/component/flex/item.rs
View file

@ -33,7 +33,8 @@ impl ComponentTrait for Item {
} }
fn setup_before_prepare(&mut self, _cx: &mut Context) { fn setup_before_prepare(&mut self, _cx: &mut Context) {
self.prepend_classes( self.alter_classes(
ClassesOp::Prepend,
[ [
"flex-item__container".to_owned(), "flex-item__container".to_owned(),
self.grow().to_string(), self.grow().to_string(),

3
src/base/component/form/action_button.rs
View file

@ -48,7 +48,8 @@ impl ComponentTrait for ActionButton {
} }
fn setup_before_prepare(&mut self, _cx: &mut Context) { fn setup_before_prepare(&mut self, _cx: &mut Context) {
self.prepend_classes( self.alter_classes(
ClassesOp::Prepend,
[ [
"button__tap".to_string(), "button__tap".to_string(),
self.style().to_string(), self.style().to_string(),

4
src/base/component/form/input.rs
View file

@ -162,9 +162,9 @@ impl Input {
#[fn_builder] #[fn_builder]
pub fn alter_name(&mut self, name: &str) -> &mut Self { pub fn alter_name(&mut self, name: &str) -> &mut Self {
if let Some(previous) = self.name.get() { if let Some(previous) = self.name.get() {
self.remove_classes(concat_string!("form-item-", previous)); self.alter_classes(ClassesOp::Remove, concat_string!("form-item-", previous));
} }
self.add_classes(concat_string!("form-item-", name)); self.alter_classes(ClassesOp::Add, concat_string!("form-item-", name));
self.name.alter_value(name); self.name.alter_value(name);
self self
} }

2
src/base/component/heading.rs
View file

@ -68,7 +68,7 @@ impl ComponentTrait for Heading {
} }
fn setup_before_prepare(&mut self, _cx: &mut Context) { fn setup_before_prepare(&mut self, _cx: &mut Context) {
self.add_classes(self.size().to_string()); self.alter_classes(ClassesOp::Add, self.size().to_string());
} }
fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup { fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup {

2
src/base/component/icon.rs
View file

@ -26,7 +26,7 @@ impl ComponentTrait for Icon {
#[rustfmt::skip] #[rustfmt::skip]
fn setup_before_prepare(&mut self, cx: &mut Context) { fn setup_before_prepare(&mut self, cx: &mut Context) {
if let Some(icon_name) = self.icon_name().get() { if let Some(icon_name) = self.icon_name().get() {
self.prepend_classes( self.alter_classes(ClassesOp::Prepend,
concat_string!("bi-", icon_name, " ", self.font_size().to_string()), concat_string!("bi-", icon_name, " ", self.font_size().to_string()),
); );
cx.set_param::<bool>(PARAM_BASE_INCLUDE_ICONS, true); cx.set_param::<bool>(PARAM_BASE_INCLUDE_ICONS, true);

2
src/base/component/paragraph.rs
View file

@ -29,7 +29,7 @@ impl ComponentTrait for Paragraph {
} }
fn setup_before_prepare(&mut self, _cx: &mut Context) { fn setup_before_prepare(&mut self, _cx: &mut Context) {
self.prepend_classes(self.font_size().to_string()); self.alter_classes(ClassesOp::Prepend, self.font_size().to_string());
} }
fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup { fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup {

43
src/core/component/classes.rs
View file

@ -3,18 +3,6 @@ use crate::html::{ClassesOp, OptionClasses};
pub trait ComponentClassesOp { pub trait ComponentClassesOp {
fn with_classes(self, op: ClassesOp, classes: impl Into<String>) -> Self; fn with_classes(self, op: ClassesOp, classes: impl Into<String>) -> Self;
fn add_classes(&mut self, classes: impl Into<String>) -> &mut Self;
fn prepend_classes(&mut self, classes: impl Into<String>) -> &mut Self;
fn remove_classes(&mut self, classes: impl Into<String>) -> &mut Self;
fn replace_classes(&mut self, rep: impl Into<String>, classes: impl Into<String>) -> &mut Self;
fn toggle_classes(&mut self, classes: impl Into<String>) -> &mut Self;
fn set_classes(&mut self, classes: impl Into<String>) -> &mut Self;
} }
pub trait ComponentClasses: ComponentBase + ComponentClassesOp { pub trait ComponentClasses: ComponentBase + ComponentClassesOp {
@ -24,39 +12,8 @@ pub trait ComponentClasses: ComponentBase + ComponentClassesOp {
} }
impl<C: ComponentBase + ComponentClasses> ComponentClassesOp for C { impl<C: ComponentBase + ComponentClasses> ComponentClassesOp for C {
#[doc(hidden)]
fn with_classes(mut self, op: ClassesOp, classes: impl Into<String>) -> Self { fn with_classes(mut self, op: ClassesOp, classes: impl Into<String>) -> Self {
self.alter_classes(op, classes); self.alter_classes(op, classes);
self self
} }
fn add_classes(&mut self, classes: impl Into<String>) -> &mut Self {
self.alter_classes(ClassesOp::Add, classes);
self
}
fn prepend_classes(&mut self, classes: impl Into<String>) -> &mut Self {
self.alter_classes(ClassesOp::Prepend, classes);
self
}
fn remove_classes(&mut self, classes: impl Into<String>) -> &mut Self {
self.alter_classes(ClassesOp::Remove, classes);
self
}
fn replace_classes(&mut self, rep: impl Into<String>, classes: impl Into<String>) -> &mut Self {
self.alter_classes(ClassesOp::Replace(rep.into()), classes);
self
}
fn toggle_classes(&mut self, classes: impl Into<String>) -> &mut Self {
self.alter_classes(ClassesOp::Toggle, classes);
self
}
fn set_classes(&mut self, classes: impl Into<String>) -> &mut Self {
self.alter_classes(ClassesOp::Set, classes);
self
}
} }