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

🩹 Fix component reference unwrap() issues

Browse source
This commit is contained in:
Manuel Cillero 2023-11-18 08:27:40 +01:00
parent 37f873131b
commit ed495121dd
3 changed files with 293 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

130
pagetop-bootsier/src/lib.rs
View file

@ -84,103 +84,167 @@ impl ThemeTrait for Bootsier {
fn before_prepare_component(&self, component: &mut dyn ComponentTrait, _cx: &mut Context) { fn before_prepare_component(&self, component: &mut dyn ComponentTrait, _cx: &mut Context) {
match component.handle() { match component.handle() {
COMPONENT_BASE_ICON => { COMPONENT_BASE_ICON => {
let i = component_as_mut::<Icon>(component); if let Some(icon) = component_as_mut::<Icon>(component) {
match i.font_size() { match icon.font_size() {
FontSize::ExtraLarge => { FontSize::ExtraLarge => {
i.alter_classes(ClassesOp::Replace(i.font_size().to_string()), "fs-1"); icon.alter_classes(
ClassesOp::Replace(icon.font_size().to_string()),
"fs-1",
);
} }
FontSize::XxLarge => { FontSize::XxLarge => {
i.alter_classes(ClassesOp::Replace(i.font_size().to_string()), "fs-2"); icon.alter_classes(
ClassesOp::Replace(icon.font_size().to_string()),
"fs-2",
);
} }
FontSize::XLarge => { FontSize::XLarge => {
i.alter_classes(ClassesOp::Replace(i.font_size().to_string()), "fs-3"); icon.alter_classes(
ClassesOp::Replace(icon.font_size().to_string()),
"fs-3",
);
} }
FontSize::Large => { FontSize::Large => {
i.alter_classes(ClassesOp::Replace(i.font_size().to_string()), "fs-4"); icon.alter_classes(
ClassesOp::Replace(icon.font_size().to_string()),
"fs-4",
);
} }
FontSize::Medium => { FontSize::Medium => {
i.alter_classes(ClassesOp::Replace(i.font_size().to_string()), "fs-5"); icon.alter_classes(
ClassesOp::Replace(icon.font_size().to_string()),
"fs-5",
);
} }
_ => {} _ => {}
}; };
} }
}
COMPONENT_BASE_BUTTON => { COMPONENT_BASE_BUTTON => {
let a = component_as_mut::<Button>(component); if let Some(button) = component_as_mut::<Button>(component) {
match a.font_size() { match button.font_size() {
FontSize::ExtraLarge => { FontSize::ExtraLarge => {
a.alter_classes(ClassesOp::Replace(a.font_size().to_string()), "fs-1"); button.alter_classes(
ClassesOp::Replace(button.font_size().to_string()),
"fs-1",
);
} }
FontSize::XxLarge => { FontSize::XxLarge => {
a.alter_classes(ClassesOp::Replace(a.font_size().to_string()), "fs-2"); button.alter_classes(
ClassesOp::Replace(button.font_size().to_string()),
"fs-2",
);
} }
FontSize::XLarge => { FontSize::XLarge => {
a.alter_classes(ClassesOp::Replace(a.font_size().to_string()), "fs-3"); button.alter_classes(
ClassesOp::Replace(button.font_size().to_string()),
"fs-3",
);
} }
FontSize::Large => { FontSize::Large => {
a.alter_classes(ClassesOp::Replace(a.font_size().to_string()), "fs-4"); button.alter_classes(
ClassesOp::Replace(button.font_size().to_string()),
"fs-4",
);
} }
FontSize::Medium => { FontSize::Medium => {
a.alter_classes(ClassesOp::Replace(a.font_size().to_string()), "fs-5"); button.alter_classes(
ClassesOp::Replace(button.font_size().to_string()),
"fs-5",
);
} }
_ => {} _ => {}
}; };
match a.button_type() { match button.button_type() {
ButtonType::Link => { ButtonType::Link => {
a.alter_classes( button.alter_classes(
ClassesOp::Replace(a.button_type().to_string()), ClassesOp::Replace(button.button_type().to_string()),
"btn btn-link", "btn btn-link",
); );
} }
ButtonType::Primary => { ButtonType::Primary => {
a.alter_classes( button.alter_classes(
ClassesOp::Replace(a.button_type().to_string()), ClassesOp::Replace(button.button_type().to_string()),
"btn btn-primary", "btn btn-primary",
); );
} }
};
} }
} }
COMPONENT_BASE_HEADING => { COMPONENT_BASE_HEADING => {
let h = component_as_mut::<Heading>(component); if let Some(heading) = component_as_mut::<Heading>(component) {
match h.display() { match heading.display() {
HeadingDisplay::ExtraLarge => { HeadingDisplay::ExtraLarge => {
h.alter_classes(ClassesOp::Replace(h.display().to_string()), "display-1"); heading.alter_classes(
ClassesOp::Replace(heading.display().to_string()),
"display-1",
);
} }
HeadingDisplay::XxLarge => { HeadingDisplay::XxLarge => {
h.alter_classes(ClassesOp::Replace(h.display().to_string()), "display-2"); heading.alter_classes(
ClassesOp::Replace(heading.display().to_string()),
"display-2",
);
} }
HeadingDisplay::XLarge => { HeadingDisplay::XLarge => {
h.alter_classes(ClassesOp::Replace(h.display().to_string()), "display-3"); heading.alter_classes(
ClassesOp::Replace(heading.display().to_string()),
"display-3",
);
} }
HeadingDisplay::Large => { HeadingDisplay::Large => {
h.alter_classes(ClassesOp::Replace(h.display().to_string()), "display-4"); heading.alter_classes(
ClassesOp::Replace(heading.display().to_string()),
"display-4",
);
} }
HeadingDisplay::Medium => { HeadingDisplay::Medium => {
h.alter_classes(ClassesOp::Replace(h.display().to_string()), "display-5"); heading.alter_classes(
ClassesOp::Replace(heading.display().to_string()),
"display-5",
);
} }
_ => {} _ => {}
}; };
} }
}
COMPONENT_BASE_PARAGRAPH => { COMPONENT_BASE_PARAGRAPH => {
let p = component_as_mut::<Paragraph>(component); if let Some(paragraph) = component_as_mut::<Paragraph>(component) {
match p.font_size() { match paragraph.font_size() {
FontSize::ExtraLarge => { FontSize::ExtraLarge => {
p.alter_classes(ClassesOp::Replace(p.font_size().to_string()), "fs-1"); paragraph.alter_classes(
ClassesOp::Replace(paragraph.font_size().to_string()),
"fs-1",
);
} }
FontSize::XxLarge => { FontSize::XxLarge => {
p.alter_classes(ClassesOp::Replace(p.font_size().to_string()), "fs-2"); paragraph.alter_classes(
ClassesOp::Replace(paragraph.font_size().to_string()),
"fs-2",
);
} }
FontSize::XLarge => { FontSize::XLarge => {
p.alter_classes(ClassesOp::Replace(p.font_size().to_string()), "fs-3"); paragraph.alter_classes(
ClassesOp::Replace(paragraph.font_size().to_string()),
"fs-3",
);
} }
FontSize::Large => { FontSize::Large => {
p.alter_classes(ClassesOp::Replace(p.font_size().to_string()), "fs-4"); paragraph.alter_classes(
ClassesOp::Replace(paragraph.font_size().to_string()),
"fs-4",
);
} }
FontSize::Medium => { FontSize::Medium => {
p.alter_classes(ClassesOp::Replace(p.font_size().to_string()), "fs-5"); paragraph.alter_classes(
ClassesOp::Replace(paragraph.font_size().to_string()),
"fs-5",
);
} }
_ => {} _ => {}
}; };
} }
}
_ => {} _ => {}
} }
} }

126
pagetop-bulmix/src/lib.rs
View file

@ -33,92 +33,142 @@ impl ThemeTrait for Bulmix {
fn before_prepare_component(&self, component: &mut dyn ComponentTrait, _cx: &mut Context) { fn before_prepare_component(&self, component: &mut dyn ComponentTrait, _cx: &mut Context) {
match component.handle() { match component.handle() {
COMPONENT_BASE_ICON => { COMPONENT_BASE_ICON => {
let i = component_as_mut::<Icon>(component); if let Some(icon) = component_as_mut::<Icon>(component) {
match i.font_size() { match icon.font_size() {
FontSize::ExtraLarge => { FontSize::ExtraLarge => {
i.alter_classes(ClassesOp::Replace(i.font_size().to_string()), "is-size-1"); icon.alter_classes(
ClassesOp::Replace(icon.font_size().to_string()),
"is-size-1",
);
} }
FontSize::XxLarge => { FontSize::XxLarge => {
i.alter_classes(ClassesOp::Replace(i.font_size().to_string()), "is-size-2"); icon.alter_classes(
ClassesOp::Replace(icon.font_size().to_string()),
"is-size-2",
);
} }
FontSize::XLarge => { FontSize::XLarge => {
i.alter_classes(ClassesOp::Replace(i.font_size().to_string()), "is-size-3"); icon.alter_classes(
ClassesOp::Replace(icon.font_size().to_string()),
"is-size-3",
);
} }
FontSize::Large => { FontSize::Large => {
i.alter_classes(ClassesOp::Replace(i.font_size().to_string()), "is-size-4"); icon.alter_classes(
ClassesOp::Replace(icon.font_size().to_string()),
"is-size-4",
);
} }
FontSize::Medium => { FontSize::Medium => {
i.alter_classes(ClassesOp::Replace(i.font_size().to_string()), "is-size-5"); icon.alter_classes(
ClassesOp::Replace(icon.font_size().to_string()),
"is-size-5",
);
} }
_ => {} _ => {}
}; };
} }
}
COMPONENT_BASE_BUTTON => { COMPONENT_BASE_BUTTON => {
let a = component_as_mut::<Button>(component); if let Some(button) = component_as_mut::<Button>(component) {
match a.font_size() { match button.font_size() {
FontSize::ExtraLarge => { FontSize::ExtraLarge => {
a.alter_classes(ClassesOp::Replace(a.font_size().to_string()), "is-size-1"); button.alter_classes(
ClassesOp::Replace(button.font_size().to_string()),
"is-size-1",
);
} }
FontSize::XxLarge => { FontSize::XxLarge => {
a.alter_classes(ClassesOp::Replace(a.font_size().to_string()), "is-size-2"); button.alter_classes(
ClassesOp::Replace(button.font_size().to_string()),
"is-size-2",
);
} }
FontSize::XLarge => { FontSize::XLarge => {
a.alter_classes(ClassesOp::Replace(a.font_size().to_string()), "is-size-3"); button.alter_classes(
ClassesOp::Replace(button.font_size().to_string()),
"is-size-3",
);
} }
FontSize::Large => { FontSize::Large => {
a.alter_classes(ClassesOp::Replace(a.font_size().to_string()), "is-size-4"); button.alter_classes(
ClassesOp::Replace(button.font_size().to_string()),
"is-size-4",
);
} }
FontSize::Medium => { FontSize::Medium => {
a.alter_classes(ClassesOp::Replace(a.font_size().to_string()), "is-size-5"); button.alter_classes(
ClassesOp::Replace(button.font_size().to_string()),
"is-size-5",
);
} }
_ => {} _ => {}
}; };
match a.button_type() { match button.button_type() {
ButtonType::Link => { ButtonType::Link => {
a.alter_classes( button.alter_classes(
ClassesOp::Replace(a.button_type().to_string()), ClassesOp::Replace(button.button_type().to_string()),
"button is-text", "button is-text",
); );
} }
ButtonType::Primary => { ButtonType::Primary => {
a.alter_classes( button.alter_classes(
ClassesOp::Replace(a.button_type().to_string()), ClassesOp::Replace(button.button_type().to_string()),
"button is-primary", "button is-primary",
); );
} }
};
} }
} }
COMPONENT_BASE_HEADING => { COMPONENT_BASE_HEADING => {
let h = component_as_mut::<Heading>(component); if let Some(heading) = component_as_mut::<Heading>(component) {
match h.display() { match heading.display() {
HeadingDisplay::Subtitle => { HeadingDisplay::Subtitle => heading.alter_classes(
h.alter_classes(ClassesOp::Replace(h.display().to_string()), "subtitle") ClassesOp::Replace(heading.display().to_string()),
} "subtitle",
_ => h.alter_classes(ClassesOp::Add, "title"), ),
_ => heading.alter_classes(ClassesOp::Add, "title"),
}; };
} }
}
COMPONENT_BASE_PARAGRAPH => { COMPONENT_BASE_PARAGRAPH => {
let p = component_as_mut::<Paragraph>(component); if let Some(paragraph) = component_as_mut::<Paragraph>(component) {
p.alter_classes(ClassesOp::Add, "block"); paragraph.alter_classes(ClassesOp::Add, "block");
match p.font_size() { match paragraph.font_size() {
FontSize::ExtraLarge => { FontSize::ExtraLarge => {
p.alter_classes(ClassesOp::Replace(p.font_size().to_string()), "is-size-1"); paragraph.alter_classes(
ClassesOp::Replace(paragraph.font_size().to_string()),
"is-size-1",
);
} }
FontSize::XxLarge => { FontSize::XxLarge => {
p.alter_classes(ClassesOp::Replace(p.font_size().to_string()), "is-size-2"); paragraph.alter_classes(
ClassesOp::Replace(paragraph.font_size().to_string()),
"is-size-2",
);
} }
FontSize::XLarge => { FontSize::XLarge => {
p.alter_classes(ClassesOp::Replace(p.font_size().to_string()), "is-size-3"); paragraph.alter_classes(
ClassesOp::Replace(paragraph.font_size().to_string()),
"is-size-3",
);
} }
FontSize::Large => { FontSize::Large => {
p.alter_classes(ClassesOp::Replace(p.font_size().to_string()), "is-size-4"); paragraph.alter_classes(
ClassesOp::Replace(paragraph.font_size().to_string()),
"is-size-4",
);
} }
FontSize::Medium => { FontSize::Medium => {
p.alter_classes(ClassesOp::Replace(p.font_size().to_string()), "is-size-5"); paragraph.alter_classes(
ClassesOp::Replace(paragraph.font_size().to_string()),
"is-size-5",
);
} }
_ => {} _ => {}
}; };
} }
}
_ => {} _ => {}
} }
} }
@ -130,11 +180,15 @@ impl ThemeTrait for Bulmix {
) -> Option<Markup> { ) -> Option<Markup> {
match component.handle() { match component.handle() {
COMPONENT_BASE_ICON => { COMPONENT_BASE_ICON => {
let icon = component_as_ref::<Icon>(component); if let Some(icon) = component_as_ref::<Icon>(component) {
match icon.icon_name().get() { return match icon.icon_name().get() {
None => None, None => None,
_ => Some(html! { span class="icon" { i class=[icon.classes().get()] {} } }), _ => {
Some(html! { span class="icon" { i class=[icon.classes().get()] {} } })
} }
};
}
None
} }
_ => None, _ => None,
} }

8
pagetop/src/core/component/definition.rs
View file

@ -97,10 +97,10 @@ impl<C: ComponentTrait> ComponentBase for C {
} }
} }
pub fn component_as_ref<C: ComponentTrait>(component: &dyn ComponentTrait) -> &C { pub fn component_as_ref<C: ComponentTrait>(component: &dyn ComponentTrait) -> Option<&C> {
component.as_ref_any().downcast_ref::<C>().unwrap() component.as_ref_any().downcast_ref::<C>()
} }
pub fn component_as_mut<C: ComponentTrait>(component: &mut dyn ComponentTrait) -> &mut C { pub fn component_as_mut<C: ComponentTrait>(component: &mut dyn ComponentTrait) -> Option<&mut C> {
component.as_mut_any().downcast_mut::<C>().unwrap() component.as_mut_any().downcast_mut::<C>()
} }